Merge branch 'develop' into features/JAL-1705_ensembl

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

diff --git a/src/jalview/util/StringUtils.java b/src/jalview/util/StringUtils.java
index 1325ce5..533e98b 100644 (file)
--- a/src/jalview/util/StringUtils.java
+++ b/src/jalview/util/StringUtils.java
@@ -1,13 +1,33 @@
+/*
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
+ * 
+ * This file is part of Jalview.
+ * 
+ * Jalview is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * as published by the Free Software Foundation, either version 3
+ * of the License, or (at your option) any later version.
+ *  
+ * Jalview is distributed in the hope that it will be useful, but 
+ * WITHOUT ANY WARRANTY; without even the implied warranty 
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+ * PURPOSE.  See the GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview.  If not, see <http://www.gnu.org/licenses/>.
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
+ */
 package jalview.util;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.regex.Pattern;
 
-
 public class StringUtils
 {
-  private static final Pattern DELIMITERS_PATTERN = Pattern.compile(".*='[^']*(?!')");
+  private static final Pattern DELIMITERS_PATTERN = Pattern
+          .compile(".*='[^']*(?!')");
 
   private static final boolean DEBUG = false;
 
@@ -25,11 +45,10 @@ public class StringUtils
    *          the character to insert
    */
   public static final char[] insertCharAt(char[] in, int position,
-          int count,
-          char ch)
+          int count, char ch)
   {
     char[] tmp = new char[in.length + count];
-  
+
     if (position >= in.length)
     {
       System.arraycopy(in, 0, tmp, 0, in.length);
@@ -39,20 +58,19 @@ public class StringUtils
     {
       System.arraycopy(in, 0, tmp, 0, position);
     }
-  
+
     int index = position;
     while (count > 0)
     {
       tmp[index++] = ch;
       count--;
     }
-  
+
     if (position < in.length)
     {
-      System.arraycopy(in, position, tmp, index,
-              in.length - position);
+      System.arraycopy(in, position, tmp, index, in.length - position);
     }
-  
+
     return tmp;
   }
 
@@ -66,7 +84,7 @@ public class StringUtils
    */
   public static final char[] deleteChars(char[] in, int from, int to)
   {
-    if (from >= in.length)
+    if (from >= in.length || from < 0)
     {
       return in;
     }