Version->BETA2 after tag

[sw/motorsim] / gui / com / billkuker / rocketry / motorsim / visual / workbench / MotorWorkbench.java

diff --git a/gui/com/billkuker/rocketry/motorsim/visual/workbench/MotorWorkbench.java b/gui/com/billkuker/rocketry/motorsim/visual/workbench/MotorWorkbench.java
index c19afb6b46fae923c32de246c55497a2290770c1..140036dd216ed4a1c24cd6f4302b738aea92146d 100644 (file)
--- a/gui/com/billkuker/rocketry/motorsim/visual/workbench/MotorWorkbench.java
+++ b/gui/com/billkuker/rocketry/motorsim/visual/workbench/MotorWorkbench.java
@@ -2,27 +2,32 @@ package com.billkuker.rocketry.motorsim.visual.workbench;
 \r
 import java.awt.event.ActionEvent;\r
 import java.awt.event.ActionListener;\r
+import java.awt.event.WindowEvent;\r
+import java.awt.event.WindowListener;\r
 \r
 import javax.swing.ButtonGroup;\r
 import javax.swing.JFrame;\r
 import javax.swing.JMenu;\r
 import javax.swing.JMenuBar;\r
 import javax.swing.JMenuItem;\r
+import javax.swing.JOptionPane;\r
 import javax.swing.JRadioButtonMenuItem;\r
-import javax.swing.WindowConstants;\r
+import javax.swing.JSeparator;\r
 \r
 import com.billkuker.rocketry.motorsim.RocketScience.UnitPreference;\r
 import com.billkuker.rocketry.motorsim.fuel.FuelsEditor;\r
+import com.billkuker.rocketry.motorsim.visual.RememberJFrame;\r
 \r
 \r
-public class MotorWorkbench extends JFrame {\r
-       public static final String name = "MotorSim 2.0 BETA";\r
+public class MotorWorkbench extends RememberJFrame {\r
+       public static final String version = "2.0 BETA2";\r
+       public static final String name = "MotorSim " + version;\r
        private static final long serialVersionUID = 1L;\r
        \r
        private MultiMotorThrustChart mb;\r
        private JFrame allBurns;\r
        \r
-       private JFrame fuelEditorFrame = new JFrame(){\r
+       private JFrame fuelEditorFrame = new RememberJFrame(800,600){\r
                private static final long serialVersionUID = 1L;\r
                {\r
                        setSize(800, 600);\r
@@ -39,8 +44,8 @@ public class MotorWorkbench extends JFrame {
 \r
        \r
        public MotorWorkbench() {\r
+               super(1024, 768);\r
                setTitle(name);\r
-               setSize(1024, 768);\r
 \r
                motorsEditor = new MotorsEditor(this);\r
                setContentPane(motorsEditor);\r
@@ -51,14 +56,63 @@ public class MotorWorkbench extends JFrame {
                allBurns = new JFrame();\r
                allBurns.setTitle("All Burns");\r
                allBurns.setSize(800, 600);\r
-               setDefaultCloseOperation(WindowConstants.HIDE_ON_CLOSE);\r
                allBurns.add(mb);\r
 \r
-\r
-               setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE);\r
-               setVisible(true);\r
+               setDefaultCloseOperation(DO_NOTHING_ON_CLOSE);\r
+\r
+               addWindowListener(new WindowListener() {\r
+                       \r
+                       @Override\r
+                       public void windowOpened(WindowEvent e) {}\r
+                       \r
+                       @Override\r
+                       public void windowIconified(WindowEvent e) {}\r
+                       \r
+                       @Override\r
+                       public void windowDeiconified(WindowEvent e) {}\r
+                       \r
+                       @Override\r
+                       public void windowDeactivated(WindowEvent e) {}\r
+                       \r
+                       @Override\r
+                       public void windowClosing(WindowEvent e) {\r
+                               maybeQuit();\r
+                       }\r
+                       \r
+                       @Override\r
+                       public void windowClosed(WindowEvent e) {}\r
+                       \r
+                       @Override\r
+                       public void windowActivated(WindowEvent e) {}\r
+               });\r
 \r
        }\r
+       \r
+       private void maybeQuit(){\r
+               if (motorsEditor.hasDirty()) {\r
+                       int response = JOptionPane\r
+                                       .showConfirmDialog(\r
+                                                       MotorWorkbench.this,\r
+                                                       "There are unsaved Motors.\nExit Anyway?",\r
+                                                       "Confirm",\r
+                                                       JOptionPane.YES_NO_OPTION);\r
+                       if (response == JOptionPane.NO_OPTION) {\r
+                               return;\r
+                       }\r
+               }\r
+               if (fuelEditor.hasDirty()) {\r
+                       int response = JOptionPane\r
+                                       .showConfirmDialog(\r
+                                                       MotorWorkbench.this,\r
+                                                       "There are unsaved Fuels.\nExit Anyway?",\r
+                                                       "Confirm",\r
+                                                       JOptionPane.YES_NO_OPTION);\r
+                       if (response == JOptionPane.NO_OPTION) {\r
+                               return;\r
+                       }\r
+               }\r
+               MotorWorkbench.this.dispose();\r
+       }\r
 \r
        private void addMenu() {\r
 \r
@@ -66,7 +120,20 @@ public class MotorWorkbench extends JFrame {
                        private static final long serialVersionUID = 1L;\r
 \r
                        {\r
-                               add(motorsEditor.getMenu());\r
+                               JMenu file = motorsEditor.getMenu();\r
+                               file.add(new JSeparator());\r
+                               file.add(new JMenuItem("Quit") {\r
+                                       private static final long serialVersionUID = 1L;\r
+                                       {\r
+                                               addActionListener(new ActionListener() {\r
+                                                       @Override\r
+                                                       public void actionPerformed(ActionEvent e) {\r
+                                                               maybeQuit();\r
+                                                       }\r
+                                               });\r
+                                       }\r
+                               });\r
+                               add(file);\r
                                \r
                                add(new JMenu("Settings") {\r
                                        private static final long serialVersionUID = 1L;\r