update author list in license for (JAL-826)

[jalview.git] / src / jalview / datamodel / ColumnSelection.java

diff --git a/src/jalview/datamodel/ColumnSelection.java b/src/jalview/datamodel/ColumnSelection.java
index 0bcbd5b..d0fc927 100644 (file)
--- a/src/jalview/datamodel/ColumnSelection.java
+++ b/src/jalview/datamodel/ColumnSelection.java
@@ -1,6 +1,6 @@
 /*\r
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.6)\r
- * Copyright (C) 2010 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle\r
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.7)\r
+ * Copyright (C) 2011 J Procter, AM Waterhouse, J Engelhardt, LM Lui, G Barton, M Clamp, S Searle\r
  * \r
  * This file is part of Jalview.\r
  * \r
@@ -1181,9 +1181,16 @@ public class ColumnSelection
                 sq = sq + sb;\r
                 while ((diff = spos + offset - sq.length() - 1) > 0)\r
                 {\r
-                  sq = sq\r
-                          + ((diff >= sb.length()) ? sb.toString() : sb\r
-                                  .substring(0, diff));\r
+                  //sq = sq\r
+                  //        + ((diff >= sb.length()) ? sb.toString() : sb\r
+                  //                .substring(0, diff));\r
+                  if (diff>=sb.length()) {\r
+                    sq+=sb.toString();\r
+                  } else {\r
+                    char[] buf = new char[diff];\r
+                    sb.getChars(0, diff, buf, 0);\r
+                    sq+=buf.toString();\r
+                  }\r
                 }\r
               }\r
               sq += sb.toString();\r
@@ -1220,9 +1227,16 @@ public class ColumnSelection
         int diff = origseq.getLength() - sq.length();\r
         while (diff > 0)\r
         {\r
-          sq = sq\r
-                  + ((diff >= sb.length()) ? sb.toString() : sb\r
-                          .substring(0, diff));\r
+          //sq = sq\r
+          //        + ((diff >= sb.length()) ? sb.toString() : sb\r
+          //                .substring(0, diff));\r
+          if (diff>=sb.length()) {\r
+            sq+=sb.toString();\r
+          } else {\r
+            char[] buf = new char[diff];\r
+            sb.getChars(0, diff, buf, 0);\r
+            sq+=buf.toString();\r
+          }\r
           diff = origseq.getLength() - sq.length();\r
         }\r
       }\r