Minor changes for Froyo compatibility.

git-svn-id: https://openrocket.svn.sourceforge.net/svnroot/openrocket/trunk@961 180e2498-e6e9-4542-8430-84ac67f01cd8

diff --git a/core/src/net/sf/openrocket/rocketcomponent/FinSet.java b/core/src/net/sf/openrocket/rocketcomponent/FinSet.java
index 5e40810b4749fc1268648d7d9da484a049c7e3b1..4b8d58058cb98232e147b516f83ec538139481ea 100644 (file)
--- a/core/src/net/sf/openrocket/rocketcomponent/FinSet.java
+++ b/core/src/net/sf/openrocket/rocketcomponent/FinSet.java
@@ -7,6 +7,7 @@ import java.util.List;
 
 import net.sf.openrocket.l10n.Translator;
 import net.sf.openrocket.startup.Application;
+import net.sf.openrocket.util.ArrayUtils;
 import net.sf.openrocket.util.Coordinate;
 import net.sf.openrocket.util.MathUtil;
 import net.sf.openrocket.util.Transformation;
@@ -675,7 +676,7 @@ public abstract class FinSet extends ExternalComponent {
                double y = -getTabHeight();
                
                int n = points.length;
-               points = Arrays.copyOf(points, points.length + 4);
+               points = ArrayUtils.copyOf(points, points.length + 4);
                points[n] = new Coordinate(x2, 0);
                points[n + 1] = new Coordinate(x2, y);
                points[n + 2] = new Coordinate(x1, y);

diff --git a/core/src/net/sf/openrocket/simulation/customexpression/CustomExpression.java b/core/src/net/sf/openrocket/simulation/customexpression/CustomExpression.java
index ddafd9bf0624bad8d42ee25c8b8ff2c172a84c3b..40b3d700c4a76686980b324a7ea845648ff89067 100644 (file)
--- a/core/src/net/sf/openrocket/simulation/customexpression/CustomExpression.java
+++ b/core/src/net/sf/openrocket/simulation/customexpression/CustomExpression.java
@@ -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;
                }