You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by cm...@apache.org on 2012/08/20 03:40:47 UTC

svn commit: r1374893 [3/5] - in /incubator/ooo/devtools/netbeansintegration/trunk: nbproject/ src/org/openoffice/extensions/config/ src/org/openoffice/extensions/filetypes/implobject/ src/org/openoffice/extensions/filetypes/oxt/window/ src/org/openoffi...

Modified: incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/projecttemplates/addon/AddOnPanelVisual2Description.form
URL: http://svn.apache.org/viewvc/incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/projecttemplates/addon/AddOnPanelVisual2Description.form?rev=1374893&r1=1374892&r2=1374893&view=diff
==============================================================================
--- incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/projecttemplates/addon/AddOnPanelVisual2Description.form (original)
+++ incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/projecttemplates/addon/AddOnPanelVisual2Description.form Mon Aug 20 01:40:43 2012
@@ -8,9 +8,10 @@
   <AuxValues>
     <AuxValue name="FormSettings_autoResourcing" type="java.lang.Integer" value="0"/>
     <AuxValue name="FormSettings_autoSetComponentName" type="java.lang.Boolean" value="false"/>
+    <AuxValue name="FormSettings_generateFQN" type="java.lang.Boolean" value="true"/>
     <AuxValue name="FormSettings_generateMnemonicsCode" type="java.lang.Boolean" value="true"/>
     <AuxValue name="FormSettings_i18nAutoMode" type="java.lang.Boolean" value="false"/>
-    <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" value="2"/>
+    <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" value="1"/>
     <AuxValue name="FormSettings_listenerGenerationStyle" type="java.lang.Integer" value="0"/>
     <AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" value="false"/>
     <AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" value="2"/>

Modified: incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/projecttemplates/addon/AddOnPanelVisual2Description.java
URL: http://svn.apache.org/viewvc/incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/projecttemplates/addon/AddOnPanelVisual2Description.java?rev=1374893&r1=1374892&r2=1374893&view=diff
==============================================================================
--- incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/projecttemplates/addon/AddOnPanelVisual2Description.java (original)
+++ incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/projecttemplates/addon/AddOnPanelVisual2Description.java Mon Aug 20 01:40:43 2012
@@ -105,8 +105,9 @@ public class AddOnPanelVisual2Descriptio
      * WARNING: Do NOT modify this code. The content of this method is
      * always regenerated by the Form Editor.
      */
-    // <editor-fold defaultstate="collapsed" desc=" Generated Code ">//GEN-BEGIN:initComponents
+    // <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
     private void initComponents() {
+
         jSplitPane1 = new javax.swing.JSplitPane();
         jPanel1 = new PropertySheet();
         jScrollPane1 = new TreeTableView();
@@ -117,83 +118,85 @@ public class AddOnPanelVisual2Descriptio
 
         setAutoscrolls(true);
         setRequestFocusEnabled(false);
+
         jSplitPane1.setDividerLocation(200);
         jSplitPane1.setForeground(java.awt.Color.white);
+
         jPanel1.setBorder(javax.swing.BorderFactory.createEtchedBorder());
         jPanel1.setMinimumSize(new java.awt.Dimension(5, 10));
-        jPanel1.setName("properties");
+        jPanel1.setName("properties"); // NOI18N
         jPanel1.setPreferredSize(new java.awt.Dimension(5, 10));
         jSplitPane1.setRightComponent(jPanel1);
 
         jScrollPane1.setBorder(javax.swing.BorderFactory.createEtchedBorder());
         jScrollPane1.setFocusTraversalPolicy(getFocusTraversalPolicy());
         jScrollPane1.setMinimumSize(new java.awt.Dimension(5, 10));
-        jScrollPane1.setName("commands");
+        jScrollPane1.setName("commands"); // NOI18N
         jScrollPane1.setPreferredSize(new java.awt.Dimension(5, 10));
         jSplitPane1.setLeftComponent(jScrollPane1);
 
-        org.openide.awt.Mnemonics.setLocalizedText(addFunctionButton, org.openide.util.NbBundle.getMessage(AddOnWizardIterator.class, "LBL_BUTTON_AddCommand"));
-        addFunctionButton.setToolTipText(NbBundle.getMessage(AddOnPanelVisual2Description.class, "BUTTON_AddFunction_Tooltip"));
-        addFunctionButton.setName("addCommand");
+        org.openide.awt.Mnemonics.setLocalizedText(addFunctionButton, org.openide.util.NbBundle.getMessage(AddOnWizardIterator.class, "LBL_BUTTON_AddCommand")); // NOI18N
+        addFunctionButton.setToolTipText(NbBundle.getMessage(AddOnPanelVisual2Description.class, "BUTTON_AddFunction_Tooltip")); // NOI18N
+        addFunctionButton.setName("addCommand"); // NOI18N
         addFunctionButton.addActionListener(new java.awt.event.ActionListener() {
             public void actionPerformed(java.awt.event.ActionEvent evt) {
                 addFunctionButtonActionPerformed(evt);
             }
         });
 
-        org.openide.awt.Mnemonics.setLocalizedText(deleteLanguageButton, org.openide.util.NbBundle.getMessage(AddOnWizardIterator.class, "LBL_BUTTON_DeleteLanguage"));
-        deleteLanguageButton.setToolTipText(NbBundle.getMessage(AddOnPanelVisual2Description.class, "BUTTON_DeleteLang_Tooltip"));
-        deleteLanguageButton.setName("deleteLanguage");
+        org.openide.awt.Mnemonics.setLocalizedText(deleteLanguageButton, org.openide.util.NbBundle.getMessage(AddOnWizardIterator.class, "LBL_BUTTON_DeleteLanguage")); // NOI18N
+        deleteLanguageButton.setToolTipText(NbBundle.getMessage(AddOnPanelVisual2Description.class, "BUTTON_DeleteLang_Tooltip")); // NOI18N
+        deleteLanguageButton.setName("deleteLanguage"); // NOI18N
         deleteLanguageButton.addActionListener(new java.awt.event.ActionListener() {
             public void actionPerformed(java.awt.event.ActionEvent evt) {
                 deleteLanguageButtonActionPerformed(evt);
             }
         });
 
-        org.openide.awt.Mnemonics.setLocalizedText(deleteButton, org.openide.util.NbBundle.getMessage(AddOnPanelVisual2Description.class, "LBL_BUTTON_Delete"));
-        deleteButton.setToolTipText(NbBundle.getMessage(AddOnPanelVisual2Description.class, "BUTTON_Delete_Tooltip"));
-        deleteButton.setName("deleteCommand");
+        org.openide.awt.Mnemonics.setLocalizedText(deleteButton, org.openide.util.NbBundle.getMessage(AddOnPanelVisual2Description.class, "LBL_BUTTON_Delete")); // NOI18N
+        deleteButton.setToolTipText(NbBundle.getMessage(AddOnPanelVisual2Description.class, "BUTTON_Delete_Tooltip")); // NOI18N
+        deleteButton.setName("deleteCommand"); // NOI18N
         deleteButton.addActionListener(new java.awt.event.ActionListener() {
             public void actionPerformed(java.awt.event.ActionEvent evt) {
                 deleteButtonActionPerformed(evt);
             }
         });
 
-        org.openide.awt.Mnemonics.setLocalizedText(addLanguageButton, org.openide.util.NbBundle.getMessage(AddOnWizardIterator.class, "LBL_BUTTON_AddLanguage"));
-        addLanguageButton.setToolTipText(NbBundle.getMessage(AddOnPanelVisual2Description.class, "BUTTON_AddLang_Tooltip"));
-        addLanguageButton.setName("addLanguage");
+        org.openide.awt.Mnemonics.setLocalizedText(addLanguageButton, org.openide.util.NbBundle.getMessage(AddOnWizardIterator.class, "LBL_BUTTON_AddLanguage")); // NOI18N
+        addLanguageButton.setToolTipText(NbBundle.getMessage(AddOnPanelVisual2Description.class, "BUTTON_AddLang_Tooltip")); // NOI18N
+        addLanguageButton.setName("addLanguage"); // NOI18N
         addLanguageButton.addActionListener(new java.awt.event.ActionListener() {
             public void actionPerformed(java.awt.event.ActionEvent evt) {
                 addLanguageButtonActionPerformed(evt);
             }
         });
 
-        org.jdesktop.layout.GroupLayout layout = new org.jdesktop.layout.GroupLayout(this);
+        javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
         this.setLayout(layout);
         layout.setHorizontalGroup(
-            layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-            .add(org.jdesktop.layout.GroupLayout.TRAILING, layout.createSequentialGroup()
-                .add(jSplitPane1, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 405, Short.MAX_VALUE)
-                .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-                    .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING)
-                        .add(addFunctionButton, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 152, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
-                        .add(deleteButton, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 152, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
-                    .add(deleteLanguageButton, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 152, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
-                    .add(addLanguageButton, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 152, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
+            layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+            .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup()
+                .addComponent(jSplitPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 405, Short.MAX_VALUE)
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                    .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
+                        .addComponent(addFunctionButton, javax.swing.GroupLayout.PREFERRED_SIZE, 152, javax.swing.GroupLayout.PREFERRED_SIZE)
+                        .addComponent(deleteButton, javax.swing.GroupLayout.PREFERRED_SIZE, 152, javax.swing.GroupLayout.PREFERRED_SIZE))
+                    .addComponent(deleteLanguageButton, javax.swing.GroupLayout.PREFERRED_SIZE, 152, javax.swing.GroupLayout.PREFERRED_SIZE)
+                    .addComponent(addLanguageButton, javax.swing.GroupLayout.PREFERRED_SIZE, 152, javax.swing.GroupLayout.PREFERRED_SIZE))
                 .addContainerGap())
         );
         layout.setVerticalGroup(
-            layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-            .add(layout.createSequentialGroup()
-                .add(addFunctionButton)
-                .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                .add(deleteButton)
-                .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED, 364, Short.MAX_VALUE)
-                .add(addLanguageButton)
-                .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                .add(deleteLanguageButton))
-            .add(org.jdesktop.layout.GroupLayout.TRAILING, jSplitPane1, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 488, Short.MAX_VALUE)
+            layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+            .addGroup(layout.createSequentialGroup()
+                .addComponent(addFunctionButton)
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                .addComponent(deleteButton)
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 372, Short.MAX_VALUE)
+                .addComponent(addLanguageButton)
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                .addComponent(deleteLanguageButton))
+            .addComponent(jSplitPane1, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, 500, Short.MAX_VALUE)
         );
     }// </editor-fold>//GEN-END:initComponents
 

