Update exercises with core

Author: jamo

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

@@ -50,7 +50,7 @@ public static void startTimer() {
         timer.start();
     }
 
-    private static final TmcNotificationDisplayer.SingletonToken notifierToken = TmcNotificationDisplayer.createSingletonToken();
+    private static final TmcNotificationDisplayer.SingletonToken NOTIFIER_TOKEN = TmcNotificationDisplayer.createSingletonToken();
 
     private CourseDb courseDb;
     private TmcNotificationDisplayer notifier;
@@ -158,7 +158,7 @@ private void displayNotification(LocalExerciseStatus status, ActionListener acti
 
         String prompt = "Click here to " + TmcStringUtils.joinCommaAnd(actions) + ".";
 
-        notifier.notify(notifierToken, msg, getNotificationIcon(), prompt, action);
+        notifier.notify(NOTIFIER_TOKEN, msg, getNotificationIcon(), prompt, action);
     }
 
     private Icon getNotificationIcon() {

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

@@ -16,13 +16,11 @@
 import fi.helsinki.cs.tmc.utilities.TmcSwingUtilities;
 
 import com.google.common.collect.Lists;
-import java.lang.reflect.InvocationTargetException;
 import java.util.Collection;
 import java.util.List;
 import java.util.concurrent.Callable;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.swing.SwingUtilities;
 import org.openide.util.Exceptions;
 
 /**

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

@@ -1,7 +1,9 @@
 package fi.helsinki.cs.tmc.actions;
 
+import fi.helsinki.cs.tmc.core.TmcCore;
 import fi.helsinki.cs.tmc.core.communication.TmcServerCommunicationTaskFactory;
 import fi.helsinki.cs.tmc.core.domain.Exercise;
+import fi.helsinki.cs.tmc.core.domain.ProgressObserver;
 import fi.helsinki.cs.tmc.core.utilities.ServerErrorHelper;
 import fi.helsinki.cs.tmc.core.events.TmcEvent;
 import fi.helsinki.cs.tmc.events.TmcEventBus;
@@ -15,13 +17,15 @@
 import fi.helsinki.cs.tmc.utilities.BgTaskListener;
 import fi.helsinki.cs.tmc.utilities.zip.NbProjectUnzipper;
 
+import com.google.common.collect.ImmutableList;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
+import java.util.concurrent.Callable;
 import java.util.logging.Logger;
 
 public class UpdateExercisesAction implements ActionListener {
@@ -77,27 +81,14 @@ public void bgTaskFailed(Throwable ex) {
             final File projectDir = projectMediator.getProjectDirForExercise(exercise);
             eventBus.post(new InvokedEvent(exercise));
 
-            BgTask.start("Downloading " + exercise.getName(), new TmcServerCommunicationTaskFactory().getDownloadingExerciseZipTask(exercise), new BgTaskListener<byte[]>() {
+            Callable<List<Exercise>> downloadAndExtractExerciseTask = TmcCore.get().downloadOrUpdateExercises(ProgressObserver.NULL_OBSERVER, ImmutableList.of(exercise));
+            BgTask.start("Downloading " + exercise.getName(), downloadAndExtractExerciseTask, new BgTaskListener<List<Exercise>>() {
 
                 @Override
-                public void bgTaskReady(byte[] data) {
-                    TmcProjectInfo project = null;
-                    try {
-                        try {
-                            ExerciseUpdateOverwritingDecider overwriter = new ExerciseUpdateOverwritingDecider(projectDir);
-                            NbProjectUnzipper unzipper = new NbProjectUnzipper(overwriter);
-                            NbProjectUnzipper.Result result = unzipper.unzipProject(data, projectDir);
-                            log.info("== Exercise unzip result ==\n" + result);
-                        } catch (IOException ex) {
-                            dialogDisplayer.displayError("Failed to update project.", ex);
-                            return;
-                        }
-                        courseDb.exerciseDownloaded(exercise);
-
-                        project = projectMediator.tryGetProjectForExercise(exercise);
-                    } finally {
-                        projectOpener.bgTaskReady(project);
-                    }
+                public void bgTaskReady(List<Exercise> exercises) {
+                    courseDb.exerciseDownloaded(exercise);
+                    TmcProjectInfo project = projectMediator.tryGetProjectForExercise(exercise);
+                    projectOpener.bgTaskReady(project);
                 }
 
                 @Override

tmc-plugin/src/fi/helsinki/cs/tmc/spyware/eventsources/WindowStatechangesEventSource.java

@@ -171,13 +171,15 @@ private String toStringWithObjects(Object object) {
                 return ((Mode) object).getName();
             } else if (object instanceof Accessible) {
                 try {
-                    Accessible acc = (Accessible) object;
-                    if (acc != null) {
-                        AccessibleContext context = acc.getAccessibleContext();
-                        if (context != null) {
-                            String str = context.getAccessibleName();
-                            if (str != null) {
-                                return str;
+                    if (object != null) {
+                        Accessible acc = (Accessible) object;
+                        if (acc != null) {
+                            AccessibleContext context = acc.getAccessibleContext();
+                            if (context != null) {
+                                String str = context.getAccessibleName();
+                                if (str != null) {
+                                    return str;
+                                }
                             }
                         }
                     }
@@ -188,6 +190,7 @@ private String toStringWithObjects(Object object) {
             }
             return object.toString();
         } catch (Exception e) {
+            log.log(Level.WARNING, "Error in window state change event source listener:", e);
             return "error";
         }
     }