Cleanup and minor fixes

Author: jamo

maven-wrapper/pom.xml

@@ -46,13 +46,18 @@
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>core</artifactId>
-            <version>0.6.0-SNAPSHOT</version>
+            <version>0.7.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>tmc-langs-abstraction</artifactId>
             <version>1.0.0</version>
         </dependency>
+        <dependency>
+            <groupId>fi.helsinki.cs.tmc</groupId>
+            <artifactId>tmc-checkstyle-runner</artifactId>
+            <version>3.0.1</version>
+        </dependency>
         <dependency>
             <artifactId>sisu-guava</artifactId>
             <groupId>org.sonatype.sisu</groupId>
@@ -151,6 +156,7 @@
                         <publicPackage>fi.helsinki.cs.tmc.stylerunner.*</publicPackage>
                         <publicPackage>fi.helsinki.cs.tmc.testrunner.*</publicPackage>
                         <publicPackage>fi.helsinki.cs.tmc.testscanner.*</publicPackage>
+                        <publicPackage>com.puppycrawl.*</publicPackage>
                         <publicPackage>name.fraser.neil.plaintext.*</publicPackage>
                         <publicPackage>org.cometd.*</publicPackage>
                         <publicPackage>org.eclipse.jetty.*</publicPackage>

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

@@ -13,6 +13,7 @@
 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.TmcSwingUtilities;
 
 import com.google.common.collect.Lists;
 import java.lang.reflect.InvocationTargetException;
