Merge pull request #21 from rage/reviews

Code review & imports changed to TmcCore Review

Author: UMTti

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

@@ -1,13 +1,19 @@
 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.Review;
+import hy.tmc.core.domain.Review;
 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;
@@ -18,24 +24,26 @@
 import org.openide.awt.ActionReference;
 import org.openide.awt.ActionReferences;
 import org.openide.awt.ActionRegistration;
+import org.openide.util.Exceptions;
 import org.openide.util.NbBundle;
 
 @ActionID(category = "TMC",
-id = "fi.helsinki.cs.tmc.actions.CheckForNewReviews")
+        id = "fi.helsinki.cs.tmc.actions.CheckForNewReviews")
 @ActionRegistration(displayName = "#CTL_CheckForNewReviews")
 @ActionReferences({
     @ActionReference(path = "Menu/TM&C", position = -40)
 })
 @NbBundle.Messages("CTL_CheckForNewReviews=Check for new code &reviews")
 public class CheckForNewReviews implements ActionListener, Runnable {
+
     private static final Logger log = Logger.getLogger(CheckForNewReviews.class.getName());
-    
+
     private static CheckForNewReviews instance;
-    
+
     public static void startTimer() {
         if (instance == null) {
             instance = new CheckForNewReviews(true, false, false);
-            int interval = 20*60*1000; // 20 minutes
+            int interval = 20 * 60 * 1000; // 20 minutes
             javax.swing.Timer timer = new javax.swing.Timer(interval, instance);
             timer.setRepeats(true);
             timer.start();
@@ -44,15 +52,15 @@ public static void startTimer() {
             log.warning("CheckForNewReviews.startTimer() called twice");
         }
     }
-    
+
     private ServerAccess serverAccess;
     private CourseDb courseDb;
     private ReviewDb reviewDb;
     private ConvenientDialogDisplayer dialogs;
     private boolean beQuiet;
     private boolean resetNotifications;
     private boolean notifyAboutNoNewReviews;
-    
+
     CheckForNewReviews() {
         this(false, true, true);
     }
@@ -71,13 +79,13 @@ public static void startTimer() {
     public void actionPerformed(ActionEvent e) {
         run();
     }
-    
+
     @Override
     public void run() {
         if (resetNotifications) {
             reviewDb.forgetReviewsNotifiedAbout();
         }
-        
+
         Course course = courseDb.getCurrentCourse();
         if (course == null) {
             if (!beQuiet) {
@@ -88,28 +96,43 @@ public void run() {
         if (course.getReviewsUrl() == null) {
             return;
         }
-        
-        BgTask.start("Checking for code reviews", serverAccess.getDownloadingReviewListTask(course), new BgTaskListener<List<Review>>() {
-            @Override
-            public void bgTaskReady(List<Review> result) {
-                boolean newReviews = reviewDb.setReviews(result);
-                if (!newReviews && notifyAboutNoNewReviews) {
-                    dialogs.displayMessage("You have no unread code reviews.");
+        getReviews(course);
+
+    }
+    
+    private void getReviews(Course course){
+        try {
+            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);
                 }
-            }
 
-            @Override
-            public void bgTaskFailed(final Throwable ex) {
-                final String msg = "Failed to check for code reviews";
-                log.log(Level.INFO, msg, ex);
-                if (!beQuiet) {
-                    dialogs.displayError(msg, ex);
+                @Override
+                public void onFailure(Throwable thrwbl) {
+                    fail(thrwbl);
                 }
-            }
 
-            @Override
-            public void bgTaskCancelled() {
-            }
-        });
+            });
+        } catch (TmcCoreException ex) {
+            Exceptions.printStackTrace(ex);
+        }
+    }
+
+    private void success(List<Review> list) {
+        boolean newReviews = reviewDb.setReviews(list);
+        if (!newReviews && notifyAboutNoNewReviews) {
+            dialogs.displayMessage("You have no unread code reviews.");
+        }
+    }
+
+    private void fail(Throwable thrwbl) {
+        final String msg = "Failed to check for code reviews";
+        log.log(Level.INFO, msg, thrwbl);
+        if (!beQuiet) {
+            dialogs.displayError(msg, thrwbl);
+        }
     }
 }

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

@@ -1,7 +1,7 @@
 package fi.helsinki.cs.tmc.actions;
 
 import com.google.gson.Gson;
-import fi.helsinki.cs.tmc.data.Review;
+import hy.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;

tmc-plugin/src/fi/helsinki/cs/tmc/data/Review.java

@@ -2,7 +2,7 @@
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
-import fi.helsinki.cs.tmc.data.Review;
+import hy.tmc.core.domain.Review;
 import java.util.Arrays;
 import java.util.Date;
 import java.util.List;

tmc-plugin/src/fi/helsinki/cs/tmc/data/serialization/ReviewListParser.java

@@ -1,6 +1,6 @@
 package fi.helsinki.cs.tmc.model;
 
-import fi.helsinki.cs.tmc.data.Review;
+import hy.tmc.core.domain.Review;
 import fi.helsinki.cs.tmc.events.TmcEvent;
 import fi.helsinki.cs.tmc.events.TmcEventBus;
 import java.util.ArrayList;

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

@@ -11,7 +11,7 @@
 import hy.tmc.core.domain.Course;
 import hy.tmc.core.domain.Exercise;
 import fi.helsinki.cs.tmc.data.FeedbackAnswer;
-import fi.helsinki.cs.tmc.data.Review;
+import hy.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;

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

@@ -1,6 +1,6 @@
 package fi.helsinki.cs.tmc.ui;
 
-import fi.helsinki.cs.tmc.data.Review;
+import hy.tmc.core.domain.Review;
 import java.awt.Dimension;
 import java.awt.Toolkit;
 import java.awt.event.ActionListener;