using tmcCore should work now, unless AWT thread cause trouble

Author: zinkko

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

@@ -1,15 +1,23 @@
 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 hy.tmc.core.TmcCore;
+import hy.tmc.core.exceptions.TmcCoreException;
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 import java.util.concurrent.Callable;
@@ -21,6 +29,7 @@
  * 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;
@@ -29,6 +38,8 @@ public class DownloadExercisesAction {
     private ConvenientDialogDisplayer dialogs;
 
     private List<Exercise> exercisesToDownload;
+    private TmcCore tmcCore;
+    private NBTmcSettings settings;
 
     public DownloadExercisesAction(List<Exercise> exercisesToOpen) {
         this.serverAccess = new ServerAccess();
@@ -37,17 +48,43 @@ public DownloadExercisesAction(List<Exercise> exercisesToOpen) {
         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);
+    public void run() throws TmcCoreException {
+        // final AggregatingBgTaskListener<TmcProjectInfo> aggregator
+        //         = new AggregatingBgTaskListener<TmcProjectInfo>(exercisesToDownload.size(), whenAllDownloadsFinished);
 
-        for (final Exercise exercise : exercisesToDownload) {
-            startDownloading(exercise, aggregator);
-        }
+        ListenableFuture<List<Exercise>> dlFuture = tmcCore.donwloadExercises(exercisesToDownload, settings);
+
+        Futures.addCallback(dlFuture,
+                new FutureCallback<List<Exercise>>() {
+
+                    @Override
+                    public void onSuccess(List<Exercise> downloadedExercises) {
+                        List<TmcProjectInfo> projects = new ArrayList<TmcProjectInfo>();
+                        for (Exercise exercise : downloadedExercises) {
+                            projects.add(projectMediator.tryGetProjectForExercise(exercise));
+                        }
+                        projectMediator.openProjects(projects);
+                    }
+
+                    @Override
+                    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));
+
+                    }
+                }
+        );
+
+        //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
@@ -75,7 +112,7 @@ public void run() {
                     }
                 }, listener);
             }
-            
+
             @Override
             public void bgTaskCancelled() {
                 listener.bgTaskCancelled();
@@ -87,7 +124,7 @@ public void bgTaskFailed(Throwable ex) {
             }
         });
     }
-
+    /*
     private BgTaskListener<Collection<TmcProjectInfo>> whenAllDownloadsFinished = new BgTaskListener<Collection<TmcProjectInfo>>() {
         @Override
         public void bgTaskReady(Collection<TmcProjectInfo> projects) {
@@ -104,4 +141,6 @@ public void bgTaskFailed(Throwable ex) {
             dialogs.displayError("Failed to download exercises.\n" + ServerErrorHelper.getServerExceptionMsg(ex));
         }
     };
+    */
+
 }

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

@@ -63,7 +63,7 @@ public List<TmcProjectInfo> wrapProjects(List<Project> projects) {
     }
 
     public String getProjectRootDir() {
-        return TmcSettings.getDefault().getProjectRootDir();
+        return NBTmcSettings.getDefault().getProjectRootDir();
     }
 
     public static String getDefaultProjectRootDir() {

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

@@ -9,6 +9,7 @@
   </Properties>
   <SyntheticProperties>
     <SyntheticProperty name="formSizePolicy" type="int" value="1"/>
+    <SyntheticProperty name="generateCenter" type="boolean" value="false"/>
   </SyntheticProperties>
   <AuxValues>
     <AuxValue name="FormSettings_autoResourcing" type="java.lang.Integer" value="1"/>

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;
@@ -13,6 +15,7 @@
 import java.util.List;
 import javax.swing.JCheckBox;
 import javax.swing.JDialog;
+import org.openide.util.Exceptions;
 import org.openide.windows.WindowManager;
 
 public class DownloadOrUpdateExercisesDialog extends JDialog {
@@ -117,8 +120,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));
+        }
     }
 
     /** This method is called from within the constructor to