# This patch file was generated by NetBeans IDE
# Following Index: paths are relative to: D:\ws\main
# This patch can be applied using context Tools: Patch action on respective folder.
# It uses platform neutral UTF-8 encoding and \n newlines.
# Above lines and this line are ignored by the patching process.
Index: editor.codetemplates/src/org/netbeans/lib/editor/codetemplates/storage/ui/CodeTemplatesPanel.form
--- editor.codetemplates/src/org/netbeans/lib/editor/codetemplates/storage/ui/CodeTemplatesPanel.form
+++ editor.codetemplates/src/org/netbeans/lib/editor/codetemplates/storage/ui/CodeTemplatesPanel.form
@@ -33,22 +33,18 @@
                       <EmptySpace max="-2" attributes="0"/>
                       <Component id="cbOnExpandAction" min="-2" max="-2" attributes="0"/>
                   </Group>
-                  <Group type="102" alignment="1" attributes="0">
-                      <Group type="103" groupAlignment="1" attributes="0">
-                          <Component id="tabPane" alignment="0" max="32767" attributes="0"/>
-                          <Component id="spTemplates" alignment="1" pref="0" max="32767" attributes="2"/>
+                  <Group type="102" attributes="0">
+                      <Component id="jSplitPane1" pref="363" max="32767" attributes="0"/>
+                      <EmptySpace min="-2" max="-2" attributes="0"/>
+                      <Group type="103" groupAlignment="0" max="-2" attributes="0">
+                          <Component id="bNew" max="32767" attributes="1"/>
+                          <Component id="bRemove" pref="89" max="32767" attributes="1"/>
                       </Group>
-                      <EmptySpace type="unrelated" max="-2" attributes="0"/>
-                      <Group type="103" groupAlignment="1" max="-2" attributes="0">
-                          <Component id="bRemove" max="32767" attributes="1"/>
-                          <Component id="bNew" alignment="1" pref="122" max="32767" attributes="1"/>
                       </Group>
-                      <EmptySpace min="-2" pref="10" max="-2" attributes="0"/>
                   </Group>
+              <EmptySpace min="-2" max="-2" attributes="0"/>
               </Group>
-              <EmptySpace max="-2" attributes="0"/>
           </Group>
-      </Group>
     </DimensionLayout>
     <DimensionLayout dim="1">
       <Group type="103" groupAlignment="0" attributes="0">
@@ -59,24 +55,24 @@
               </Group>
               <EmptySpace min="-2" max="-2" attributes="0"/>
               <Component id="lTemplates" min="-2" max="-2" attributes="0"/>
-              <EmptySpace min="-2" max="-2" attributes="0"/>
+              <EmptySpace max="-2" attributes="0"/>
               <Group type="103" groupAlignment="0" attributes="0">
                   <Group type="102" attributes="0">
                       <Component id="bNew" min="-2" max="-2" attributes="0"/>
                       <EmptySpace max="-2" attributes="0"/>
                       <Component id="bRemove" min="-2" max="-2" attributes="0"/>
+                      <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
                   </Group>
-                  <Component id="spTemplates" min="-2" pref="109" max="-2" attributes="0"/>
+                  <Component id="jSplitPane1" pref="338" max="32767" attributes="0"/>
               </Group>
-              <EmptySpace type="unrelated" max="-2" attributes="0"/>
-              <Component id="tabPane" pref="218" max="32767" attributes="0"/>
-              <EmptySpace type="unrelated" max="-2" attributes="0"/>
+              <EmptySpace max="-2" attributes="0"/>
               <Group type="103" groupAlignment="3" attributes="0">
-                  <Component id="lExplandTemplateOn" alignment="3" min="-2" max="-2" attributes="0"/>
                   <Component id="cbExpandTemplateOn" alignment="3" min="-2" max="-2" attributes="0"/>
                   <Component id="lOnExpandAction" alignment="3" min="-2" max="-2" attributes="0"/>
                   <Component id="cbOnExpandAction" alignment="3" min="-2" max="-2" attributes="0"/>