Modified: incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/projecttemplates/addon/AddOnPanelVisual3Menubar.form
URL: http://svn.apache.org/viewvc/incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/projecttemplates/addon/AddOnPanelVisual3Menubar.form?rev=1374893&r1=1374892&r2=1374893&view=diff
==============================================================================
--- incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/projecttemplates/addon/AddOnPanelVisual3Menubar.form (original)
+++ incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/projecttemplates/addon/AddOnPanelVisual3Menubar.form Mon Aug 20 01:40:43 2012
@@ -8,9 +8,10 @@
   <AuxValues>
     <AuxValue name="FormSettings_autoResourcing" type="java.lang.Integer" value="0"/>
     <AuxValue name="FormSettings_autoSetComponentName" type="java.lang.Boolean" value="false"/>
+    <AuxValue name="FormSettings_generateFQN" type="java.lang.Boolean" value="true"/>
     <AuxValue name="FormSettings_generateMnemonicsCode" type="java.lang.Boolean" value="true"/>
     <AuxValue name="FormSettings_i18nAutoMode" type="java.lang.Boolean" value="false"/>
-    <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" value="2"/>
+    <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" value="1"/>
     <AuxValue name="FormSettings_listenerGenerationStyle" type="java.lang.Integer" value="0"/>
     <AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" value="false"/>
     <AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" value="2"/>

Modified: incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/projecttemplates/addon/AddOnPanelVisual3Menubar.java
URL: http://svn.apache.org/viewvc/incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/projecttemplates/addon/AddOnPanelVisual3Menubar.java?rev=1374893&r1=1374892&r2=1374893&view=diff
==============================================================================
--- incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/projecttemplates/addon/AddOnPanelVisual3Menubar.java (original)
+++ incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/projecttemplates/addon/AddOnPanelVisual3Menubar.java Mon Aug 20 01:40:43 2012
@@ -101,8 +101,9 @@ public class AddOnPanelVisual3Menubar ex
      * WARNING: Do NOT modify this code. The content of this method is
      * always regenerated by the Form Editor.
      */
