Skip to content

Commit cfe70c4

Browse files
committed
Fixes most layer position warnings and improved logging
The warning message will now include the position of the services to make picking a value easier. Tested activation of all clusters and maven project creation, only one root '/' warning is left to fix in the log. Might make the layer behave more deterministic in some cases. conflict fixes: RecursiveDiffAction -> 250 same position 300 for both UI/ToolActions/Files/org-netbeans-modules-diff-tree-RecursiveDiffAction.shadow and UI/ToolActions/Files/org-netbeans-modules-favorites-Add.shadow Native -> 660 same position 650 for both Templates/Project/GradleGroovy and Templates/Project/Native ordering fixes: TextToolsTopComponent -> 3400 Not all children in Windows2/Modes/output/ marked with the position attribute: [TextToolsTopComponent.wstcref], but some are: [watchesView.wstcref, NotificationCenterTopComponent.wstcref, ...] InlineHints -> 0 Not all children in OptionsDialog/Editor/ marked with the position attribute: [InlineHints], but some are: [CodeCompletion, Formatting, Hints, MarkOccurrences, ...] CoverageReportTopComponent -> 0 TreeDiffViewerTopComponent -> 0 Not all children in Windows2/Modes/editor/ marked with the position attribute: [TreeDiffViewerTopComponent.wstcref, CoverageReportTopComponent.wstcref], but some are: [DashboardDisplayer.wstcref] settings.xml -> 110 Not all children in Templates/Project/Maven2/ marked with the position attribute: [settings.xml], but some are: [JavaApp, org-netbeans-modules-maven-j2ee-ui-wizard-EEWizardIterator-createWebAppIterator, ...] CompletionProviderImpl -> 1000 Not all children in / marked with the position attribute: [org-netbeans-modules-lsp-client-bindings-CompletionProviderImpl.instance], but some are: [org-netbeans-modules-editor-java-JavaCompletionProvider.instance, ...] WordCompletion -> 600 (across several layer registrations) Not all children in / marked with the position attribute: [org-netbeans-modules-spellchecker-completion-WordCompletion.instance], but some are: [org-netbeans-modules-lsp-client-bindings-CompletionProviderImpl.instance@1000]
1 parent 1761006 commit cfe70c4

File tree

11 files changed

+38
-15
lines changed

11 files changed

+38
-15
lines changed

cpplite/cpplite.project/src/org/netbeans/modules/cpplite/project/layer.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<folder name="Templates">
2525
<folder name="Project">
2626
<folder name="Native">
27-
<attr name="position" intvalue="650"/>
27+
<attr name="position" intvalue="660"/>
2828
<attr name="displayName" bundlevalue="org.netbeans.modules.cpplite.project.Bundle#CPPLite_NewProject" />
2929
</folder>
3030
</folder>

