Merge branch 'core_integration' of github.com:rage/tmc-netbeans into core_integration

samutamm · samutamm · commit ce1044c835c1 · 2015-07-17T13:03:29.000+03:00
Conflicts:
	tmc-plugin/test/unit/src/fi/helsinki/cs/tmc/data/serialization/SubmissionResultParserTest.java
diff --git a/tmc-plugin/src/fi/helsinki/cs/tmc/actions/CheckForUnopenedExercises.java b/tmc-plugin/src/fi/helsinki/cs/tmc/actions/CheckForUnopenedExercises.java
@@ -1,4 +1,4 @@
-package fi.helsinki.cs.tmc.actions;
+ package fi.helsinki.cs.tmc.actions;
 
 import hy.tmc.core.domain.Exercise;
 import fi.helsinki.cs.tmc.model.CourseDb;
diff --git a/tmc-plugin/src/fi/helsinki/cs/tmc/actions/SendFeedbackAction.java b/tmc-plugin/src/fi/helsinki/cs/tmc/actions/SendFeedbackAction.java
@@ -0,0 +1,79 @@
+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 fi.helsinki.cs.tmc.data.FeedbackAnswer;
+
+import fi.helsinki.cs.tmc.model.NBTmcSettings;
+import fi.helsinki.cs.tmc.model.TmcCoreSingleton;
+import fi.helsinki.cs.tmc.ui.ConvenientDialogDisplayer;
+import fi.helsinki.cs.tmc.utilities.ExceptionUtils;
+import hy.tmc.core.TmcCore;
+import hy.tmc.core.communication.HttpResult;
+import hy.tmc.core.domain.submission.SubmissionResult;
+import hy.tmc.core.exceptions.TmcCoreException;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import org.openide.util.Exceptions;
+
+public class SendFeedbackAction {
+
+    private List<FeedbackAnswer> answers;
+    private TmcCore core;
+    private ConvenientDialogDisplayer dialogs;
+    private final SubmissionResult result;
+    private NBTmcSettings settings = NBTmcSettings.getDefault();
+    private static final Logger log = Logger.getLogger(SendFeedbackAction.class.getName());
+
+    public SendFeedbackAction(List<FeedbackAnswer> answers, SubmissionResult result) {
+        this.answers = answers;
+        this.core = TmcCoreSingleton.getInstance();
+        this.dialogs = ConvenientDialogDisplayer.getDefault();
+        this.result = result;
+    }
+
+    public void run() {
+        try {
+            ListenableFuture<HttpResult> feedbackFuture;
+            feedbackFuture = core.sendFeedback(
+                    getFeedbackAnswers(), result.getFeedbackAnswerUrl(), settings
+            );
+            Futures.addCallback(feedbackFuture, new FeedbackReplyCallback());
+        } catch (TmcCoreException ex) {
+            Exceptions.printStackTrace(ex);
+        } catch (IOException ex) {
+            Exceptions.printStackTrace(ex);
+        }
+    }
+
+    private Map<String, String> getFeedbackAnswers() {
+        Map<String, String> answerMap = new HashMap<String, String>();
+        
+        for (FeedbackAnswer answer : answers) {
+            answerMap.put("" + answer.getQuestion().getId(), answer.getAnswer());
+        }
+        
+        return answerMap;
+    }
+
+    private class FeedbackReplyCallback implements FutureCallback<HttpResult> {
+
+        @Override
+        public void onSuccess(HttpResult v) {
+            System.out.println(v.getData() + "  " + v.getStatusCode());
+        }
+
+        @Override
+        public void onFailure(Throwable ex) {
+            String msg = "Failed to send feedback :-(\n" + ex.getMessage();
+            String msgWithBacktrace = msg + "\n" + ExceptionUtils.backtraceToString(ex);
+            log.log(Level.INFO, msgWithBacktrace);
+            dialogs.displayError(msg);
+        }
+    }
+}
diff --git a/tmc-plugin/src/fi/helsinki/cs/tmc/actions/SubmitExerciseAction.java b/tmc-plugin/src/fi/helsinki/cs/tmc/actions/SubmitExerciseAction.java
@@ -4,8 +4,8 @@
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
 import fi.helsinki.cs.tmc.data.ResultCollector;
