Renamed show() to showAsWindow() because show() is actually in Component. Oops

diff --git a/src/com/billkuker/rocketry/motorsim/grain/CoredCylindricalGrain.java b/src/com/billkuker/rocketry/motorsim/grain/CoredCylindricalGrain.java
index 78d5fbfdc4061b3babd2574201420d41164dbdc1..dc44a5372c234cc56bc2af4a2cde00ebe6110b13 100644 (file)
--- a/src/com/billkuker/rocketry/motorsim/grain/CoredCylindricalGrain.java
+++ b/src/com/billkuker/rocketry/motorsim/grain/CoredCylindricalGrain.java
@@ -266,7 +266,7 @@ public class CoredCylindricalGrain extends ExtrudedGrain implements MotorPart.Va
        public static void main(String args[]) throws Exception {\r
                CoredCylindricalGrain e = DEFAULT_GRAIN;\r
                new Editor(e).show();\r
-               new GrainPanel(e).show();\r
+               new GrainPanel(e).showAsWindow();\r
        }\r
 \r
 }\r

diff --git a/src/com/billkuker/rocketry/motorsim/grain/ExtrudedShapeGrain.java b/src/com/billkuker/rocketry/motorsim/grain/ExtrudedShapeGrain.java
index 0378dcbd27cb682ae07a5442e0efb8f6d53cd163..fbd6d7ada18b797b760e7e17f3472965267e7dc4 100644 (file)
--- a/src/com/billkuker/rocketry/motorsim/grain/ExtrudedShapeGrain.java
+++ b/src/com/billkuker/rocketry/motorsim/grain/ExtrudedShapeGrain.java
@@ -171,7 +171,7 @@ public class ExtrudedShapeGrain extends MotorPart implements Grain {
        public static void main(String args[]) throws Exception {\r
                ExtrudedShapeGrain e = DEFAULT_GRAIN;\r
                new Editor(e).show();\r
-               new GrainPanel(e).show();\r
+               new GrainPanel(e).showAsWindow();\r
        }\r
 \r
 }\r

diff --git a/src/com/billkuker/rocketry/motorsim/grain/RodAndTubeGrain.java b/src/com/billkuker/rocketry/motorsim/grain/RodAndTubeGrain.java
index e9228ba333c2cf83e485128b7db2970fdfd00223..7070ef613342cbc3c4bb0876b039a5b9e2dda57f 100644 (file)
--- a/src/com/billkuker/rocketry/motorsim/grain/RodAndTubeGrain.java
+++ b/src/com/billkuker/rocketry/motorsim/grain/RodAndTubeGrain.java
@@ -102,6 +102,6 @@ public class RodAndTubeGrain extends CompoundGrain {
        public static void main(String args[]) throws Exception {\r
                Grain g = DEFAULT_GRAIN;\r
                new Editor(g).show();\r
-               new GrainPanel(g).show();\r
+               new GrainPanel(g).showAsWindow();\r
        }\r
 }\r

diff --git a/src/com/billkuker/rocketry/motorsim/grain/RotatedShapeGrain.java b/src/com/billkuker/rocketry/motorsim/grain/RotatedShapeGrain.java
index 30b78f2f9d326572508f568e088b523cc2fc9fbb..821cb5a42dcea57b79a36095a52bfa65fb2e9ffc 100644 (file)
--- a/src/com/billkuker/rocketry/motorsim/grain/RotatedShapeGrain.java
+++ b/src/com/billkuker/rocketry/motorsim/grain/RotatedShapeGrain.java
@@ -253,7 +253,7 @@ public class RotatedShapeGrain implements Grain {
        public static void main(String args[]) throws Exception {\r
                RotatedShapeGrain e = DEFAULT_GRAIN;\r
                new Editor(e).show();\r
-               new GrainPanel(e).show();\r
+               new GrainPanel(e).showAsWindow();\r
        }\r
        \r
 }\r

diff --git a/src/com/billkuker/rocketry/motorsim/visual/BurnPanel.java b/src/com/billkuker/rocketry/motorsim/visual/BurnPanel.java
index a519b4657f8b98db947e675493f822c69c74e8f7..c387832fd9a93aa37b946216fd4b2396c93bee7b 100644 (file)
--- a/src/com/billkuker/rocketry/motorsim/visual/BurnPanel.java
+++ b/src/com/billkuker/rocketry/motorsim/visual/BurnPanel.java
@@ -131,7 +131,7 @@ public class BurnPanel extends JPanel {
                }\r
        }\r
        \r
