fix to register under global Java options

apache · Sep 25, 2024 · 1581f0d · 1581f0d
1 parent eeb44bb
commit 1581f0d
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 29 deletions.
diff --git a/extide/options.java/nbproject/project.xml b/extide/options.java/nbproject/project.xml
@@ -63,6 +63,7 @@
                 <friend>org.netbeans.modules.profiler.options</friend>
                 <friend>org.netbeans.modules.vmd.componentssupport</friend>
                 <friend>org.netbeans.modules.jshell.support</friend>
+                <friend>org.netbeans.modules.java.file.launcher</friend>
                 <package>org.netbeans.modules.options.java.api</package>
             </friend-packages>
         </data>

diff --git a/java/java.file.launcher/manifest.mf b/java/java.file.launcher/manifest.mf
@@ -1,7 +1,6 @@
 Manifest-Version: 1.0
 AutoUpdate-Show-In-Client: false
 OpenIDE-Module: org.netbeans.modules.java.file.launcher
-OpenIDE-Module-Layer: org/netbeans/modules/java/file/launcher/layer.xml
 OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/java/file/launcher/Bundle.properties
 OpenIDE-Module-Specification-Version: 1.3
 
diff --git a/java/java.file.launcher/nbproject/project.xml b/java/java.file.launcher/nbproject/project.xml
@@ -149,6 +149,14 @@
                         <specification-version>1.71</specification-version>
                     </run-dependency>
                 </dependency>
+                <dependency>
+                    <code-name-base>org.netbeans.modules.options.java</code-name-base>
+                    <build-prerequisite/>
+                    <compile-dependency/>
+                    <run-dependency>
+                        <specification-version>1.39</specification-version>
+                    </run-dependency>
+                </dependency>
                 <dependency>
                     <code-name-base>org.netbeans.modules.parsing.api</code-name-base>
                     <build-prerequisite/>

diff --git a/...her/src/org/netbeans/modules/java/file/launcher/GlobalSettingsOptionsPanelController.java b/...her/src/org/netbeans/modules/java/file/launcher/GlobalSettingsOptionsPanelController.java
@@ -23,11 +23,12 @@
 import javax.swing.JComponent;
 import javax.swing.SwingUtilities;
 import org.netbeans.spi.options.OptionsPanelController;
+import org.netbeans.modules.options.java.api.JavaOptions;
 import org.openide.util.HelpCtx;
 import org.openide.util.Lookup;
 
 @OptionsPanelController.SubRegistration(
-        location = "Java",
+        location = JavaOptions.JAVA,
         displayName = "#AdvancedOption_DisplayName_GlobalSettings",
         keywords = "#AdvancedOption_Keywords_GlobalSettings",
         keywordsCategory = "Java/GlobalSettings"

diff --git a/java/java.file.launcher/src/org/netbeans/modules/java/file/launcher/layer.xml b/java/java.file.launcher/src/org/netbeans/modules/java/file/launcher/layer.xml