JAL-3664 support for user.home, user.dir, user

[jalview.git] / src / jalview / datamodel / features / FeatureAttributes.java

diff --git a/src/jalview/datamodel/features/FeatureAttributes.java b/src/jalview/datamodel/features/FeatureAttributes.java
index 1a125c2..655d1eb 100644 (file)
--- a/src/jalview/datamodel/features/FeatureAttributes.java
+++ b/src/jalview/datamodel/features/FeatureAttributes.java
@@ -137,7 +137,7 @@ public class FeatureAttributes implements ApplicationSingletonI
          * Parse numeric value unless we have previously
          * seen text data for this attribute type
          */
-        if (type == null || type == Datatype.Number)
+        if (type == null && couldBeNumber(value) || type == Datatype.Number)
         {
           try
           {
@@ -224,6 +224,27 @@ public class FeatureAttributes implements ApplicationSingletonI
   }
 
   /**
+   * This quick check will save significant time avoiding numerous NumberFormatExceptions.
+   * 
+   * @param f
+   * @return
+   */
+  public boolean couldBeNumber(String f)
+  {
+    int len = f.length();
+    if (len == 0)
+      return false;
+    char ch = f.charAt(0);
+    switch (ch) {
+    case '.':
+    case '+':
+    case '-':
+      return len > 1;
+    }
+    return (ch <= '9' &&  ch >= '0');
+  }
+
+  /**
    * Answers true if at least one attribute is known for the given feature type,
    * else false
    *