+                  <Component id="lExplandTemplateOn" alignment="3" min="-2" max="-2" attributes="0"/>
               </Group>
+              <EmptySpace min="-2" pref="5" max="-2" attributes="0"/>
           </Group>
       </Group>
     </DimensionLayout>
@@ -108,27 +104,6 @@
         <Property name="text" type="java.lang.String" value="Templates:"/>
       </Properties>
     </Component>
-    <Container class="javax.swing.JScrollPane" name="spTemplates">
-      <AuxValues>
-        <AuxValue name="autoScrollPane" type="java.lang.Boolean" value="true"/>
-      </AuxValues>
-
-      <Layout class="org.netbeans.modules.form.compat2.layouts.support.JScrollPaneSupportLayout"/>
-      <SubComponents>
-        <Component class="javax.swing.JTable" name="tTemplates">
-          <Properties>
-            <Property name="model" type="javax.swing.table.TableModel" editor="org.netbeans.modules.form.editors2.TableModelEditor">
-              <Table columnCount="3" rowCount="4">
-                <Column editable="false" title="Abbreviation" type="java.lang.String"/>
-                <Column editable="false" title="Expanded Text" type="java.lang.String"/>
-                <Column editable="false" title="Description" type="java.lang.String"/>
-              </Table>
-            </Property>
-            <Property name="focusCycleRoot" type="boolean" value="true"/>
-          </Properties>
-        </Component>
-      </SubComponents>
-    </Container>
     <Component class="javax.swing.JButton" name="bNew">
       <Properties>
         <Property name="text" type="java.lang.String" value="New"/>
@@ -178,6 +153,17 @@
         </Property>
       </Properties>
     </Component>
+    <Container class="javax.swing.JSplitPane" name="jSplitPane1">
+      <Properties>
+        <Property name="dividerLocation" type="int" value="150"/>
+        <Property name="orientation" type="int" value="0"/>
+        <Property name="cursor" type="java.awt.Cursor" editor="org.netbeans.modules.form.editors2.CursorEditor">
+          <Color id="Default Cursor"/>
+        </Property>
+      </Properties>
+
+      <Layout class="org.netbeans.modules.form.compat2.layouts.support.JSplitPaneSupportLayout"/>
+      <SubComponents>
     <Container class="javax.swing.JTabbedPane" name="tabPane">
       <Properties>
         <Property name="tabLayoutPolicy" type="int" value="1"/>
@@ -186,6 +172,11 @@
           <ComponentRef name="cbExpandTemplateOn"/>
         </Property>
       </Properties>
+          <Constraints>
+            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JSplitPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JSplitPaneSupportLayout$JSplitPaneConstraintsDescription">
+              <JSplitPaneConstraints position="bottom"/>
+            </Constraint>
+          </Constraints>
 
       <Layout class="org.netbeans.modules.form.compat2.layouts.support.JTabbedPaneSupportLayout"/>
       <SubComponents>
@@ -227,5 +218,33 @@
         </Container>
       </SubComponents>
     </Container>
+        <Container class="javax.swing.JScrollPane" name="spTemplates">
+          <AuxValues>
+            <AuxValue name="autoScrollPane" type="java.lang.Boolean" value="true"/>
+          </AuxValues>
+          <Constraints>
+            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JSplitPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JSplitPaneSupportLayout$JSplitPaneConstraintsDescription">
+              <JSplitPaneConstraints position="left"/>
+            </Constraint>
+          </Constraints>
+
+          <Layout class="org.netbeans.modules.form.compat2.layouts.support.JScrollPaneSupportLayout"/>
+          <SubComponents>
+            <Component class="javax.swing.JTable" name="tTemplates">
+              <Properties>
+                <Property name="model" type="javax.swing.table.TableModel" editor="org.netbeans.modules.form.editors2.TableModelEditor">
+                  <Table columnCount="3" rowCount="4">
+                    <Column editable="false" title="Abbreviation" type="java.lang.String"/>
+                    <Column editable="false" title="Expanded Text" type="java.lang.String"/>
+                    <Column editable="false" title="Description" type="java.lang.String"/>
+                  </Table>
+                </Property>
+                <Property name="focusCycleRoot" type="boolean" value="true"/>
+              </Properties>
+            </Component>
   </SubComponents>
