Merge branch 'Release_2_8_2b1_Branch'

[jalview.git] / src / jalview / schemabinding / version2 / JSeq.java

diff --git a/src/jalview/schemabinding/version2/JSeq.java b/src/jalview/schemabinding/version2/JSeq.java
index cc8a884..cb2f51d 100644 (file)
--- a/src/jalview/schemabinding/version2/JSeq.java
+++ b/src/jalview/schemabinding/version2/JSeq.java
@@ -1,19 +1,22 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8)
- * Copyright (C) 2012 J Procter, AM Waterhouse, LM Lui, J Engelhardt, G Barton, M Clamp, S Searle
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2b1)
+ * Copyright (C) 2014 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.
+ * 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/>.
+ * 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.schemabinding.version2;
 
@@ -21,6 +24,8 @@ package jalview.schemabinding.version2;
 //- Imported classes and packages -/
 //---------------------------------/
 
+import jalview.util.MessageManager;
+
 import org.exolab.castor.xml.Marshaller;
 import org.exolab.castor.xml.Unmarshaller;
 
@@ -293,9 +298,11 @@ public class JSeq implements java.io.Serializable
     // check bounds for index
     if (index < 0 || index >= this._featuresList.size())
     {
-      throw new IndexOutOfBoundsException("getFeatures: Index value '"
-              + index + "' not in range [0.."
-              + (this._featuresList.size() - 1) + "]");
+        throw new IndexOutOfBoundsException(MessageManager.formatMessage("exception.index_value_not_in_range", new String[]{
+                         "getFeatures",
+                         Integer.valueOf(index).toString(),
+                         Integer.valueOf((this._featuresList.size() - 1)).toString()
+          })); 
     }
 
     return (jalview.schemabinding.version2.Features) _featuresList
@@ -352,10 +359,11 @@ public class JSeq implements java.io.Serializable
     // check bounds for index
     if (index < 0 || index >= this._hiddenSequencesList.size())
     {
-      throw new IndexOutOfBoundsException(
-              "getHiddenSequences: Index value '" + index
-                      + "' not in range [0.."
-                      + (this._hiddenSequencesList.size() - 1) + "]");
+        throw new IndexOutOfBoundsException(MessageManager.formatMessage("exception.index_value_not_in_range", new String[]{
+                 "getHiddenSequences",
+                 Integer.valueOf(index).toString(),
+                 Integer.valueOf((this._hiddenSequencesList.size() - 1)).toString()
+        })); 
     }
 
     return ((java.lang.Integer) _hiddenSequencesList.get(index)).intValue();
@@ -414,9 +422,11 @@ public class JSeq implements java.io.Serializable
     // check bounds for index
     if (index < 0 || index >= this._pdbidsList.size())
     {
-      throw new IndexOutOfBoundsException("getPdbids: Index value '"
-              + index + "' not in range [0.."
-              + (this._pdbidsList.size() - 1) + "]");
+        throw new IndexOutOfBoundsException(MessageManager.formatMessage("exception.index_value_not_in_range", new String[]{
+                         "getPdbids",
+                         Integer.valueOf(index).toString(),
+                         Integer.valueOf((this._pdbidsList.size() - 1)).toString()
+          })); 
     }
 
     return (jalview.schemabinding.version2.Pdbids) _pdbidsList.get(index);
@@ -699,9 +709,11 @@ public class JSeq implements java.io.Serializable
     // check bounds for index
     if (index < 0 || index >= this._featuresList.size())
     {
-      throw new IndexOutOfBoundsException("setFeatures: Index value '"
-              + index + "' not in range [0.."
-              + (this._featuresList.size() - 1) + "]");
+        throw new IndexOutOfBoundsException(MessageManager.formatMessage("exception.index_value_not_in_range", new String[]{
+                 "setFeatures",
+                 Integer.valueOf(index).toString(),
+                 Integer.valueOf((this._featuresList.size() - 1)).toString()
+        })); 
     }
 
     this._featuresList.set(index, vFeatures);
@@ -750,10 +762,11 @@ public class JSeq implements java.io.Serializable
     // check bounds for index
     if (index < 0 || index >= this._hiddenSequencesList.size())
     {
-      throw new IndexOutOfBoundsException(
-              "setHiddenSequences: Index value '" + index
-                      + "' not in range [0.."
-                      + (this._hiddenSequencesList.size() - 1) + "]");
+        throw new IndexOutOfBoundsException(MessageManager.formatMessage("exception.index_value_not_in_range", new String[]{
+                         "setHiddenSequences",
+                         Integer.valueOf(index).toString(),
+                         Integer.valueOf((this._hiddenSequencesList.size() - 1)).toString()
+          })); 
     }
 
     this._hiddenSequencesList.set(index, new java.lang.Integer(
@@ -803,9 +816,11 @@ public class JSeq implements java.io.Serializable
     // check bounds for index
     if (index < 0 || index >= this._pdbidsList.size())
     {
-      throw new IndexOutOfBoundsException("setPdbids: Index value '"
-              + index + "' not in range [0.."
-              + (this._pdbidsList.size() - 1) + "]");
+        throw new IndexOutOfBoundsException(MessageManager.formatMessage("exception.index_value_not_in_range", new String[]{
+                 "setPdbids",
+                 Integer.valueOf(index).toString(),
+                 Integer.valueOf((this._pdbidsList.size() - 1)).toString()
+        })); 
     }
 
     this._pdbidsList.set(index, vPdbids);