New version, add support for submission result status "hidden"

testmycode · May 9, 2019 · 0e81867 · 0e81867
1 parent 7f38474
commit 0e81867
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 36 deletions.
diff --git a/build.xml b/build.xml
@@ -10,7 +10,7 @@
 
     <target name="-check-mavenmodules">
         <uptodate property="mavenmodules.uptodate"
-                  srcfile="maven-wrapper/target/nbm/maven-wrapper-1.29.nbm"
+                  srcfile="maven-wrapper/target/nbm/maven-wrapper-1.30.nbm"
                   targetfile="mavenmodules"/>
     </target>
 

diff --git a/maven-wrapper/pom.xml b/maven-wrapper/pom.xml
@@ -4,7 +4,7 @@
 
     <groupId>fi.helsinki.cs.tmc</groupId>
     <artifactId>maven-wrapper</artifactId>
-    <version>1.29</version>
+    <version>1.30</version>
     <packaging>nbm</packaging>
 
     <name>TMC Maven Wrapper</name>
@@ -46,7 +46,7 @@
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>core</artifactId>
-            <version>0.10.11-SNAPSHOT</version>
+            <version>0.10.13-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>

diff --git a/nbproject/platform.properties b/nbproject/platform.properties
@@ -1,15 +1,12 @@
 branding.token=tmcbeans
 cluster.path=\
-    ${nbplatform.active.dir}/cnd:\
     ${nbplatform.active.dir}/extide:\
-    ${nbplatform.active.dir}/dlight:\
     ${nbplatform.active.dir}/harness:\
     ${nbplatform.active.dir}/ide:\
     ${nbplatform.active.dir}/java:\
     ${nbplatform.active.dir}/javafx:\
     ${nbplatform.active.dir}/nb:\
     ${nbplatform.active.dir}/platform:\
-    ${nbplatform.active.dir}/webcommon:\
     ${nbplatform.active.dir}/websvccommon:\
     mavenmodules
 disabled.modules=\

diff --git a/tmc-plugin/manifest.mf b/tmc-plugin/manifest.mf
@@ -6,4 +6,4 @@ OpenIDE-Module-Requires:
   org.openide.windows.IOProvider,
   org.openide.windows.WindowManager
 OpenIDE-Module-Install: fi/helsinki/cs/tmc/actions/TmcModuleInstall.class
-OpenIDE-Module-Specification-Version: 1.2.4
+OpenIDE-Module-Specification-Version: 1.2.5
diff --git a/tmc-plugin/src/fi/helsinki/cs/tmc/exerciseSubmitter/ExerciseSubmitter.java b/tmc-plugin/src/fi/helsinki/cs/tmc/exerciseSubmitter/ExerciseSubmitter.java
@@ -90,7 +90,7 @@ public void bgTaskReady(SubmissionResult result) {
                 // as we might have unlocked new exercises.
                 exercise.setAttempted(true);
 
-                if (result.getStatus() == SubmissionResult.Status.OK) {
+                if (result.getStatus() == SubmissionResult.Status.OK || result.getStatus() == SubmissionResult.Status.HIDDEN) {
                     exercise.setCompleted(true);
                 }
 

diff --git a/tmc-plugin/src/fi/helsinki/cs/tmc/ui/TestResultDisplayer.java b/tmc-plugin/src/fi/helsinki/cs/tmc/ui/TestResultDisplayer.java
@@ -15,11 +15,9 @@
 import fi.helsinki.cs.tmc.langs.domain.RunResult;
 
 import com.google.common.collect.ImmutableList;
-import fi.helsinki.cs.tmc.core.domain.ProgressObserver;
 
 import java.awt.Dialog;
 import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
 import java.net.URI;
@@ -68,38 +66,38 @@ public void showSubmissionResult(Exercise exercise, SubmissionResult result, fin
                 clearTestCaseView();
                 displayError(result.getError());
                 break;
+            case HIDDEN:
+                dialogs.displayMessage("Submission received and saved.\nResults are hidden for this exercise.");
+                break;
         }
     }
 
     private void displaySuccessfulSubmissionMsg(Exercise exercise, final SubmissionResult result) {
         final SuccessfulSubmissionDialog dialog = new SuccessfulSubmissionDialog(exercise, result);
 
-        dialog.addOkListener(new ActionListener() {
-            @Override
-            public void actionPerformed(ActionEvent e) {
-                List<FeedbackAnswer> answers = dialog.getFeedbackAnswers();
-                if (!answers.isEmpty()) {
-                    Callable<String> task = new TmcServerCommunicationTaskFactory().getFeedbackAnsweringJob(URI.create(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);
-                            SwingUtilities.invokeLater(() -> {
-                                dialogs.displayError(msg);
-                            });
-                        }
-                    });
-                }
+        dialog.addOkListener((ActionEvent e) -> {
+            List<FeedbackAnswer> answers = dialog.getFeedbackAnswers();
+            if (!answers.isEmpty()) {
+                Callable<String> task = new TmcServerCommunicationTaskFactory().getFeedbackAnsweringJob(URI.create(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);
+                        SwingUtilities.invokeLater(() -> {
+                            dialogs.displayError(msg);
+                        });
+                    }
+                });
             }
         });