Merge branch 'Release_2_8_2_Branch' into JAL-429_phylip-file-support

[jalview.git] / src / jalview / binding / Annotation.java

diff --git a/src/jalview/binding/Annotation.java b/src/jalview/binding/Annotation.java
index d1f28c0..463312f 100644 (file)
--- a/src/jalview/binding/Annotation.java
+++ b/src/jalview/binding/Annotation.java
@@ -24,6 +24,8 @@ package jalview.binding;
 //- Imported classes and packages -/
 //---------------------------------/
 
+import jalview.util.MessageManager;
+
 import org.exolab.castor.xml.Marshaller;
 import org.exolab.castor.xml.Unmarshaller;
 
@@ -156,10 +158,11 @@ public class Annotation implements java.io.Serializable
     // check bounds for index
     if (index < 0 || index >= this._annotationElementList.size())
     {
-      throw new IndexOutOfBoundsException(
-              "getAnnotationElement: Index value '" + index
-                      + "' not in range [0.."
-                      + (this._annotationElementList.size() - 1) + "]");
+      throw new IndexOutOfBoundsException(MessageManager.formatMessage("exception.index_value_not_in_range", new String[]{
+                 "getAnnotationElement",
+                 Integer.valueOf(index).toString(),
+                 Integer.valueOf((this._annotationElementList.size() - 1)).toString()
+      }));
     }
 
     return (jalview.binding.AnnotationElement) _annotationElementList
@@ -365,10 +368,11 @@ public class Annotation implements java.io.Serializable
     // check bounds for index
     if (index < 0 || index >= this._annotationElementList.size())
     {
-      throw new IndexOutOfBoundsException(
-              "setAnnotationElement: Index value '" + index
-                      + "' not in range [0.."
-                      + (this._annotationElementList.size() - 1) + "]");
+        throw new IndexOutOfBoundsException(MessageManager.formatMessage("exception.index_value_not_in_range", new String[]{
+                 "setAnnotationElement",
+                 Integer.valueOf(index).toString(),
+                 Integer.valueOf((this._annotationElementList.size() - 1)).toString()
+        }));
     }
 
     this._annotationElementList.set(index, vAnnotationElement);