Remove a superfluous component. [#4]

marnen · Nov 30, 2009 · 1a65c66 · 1a65c66
1 parent 2326619
commit 1a65c66
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 35 deletions.
diff --git a/src/intro_window/IntroWindow.form b/src/intro_window/IntroWindow.form
@@ -2,25 +2,7 @@
 
 <Form version="1.3" maxVersion="1.7" type="org.netbeans.modules.form.forminfo.JFrameFormInfo">
   <NonVisualComponents>
-    <Container class="javax.swing.JMenuBar" name="jMenuBar1">
-
-      <Layout class="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout">
-        <Property name="useNullLayout" type="boolean" value="true"/>
-      </Layout>
-      <SubComponents>
-        <Menu class="javax.swing.JMenu" name="jMenu1">
-          <Properties>
-            <Property name="text" type="java.lang.String" value="File"/>
-          </Properties>
-        </Menu>
-        <Menu class="javax.swing.JMenu" name="jMenu2">
-          <Properties>
-            <Property name="text" type="java.lang.String" value="Edit"/>
-          </Properties>
-        </Menu>
-      </SubComponents>
-    </Container>
-    <Menu class="javax.swing.JMenuBar" name="jMenuBar2">
+    <Menu class="javax.swing.JMenuBar" name="jMenuBar1">
       <SubComponents>
         <Menu class="javax.swing.JMenu" name="file_menu">
           <Properties>
@@ -64,7 +46,7 @@
     </Property>
   </Properties>
   <SyntheticProperties>
-    <SyntheticProperty name="menuBar" type="java.lang.String" value="jMenuBar2"/>
+    <SyntheticProperty name="menuBar" type="java.lang.String" value="jMenuBar1"/>
     <SyntheticProperty name="formSizePolicy" type="int" value="1"/>
   </SyntheticProperties>
   <AuxValues>

diff --git a/src/intro_window/IntroWindow.java b/src/intro_window/IntroWindow.java
@@ -33,21 +33,12 @@ public IntroWindow() {
   // <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
   private void initComponents() {
 
-    jMenuBar1 = new javax.swing.JMenuBar();
-    jMenu1 = new javax.swing.JMenu();
-    jMenu2 = new javax.swing.JMenu();
     jLabel1 = new javax.swing.JLabel();
-    jMenuBar2 = new javax.swing.JMenuBar();
+    jMenuBar1 = new javax.swing.JMenuBar();
     file_menu = new javax.swing.JMenu();
     file_new_menu_item = new javax.swing.JMenuItem();
     file_open_menu_item = new javax.swing.JMenuItem();
 
-    jMenu1.setText("File");
-    jMenuBar1.add(jMenu1);
-
-    jMenu2.setText("Edit");
-    jMenuBar1.add(jMenu2);
-
     setDefaultCloseOperation(javax.swing.WindowConstants.EXIT_ON_CLOSE);
     java.util.ResourceBundle bundle = java.util.ResourceBundle.getBundle("intro_window/Bundle"); // NOI18N
     setTitle(bundle.getString("appName")); // NOI18N
@@ -67,9 +58,9 @@ private void initComponents() {
     file_open_menu_item.setText(bundle1.getString("FileMenu.Open")); // NOI18N
     file_menu.add(file_open_menu_item);
 
-    jMenuBar2.add(file_menu);
+    jMenuBar1.add(file_menu);
 
-    setJMenuBar(jMenuBar2);
+    setJMenuBar(jMenuBar1);
 
     javax.swing.GroupLayout layout = new javax.swing.GroupLayout(getContentPane());
     getContentPane().setLayout(layout);
@@ -108,10 +99,7 @@ public void run() {
   private javax.swing.JMenuItem file_new_menu_item;
   private javax.swing.JMenuItem file_open_menu_item;
   private javax.swing.JLabel jLabel1;
-  private javax.swing.JMenu jMenu1;
-  private javax.swing.JMenu jMenu2;
   private javax.swing.JMenuBar jMenuBar1;
-  private javax.swing.JMenuBar jMenuBar2;
   // End of variables declaration//GEN-END:variables
 
 }