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

[debian/openrocket] / core / src / net / sf / openrocket / simulation / customexpression / CustomExpression.java

diff --git a/core/src/net/sf/openrocket/simulation/customexpression/CustomExpression.java b/core/src/net/sf/openrocket/simulation/customexpression/CustomExpression.java
index 2ac41ffc0651bc7a094998089af45607d37c5c28..ddafd9bf0624bad8d42ee25c8b8ff2c172a84c3b 100644 (file)
--- a/core/src/net/sf/openrocket/simulation/customexpression/CustomExpression.java
+++ b/core/src/net/sf/openrocket/simulation/customexpression/CustomExpression.java
@@ -175,7 +175,7 @@ public class CustomExpression implements Cloneable{
                        names.add(type.getName());
 
                if (doc != null){
-                       ArrayList<CustomExpression> expressions = doc.getCustomExpressions();
+                       List<CustomExpression> expressions = doc.getCustomExpressions();
                        for (CustomExpression exp : expressions ){
                                if (exp != this)
                                        names.add(exp.getName());
@@ -412,7 +412,7 @@ public class CustomExpression implements Cloneable{
         */
        public void addToDocument(){
                // Abort if exact expression already in
-               ArrayList<CustomExpression> expressions = doc.getCustomExpressions();
+               List<CustomExpression> expressions = doc.getCustomExpressions();
                if ( !expressions.isEmpty() ) {
                        // check if expression already exists
                        if ( expressions.contains(this) ){