Don't push exceptions to users face

Author: jamo

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

@@ -79,7 +79,7 @@ public void actionPerformed(ActionEvent e) {
 
     public void run() {
         final Course currentCourseBeforeUpdate = courseDb.getCurrentCourse();
-        
+
         if (backgroundCheck && !((TmcCoreSettingsImpl)TmcSettingsHolder.get()).isCheckingForUpdatesInTheBackground()) {
             return;
         }

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

@@ -1,14 +1,18 @@
 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.Exercise;
+import fi.helsinki.cs.tmc.core.domain.ProgressObserver;
 import fi.helsinki.cs.tmc.core.utilities.ServerErrorHelper;
 import fi.helsinki.cs.tmc.core.events.TmcEvent;
+import fi.helsinki.cs.tmc.core.exceptions.ObsoleteClientException;
 import fi.helsinki.cs.tmc.events.TmcEventBus;
 import fi.helsinki.cs.tmc.model.CourseDb;
 import fi.helsinki.cs.tmc.model.LocalExerciseStatus;
 import fi.helsinki.cs.tmc.ui.ConvenientDialogDisplayer;
 import fi.helsinki.cs.tmc.ui.DownloadOrUpdateExercisesDialog;
+import fi.helsinki.cs.tmc.utilities.BgTask;
 import fi.helsinki.cs.tmc.utilities.BgTaskListener;
 
 import org.openide.awt.ActionID;
@@ -20,6 +24,7 @@
 import java.awt.event.ActionListener;
 import java.util.Collections;
 import java.util.List;
+import java.util.concurrent.Callable;
 
 @ActionID(category = "TMC", id = "fi.helsinki.cs.tmc.actions.DownloadCompletedExercises")
 @ActionRegistration(displayName = "#CTL_DownloadCompletedExercises")
@@ -46,17 +51,22 @@ public void actionPerformed(ActionEvent e) {
         }
 
         eventBus.post(new InvokedEvent(currentCourse));
-        RefreshCoursesAction action = new RefreshCoursesAction();
-        action.addDefaultListener(true, true);
-        action.addListener(new BgTaskListener<List<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(List<Course> receivedCourseList) {
-                LocalExerciseStatus status = LocalExerciseStatus.get(courseDb.getCurrentCourseExercises());
-                if (!status.downloadableCompleted.isEmpty()) {
-                    List<Exercise> emptyList = Collections.emptyList();
-                    DownloadOrUpdateExercisesDialog.display(emptyList, status.downloadableCompleted, emptyList);
-                } else {
-                    dialogs.displayMessage("No completed exercises to download.\nDid you only close them and not delete them?");
+            public void bgTaskReady(Course receivedCourse) {
+                if (receivedCourse != null) {
+                    courseDb.putDetailedCourse(receivedCourse);
+
+                    final LocalExerciseStatus status = LocalExerciseStatus.get(receivedCourse.getExercises());
+
+                    if (!status.downloadableCompleted.isEmpty()) {
+                        List<Exercise> emptyList = Collections.emptyList();
+                        DownloadOrUpdateExercisesDialog.display(emptyList, status.downloadableCompleted, emptyList);
+                    } else {
+                        dialogs.displayMessage("No completed exercises to download.\nDid you only close them and not delete them?");
+                    }
                 }
             }
 
@@ -69,7 +79,6 @@ public void bgTaskFailed(Throwable ex) {
                 dialogs.displayError("Failed to check for new exercises.\n" + ServerErrorHelper.getServerExceptionMsg(ex));
             }
         });
-        action.run();
     }
 
     public static class InvokedEvent implements TmcEvent {
@@ -80,4 +89,4 @@ public InvokedEvent(Course currentCourse) {
             this.course = currentCourse;
         }
     }
-}
+}

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

