X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fdatamodel%2FCigarBase.java;h=5fb507a5392d88fc43da717938439cefda84632c;hb=2e18e422cead591bd9a1df295f1897b3e346a480;hp=69826b6ac7f2d2241d53bc310e62f9ca0db12583;hpb=47168f025aefdaa044802bd5f8f510ffe43a4808;p=jalview.git

diff --git a/src/jalview/datamodel/CigarBase.java b/src/jalview/datamodel/CigarBase.java
index 69826b6..5fb507a 100644
--- a/src/jalview/datamodel/CigarBase.java
+++ b/src/jalview/datamodel/CigarBase.java
@@ -1,6 +1,6 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2)
- * Copyright (C) 2014 The Jalview Authors
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
  * 
  * This file is part of Jalview.
  * 
@@ -20,7 +20,9 @@
  */
 package jalview.datamodel;
 
-import java.util.*;
+import jalview.util.MessageManager;
+
+import java.util.Vector;
 
 public abstract class CigarBase
 {
@@ -99,8 +101,7 @@ public abstract class CigarBase
       case D:
         if (!consecutive_del)
         {
-          deletions[++delcount] = new int[]
-          { cursor, 0, alcursor };
+          deletions[++delcount] = new int[] { cursor, 0, alcursor };
         }
         cursor += range[i];
         deletions[delcount][1] = cursor - 1;
@@ -144,7 +145,9 @@ public abstract class CigarBase
         endpos = alcursor;
         break;
       default:
-        throw new Error("Unknown SeqCigar operation '" + operation[i] + "'");
+        throw new Error(MessageManager.formatMessage(
+                "error.unknown_seq_cigar_operation",
+                new String[] { new StringBuffer(operation[i]).toString() }));
       }
     }
     if (++delcount > 0)
@@ -153,9 +156,8 @@ public abstract class CigarBase
       System.arraycopy(deletions, 0, trunc_deletions, 0, delcount);
     }
     deletions = null;
-    return new Object[]
-    { ((reference != null) ? sq.toString() : null), new int[]
-    { start, startpos, end, endpos }, trunc_deletions };
+    return new Object[] { ((reference != null) ? sq.toString() : null),
+        new int[] { start, startpos, end, endpos }, trunc_deletions };
   }
 
   protected void compact_operations()
@@ -223,7 +225,9 @@ public abstract class CigarBase
       } while (c >= '0' && c <= '9' && j < l);
       if (j >= l && c >= '0' && c <= '9')
       {
-        throw new Exception("Unterminated cigar string.");
+        throw new Exception(
+                MessageManager
+                        .getString("exception.unterminated_cigar_string"));
       }
       try
       {
@@ -232,7 +236,9 @@ public abstract class CigarBase
         i = j;
       } catch (Exception e)
       {
-        throw new Error("Implementation bug in parseCigarString");
+        throw new Error(
+                MessageManager
+                        .getString("error.implementation_bug_parse_cigar_string"));
       }
       if (c >= 'a' && c <= 'z')
       {
@@ -244,13 +250,13 @@ public abstract class CigarBase
       }
       else
       {
-        throw new Exception("Unexpected operation '" + c
-                + "' in cigar string (position " + i + " in '"
-                + cigarString + "'");
+        throw new Exception(MessageManager.formatMessage(
+                "exception.unexpected_operation_cigar_string_pos",
+                new String[] { new StringBuffer(c).toString(),
+                    Integer.valueOf(i).toString(), cigarString }));
       }
     }
-    return new Object[]
-    { operation, range };
+    return new Object[] { operation, range };
   }
 
   /**
@@ -269,7 +275,9 @@ public abstract class CigarBase
     }
     if (op != M && op != D && op != I)
     {
-      throw new Error("Implementation error. Invalid operation string.");
+      throw new Error(
+              MessageManager
+                      .getString("error.implementation_error_invalid_operation_string"));
     }
     if (range == 0)
     {
@@ -278,7 +286,7 @@ public abstract class CigarBase
     if (range < 0)
     {
       throw new Error(
-              "Invalid range string (must be zero or positive number)");
+              MessageManager.getString("error.invalid_range_string"));
     }
     int lngth = 0;
     if (operation == null)
@@ -391,7 +399,8 @@ public abstract class CigarBase
     if (start < 0 || start > end)
     {
       throw new Error(
-              "Implementation Error: deleteRange out of bounds: start must be non-negative and less than end.");
+              MessageManager
+                      .getString("error.implementation_error_delete_range_out_of_bounds"));
     }
     // find beginning
     int cursor = 0; // mark the position for the current operation being edited.
@@ -463,10 +472,13 @@ public abstract class CigarBase
           }
           break;
         case D:
-          throw new Error("Implementation error."); // do nothing;
+          throw new Error(
+                  MessageManager.getString("error.implementation_error")); // do
+                                                                           // nothing;
         default:
-          throw new Error("Implementation Error! Unknown operation '"
-                  + oldops[o] + "'");
+          throw new Error(MessageManager.formatMessage(
+                  "error.implementation_error_unknown_operation",
+                  new String[] { new StringBuffer(oldops[o]).toString() }));
         }
         rlength -= remain;
         remain = oldrange[++o]; // number of op characters left to edit
@@ -521,12 +533,12 @@ public abstract class CigarBase
       {
       case M:
         cursor += range[i];
+        break;
       case I:
         vcursor += range[i];
         break;
       case D:
-        dr.addElement(new int[]
-        { vcursor, cursor, range[i] });
+        dr.addElement(new int[] { vcursor, cursor, range[i] });
         cursor += range[i];
       }
     }