From 4245f4ac7475345162e484b79341cdff3b1710f4 Mon Sep 17 00:00:00 2001 From: Phillip Date: Wed, 23 Feb 2011 22:25:49 +0000 Subject: Corrected issue causing Default Shape, Enter, and Color buttons multiple times to a parameter window. --- src/tesseract/newmenu/MenuItem.java | 20 ++++++++------------ src/tesseract/newmenu/NewChainLinkMenuItem.java | 5 ++++- src/tesseract/newmenu/NewEllipsoidMenuItem.java | 4 +++- src/tesseract/newmenu/NewIcosahedronMenuItem.java | 6 +++--- .../newmenu/NewParticleEmitterMenuItem.java | 4 +++- src/tesseract/newmenu/NewParticleMenuItem.java | 6 +++--- src/tesseract/newmenu/NewPlanarPolygonMenuItem.java | 4 +++- src/tesseract/newmenu/NewToroidMenuItem.java | 4 +++- 8 files changed, 30 insertions(+), 23 deletions(-) (limited to 'src/tesseract') diff --git a/src/tesseract/newmenu/MenuItem.java b/src/tesseract/newmenu/MenuItem.java index da3cb54..c47aa2c 100644 --- a/src/tesseract/newmenu/MenuItem.java +++ b/src/tesseract/newmenu/MenuItem.java @@ -95,11 +95,6 @@ public abstract class MenuItem extends JMenuItem implements ActionListener { private boolean useColorButton; - /** - * Default constructor. - */ - public MenuItem() { } - /** * Constructor. * @param theWorld world parameter. @@ -129,9 +124,10 @@ public abstract class MenuItem extends JMenuItem implements ActionListener { * @param theLabel for menu item. * @param theColor use color button. */ - public MenuItem(final World theWorld, final String theLabel, boolean theColor) { + public MenuItem(final World theWorld, final String theLabel, + boolean theColorButton) { this(theWorld, theLabel); - useColorButton = theColor; + useColorButton = theColorButton; } /** @@ -158,14 +154,14 @@ public abstract class MenuItem extends JMenuItem implements ActionListener { protected void createParameterMenu() { - myColorButton.addActionListener(new ActionListener(){ + myColorButton.addActionListener(new ActionListener() { @Override - public void actionPerformed(ActionEvent arg0) { + public void actionPerformed(final ActionEvent arg0) { myColor = JColorChooser.showDialog(null, "Particle Color", Color.RED); - }}); + } }); Toolkit tk = Toolkit.getDefaultToolkit(); Dimension screenSize = tk.getScreenSize(); int screenHeight = screenSize.height; @@ -204,8 +200,8 @@ public abstract class MenuItem extends JMenuItem implements ActionListener { myParamFrame.setAlwaysOnTop(true); - myParamFrame.pack(); - myParamFrame.setVisible(isVisible()); + //myParamFrame.pack(); + //myParamFrame.setVisible(isVisible()); } /** diff --git a/src/tesseract/newmenu/NewChainLinkMenuItem.java b/src/tesseract/newmenu/NewChainLinkMenuItem.java index 110c79e..0c5cbbc 100644 --- a/src/tesseract/newmenu/NewChainLinkMenuItem.java +++ b/src/tesseract/newmenu/NewChainLinkMenuItem.java @@ -51,11 +51,14 @@ public class NewChainLinkMenuItem extends MenuItem { ChainLink2.DEFAULT_LENGTH).toString()); myReadData.get("Width").setText(((Float) ChainLink2.DEFAULT_WIDTH_RATIO).toString()); + createParameterMenu(); } @Override public void actionPerformed(final ActionEvent e) { - createParameterMenu(); + //createParameterMenu(); + this.getParamFrame().pack(); + this.getParamFrame().setVisible(true); final JButton defaultButton = getDefaultButton(); final JFrame params = getParamFrame(); final JButton enterButton = getEnterButton(); diff --git a/src/tesseract/newmenu/NewEllipsoidMenuItem.java b/src/tesseract/newmenu/NewEllipsoidMenuItem.java index d5ee1ca..2eebb92 100644 --- a/src/tesseract/newmenu/NewEllipsoidMenuItem.java +++ b/src/tesseract/newmenu/NewEllipsoidMenuItem.java @@ -49,11 +49,13 @@ public class NewEllipsoidMenuItem extends MenuItem { this.makePanel(); myReadData.get("Radius").setText(((Float) DEFAULT_RADIUS).toString()); + createParameterMenu(); } @Override public void actionPerformed(final ActionEvent e) { - createParameterMenu(); + this.getParamFrame().pack(); + this.getParamFrame().setVisible(true); final JButton defaultButton = getDefaultButton(); final JFrame params = getParamFrame(); final JButton enterButton = getEnterButton(); diff --git a/src/tesseract/newmenu/NewIcosahedronMenuItem.java b/src/tesseract/newmenu/NewIcosahedronMenuItem.java index d519b7d..fc06469 100644 --- a/src/tesseract/newmenu/NewIcosahedronMenuItem.java +++ b/src/tesseract/newmenu/NewIcosahedronMenuItem.java @@ -34,8 +34,6 @@ public class NewIcosahedronMenuItem extends MenuItem { public NewIcosahedronMenuItem(final World theWorld) { super(theWorld, "Icosahedron"); buildParams(); - - } /** @@ -47,11 +45,13 @@ public class NewIcosahedronMenuItem extends MenuItem { this.makePanel(); myReadData.get("Scale").setText(((Float) Icosahedron.DEFAULT_SCALE).toString()); + createParameterMenu(); } @Override public void actionPerformed(final ActionEvent e) { - createParameterMenu(); + this.getParamFrame().pack(); + this.getParamFrame().setVisible(true); final JButton defaultButton = getDefaultButton(); final JFrame params = getParamFrame(); final JButton enterButton = getEnterButton(); diff --git a/src/tesseract/newmenu/NewParticleEmitterMenuItem.java b/src/tesseract/newmenu/NewParticleEmitterMenuItem.java index 04a6ca6..880d6aa 100644 --- a/src/tesseract/newmenu/NewParticleEmitterMenuItem.java +++ b/src/tesseract/newmenu/NewParticleEmitterMenuItem.java @@ -55,11 +55,13 @@ public class NewParticleEmitterMenuItem extends MenuItem { this.makePanel(); myReadData.get("Frequency").setText(((Float) Icosahedron.DEFAULT_SCALE).toString()); + createParameterMenu(); } @Override public void actionPerformed(final ActionEvent e) { - createParameterMenu(); + this.getParamFrame().pack(); + this.getParamFrame().setVisible(true); final JButton defaultButton = getDefaultButton(); final JFrame params = getParamFrame(); final JButton enterButton = getEnterButton(); diff --git a/src/tesseract/newmenu/NewParticleMenuItem.java b/src/tesseract/newmenu/NewParticleMenuItem.java index 360b7ed..52aa1c2 100644 --- a/src/tesseract/newmenu/NewParticleMenuItem.java +++ b/src/tesseract/newmenu/NewParticleMenuItem.java @@ -41,8 +41,7 @@ public class NewParticleMenuItem extends MenuItem { public NewParticleMenuItem(final World theWorld) { super(theWorld, "Particle"); this.makePanel(); - - + createParameterMenu(); } /** @@ -58,7 +57,8 @@ public class NewParticleMenuItem extends MenuItem { @Override public void actionPerformed(final ActionEvent e) { - createParameterMenu(); + this.getParamFrame().pack(); + this.getParamFrame().setVisible(true); final JButton defaultButton = getDefaultButton(); final JFrame params = getParamFrame(); final JButton enterButton = getEnterButton(); diff --git a/src/tesseract/newmenu/NewPlanarPolygonMenuItem.java b/src/tesseract/newmenu/NewPlanarPolygonMenuItem.java index bb26c7c..64f4620 100644 --- a/src/tesseract/newmenu/NewPlanarPolygonMenuItem.java +++ b/src/tesseract/newmenu/NewPlanarPolygonMenuItem.java @@ -51,11 +51,13 @@ public class NewPlanarPolygonMenuItem extends MenuItem { ((Float) PlanarPolygon.DEFAULT_RADIUS).toString()); myReadData.get("Divisions").setText( ((Integer) PlanarPolygon.DEFAULT_DIVISIONS).toString()); + createParameterMenu(); } @Override public void actionPerformed(final ActionEvent e) { - createParameterMenu(); + this.getParamFrame().pack(); + this.getParamFrame().setVisible(true); final JButton defaultButton = getDefaultButton(); final JFrame params = getParamFrame(); final JButton enterButton = getEnterButton(); diff --git a/src/tesseract/newmenu/NewToroidMenuItem.java b/src/tesseract/newmenu/NewToroidMenuItem.java index 4656603..1ab20b7 100644 --- a/src/tesseract/newmenu/NewToroidMenuItem.java +++ b/src/tesseract/newmenu/NewToroidMenuItem.java @@ -56,11 +56,13 @@ public class NewToroidMenuItem extends MenuItem { myReadData.get("Tube Resolution").setText("25"); myReadData.get("Toroid Radius").setText(".08"); myReadData.get("Toroid Resolution").setText("30"); + createParameterMenu(); } @Override public void actionPerformed(final ActionEvent e) { - createParameterMenu(); + this.getParamFrame().pack(); + this.getParamFrame().setVisible(true); final JButton defaultButton = getDefaultButton(); final JFrame params = getParamFrame(); final JButton enterButton = getEnterButton(); -- cgit v1.2.3