X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=core%2Fsrc%2Fnet%2Fsf%2Fopenrocket%2Fdocument%2FSimulation.java;h=edb093c3b9b016c813ce61ba1ddf0858f42340ff;hb=77f2457dc781c8c517ddef157c18491ad770f6c6;hp=33a4866e2ccee10e5c1bac9c8171df199f7b16f7;hpb=685fa98064d819d518323347255ee5e4410087af;p=debian%2Fopenrocket

diff --git a/core/src/net/sf/openrocket/document/Simulation.java b/core/src/net/sf/openrocket/document/Simulation.java
index 33a4866e..edb093c3 100644
--- 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;
@@ -71,7 +70,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;
@@ -90,8 +88,8 @@ public class Simulation implements ChangeSource, Cloneable {
 	
 	
 	/**
-	 * Create a new simulation for the rocket.  The initial motor configuration is
-	 * taken from the default rocket configuration.
+	 * Create a new simulation for the rocket. Parent document should also be provided.
+	 * The initial motor configuration is taken from the default rocket configuration.
 	 * 
 	 * @param rocket	the rocket associated with the simulation.
 	 */
@@ -148,21 +146,6 @@ public class Simulation implements ChangeSource, Cloneable {
 		
 	}
 	
-	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.
 	 *