Skip to content

Commit e75a07e

Browse files
nygrenhnygrenh
committed
Merge branch 'oauth'
2 parents cee0c75 + 79a458b commit e75a07e

37 files changed

+1990
-879
lines changed

‎build.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
<target name="-check-mavenmodules">
1212
<uptodate property="mavenmodules.uptodate"
13-
srcfile="maven-wrapper/target/nbm/maven-wrapper-1.15.nbm"
13+
srcfile="maven-wrapper/target/nbm/maven-wrapper-1.16.nbm"
1414
targetfile="mavenmodules"/>
1515
</target>
1616

‎maven-wrapper/pom.xml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
<groupId>fi.helsinki.cs.tmc</groupId>
66
<artifactId>maven-wrapper</artifactId>
7-
<version>1.15</version>
7+
<version>1.16</version>
88
<packaging>nbm</packaging>
99

1010
<name>TMC Maven Wrapper</name>
@@ -46,7 +46,7 @@
4646
<dependency>
4747
<groupId>${project.groupId}</groupId>
4848
<artifactId>core</artifactId>
49-
<version>0.9.13-SNAPSHOT</version>
49+
<version>0.10.0-SNAPSHOT</version>
5050
</dependency>
5151
<dependency>
5252
<groupId>${project.groupId}</groupId>
@@ -141,6 +141,7 @@
141141
<publicPackage>org.yaml.snakeyaml</publicPackage>
142142
<publicPackage>org.apache.http.*</publicPackage>
143143
<publicPackage>org.apache.commons.*</publicPackage>
144+
<publicPackage>org.apache.oltu.oauth2.common.*</publicPackage>
144145
<publicPackage>fi.helsinki.cs.tmc.core.*</publicPackage>
145146
<publicPackage>fi.helsinki.cs.tmc.spyware.*</publicPackage>
146147
<publicPackage>fi.helsinki.cs.tmc.langs.abstraction.*</publicPackage>

‎tmc-plugin/manifest.mf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ OpenIDE-Module-Requires:
66
org.openide.windows.IOProvider,
77
org.openide.windows.WindowManager
88
OpenIDE-Module-Install: fi/helsinki/cs/tmc/actions/TmcModuleInstall.class
9-
OpenIDE-Module-Specification-Version: 1.1.8
9+
OpenIDE-Module-Specification-Version: 1.1.9

‎tmc-plugin/nbproject/genfiles.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@ build.xml.script.CRC32=84aa6cb9
33
build.xml.stylesheet.CRC32=a56c6a5b@1.45.1
44
# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
55
# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
6-
nbproject/build-impl.xml.data.CRC32=71dc5f8e
6+
nbproject/build-impl.xml.data.CRC32=83609e03
77
nbproject/build-impl.xml.script.CRC32=72a9c69e
88
nbproject/build-impl.xml.stylesheet.CRC32=238281d1@2.72.1

‎tmc-plugin/nbproject/project.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
javac.source=1.7
1+
javac.source=1.8
22
javac.compilerargs=-Xlint -Xlint:-serial -Xlint:-path
33
license.file=../LICENSE
44
nbm.homepage=https://github.com/testmycode/tmc-netbeans