-       public void show(){\r
+       public void showAsWindow(){\r
                JFrame f = new JFrame();\r
                f.setTitle(burn.getMotor().getName());\r
                f.setSize(1280,720);\r

diff --git a/src/com/billkuker/rocketry/motorsim/visual/CrappyEditor.java b/src/com/billkuker/rocketry/motorsim/visual/CrappyEditor.java
new file mode 100644 (file)
index 0000000..4566828
--- /dev/null
+++ b/src/com/billkuker/rocketry/motorsim/visual/CrappyEditor.java
@@ -0,0 +1,64 @@
+package com.billkuker.rocketry.motorsim.visual;\r
+\r
+import java.awt.BorderLayout;\r
+import java.awt.event.ActionEvent;\r
+import java.awt.event.ActionListener;\r
+import java.io.IOException;\r
+\r
+import javax.swing.JButton;\r
+import javax.swing.JFrame;\r
+import javax.swing.JPanel;\r
+import javax.swing.JTabbedPane;\r
+import javax.swing.JTextArea;\r
+import javax.swing.border.Border;\r
+\r
+import com.billkuker.rocketry.motorsim.Burn;\r
+import com.billkuker.rocketry.motorsim.io.XStreamMotorIO;\r
+import com.billkuker.rocketry.motorsim.motors.kuker.PVC9;\r
+\r
+public class CrappyEditor extends JFrame {\r
+       JTabbedPane tabs = new JTabbedPane();\r
+       JPanel editor = new JPanel();\r
+       JTextArea text = new JTextArea();\r
+       public CrappyEditor(){\r
+               setSize(1024, 768);\r
+               \r
+               setContentPane(tabs);\r
+               \r
+               try {\r
+                       text.setText(XStreamMotorIO.writeMotor(new PVC9()));\r
+               } catch (IOException e) {\r
+                       e.printStackTrace();\r
+               }\r
+               \r
+               editor.setLayout(new BorderLayout());\r
+               editor.add(text, BorderLayout.CENTER);\r
+               editor.add(new JButton("Burn!"){\r
+                       {\r
+                               addActionListener(new ActionListener(){\r
+                                       public void actionPerformed(ActionEvent arg0) {\r
+                                               burn();\r
+                                       }\r
+                               });\r
+                       }\r
+                       \r
+               }, BorderLayout.SOUTH);\r
+               \r
+               tabs.addTab("Edit", editor);\r
+               \r
+               \r
+       }\r
+       \r
+       private void burn(){\r
+               try {\r
+                       Burn b = new Burn(XStreamMotorIO.readMotor(text.getText()));\r
+                       tabs.addTab("Burn", new BurnPanel(b));\r
+               } catch (IOException e) {\r
+                       e.printStackTrace();\r
+               }\r
+       }\r
+       \r
+       public static void main(String args[]){\r
+               new CrappyEditor().show();\r
+       }\r
+}\r

diff --git a/src/com/billkuker/rocketry/motorsim/visual/GrainPanel.java b/src/com/billkuker/rocketry/motorsim/visual/GrainPanel.java
index 1b434ba04da04d9821953268e0c38a2c0231b56f..ce3ecf57a9ca088e2705abb0861845f938df0782 100644 (file)
--- a/src/com/billkuker/rocketry/motorsim/visual/GrainPanel.java
+++ b/src/com/billkuker/rocketry/motorsim/visual/GrainPanel.java
@@ -200,7 +200,7 @@ public class GrainPanel extends JPanel {
                }\r
        }\r
        \r
-       public void show(){\r
+       public void showAsWindow(){\r
                JFrame f = new JFrame();\r
                f.setTitle(grain.getClass().getName());\r
                f.setSize(1024,600);\r

diff --git a/src/com/billkuker/rocketry/motorsim/visual/NozzlePanel.java b/src/com/billkuker/rocketry/motorsim/visual/NozzlePanel.java
index 2cc950176801a80d25f635d5d52369b61e2b4069..9552756a7c25247ab777114f0bc669b1ce981d56 100644 (file)
--- a/src/com/billkuker/rocketry/motorsim/visual/NozzlePanel.java
+++ b/src/com/billkuker/rocketry/motorsim/visual/NozzlePanel.java
@@ -59,7 +59,7 @@ public class NozzlePanel extends JPanel {
                g2d.draw( a );\r
        }\r
        \r
-       public void show(){\r
+       public void showAsWindow(){\r
                JFrame f = new JFrame();\r
                f.setSize(220,250);\r
                f.setContentPane(this);\r