-    // <editor-fold defaultstate="collapsed" desc=" Generated Code ">//GEN-BEGIN:initComponents
+    // <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
     private void initComponents() {
+
         jSplitPane1 = new javax.swing.JSplitPane();
         jPanel1 = new PropertySheet();
         jScrollPane1 = new TreeTableView();
@@ -117,66 +118,68 @@ public class AddOnPanelVisual3Menubar ex
 
         setAutoscrolls(true);
         setRequestFocusEnabled(false);
+
         jSplitPane1.setDividerLocation(200);
         jSplitPane1.setForeground(java.awt.Color.white);
+
         jPanel1.setBorder(javax.swing.BorderFactory.createEtchedBorder());
         jPanel1.setMinimumSize(new java.awt.Dimension(5, 10));
-        jPanel1.setName("properties");
+        jPanel1.setName("properties"); // NOI18N
         jPanel1.setPreferredSize(new java.awt.Dimension(5, 10));
         jSplitPane1.setRightComponent(jPanel1);
 
         jScrollPane1.setBorder(javax.swing.BorderFactory.createEtchedBorder());
         jScrollPane1.setFocusTraversalPolicy(getFocusTraversalPolicy());
         jScrollPane1.setMinimumSize(new java.awt.Dimension(5, 10));
-        jScrollPane1.setName("menuStructure");
+        jScrollPane1.setName("menuStructure"); // NOI18N
         jScrollPane1.setPreferredSize(new java.awt.Dimension(5, 10));
         jSplitPane1.setLeftComponent(jScrollPane1);
 
-        org.openide.awt.Mnemonics.setLocalizedText(addMenuButton, NbBundle.getMessage(AddOnPanelVisual3Menubar.class, "LBL_BUTTON_AddSubMenu"));
-        addMenuButton.setToolTipText(NbBundle.getMessage(AddOnPanelVisual3Menubar.class, "BUTTON_AddSubMenu_Tooltip"));
-        addMenuButton.setName("addMenu");
+        org.openide.awt.Mnemonics.setLocalizedText(addMenuButton, NbBundle.getMessage(AddOnPanelVisual3Menubar.class, "LBL_BUTTON_AddSubMenu")); // NOI18N
+        addMenuButton.setToolTipText(NbBundle.getMessage(AddOnPanelVisual3Menubar.class, "BUTTON_AddSubMenu_Tooltip")); // NOI18N
+        addMenuButton.setName("addMenu"); // NOI18N
         addMenuButton.addActionListener(new java.awt.event.ActionListener() {
             public void actionPerformed(java.awt.event.ActionEvent evt) {
                 addMenuButtonActionPerformed(evt);
             }
         });
 
-        org.openide.awt.Mnemonics.setLocalizedText(addSeparatorButton, NbBundle.getMessage(AddOnPanelVisual3Menubar.class, "LBL_BUTTON_AddSeparator"));
-        addSeparatorButton.setName("addSeparator");
+        org.openide.awt.Mnemonics.setLocalizedText(addSeparatorButton, NbBundle.getMessage(AddOnPanelVisual3Menubar.class, "LBL_BUTTON_AddSeparator")); // NOI18N
+        addSeparatorButton.setName("addSeparator"); // NOI18N
         addSeparatorButton.addActionListener(new java.awt.event.ActionListener() {
             public void actionPerformed(java.awt.event.ActionEvent evt) {
                 addSeparatorButtonActionPerformed(evt);
             }
         });
 
-        upButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/openoffice/extensions/projecttemplates/addon/icons/up.gif")));
-        upButton.setToolTipText(org.openide.util.NbBundle.getMessage(AddOnPanelVisual3Menubar.class, "LBL_BUTTON_Delete"));
-        upButton.setName("up");
+        upButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/openoffice/extensions/projecttemplates/addon/icons/up.gif"))); // NOI18N
+        upButton.setToolTipText(org.openide.util.NbBundle.getMessage(AddOnPanelVisual3Menubar.class, "LBL_BUTTON_Delete")); // NOI18N
+        upButton.setName("up"); // NOI18N
         upButton.addActionListener(new java.awt.event.ActionListener() {
             public void actionPerformed(java.awt.event.ActionEvent evt) {
                 upButtonActionPerformed(evt);
             }
         });
 
-        downButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/openoffice/extensions/projecttemplates/addon/icons/down.gif")));
-        downButton.setToolTipText(org.openide.util.NbBundle.getMessage(AddOnPanelVisual3Menubar.class, "LBL_BUTTON_Delete"));
-        downButton.setName("down");
+        downButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/openoffice/extensions/projecttemplates/addon/icons/down.gif"))); // NOI18N
+        downButton.setToolTipText(org.openide.util.NbBundle.getMessage(AddOnPanelVisual3Menubar.class, "LBL_BUTTON_Delete")); // NOI18N
+        downButton.setName("down"); // NOI18N
         downButton.addActionListener(new java.awt.event.ActionListener() {
             public void actionPerformed(java.awt.event.ActionEvent evt) {
                 downButtonActionPerformed(evt);
             }
         });
 
-        org.openide.awt.Mnemonics.setLocalizedText(removeCommandButton, NbBundle.getMessage(AddOnPanelVisual3Menubar.class, "LBL_BUTTON_Delete"));
-        removeCommandButton.setName("delete");
+        org.openide.awt.Mnemonics.setLocalizedText(removeCommandButton, NbBundle.getMessage(AddOnPanelVisual3Menubar.class, "LBL_BUTTON_Delete")); // NOI18N
+        removeCommandButton.setName("delete"); // NOI18N
         removeCommandButton.addActionListener(new java.awt.event.ActionListener() {
             public void actionPerformed(java.awt.event.ActionEvent evt) {
                 removeCommandButtonActionPerformed(evt);
             }
         });
 
-        org.openide.awt.Mnemonics.setLocalizedText(addCommandsButton, NbBundle.getMessage(AddOnPanelVisual3Menubar.class, "LBL_BUTTON_AddCommand"));
-        addCommandsButton.setName("addCommand");
+        org.openide.awt.Mnemonics.setLocalizedText(addCommandsButton, NbBundle.getMessage(AddOnPanelVisual3Menubar.class, "LBL_BUTTON_AddCommand")); // NOI18N
+        addCommandsButton.setName("addCommand"); // NOI18N
         addCommandsButton.addActionListener(new java.awt.event.ActionListener() {
             public void actionPerformed(java.awt.event.ActionEvent evt) {
                 addCommandsButtonActionPerformed(evt);
@@ -192,58 +195,58 @@ public class AddOnPanelVisual3Menubar ex
 
         jLabel1.setHorizontalAlignment(javax.swing.SwingConstants.LEFT);
         jLabel1.setLabelFor(previewComboBox);
-        org.openide.awt.Mnemonics.setLocalizedText(jLabel1, NbBundle.getMessage(AddOnPanelVisual3Menubar.class, "LBL_Preview"));
+        org.openide.awt.Mnemonics.setLocalizedText(jLabel1, NbBundle.getMessage(AddOnPanelVisual3Menubar.class, "LBL_Preview")); // NOI18N
         jLabel1.setHorizontalTextPosition(javax.swing.SwingConstants.RIGHT);
 
-        org.jdesktop.layout.GroupLayout layout = new org.jdesktop.layout.GroupLayout(this);
+        javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
         this.setLayout(layout);
         layout.setHorizontalGroup(
-            layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-            .add(org.jdesktop.layout.GroupLayout.TRAILING, layout.createSequentialGroup()
-                .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-                    .add(org.jdesktop.layout.GroupLayout.TRAILING, layout.createSequentialGroup()
-                        .add(jLabel1, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 91, Short.MAX_VALUE)
-                        .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                        .add(previewComboBox, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 350, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
-                    .add(jSplitPane1, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 453, Short.MAX_VALUE))
-                .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-                    .add(layout.createSequentialGroup()
-                        .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                        .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-                            .add(addMenuButton, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 179, Short.MAX_VALUE)
-                            .add(addSeparatorButton, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 179, Short.MAX_VALUE)
-                            .add(addCommandsButton, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 179, Short.MAX_VALUE)
-                            .add(removeCommandButton, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 179, Short.MAX_VALUE)))
-                    .add(layout.createSequentialGroup()
-                        .add(46, 46, 46)
-                        .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING)
-                            .add(org.jdesktop.layout.GroupLayout.LEADING, downButton, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 63, Short.MAX_VALUE)
-                            .add(org.jdesktop.layout.GroupLayout.LEADING, upButton, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
-                        .add(76, 76, 76)))
+            layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+            .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup()
+                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                    .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup()
+                        .addComponent(jLabel1, javax.swing.GroupLayout.DEFAULT_SIZE, 91, Short.MAX_VALUE)
+                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                        .addComponent(previewComboBox, javax.swing.GroupLayout.PREFERRED_SIZE, 350, javax.swing.GroupLayout.PREFERRED_SIZE))
+                    .addComponent(jSplitPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 453, Short.MAX_VALUE))
+                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                    .addGroup(layout.createSequentialGroup()
+                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                        .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                            .addComponent(addMenuButton, javax.swing.GroupLayout.DEFAULT_SIZE, 179, Short.MAX_VALUE)
+                            .addComponent(addSeparatorButton, javax.swing.GroupLayout.DEFAULT_SIZE, 179, Short.MAX_VALUE)
+                            .addComponent(addCommandsButton, javax.swing.GroupLayout.DEFAULT_SIZE, 179, Short.MAX_VALUE)
+                            .addComponent(removeCommandButton, javax.swing.GroupLayout.DEFAULT_SIZE, 179, Short.MAX_VALUE)))
+                    .addGroup(layout.createSequentialGroup()
+                        .addGap(46, 46, 46)
+                        .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
+                            .addComponent(downButton, javax.swing.GroupLayout.Alignment.LEADING, javax.swing.GroupLayout.DEFAULT_SIZE, 63, Short.MAX_VALUE)
+                            .addComponent(upButton, javax.swing.GroupLayout.Alignment.LEADING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+                        .addGap(76, 76, 76)))
                 .addContainerGap())
         );
         layout.setVerticalGroup(
-            layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-            .add(layout.createSequentialGroup()
-                .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
-                    .add(previewComboBox, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
-                    .add(jLabel1, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 23, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
-                .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING)
-                    .add(org.jdesktop.layout.GroupLayout.LEADING, layout.createSequentialGroup()
-                        .add(addMenuButton)
-                        .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                        .add(addSeparatorButton)
-                        .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                        .add(addCommandsButton)
-                        .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                        .add(removeCommandButton)
-                        .add(50, 50, 50)
-                        .add(upButton, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 31, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
-                        .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                        .add(downButton, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 29, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
+            layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+            .addGroup(layout.createSequentialGroup()
+                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+                    .addComponent(previewComboBox, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                    .addComponent(jLabel1, javax.swing.GroupLayout.PREFERRED_SIZE, 23, javax.swing.GroupLayout.PREFERRED_SIZE))
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
+                    .addGroup(javax.swing.GroupLayout.Alignment.LEADING, layout.createSequentialGroup()
+                        .addComponent(addMenuButton)
+                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                        .addComponent(addSeparatorButton)
+                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                        .addComponent(addCommandsButton)
+                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                        .addComponent(removeCommandButton)
+                        .addGap(50, 50, 50)
+                        .addComponent(upButton, javax.swing.GroupLayout.PREFERRED_SIZE, 31, javax.swing.GroupLayout.PREFERRED_SIZE)
+                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                        .addComponent(downButton, javax.swing.GroupLayout.PREFERRED_SIZE, 29, javax.swing.GroupLayout.PREFERRED_SIZE)
                         .addContainerGap())
-                    .add(jSplitPane1, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 449, Short.MAX_VALUE)))
+                    .addComponent(jSplitPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 449, Short.MAX_VALUE)))
         );
     }// </editor-fold>//GEN-END:initComponents
 

Modified: incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/projecttemplates/addon/AddOnPanelVisual4Toolbar.form
URL: http://svn.apache.org/viewvc/incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/projecttemplates/addon/AddOnPanelVisual4Toolbar.form?rev=1374893&r1=1374892&r2=1374893&view=diff
==============================================================================
--- incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/projecttemplates/addon/AddOnPanelVisual4Toolbar.form (original)
+++ incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/projecttemplates/addon/AddOnPanelVisual4Toolbar.form Mon Aug 20 01:40:43 2012
@@ -8,9 +8,10 @@
   <AuxValues>
     <AuxValue name="FormSettings_autoResourcing" type="java.lang.Integer" value="0"/>
     <AuxValue name="FormSettings_autoSetComponentName" type="java.lang.Boolean" value="false"/>
+    <AuxValue name="FormSettings_generateFQN" type="java.lang.Boolean" value="true"/>
     <AuxValue name="FormSettings_generateMnemonicsCode" type="java.lang.Boolean" value="true"/>
     <AuxValue name="FormSettings_i18nAutoMode" type="java.lang.Boolean" value="false"/>
-    <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" value="2"/>
+    <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" value="1"/>
     <AuxValue name="FormSettings_listenerGenerationStyle" type="java.lang.Integer" value="0"/>
     <AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" value="false"/>
     <AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" value="2"/>
@@ -25,7 +26,6 @@
                       <Component id="jLabel1" min="-2" pref="88" max="-2" attributes="0"/>
                       <EmptySpace max="-2" attributes="0"/>
                       <Component id="previewComboBox" pref="380" max="32767" attributes="0"/>
-                      <EmptySpace max="-2" attributes="0"/>
                   </Group>
                   <Component id="jSplitPane1" pref="486" max="32767" attributes="0"/>
               </Group>
@@ -139,7 +139,6 @@
         </Property>
         <Property name="dividerLocation" type="int" value="60"/>
         <Property name="orientation" type="int" value="0"/>
-        <Property name="opaque" type="boolean" value="false"/>
       </Properties>
 
       <Layout class="org.netbeans.modules.form.compat2.layouts.support.JSplitPaneSupportLayout"/>

Modified: incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/projecttemplates/addon/AddOnPanelVisual4Toolbar.java
URL: http://svn.apache.org/viewvc/incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/projecttemplates/addon/AddOnPanelVisual4Toolbar.java?rev=1374893&r1=1374892&r2=1374893&view=diff
==============================================================================
--- incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/projecttemplates/addon/AddOnPanelVisual4Toolbar.java (original)
+++ incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/projecttemplates/addon/AddOnPanelVisual4Toolbar.java Mon Aug 20 01:40:43 2012
@@ -90,8 +90,9 @@ public class AddOnPanelVisual4Toolbar ex
      * WARNING: Do NOT modify this code. The content of this method is
      * always regenerated by the Form Editor.
      */
-    // <editor-fold defaultstate="collapsed" desc=" Generated Code ">//GEN-BEGIN:initComponents
+    // <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
     private void initComponents() {
+
         deleteButton = new javax.swing.JButton();
         addSeparatorButton = new javax.swing.JButton();
         leftButton = new javax.swing.JButton();
@@ -106,35 +107,36 @@ public class AddOnPanelVisual4Toolbar ex
 
         setAutoscrolls(true);
         setRequestFocusEnabled(false);
-        org.openide.awt.Mnemonics.setLocalizedText(deleteButton, NbBundle.getMessage(AddOnPanelVisual4Toolbar.class, "LBL_BUTTON_Delete"));
+
+        org.openide.awt.Mnemonics.setLocalizedText(deleteButton, NbBundle.getMessage(AddOnPanelVisual4Toolbar.class, "LBL_BUTTON_Delete")); // NOI18N
         deleteButton.setActionCommand("Delete");
-        deleteButton.setName("delete");
+        deleteButton.setName("delete"); // NOI18N
         deleteButton.addActionListener(new java.awt.event.ActionListener() {
             public void actionPerformed(java.awt.event.ActionEvent evt) {
                 deleteButtonActionPerformed(evt);
             }
         });
 
-        org.openide.awt.Mnemonics.setLocalizedText(addSeparatorButton, NbBundle.getMessage(AddOnPanelVisual4Toolbar.class, "LBL_BUTTON_AddSeparator"));
-        addSeparatorButton.setName("addSeparator");
+        org.openide.awt.Mnemonics.setLocalizedText(addSeparatorButton, NbBundle.getMessage(AddOnPanelVisual4Toolbar.class, "LBL_BUTTON_AddSeparator")); // NOI18N
+        addSeparatorButton.setName("addSeparator"); // NOI18N
         addSeparatorButton.addActionListener(new java.awt.event.ActionListener() {
             public void actionPerformed(java.awt.event.ActionEvent evt) {
                 addSeparatorButtonActionPerformed(evt);
             }
         });
 
-        leftButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/openoffice/extensions/projecttemplates/addon/icons/back.gif")));
-        leftButton.setName("left");
+        leftButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/openoffice/extensions/projecttemplates/addon/icons/back.gif"))); // NOI18N
+        leftButton.setName("left"); // NOI18N
         leftButton.addActionListener(new java.awt.event.ActionListener() {
             public void actionPerformed(java.awt.event.ActionEvent evt) {
                 leftButtonActionPerformed(evt);
             }
         });
 
-        rightButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/openoffice/extensions/projecttemplates/addon/icons/forward.gif")));
+        rightButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/openoffice/extensions/projecttemplates/addon/icons/forward.gif"))); // NOI18N
         rightButton.setMaximumSize(new java.awt.Dimension(65, 28));
         rightButton.setMinimumSize(new java.awt.Dimension(65, 28));
-        rightButton.setName("right");
+        rightButton.setName("right"); // NOI18N
         rightButton.setPreferredSize(new java.awt.Dimension(65, 28));
         rightButton.addActionListener(new java.awt.event.ActionListener() {
             public void actionPerformed(java.awt.event.ActionEvent evt) {
@@ -145,16 +147,16 @@ public class AddOnPanelVisual4Toolbar ex
         jSplitPane1.setBackground(new java.awt.Color(255, 255, 255));
         jSplitPane1.setDividerLocation(60);
         jSplitPane1.setOrientation(javax.swing.JSplitPane.VERTICAL_SPLIT);
-        jSplitPane1.setOpaque(false);
+
         jScrollPane1.setBackground(new java.awt.Color(255, 255, 255));
-        jScrollPane1.setName("toolbar");
+        jScrollPane1.setName("toolbar"); // NOI18N
         jSplitPane1.setLeftComponent(jScrollPane1);
 
-        jPanel1.setName("properties");
+        jPanel1.setName("properties"); // NOI18N
         jSplitPane1.setBottomComponent(jPanel1);
 
-        org.openide.awt.Mnemonics.setLocalizedText(addCommandButton, NbBundle.getMessage(AddOnPanelVisual4Toolbar.class, "LBL_BUTTON_AddCommand"));
-        addCommandButton.setName("addCommand");
+        org.openide.awt.Mnemonics.setLocalizedText(addCommandButton, NbBundle.getMessage(AddOnPanelVisual4Toolbar.class, "LBL_BUTTON_AddCommand")); // NOI18N
+        addCommandButton.setName("addCommand"); // NOI18N
         addCommandButton.addActionListener(new java.awt.event.ActionListener() {
             public void actionPerformed(java.awt.event.ActionEvent evt) {
                 addCommandButtonActionPerformed(evt);
@@ -170,53 +172,52 @@ public class AddOnPanelVisual4Toolbar ex
 
         jLabel1.setHorizontalAlignment(javax.swing.SwingConstants.LEFT);
         jLabel1.setLabelFor(previewComboBox);
-        org.openide.awt.Mnemonics.setLocalizedText(jLabel1, NbBundle.getMessage(AddOnPanelVisual4Toolbar.class, "LBL_Preview"));
+        org.openide.awt.Mnemonics.setLocalizedText(jLabel1, NbBundle.getMessage(AddOnPanelVisual4Toolbar.class, "LBL_Preview")); // NOI18N
 
-        org.jdesktop.layout.GroupLayout layout = new org.jdesktop.layout.GroupLayout(this);
+        javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
         this.setLayout(layout);
         layout.setHorizontalGroup(
-            layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-            .add(layout.createSequentialGroup()
-                .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-                    .add(layout.createSequentialGroup()
-                        .add(jLabel1, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 88, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
-                        .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                        .add(previewComboBox, 0, 380, Short.MAX_VALUE)
-                        .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED))
-                    .add(jSplitPane1, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 480, Short.MAX_VALUE))
-                .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-                    .add(layout.createSequentialGroup()
-                        .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                        .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-                            .add(addSeparatorButton, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 159, Short.MAX_VALUE)
-                            .add(deleteButton, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 159, Short.MAX_VALUE)
-                            .add(addCommandButton, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 159, Short.MAX_VALUE)))
-                    .add(layout.createSequentialGroup()
-                        .add(28, 28, 28)
-                        .add(leftButton, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 40, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
-                        .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                        .add(rightButton, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 40, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)))
+            layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+            .addGroup(layout.createSequentialGroup()
+                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                    .addGroup(layout.createSequentialGroup()
+                        .addComponent(jLabel1, javax.swing.GroupLayout.PREFERRED_SIZE, 88, javax.swing.GroupLayout.PREFERRED_SIZE)
+                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                        .addComponent(previewComboBox, 0, 380, Short.MAX_VALUE))
+                    .addComponent(jSplitPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 486, Short.MAX_VALUE))
+                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                    .addGroup(layout.createSequentialGroup()
+                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                        .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                            .addComponent(addSeparatorButton, javax.swing.GroupLayout.DEFAULT_SIZE, 159, Short.MAX_VALUE)
+                            .addComponent(deleteButton, javax.swing.GroupLayout.DEFAULT_SIZE, 159, Short.MAX_VALUE)
+                            .addComponent(addCommandButton, javax.swing.GroupLayout.DEFAULT_SIZE, 159, Short.MAX_VALUE)))
+                    .addGroup(layout.createSequentialGroup()
+                        .addGap(28, 28, 28)
+                        .addComponent(leftButton, javax.swing.GroupLayout.PREFERRED_SIZE, 40, javax.swing.GroupLayout.PREFERRED_SIZE)
+                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                        .addComponent(rightButton, javax.swing.GroupLayout.PREFERRED_SIZE, 40, javax.swing.GroupLayout.PREFERRED_SIZE)))
                 .addContainerGap())
         );
         layout.setVerticalGroup(
-            layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-            .add(layout.createSequentialGroup()
-                .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
-                    .add(jLabel1)
-                    .add(previewComboBox, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
-                .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING)
-                    .add(org.jdesktop.layout.GroupLayout.LEADING, layout.createSequentialGroup()
-                        .add(addSeparatorButton)
-                        .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                        .add(addCommandButton)
-                        .add(4, 4, 4)
-                        .add(deleteButton)
-                        .add(35, 35, 35)
-                        .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
-                            .add(leftButton)
-                            .add(rightButton, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 39, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)))
-                    .add(jSplitPane1, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 437, Short.MAX_VALUE))
+            layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+            .addGroup(layout.createSequentialGroup()
+                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+                    .addComponent(jLabel1)
+                    .addComponent(previewComboBox, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
+                    .addGroup(javax.swing.GroupLayout.Alignment.LEADING, layout.createSequentialGroup()
+                        .addComponent(addSeparatorButton)
+                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                        .addComponent(addCommandButton)
+                        .addGap(4, 4, 4)
+                        .addComponent(deleteButton)
+                        .addGap(35, 35, 35)
+                        .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+                            .addComponent(leftButton)
+                            .addComponent(rightButton, javax.swing.GroupLayout.PREFERRED_SIZE, 39, javax.swing.GroupLayout.PREFERRED_SIZE)))
+                    .addComponent(jSplitPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 437, Short.MAX_VALUE))
                 .addContainerGap())
         );
     }// </editor-fold>//GEN-END:initComponents

Modified: incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/projecttemplates/addon/dialogs/AddDeletedCommandPanel.form
URL: http://svn.apache.org/viewvc/incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/projecttemplates/addon/dialogs/AddDeletedCommandPanel.form?rev=1374893&r1=1374892&r2=1374893&view=diff
==============================================================================
--- incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/projecttemplates/addon/dialogs/AddDeletedCommandPanel.form (original)
+++ incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/projecttemplates/addon/dialogs/AddDeletedCommandPanel.form Mon Aug 20 01:40:43 2012
@@ -1,9 +1,13 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 
-<Form version="1.3" type="org.netbeans.modules.form.forminfo.JPanelFormInfo">
+<Form version="1.3" maxVersion="1.3" type="org.netbeans.modules.form.forminfo.JPanelFormInfo">
   <AuxValues>
+    <AuxValue name="FormSettings_autoResourcing" type="java.lang.Integer" value="0"/>
+    <AuxValue name="FormSettings_autoSetComponentName" type="java.lang.Boolean" value="false"/>
+    <AuxValue name="FormSettings_generateFQN" type="java.lang.Boolean" value="true"/>
     <AuxValue name="FormSettings_generateMnemonicsCode" type="java.lang.Boolean" value="false"/>
-    <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" value="2"/>
+    <AuxValue name="FormSettings_i18nAutoMode" type="java.lang.Boolean" value="false"/>
+    <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" value="1"/>
     <AuxValue name="FormSettings_listenerGenerationStyle" type="java.lang.Integer" value="0"/>
     <AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" value="false"/>
     <AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" value="2"/>
@@ -45,7 +49,7 @@
             <Property name="model" type="javax.swing.tree.TreeModel" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
               <Connection code="getTreeModel()" type="code"/>
             </Property>
-            <Property name="name" type="java.lang.String" value="listOfDeletedCommands"/>
+            <Property name="name" type="java.lang.String" value="listOfDeletedCommands" noResource="true"/>
             <Property name="rootVisible" type="boolean" value="false"/>
           </Properties>
         </Component>

Modified: incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/projecttemplates/addon/dialogs/AddDeletedCommandPanel.java
URL: http://svn.apache.org/viewvc/incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/projecttemplates/addon/dialogs/AddDeletedCommandPanel.java?rev=1374893&r1=1374892&r2=1374893&view=diff
==============================================================================
--- incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/projecttemplates/addon/dialogs/AddDeletedCommandPanel.java (original)
+++ incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/projecttemplates/addon/dialogs/AddDeletedCommandPanel.java Mon Aug 20 01:40:43 2012
@@ -76,31 +76,32 @@ public class AddDeletedCommandPanel exte
      * WARNING: Do NOT modify this code. The content of this method is
      * always regenerated by the Form Editor.
      */
-    // <editor-fold defaultstate="collapsed" desc=" Generated Code ">//GEN-BEGIN:initComponents
+    // <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
     private void initComponents() {
+
         jScrollPane1 = new javax.swing.JScrollPane();
         jTree1 = new javax.swing.JTree();
 
         jTree1.setCellRenderer(getTreeCellRenderer());
         jTree1.setModel(getTreeModel());
-        jTree1.setName("listOfDeletedCommands");
+        jTree1.setName("listOfDeletedCommands"); // NOI18N
         jTree1.setRootVisible(false);
         jScrollPane1.setViewportView(jTree1);
 
-        org.jdesktop.layout.GroupLayout layout = new org.jdesktop.layout.GroupLayout(this);
+        javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
         this.setLayout(layout);
         layout.setHorizontalGroup(
-            layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-            .add(org.jdesktop.layout.GroupLayout.TRAILING, layout.createSequentialGroup()
+            layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+            .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup()
                 .addContainerGap()
-                .add(jScrollPane1, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 380, Short.MAX_VALUE)
+                .addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 380, Short.MAX_VALUE)
                 .addContainerGap())
         );
         layout.setVerticalGroup(
-            layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-            .add(org.jdesktop.layout.GroupLayout.TRAILING, layout.createSequentialGroup()
+            layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+            .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup()
                 .addContainerGap()
-                .add(jScrollPane1, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 278, Short.MAX_VALUE)
+                .addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 278, Short.MAX_VALUE)
                 .addContainerGap())
         );
     }// </editor-fold>//GEN-END:initComponents

