Merge pull request #8916 from mbien/fix-some-layer-ordering-warnings

mbien · web-flow · commit b535ff51fe20 · 2025-11-18T01:50:10.000+01:00
Fixes most layer position warnings and improves logging
diff --git a/cpplite/cpplite.project/src/org/netbeans/modules/cpplite/project/layer.xml b/cpplite/cpplite.project/src/org/netbeans/modules/cpplite/project/layer.xml
@@ -24,7 +24,7 @@
     <folder name="Templates">
         <folder name="Project">
             <folder name="Native">
-                <attr name="position" intvalue="650"/>
+                <attr name="position" intvalue="660"/>
                 <attr name="displayName" bundlevalue="org.netbeans.modules.cpplite.project.Bundle#CPPLite_NewProject" />
             </folder>
         </folder>
diff --git a/enterprise/micronaut/src/org/netbeans/modules/micronaut/db/MicronautDataEndpointGenerator.java b/enterprise/micronaut/src/org/netbeans/modules/micronaut/db/MicronautDataEndpointGenerator.java
@@ -358,7 +358,7 @@ private static DialogDescriptor createDialogDescriptor( JComponent content, Stri
         return dd;
     }
 
-    @MimeRegistration(mimeType = "text/x-java", service = CodeGenerator.Factory.class)
+    @MimeRegistration(mimeType = "text/x-java", service = CodeGenerator.Factory.class, position = 800)
     public static class Factory implements CodeGenerator.Factory {
 
         @Override
diff --git a/ide/diff/src/org/netbeans/modules/diff/tree/RecursiveDiffAction.java b/ide/diff/src/org/netbeans/modules/diff/tree/RecursiveDiffAction.java
@@ -46,7 +46,7 @@
 )
 @ActionReference(
     path = "UI/ToolActions/Files",
-    position = 300
+    position = 250
 )
 @Messages("CTL_RecursiveDiffAction=Tree diff")
 public final class RecursiveDiffAction extends NodeAction implements ActionListener {
diff --git a/ide/diff/src/org/netbeans/modules/diff/tree/TreeDiffViewerTopComponent.java b/ide/diff/src/org/netbeans/modules/diff/tree/TreeDiffViewerTopComponent.java
@@ -63,7 +63,8 @@
 )
 @TopComponent.Registration(
         mode = "editor",
-        openAtStartup = false
+        openAtStartup = false,
+        position = 0
 )
 @Messages({
     "CTL_TreeDiffViewerTopComponent=Tree diff",
diff --git a/ide/gsf.codecoverage/src/org/netbeans/modules/gsf/codecoverage/layer.xml b/ide/gsf.codecoverage/src/org/netbeans/modules/gsf/codecoverage/layer.xml
@@ -36,7 +36,9 @@
     <folder name="Windows2">
         <folder name="Modes">
             <folder name="editor">
-                <file name="CoverageReportTopComponent.wstcref" url="CoverageReportTopComponentWstcref.xml"/>
+                <file name="CoverageReportTopComponent.wstcref" url="CoverageReportTopComponentWstcref.xml">
+                    <attr name="position" intvalue="0"/>
+                </file>
             </folder>
         </folder>
     </folder>
diff --git a/ide/lsp.client/src/org/netbeans/modules/lsp/client/bindings/CompletionProviderImpl.java b/ide/lsp.client/src/org/netbeans/modules/lsp/client/bindings/CompletionProviderImpl.java
@@ -87,7 +87,7 @@
  *
  * @author lahvac
  */
-@MimeRegistration(mimeType="", service=CompletionProvider.class)
+@MimeRegistration(mimeType="", service=CompletionProvider.class, position = 1000)
 public class CompletionProviderImpl implements CompletionProvider {
 
     private static final Logger LOG = Logger.getLogger(CompletionProviderImpl.class.getName());
diff --git a/ide/spellchecker.bindings.htmlxml/src/org/netbeans/modules/spellchecker/bindings/htmlxml/layer.xml b/ide/spellchecker.bindings.htmlxml/src/org/netbeans/modules/spellchecker/bindings/htmlxml/layer.xml
@@ -28,55 +28,77 @@
                     <file name="org-netbeans-modules-spellchecker-bindings-htmlxml-HtmlXmlTokenListProvider.instance" />
                 </folder>
                 <folder name="CompletionProviders">
-                    <file name="org-netbeans-modules-spellchecker-completion-WordCompletion.instance"/>
+                    <file name="org-netbeans-modules-spellchecker-completion-WordCompletion.instance">
+                        <attr name="position" intvalue="600"/>
+                    </file>
                 </folder>
             </folder>
             <folder name="xhtml">
                 <folder name="TokenListProvider">
                     <file name="org-netbeans-modules-spellchecker-bindings-htmlxml-HtmlXmlTokenListProvider.instance" />
                 </folder>
                 <folder name="CompletionProviders">
-                    <file name="org-netbeans-modules-spellchecker-completion-WordCompletion.instance"/>
+                    <file name="org-netbeans-modules-spellchecker-completion-WordCompletion.instance">
+                        <attr name="position" intvalue="600"/>
+                    </file>
                 </folder>
             </folder>
             <folder name="x-php5">
                 <folder name="TokenListProvider">
                     <file name="org-netbeans-modules-spellchecker-bindings-htmlxml-HtmlXmlTokenListProvider.instance" />
                 </folder>
                 <folder name="CompletionProviders">
-                    <file name="org-netbeans-modules-spellchecker-completion-WordCompletion.instance"/>
+                    <file name="org-netbeans-modules-spellchecker-completion-WordCompletion.instance">
+                        <!-- none of the php completion providers have currently a position
+                        <attr name="position" intvalue="600"/>
+                        -->
+                    </file>
                 </folder>
             </folder>
             <folder name="x-jsp">
                 <folder name="TokenListProvider">
                     <file name="org-netbeans-modules-spellchecker-bindings-htmlxml-HtmlXmlTokenListProvider.instance" />
                 </folder>
                 <folder name="CompletionProviders">
-                    <file name="org-netbeans-modules-spellchecker-completion-WordCompletion.instance"/>
+                    <file name="org-netbeans-modules-spellchecker-completion-WordCompletion.instance">
+                        <!-- none of the enterprise completion providers have currently a position
+                        <attr name="position" intvalue="600"/>
+                        -->
+                    </file>
                 </folder>
             </folder>
             <folder name="x-tag">
                 <folder name="TokenListProvider">
                     <file name="org-netbeans-modules-spellchecker-bindings-htmlxml-HtmlXmlTokenListProvider.instance" />
                 </folder>
                 <folder name="CompletionProviders">
-                    <file name="org-netbeans-modules-spellchecker-completion-WordCompletion.instance"/>
+                    <file name="org-netbeans-modules-spellchecker-completion-WordCompletion.instance">
+                        <!-- none of the other completion providers have currently a position
+                        <attr name="position" intvalue="600"/>
+                        -->
+                    </file>
                 </folder>
             </folder>
             <folder name="x-gsp">
                 <folder name="TokenListProvider">
                     <file name="org-netbeans-modules-spellchecker-bindings-htmlxml-HtmlXmlTokenListProvider.instance" />
                 </folder>
                 <folder name="CompletionProviders">
-                    <file name="org-netbeans-modules-spellchecker-completion-WordCompletion.instance"/>
+                    <file name="org-netbeans-modules-spellchecker-completion-WordCompletion.instance">
+                        <!-- none of the other completion providers have currently a position
+                        <attr name="position" intvalue="600"/>
+                        -->
+                    </file>
                 </folder>
             </folder>
             <folder name="xml">
                 <folder name="TokenListProvider">
                     <file name="org-netbeans-modules-spellchecker-bindings-htmlxml-HtmlXmlTokenListProvider.instance" />
                 </folder>
                 <folder name="CompletionProviders">
-                    <file name="org-netbeans-modules-spellchecker-completion-WordCompletion.instance"/>
+                    <file name="org-netbeans-modules-spellchecker-completion-WordCompletion.instance">
+                        <attr name="position" intvalue="600"/>
+                    </file>
                 </folder>
             </folder>
         </folder>
diff --git a/ide/spellchecker.bindings.properties/src/org/netbeans/modules/spellchecker/bindings/properties/layer.xml b/ide/spellchecker.bindings.properties/src/org/netbeans/modules/spellchecker/bindings/properties/layer.xml
@@ -28,7 +28,9 @@
                     <file name="org-netbeans-modules-spellchecker-bindings-properties-PropertiesTokenListProvider.instance" />
                 </folder>
                 <folder name="CompletionProviders">
-                    <file name="org-netbeans-modules-spellchecker-completion-WordCompletion.instance"/>
+                    <file name="org-netbeans-modules-spellchecker-completion-WordCompletion.instance">
+                        <attr name="position" intvalue="600"/>
+                    </file>
                 </folder>
             </folder>
         </folder>
diff --git a/ide/texttools/src/org/netbeans/modules/texttools/TextToolsTopComponent.java b/ide/texttools/src/org/netbeans/modules/texttools/TextToolsTopComponent.java
@@ -70,7 +70,7 @@
     iconBase="org/netbeans/modules/texttools/accessories-text-editor.png",
     persistenceType = TopComponent.PERSISTENCE_ONLY_OPENED
 )
-@TopComponent.Registration(mode = "output", openAtStartup = false)
+@TopComponent.Registration(mode = "output", openAtStartup = false, position = 3400)
 @Messages({
     "CTL_TextToolsAction=Text Tools",
     "CTL_TextToolsTopComponent=Text Tools Window",
diff --git a/ide/xml.schema.completion/src/org/netbeans/modules/xml/schema/completion/layer.xml b/ide/xml.schema.completion/src/org/netbeans/modules/xml/schema/completion/layer.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <!--
 
     Licensed to the Apache Software Foundation (ASF) under one
@@ -28,7 +27,9 @@
             <folder name="xml">
                 <attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.modules.xml.schema.completion.Bundle"/>
                 <folder name="CompletionProviders">
-                    <file name="org-netbeans-modules-xml-schema-completion-SchemaBasedCompletionProvider.instance"/>
+                    <file name="org-netbeans-modules-xml-schema-completion-SchemaBasedCompletionProvider.instance">
+                        <attr name="position" intvalue="800"/>
+                    </file>
                 </folder>
             </folder>
         </folder>
diff --git a/ide/xml.text/src/org/netbeans/modules/xml/text/completion/XMLCompletionProvider.java b/ide/xml.text/src/org/netbeans/modules/xml/text/completion/XMLCompletionProvider.java
@@ -47,7 +47,7 @@
  * @author Samaresh (Samaresh.Panda@Sun.Com)
  */
 @MimeRegistrations({
-    @MimeRegistration(mimeType = "text/xml", service = CompletionProvider.class),
+    @MimeRegistration(mimeType = "text/xml", service = CompletionProvider.class, position = 700),
     @MimeRegistration(mimeType = "text/xml-external-parsed-entity", service = CompletionProvider.class),
 })
 public class XMLCompletionProvider implements CompletionProvider {
diff --git a/java/java.editor/src/org/netbeans/modules/java/editor/resources/layer.xml b/java/java.editor/src/org/netbeans/modules/java/editor/resources/layer.xml
@@ -411,9 +411,9 @@
                         <folder name="BracesMatchers">
                             <file name="org-netbeans-modules-editor-java-JavaBracesMatcher.shadow">
                                 <attr name="originalFile" stringvalue="Editors/text/x-java/BracesMatchers/org-netbeans-modules-editor-java-JavaBracesMatcher.instance"/>
+                                <attr name="position" intvalue="300"/>
                             </file>
-                        </folder>                
-
+                        </folder>
                     </folder>
                 </folder>
             </folder>
@@ -448,6 +448,7 @@
                 </folder>
             </folder>
             <folder name="InlineHints">
+                <attr name="position" intvalue="0"/>
                 <folder name="text">
                     <folder name="x-java">
                         <file name="JavaInlineHints.instance">
diff --git a/java/maven/src/org/netbeans/modules/maven/layer.xml b/java/maven/src/org/netbeans/modules/maven/layer.xml
@@ -53,6 +53,7 @@
                 <file name="settings.xml" url="settings.template.xml">
                     <attr name="javax.script.ScriptEngine" stringvalue="freemarker"/>
                     <attr name="template.openFile" boolvalue="false"/>
+                    <attr name="position" intvalue="110"/>
                 </file>
             </folder>
         </folder>
diff --git a/platform/openide.filesystems/src/org/openide/filesystems/Ordering.java b/platform/openide.filesystems/src/org/openide/filesystems/Ordering.java
@@ -201,7 +201,7 @@ public int compareTo(ChildAndPosition o) {
                     if (n.contains("ergonomics")) { // NOI18N
                         break IGNORE_ERGO;
                     }
-                    presentNames.add(n);
+                    presentNames.add(n + "@" + cap.position);
                 }
                 LOG.log(
                     Level.WARNING, "Not all children in {0}/ marked with the position attribute: {1}, but some are: {2}",

Original file line number	Diff line number	Diff line change
`@@ -358,7 +358,7 @@ private static DialogDescriptor createDialogDescriptor( JComponent content, Stri`
`358`	`358`	`return dd;`
`359`	`359`	`}`
`360`	`360`
`361`		`- @MimeRegistration(mimeType = "text/x-java", service = CodeGenerator.Factory.class)`
	`361`	`+ @MimeRegistration(mimeType = "text/x-java", service = CodeGenerator.Factory.class, position = 800)`
`362`	`362`	`public static class Factory implements CodeGenerator.Factory {`
`363`	`363`
`364`	`364`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@`
`46`	`46`	`)`
`47`	`47`	`@ActionReference(`
`48`	`48`	`path = "UI/ToolActions/Files",`
`49`		`- position = 300`
	`49`	`+ position = 250`
`50`	`50`	`)`
`51`	`51`	`@Messages("CTL_RecursiveDiffAction=Tree diff")`
`52`	`52`	`public final class RecursiveDiffAction extends NodeAction implements ActionListener {`
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,8 @@`
`63`	`63`	`)`
`64`	`64`	`@TopComponent.Registration(`
`65`	`65`	`mode = "editor",`
`66`		`- openAtStartup = false`
	`66`	`+ openAtStartup = false,`
	`67`	`+ position = 0`
`67`	`68`	`)`
`68`	`69`	`@Messages({`
`69`	`70`	`"CTL_TreeDiffViewerTopComponent=Tree diff",`
Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,7 @@`
`87`	`87`	`*`
`88`	`88`	`* @author lahvac`
`89`	`89`	`*/`
`90`		`-@MimeRegistration(mimeType="", service=CompletionProvider.class)`
	`90`	`+@MimeRegistration(mimeType="", service=CompletionProvider.class, position = 1000)`
`91`	`91`	`public class CompletionProviderImpl implements CompletionProvider {`
`92`	`92`
`93`	`93`	`private static final Logger LOG = Logger.getLogger(CompletionProviderImpl.class.getName());`
Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@`
`70`	`70`	`iconBase="org/netbeans/modules/texttools/accessories-text-editor.png",`
`71`	`71`	`persistenceType = TopComponent.PERSISTENCE_ONLY_OPENED`
`72`	`72`	`)`
`73`		`-@TopComponent.Registration(mode = "output", openAtStartup = false)`
	`73`	`+@TopComponent.Registration(mode = "output", openAtStartup = false, position = 3400)`
`74`	`74`	`@Messages({`
`75`	`75`	`"CTL_TextToolsAction=Text Tools",`
`76`	`76`	`"CTL_TextToolsTopComponent=Text Tools Window",`