@@ -22,11 +22,12 @@
  * Refreshes the course list in the background.
  */
 public final class RefreshCoursesAction {
+
     private final static Logger log = Logger.getLogger(RefreshCoursesAction.class.getName());
 
     private CourseDb courseDb;
     private ConvenientDialogDisplayer dialogs;
-    
+
     private BgTaskListenerList<List<Course>> listeners;
 
     public RefreshCoursesAction() {
@@ -48,9 +49,9 @@ public RefreshCoursesAction addListener(BgTaskListener<List<Course>> listener) {
     }
 
     public void run() {
-        log.warning("Running list courses");
+        log.log(Level.INFO, "Running list courses");
         Callable<List<Course>> courseListTask = TmcCore.get().listCourses(ProgressObserver.NULL_OBSERVER);
-       
+
         BgTask.start("Refreshing course list", courseListTask, new BgTaskListener<List<Course>>() {
 
             @Override
@@ -86,7 +87,7 @@ public void bgTaskFailed(Throwable ex) {
                             listeners.bgTaskFailed(ex);
                         }
                     });
-                    
+
                 } else {
                     listeners.bgTaskReady(courses);
                 }
@@ -99,13 +100,14 @@ public void bgTaskCancelled() {
 
             @Override
             public void bgTaskFailed(Throwable ex) {
-                log.log(Level.WARNING, "Failed to download course list.", ex);
+                log.log(Level.INFO, "Failed to download course list.", ex);
                 listeners.bgTaskFailed(ex);
             }
         });
     }
 
     private class DefaultListener implements BgTaskListener<List<Course>> {
+
         private final boolean showDialogOnError;
         private final boolean updateCourseDb;
 

tmc-plugin/src/fi/helsinki/cs/tmc/utilities/BgTask.java

@@ -1,5 +1,7 @@
 package fi.helsinki.cs.tmc.utilities;
 
+import fi.helsinki.cs.tmc.core.exceptions.TmcCoreException;
+
 import java.util.concurrent.Callable;
 import java.util.concurrent.Future;
 import javax.swing.SwingUtilities;
@@ -15,17 +17,17 @@
  * also {@link Cancellable}.
  */
 public class BgTask<V> implements CancellableCallable<V> {
-    
+
     private RequestProcessor requestProcessor;
     private String label;
     private BgTaskListener<? super V> listener;
     private Callable<V> callable;
     private ProgressHandle progressHandle;
-    
+
     private final Object cancelLock = new Object();
     private boolean cancelled;
     private Thread executingThread;
-    
+
     public static <V> Future<V> start(String label, Callable<V> callable) {
         return new BgTask<V>(label, callable).start();
     }
@@ -43,7 +45,7 @@ public static Future<Object> start(String label, Runnable runnable, BgTaskListen
         Callable<Object> callable = runnableToCallable(runnable);
         return start(label, callable, listener);
     }
-    
+
     private static Callable<Object> runnableToCallable(final Runnable runnable) {
         if (runnable instanceof Cancellable) {
             return new CancellableCallable<Object>() {
@@ -72,15 +74,15 @@ public Object call() throws Exception {
     public BgTask(String label, Callable<V> callable) {
         this(label, callable, EmptyBgTaskListener.get());
     }
-    
+
     public BgTask(String label, Callable<V> callable, BgTaskListener<? super V> listener) {
         this.requestProcessor = TmcRequestProcessor.instance;
         this.label = label;
         this.listener = listener;
         this.callable = callable;
         this.progressHandle = null;
     }
-    
+
     public Future<V> start() {
         return requestProcessor.submit(this);
     }
@@ -104,11 +106,11 @@ public void run() {
                 executingThread = Thread.currentThread();
             }
         }
-        
+
         if (progressHandle == null) {
             progressHandle = ProgressHandleFactory.createSystemHandle(label, this);
         }
-        
+
         progressHandle.start();
         try {
             final V result = callable.call();
@@ -128,6 +130,14 @@ public void run() {
                 }
             });
             return null;
+        } catch (final Exception ex) {
+            :wingUtilities.invokeLater(new Runnable() {
+                @Override
+                public void run() {
+                    listener.bgTaskFailed(ex);
+                }
+            });
+            return null;
         } catch (final Throwable ex) {
             SwingUtilities.invokeLater(new Runnable() {
                 @Override