Modified: incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/projecttemplates/calcaddin/AddinPanelVisual1Project.form
URL: http://svn.apache.org/viewvc/incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/projecttemplates/calcaddin/AddinPanelVisual1Project.form?rev=1374893&r1=1374892&r2=1374893&view=diff
==============================================================================
--- incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/projecttemplates/calcaddin/AddinPanelVisual1Project.form (original)
+++ incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/projecttemplates/calcaddin/AddinPanelVisual1Project.form Mon Aug 20 01:40:43 2012
@@ -4,9 +4,10 @@
   <AuxValues>
     <AuxValue name="FormSettings_autoResourcing" type="java.lang.Integer" value="0"/>
     <AuxValue name="FormSettings_autoSetComponentName" type="java.lang.Boolean" value="false"/>
+    <AuxValue name="FormSettings_generateFQN" type="java.lang.Boolean" value="true"/>
     <AuxValue name="FormSettings_generateMnemonicsCode" type="java.lang.Boolean" value="true"/>
     <AuxValue name="FormSettings_i18nAutoMode" type="java.lang.Boolean" value="false"/>
-    <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" value="2"/>
+    <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" value="1"/>
     <AuxValue name="FormSettings_listenerGenerationStyle" type="java.lang.Integer" value="0"/>
     <AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" value="false"/>
     <AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" value="2"/>
