Rework the CustomExpression evaluation to use SimulationListeners. Removed the OpenR...

[debian/openrocket] / core / src / net / sf / openrocket / gui / dialogs / optimization / GeneralOptimizationDialog.java

diff --git a/core/src/net/sf/openrocket/gui/dialogs/optimization/GeneralOptimizationDialog.java b/core/src/net/sf/openrocket/gui/dialogs/optimization/GeneralOptimizationDialog.java
index 50d555472ba26c0ba55a1b734c7a6d4be54f03a9..7a0ecc5fc95e5b12dedc6140995150390789eca1 100644 (file)
--- a/core/src/net/sf/openrocket/gui/dialogs/optimization/GeneralOptimizationDialog.java
+++ b/core/src/net/sf/openrocket/gui/dialogs/optimization/GeneralOptimizationDialog.java
@@ -1000,14 +1000,14 @@ public class GeneralOptimizationDialog extends JDialog {
                        if (id == null) {
                                continue;
                        }
-                       Simulation sim = new Simulation(documentCopy, rocket);
+                       Simulation sim = new Simulation(rocket);
                        sim.getConfiguration().setMotorConfigurationID(id);
                        String name = createSimulationName(trans.get("basicSimulationName"), rocket.getMotorConfigurationNameOrDescription(id));
                        simulations.add(new Named<Simulation>(sim, name));
                }
                
                
-               Simulation sim = new Simulation(documentCopy, rocket);
+               Simulation sim = new Simulation(rocket);
                sim.getConfiguration().setMotorConfigurationID(null);
                String name = createSimulationName(trans.get("noSimulationName"), rocket.getMotorConfigurationNameOrDescription(null));
                simulations.add(new Named<Simulation>(sim, name));