Merge branch 'core_integration' into submit-new

Author: samutamm

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

@@ -8,18 +8,17 @@
 import fi.helsinki.cs.tmc.model.CourseDb;
 import fi.helsinki.cs.tmc.model.NBTmcSettings;
 import fi.helsinki.cs.tmc.model.ReviewDb;
-import fi.helsinki.cs.tmc.model.ServerAccess;
 import fi.helsinki.cs.tmc.model.TmcCoreSingleton;
 import fi.helsinki.cs.tmc.ui.ConvenientDialogDisplayer;
-import fi.helsinki.cs.tmc.utilities.BgTask;
-import fi.helsinki.cs.tmc.utilities.BgTaskListener;
 import hy.tmc.core.exceptions.TmcCoreException;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import javax.swing.SwingUtilities;
+import org.netbeans.api.progress.ProgressHandle;
+import org.netbeans.api.progress.ProgressHandleFactory;
 import org.openide.awt.ActionID;
 import org.openide.awt.ActionReference;
 import org.openide.awt.ActionReferences;
@@ -53,7 +52,6 @@ public static void startTimer() {
         }
     }
 
-    private ServerAccess serverAccess;
     private CourseDb courseDb;
     private ReviewDb reviewDb;
     private ConvenientDialogDisplayer dialogs;
