Merge branch 'core_integration' of github.com:rage/tmc-netbeans into core_integration

Conflicts:
	tmc-plugin/src/fi/helsinki/cs/tmc/ui/DownloadOrUpdateExercisesDialog.java

Author: samutamm

tmc-plugin/src/fi/helsinki/cs/tmc/actions/DownloadExercisesAction.java

@@ -1,107 +1,75 @@
 package fi.helsinki.cs.tmc.actions;
 
+import com.google.common.util.concurrent.FutureCallback;
+import com.google.common.util.concurrent.Futures;
+import com.google.common.util.concurrent.ListenableFuture;
 import hy.tmc.core.domain.Exercise;
-import fi.helsinki.cs.tmc.model.CourseDb;
+import fi.helsinki.cs.tmc.model.NBTmcSettings;
 import fi.helsinki.cs.tmc.model.ProjectMediator;
-import fi.helsinki.cs.tmc.model.ServerAccess;
+import fi.helsinki.cs.tmc.model.TmcCoreSingleton;
 import fi.helsinki.cs.tmc.model.TmcProjectInfo;
 import fi.helsinki.cs.tmc.ui.ConvenientDialogDisplayer;
-import fi.helsinki.cs.tmc.utilities.AggregatingBgTaskListener;
-import fi.helsinki.cs.tmc.utilities.BgTask;
-import fi.helsinki.cs.tmc.utilities.BgTaskListener;
-import fi.helsinki.cs.tmc.utilities.zip.NbProjectUnzipper;
-import java.util.Collection;
+import hy.tmc.core.TmcCore;
+import hy.tmc.core.exceptions.TmcCoreException;
+import java.util.ArrayList;
 import java.util.List;