ide/diff/src/org/netbeans/modules/diff/tree/RecursiveDiffAction.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
)
4747
@ActionReference(
4848
path = "UI/ToolActions/Files",
49-
position = 300
49+
position = 250
5050
)
5151
@Messages("CTL_RecursiveDiffAction=Tree diff")
5252
public final class RecursiveDiffAction extends NodeAction implements ActionListener {

ide/diff/src/org/netbeans/modules/diff/tree/TreeDiffViewerTopComponent.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,8 @@
6363
)
6464
@TopComponent.Registration(
6565
mode = "editor",
66-
openAtStartup = false
66+
openAtStartup = false,
67+
position = 0
6768
)
6869
@Messages({
6970
"CTL_TreeDiffViewerTopComponent=Tree diff",

ide/gsf.codecoverage/src/org/netbeans/modules/gsf/codecoverage/layer.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,9 @@
3636
<folder name="Windows2">
3737
<folder name="Modes">
3838
<folder name="editor">
39-
<file name="CoverageReportTopComponent.wstcref" url="CoverageReportTopComponentWstcref.xml"/>
39+
<file name="CoverageReportTopComponent.wstcref" url="CoverageReportTopComponentWstcref.xml">
40+
<attr name="position" intvalue="0"/>
41+
</file>
4042
</folder>
4143
</folder>
4244
</folder>

ide/lsp.client/src/org/netbeans/modules/lsp/client/bindings/CompletionProviderImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@
8787
*
8888
* @author lahvac
8989
*/
90-
@MimeRegistration(mimeType="", service=CompletionProvider.class)
90+
@MimeRegistration(mimeType="", service=CompletionProvider.class, position = 1000)
9191
public class CompletionProviderImpl implements CompletionProvider {
9292

9393
private static final Logger LOG = Logger.getLogger(CompletionProviderImpl.class.getName());

ide/spellchecker.bindings.htmlxml/src/org/netbeans/modules/spellchecker/bindings/htmlxml/layer.xml

Lines changed: 23 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,55 +28,71 @@
2828
<file name="org-netbeans-modules-spellchecker-bindings-htmlxml-HtmlXmlTokenListProvider.instance" />
2929
</folder>
3030
<folder name="CompletionProviders">
31-
<file name="org-netbeans-modules-spellchecker-completion-WordCompletion.instance"/>
31+
<file name="org-netbeans-modules-spellchecker-completion-WordCompletion.instance">
32+
<attr name="position" intvalue="600"/>
33+
</file>
3234
</folder>
3335
</folder>
3436
<folder name="xhtml">
3537
<folder name="TokenListProvider">
3638
<file name="org-netbeans-modules-spellchecker-bindings-htmlxml-HtmlXmlTokenListProvider.instance" />
3739
</folder>
3840
<folder name="CompletionProviders">
39-
<file name="org-netbeans-modules-spellchecker-completion-WordCompletion.instance"/>
41+
<file name="org-netbeans-modules-spellchecker-completion-WordCompletion.instance">
42+
<attr name="position" intvalue="600"/>
43+
</file>
4044
</folder>
4145
</folder>
4246
<folder name="x-php5">
4347
<folder name="TokenListProvider">
4448
<file name="org-netbeans-modules-spellchecker-bindings-htmlxml-HtmlXmlTokenListProvider.instance" />
4549
</folder>
4650
<folder name="CompletionProviders">
47-
<file name="org-netbeans-modules-spellchecker-completion-WordCompletion.instance"/>
51+
<file name="org-netbeans-modules-spellchecker-completion-WordCompletion.instance">
52+
<!-- none of the php completion poviders have currently a position
53+
<attr name="position" intvalue="600"/>
54+
-->
55+
</file>
4856
</folder>
4957
</folder>
5058
<folder name="x-jsp">
5159
<folder name="TokenListProvider">
5260
<file name="org-netbeans-modules-spellchecker-bindings-htmlxml-HtmlXmlTokenListProvider.instance" />
5361
</folder>
5462
<folder name="CompletionProviders">
55-
<file name="org-netbeans-modules-spellchecker-completion-WordCompletion.instance"/>
63+
<file name="org-netbeans-modules-spellchecker-completion-WordCompletion.instance">
64+
<attr name="position" intvalue="600"/>
65+
</file>
5666
</folder>
5767
</folder>
5868
<folder name="x-tag">
5969
<folder name="TokenListProvider">
6070
<file name="org-netbeans-modules-spellchecker-bindings-htmlxml-HtmlXmlTokenListProvider.instance" />
6171
</folder>
6272
<folder name="CompletionProviders">
63-
<file name="org-netbeans-modules-spellchecker-completion-WordCompletion.instance"/>
73+
<file name="org-netbeans-modules-spellchecker-completion-WordCompletion.instance">
74+
<attr name="position" intvalue="600"/>
75+
</file>
6476
</folder>
6577
</folder>
6678
<folder name="x-gsp">
6779
<folder name="TokenListProvider">
6880
<file name="org-netbeans-modules-spellchecker-bindings-htmlxml-HtmlXmlTokenListProvider.instance" />
6981
</folder>
7082
<folder name="CompletionProviders">
71-
<file name="org-netbeans-modules-spellchecker-completion-WordCompletion.instance"/>
83+
<file name="org-netbeans-modules-spellchecker-completion-WordCompletion.instance">
84+
<attr name="position" intvalue="600"/>
85+
</file>
7286
</folder>
7387
</folder>
7488
<folder name="xml">
7589
<folder name="TokenListProvider">
7690
<file name="org-netbeans-modules-spellchecker-bindings-htmlxml-HtmlXmlTokenListProvider.instance" />
7791
</folder>
7892
<folder name="CompletionProviders">
79-
<file name="org-netbeans-modules-spellchecker-completion-WordCompletion.instance"/>
93+
<file name="org-netbeans-modules-spellchecker-completion-WordCompletion.instance">
94+
<attr name="position" intvalue="600"/>
95+
</file>
8096
</folder>
8197
</folder>
8298
</folder>

ide/spellchecker.bindings.properties/src/org/netbeans/modules/spellchecker/bindings/properties/layer.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,9 @@
2828
<file name="org-netbeans-modules-spellchecker-bindings-properties-PropertiesTokenListProvider.instance" />
2929
</folder>
3030
<folder name="CompletionProviders">
31-
<file name="org-netbeans-modules-spellchecker-completion-WordCompletion.instance"/>
31+
<file name="org-netbeans-modules-spellchecker-completion-WordCompletion.instance">
32+
<attr name="position" intvalue="600"/>
33+
</file>
3234
</folder>
3335
</folder>
3436
</folder>

ide/texttools/src/org/netbeans/modules/texttools/TextToolsTopComponent.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
iconBase="org/netbeans/modules/texttools/accessories-text-editor.png",
7171
persistenceType = TopComponent.PERSISTENCE_ONLY_OPENED
7272
)
73-
@TopComponent.Registration(mode = "output", openAtStartup = false)
73+
@TopComponent.Registration(mode = "output", openAtStartup = false, position = 3400)
7474
@Messages({
7575
"CTL_TextToolsAction=Text Tools",
7676
"CTL_TextToolsTopComponent=Text Tools Window",

java/java.editor/src/org/netbeans/modules/java/editor/resources/layer.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -448,6 +448,7 @@
448448
</folder>
449449
</folder>
450450
<folder name="InlineHints">
451+
<attr name="position" intvalue="0"/>
451452
<folder name="text">
452453
<folder name="x-java">
453454
<file name="JavaInlineHints.instance">

java/maven/src/org/netbeans/modules/maven/layer.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@
5353
<file name="settings.xml" url="settings.template.xml">
5454
<attr name="javax.script.ScriptEngine" stringvalue="freemarker"/>
5555
<attr name="template.openFile" boolvalue="false"/>
56+
<attr name="position" intvalue="110"/>
5657
</file>
5758
</folder>
5859
</folder>

0 commit comments

Comments
 (0)