@@ -66,7 +64,6 @@ public static void startTimer() {
     }
 
     CheckForNewReviews(boolean beQuiet, boolean resetNotifications, boolean notifyAboutNoNewReviews) {
-        this.serverAccess = new ServerAccess();
         this.courseDb = CourseDb.getInstance();
         this.reviewDb = ReviewDb.getInstance();
         this.dialogs = ConvenientDialogDisplayer.getDefault();
@@ -101,22 +98,30 @@ public void run() {
     }
 
     private void getReviews(Course course){
+        final ProgressHandle progress = ProgressHandleFactory.createHandle("Checking for code reviews");
+        progress.start();
         try {
-            ListenableFuture<List<Review>> reviews = TmcCoreSingleton.getInstance().getNewReviews(course, NBTmcSettings.getDefault());
+            ListenableFuture<List<Review>> reviews = TmcCoreSingleton.getInstance().getNewReviews(
+                    course, NBTmcSettings.getDefault()
+            );
             Futures.addCallback(reviews, new FutureCallback<List<Review>>() {
 
                 @Override
                 public void onSuccess(List<Review> v) {
                     success(v);
+                    progress.finish();
+                    
                 }
 
                 @Override
                 public void onFailure(Throwable thrwbl) {
                     fail(thrwbl);
+                    progress.finish();
                 }
 
             });
         } catch (TmcCoreException ex) {
+            progress.finish();
             Exceptions.printStackTrace(ex);
         }
     }

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

@@ -6,25 +6,17 @@
 import hy.tmc.core.domain.Exercise;
 import fi.helsinki.cs.tmc.model.CourseDb;
 import fi.helsinki.cs.tmc.model.ProjectMediator;
-import fi.helsinki.cs.tmc.model.ServerAccess;
 import fi.helsinki.cs.tmc.model.TmcProjectInfo;
 import fi.helsinki.cs.tmc.model.NBTmcSettings;
 import fi.helsinki.cs.tmc.model.TmcCoreSingleton;
 import fi.helsinki.cs.tmc.ui.ConvenientDialogDisplayer;
 import fi.helsinki.cs.tmc.ui.PastebinDialog;
 import fi.helsinki.cs.tmc.ui.PastebinResponseDialog;
-import fi.helsinki.cs.tmc.utilities.BgTask;
-import fi.helsinki.cs.tmc.utilities.BgTaskListener;
-import fi.helsinki.cs.tmc.utilities.CancellableCallable;
-import fi.helsinki.cs.tmc.utilities.zip.RecursiveZipper;
 import hy.tmc.core.exceptions.TmcCoreException;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.net.URI;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
-import java.util.concurrent.Callable;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import org.netbeans.api.project.Project;

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

@@ -78,17 +78,25 @@ public RefreshCoursesAction addListener(FutureCallback<List<Course>> callback) {
      */
     public void run() {
         try {
-            ProgressHandle courseRefresh = ProgressHandleFactory.createSystemHandle(
+            if (settingsAreSet()) {
+                ProgressHandle courseRefresh = ProgressHandleFactory.createSystemHandle(
                     "Refreshing course list");
-            courseRefresh.start();
-            ListenableFuture<List<Course>> listCourses = this.tmcCore.listCourses(tmcSettings);
-            Futures.addCallback(listCourses, new LoadCourses(courseRefresh));
+                courseRefresh.start();
+                ListenableFuture<List<Course>> listCourses = this.tmcCore.listCourses(tmcSettings);
+                Futures.addCallback(listCourses, new LoadCourses(courseRefresh));
+            }
         } catch (TmcCoreException ex) {
             Exceptions.printStackTrace(ex);
             callbacks.onFailure(ex);
         }
     }
 
+    private boolean settingsAreSet() {
+        return tmcSettings.userDataExists()
+                && tmcSettings.getServerAddress() != null
+                && !tmcSettings.getServerAddress().trim().isEmpty();
+    }
+
     class LoadCourses implements FutureCallback<List<Course>> {
 
         private ProgressHandle lastAction;

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

@@ -3,6 +3,7 @@
 import com.google.common.util.concurrent.FutureCallback;
 import hy.tmc.core.domain.Course;
 import fi.helsinki.cs.tmc.model.CourseDb;
+import fi.helsinki.cs.tmc.model.NBTmcSettings;
 import fi.helsinki.cs.tmc.model.PushEventListener;
 import fi.helsinki.cs.tmc.model.ServerAccess;
 import fi.helsinki.cs.tmc.spyware.SpywareFacade;
@@ -62,7 +63,12 @@ public void run() {
                 } else if (new ServerAccess().needsOnlyPassword() && CourseDb.getInstance().getCurrentCourse() != null) {
                     LoginDialog.display(new CheckForNewExercisesOrUpdates(false, false));
                 } else {
-                    // Do full refresh.
+                    refreshCourses();
+                }
+            }
+
+            private void refreshCourses() {
+                // Do full refresh.
                     new RefreshCoursesAction().addDefaultListener(false, true).addListener(new FutureCallback<List<Course>>() {
                         @Override
                         public void onSuccess(List<Course> result) {
@@ -76,7 +82,6 @@ public void onSuccess(List<Course> result) {
                         public void onFailure(Throwable thrwbl) {
                         }
                     }).run();
-                }
             }
         });
     }

tmc-plugin/src/fi/helsinki/cs/tmc/runners/TestRunHandler.java

@@ -1,6 +1,7 @@
 package fi.helsinki.cs.tmc.runners;
 
-import com.google.common.base.Optional;
+import static fi.helsinki.cs.tmc.langs.RunResult.Status.COMPILE_FAILED;
+
 import com.google.common.base.Throwables;
 import com.google.common.collect.ImmutableList;
 import com.google.common.util.concurrent.FutureCallback;
@@ -9,28 +10,20 @@
 import hy.tmc.core.domain.Exercise;
 import fi.helsinki.cs.tmc.data.ResultCollector;
 import fi.helsinki.cs.tmc.data.TestCaseResult;
-import fi.helsinki.cs.tmc.data.TestRunResult;
 import fi.helsinki.cs.tmc.events.TmcEvent;
 import fi.helsinki.cs.tmc.events.TmcEventBus;
 import fi.helsinki.cs.tmc.exerciseSubmitter.ExerciseSubmitter;
 import fi.helsinki.cs.tmc.langs.RunResult;
-import static fi.helsinki.cs.tmc.langs.RunResult.Status.COMPILE_FAILED;
 import fi.helsinki.cs.tmc.langs.TestResult;
 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.TmcCoreSingleton;
 import fi.helsinki.cs.tmc.model.TmcProjectInfo;
-import static fi.helsinki.cs.tmc.model.TmcProjectType.JAVA_MAVEN;
-import static fi.helsinki.cs.tmc.model.TmcProjectType.JAVA_SIMPLE;
-import static fi.helsinki.cs.tmc.model.TmcProjectType.MAKEFILE;
 import fi.helsinki.cs.tmc.ui.ConvenientDialogDisplayer;
 import fi.helsinki.cs.tmc.ui.TestResultDisplayer;
-import fi.helsinki.cs.tmc.utilities.BgTask;
-import fi.helsinki.cs.tmc.utilities.BgTaskListener;
 import hy.tmc.core.exceptions.TmcCoreException;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 import static java.util.logging.Level.INFO;
 import java.util.logging.Logger;
@@ -82,14 +75,14 @@ public void performAction(final ResultCollector resultCollector, Project... proj
                 Futures.addCallback(result, new FutureCallback<RunResult>() {
                     @Override
                     public void onSuccess(final RunResult result) {
-                        runningTestsLocally.finish();
                         explainResults(result, projectInfo, resultCollector);
+                        runningTestsLocally.finish();
                     }
 
                     @Override
                     public void onFailure(final Throwable ex) {
-                        runningTestsLocally.finish();
                         explainFailure(ex);
+                        runningTestsLocally.finish();
                     }
 
                 });
@@ -113,7 +106,6 @@ public void run() {
 
     private void explainResults(final RunResult result, final TmcProjectInfo projectInfo, final ResultCollector resultCollector) {
         SwingUtilities.invokeLater(new Runnable() {
-
             @Override
             public void run() {
                 if (result.status == COMPILE_FAILED) {

tmc-plugin/src/fi/helsinki/cs/tmc/spyware/EventSendBuffer.java

@@ -245,9 +245,6 @@ private String pickDestinationUrl() {
 
         /**
          * Converts events to data[] and sends it to defined url.
-         * 
-         * @param eventsToSend
-         * @param url 
          */
         private void doSend(final ArrayList<LoggableEvent> eventsToSend, final String url) {       
             NBTmcSettings settings = NBTmcSettings.getDefault();

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

@@ -52,6 +52,10 @@ public RefreshSettings(String username, String password, String baseUrl) {
         public boolean isAllSet() {
             return username != null && password != null && baseUrl != null;
         }
+        
+        public boolean noneIsEmpty() {
+            return !username.trim().isEmpty() && !password.trim().isEmpty() && !baseUrl.trim().isEmpty();
+        }
 
         @Override
         public boolean equals(Object obj) {
@@ -409,7 +413,7 @@ private String joinWithCommasAndAnd(List<String> strings) {
     }
 
     private boolean canProbablyRefreshCourseList() {
-        return getRefreshSettings().isAllSet();
+        return getRefreshSettings().isAllSet() && getRefreshSettings().noneIsEmpty();
     }
 
     private boolean alreadyRefreshingCourseList() {
@@ -702,10 +706,11 @@ private void folderChooserBtnActionPerformed(java.awt.event.ActionEvent evt) {//
 
     private void refreshCoursesBtnActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_refreshCoursesBtnActionPerformed
         NBTmcSettings settings = getTransientSettingsForRefresh();
-        if (settings.getServerAddress() == null || settings.getServerAddress().trim().isEmpty()) {
+        if (!canProbablyRefreshCourseList()) {
             dialogs.displayError("Please set the server address first");
+        } else {
+            startRefreshingCourseList(false, false);
         }
-        startRefreshingCourseList(false, false);
     }//GEN-LAST:event_refreshCoursesBtnActionPerformed
 
     private void serverAddressTextFieldActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_serverAddressTextFieldActionPerformed