convert to Sierra menus - cleanup

Author: lawson89

sierra-previewer/src/main/java/org/httprpc/sierra/previewer/MainFrame.java

@@ -54,14 +54,12 @@ public class MainFrame extends JFrame {
 
     // --- File Handling State ---
     private final JFileChooser fileChooser;
-    private Path currentFilePath = null; // Stores the path of the currently loaded file
-
+    private Path currentFilePath = null;
     // --- UI Components (Injected by Sierra) ---
-    @Outlet
-    private JMenuBar menuBar;
+    // Stores the path of the currently loaded file
 
-    @Outlet
-    private JMenu fileMenu;
+    @Outlet 
+    private JMenuBar menuBar;
 
     @Outlet
     private JMenuItem openItem;    
@@ -74,10 +72,7 @@ public class MainFrame extends JFrame {
 
     @Outlet
     private JMenuItem exitItem;          
-    
-    @Outlet
-    private JMenu aboutMenu;
-        
+            
     @Outlet
     private JMenuItem aboutItem;    
 
@@ -176,7 +171,6 @@ public void changedUpdate(DocumentEvent e) {
      * Creates and sets the application's menu bar.
      */
     private void setupMenuBar() {
-        menuBar = new JMenuBar();
 
         // Open
         openItem.addActionListener(e -> {
@@ -196,9 +190,6 @@ private void setupMenuBar() {
         exitItem.addActionListener(e -> {
             System.exit(0); // Exit the application
         });
-        fileMenu.add(exitItem);
-
-        menuBar.add(fileMenu);
 
         // --- About Menu ---
         aboutItem.addActionListener(e -> {
@@ -212,7 +203,6 @@ private void setupMenuBar() {
                     JOptionPane.INFORMATION_MESSAGE
             );
         });
-        menuBar.add(aboutMenu);
 
         this.setJMenuBar(menuBar);
     }

sierra-previewer/src/main/resources/org/httprpc/sierra/previewer/MainFrame.xml

@@ -2,26 +2,24 @@
 <!DOCTYPE column-panel SYSTEM "sierra.dtd">
 <column-panel>
     <menu-bar name="menuBar">
-        <menu name="fileMenu" text="File">
+        <menu text="File">
             <menu-item name="openItem" text="Open..."/>
             <menu name="recentMenu" text="Recent"/>
             <popup-menu-separator/>
             <menu-item name="saveItem" text="Save"/>
             <popup-menu-separator/>
             <menu-item name="exitItem" text="Exit"/>
         </menu>
-        <menu name="aboutMenu" text="About">
+        <menu text="About">
             <menu-item name="aboutItem" text="About Previewer"/>
         </menu>        
     </menu-bar>
 
 
     <row-panel weight="1">
 
-        <column-panel weight="1">           
-            
-            <scroll-pane name="editorScrollPane" weight="1"/>
-            
+	<column-panel weight="1">                       
+            <scroll-pane name="editorScrollPane" weight="1"/>            
         </column-panel>
 
 
@@ -34,6 +32,7 @@
         </column-panel>
 
     </row-panel>
+
     <label name="filePathLabel" text="" padding="4, 6, 4, 6"/>
     <label name="statusBar" text="Ready." padding="2, 5, 2, 5"/>
 </column-panel>