Minor changes for Froyo compatibility.

[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..40b3d700c4a76686980b324a7ea845648ff89067 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());
@@ -200,7 +200,7 @@ public class CustomExpression implements Cloneable{
        }
        
        public boolean checkSymbol(){
-               if (symbol.trim().isEmpty())
+               if ("".equals(symbol.trim()))
                        return false;
                
                // No bad characters
@@ -226,7 +226,7 @@ public class CustomExpression implements Cloneable{
        }
        
        public boolean checkName(){
-               if (name.trim().isEmpty())
+               if ("".equals(name.trim()))
                        return false;
                
                // No characters that could mess things up saving etc
@@ -275,7 +275,7 @@ public class CustomExpression implements Cloneable{
         * building the expression.
         */
        public boolean checkExpression(){
-               if (expression.trim().isEmpty()){
+               if ("".equals(expression.trim())){
                        return false;
                }
                
@@ -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) ){