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

Author: zinkko

maven-wrapper/pom.xml

@@ -24,7 +24,7 @@
         <repository>
             <id>netbeans</id>
             <name>NetBeans</name>
-            <url>http://bits.netbeans.org/maven2/</url>
+            <url>http://bits.netbeans.org/nexus/content/groups/netbeans/</url>
             <snapshots>
                 <enabled>false</enabled>
             </snapshots>
@@ -321,7 +321,6 @@
             <artifactId>javax-websocket-client-impl</artifactId>
             <version>9.2.5.v20141112</version>
         </dependency>
-
     </dependencies>
 
     <build>

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

@@ -1,35 +1,38 @@
 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.Course;
-import fi.helsinki.cs.tmc.data.CourseListUtils;
 import fi.helsinki.cs.tmc.model.CourseDb;
 import fi.helsinki.cs.tmc.model.LocalExerciseStatus;
 import fi.helsinki.cs.tmc.model.ObsoleteClientException;
 import fi.helsinki.cs.tmc.model.ServerAccess;
 import fi.helsinki.cs.tmc.model.NBTmcSettings;
+import fi.helsinki.cs.tmc.model.TmcCoreSingleton;
 import fi.helsinki.cs.tmc.ui.DownloadOrUpdateExercisesDialog;
 import fi.helsinki.cs.tmc.ui.ConvenientDialogDisplayer;
 import fi.helsinki.cs.tmc.ui.TmcNotificationDisplayer;
-import fi.helsinki.cs.tmc.utilities.BgTask;
-import fi.helsinki.cs.tmc.utilities.BgTaskListener;
 import fi.helsinki.cs.tmc.utilities.Inflector;
 import fi.helsinki.cs.tmc.utilities.TmcStringUtils;
+import hy.tmc.core.TmcCore;
+import hy.tmc.core.exceptions.TmcCoreException;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.util.ArrayList;
-import java.util.List;
 import javax.swing.AbstractAction;
 import javax.swing.Icon;
 import org.apache.commons.lang3.StringUtils;
 import org.openide.awt.ActionID;
 import org.openide.awt.ActionReference;
 import org.openide.awt.ActionReferences;
 import org.openide.awt.ActionRegistration;
