Check for updates and others to core

jamo · jamo · commit 116a3f19c5a4 · 2016-06-13T11:54:18.000+03:00
diff --git a/tmc-plugin/src/fi/helsinki/cs/tmc/actions/CheckForNewExercisesOrUpdates.java b/tmc-plugin/src/fi/helsinki/cs/tmc/actions/CheckForNewExercisesOrUpdates.java
@@ -1,6 +1,8 @@
 package fi.helsinki.cs.tmc.actions;
 
+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.coreimpl.TmcCoreSettingsImpl;
 import fi.helsinki.cs.tmc.data.CourseListUtils;
@@ -21,7 +23,7 @@
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.util.ArrayList;
-import java.util.List;
+import java.util.concurrent.Callable;
 import javax.swing.AbstractAction;
 import javax.swing.Icon;
 import org.apache.commons.lang3.StringUtils;
@@ -92,7 +94,8 @@ public void run() {
         }
         eventBus.post(new InvokedEvent(currentCourseBeforeUpdate));
 
-        BgTask.start("Checking for new exercises", serverAccess.getFullCourseInfoTask(currentCourseBeforeUpdate), new BgTaskListener<Course>() {
+        Callable<Course> getFullCourseInfoTask = TmcCore.get().getCourseDetails(ProgressObserver.NULL_OBSERVER, courseDb.getCurrentCourse());
+        BgTask.start("Checking for new exercises", getFullCourseInfoTask, new BgTaskListener<Course>() {
             @Override
             public void bgTaskReady(Course receivedCourse) {
                 if (receivedCourse != null) {
diff --git a/tmc-plugin/src/fi/helsinki/cs/tmc/actions/CheckForNewReviews.java b/tmc-plugin/src/fi/helsinki/cs/tmc/actions/CheckForNewReviews.java
@@ -1,7 +1,7 @@
 package fi.helsinki.cs.tmc.actions;
 
 import fi.helsinki.cs.tmc.core.domain.Course;
-import fi.helsinki.cs.tmc.data.Review;
+import fi.helsinki.cs.tmc.core.domain.Review;
 import fi.helsinki.cs.tmc.model.CourseDb;
 import fi.helsinki.cs.tmc.model.ReviewDb;
 import fi.helsinki.cs.tmc.model.ServerAccess;
diff --git a/tmc-plugin/src/fi/helsinki/cs/tmc/actions/DownloadCompletedExercises.java b/tmc-plugin/src/fi/helsinki/cs/tmc/actions/DownloadCompletedExercises.java
@@ -27,13 +27,11 @@
 @Messages("CTL_DownloadCompletedExercises=Download old completed exercises")
 public final class DownloadCompletedExercises implements ActionListener {
 
-    private ServerAccess serverAccess;
     private CourseDb courseDb;
     private ConvenientDialogDisplayer dialogs;
     private TmcEventBus eventBus;
 
     public DownloadCompletedExercises() {
-        this.serverAccess = new ServerAccess();
         this.courseDb = CourseDb.getInstance();
         this.dialogs = ConvenientDialogDisplayer.getDefault();
         this.eventBus = TmcEventBus.getDefault();
diff --git a/tmc-plugin/src/fi/helsinki/cs/tmc/actions/DownloadExercisesAction.java b/tmc-plugin/src/fi/helsinki/cs/tmc/actions/DownloadExercisesAction.java
@@ -1,24 +1,27 @@
 package fi.helsinki.cs.tmc.actions;
 
+import fi.helsinki.cs.tmc.core.TmcCore;
 import fi.helsinki.cs.tmc.core.domain.Exercise;
+import fi.helsinki.cs.tmc.core.domain.ProgressObserver;
 import fi.helsinki.cs.tmc.events.TmcEvent;
 import fi.helsinki.cs.tmc.events.TmcEventBus;
 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.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 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;
 
 /**
  * Downloads and opens the given exercises in the background.
@@ -27,7 +30,6 @@ public class DownloadExercisesAction {
 
     private static final Logger logger = Logger.getLogger(DownloadExercisesAction.class.getName());
 
-    private ServerAccess serverAccess;
     private CourseDb courseDb;
     private ProjectMediator projectMediator;
     private ConvenientDialogDisplayer dialogs;
@@ -36,7 +38,6 @@ public class DownloadExercisesAction {
     private List<Exercise> exercisesToDownload;
 
     public DownloadExercisesAction(List<Exercise> exercisesToOpen) {
-        this.serverAccess = new ServerAccess();
         this.courseDb = CourseDb.getInstance();
         this.projectMediator = ProjectMediator.getInstance();
         this.dialogs = ConvenientDialogDisplayer.getDefault();
@@ -56,31 +57,34 @@ public void run() {
     }
 
     private void startDownloading(final Exercise exercise, final BgTaskListener<TmcProjectInfo> listener) {
-        BgTask.start("Downloading " + exercise.getName(), serverAccess.getDownloadingExerciseZipTask(exercise), new BgTaskListener<byte[]>() {
-            @Override
-            public void bgTaskReady(final byte[] zipData) {
-                BgTask.start("Extracting project", new Callable<TmcProjectInfo>() {
-                    @Override
-                    public TmcProjectInfo call() throws Exception {
-                        NbProjectUnzipper unzipper = new NbProjectUnzipper();
-                        unzipper.unzipProject(zipData, projectMediator.getProjectDirForExercise(exercise));
-                        TmcProjectInfo proj = projectMediator.tryGetProjectForExercise(exercise);
-
-                        if (proj == null) {
-                            throw new RuntimeException("Failed to open project for exercise " + exercise.getName());
-                        }
-
-                        // Need to invoke courseDb in swing thread to avoid races
-                        SwingUtilities.invokeAndWait(new Runnable() {
-                            @Override
-                            public void run() {
-                                courseDb.exerciseDownloaded(exercise);
-                            }
-                        });
+        Callable<List<Exercise>> downloadExercisesTask = TmcCore.get().downloadOrUpdateExercises(ProgressObserver.NULL_OBSERVER, Lists.newArrayList(exercise));
 
-                        return proj;
+        BgTask.start("Downloading " + exercise.getName(), downloadExercisesTask, new BgTaskListener<List<Exercise>>() {
+            @Override
+            public void bgTaskReady(List<Exercise> result) {
+                try {
+                    
+                    // There is only one exercise given as parameter.
+                    TmcProjectInfo proj = projectMediator.tryGetProjectForExercise(result.get(0));
+
+                    if (proj == null) {
+                        throw new RuntimeException("Failed to open project for exercise " + exercise.getName());
                     }
-                }, listener);
+
+                    // Need to invoke courseDb in swing thread to avoid races
+                    SwingUtilities.invokeAndWait(new Runnable() {
+                        @Override
+                        public void run() {
+                            courseDb.exerciseDownloaded(exercise);
+                        }
+                    });
+                    listener.bgTaskReady(proj);
+
+                } catch (InterruptedException ex) {
+                    Exceptions.printStackTrace(ex);
+                } catch (InvocationTargetException ex) {
+                    Exceptions.printStackTrace(ex);
+                }
             }
 
             @Override
diff --git a/tmc-plugin/src/fi/helsinki/cs/tmc/actions/ReviewEventListener.java b/tmc-plugin/src/fi/helsinki/cs/tmc/actions/ReviewEventListener.java
@@ -1,7 +1,8 @@
 package fi.helsinki.cs.tmc.actions;
 
 import com.google.gson.Gson;
-import fi.helsinki.cs.tmc.data.Review;
+
+import fi.helsinki.cs.tmc.core.domain.Review;
 import fi.helsinki.cs.tmc.events.TmcEventBus;
 import fi.helsinki.cs.tmc.events.TmcEventListener;
 import fi.helsinki.cs.tmc.model.CourseDb;
@@ -14,6 +15,7 @@
 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;
 import java.awt.event.ActionListener;
@@ -154,7 +156,7 @@ private static class ReviewOpened {
 
         public ReviewOpened(Review review) {
             this.id = review.getId();
-            this.url = review.getUrl();
+            this.url = review.getUrl().toString();
             this.submissionId = review.getSubmissionId();
             this.markedAsRead = review.isMarkedAsRead();
         }
diff --git a/tmc-plugin/src/fi/helsinki/cs/tmc/data/CourseListUtils.java b/tmc-plugin/src/fi/helsinki/cs/tmc/data/CourseListUtils.java
@@ -4,10 +4,12 @@
 
 import java.util.List;
 
+@Deprecated
 public class CourseListUtils {
     /**
      * Returns the course with the given name or null if not found.
      */
+    @Deprecated
     public static Course getCourseByName(List<Course> courses, String courseName) {
         for (Course course : courses) {
             if (course.getName().equals(courseName)) {
@@ -18,6 +20,7 @@ public static Course getCourseByName(List<Course> courses, String courseName) {
         return null;
     }
     
+    @Deprecated
     public static boolean hasCourseByName(List<Course> courses, String courseName) {
         return getCourseByName(courses, courseName) != null;
     }
diff --git a/tmc-plugin/src/fi/helsinki/cs/tmc/data/ExerciseListUtils.java b/tmc-plugin/src/fi/helsinki/cs/tmc/data/ExerciseListUtils.java
@@ -4,10 +4,12 @@
 
 import java.util.List;
 
+@Deprecated
 public class ExerciseListUtils {
     /**
      * Returns the exercise with the given name or null if not found.
      */
+    @Deprecated
     public static Exercise getExerciseByName(List<Exercise> exercises, String exerciseName) {
         if (exerciseName == null) {
             return null;
@@ -22,6 +24,7 @@ public static Exercise getExerciseByName(List<Exercise> exercises, String exerci
         return null;
     }
 
+    @Deprecated
     public static void setCourseNameForEach(List<Exercise> exercises, String courseName) {
         for (Exercise ex : exercises) {
             ex.setCourseName(courseName);
diff --git a/tmc-plugin/src/fi/helsinki/cs/tmc/data/serialization/ReviewListParser.java b/tmc-plugin/src/fi/helsinki/cs/tmc/data/serialization/ReviewListParser.java
@@ -1,8 +1,9 @@
 package fi.helsinki.cs.tmc.data.serialization;
 
+import fi.helsinki.cs.tmc.core.domain.Review;
+
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
-import fi.helsinki.cs.tmc.data.Review;
 import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
diff --git a/tmc-plugin/src/fi/helsinki/cs/tmc/model/ReviewDb.java b/tmc-plugin/src/fi/helsinki/cs/tmc/model/ReviewDb.java
@@ -1,12 +1,12 @@
 package fi.helsinki.cs.tmc.model;
 
-import fi.helsinki.cs.tmc.data.Review;
+import fi.helsinki.cs.tmc.core.domain.Review;
 import fi.helsinki.cs.tmc.events.TmcEvent;
 import fi.helsinki.cs.tmc.events.TmcEventBus;
+
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
-import java.util.Set;
 import java.util.logging.Logger;
 
 /**
diff --git a/tmc-plugin/src/fi/helsinki/cs/tmc/model/ServerAccess.java b/tmc-plugin/src/fi/helsinki/cs/tmc/model/ServerAccess.java
@@ -12,7 +12,7 @@
 import com.google.gson.reflect.TypeToken;
 
 import fi.helsinki.cs.tmc.core.domain.submission.FeedbackAnswer;
-import fi.helsinki.cs.tmc.data.Review;
+import fi.helsinki.cs.tmc.core.domain.Review;
 import fi.helsinki.cs.tmc.data.serialization.CourseInfoParser;
 import fi.helsinki.cs.tmc.data.serialization.CourseListParser;
 import fi.helsinki.cs.tmc.data.serialization.ReviewListParser;
diff --git a/tmc-plugin/src/fi/helsinki/cs/tmc/ui/CodeReviewDialog.form b/tmc-plugin/src/fi/helsinki/cs/tmc/ui/CodeReviewDialog.form
@@ -7,6 +7,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"/>
diff --git a/tmc-plugin/src/fi/helsinki/cs/tmc/ui/CodeReviewDialog.java b/tmc-plugin/src/fi/helsinki/cs/tmc/ui/CodeReviewDialog.java
@@ -1,6 +1,7 @@
 package fi.helsinki.cs.tmc.ui;
 
-import fi.helsinki.cs.tmc.data.Review;
+import fi.helsinki.cs.tmc.core.domain.Review;
+
 import java.awt.Dimension;
 import java.awt.Toolkit;
 import java.awt.event.ActionListener;
@@ -59,7 +60,7 @@ private String getPointsAwardedText(Review review) {
     
     private void openInBrowser() {
         try {
-            HtmlBrowser.URLDisplayer.getDefault().showURLExternal(new URL(review.getUrl()));
+            HtmlBrowser.URLDisplayer.getDefault().showURLExternal(review.getUrl().toURL());
         } catch (MalformedURLException ex) {
             log.log(Level.WARNING, "Malformed URL: " + ex.getMessage(), ex);
         }