+        </Container>
+      </SubComponents>
+    </Container>
+  </SubComponents>
 </Form>
Index: editor.codetemplates/src/org/netbeans/lib/editor/codetemplates/storage/ui/CodeTemplatesPanel.java
--- editor.codetemplates/src/org/netbeans/lib/editor/codetemplates/storage/ui/CodeTemplatesPanel.java
+++ editor.codetemplates/src/org/netbeans/lib/editor/codetemplates/storage/ui/CodeTemplatesPanel.java
@@ -572,19 +572,20 @@
         lLanguage = new javax.swing.JLabel();
         cbLanguage = new javax.swing.JComboBox();
         lTemplates = new javax.swing.JLabel();
-        spTemplates = new javax.swing.JScrollPane();
-        tTemplates = new javax.swing.JTable();
         bNew = new javax.swing.JButton();
         bRemove = new javax.swing.JButton();
         lExplandTemplateOn = new javax.swing.JLabel();
         cbExpandTemplateOn = new javax.swing.JComboBox();
         lOnExpandAction = new javax.swing.JLabel();
         cbOnExpandAction = new javax.swing.JComboBox();
+        jSplitPane1 = new javax.swing.JSplitPane();
         tabPane = new javax.swing.JTabbedPane();
         spExpandedText = new javax.swing.JScrollPane();
         epExpandedText = new javax.swing.JEditorPane();
         spDescription = new javax.swing.JScrollPane();
         epDescription = new javax.swing.JEditorPane();
+        spTemplates = new javax.swing.JScrollPane();
+        tTemplates = new javax.swing.JTable();
 
         lLanguage.setLabelFor(cbLanguage);
         lLanguage.setText("Language:");
@@ -594,6 +595,39 @@
         lTemplates.setLabelFor(tTemplates);
         lTemplates.setText("Templates:");
 
