From 214f39ae9655d87a9610aaedf8789d9cf06fd3b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matthias=20Bl=C3=A4sing?= <mblaesing@doppel-helix.eu>
Date: Mon, 1 Apr 2024 20:28:51 +0200
Subject: [PATCH] Register comment/uncomment action in editor toolbar for
 properties and XML files

Closes: #7207
---
 .../netbeans/modules/properties/syntax/Layer.xml | 16 ++++++++++++++++
 .../modules/xml/tools/resources/mf-layer.xml     | 12 +++++++++++-
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/ide/properties.syntax/src/org/netbeans/modules/properties/syntax/Layer.xml b/ide/properties.syntax/src/org/netbeans/modules/properties/syntax/Layer.xml
index 46a752c90810..881cbbcbd163 100644
--- a/ide/properties.syntax/src/org/netbeans/modules/properties/syntax/Layer.xml
+++ b/ide/properties.syntax/src/org/netbeans/modules/properties/syntax/Layer.xml
@@ -57,6 +57,22 @@
                     <attr name="instanceOf" stringvalue="javax.swing.text.EditorKit,org.netbeans.modules.properties.syntax.PropertiesKit"/>
                     <attr name="beaninfo" boolvalue="false"/>
                 </file>
+
+                <folder name="Toolbars">
+                    <folder name="Default">
+                        <!-- Comment-Entries added based on LanguageRegistrationProcessor#registerCommentUncommentToolbarButtons -->
+                        <file name="Separator-before-comment.instance">
+                            <attr name="instanceClass" stringvalue="javax.swing.JSeparator"/>
+                            <attr intvalue="30000" name="position"/>
+                        </file>
+                        <file name="comment">
+                            <attr intvalue="30100" name="position"/>
+                        </file>
+                        <file name="uncomment">
+                            <attr intvalue="30200" name="position"/>
+                        </file>
+                    </folder>
+                </folder>
             </folder>
         </folder>
     </folder>
diff --git a/ide/xml.tools/src/org/netbeans/modules/xml/tools/resources/mf-layer.xml b/ide/xml.tools/src/org/netbeans/modules/xml/tools/resources/mf-layer.xml
index 19cf7a6f0ab1..3db783ad7643 100644
--- a/ide/xml.tools/src/org/netbeans/modules/xml/tools/resources/mf-layer.xml
+++ b/ide/xml.tools/src/org/netbeans/modules/xml/tools/resources/mf-layer.xml
@@ -123,7 +123,6 @@
             <folder name="xml">
                 <folder name="Toolbars">
                     <folder name="Default">
-<!--                        <attr name="xml-uncomment/XMLSeparator1.instance" boolvalue="true"/>-->
                         <file name="XMLSeparator1.instance">
                             <attr name="instanceClass" stringvalue="javax.swing.JSeparator"/>
                             <attr name="position" intvalue="19100"/>
@@ -136,6 +135,17 @@
                             <attr name="originalFile" stringvalue="Actions/XML/org-netbeans-modules-xml-tools-actions-ValidateAction.instance"/>
                             <attr name="position" intvalue="19300"/>
                         </file>
+                        <!-- Comment-Entries added based on LanguageRegistrationProcessor#registerCommentUncommentToolbarButtons -->
+                        <file name="Separator-before-comment.instance">
+                            <attr name="instanceClass" stringvalue="javax.swing.JSeparator"/>
+                            <attr intvalue="30000" name="position"/>
+                        </file>
+                        <file name="comment">
+                            <attr intvalue="30100" name="position"/>
+                        </file>
+                        <file name="uncomment">
+                            <attr intvalue="30200" name="position"/>
+                        </file>
                     </folder> <!-- Default -->
                 </folder> <!-- Toolbars -->
             </folder> <!-- xml -->