Skip to content

Commit b570d47

Browse files
committed
3.2.4.09 CompiliationParticipant fix for comparison project location
null.
1 parent 6448ca7 commit b570d47

File tree

9 files changed

+8
-3
lines changed

9 files changed

+8
-3
lines changed
208 Bytes
Binary file not shown.
15 Bytes
Binary file not shown.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
20191029103701
1+
20191030144707
208 Bytes
Binary file not shown.
15 Bytes
Binary file not shown.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
20191029103701
1+
20191030144707

sources/net.sf.j2s.core/src/net/sf/j2s/core/CorePlugin.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ public class CorePlugin extends Plugin {
2020
*
2121
*/
2222
public static String VERSION = "3.2.4.09";
23+
// BH 2019.10.30 -- 3.2.4.09 fixes problem with team...show history...compare having null project.getProject().getLocation()
2324
// BH 2019.10.27 -- 3.2.4.09 fixes problem with method of name c() becoming c$() -- constructor
2425
// BH 2019.10.25 -- 3.2.4.09 adds j2s.compiler.java.version (default 8)
2526
// BH 2019.10.25 -- 3.2.4.09 adds j2s.break.on.error (default false)

sources/net.sf.j2s.core/src/net/sf/j2s/core/Java2ScriptCompilationParticipant.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,12 @@ public Java2ScriptCompilationParticipant() {
4141
*/
4242
@Override
4343
public boolean isActive(IJavaProject project) {
44+
if (project.getProject().getLocation() == null) {
45+
// happens when comparing to team...show history item
46+
return false;
47+
}
4448
boolean isj2s = Java2ScriptCompiler.isActive(project);
45-
String loc = " " + project.getProject().getLocation().toString() + " ";
49+
String loc = " " + project.getProject().getLocation() + " ";
4650
// notify only if changed
4751
if (isActiveNotified.indexOf(isj2s + loc) < 0) {
4852
System.out.println("J2S isActive " + isj2s + loc);
208 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)