Big update to custom expression feature.

[debian/openrocket] / core / src / net / sf / openrocket / document / Simulation.java

diff --git a/core/src/net/sf/openrocket/document/Simulation.java b/core/src/net/sf/openrocket/document/Simulation.java
index c947e23d9ac61fed5869b02d47ecbf989310ffa8..162ee20d06f5ee01febae1c90a8c8af911495316 100644 (file)
--- a/core/src/net/sf/openrocket/document/Simulation.java
+++ b/core/src/net/sf/openrocket/document/Simulation.java
@@ -13,7 +13,6 @@ import net.sf.openrocket.masscalc.MassCalculator;
 import net.sf.openrocket.rocketcomponent.Configuration;
 import net.sf.openrocket.rocketcomponent.Rocket;
 import net.sf.openrocket.simulation.BasicEventSimulationEngine;
-import net.sf.openrocket.simulation.CustomExpression;
 import net.sf.openrocket.simulation.FlightData;
 import net.sf.openrocket.simulation.RK4SimulationStepper;
 import net.sf.openrocket.simulation.SimulationConditions;
@@ -72,7 +71,6 @@ public class Simulation implements ChangeSource, Cloneable {
        private SimulationOptions options;
        
        private ArrayList<String> simulationListeners = new ArrayList<String>();
-       private ArrayList<CustomExpression> customExpressions = new ArrayList<CustomExpression>();
        
        private final Class<? extends SimulationEngine> simulationEngineClass = BasicEventSimulationEngine.class;
        private Class<? extends SimulationStepper> simulationStepperClass = RK4SimulationStepper.class;
@@ -161,21 +159,6 @@ public class Simulation implements ChangeSource, Cloneable {
                return document;
        }
        
-       public void addCustomExpression(CustomExpression expression){
-               this.status = Simulation.Status.OUTDATED;
-               log.debug("Simulation must be run again to update custom expression.");
-               customExpressions.add(expression);
-       }
-       
-       public void removeCustomExpression(CustomExpression expression){
-               customExpressions.remove(expression);
-       }
-       
-       public ArrayList<CustomExpression> getCustomExpressions(){
-               return customExpressions;
-       }
-       
-       
        /**
         * Return the rocket associated with this simulation.
         *