X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Futil%2FStringUtils.java;h=b3456aaf38bfcde51397060fd2f30252ead5b9ec;hb=4cc3017f070e0bc1b291d9cfaf572b1c9c5e76d3;hp=ad1c0f7b7ab33bd658c70e3511bb3a72b87b9929;hpb=26ba864a6c290121fe6cf616794d2d0bea65fb7d;p=jalview.git

diff --git a/src/jalview/util/StringUtils.java b/src/jalview/util/StringUtils.java
index ad1c0f7..b3456aa 100644
--- a/src/jalview/util/StringUtils.java
+++ b/src/jalview/util/StringUtils.java
@@ -21,9 +21,7 @@
 package jalview.util;
 
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 import java.util.regex.Pattern;
 
 public class StringUtils
@@ -140,7 +138,8 @@ public class StringUtils
    * @param delimiter
    * @return elements separated by separator
    */
-  public static String[] separatorListToArray(String input, String delimiter)
+  public static String[] separatorListToArray(String input,
+          String delimiter)
   {
     int seplen = delimiter.length();
     if (input == null || input.equals("") || input.equals(delimiter))
@@ -157,9 +156,8 @@ public class StringUtils
       if (wasescaped || wasquoted)
       {
         // append to previous pos
-        jv.set(jv.size() - 1,
-                lstitem = lstitem + delimiter
-                        + input.substring(cp, pos + escape));
+        jv.set(jv.size() - 1, lstitem = lstitem + delimiter
+                + input.substring(cp, pos + escape));
       }
       else
       {
@@ -203,8 +201,8 @@ public class StringUtils
     }
     if (DEBUG)
     {
-      System.err.println("Empty Array from '" + delimiter
-              + "' separated List");
+      System.err.println(
+              "Empty Array from '" + delimiter + "' separated List");
     }
     return null;
   }
@@ -237,85 +235,19 @@ public class StringUtils
       }
       if (DEBUG)
       {
-        System.err.println("Returning '" + separator
-                + "' separated List:\n");
+        System.err
+                .println("Returning '" + separator + "' separated List:\n");
         System.err.println(v);
       }
       return v.toString();
     }
     if (DEBUG)
     {
-      System.err.println("Returning empty '" + separator
-              + "' separated List\n");
+      System.err.println(
+              "Returning empty '" + separator + "' separated List\n");
     }
     return "" + separator;
   }
-  
-  /**
-   * Parses the input line to a map of name / value(s) pairs. For example the
-   * line <br>
-   * Notes=Fe-S;Method=manual curation; source = Pfam; Notes = Metal <br>
-   * if parsed with delimiter=";" and separators {' ', '='} <br>
-   * would return a map with { Notes={Fe=S, Metal}, Method={manual curation},
-   * source={Pfam}} <br>
-   * Note the name/value strings are trimmed of leading / trailing spaces; the
-   * first separator encountered is used
-   * 
-   * @param line
-   * @param delimiter
-   *          the major delimiter between name-value pairs
-   * @param separators
-   *          one or more separators used between name and value
-   * @return the name-values map (which may be empty but never null)
-   */
-  public static Map<String, List<String>> parseNameValuePairs(String line,
-          String delimiter, char[] separators)
-  {
-    Map<String, List<String>> map = new HashMap<String, List<String>>();
-    if (line == null || line.trim().length() == 0)
-    {
-      return map;
-    }
-
-    for (String pair : line.trim().split(delimiter))
-    {
-      pair = pair.trim();
-      if (pair.length() == 0)
-      {
-        continue;
-      }
-
-      int sepPos = -1;
-      for (char sep : separators)
-      {
-        int pos = pair.indexOf(sep);
-        if (pos > -1 && (sepPos == -1 || pos < sepPos))
-        {
-          sepPos = pos;
-        }
-      }
-
-      if (sepPos == -1)
-      {
-        // no name=value detected
-        continue;
-      }
-
-      String key = pair.substring(0, sepPos).trim();
-      String value = pair.substring(sepPos + 1).trim();
-      if (value.length() > 0)
-      {
-        List<String> vals = map.get(key);
-        if (vals == null)
-        {
-          vals = new ArrayList<String>();
-          map.put(key, vals);
-        }
-        vals.add(value);
-      }
-    }
-    return map;
-  }
 
   /**
    * Converts a list to a string with a delimiter before each term except the
@@ -367,4 +299,108 @@ public class StringUtils
     }
     return result;
   }
+
+  /**
+   * Compares two versions formatted as e.g. "3.4.5" and returns -1, 0 or 1 as
+   * the first version precedes, is equal to, or follows the second
+   * 
+   * @param v1
+   * @param v2
+   * @return
+   */
+  public static int compareVersions(String v1, String v2)
+  {
+    return compareVersions(v1, v2, null);
+  }
+
+  /**
+   * Compares two versions formatted as e.g. "3.4.5b1" and returns -1, 0 or 1 as
+   * the first version precedes, is equal to, or follows the second
+   * 
+   * @param v1
+   * @param v2
+   * @param pointSeparator
+   *          a string used to delimit point increments in sub-tokens of the
+   *          version
+   * @return
+   */
+  public static int compareVersions(String v1, String v2,
+          String pointSeparator)
+  {
+    if (v1 == null || v2 == null)
+    {
+      return 0;
+    }
+    String[] toks1 = v1.split("\\.");
+    String[] toks2 = v2.split("\\.");
+    int i = 0;
+    for (; i < toks1.length; i++)
+    {
+      if (i >= toks2.length)
+      {
+        /*
+         * extra tokens in v1
+         */
+        return 1;
+      }
+      String tok1 = toks1[i];
+      String tok2 = toks2[i];
+      if (pointSeparator != null)
+      {
+        /*
+         * convert e.g. 5b2 into decimal 5.2 for comparison purposes
+         */
+        tok1 = tok1.replace(pointSeparator, ".");
+        tok2 = tok2.replace(pointSeparator, ".");
+      }
+      try
+      {
+        float f1 = Float.valueOf(tok1);
+        float f2 = Float.valueOf(tok2);
+        int comp = Float.compare(f1, f2);
+        if (comp != 0)
+        {
+          return comp;
+        }
+      } catch (NumberFormatException e)
+      {
+        System.err
+                .println("Invalid version format found: " + e.getMessage());
+        return 0;
+      }
+    }
+
+    if (i < toks2.length)
+    {
+      /*
+       * extra tokens in v2 
+       */
+      return -1;
+    }
+
+    /*
+     * same length, all tokens match
+     */
+    return 0;
+  }
+
+  /**
+   * Converts the string to all lower-case except the first character which is
+   * upper-cased
+   * 
+   * @param s
+   * @return
+   */
+  public static String toSentenceCase(String s)
+  {
+    if (s == null)
+    {
+      return s;
+    }
+    if (s.length() <= 1)
+    {
+      return s.toUpperCase();
+    }
+    return s.substring(0, 1).toUpperCase() + s.substring(1).toLowerCase();
+  }
 }