‎tmc-plugin/nbproject/project.xml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,15 @@
155155
<specification-version>1.83.1.9</specification-version>
156156
</run-dependency>
157157
</dependency>
158+
<dependency>
159+
<code-name-base>org.netbeans.modules.settings</code-name-base>
160+
<build-prerequisite/>
161+
<compile-dependency/>
162+
<run-dependency>
163+
<release-version>1</release-version>
164+
<specification-version>1.48.1</specification-version>
165+
</run-dependency>
166+
</dependency>
158167
<dependency>
159168
<code-name-base>org.openide.awt</code-name-base>
160169
<build-prerequisite/>

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

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
package fi.helsinki.cs.tmc.actions;
2+
3+
import fi.helsinki.cs.tmc.core.events.TmcEventBus;
4+
import fi.helsinki.cs.tmc.core.events.TmcEventListener;
5+
import fi.helsinki.cs.tmc.model.CourseDb;
6+
7+
import org.openide.nodes.Node;
8+
import org.openide.util.HelpCtx;
9+
import org.openide.util.actions.NodeAction;
10+
11+
public abstract class AbstractCourseSensitiveAction extends NodeAction {
12+
13+
public AbstractCourseSensitiveAction() {
14+
TmcEventBus.getDefault().subscribeDependent(new TmcEventListener() {
15+
public void receive(CourseDb.ChangedEvent event) throws Throwable {
16+
setEnabled(CourseDb.getInstance().getCurrentCourse() != null);
17+
}
18+
}, this);
19+
}
20+
21+
@Override
22+
protected boolean enable(Node[] nodes) {
23+
return CourseDb.getInstance().getCurrentCourse() != null;
24+
}
25+
26+
@Override
27+
public HelpCtx getHelpCtx() {
28+
return HelpCtx.DEFAULT_HELP;
29+
}
30+
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
import fi.helsinki.cs.tmc.core.events.TmcEventBus;
1313
import fi.helsinki.cs.tmc.model.CourseDb;
1414
import fi.helsinki.cs.tmc.model.LocalExerciseStatus;
15-
import fi.helsinki.cs.tmc.ui.DownloadOrUpdateExercisesDialog;
1615
import fi.helsinki.cs.tmc.ui.ConvenientDialogDisplayer;
16+
import fi.helsinki.cs.tmc.ui.DownloadOrUpdateExercisesDialog;
1717
import fi.helsinki.cs.tmc.ui.TmcNotificationDisplayer;
1818
import fi.helsinki.cs.tmc.utilities.BgTask;
1919
import fi.helsinki.cs.tmc.utilities.BgTaskListener;
@@ -86,7 +86,7 @@ public void run() {
8686

8787
if (currentCourseBeforeUpdate == null) {
8888
if (!beQuiet) {
89-
dialogs.displayMessage("Please select a course in TMC -> Settings.");
89+
dialogs.displayMessage("Please make sure you're logged in and have selected a course in TMC -> Settings.");
9090
}
9191
return;
9292
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@
3232
@Messages("CTL_DownloadCompletedExercises=Download old completed exercises")
3333
public final class DownloadCompletedExercises implements ActionListener {
3434

35-
private CourseDb courseDb;
36-
private ConvenientDialogDisplayer dialogs;
37-
private TmcEventBus eventBus;
35+
private final CourseDb courseDb;
36+
private final ConvenientDialogDisplayer dialogs;
37+
private final TmcEventBus eventBus;
3838

3939
public DownloadCompletedExercises() {
4040
this.courseDb = CourseDb.getInstance();

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

Lines changed: 20 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,50 @@
11
package fi.helsinki.cs.tmc.actions;
22

3+
import java.io.File;
34
import java.io.IOException;
45
import java.nio.file.Files;
56
import java.nio.file.Path;
67
import java.nio.file.Paths;
78
import java.nio.file.attribute.PosixFilePermission;
89
import java.util.Set;
10+
import org.openide.modules.InstalledFileLocator;
911

1012
public class EnsureMavenBinaryIsExecutable {
1113

1214
private final static Path RELATIVE_MAVEN_LOCATION = Paths.get("java").resolve("maven").resolve("bin").resolve("mvn");
1315

14-
private final Path mavenPath;
16+
private Path mavenPath;
1517
private final boolean isUnix;
1618

1719
public EnsureMavenBinaryIsExecutable() {
20+
this.isUnix = !System.getProperty("os.name").startsWith("Windows");
21+
}
22+
23+
public void run() {
24+
if (!isUnix) {
25+
return;
26+
}
1827
Path pathCandidate = Paths.get(System.getProperty("user.dir")).resolve(RELATIVE_MAVEN_LOCATION);
1928
if (Files.exists(pathCandidate)) {
2029
this.mavenPath = pathCandidate;
2130
} else {
2231
this.mavenPath = Paths.get(System.getProperty("user.dir")).resolve("../").resolve(RELATIVE_MAVEN_LOCATION);
2332
}
24-
this.isUnix = !System.getProperty("os.name").startsWith("Windows");
25-
}
26-
27-
public void run() {
28-
if (!isUnix || !Files.exists(mavenPath)) {
33+
for (File file : InstalledFileLocator.getDefault().locateAll(".", null, false)) {
34+
tryToChmod(Paths.get(file.getAbsolutePath()).resolve("..").resolve(RELATIVE_MAVEN_LOCATION));
35+
}
36+
if (!Files.exists(mavenPath)) {
2937
return;
3038
}
39+
tryToChmod(mavenPath);
40+
}
41+
42+
private void tryToChmod(Path path) {
3143
try {
32-
Set<PosixFilePermission> permissions = Files.getPosixFilePermissions(mavenPath);
44+
Set<PosixFilePermission> permissions = Files.getPosixFilePermissions(path);
3345
if (!permissions.contains(PosixFilePermission.OWNER_EXECUTE)) {
3446
permissions.add(PosixFilePermission.OWNER_EXECUTE);
35-
Files.setPosixFilePermissions(mavenPath, permissions);
47+
Files.setPosixFilePermissions(path, permissions);
3648
}
3749
} catch (IOException ex) { }
3850
}

0 commit comments

Comments
 (0)