@@ -63,7 +64,7 @@ private void startDownloading(final Exercise exercise, final BgTaskListener<TmcP
         BgTask.start("Downloading " + exercise.getName(), downloadExercisesTask, new BgTaskListener<List<Exercise>>() {
             @Override
             public void bgTaskReady(List<Exercise> result) {
-//                try {
+                try {
                     logger.warning("res: " + result);
                     // There is only one exercise given as parameter.
                     TmcProjectInfo proj = projectMediator.tryGetProjectForExercise(result.get(0));
@@ -73,19 +74,18 @@ public void bgTaskReady(List<Exercise> result) {
                     }
 
                     // Need to invoke courseDb in swing thread to avoid races
-//                    SwingUtilities.invokeAndWait(new Runnable() {
-//                        @Override
-//                        public void run() {
+                    // java.lang.Error: Cannot call invokeAndWait from the event dispatcher thread
+                    TmcSwingUtilities.ensureEdt(new Runnable() {
+                        @Override
+                        public void run() {
                             courseDb.exerciseDownloaded(exercise);
-//                        }
-//                    });
+                        }
+                    });
                     listener.bgTaskReady(proj);
 
-//                } catch (InterruptedException ex) {
-//                    Exceptions.printStackTrace(ex);
-//                } catch (InvocationTargetException ex) {
-//                    Exceptions.printStackTrace(ex);
-//                }
+                } catch (RuntimeException ex) {
+                    Exceptions.printStackTrace(ex);
+                }
             }
 
             @Override

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

@@ -3,9 +3,7 @@
 import fi.helsinki.cs.tmc.core.TmcCore;
 import fi.helsinki.cs.tmc.core.domain.Course;
 import fi.helsinki.cs.tmc.core.domain.ProgressObserver;
-import fi.helsinki.cs.tmc.core.holders.TmcSettingsHolder;
 import fi.helsinki.cs.tmc.core.utilities.ServerErrorHelper;
-import fi.helsinki.cs.tmc.coreimpl.TmcCoreSettingsImpl;
 
 import fi.helsinki.cs.tmc.data.CourseListUtils;
 import fi.helsinki.cs.tmc.model.CourseDb;
@@ -57,15 +55,13 @@ public void run() {
 
             @Override
             public void bgTaskReady(final List<Course> courses) {
-                log.warning("Got refreshed list of courses");
                 Course currentCourseStub = CourseListUtils.getCourseByName(courses, courseDb.getCurrentCourseName());
                 if (currentCourseStub != null) {
                     Callable<Course> currentCourseTask = TmcCore.get().getCourseDetails(ProgressObserver.NULL_OBSERVER, currentCourseStub);
 
                     BgTask.start("Loading course", currentCourseTask, new BgTaskListener<Course>() {
                         @Override
                         public void bgTaskReady(Course currentCourse) {
-                            log.warning("GotCurrentCourse");
                             currentCourse.setExercisesLoaded(true);
 
                             ArrayList<Course> finalCourses = new ArrayList<Course>();
@@ -103,8 +99,7 @@ public void bgTaskCancelled() {
 
             @Override
             public void bgTaskFailed(Throwable ex) {
-                log.warning("Failed to download courseList");
-                log.log(Level.INFO, "Failed to download course list.", ex);
+                log.log(Level.WARNING, "Failed to download course list.", ex);
                 listeners.bgTaskFailed(ex);
             }
         });

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

@@ -3,7 +3,6 @@
 import fi.helsinki.cs.tmc.core.communication.TmcServerCommunicationTaskFactory;
 import fi.helsinki.cs.tmc.core.communication.TmcServerCommunicationTaskFactory.SubmissionResponse;
 import fi.helsinki.cs.tmc.core.domain.Exercise;
-import fi.helsinki.cs.tmc.core.events.TmcEvent;
 import fi.helsinki.cs.tmc.core.holders.TmcSettingsHolder;
 import fi.helsinki.cs.tmc.coreimpl.TmcCoreSettingsImpl;
 
@@ -112,6 +111,7 @@ private void requestCodeReviewFor(final TmcProjectInfo projectInfo, final Exerci
 
         final String errorMsgLocale = settings.getErrorMsgLocale().toString();
 
+        // TODO: use core
         BgTask.start("Zipping up " + exercise.getName(), new Callable<byte[]>() {
             @Override
             public byte[] call() throws Exception {

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

@@ -16,7 +16,6 @@
 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.CancellableCallable;
 
 import java.awt.Image;
 import java.awt.event.ActionEvent;
@@ -120,6 +119,7 @@ public void actionPerformed(ActionEvent e) {
     }
 
     private void markAsRead(Review review) {
+        // TODO: use core
         Callable<Void> task = new TmcServerCommunicationTaskFactory().getMarkingReviewAsReadTask(review, true);
         BgTask.start("Marking review as read", task, new BgTaskListener<Void>() {
             @Override

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

@@ -8,17 +8,13 @@
 import fi.helsinki.cs.tmc.langs.domain.RunResult;
 import fi.helsinki.cs.tmc.model.CourseDb;
 import fi.helsinki.cs.tmc.model.ProjectMediator;
-import fi.helsinki.cs.tmc.model.TmcProjectInfo;
-import fi.helsinki.cs.tmc.utilities.AggregatingBgTaskListener;
 import fi.helsinki.cs.tmc.utilities.BgTask;
 import fi.helsinki.cs.tmc.utilities.BgTaskListener;
 
-import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import org.netbeans.api.project.Project;
 import org.openide.nodes.Node;
-import org.openide.util.Exceptions;
 import org.openide.util.NbBundle.Messages;
 import org.openide.windows.WindowManager;
 
@@ -81,14 +77,17 @@ public void run() {
         final ResultCollector resultCollector = new ResultCollector(exercise);
 
         if (exercise != null) {
+            
             BgTask.start("Running tests for " + exercise.getName(), TmcCore.get().runTests(ProgressObserver.NULL_OBSERVER, exercise), new BgTaskListener<RunResult>() {
                 @Override
                 public void bgTaskReady(RunResult result) {
+                    log.log(Level.INFO, "Got test results: {0}", result);
                     resultCollector.setLocalTestResults(result);
                 }
 
                 @Override
                 public void bgTaskCancelled() {
+                    log.log(Level.INFO, "Run tests cancelled");
                     // NOP
                 }
 
@@ -102,12 +101,13 @@ public void bgTaskFailed(Throwable ex) {
         BgTask.start("Running code style validations", TmcCore.get().runCheckStyle(ProgressObserver.NULL_OBSERVER, exercise), new BgTaskListener<ValidationResult>() {
             @Override
             public void bgTaskReady(ValidationResult result) {
+                log.log(Level.INFO, "Got code style results: {0}", result);
                 resultCollector.setValidationResult(result);
             }
 
             @Override
             public void bgTaskCancelled() {
-                // NOP
+                log.log(Level.INFO, "Run code style cancelled");
             }
 
             @Override