More fixes

Author: nygrenh

tmc-plugin/nbproject/genfiles.properties

@@ -5,4 +5,4 @@ [email protected]
 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
 nbproject/build-impl.xml.data.CRC32=71dc5f8e
 nbproject/build-impl.xml.script.CRC32=72a9c69e
-nbproject/build-impl.xml.stylesheet.CRC32=238281d1@2.71.1
+nbproject/build-impl.xml.stylesheet.CRC32=238281d1@2.72.1

tmc-plugin/src/fi/helsinki/cs/tmc/actions/.DownloadExercisesAction.java.swp

@@ -74,7 +74,7 @@ public void bgTaskReady(List<Exercise> result) {
                         return;
                     }
                     TmcProjectInfo proj = projectMediator.tryGetProjectForExercise(result.get(0));
-
+                    
                     if (proj == null) {
                         throw new RuntimeException("Failed to open project for exercise " + exercise.getName());
                     }

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

@@ -0,0 +1,39 @@
+package fi.helsinki.cs.tmc.actions;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.nio.file.attribute.PosixFilePermission;
+import java.util.Set;
+
+public class EnsureMavenBinaryIsExecutable {
+    
+    private final static Path RELATIVE_MAVEN_LOCATION = Paths.get("java").resolve("maven").resolve("bin").resolve("mvn");
+    
+    private final Path mavenPath;
+    private final boolean isUnix;
+    
+    public EnsureMavenBinaryIsExecutable() {
+        Path pathCandidate = Paths.get(System.getProperty("user.dir")).resolve(RELATIVE_MAVEN_LOCATION);
+        if (Files.exists(pathCandidate)) {
+            this.mavenPath = pathCandidate;
+        } else {
+            this.mavenPath = Paths.get(System.getProperty("user.dir")).resolve("../").resolve(RELATIVE_MAVEN_LOCATION);
+        }
+        this.isUnix = !System.getProperty("os.name").startsWith("Windows");
+    }
+    
+    public void run() {
+        if (!isUnix || !Files.exists(mavenPath)) {
+            return;
+        }
+        try {
+            Set<PosixFilePermission> permissions = Files.getPosixFilePermissions(mavenPath);
+            if (!permissions.contains(PosixFilePermission.OWNER_EXECUTE)) {
+                permissions.add(PosixFilePermission.OWNER_EXECUTE);
+                Files.setPosixFilePermissions(mavenPath, permissions);
+            }
+        } catch (IOException ex) { }
+    }
+}

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

@@ -0,0 +1,36 @@
+package fi.helsinki.cs.tmc.actions;
+
+import org.openide.util.NbPreferences;
+
+import java.util.prefs.Preferences;
+
+public class FixUnoptimalSettings {
+
+    private final Preferences mavenPrefrences;
+
+    public FixUnoptimalSettings() {
+        this.mavenPrefrences = NbPreferences.root()
+                .node("org")
+                .node("netbeans")
+                .node("modules")
+                .node("maven");
+    }
+
+    public void run() {
+        fixMavenDependencyDownloadPolicy();
+    }
+
+    private void fixMavenDependencyDownloadPolicy() {
+        final String binaryDownloadValue = mavenPrefrences.get("binaryDownload", "");
+        if (!binaryDownloadValue.equals("EVERY_OPEN")) {
+            mavenPrefrences.put("binaryDownload", "EVERY_OPEN");
+        }
+    }
+
+    void undo() {
+        final String binaryDownloadValue = mavenPrefrences.get("binaryDownload", "");
+        if (binaryDownloadValue.equals("EVERY_OPEN")) {
+            mavenPrefrences.put("binaryDownload", "NEVER");
+        }
+    }
+}

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

@@ -74,11 +74,8 @@ protected CourseDb getCourseDb() {
 
     @Override
     public boolean enable(Project... projects) {
-        if (projects.length > 1) {
-            return false; // One at a time please
-        } else {
-            return super.enable(projects);
-        }
+        // One at a time please
+        return projects.length <= 1 && super.enable(projects);
     }
 
     @Override

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

@@ -58,7 +58,7 @@ public static void start() {
         this.eventBus = TmcEventBus.getDefault();
     }
 
-    public void receive(PushEventListener.ReviewAvailableEvent e) throws Throwable {
+    public void receive(PushEventListener.ReviewAvailableEvent e) {
         SwingUtilities.invokeLater(new Runnable() {
             @Override
             public void run() {
@@ -67,7 +67,7 @@ public void run() {
         });
     }
 
-    public void receive(ReviewDb.NewUnreadReviewEvent e) throws Throwable {
+    public void receive(ReviewDb.NewUnreadReviewEvent e) {
         final Review review = e.review;
         SwingUtilities.invokeLater(new Runnable() {
             @Override

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

@@ -10,22 +10,17 @@
 import fi.helsinki.cs.tmc.langs.domain.RunResult;
 import fi.helsinki.cs.tmc.model.CourseDb;
 import fi.helsinki.cs.tmc.model.ProjectMediator;
-import fi.helsinki.cs.tmc.model.SourceFileLookup;
 import fi.helsinki.cs.tmc.ui.TestResultDisplayer;
 import fi.helsinki.cs.tmc.utilities.BgTask;
 import fi.helsinki.cs.tmc.utilities.BgTaskListener;
 
 import java.util.concurrent.Callable;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import java.util.prefs.BackingStoreException;
-import java.util.prefs.Preferences;
+
 import org.netbeans.api.project.Project;
-import org.openide.filesystems.FileObject;
 import org.openide.nodes.Node;
-import org.openide.util.Exceptions;
 import org.openide.util.NbBundle.Messages;
-import org.openide.util.NbPreferences;
 import org.openide.windows.WindowManager;
 
 @Messages("CTL_RunTestsLocallyExerciseAction=Run &tests locally")

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

@@ -112,11 +112,8 @@ private boolean isSubmittable() {
             return isReturnable;
         }
 
-        if (!validationResults.getValidationErrors().isEmpty()) {
-            return false;
-        }
+        return validationResults.getValidationErrors().isEmpty() && isReturnable;
 
-        return isReturnable;
     }
 
     private List<String> tryToCleanLog(List<String> log) {

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

@@ -130,11 +130,7 @@ public Course getCourseByName(String name) {
 
     public boolean isUnlockable(Exercise ex) {
         Course course = getCourseByName(ex.getCourseName());
-        if (course != null) {
-            return course.getUnlockables().contains(ex.getName());
-        } else {
-            return false;
-        }
+        return course != null && course.getUnlockables().contains(ex.getName());
     }
 
     /**