@@ -35,10 +36,7 @@
                           <Component id="calcAddinNameTextField" alignment="0" pref="383" max="32767" attributes="2"/>
                           <Component id="createdFolderTextField" alignment="0" pref="383" max="32767" attributes="2"/>
                           <Component id="packageTextField" alignment="1" pref="383" max="32767" attributes="2"/>
-                          <Group type="102" alignment="0" attributes="0">
-                              <Component id="projectLocationTextField" pref="383" max="32767" attributes="2"/>
-                              <EmptySpace max="-2" attributes="0"/>
-                          </Group>
+                          <Component id="projectLocationTextField" alignment="0" pref="383" max="32767" attributes="2"/>
                       </Group>
                       <EmptySpace min="-2" pref="6" max="-2" attributes="0"/>
                       <Component id="browseButton" min="-2" max="-2" attributes="0"/>
@@ -217,13 +215,13 @@
     </Component>
     <Component class="javax.swing.JTextPane" name="createdFilesPane">
       <Properties>
+        <Property name="editable" type="boolean" value="false"/>
         <Property name="background" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
           <Color blue="d8" green="e9" red="ec" type="rgb"/>
         </Property>
         <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
           <Border info="null"/>
         </Property>
-        <Property name="editable" type="boolean" value="false"/>
         <Property name="opaque" type="boolean" value="false"/>
       </Properties>
     </Component>

