# HG changeset patch
# User Aldo Brucale <aldobrucale@netbeans.org>
# Date 1263394417 -3600
# Node ID 6bdc51c895be3362817554c97b78e11ef845ded2
# Parent  8e22e00d2d002c86b631cf4847ad7e584ae4985c
Issue 179431 - Non closeable toolbars

diff --git a/core.windows/src/org/netbeans/core/windows/resources/layer.xml b/core.windows/src/org/netbeans/core/windows/resources/layer.xml
--- a/core.windows/src/org/netbeans/core/windows/resources/layer.xml
+++ b/core.windows/src/org/netbeans/core/windows/resources/layer.xml
@@ -222,6 +222,12 @@
                     <attr name="settings.instanceClass" stringvalue="org.netbeans.core.windows.view.ui.toolbars.ToolbarConfiguration"/>
                     <attr name="settings.instanceOf" stringvalue="org.openide.awt.ToolbarPool.Configuration"/>
                 </file>
+                <file name="DTD_toolbar_1_2.instance">
+                    <attr name="instanceCreate" methodvalue="org.netbeans.api.settings.Factory.create"/>
+                    <attr name="settings.convertor" methodvalue="org.netbeans.core.windows.view.ui.toolbars.ToolbarConvertor.create"/>
+                    <attr name="settings.instanceClass" stringvalue="org.netbeans.core.windows.view.ui.toolbars.ToolbarConfiguration"/>
+                    <attr name="settings.instanceOf" stringvalue="org.openide.awt.ToolbarPool.Configuration"/>
+                </file>
             </folder>
         </folder>
 
@@ -233,6 +239,9 @@
                 <file name="DTD_toolbar_1_1" url="nbres:/org/netbeans/core/windows/resources/toolbar1_1.dtd">
                     <attr name="hint.originalPublicID" stringvalue="-//NetBeans IDE//DTD toolbar 1.1//EN"/>
                 </file>
+                <file name="DTD_toolbar_1_2" url="nbres:/org/netbeans/core/windows/resources/toolbar1_2.dtd">
+                    <attr name="hint.originalPublicID" stringvalue="-//NetBeans IDE//DTD toolbar 1.2//EN"/>
+                </file>
             </folder>
 
             <folder name="NetBeans">
diff --git a/core.windows/src/org/netbeans/core/windows/resources/toolbar1_2.dtd b/core.windows/src/org/netbeans/core/windows/resources/toolbar1_2.dtd
new file mode 100644
--- /dev/null
+++ b/core.windows/src/org/netbeans/core/windows/resources/toolbar1_2.dtd
@@ -0,0 +1,18 @@
+ <!-- Document Type Declaration for toolbar configuration xml files. -->
+
+  <!-- Root element of toolbar configuration. It's a list of Rows. -->
+  <!ELEMENT Configuration (Row+)>
+
+  <!-- Toolbar configuration row. It's a list of Toolbars. -->
+  <!ELEMENT Row (Toolbar*)>
+
+  <!-- Toolbar configuration Toolbar. It contains name of toolbar,
+  it's position and switch of toolbar visibility. -->
+  <!ELEMENT Toolbar EMPTY>
+  <!ATTLIST Toolbar
+    name CDATA #REQUIRED
+    visible (true | false) #IMPLIED
+    align (left | right) #IMPLIED
+    draggable (true | false) #IMPLIED
+    closeable (true | false) #IMPLIED
+  >
diff --git a/core.windows/src/org/netbeans/core/windows/view/ui/toolbars/ToolbarConfiguration.java b/core.windows/src/org/netbeans/core/windows/view/ui/toolbars/ToolbarConfiguration.java
--- a/core.windows/src/org/netbeans/core/windows/view/ui/toolbars/ToolbarConfiguration.java
+++ b/core.windows/src/org/netbeans/core/windows/view/ui/toolbars/ToolbarConfiguration.java
@@ -154,7 +154,7 @@
             ToolbarConstraints tc = name2constr.get(tbName);
 
 
