Merge branch 'oauth'

Author: nygrenh

build.xml

@@ -10,7 +10,7 @@
 
     <target name="-check-mavenmodules">
         <uptodate property="mavenmodules.uptodate"
-                  srcfile="maven-wrapper/target/nbm/maven-wrapper-1.15.nbm"
+                  srcfile="maven-wrapper/target/nbm/maven-wrapper-1.16.nbm"
                   targetfile="mavenmodules"/>
     </target>
 

maven-wrapper/pom.xml

@@ -4,7 +4,7 @@
 
     <groupId>fi.helsinki.cs.tmc</groupId>
     <artifactId>maven-wrapper</artifactId>
-    <version>1.15</version>
+    <version>1.16</version>
     <packaging>nbm</packaging>
 
     <name>TMC Maven Wrapper</name>
@@ -46,7 +46,7 @@
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>core</artifactId>
-            <version>0.9.13-SNAPSHOT</version>
+            <version>0.10.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
@@ -141,6 +141,7 @@
                         <publicPackage>org.yaml.snakeyaml</publicPackage>
                         <publicPackage>org.apache.http.*</publicPackage>
                         <publicPackage>org.apache.commons.*</publicPackage>
+                        <publicPackage>org.apache.oltu.oauth2.common.*</publicPackage>
                         <publicPackage>fi.helsinki.cs.tmc.core.*</publicPackage>
                         <publicPackage>fi.helsinki.cs.tmc.spyware.*</publicPackage>
                         <publicPackage>fi.helsinki.cs.tmc.langs.abstraction.*</publicPackage>

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.1.8
+OpenIDE-Module-Specification-Version: 1.1.9

tmc-plugin/nbproject/genfiles.properties

@@ -3,6 +3,6 @@ build.xml.script.CRC32=84aa6cb9
 build.xml.stylesheet.CRC32=[email protected]
 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
 # 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.data.CRC32=83609e03
 nbproject/build-impl.xml.script.CRC32=72a9c69e
 nbproject/build-impl.xml.stylesheet.CRC32=[email protected]

tmc-plugin/nbproject/project.properties

@@ -1,4 +1,4 @@
-javac.source=1.7
+javac.source=1.8
 javac.compilerargs=-Xlint -Xlint:-serial -Xlint:-path
 license.file=../LICENSE
 nbm.homepage=https://github.com/testmycode/tmc-netbeans

tmc-plugin/nbproject/project.xml

@@ -155,6 +155,15 @@
                         <specification-version>1.83.1.9</specification-version>
                     </run-dependency>
                 </dependency>
+                <dependency>
+                    <code-name-base>org.netbeans.modules.settings</code-name-base>
+                    <build-prerequisite/>
+                    <compile-dependency/>
+                    <run-dependency>
+                        <release-version>1</release-version>
+                        <specification-version>1.48.1</specification-version>
+                    </run-dependency>
+                </dependency>
                 <dependency>
                     <code-name-base>org.openide.awt</code-name-base>
                     <build-prerequisite/>

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

@@ -0,0 +1,30 @@
+package fi.helsinki.cs.tmc.actions;
+
+import fi.helsinki.cs.tmc.core.events.TmcEventBus;
+import fi.helsinki.cs.tmc.core.events.TmcEventListener;
+import fi.helsinki.cs.tmc.model.CourseDb;
+
+import org.openide.nodes.Node;
+import org.openide.util.HelpCtx;
+import org.openide.util.actions.NodeAction;
+
+public abstract class AbstractCourseSensitiveAction extends NodeAction {
+    
+    public AbstractCourseSensitiveAction() {
+        TmcEventBus.getDefault().subscribeDependent(new TmcEventListener() {
+            public void receive(CourseDb.ChangedEvent event) throws Throwable {
+                setEnabled(CourseDb.getInstance().getCurrentCourse() != null);
+            }
+        }, this);
+    }
+    
+    @Override
+    protected boolean enable(Node[] nodes) {
+        return CourseDb.getInstance().getCurrentCourse() != null;
+    }
+
+    @Override
+    public HelpCtx getHelpCtx() {
+        return HelpCtx.DEFAULT_HELP;
+    }
+}

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

@@ -12,8 +12,8 @@
 import fi.helsinki.cs.tmc.core.events.TmcEventBus;
 import fi.helsinki.cs.tmc.model.CourseDb;
 import fi.helsinki.cs.tmc.model.LocalExerciseStatus;
-import fi.helsinki.cs.tmc.ui.DownloadOrUpdateExercisesDialog;
 import fi.helsinki.cs.tmc.ui.ConvenientDialogDisplayer;
+import fi.helsinki.cs.tmc.ui.DownloadOrUpdateExercisesDialog;
 import fi.helsinki.cs.tmc.ui.TmcNotificationDisplayer;
 import fi.helsinki.cs.tmc.utilities.BgTask;
 import fi.helsinki.cs.tmc.utilities.BgTaskListener;
@@ -86,7 +86,7 @@ public void run() {
 
         if (currentCourseBeforeUpdate == null) {
             if (!beQuiet) {
-                dialogs.displayMessage("Please select a course in TMC -> Settings.");
+                dialogs.displayMessage("Please make sure you're logged in and have selected a course in TMC -> Settings.");
             }
             return;
         }

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

@@ -32,9 +32,9 @@
 @Messages("CTL_DownloadCompletedExercises=Download old completed exercises")
 public final class DownloadCompletedExercises implements ActionListener {
 
-    private CourseDb courseDb;
-    private ConvenientDialogDisplayer dialogs;
-    private TmcEventBus eventBus;
+    private final CourseDb courseDb;
+    private final ConvenientDialogDisplayer dialogs;
+    private final TmcEventBus eventBus;
 
     public DownloadCompletedExercises() {
         this.courseDb = CourseDb.getInstance();

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

@@ -1,38 +1,50 @@
 package fi.helsinki.cs.tmc.actions;
 
+import java.io.File;
 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;
+import org.openide.modules.InstalledFileLocator;
 
 public class EnsureMavenBinaryIsExecutable {
 
     private final static Path RELATIVE_MAVEN_LOCATION = Paths.get("java").resolve("maven").resolve("bin").resolve("mvn");
 
-    private final Path mavenPath;
+    private Path mavenPath;
     private final boolean isUnix;
 
     public EnsureMavenBinaryIsExecutable() {
+        this.isUnix = !System.getProperty("os.name").startsWith("Windows");
+    }
+    
+    public void run() {
+        if (!isUnix) {
+            return;
+        }
         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)) {
+        for (File file : InstalledFileLocator.getDefault().locateAll(".", null, false)) {
+            tryToChmod(Paths.get(file.getAbsolutePath()).resolve("..").resolve(RELATIVE_MAVEN_LOCATION));
+        }
+        if (!Files.exists(mavenPath)) {
             return;
         }
+        tryToChmod(mavenPath);
+    }
+
+    private void tryToChmod(Path path) {
         try {
-            Set<PosixFilePermission> permissions = Files.getPosixFilePermissions(mavenPath);
+            Set<PosixFilePermission> permissions = Files.getPosixFilePermissions(path);
             if (!permissions.contains(PosixFilePermission.OWNER_EXECUTE)) {
                 permissions.add(PosixFilePermission.OWNER_EXECUTE);
-                Files.setPosixFilePermissions(mavenPath, permissions);
+                Files.setPosixFilePermissions(path, permissions);
             }
         } catch (IOException ex) { }
     }