+        bNew.setText("New");
+        bNew.setNextFocusableComponent(bRemove);
+
+        bRemove.setText("Remove");
+
+        lExplandTemplateOn.setLabelFor(cbExpandTemplateOn);
+        lExplandTemplateOn.setText("Expand Template on:");
+
+        cbExpandTemplateOn.setNextFocusableComponent(cbOnExpandAction);
+
+        lOnExpandAction.setLabelFor(cbOnExpandAction);
+        lOnExpandAction.setText("On Template Expand:");
+
+        cbOnExpandAction.setNextFocusableComponent(bNew);
+
+        jSplitPane1.setDividerLocation(150);
+        jSplitPane1.setOrientation(javax.swing.JSplitPane.VERTICAL_SPLIT);
+        jSplitPane1.setCursor(new java.awt.Cursor(java.awt.Cursor.DEFAULT_CURSOR));
+
+        tabPane.setTabLayoutPolicy(javax.swing.JTabbedPane.SCROLL_TAB_LAYOUT);
+        tabPane.setFocusCycleRoot(true);
+        tabPane.setNextFocusableComponent(cbExpandTemplateOn);
+
+        spExpandedText.setViewportView(epExpandedText);
+
+        tabPane.addTab("tab1", spExpandedText);
+
+        spDescription.setViewportView(epDescription);
+
+        tabPane.addTab("tab2", spDescription);
+
+        jSplitPane1.setBottomComponent(tabPane);
+
         tTemplates.setModel(new javax.swing.table.DefaultTableModel(
             new Object [][] {
                 {null, null, null},
@@ -623,33 +657,8 @@
         tTemplates.setFocusCycleRoot(true);
         spTemplates.setViewportView(tTemplates);
 
-        bNew.setText("New");
-        bNew.setNextFocusableComponent(bRemove);
+        jSplitPane1.setLeftComponent(spTemplates);
 
-        bRemove.setText("Remove");
-
-        lExplandTemplateOn.setLabelFor(cbExpandTemplateOn);
-        lExplandTemplateOn.setText("Expand Template on:");
-
-        cbExpandTemplateOn.setNextFocusableComponent(cbOnExpandAction);
-
-        lOnExpandAction.setLabelFor(cbOnExpandAction);
-        lOnExpandAction.setText("On Template Expand:");
-
-        cbOnExpandAction.setNextFocusableComponent(bNew);
-
-        tabPane.setTabLayoutPolicy(javax.swing.JTabbedPane.SCROLL_TAB_LAYOUT);
-        tabPane.setFocusCycleRoot(true);
-        tabPane.setNextFocusableComponent(cbExpandTemplateOn);
-
-        spExpandedText.setViewportView(epExpandedText);
-
-        tabPane.addTab("tab1", spExpandedText);
-
-        spDescription.setViewportView(epDescription);
-
-        tabPane.addTab("tab2", spDescription);
-
         javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
         this.setLayout(layout);
         layout.setHorizontalGroup(
@@ -669,15 +678,12 @@
                         .addComponent(lOnExpandAction)
                         .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                         .addComponent(cbOnExpandAction, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
-                    .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup()
-                        .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
-                            .addComponent(tabPane, javax.swing.GroupLayout.Alignment.LEADING, javax.swing.GroupLayout.DEFAULT_SIZE, 335, Short.MAX_VALUE)
-                            .addComponent(spTemplates, javax.swing.GroupLayout.DEFAULT_SIZE, 335, Short.MAX_VALUE))
-                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
-                        .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING, false)
-                            .addComponent(bRemove, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
-                            .addComponent(bNew, javax.swing.GroupLayout.DEFAULT_SIZE, 122, Short.MAX_VALUE))
-                        .addGap(10, 10, 10)))
+                    .addGroup(layout.createSequentialGroup()
+                        .addComponent(jSplitPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 363, Short.MAX_VALUE)
+                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                        .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
+                            .addComponent(bNew, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+                            .addComponent(bRemove, javax.swing.GroupLayout.DEFAULT_SIZE, 89, Short.MAX_VALUE))))
                 .addContainerGap())
         );
         layout.setVerticalGroup(
@@ -693,16 +699,16 @@
                     .addGroup(layout.createSequentialGroup()
                         .addComponent(bNew)
                         .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                        .addComponent(bRemove))
-                    .addComponent(spTemplates, javax.swing.GroupLayout.PREFERRED_SIZE, 109, javax.swing.GroupLayout.PREFERRED_SIZE))
-                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
-                .addComponent(tabPane, javax.swing.GroupLayout.DEFAULT_SIZE, 218, Short.MAX_VALUE)
-                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
+                        .addComponent(bRemove)
+                        .addGap(0, 0, Short.MAX_VALUE))
+                    .addComponent(jSplitPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 338, Short.MAX_VALUE))
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                 .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
-                    .addComponent(lExplandTemplateOn)
                     .addComponent(cbExpandTemplateOn, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
                     .addComponent(lOnExpandAction)
-                    .addComponent(cbOnExpandAction, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)))
+                    .addComponent(cbOnExpandAction, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                    .addComponent(lExplandTemplateOn))
+                .addGap(5, 5, 5))
         );
     }// </editor-fold>//GEN-END:initComponents
         
@@ -714,6 +720,7 @@
     private javax.swing.JComboBox cbOnExpandAction;
     private javax.swing.JEditorPane epDescription;
     private javax.swing.JEditorPane epExpandedText;
+    private javax.swing.JSplitPane jSplitPane1;
     private javax.swing.JLabel lExplandTemplateOn;
     private javax.swing.JLabel lLanguage;
     private javax.swing.JLabel lOnExpandAction;