-            if (tc != null && tb != null) {
+            if (tc != null && tb != null && tc.isCloseable()) {
                 //May be null if a toolbar has been renamed
                 JCheckBoxMenuItem mi = new JCheckBoxMenuItem (
                     tb.getDisplayName(), tc.isVisible()
@@ -440,7 +440,7 @@
             boolean isQuickSearch = "QuickSearch".equals(toolbarName); //NOI18N
             tc = new ToolbarConstraints(toolbarName,
                     isQuickSearch ? ToolbarConstraints.Align.right : ToolbarConstraints.Align.left,
-                    true, true);
+                    true, true, true);
             ToolbarRow row = null; //TODO find / add row with the best available space
             if( rows.isEmpty() ) {
                 row = new ToolbarRow();
diff --git a/core.windows/src/org/netbeans/core/windows/view/ui/toolbars/ToolbarConstraints.java b/core.windows/src/org/netbeans/core/windows/view/ui/toolbars/ToolbarConstraints.java
--- a/core.windows/src/org/netbeans/core/windows/view/ui/toolbars/ToolbarConstraints.java
+++ b/core.windows/src/org/netbeans/core/windows/view/ui/toolbars/ToolbarConstraints.java
@@ -68,11 +68,14 @@
 
     private final boolean draggable;
 
-    public ToolbarConstraints( String name, Align align, boolean visible, boolean draggable ) {
+    private final boolean closeable;
+
+    public ToolbarConstraints( String name, Align align, boolean visible, boolean draggable, boolean closeable ) {
         this.name = name;
         this.draggable = draggable;
         this.align = align;
         this.visible = visible;
+        this.closeable = closeable;
     }
 
     public Align getAlign() {
@@ -83,6 +86,10 @@
         this.align = align;
     }
 
+    public boolean isCloseable() {
+        return closeable;
+    }
+
     public boolean isDraggable() {
         return draggable;
     }
diff --git a/core.windows/src/org/netbeans/core/windows/view/ui/toolbars/ToolbarConvertor.java b/core.windows/src/org/netbeans/core/windows/view/ui/toolbars/ToolbarConvertor.java
--- a/core.windows/src/org/netbeans/core/windows/view/ui/toolbars/ToolbarConvertor.java
+++ b/core.windows/src/org/netbeans/core/windows/view/ui/toolbars/ToolbarConvertor.java
@@ -78,6 +78,8 @@
     private static final String ATT_TOOLBAR_VISIBLE = "visible"; // NOI18N
     /** xml attribute for toolbar draggable */
     private static final String ATT_TOOLBAR_DRAGGABLE = "draggable"; // NOI18N
+    /** xml attribute for toolbar closeable */
+    private static final String ATT_TOOLBAR_CLOSEABLE = "closeable"; // NOI18N
 
     public static ToolbarConvertor create() {
         return new ToolbarConvertor();
@@ -112,7 +114,7 @@
         w.write("<?xml version=\"1.0\"?>"); //NOI18N
         w.newLine();
 
-        w.write("<!DOCTYPE Configuration PUBLIC \"-//NetBeans IDE//DTD toolbar 1.1//EN\" \"http://www.netbeans.org/dtds/toolbar1_1.dtd\">"); //NOI18N
+        w.write("<!DOCTYPE Configuration PUBLIC \"-//NetBeans IDE//DTD toolbar 1.2//EN\" \"http://www.netbeans.org/dtds/toolbar1_2.dtd\">"); //NOI18N
         w.newLine();
 
         w.write("<"); w.write(TAG_CONFIGURATION); w.write(">"); //NOI18N
@@ -131,6 +133,8 @@
                 w.write(" "); //NOI18N
                 w.write(ATT_TOOLBAR_DRAGGABLE); w.write("=\""); w.write(tc.isDraggable() ? "true" : "false"); w.write("\""); //NOI18N
                 w.write(" "); //NOI18N
+                w.write(ATT_TOOLBAR_CLOSEABLE); w.write("=\""); w.write(tc.isCloseable() ? "true" : "false"); w.write("\""); //NOI18N
+                w.write(" "); //NOI18N
                 w.write(ATT_TOOLBAR_ALIGNMENT); w.write("=\""); w.write(tc.getAlign().toString()); w.write("\""); //NOI18N
                 w.write("/>"); //NOI18N
                 w.newLine();
@@ -180,12 +184,14 @@
 
                 boolean draggable = !"false".equals( attributes.getValue(ATT_TOOLBAR_DRAGGABLE) ); //NOI18N
 
+                boolean closeable = !"false".equals( attributes.getValue(ATT_TOOLBAR_CLOSEABLE) ); //NOI18N
+
                 //#154332 - HACK always dock quick search toolbar to the right
                 //needed when importing toolbar settings from nb 6.5
                 if( "QuickSearch".equals( barName ) ) {
                     align = ToolbarConstraints.Align.right;
                 }
-                ToolbarConstraints tc = new ToolbarConstraints(barName, align, visible, draggable);
+                ToolbarConstraints tc = new ToolbarConstraints(barName, align, visible, draggable, closeable);
                 if( null != currentRow )
                     currentRow.addConstraint(tc);
             }
diff --git a/core.windows/src/org/netbeans/core/windows/view/ui/toolbars/ToolbarRow.java b/core.windows/src/org/netbeans/core/windows/view/ui/toolbars/ToolbarRow.java
--- a/core.windows/src/org/netbeans/core/windows/view/ui/toolbars/ToolbarRow.java
+++ b/core.windows/src/org/netbeans/core/windows/view/ui/toolbars/ToolbarRow.java
@@ -156,7 +156,7 @@
      * visualize toolbar drop feedback.
      */
     private void addDropConstraints() {
-        dropConstraints = new ToolbarConstraints(FAKE_NAME, ToolbarConstraints.Align.left, false, true);
+        dropConstraints = new ToolbarConstraints(FAKE_NAME, ToolbarConstraints.Align.left, false, true, true);
         dropReplacement = new JLabel();
         dropReplacement.setName(dropConstraints.getName());
         add( dropReplacement );
@@ -319,7 +319,7 @@
             constraints.add( constraints.indexOf(dropConstraints), dragConstraints );
         } else {
             //we've got a new toolbar, create new constraints for it
-            ToolbarConstraints newConstraints = new ToolbarConstraints( dropContainter.getName(), dropConstraints.getAlign(), true, true);
+            ToolbarConstraints newConstraints = new ToolbarConstraints( dropContainter.getName(), dropConstraints.getAlign(), true, true, true);
             add( dropContainter );
             constraints.add( constraints.indexOf(dropConstraints), newConstraints );
             name2constraint.put(newConstraints.getName(), newConstraints);