Merge pull request #7235 from mbien/resolve-position-conflicts

Deconflict some layer registration positions
apache · Apr 8, 2024 · 57b7d49 · 57b7d49
2 parents 466ffa0 + 3c87d8c
commit 57b7d49
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/enterprise/cloud.oracle/src/org/netbeans/modules/cloud/oracle/adm/RunFileADMAction.java b/enterprise/cloud.oracle/src/org/netbeans/modules/cloud/oracle/adm/RunFileADMAction.java
@@ -50,7 +50,7 @@
 
 @ActionReferences(value = {
     @ActionReference(position = 251, path = "Loaders/text/x-maven-pom+xml/Actions"),
-    @ActionReference(position = 1800, path = "Projects/org-netbeans-modules-maven/Actions")
+    @ActionReference(position = 1850, path = "Projects/org-netbeans-modules-maven/Actions")
 })
 
 @NbBundle.Messages({

diff --git a/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/resources/layer.xml b/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/resources/layer.xml
@@ -40,7 +40,7 @@
             <folder name="x-java">
             	<folder name="CodeGenerators">
                     <file name="org-netbeans-modules-jakarta-web-beans-actions-InterceptorFactory.instance">
-                        <attr name="position" intvalue="1000"/>
+                        <attr name="position" intvalue="1100"/>
                     </file>
                 </folder> 
                 <folder name="GlyphGutterActions">
@@ -92,7 +92,7 @@
     <folder name="Templates">
         <folder name="CDI_JakartaEE">
             <attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.modules.jakarta.web.beans.resources.Bundle"/>
-            <attr name="position" intvalue="876"/>
+            <attr name="position" intvalue="874"/>
             <file name="beans.xml">
                 <attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.modules.jakarta.web.beans.resources.Bundle"/>
                 <attr name="position" intvalue="10"/>

diff --git a/ide/options.editor/src/org/netbeans/modules/options/editor/FolderBasedController.java b/ide/options.editor/src/org/netbeans/modules/options/editor/FolderBasedController.java
@@ -102,7 +102,7 @@ public static OptionsPanelController markOccurrences() {
         location=OptionsDisplayer.EDITOR,
         keywords="#KW_InlineHints",
         keywordsCategory="Editor/InlineHints",
-        position=500
+        position=600
 //        toolTip="#CTL_MarkOccurences_ToolTip"
     )
     public static OptionsPanelController inlineHints() {

diff --git a/....launcher/src/org/netbeans/modules/java/file/launcher/indexer/CompilerOptionsIndexer.java b/....launcher/src/org/netbeans/modules/java/file/launcher/indexer/CompilerOptionsIndexer.java
@@ -50,7 +50,7 @@ protected void index(Iterable<? extends Indexable> files, Context context) {
     }
 
 
-    @MimeRegistration(mimeType="text/x-java", service=CustomIndexerFactory.class, position=1_000)
+    @MimeRegistration(mimeType="text/x-java", service=CustomIndexerFactory.class, position=1_100)
     public static final class FactoryImpl extends CustomIndexerFactory {
 
         @Override