temp push

[jalview.git] / src / jalview / util / StringUtils.java

diff --git a/src/jalview/util/StringUtils.java b/src/jalview/util/StringUtils.java
index 1f114a8..a05dc95 100644 (file)
--- a/src/jalview/util/StringUtils.java
+++ b/src/jalview/util/StringUtils.java
@@ -518,6 +518,34 @@ public class StringUtils
    * {@code "a=b;c"}.
    * 
    * @param s
+   * @return
+   */
+  public static boolean isHexString(String s)
+  {
+    int j = s.length();
+    if (j == 0)
+    {
+      return false;
+    }
+    for (int i = 0; i < j; i++)
+    {
+      int c = s.charAt(i);
+      if (!(c >= '0' && c <= '9') && !(c >= 'a' && c <= 'f')
+              && !(c >= 'A' && c <= 'F'))
+      {
+        return false;
+      }
+    }
+    return true;
+  }
+  /**
+   * Answers the input string with any occurrences of the specified (unencoded)
+   * characters replaced by their URL decoding.
+   * <p>
+   * Example: {@code urlDecode("a%3Db%3Bc", "-;=,")} should answer
+   * {@code "a=b;c"}.
+   * 
+   * @param s
    * @param encodable
    * @return
    */
@@ -541,31 +569,33 @@ public class StringUtils
   }
 
   /**
-   * Does a lazy lookup of the url encoding of the given character, saving the
-   * value for repeat lookups
-   * 
-   * @param c
-   * @return
-   */
-  private static String getUrlEncoding(char c)
-  {
-    if (c < 0 || c >= urlEncodings.length)
-    {
-      return String.valueOf(c);
-    }
+  * Does a lazy lookup of the url encoding of the given character, saving the
+  * value for repeat lookups
+  * 
+  * @param c
+  * @return
+  */
+ private static String getUrlEncoding(char c)
+ {
+   if (c < 0 || c >= urlEncodings.length)
+   {
+     return String.valueOf(c);
+   }
+
+   String enc = urlEncodings[c];
+   if (enc == null)
+   {
+     try
+     {
+       enc = urlEncodings[c] = URLEncoder.encode(String.valueOf(c),
+               "UTF-8");
+     } catch (UnsupportedEncodingException e)
+     {
+       enc = urlEncodings[c] = String.valueOf(c);
+     }
+   }
+   return enc;
+ }
 
-    String enc = urlEncodings[c];
-    if (enc == null)
-    {
-      try
-      {
-        enc = urlEncodings[c] = URLEncoder.encode(String.valueOf(c),
-                "UTF-8");
-      } catch (UnsupportedEncodingException e)
-      {
-        enc = urlEncodings[c] = String.valueOf(c);
-      }
-    }
-    return enc;
-  }
+  
 }