From 98fd17413359d09888e4aa7181bc2a85584a2014 Mon Sep 17 00:00:00 2001 From: Bill Kuker Date: Thu, 16 Apr 2009 14:09:15 +0000 Subject: [PATCH] Renamed show() to showAsWindow() because show() is actually in Component. Oops --- .../motorsim/grain/CoredCylindricalGrain.java | 2 +- .../motorsim/grain/ExtrudedShapeGrain.java | 2 +- .../motorsim/grain/RodAndTubeGrain.java | 2 +- .../motorsim/grain/RotatedShapeGrain.java | 2 +- .../rocketry/motorsim/visual/BurnPanel.java | 2 +- .../motorsim/visual/CrappyEditor.java | 64 +++++++++++++++++++ .../rocketry/motorsim/visual/GrainPanel.java | 2 +- .../rocketry/motorsim/visual/NozzlePanel.java | 2 +- 8 files changed, 71 insertions(+), 7 deletions(-) create mode 100644 src/com/billkuker/rocketry/motorsim/visual/CrappyEditor.java diff --git a/src/com/billkuker/rocketry/motorsim/grain/CoredCylindricalGrain.java b/src/com/billkuker/rocketry/motorsim/grain/CoredCylindricalGrain.java index 78d5fbf..dc44a53 100644 --- 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 { CoredCylindricalGrain e = DEFAULT_GRAIN; new Editor(e).show(); - new GrainPanel(e).show(); + new GrainPanel(e).showAsWindow(); } } diff --git a/src/com/billkuker/rocketry/motorsim/grain/ExtrudedShapeGrain.java b/src/com/billkuker/rocketry/motorsim/grain/ExtrudedShapeGrain.java index 0378dcb..fbd6d7a 100644 --- 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 { ExtrudedShapeGrain e = DEFAULT_GRAIN; new Editor(e).show(); - new GrainPanel(e).show(); + new GrainPanel(e).showAsWindow(); } } diff --git a/src/com/billkuker/rocketry/motorsim/grain/RodAndTubeGrain.java b/src/com/billkuker/rocketry/motorsim/grain/RodAndTubeGrain.java index e9228ba..7070ef6 100644 --- 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 { Grain g = DEFAULT_GRAIN; new Editor(g).show(); - new GrainPanel(g).show(); + new GrainPanel(g).showAsWindow(); } } diff --git a/src/com/billkuker/rocketry/motorsim/grain/RotatedShapeGrain.java b/src/com/billkuker/rocketry/motorsim/grain/RotatedShapeGrain.java index 30b78f2..821cb5a 100644 --- 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 { RotatedShapeGrain e = DEFAULT_GRAIN; new Editor(e).show(); - new GrainPanel(e).show(); + new GrainPanel(e).showAsWindow(); } } diff --git a/src/com/billkuker/rocketry/motorsim/visual/BurnPanel.java b/src/com/billkuker/rocketry/motorsim/visual/BurnPanel.java index a519b46..c387832 100644 --- 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 { } } - public void show(){ + public void showAsWindow(){ JFrame f = new JFrame(); f.setTitle(burn.getMotor().getName()); f.setSize(1280,720); diff --git a/src/com/billkuker/rocketry/motorsim/visual/CrappyEditor.java b/src/com/billkuker/rocketry/motorsim/visual/CrappyEditor.java new file mode 100644 index 0000000..4566828 --- /dev/null +++ b/src/com/billkuker/rocketry/motorsim/visual/CrappyEditor.java @@ -0,0 +1,64 @@ +package com.billkuker.rocketry.motorsim.visual; + +import java.awt.BorderLayout; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.io.IOException; + +import javax.swing.JButton; +import javax.swing.JFrame; +import javax.swing.JPanel; +import javax.swing.JTabbedPane; +import javax.swing.JTextArea; +import javax.swing.border.Border; + +import com.billkuker.rocketry.motorsim.Burn; +import com.billkuker.rocketry.motorsim.io.XStreamMotorIO; +import com.billkuker.rocketry.motorsim.motors.kuker.PVC9; + +public class CrappyEditor extends JFrame { + JTabbedPane tabs = new JTabbedPane(); + JPanel editor = new JPanel(); + JTextArea text = new JTextArea(); + public CrappyEditor(){ + setSize(1024, 768); + + setContentPane(tabs); + + try { + text.setText(XStreamMotorIO.writeMotor(new PVC9())); + } catch (IOException e) { + e.printStackTrace(); + } + + editor.setLayout(new BorderLayout()); + editor.add(text, BorderLayout.CENTER); + editor.add(new JButton("Burn!"){ + { + addActionListener(new ActionListener(){ + public void actionPerformed(ActionEvent arg0) { + burn(); + } + }); + } + + }, BorderLayout.SOUTH); + + tabs.addTab("Edit", editor); + + + } + + private void burn(){ + try { + Burn b = new Burn(XStreamMotorIO.readMotor(text.getText())); + tabs.addTab("Burn", new BurnPanel(b)); + } catch (IOException e) { + e.printStackTrace(); + } + } + + public static void main(String args[]){ + new CrappyEditor().show(); + } +} diff --git a/src/com/billkuker/rocketry/motorsim/visual/GrainPanel.java b/src/com/billkuker/rocketry/motorsim/visual/GrainPanel.java index 1b434ba..ce3ecf5 100644 --- 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 { } } - public void show(){ + public void showAsWindow(){ JFrame f = new JFrame(); f.setTitle(grain.getClass().getName()); f.setSize(1024,600); diff --git a/src/com/billkuker/rocketry/motorsim/visual/NozzlePanel.java b/src/com/billkuker/rocketry/motorsim/visual/NozzlePanel.java index 2cc9501..9552756 100644 --- 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 ); } - public void show(){ + public void showAsWindow(){ JFrame f = new JFrame(); f.setSize(220,250); f.setContentPane(this); -- 2.47.2