-import java.util.concurrent.Callable;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.swing.SwingUtilities;
 
 /**
  * Downloads and opens the given exercises in the background.
  */
 public class DownloadExercisesAction {
+
     private static final Logger logger = Logger.getLogger(DownloadExercisesAction.class.getName());
 
-    private ServerAccess serverAccess;
-    private CourseDb courseDb;
     private ProjectMediator projectMediator;
     private ConvenientDialogDisplayer dialogs;
 
     private List<Exercise> exercisesToDownload;
+    private TmcCore tmcCore;
+    private NBTmcSettings settings;
 
     public DownloadExercisesAction(List<Exercise> exercisesToOpen) {
-        this.serverAccess = new ServerAccess();
-        this.courseDb = CourseDb.getInstance();
         this.projectMediator = ProjectMediator.getInstance();
         this.dialogs = ConvenientDialogDisplayer.getDefault();
 
         this.exercisesToDownload = exercisesToOpen;
+        this.tmcCore = TmcCoreSingleton.getInstance();
+        this.settings = NBTmcSettings.getDefault();
     }
 
-    public void run() {
-        final AggregatingBgTaskListener<TmcProjectInfo> aggregator =
-                new AggregatingBgTaskListener<TmcProjectInfo>(exercisesToDownload.size(), whenAllDownloadsFinished);
-
-        for (final Exercise exercise : exercisesToDownload) {
-            startDownloading(exercise, aggregator);
-        }
-    }
-
-    private void startDownloading(final Exercise exercise, final BgTaskListener<TmcProjectInfo> listener) {
-        BgTask.start("Downloading " + exercise.getName(), serverAccess.getDownloadingExerciseZipTask(exercise), new BgTaskListener<byte[]>() {
-            @Override
-            public void bgTaskReady(final byte[] zipData) {
-                BgTask.start("Extracting project", new Callable<TmcProjectInfo>() {
-                    @Override
-                    public TmcProjectInfo call() throws Exception {
-                        NbProjectUnzipper unzipper = new NbProjectUnzipper();
-                        unzipper.unzipProject(zipData, projectMediator.getProjectDirForExercise(exercise));
-                        TmcProjectInfo proj = projectMediator.tryGetProjectForExercise(exercise);
-
-                        if (proj == null) {
-                            throw new RuntimeException("Failed to open project for exercise " + exercise.getName());
-                        }
+    public void run() throws TmcCoreException {
+        // final AggregatingBgTaskListener<TmcProjectInfo> aggregator
+        //         = new AggregatingBgTaskListener<TmcProjectInfo>(exercisesToDownload.size(), whenAllDownloadsFinished);
 
-                        // Need to invoke courseDb in swing thread to avoid races
-                        SwingUtilities.invokeAndWait(new Runnable() {
-                            @Override
-                            public void run() {
-                                courseDb.exerciseDownloaded(exercise);
-                            }
-                        });
+        ListenableFuture<List<Exercise>> dlFuture = tmcCore.downloadExercises(exercisesToDownload, settings);
 
-                        return proj;
-                    }
-                }, listener);
-            }
-            
-            @Override
-            public void bgTaskCancelled() {
-                listener.bgTaskCancelled();
-            }
-
-            @Override
-            public void bgTaskFailed(Throwable ex) {
-                listener.bgTaskFailed(ex);
-            }
-        });
+        Futures.addCallback(dlFuture, new ProjectOpener());
     }
 
-    private BgTaskListener<Collection<TmcProjectInfo>> whenAllDownloadsFinished = new BgTaskListener<Collection<TmcProjectInfo>>() {
+    private class ProjectOpener implements FutureCallback<List<Exercise>> {
+
         @Override
-        public void bgTaskReady(Collection<TmcProjectInfo> projects) {
+        public void onSuccess(List<Exercise> downloadedExercises) {
+            List<TmcProjectInfo> projects = new ArrayList<TmcProjectInfo>();
+            for (Exercise exercise : downloadedExercises) {
+                TmcProjectInfo info = projectMediator.tryGetProjectForExercise(exercise);
+                if (info == null) {
+                    dialogs.displayError(
+                            "Could not find exercise " + exercise.getName() + " from the filesystem");
+                    continue;
+                }
+                projects.add(info);
+            }
             projectMediator.openProjects(projects);
         }
 
         @Override
-        public void bgTaskCancelled() {
-        }
+        public void onFailure(Throwable thrwbl) {
+            logger.log(Level.INFO, "Failed to download exercise file.", thrwbl);
+            dialogs.displayError("Failed to download exercises.\n" + ServerErrorHelper.getServerExceptionMsg(thrwbl));
 
-        @Override
-        public void bgTaskFailed(Throwable ex) {
-            logger.log(Level.INFO, "Failed to download exercise file.", ex);
-            dialogs.displayError("Failed to download exercises.\n" + ServerErrorHelper.getServerExceptionMsg(ex));
         }
-    };
+    }
 }

tmc-plugin/src/fi/helsinki/cs/tmc/model/ProjectMediator.java

@@ -115,7 +115,7 @@ public File getProjectDirForExercise(Exercise ex) {
         String path = 
                 getProjectRootDir() + File.separator +
                 ex.getCourseName() + File.separator +
-                ex.getName().replaceAll("/", "-");
+                ex.getName().replaceAll("-", "/");
         return new File(path);
     }
 

tmc-plugin/src/fi/helsinki/cs/tmc/ui/DownloadOrUpdateExercisesDialog.java

@@ -1,9 +1,11 @@
 package fi.helsinki.cs.tmc.ui;
 
 import fi.helsinki.cs.tmc.actions.DownloadExercisesAction;
+import fi.helsinki.cs.tmc.actions.ServerErrorHelper;
 import fi.helsinki.cs.tmc.actions.UnlockExercisesAction;
 import fi.helsinki.cs.tmc.actions.UpdateExercisesAction;
 import hy.tmc.core.domain.Exercise;
+import hy.tmc.core.exceptions.TmcCoreException;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.ItemEvent;
@@ -14,6 +16,7 @@
 import javax.swing.JCheckBox;
 import javax.swing.JDialog;
 import javax.swing.SwingUtilities;
+import org.openide.util.Exceptions;
 import org.openide.windows.WindowManager;
 
 public class DownloadOrUpdateExercisesDialog extends JDialog {
@@ -123,8 +126,14 @@ private void updateSelectAllButtonState() {
     }
 
     private void doDownloadAndUpdate(List<Exercise> toDownload, List<Exercise> toUpdate) {
-        new DownloadExercisesAction(toDownload).run();
-        new UpdateExercisesAction(toUpdate).run();
+        try {
+            new DownloadExercisesAction(toDownload).run();
+            new UpdateExercisesAction(toUpdate).run();
+        } catch (TmcCoreException ex) {
+            Exceptions.printStackTrace(ex);
+            ConvenientDialogDisplayer.getDefault()
+                .displayError("Failed to download exercises.\n" + ServerErrorHelper.getServerExceptionMsg(ex));
+        }
     }
 
     /**