Cleanup and TODOs

Author: jamo

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

@@ -1,27 +1,24 @@
 package fi.helsinki.cs.tmc.actions;
 
-import com.google.common.util.concurrent.FutureCallback;
 import fi.helsinki.cs.tmc.core.domain.Course;
-import fi.helsinki.cs.tmc.data.CourseListUtils;
 import fi.helsinki.cs.tmc.core.domain.Exercise;
 import fi.helsinki.cs.tmc.model.CourseDb;
 import fi.helsinki.cs.tmc.model.LocalExerciseStatus;
 import fi.helsinki.cs.tmc.model.ServerAccess;
 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 fi.helsinki.cs.tmc.core.exceptions.TmcCoreException;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.util.Collections;
-import java.util.List;
+
 import org.openide.awt.ActionID;
 import org.openide.awt.ActionReference;
 import org.openide.awt.ActionRegistration;
-import org.openide.util.Exceptions;
 import org.openide.util.NbBundle.Messages;
 
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.Collections;
+import java.util.List;
+
 @ActionID(category = "TMC", id = "fi.helsinki.cs.tmc.actions.DownloadCompletedExercises")
 @ActionRegistration(displayName = "#CTL_DownloadCompletedExercises")
 @ActionReference(path = "Menu/TM&C", position = -45)
@@ -40,7 +37,6 @@ public DownloadCompletedExercises() {
 
     @Override
     public void actionPerformed(ActionEvent e) {
-        // TODO(jamo): use bg task
         final Course currentCourse = courseDb.getCurrentCourse();
         if (currentCourse == null) {
             dialogs.displayMessage("Please select a course in TMC -> Settings.");

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

@@ -1,6 +1,5 @@
 package fi.helsinki.cs.tmc.actions;
 
-import com.google.common.base.Function;
 import fi.helsinki.cs.tmc.core.domain.Exercise;
 import fi.helsinki.cs.tmc.model.CourseDb;
 import fi.helsinki.cs.tmc.model.ProjectMediator;
@@ -13,11 +12,9 @@
 import fi.helsinki.cs.tmc.utilities.CancellableCallable;
 import fi.helsinki.cs.tmc.utilities.zip.NbProjectUnzipper;
 import fi.helsinki.cs.tmc.utilities.zip.NbProjectUnzipper.OverwritingDecider;
-import java.util.concurrent.Callable;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import javax.swing.JComponent;
-import javax.swing.JMenuItem;
+
+import com.google.common.base.Function;
+
 import org.netbeans.api.project.Project;
 import org.openide.awt.ActionID;
 import org.openide.awt.ActionReference;
@@ -28,6 +25,12 @@
 import org.openide.util.HelpCtx;
 import org.openide.util.NbBundle.Messages;
 
+import java.util.concurrent.Callable;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import javax.swing.JComponent;
+import javax.swing.JMenuItem;
+
 @ActionID(category = "TMC",
 id = "fi.helsinki.cs.tmc.actions.DownloadSolutionAction")
 @ActionRegistration(displayName = "#CTL_DownloadSolutionAction", lazy = false)
@@ -46,7 +49,7 @@ public DownloadSolutionAction() {
         this.courseDb = CourseDb.getInstance();
         this.dialogs = ConvenientDialogDisplayer.getDefault();
     }
-    
+
     @Override
     public String getName() {
         return "Download suggested &solution";
@@ -66,7 +69,7 @@ protected boolean enabledFor(Exercise exercise) {
     protected boolean enabledForMultipleProjects() {
         return true;
     }
-    
+
     @Override
     protected boolean asynchronous() {
         return false;
@@ -76,7 +79,7 @@ protected boolean asynchronous() {
     public JMenuItem getMenuPresenter() {
         return new ActionMenuItem();
     }
-    
+
     private JMenuItem getOriginalMenuPresenter() {
         return super.getMenuPresenter();
     }
@@ -93,9 +96,8 @@ protected CourseDb getCourseDb() {
 
     @Override
     protected void performAction(Node[] nodes) {
-        // TODO(jamo): use bg task
         projectMediator.saveAllFiles();
-        
+
         for (final Project project : projectsFromNodes(nodes)) {
             final Exercise ex = exerciseForProject(project);
             if (ex.getSolutionDownloadUrl() == null) {
@@ -104,7 +106,7 @@ protected void performAction(Node[] nodes) {
                 this.setEnabled(false);
                 return;
             }
-            
+
             String question = "Are you sure you want to OVERWRITE your copy of\n" + ex.getName() + " with the suggested solution?";
             String title = "Replace with solution?";
             dialogs.askYesNo(question, title, new Function<Boolean, Void>() {
@@ -121,6 +123,8 @@ public Void apply(Boolean yes) {
 
     private void downloadSolution(final Exercise ex, final TmcProjectInfo proj) {
         ServerAccess serverAccess = new ServerAccess(NbTmcSettings.getDefault());
+
+        // TODO: Use tmc-core.
         CancellableCallable<byte[]> downloadTask = serverAccess.getDownloadingExerciseSolutionZipTask(ex);
         BgTask.start("Downloading solution for " + ex.getName(), downloadTask, new BgTaskListener<byte[]>() {
             @Override
@@ -139,7 +143,7 @@ public void bgTaskFailed(Throwable ex) {
             }
         });
     }
-    
+
     private void unzipSolution(final Exercise ex, final TmcProjectInfo proj, final byte[] data) {
         Callable<Object> task = new Callable<Object>() {
             @Override
@@ -149,7 +153,7 @@ public Object call() throws Exception {
                 return null;
             }
         };
-        
+
         BgTask.start("Extracting solution", task, new BgTaskListener<Object>() {
             @Override
             public void bgTaskReady(Object result) {
@@ -167,7 +171,7 @@ public void bgTaskFailed(Throwable ex) {
             }
         });
     }
-    
+
     private OverwritingDecider solutionOverwriting = new OverwritingDecider() {
         @Override
         public boolean mayOverwrite(String relPath) {
@@ -178,12 +182,12 @@ public boolean mayDelete(String relPath) {
             return false;
         }
     };
-    
+
     private class ActionMenuItem extends JMenuItem implements DynamicMenuContent {
         public ActionMenuItem() {
             super(DownloadSolutionAction.this);
         }
-        
+
         @Override
         public JComponent[] getMenuPresenters() {
             if (DownloadSolutionAction.this.isEnabled()) {
@@ -197,6 +201,6 @@ public JComponent[] getMenuPresenters() {
         public JComponent[] synchMenuPresenters(JComponent[] jcs) {
             return getMenuPresenters();
         }
-        
+
     }
 }