Modified: incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/projecttemplates/calcaddin/AddinPanelVisual1Project.java
URL: http://svn.apache.org/viewvc/incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/projecttemplates/calcaddin/AddinPanelVisual1Project.java?rev=1374893&r1=1374892&r2=1374893&view=diff
==============================================================================
--- incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/projecttemplates/calcaddin/AddinPanelVisual1Project.java (original)
+++ incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/projecttemplates/calcaddin/AddinPanelVisual1Project.java Mon Aug 20 01:40:43 2012
@@ -127,67 +127,65 @@ public class AddinPanelVisual1Project ex
         createdFilesPane.setEditable(false);
         createdFilesPane.setOpaque(false);
 
-        org.jdesktop.layout.GroupLayout layout = new org.jdesktop.layout.GroupLayout(this);
+        javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
         this.setLayout(layout);
         layout.setHorizontalGroup(
-            layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-            .add(layout.createSequentialGroup()
+            layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+            .addGroup(layout.createSequentialGroup()
                 .addContainerGap()
-                .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-                    .add(projectNameLabel)
-                    .add(packageLabel)
-                    .add(addinNameLabel)
-                    .add(projectLocationLabel)
-                    .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING)
-                        .add(createdFilesLabel)
-                        .add(createdFolderLabel)))
-                .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-                    .add(layout.createSequentialGroup()
-                        .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-                            .add(projectNameTextField, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 383, Short.MAX_VALUE)
-                            .add(calcAddinNameTextField, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 383, Short.MAX_VALUE)
-                            .add(createdFolderTextField, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 383, Short.MAX_VALUE)
-                            .add(org.jdesktop.layout.GroupLayout.TRAILING, packageTextField, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 383, Short.MAX_VALUE)
-                            .add(layout.createSequentialGroup()
-                                .add(projectLocationTextField, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 383, Short.MAX_VALUE)
-                                .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)))
-                        .add(6, 6, 6)
-                        .add(browseButton))
-                    .add(createdFilesPane, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 476, Short.MAX_VALUE))
+                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                    .addComponent(projectNameLabel)
+                    .addComponent(packageLabel)
+                    .addComponent(addinNameLabel)
+                    .addComponent(projectLocationLabel)
+                    .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
+                        .addComponent(createdFilesLabel)
+                        .addComponent(createdFolderLabel)))
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                    .addGroup(layout.createSequentialGroup()
+                        .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                            .addComponent(projectNameTextField, javax.swing.GroupLayout.DEFAULT_SIZE, 383, Short.MAX_VALUE)
+                            .addComponent(calcAddinNameTextField, javax.swing.GroupLayout.DEFAULT_SIZE, 383, Short.MAX_VALUE)
+                            .addComponent(createdFolderTextField, javax.swing.GroupLayout.DEFAULT_SIZE, 383, Short.MAX_VALUE)
+                            .addComponent(packageTextField, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, 383, Short.MAX_VALUE)
+                            .addComponent(projectLocationTextField, javax.swing.GroupLayout.DEFAULT_SIZE, 383, Short.MAX_VALUE))
+                        .addGap(6, 6, 6)
+                        .addComponent(browseButton))
+                    .addComponent(createdFilesPane, javax.swing.GroupLayout.DEFAULT_SIZE, 476, Short.MAX_VALUE))
                 .addContainerGap())
         );
         layout.setVerticalGroup(
-            layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-            .add(layout.createSequentialGroup()
+            layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+            .addGroup(layout.createSequentialGroup()
                 .addContainerGap()
-                .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
-                    .add(projectNameLabel)
-                    .add(projectNameTextField, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
-                .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
-                    .add(addinNameLabel)
-                    .add(calcAddinNameTextField, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
-                .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
-                    .add(packageLabel)
-                    .add(packageTextField, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
-                .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
-                    .add(projectLocationLabel)
-                    .add(projectLocationTextField, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
-                    .add(browseButton))
-                .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING)
-                    .add(createdFolderLabel)
-                    .add(createdFolderTextField, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
-                .add(18, 18, 18)
-                .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-                    .add(layout.createSequentialGroup()
-                        .add(createdFilesLabel)
-                        .add(165, 165, 165))
-                    .add(layout.createSequentialGroup()
-                        .add(createdFilesPane, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 184, Short.MAX_VALUE)
+                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+                    .addComponent(projectNameLabel)
+                    .addComponent(projectNameTextField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+                    .addComponent(addinNameLabel)
+                    .addComponent(calcAddinNameTextField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+                    .addComponent(packageLabel)
+                    .addComponent(packageTextField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+                    .addComponent(projectLocationLabel)
+                    .addComponent(projectLocationTextField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                    .addComponent(browseButton))
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
+                    .addComponent(createdFolderLabel)
+                    .addComponent(createdFolderTextField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+                .addGap(18, 18, 18)
+                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                    .addGroup(layout.createSequentialGroup()
+                        .addComponent(createdFilesLabel)
+                        .addGap(165, 165, 165))
+                    .addGroup(layout.createSequentialGroup()
+                        .addComponent(createdFilesPane, javax.swing.GroupLayout.DEFAULT_SIZE, 184, Short.MAX_VALUE)
                         .addContainerGap())))
         );
     }// </editor-fold>//GEN-END:initComponents

Modified: incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/projecttemplates/calcaddin/AddinPanelVisual2Description.form
URL: http://svn.apache.org/viewvc/incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/projecttemplates/calcaddin/AddinPanelVisual2Description.form?rev=1374893&r1=1374892&r2=1374893&view=diff
==============================================================================
--- incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/projecttemplates/calcaddin/AddinPanelVisual2Description.form (original)
+++ incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/projecttemplates/calcaddin/AddinPanelVisual2Description.form Mon Aug 20 01:40:43 2012
@@ -1,13 +1,17 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 
-<Form version="1.3" type="org.netbeans.modules.form.forminfo.JPanelFormInfo">
+<Form version="1.3" maxVersion="1.3" type="org.netbeans.modules.form.forminfo.JPanelFormInfo">
   <Properties>
     <Property name="autoscrolls" type="boolean" value="true"/>
     <Property name="requestFocusEnabled" type="boolean" value="false"/>
   </Properties>
   <AuxValues>
+    <AuxValue name="FormSettings_autoResourcing" type="java.lang.Integer" value="0"/>
+    <AuxValue name="FormSettings_autoSetComponentName" type="java.lang.Boolean" value="false"/>
+    <AuxValue name="FormSettings_generateFQN" type="java.lang.Boolean" value="true"/>
     <AuxValue name="FormSettings_generateMnemonicsCode" type="java.lang.Boolean" value="true"/>
-    <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" value="2"/>
+    <AuxValue name="FormSettings_i18nAutoMode" type="java.lang.Boolean" value="false"/>
+    <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" value="1"/>
     <AuxValue name="FormSettings_listenerGenerationStyle" type="java.lang.Integer" value="0"/>
     <AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" value="false"/>
     <AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" value="2"/>
@@ -24,7 +28,7 @@
                   <Component id="deleteButton" max="32767" attributes="1"/>
                   <Component id="addParameterButton" max="32767" attributes="1"/>
                   <Component id="deleteLanguageButton" max="32767" attributes="1"/>
-                  <Component id="addFunctionButton" alignment="0" pref="113" max="32767" attributes="1"/>
+                  <Component id="addFunctionButton" alignment="0" max="32767" attributes="1"/>
               </Group>
           </Group>
       </Group>
@@ -67,7 +71,7 @@
             <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
               <Dimension value="[5, 10]"/>
             </Property>
-            <Property name="name" type="java.lang.String" value="properties"/>
+            <Property name="name" type="java.lang.String" value="properties" noResource="true"/>
             <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
               <Dimension value="[5, 10]"/>
             </Property>
@@ -93,7 +97,7 @@
             <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
               <Dimension value="[5, 10]"/>
             </Property>
-            <Property name="name" type="java.lang.String" value="functionList"/>
+            <Property name="name" type="java.lang.String" value="functionList" noResource="true"/>
             <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
               <Dimension value="[5, 10]"/>
             </Property>
@@ -119,7 +123,7 @@
         <Property name="toolTipText" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
           <ResourceString bundle="org/openoffice/extensions/projecttemplates/calcaddin/Bundle.properties" key="BUTTON_AddFunction_Tooltip" replaceFormat="NbBundle.getMessage(AddinPanelVisual2Description.class, &quot;{key}&quot;)"/>
         </Property>
-        <Property name="name" type="java.lang.String" value="addFunction"/>
+        <Property name="name" type="java.lang.String" value="addFunction" noResource="true"/>
       </Properties>
       <Events>
         <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="addFunctionButtonActionPerformed"/>
@@ -146,7 +150,7 @@
         <Property name="toolTipText" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
           <ResourceString bundle="org/openoffice/extensions/projecttemplates/calcaddin/Bundle.properties" key="BUTTON_AddParam_Tooltip" replaceFormat="NbBundle.getMessage(AddinPanelVisual2Description.class, &quot;{key}&quot;)"/>
         </Property>
-        <Property name="name" type="java.lang.String" value="addParamater"/>
+        <Property name="name" type="java.lang.String" value="addParamater" noResource="true"/>
       </Properties>
       <Events>
         <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="addParameterButtonActionPerformed"/>
@@ -160,7 +164,7 @@
         <Property name="toolTipText" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
           <ResourceString bundle="org/openoffice/extensions/projecttemplates/calcaddin/Bundle.properties" key="BUTTON_Delete_Tooltip" replaceFormat="NbBundle.getMessage(AddinPanelVisual2Description.class, &quot;{key}&quot;)"/>
         </Property>
-        <Property name="name" type="java.lang.String" value="delete"/>
+        <Property name="name" type="java.lang.String" value="delete" noResource="true"/>
       </Properties>
       <Events>
         <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="deleteButtonActionPerformed"/>

Modified: incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/projecttemplates/calcaddin/AddinPanelVisual2Description.java
URL: http://svn.apache.org/viewvc/incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/projecttemplates/calcaddin/AddinPanelVisual2Description.java?rev=1374893&r1=1374892&r2=1374893&view=diff
==============================================================================
--- incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/projecttemplates/calcaddin/AddinPanelVisual2Description.java (original)
+++ incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/projecttemplates/calcaddin/AddinPanelVisual2Description.java Mon Aug 20 01:40:43 2012
@@ -102,8 +102,9 @@ public class AddinPanelVisual2Descriptio
      * WARNING: Do NOT modify this code. The content of this method is
      * always regenerated by the Form Editor.
      */
-    // <editor-fold defaultstate="collapsed" desc=" Generated Code ">//GEN-BEGIN:initComponents
+    // <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
     private void initComponents() {
+
         jSplitPane1 = new javax.swing.JSplitPane();
         jPanel1 = new PropertySheet();
         jScrollPane1 = new BeanTreeView();
@@ -115,90 +116,92 @@ public class AddinPanelVisual2Descriptio
 
         setAutoscrolls(true);
         setRequestFocusEnabled(false);
+
         jSplitPane1.setDividerLocation(200);
         jSplitPane1.setForeground(java.awt.Color.white);
+
         jPanel1.setBorder(javax.swing.BorderFactory.createEtchedBorder());
         jPanel1.setMinimumSize(new java.awt.Dimension(5, 10));
-        jPanel1.setName("properties");
+        jPanel1.setName("properties"); // NOI18N
         jPanel1.setPreferredSize(new java.awt.Dimension(5, 10));
         jSplitPane1.setRightComponent(jPanel1);
 
         jScrollPane1.setBorder(javax.swing.BorderFactory.createEtchedBorder());
         jScrollPane1.setMinimumSize(new java.awt.Dimension(5, 10));
-        jScrollPane1.setName("functionList");
+        jScrollPane1.setName("functionList"); // NOI18N
         jScrollPane1.setPreferredSize(new java.awt.Dimension(5, 10));
         jSplitPane1.setLeftComponent(jScrollPane1);
 
-        org.openide.awt.Mnemonics.setLocalizedText(addFunctionButton, org.openide.util.NbBundle.getMessage(AddinWizardIterator.class, "LBL_BUTTON_AddFunction"));
-        addFunctionButton.setToolTipText(NbBundle.getMessage(AddinPanelVisual2Description.class, "BUTTON_AddFunction_Tooltip"));
-        addFunctionButton.setName("addFunction");
+        org.openide.awt.Mnemonics.setLocalizedText(addFunctionButton, org.openide.util.NbBundle.getMessage(AddinWizardIterator.class, "LBL_BUTTON_AddFunction")); // NOI18N
+        addFunctionButton.setToolTipText(NbBundle.getMessage(AddinPanelVisual2Description.class, "BUTTON_AddFunction_Tooltip")); // NOI18N
+        addFunctionButton.setName("addFunction"); // NOI18N
         addFunctionButton.addActionListener(new java.awt.event.ActionListener() {
             public void actionPerformed(java.awt.event.ActionEvent evt) {
                 addFunctionButtonActionPerformed(evt);
             }
         });
 
-        org.openide.awt.Mnemonics.setLocalizedText(deleteLanguageButton, org.openide.util.NbBundle.getMessage(AddinWizardIterator.class, "LBL_BUTTON_DeleteLanguage"));
-        deleteLanguageButton.setToolTipText(NbBundle.getMessage(AddinPanelVisual2Description.class, "BUTTON_DeleteLang_Tooltip"));
+        org.openide.awt.Mnemonics.setLocalizedText(deleteLanguageButton, org.openide.util.NbBundle.getMessage(AddinWizardIterator.class, "LBL_BUTTON_DeleteLanguage")); // NOI18N
+        deleteLanguageButton.setToolTipText(NbBundle.getMessage(AddinPanelVisual2Description.class, "BUTTON_DeleteLang_Tooltip")); // NOI18N
         deleteLanguageButton.addActionListener(new java.awt.event.ActionListener() {
             public void actionPerformed(java.awt.event.ActionEvent evt) {
                 deleteLanguageButtonActionPerformed(evt);
             }
         });
 
-        org.openide.awt.Mnemonics.setLocalizedText(addParameterButton, org.openide.util.NbBundle.getMessage(AddinWizardIterator.class, "LBL_BUTTON_AddParameter"));
-        addParameterButton.setToolTipText(NbBundle.getMessage(AddinPanelVisual2Description.class, "BUTTON_AddParam_Tooltip"));
-        addParameterButton.setName("addParamater");
+        org.openide.awt.Mnemonics.setLocalizedText(addParameterButton, org.openide.util.NbBundle.getMessage(AddinWizardIterator.class, "LBL_BUTTON_AddParameter")); // NOI18N
+        addParameterButton.setToolTipText(NbBundle.getMessage(AddinPanelVisual2Description.class, "BUTTON_AddParam_Tooltip")); // NOI18N
+        addParameterButton.setName("addParamater"); // NOI18N
         addParameterButton.addActionListener(new java.awt.event.ActionListener() {
             public void actionPerformed(java.awt.event.ActionEvent evt) {
                 addParameterButtonActionPerformed(evt);
             }
         });
 
-        org.openide.awt.Mnemonics.setLocalizedText(deleteButton, org.openide.util.NbBundle.getMessage(AddinWizardIterator.class, "LBL_BUTTON_Delete"));
-        deleteButton.setToolTipText(NbBundle.getMessage(AddinPanelVisual2Description.class, "BUTTON_Delete_Tooltip"));
-        deleteButton.setName("delete");
+        org.openide.awt.Mnemonics.setLocalizedText(deleteButton, org.openide.util.NbBundle.getMessage(AddinWizardIterator.class, "LBL_BUTTON_Delete")); // NOI18N
+        deleteButton.setToolTipText(NbBundle.getMessage(AddinPanelVisual2Description.class, "BUTTON_Delete_Tooltip")); // NOI18N
+        deleteButton.setName("delete"); // NOI18N
         deleteButton.addActionListener(new java.awt.event.ActionListener() {
             public void actionPerformed(java.awt.event.ActionEvent evt) {
                 deleteButtonActionPerformed(evt);
             }
         });
 
-        org.openide.awt.Mnemonics.setLocalizedText(addLanguageButton, org.openide.util.NbBundle.getMessage(AddinWizardIterator.class, "LBL_BUTTON_AddLanguage"));
-        addLanguageButton.setToolTipText(NbBundle.getMessage(AddinPanelVisual2Description.class, "BUTTON_AddLang_Tooltip"));
+        org.openide.awt.Mnemonics.setLocalizedText(addLanguageButton, org.openide.util.NbBundle.getMessage(AddinWizardIterator.class, "LBL_BUTTON_AddLanguage")); // NOI18N
+        addLanguageButton.setToolTipText(NbBundle.getMessage(AddinPanelVisual2Description.class, "BUTTON_AddLang_Tooltip")); // NOI18N
         addLanguageButton.addActionListener(new java.awt.event.ActionListener() {
             public void actionPerformed(java.awt.event.ActionEvent evt) {
                 addLanguageButtonActionPerformed(evt);
             }
         });
 
-        org.jdesktop.layout.GroupLayout layout = new org.jdesktop.layout.GroupLayout(this);
+        javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
         this.setLayout(layout);
         layout.setHorizontalGroup(
-            layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-            .add(org.jdesktop.layout.GroupLayout.TRAILING, layout.createSequentialGroup()
-                .add(jSplitPane1, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 403, Short.MAX_VALUE)
-                .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING, false)
-                    .add(addLanguageButton, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
-                    .add(deleteButton, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
-                    .add(addParameterButton, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
-                    .add(deleteLanguageButton, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
-                    .add(addFunctionButton, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 113, Short.MAX_VALUE)))
+            layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+            .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup()
+                .addComponent(jSplitPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 403, Short.MAX_VALUE)
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
+                    .addComponent(addLanguageButton, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+                    .addComponent(deleteButton, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+                    .addComponent(addParameterButton, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+                    .addComponent(deleteLanguageButton, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+                    .addComponent(addFunctionButton, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)))
         );
         layout.setVerticalGroup(
-            layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-            .add(layout.createSequentialGroup()
-                .add(addFunctionButton)
-                .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                .add(addParameterButton)
-                .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                .add(deleteButton)
-                .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED, 305, Short.MAX_VALUE)
-                .add(addLanguageButton)
-                .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                .add(deleteLanguageButton))
-            .add(org.jdesktop.layout.GroupLayout.TRAILING, jSplitPane1, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 463, Short.MAX_VALUE)
+            layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+            .addGroup(layout.createSequentialGroup()
+                .addComponent(addFunctionButton)
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                .addComponent(addParameterButton)
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                .addComponent(deleteButton)
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 315, Short.MAX_VALUE)
+                .addComponent(addLanguageButton)
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                .addComponent(deleteLanguageButton))
+            .addComponent(jSplitPane1, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, 463, Short.MAX_VALUE)
         );
     }// </editor-fold>//GEN-END:initComponents
 

Modified: incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/projecttemplates/calcaddin/LanguageHandlingDialog.form
URL: http://svn.apache.org/viewvc/incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/projecttemplates/calcaddin/LanguageHandlingDialog.form?rev=1374893&r1=1374892&r2=1374893&view=diff
==============================================================================
--- incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/projecttemplates/calcaddin/LanguageHandlingDialog.form (original)
+++ incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/projecttemplates/calcaddin/LanguageHandlingDialog.form Mon Aug 20 01:40:43 2012
@@ -7,7 +7,7 @@
     <AuxValue name="FormSettings_generateFQN" type="java.lang.Boolean" value="true"/>
     <AuxValue name="FormSettings_generateMnemonicsCode" type="java.lang.Boolean" value="false"/>
     <AuxValue name="FormSettings_i18nAutoMode" type="java.lang.Boolean" value="false"/>
-    <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" value="2"/>
+    <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" value="1"/>
     <AuxValue name="FormSettings_listenerGenerationStyle" type="java.lang.Integer" value="0"/>
     <AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" value="false"/>
     <AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" value="2"/>

Modified: incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/projecttemplates/calcaddin/LanguageHandlingDialog.java
URL: http://svn.apache.org/viewvc/incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/projecttemplates/calcaddin/LanguageHandlingDialog.java?rev=1374893&r1=1374892&r2=1374893&view=diff
==============================================================================
--- incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/projecttemplates/calcaddin/LanguageHandlingDialog.java (original)
+++ incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/projecttemplates/calcaddin/LanguageHandlingDialog.java Mon Aug 20 01:40:43 2012
@@ -72,25 +72,25 @@ public LanguageHandlingDialog(boolean de
         jLabel1.setLabelFor(jComboBox1);
         org.openide.awt.Mnemonics.setLocalizedText(jLabel1, org.openide.util.NbBundle.getMessage(AddinWizardIterator.class, "LBL_Language")); // NOI18N
 
-        org.jdesktop.layout.GroupLayout layout = new org.jdesktop.layout.GroupLayout(this);
+        javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
         this.setLayout(layout);
         layout.setHorizontalGroup(
-            layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-            .add(org.jdesktop.layout.GroupLayout.TRAILING, layout.createSequentialGroup()
+            layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+            .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup()
                 .addContainerGap()
-                .add(jLabel1, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 159, Short.MAX_VALUE)
-                .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                .add(jComboBox1, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 175, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
+                .addComponent(jLabel1, javax.swing.GroupLayout.DEFAULT_SIZE, 159, Short.MAX_VALUE)
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                .addComponent(jComboBox1, javax.swing.GroupLayout.PREFERRED_SIZE, 175, javax.swing.GroupLayout.PREFERRED_SIZE)
                 .addContainerGap())
         );
         layout.setVerticalGroup(
-            layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-            .add(layout.createSequentialGroup()
+            layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+            .addGroup(layout.createSequentialGroup()
                 .addContainerGap()
-                .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
-                    .add(jComboBox1, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
-                    .add(jLabel1))
-                .addContainerGap(org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+                    .addComponent(jComboBox1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                    .addComponent(jLabel1))
+                .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
         );
     }// </editor-fold>//GEN-END:initComponents
     

Modified: incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/projecttemplates/component/ComponentPanelVisual1Project.form
URL: http://svn.apache.org/viewvc/incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/projecttemplates/component/ComponentPanelVisual1Project.form?rev=1374893&r1=1374892&r2=1374893&view=diff
==============================================================================
--- incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/projecttemplates/component/ComponentPanelVisual1Project.form (original)
+++ incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/projecttemplates/component/ComponentPanelVisual1Project.form Mon Aug 20 01:40:43 2012
@@ -4,9 +4,10 @@
   <AuxValues>
     <AuxValue name="FormSettings_autoResourcing" type="java.lang.Integer" value="0"/>
     <AuxValue name="FormSettings_autoSetComponentName" type="java.lang.Boolean" value="false"/>
+    <AuxValue name="FormSettings_generateFQN" type="java.lang.Boolean" value="true"/>
     <AuxValue name="FormSettings_generateMnemonicsCode" type="java.lang.Boolean" value="true"/>
     <AuxValue name="FormSettings_i18nAutoMode" type="java.lang.Boolean" value="false"/>
-    <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" value="2"/>
+    <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" value="1"/>
     <AuxValue name="FormSettings_listenerGenerationStyle" type="java.lang.Integer" value="0"/>
     <AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" value="false"/>
     <AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" value="2"/>
@@ -208,10 +209,10 @@
     </Component>
     <Component class="javax.swing.JTextPane" name="jTextPane1">
       <Properties>
+        <Property name="editable" type="boolean" value="false"/>
         <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
           <Border info="null"/>
         </Property>
-        <Property name="editable" type="boolean" value="false"/>
         <Property name="opaque" type="boolean" value="false"/>
       </Properties>
     </Component>