+import org.openide.util.Exceptions;
 import org.openide.util.ImageUtilities;
 import org.openide.util.NbBundle.Messages;
 
 @ActionID(category = "TMC",
-id = "fi.helsinki.cs.tmc.actions.CheckForNewExercisesOrUpdates")
+        id = "fi.helsinki.cs.tmc.actions.CheckForNewExercisesOrUpdates")
 @ActionRegistration(displayName = "#CTL_CheckForNewExercisesOrUpdates")
 @ActionReferences({
     @ActionReference(path = "Menu/TM&C", position = -50)
@@ -38,94 +41,124 @@
 public class CheckForNewExercisesOrUpdates extends AbstractAction {
 
     public static void startTimer() {
-        int interval = 20*60*1000; // 20 minutes
+        int interval = 20 * 60 * 1000; // 20 minutes
         javax.swing.Timer timer = new javax.swing.Timer(interval, new CheckForNewExercisesOrUpdates(true, true));
         timer.setRepeats(true);
         timer.start();
     }
-    
+
     private static final TmcNotificationDisplayer.SingletonToken notifierToken = TmcNotificationDisplayer.createSingletonToken();
-    
+
     private CourseDb courseDb;
     private ServerAccess serverAccess;
     private TmcNotificationDisplayer notifier;
     private ConvenientDialogDisplayer dialogs;
     private boolean beQuiet;
     private boolean backgroundCheck;
+    private TmcCore tmcCore;
 
     public CheckForNewExercisesOrUpdates() {
         this(false, false);
     }
-    
+
     public CheckForNewExercisesOrUpdates(boolean beQuiet, boolean backgroundCheck) {
         this.courseDb = CourseDb.getInstance();
         this.serverAccess = new ServerAccess();
         this.notifier = TmcNotificationDisplayer.getDefault();
         this.dialogs = ConvenientDialogDisplayer.getDefault();
         this.beQuiet = beQuiet;
         this.backgroundCheck = backgroundCheck;
+        this.tmcCore = TmcCoreSingleton.getInstance();
     }
 
     @Override
     public void actionPerformed(ActionEvent e) {
         run();
     }
-    
+
+    //"Checking for new exercises" päivitä tämä näkymään progressHandleen myöhemmin
+    /**
+     *
+     */
     public void run() {
-        final Course currentCourseBeforeUpdate = courseDb.getCurrentCourse();
-        
+        try {
+            final Course currentCourseBeforeUpdate = courseDb.getCurrentCourse();
+            if (backgroundProcessingOrNoCurrentCourse(currentCourseBeforeUpdate)) {
+                return;
+            }
+            ListenableFuture<Course> currentCourseFuture = this.tmcCore.getCourse(
+                    NBTmcSettings.getDefault(), currentCourseBeforeUpdate.getDetailsUrl()
+            );
+            Futures.addCallback(currentCourseFuture, new UpdateCourseForExerciseUpdate());
+        } catch (TmcCoreException ex) {
+            Exceptions.printStackTrace(ex);
+        }
+    }
+
+    /**
+     * If there is something at background or no current course is chosen,
+     * return true.
+     */
+    private boolean backgroundProcessingOrNoCurrentCourse(final Course currentCourseBeforeUpdate) {
         if (backgroundCheck && !NBTmcSettings.getDefault().isCheckingForUpdatesInTheBackground()) {
-            return;
+            return true;
         }
-        
         if (currentCourseBeforeUpdate == null) {
             if (!beQuiet) {
                 dialogs.displayMessage("Please select a course in TMC -> Settings.");
             }
-            return;
+            return true;
+        }
+        return false;
+    }
+
+    class UpdateCourseForExerciseUpdate implements FutureCallback<Course> {
+
+        /**
+         * This should be attached to listenableFuture. When future is ready,
+         * receivedCourse will be saved to courseDb and view will be updated.
+         */
+        public UpdateCourseForExerciseUpdate() {
+        }
+
+        @Override
+        public void onSuccess(Course receivedCourse) {
+            if (receivedCourse != null) {
+                courseDb.putDetailedCourse(receivedCourse);
+                final LocalExerciseStatus status = LocalExerciseStatus.get(receivedCourse.getExercises());
+                updateGUI(status);
+            }
         }
-        
-        BgTask.start("Checking for new exercises", serverAccess.getFullCourseInfoTask(currentCourseBeforeUpdate), new BgTaskListener<Course>() {
-            @Override
-            public void bgTaskReady(Course receivedCourse) {
-                if (receivedCourse != null) {
-                    courseDb.putDetailedCourse(receivedCourse);
-
-                    final LocalExerciseStatus status = LocalExerciseStatus.get(receivedCourse.getExercises());
-                    if (status.thereIsSomethingToDownload(false)) {
-                        if (beQuiet) {
-                            displayNotification(status, new ActionListener() {
-                                @Override
-                                public void actionPerformed(ActionEvent e) {
-                                    DownloadOrUpdateExercisesDialog.display(status.unlockable, status.downloadableUncompleted, status.updateable);
-                                }
-                            });
-                        } else {
+
+        private void updateGUI(final LocalExerciseStatus status) {
+            if (status.thereIsSomethingToDownload(false)) {
+                if (beQuiet) {
+                    displayNotification(status, new ActionListener() {
+                        @Override
+                        public void actionPerformed(ActionEvent e) {
                             DownloadOrUpdateExercisesDialog.display(status.unlockable, status.downloadableUncompleted, status.updateable);
                         }
-                    } else if (!beQuiet) {
-                        dialogs.displayMessage("No new exercises or updates to download.");
-                    }
+                    });
+                } else {
+                    DownloadOrUpdateExercisesDialog.display(status.unlockable, status.downloadableUncompleted, status.updateable);
                 }
+            } else if (!beQuiet) {
+                dialogs.displayMessage("No new exercises or updates to download.");
             }
+        }
 
-            @Override
-            public void bgTaskCancelled() {
-            }
-
-            @Override
-            public void bgTaskFailed(Throwable ex) {
-                if (!beQuiet || ex instanceof ObsoleteClientException) {
-                    dialogs.displayError("Failed to check for new exercises.\n" + ServerErrorHelper.getServerExceptionMsg(ex));
-                }
+        @Override
+        public void onFailure(Throwable ex) {
+            if (!beQuiet || ex instanceof ObsoleteClientException) {
+                dialogs.displayError("Failed to check for new exercises.\n" + ServerErrorHelper.getServerExceptionMsg(ex));
             }
-        });
+        }
     }
 
     private void displayNotification(LocalExerciseStatus status, ActionListener action) {
         ArrayList<String> items = new ArrayList<String>();
         ArrayList<String> actions = new ArrayList<String>();
-        
+
         if (!status.unlockable.isEmpty()) {
             items.add(Inflector.pluralize(status.unlockable.size(), "an unlockable exercise"));
             actions.add("unlock");
@@ -138,18 +171,18 @@ private void displayNotification(LocalExerciseStatus status, ActionListener acti
             items.add(Inflector.pluralize(status.updateable.size(), "an update"));
             actions.add("update");
         }
-        
-        int total =
-                status.unlockable.size() +
-                status.downloadableUncompleted.size() +
-                status.updateable.size();
-        
+
+        int total
+                = status.unlockable.size()
+                + status.downloadableUncompleted.size()
+                + status.updateable.size();
+
         String msg = TmcStringUtils.joinCommaAnd(items);
         msg += " " + Inflector.pluralize(total, "is") + " available.";
         msg = StringUtils.capitalize(msg);
-        
+
         String prompt = "Click here to " + TmcStringUtils.joinCommaAnd(actions) + ".";
-        
+
         notifier.notify(notifierToken, msg, getNotificationIcon(), prompt, action);
     }
 

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

@@ -37,26 +37,34 @@ public final class RefreshCoursesAction {
     public RefreshCoursesAction() {
         this(NBTmcSettings.getDefault());
     }
-
+    
+    /**
+     * Default constructor.
+     */
     public RefreshCoursesAction(NBTmcSettings settings) {
+        this(settings, TmcCoreSingleton.getInstance());
+    }
+    
+    /**
+     * Dependency inject TmcCore for tests.
+     */
+    public RefreshCoursesAction(NBTmcSettings settings, TmcCore core) {
         this.tmcSettings = settings;
         this.serverAccess = new ServerAccess(settings);
         this.serverAccess.setSettings(settings);
         this.courseDb = CourseDb.getInstance();
         this.dialogs = ConvenientDialogDisplayer.getDefault();
-
-        //this.listeners = new BgTaskListenerList<List<Course>>();
         this.callbacks = new FutureCallbackList<List<Course>>();
-        this.tmcCore = TmcCoreSingleton.getInstance();
+        this.tmcCore = core;
     }
 
     public RefreshCoursesAction addDefaultListener(boolean showDialogOnError, boolean updateCourseDb) {
         this.callbacks.addListener(new DefaultListener(showDialogOnError, updateCourseDb));
         return this;
     }
 
-    public RefreshCoursesAction addListener(FutureCallback<List<Course>> callbacks) {
-        this.callbacks.addListener(callbacks);
+    public RefreshCoursesAction addListener(FutureCallback<List<Course>> callback) {
+        this.callbacks.addListener(callback);
         return this;
     }
 

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

@@ -89,7 +89,6 @@ public void save() {
         }
         settings.saveAll();
         eventBus.post(new SavedEvent());
-        
     }
 
     @Override