Merge commit '42b2e5ca519766e37ce6941ba4faecc9691cc403' into upstream

[debian/openrocket] / core / src / net / sf / openrocket / gui / customexpression / ExpressionBuilderDialog.java

diff --git a/core/src/net/sf/openrocket/gui/customexpression/ExpressionBuilderDialog.java b/core/src/net/sf/openrocket/gui/customexpression/ExpressionBuilderDialog.java
index 0c25cbf8e8fd22ff1cb6493943899cf234c9b2fc..615fdc14987c758a89ff85718f0f8d574a6f536f 100644 (file)
--- a/core/src/net/sf/openrocket/gui/customexpression/ExpressionBuilderDialog.java
+++ b/core/src/net/sf/openrocket/gui/customexpression/ExpressionBuilderDialog.java
@@ -10,18 +10,22 @@ import java.awt.event.KeyListener;
 
 import javax.swing.ImageIcon;
 import javax.swing.JButton;
+import javax.swing.JCheckBox;
 import javax.swing.JDialog;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
 import javax.swing.JTextField;
+import javax.swing.SwingConstants;
 import javax.swing.SwingUtilities;
 
 import net.miginfocom.swing.MigLayout;
+import net.sf.openrocket.document.OpenRocketDocument;
 import net.sf.openrocket.document.Simulation;
 import net.sf.openrocket.gui.util.Icons;
 import net.sf.openrocket.l10n.Translator;
 import net.sf.openrocket.logging.LogHelper;
-import net.sf.openrocket.simulation.CustomExpression;
+import net.sf.openrocket.rocketcomponent.Rocket;
+import net.sf.openrocket.simulation.customexpression.CustomExpression;
 import net.sf.openrocket.startup.Application;
 
 /**
@@ -42,7 +46,7 @@ public class ExpressionBuilderDialog extends JDialog {
        private CustomExpression previousExpressionCopy;
        
        private final Window parentWindow;
-       private final Simulation simulation;
+       private final OpenRocketDocument doc;
        
        // Define these check indicators to show if fields are OK
        private final JLabel nameCheck = new JLabel(RedIcon);
@@ -51,16 +55,16 @@ public class ExpressionBuilderDialog extends JDialog {
        private final JButton okButton = new JButton(trans.get("dlg.but.ok"));
        private final JTextField expressionField = new JTextField(20);
        
-       public ExpressionBuilderDialog(Window parent, Simulation simulation){
-               this(parent, simulation, new CustomExpression(simulation));
+       public ExpressionBuilderDialog(Window parent, OpenRocketDocument doc){
+               this(parent, doc, new CustomExpression(doc));
        }
        
-       public ExpressionBuilderDialog(Window parent, final Simulation simulation, final CustomExpression previousExpression){
+       public ExpressionBuilderDialog(Window parent, final OpenRocketDocument doc, final CustomExpression previousExpression){
                
                super(parent, trans.get("ExpressionBuilderDialog.title"), JDialog.ModalityType.DOCUMENT_MODAL);
                
+               this.doc = doc;
                this.parentWindow = parent;
-               this.simulation = simulation;
                this.previousExpressionCopy = (CustomExpression) previousExpression.clone();
                this.expression = previousExpression;
                                        
@@ -157,7 +161,7 @@ public class ExpressionBuilderDialog extends JDialog {
                        public void actionPerformed(ActionEvent e) {
                                log.debug("Opening insert variable window");
                                Window parentWindow = SwingUtilities.getWindowAncestor(ExpressionBuilderDialog.this);
-                               new VariableSelector(parentWindow, ExpressionBuilderDialog.this, simulation).setVisible(true);
+                               new VariableSelector(parentWindow, ExpressionBuilderDialog.this, doc).setVisible(true);
                        }
                });
                
@@ -172,13 +176,15 @@ public class ExpressionBuilderDialog extends JDialog {
                        }
                });
                
-               
                //// OK Button
                okButton.setEnabled(false);
                okButton.addActionListener(new ActionListener() {
                        @Override
                        public void actionPerformed(ActionEvent e) {
-                               expression.addToSimulation();
+                               // add to this simulation
+                               expression.addToDocument();
+                               
+                               // close window
                                ExpressionBuilderDialog.this.dispose();
                        }
                });