+import fi.helsinki.cs.tmc.events.TmcEvent;
 import fi.helsinki.cs.tmc.events.TmcEventBus;
-import fi.helsinki.cs.tmc.exerciseSubmitter.ExerciseSubmitter;
 
 import fi.helsinki.cs.tmc.model.CourseDb;
 import fi.helsinki.cs.tmc.model.NBTmcSettings;
@@ -37,6 +37,13 @@ public final class SubmitExerciseAction extends AbstractExerciseSensitiveAction
     private NBTmcSettings settings;
     private ConvenientDialogDisplayer dialogs;
 
+    public static class InvokedEvent implements TmcEvent {
+        public final TmcProjectInfo projectInfo;
+        public InvokedEvent(TmcProjectInfo projectInfo) {
+            this.projectInfo = projectInfo;
+        }
+    }
+
     public SubmitExerciseAction() {
         this.courseDb = CourseDb.getInstance();
         this.projectMediator = ProjectMediator.getInstance();
@@ -65,7 +72,7 @@ protected void performAction(Node[] nodes) {
         Project[] projects = projectsFromNodes(nodes).toArray(new Project[0]);
         for (Project project : projects) {
             TmcProjectInfo info = projectMediator.wrapProject(project);
-            TmcEventBus.getDefault().post(new ExerciseSubmitter.InvokedEvent(info));
+            TmcEventBus.getDefault().post(new SubmitExerciseAction.InvokedEvent(info));
             submitProject(info);
         }
     }
diff --git a/tmc-plugin/src/fi/helsinki/cs/tmc/actions/UpdateExercisesAction.java b/tmc-plugin/src/fi/helsinki/cs/tmc/actions/UpdateExercisesAction.java
@@ -1,112 +1,88 @@
 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.Exercise;
 import fi.helsinki.cs.tmc.model.CourseDb;
-import fi.helsinki.cs.tmc.model.ExerciseUpdateOverwritingDecider;
+import fi.helsinki.cs.tmc.model.NBTmcSettings;
 import fi.helsinki.cs.tmc.model.ProjectMediator;
 import fi.helsinki.cs.tmc.model.ServerAccess;
+import fi.helsinki.cs.tmc.model.TmcCoreSingleton;
 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 hy.tmc.core.TmcCore;
+import hy.tmc.core.exceptions.TmcCoreException;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-import java.io.File;
-import java.io.IOException;
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.List;
 import java.util.logging.Logger;
+import org.openide.util.Exceptions;
 
 public class UpdateExercisesAction implements ActionListener {
-    
+
     private static final Logger log = Logger.getLogger(UpdateExercisesAction.class.getName());
 
     private List<Exercise> exercisesToUpdate;
     private CourseDb courseDb;
     private ProjectMediator projectMediator;
     private ServerAccess serverAccess;
     private ConvenientDialogDisplayer dialogDisplayer;
-    
+    private TmcCore core;
+
     public UpdateExercisesAction(List<Exercise> exercisesToUpdate) {
         this.exercisesToUpdate = exercisesToUpdate;
         this.courseDb = CourseDb.getInstance();
         this.projectMediator = ProjectMediator.getInstance();
         this.serverAccess = new ServerAccess();
         this.dialogDisplayer = ConvenientDialogDisplayer.getDefault();
+        this.core = TmcCoreSingleton.getInstance();
     }
 
     @Override
     public void actionPerformed(ActionEvent e) {
         run();
     }
-
+    
     public void run() {
-        final AggregatingBgTaskListener<TmcProjectInfo> projectOpener = new AggregatingBgTaskListener<TmcProjectInfo>(exercisesToUpdate.size(), new BgTaskListener<Collection<TmcProjectInfo>>() {
-            @Override
-            public void bgTaskReady(Collection<TmcProjectInfo> result) {
-                result = new ArrayList<TmcProjectInfo>(result);
-                
-                // result may contain nulls since some downloads might fail
-                while (result.remove(null)) {
-                }
-                
-                projectMediator.scanForExternalChanges(result);
-                
-                // Open all at once. This is much faster.
-                projectMediator.openProjects(result);
-            }
-
-            // Cancelled and failed are never called since we only call bgTaskReady below manually
-            @Override
-            public void bgTaskCancelled() {
-            }
-            @Override
-            public void bgTaskFailed(Throwable ex) {
-            }
-        });
-        
-        
-        for (final Exercise exercise : exercisesToUpdate) {
-            final File projectDir = projectMediator.getProjectDirForExercise(exercise);
+        if (exercisesToUpdate.isEmpty()) {
+            return;
+        }
+        try {
+            ListenableFuture<List<Exercise>> downloadFuture = core.downloadExercises(exercisesToUpdate,
+                    NBTmcSettings.getDefault());
+            Futures.addCallback(downloadFuture, new ProjectOpenerCallback());
             
-            BgTask.start("Downloading " + exercise.getName(), serverAccess.getDownloadingExerciseZipTask(exercise), new BgTaskListener<byte[]>() {
+        } catch (TmcCoreException ex) {
+            Exceptions.printStackTrace(ex);
+            dialogDisplayer.displayError("Error occured while downloading updates", ex);
+        }
+    }
 
-                @Override
-                public void bgTaskReady(byte[] data) {
-                    TmcProjectInfo project = null;
-                    try {
-                        try {
-                            ExerciseUpdateOverwritingDecider overwriter = new ExerciseUpdateOverwritingDecider(projectDir);
-                            NbProjectUnzipper unzipper = new NbProjectUnzipper(overwriter);
-                            NbProjectUnzipper.Result result = unzipper.unzipProject(data, projectDir);
-                            log.info("== Exercise unzip result ==\n" + result);
-                        } catch (IOException ex) {
-                            dialogDisplayer.displayError("Failed to update project.", ex);
-                            return;
-                        }
-                        courseDb.exerciseDownloaded(exercise);
-                        
-                        project = projectMediator.tryGetProjectForExercise(exercise);
-                    } finally {
-                        projectOpener.bgTaskReady(project);
-                    }
-                }
+    private class ProjectOpenerCallback implements FutureCallback<List<Exercise>> {
 
-                @Override
-                public void bgTaskCancelled() {
-                    projectOpener.bgTaskReady(null);
-                }
+        @Override
+        public void onSuccess(List<Exercise> downloadedExercises) {
+            ArrayList<TmcProjectInfo> projects = new ArrayList<TmcProjectInfo>();
 
-                @Override
-                public void bgTaskFailed(Throwable ex) {
-                    projectOpener.bgTaskReady(null);
-                    String msg = ServerErrorHelper.getServerExceptionMsg(ex);
-                    dialogDisplayer.displayError("Failed to download updated exercises.\n" + msg, ex);
+            for (Exercise exercise : downloadedExercises) {
+                courseDb.exerciseDownloaded(exercise);
+                TmcProjectInfo project = projectMediator.tryGetProjectForExercise(exercise);
+                if (project != null) {
+                    projects.add(project);
                 }
-            });
+            }
+            projectMediator.scanForExternalChanges(projects);
+
+            projectMediator.openProjects(projects);
         }
+
+        @Override
+        public void onFailure(Throwable ex) {
+            Exceptions.printStackTrace(ex);
+            dialogDisplayer.displayError("Error occured while downloading updates", ex);
+        }
+
     }
 }
diff --git a/tmc-plugin/src/fi/helsinki/cs/tmc/exerciseSubmitter/ExerciseSubmitter.java b/tmc-plugin/src/fi/helsinki/cs/tmc/exerciseSubmitter/ExerciseSubmitter.java
@@ -30,6 +30,7 @@
 
 import org.netbeans.api.project.Project;
 
+@Deprecated
 public class ExerciseSubmitter {
 
     private static final Logger log = Logger.getLogger(SubmitExerciseAction.class.getName());
diff --git a/tmc-plugin/src/fi/helsinki/cs/tmc/runners/TestRunHandler.java b/tmc-plugin/src/fi/helsinki/cs/tmc/runners/TestRunHandler.java
@@ -1,6 +1,6 @@
 package fi.helsinki.cs.tmc.runners;
 
-import static fi.helsinki.cs.tmc.langs.RunResult.Status.COMPILE_FAILED;
+import static fi.helsinki.cs.tmc.langs.domain.RunResult.Status.COMPILE_FAILED;
 
 import com.google.common.base.Throwables;
 import com.google.common.collect.ImmutableList;
@@ -13,8 +13,9 @@
 import fi.helsinki.cs.tmc.events.TmcEvent;
 import fi.helsinki.cs.tmc.events.TmcEventBus;
 import fi.helsinki.cs.tmc.exerciseSubmitter.ExerciseSubmitter;
-import fi.helsinki.cs.tmc.langs.RunResult;
-import fi.helsinki.cs.tmc.langs.TestResult;
+import fi.helsinki.cs.tmc.langs.domain.RunResult;
+import fi.helsinki.cs.tmc.langs.domain.TestResult;
+
 import fi.helsinki.cs.tmc.model.CourseDb;
 import fi.helsinki.cs.tmc.model.NBTmcSettings;
 import fi.helsinki.cs.tmc.model.ProjectMediator;
diff --git a/tmc-plugin/src/fi/helsinki/cs/tmc/ui/TestResultDisplayer.java b/tmc-plugin/src/fi/helsinki/cs/tmc/ui/TestResultDisplayer.java
@@ -1,24 +1,18 @@
 package fi.helsinki.cs.tmc.ui;
 
+import fi.helsinki.cs.tmc.actions.SendFeedbackAction;
 import hy.tmc.core.domain.Exercise;
 import fi.helsinki.cs.tmc.data.FeedbackAnswer;
 import fi.helsinki.cs.tmc.data.ResultCollector;
 import hy.tmc.core.domain.submission.SubmissionResult;
 import fi.helsinki.cs.tmc.data.TestCaseResult;
-import fi.helsinki.cs.tmc.langs.TestResult;
-import fi.helsinki.cs.tmc.model.ServerAccess;
 import fi.helsinki.cs.tmc.stylerunner.validation.Strategy;
-import fi.helsinki.cs.tmc.utilities.BgTask;
-import fi.helsinki.cs.tmc.utilities.BgTaskListener;
-import fi.helsinki.cs.tmc.utilities.CancellableCallable;
-import fi.helsinki.cs.tmc.utilities.ExceptionUtils;
 import hy.tmc.core.domain.submission.TestCase;
 import java.awt.Dialog;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.logging.Level;
 import java.util.logging.Logger;
 import org.apache.commons.lang3.StringEscapeUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -76,24 +70,7 @@ private void displaySuccessfulSubmissionMsg(Exercise exercise, final SubmissionR
             public void actionPerformed(ActionEvent e) {
                 List<FeedbackAnswer> answers = dialog.getFeedbackAnswers();
                 if (!answers.isEmpty()) {
-                    CancellableCallable<String> task = new ServerAccess().getFeedbackAnsweringJob(result.getFeedbackAnswerUrl(), answers);
-                    BgTask.start("Sending feedback", task, new BgTaskListener<String>() {
-                        @Override
-                        public void bgTaskReady(String result) {
-                        }
-
-                        @Override
-                        public void bgTaskCancelled() {
-                        }
-
-                        @Override
-                        public void bgTaskFailed(Throwable ex) {
-                            String msg = "Failed to send feedback :-(\n" + ex.getMessage();
-                            String msgWithBacktrace = msg + "\n" + ExceptionUtils.backtraceToString(ex);
-                            log.log(Level.INFO, msgWithBacktrace);
-                            dialogs.displayError(msg);
-                        }
-                    });
+                    new SendFeedbackAction(answers, result).run();
                 }
             }
         });
diff --git a/tmc-plugin/test/unit/src/fi/helsinki/cs/tmc/data/serialization/SubmissionResultParserTest.java b/tmc-plugin/test/unit/src/fi/helsinki/cs/tmc/data/serialization/SubmissionResultParserTest.java
@@ -72,7 +72,6 @@ public void testExceptions() {
         String input = "{status: \"fail\", test_cases: " + testCasesJson + ", points: []}";
         
         SubmissionResult result = parse(input);
-        
         TestException cex = result.getTestCases().get(0).getException();
         assertNotNull(cex);
         assertEquals("FooEx", cex.getClassName());

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package fi.helsinki.cs.tmc.actions;`
	`1`	`+ package fi.helsinki.cs.tmc.actions;`
`2`	`2`
`3`	`3`	`import hy.tmc.core.domain.Exercise;`
`4`	`4`	`import fi.helsinki.cs.tmc.model.CourseDb;`