Two fixes, one to let platform/netbinox tests pass, other to silence …

…useless warning from InstalledFileLocator.
wqskhn · Sep 30, 2018 · db8aaa9 · db8aaa9
1 parent c02a2a5
commit db8aaa9
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/java/java.source.base/src/org/netbeans/modules/java/source/indexing/JavaCustomIndexer.java b/java/java.source.base/src/org/netbeans/modules/java/source/indexing/JavaCustomIndexer.java
@@ -1310,7 +1310,7 @@ private static File dumpHeap(@NonNull final String path) {
 
     private static String computeJavacVersion() {
         if (NoJavacHelper.hasNbJavac()) {
-            File nbJavac = InstalledFileLocator.getDefault().locate("modules/ext/nb-javac-impl.jar", null, false);
+            File nbJavac = InstalledFileLocator.getDefault().locate("modules/ext/nb-javac-impl.jar", "org.netbeans.modules.nbjavac.impl", false);
             if (nbJavac != null) {
                 return String.valueOf(nbJavac.lastModified());
             }

diff --git a/java/java.source/src/org/netbeans/modules/java/source/JBrowseModule.java b/java/java.source/src/org/netbeans/modules/java/source/JBrowseModule.java
@@ -20,6 +20,8 @@
 package org.netbeans.modules.java.source;
 
 import java.awt.Dialog;
+import java.awt.GraphicsEnvironment;
+import java.awt.Toolkit;
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.prefs.Preferences;
@@ -69,6 +71,11 @@ public JBrowseModule() {
     public void restored() {
         WindowManager.getDefault().invokeWhenUIReady(() -> {
             WindowManager.getDefault().invokeWhenUIReady(() -> {
+                if (GraphicsEnvironment.isHeadless()) {
+                    //no UI, ignore (let's assume whoever run in this mode know
+                    //what they are doing)
+                    return;
+                }
                 Preferences prefs = NbPreferences.forModule(NoJavacHelper.class);
                 if (!NoJavacHelper.hasWorkingJavac() && !prefs.getBoolean(KEY_WARNING_SHOWN, false)) {
                     String install = Bundle.BN_Install();