From: <and...@us...> - 2015-04-23 11:25:47
|
Revision: 2232 http://sourceforge.net/p/jsbml/code/2232 Author: andreas-draeger Date: 2015-04-23 11:25:34 +0000 (Thu, 23 Apr 2015) Log Message: ----------- Extracted several user messages into a resource file for later localization support. Modified Paths: -------------- trunk/core/resources/org/sbml/jsbml/resources/Messages.xml trunk/core/src/org/sbml/jsbml/AbstractMathContainer.java trunk/core/src/org/sbml/jsbml/AbstractNamedSBase.java trunk/core/src/org/sbml/jsbml/AbstractSBase.java trunk/core/src/org/sbml/jsbml/Annotation.java trunk/core/src/org/sbml/jsbml/Constraint.java trunk/core/src/org/sbml/jsbml/Event.java trunk/core/src/org/sbml/jsbml/History.java trunk/core/src/org/sbml/jsbml/KineticLaw.java trunk/core/src/org/sbml/jsbml/Model.java trunk/core/src/org/sbml/jsbml/Reaction.java trunk/core/src/org/sbml/jsbml/SBMLDocument.java trunk/core/src/org/sbml/jsbml/SpeciesReference.java trunk/core/src/org/sbml/jsbml/UnitDefinition.java trunk/core/src/org/sbml/jsbml/util/TreeNodeAdapter.java trunk/extensions/comp/src/org/sbml/jsbml/ext/comp/CompModelPlugin.java trunk/extensions/comp/src/org/sbml/jsbml/ext/comp/CompSBMLDocumentPlugin.java trunk/extensions/comp/src/org/sbml/jsbml/ext/comp/CompSBasePlugin.java trunk/extensions/comp/src/org/sbml/jsbml/ext/comp/SBaseRef.java trunk/extensions/comp/src/org/sbml/jsbml/ext/comp/Submodel.java trunk/extensions/distrib/src/org/sbml/jsbml/ext/distrib/DistribFunctionDefinitionPlugin.java trunk/extensions/distrib/src/org/sbml/jsbml/ext/distrib/DistribSBasePlugin.java trunk/extensions/distrib/src/org/sbml/jsbml/ext/distrib/DrawFromDistribution.java trunk/extensions/distrib/src/org/sbml/jsbml/ext/distrib/Uncertainty.java trunk/extensions/dyn/src/org/sbml/jsbml/ext/dyn/DynCompartmentPlugin.java trunk/extensions/dyn/src/org/sbml/jsbml/ext/dyn/DynEventPlugin.java trunk/extensions/fbc/src/org/sbml/jsbml/ext/fbc/FBCModelPlugin.java trunk/extensions/fbc/src/org/sbml/jsbml/ext/fbc/FBCReactionPlugin.java trunk/extensions/fbc/src/org/sbml/jsbml/ext/fbc/FBCSpeciesPlugin.java trunk/extensions/fbc/src/org/sbml/jsbml/ext/fbc/GeneProteinAssociation.java trunk/extensions/fbc/src/org/sbml/jsbml/ext/fbc/LogicalOperator.java trunk/extensions/fbc/src/org/sbml/jsbml/ext/fbc/Objective.java trunk/extensions/groups/src/org/sbml/jsbml/ext/groups/Group.java trunk/extensions/groups/src/org/sbml/jsbml/ext/groups/GroupsModelPlugin.java trunk/extensions/layout/src/org/sbml/jsbml/ext/layout/BoundingBox.java trunk/extensions/layout/src/org/sbml/jsbml/ext/layout/CubicBezier.java trunk/extensions/layout/src/org/sbml/jsbml/ext/layout/Curve.java trunk/extensions/layout/src/org/sbml/jsbml/ext/layout/GeneralGlyph.java trunk/extensions/layout/src/org/sbml/jsbml/ext/layout/GraphicalObject.java trunk/extensions/layout/src/org/sbml/jsbml/ext/layout/Layout.java trunk/extensions/layout/src/org/sbml/jsbml/ext/layout/LayoutModelPlugin.java trunk/extensions/layout/src/org/sbml/jsbml/ext/layout/LineSegment.java trunk/extensions/layout/src/org/sbml/jsbml/ext/layout/ReactionGlyph.java trunk/extensions/layout/src/org/sbml/jsbml/ext/layout/ReferenceGlyph.java trunk/extensions/layout/src/org/sbml/jsbml/ext/layout/SpeciesReferenceGlyph.java trunk/extensions/multi/src/org/sbml/jsbml/ext/multi/MultiCompartmentPlugin.java trunk/extensions/multi/src/org/sbml/jsbml/ext/multi/MultiModelPlugin.java trunk/extensions/multi/src/org/sbml/jsbml/ext/multi/MultiSimpleSpeciesReferencePlugin.java trunk/extensions/multi/src/org/sbml/jsbml/ext/multi/MultiSpeciesPlugin.java trunk/extensions/multi/src/org/sbml/jsbml/ext/multi/MultiSpeciesReferencePlugin.java trunk/extensions/multi/src/org/sbml/jsbml/ext/multi/SpeciesFeature.java trunk/extensions/multi/src/org/sbml/jsbml/ext/multi/SpeciesFeatureType.java trunk/extensions/multi/src/org/sbml/jsbml/ext/multi/SpeciesType.java trunk/extensions/multi/src/org/sbml/jsbml/ext/multi/SpeciesTypeComponentMapInProduct.java trunk/extensions/qual/src/org/sbml/jsbml/ext/qual/QualModelPlugin.java trunk/extensions/qual/src/org/sbml/jsbml/ext/qual/Transition.java trunk/extensions/render/src/org/sbml/jsbml/ext/render/GlobalRenderInformation.java trunk/extensions/render/src/org/sbml/jsbml/ext/render/GradientBase.java trunk/extensions/render/src/org/sbml/jsbml/ext/render/GradientStop.java trunk/extensions/render/src/org/sbml/jsbml/ext/render/Image.java trunk/extensions/render/src/org/sbml/jsbml/ext/render/LineEnding.java trunk/extensions/render/src/org/sbml/jsbml/ext/render/LinearGradient.java trunk/extensions/render/src/org/sbml/jsbml/ext/render/LocalRenderInformation.java trunk/extensions/render/src/org/sbml/jsbml/ext/render/Polygon.java trunk/extensions/render/src/org/sbml/jsbml/ext/render/Rectangle.java trunk/extensions/render/src/org/sbml/jsbml/ext/render/RenderCubicBezier.java trunk/extensions/render/src/org/sbml/jsbml/ext/render/RenderGroup.java trunk/extensions/render/src/org/sbml/jsbml/ext/render/RenderInformationBase.java trunk/extensions/render/src/org/sbml/jsbml/ext/render/RenderLayoutPlugin.java trunk/extensions/render/src/org/sbml/jsbml/ext/render/RenderListOfLayoutsPlugin.java trunk/extensions/render/src/org/sbml/jsbml/ext/render/RenderPoint.java trunk/extensions/render/src/org/sbml/jsbml/ext/render/Style.java trunk/extensions/req/src/org/sbml/jsbml/ext/req/ReqSBasePlugin.java trunk/extensions/spatial/src/org/sbml/jsbml/ext/spatial/AnalyticGeometry.java trunk/extensions/spatial/src/org/sbml/jsbml/ext/spatial/CSGHomogeneousTransformation.java trunk/extensions/spatial/src/org/sbml/jsbml/ext/spatial/CSGObject.java trunk/extensions/spatial/src/org/sbml/jsbml/ext/spatial/CSGSetOperator.java trunk/extensions/spatial/src/org/sbml/jsbml/ext/spatial/CSGTransformation.java trunk/extensions/spatial/src/org/sbml/jsbml/ext/spatial/CoordinateComponent.java trunk/extensions/spatial/src/org/sbml/jsbml/ext/spatial/Domain.java trunk/extensions/spatial/src/org/sbml/jsbml/ext/spatial/Geometry.java trunk/extensions/spatial/src/org/sbml/jsbml/ext/spatial/MixedGeometry.java trunk/extensions/spatial/src/org/sbml/jsbml/ext/spatial/ParametricGeometry.java trunk/extensions/spatial/src/org/sbml/jsbml/ext/spatial/SampledField.java trunk/extensions/spatial/src/org/sbml/jsbml/ext/spatial/SampledFieldGeometry.java trunk/extensions/spatial/src/org/sbml/jsbml/ext/spatial/SpatialCompartmentPlugin.java trunk/extensions/spatial/src/org/sbml/jsbml/ext/spatial/SpatialModelPlugin.java trunk/extensions/spatial/src/org/sbml/jsbml/ext/spatial/SpatialParameterPlugin.java Modified: trunk/core/resources/org/sbml/jsbml/resources/Messages.xml =================================================================== --- trunk/core/resources/org/sbml/jsbml/resources/Messages.xml 2015-04-23 09:46:58 UTC (rev 2231) +++ trunk/core/resources/org/sbml/jsbml/resources/Messages.xml 2015-04-23 11:25:34 UTC (rev 2232) @@ -30,7 +30,28 @@ </comment> <entry key="IndexExceedsBoundsException">Index {0,number,integer} >= {1,number,integer}</entry> + <entry key="IndexExceedsBoundsException2">Node {0} has no children.</entry> + <entry key="AbstractMathContainer.toFormula">Could not create infix formula from syntax tree.</entry> + <entry key="AbstractMathContainer.inclusion">{0} in {1}</entry> + <entry key="AbstractMathContainer.getDerivedUnitDefinition">Could not derive unit from syntax tree of {0}: {1}</entry> + + <entry key="AbstractNamedSBase.checkIdentifier">\"{0}\" is not a valid identifier for this {1}.</entry> + + <entry key="AbstractSBase.appendNotes">There was a problem adding the given XMLNode: ''{0}'' to the ''body'' XMLNode.</entry> + <entry key="AbstractSBase.createPlugin">The package namespace or name ''{0}'' is unknown!</entry> + <entry key="AbstractSBase.enablePackage">Package not enabled, could not find the SBMLDocument.</entry> + <entry key="AbstractSBase.fireNodeRemovedEvent">fireNodeRemovedEvent called on {0} (parent = {1})</entry> + <entry key="AbstractSBase.getCVTerm">No such controlled vocabulary term with index {0,number,integer}.</entry> + <entry key="AbstractSBase.registerChild1">Trying to register {0} ''{1}'', which is already registered under {2} ''{3}''.</entry> + <entry key="AbstractSBase.registerChild2">{0} ''{1}'' is associated to the different parent ''{2}''. Please remove it there before adding it to this ''{3}'' or add a clone of it to this element.</entry> + <entry key="AbstractSBase.registerChild3">Cannot register {0}.</entry> + <entry key="AbstractSBase.setMetaId">\"{0}\" is not a valid meta-identifier for this {1}.</entry> + <entry key="AbstractSBase.setSBOTerm">Cannot set invalid SBO term {0,number,integer} because it must not be smaller than zero or larger than 9999999.</entry> + <entry key="AbstractSBase.unregisterChild1">unregister called! {0} {1}</entry> + <entry key="AbstractSBase.unregisterChild2">Cannot unregister {0}.</entry> + <entry key="AbstractSBase.unregisterChild3">AbstractSBase - #unregisterChild(SBasePlugin) - called on ''{0}''</entry> + <entry key="AbstractSBase.addDeclaredNamespace">The only allowed prefix for a namespace is 'xmlns:'.</entry> <entry key="AbstractSBase.addExtensionExc">The package namespace or name ''{0}'' is unknown!</entry> <entry key="AbstractSBase.setNamespaceExc">An SBase element cannot belong to two different namespaces! Current namespace = ''{0}'', new namespace = ''{1}''</entry> Modified: trunk/core/src/org/sbml/jsbml/AbstractMathContainer.java =================================================================== --- trunk/core/src/org/sbml/jsbml/AbstractMathContainer.java 2015-04-23 09:46:58 UTC (rev 2231) +++ trunk/core/src/org/sbml/jsbml/AbstractMathContainer.java 2015-04-23 11:25:34 UTC (rev 2232) @@ -150,7 +150,7 @@ pos++; } throw new IndexOutOfBoundsException(MessageFormat.format( - "Index {0,number,integer} >= {1,number,integer}", + resourceBundle.getString("IndexExceedsBoundsException"), index, Math.min(pos, 0))); } @@ -180,12 +180,14 @@ name = getElementName(); SBase parent = getParentSBMLObject(); if ((parent != null) && (parent instanceof NamedSBase)) { - name += " in " + parent.toString(); + name = MessageFormat.format( + resourceBundle.getString("AbstractMathContainer.inclusion"), + name, parent.toString()); } } logger.warn(MessageFormat.format( - "Could not derive unit from syntax tree of {0}: {1}", name, - exc.getLocalizedMessage())); + resourceBundle.getString("AbstractMathContainer.getDerivedUnitDefinition"), + name, exc.getLocalizedMessage())); logger.debug(exc.getLocalizedMessage(), exc); } } @@ -233,8 +235,8 @@ public String getFormula() { try { return isSetMath() ? getMath().toFormula() : ""; - } catch (Throwable e) { - logger.warn("Could not create infix formula from syntax tree.", e); + } catch (Throwable exc) { + logger.warn(resourceBundle.getString("AbstractMathContainer.toFormula"), exc); return "invalid"; } } @@ -352,4 +354,5 @@ } return attributes; } + } Modified: trunk/core/src/org/sbml/jsbml/AbstractNamedSBase.java =================================================================== --- trunk/core/src/org/sbml/jsbml/AbstractNamedSBase.java 2015-04-23 09:46:58 UTC (rev 2231) +++ trunk/core/src/org/sbml/jsbml/AbstractNamedSBase.java 2015-04-23 11:25:34 UTC (rev 2232) @@ -162,7 +162,8 @@ boolean checkIdentifier(String sID) { if ((sID == null) || !SyntaxChecker.isValidId(sID, getLevel(), getVersion())) { throw new IllegalArgumentException(MessageFormat.format( - "\"{0}\" is not a valid identifier for this {1}.", sID, getElementName())); + resourceBundle.getString("AbstractNamedSBase.checkIdentifier"), + sID, getElementName())); } return true; } Modified: trunk/core/src/org/sbml/jsbml/AbstractSBase.java =================================================================== --- trunk/core/src/org/sbml/jsbml/AbstractSBase.java 2015-04-23 09:46:58 UTC (rev 2231) +++ trunk/core/src/org/sbml/jsbml/AbstractSBase.java 2015-04-23 11:25:34 UTC (rev 2232) @@ -689,7 +689,9 @@ for (i=0; i < addedNotes.getChildCount(); i++) { if (curBody.addChild(addedNotes.getChildAt(i)) < 0) { - logger.warn("There was a problem adding the given XMLNode: '" + SBMLtools.toXML(addedNotes.getChildAt(i)) + "' to the 'body' XMLNode."); + logger.warn(MessageFormat.format( + resourceBundle.getString("AbstractSBase.appendNotes"), + SBMLtools.toXML(addedNotes.getChildAt(i)))); return; } } @@ -731,7 +733,9 @@ for (i = 0; i < addedNotes.getChildCount(); i++) { if (curNotes.addChild(addedNotes.getChildAt(i)) < 0) { - logger.warn("There was a problem adding the given XMLNode: '" + SBMLtools.toXML(addedNotes.getChildAt(i)) + "' to the 'body' XMLNode."); + logger.warn(MessageFormat.format( + resourceBundle.getString("AbstractSBase.appendNotes"), + SBMLtools.toXML(addedNotes.getChildAt(i)))); return; } } @@ -760,7 +764,7 @@ * Level/Version combination than this current {@link SBase}, an * {@link LevelVersionError} is thrown. This method is only * package-wide visible because it is not intended to be a - * "real" check, rather than to indicate potential errors. + * <i>real</i> check, rather than to indicate potential errors. */ protected boolean checkLevelAndVersionCompatibility(SBase sbase) { if (sbase.getLevelAndVersion().equals(getLevelAndVersion())) { @@ -812,7 +816,7 @@ } throw new IllegalArgumentException(MessageFormat.format( - "The package namespace or name ''{0}'' is unknown!", + resourceBundle.getString("AbstractSBase.createPlugin"), nameOrUri)); } @@ -843,13 +847,12 @@ */ @Override public void enablePackage(String packageURIOrName, boolean enabled) { - SBMLDocument doc = getSBMLDocument(); if (doc != null) { doc.enablePackage(packageURIOrName, enabled); - } else { - logger.debug("Package not enabled, could not find the SBMLDocument."); + } else if (logger.isDebugEnabled()) { + logger.debug(resourceBundle.getString("AbstractSBase.enablePackage")); } } @@ -998,7 +1001,9 @@ TreeNode parent = getParent(); if (logger.isDebugEnabled()) { - logger.debug("fireNodeRemovedEvent called on " + this + " (parent = " + parent + ")"); + logger.debug(MessageFormat.format( + resourceBundle.getString("AbstractSBase.fireNodeRemovedEvent"), + this, parent)); } if ((parent != null) && (parent instanceof SBase)) { @@ -1076,10 +1081,10 @@ } } - throw new IndexOutOfBoundsException(isLeaf() ? MessageFormat.format( - "Node {0} has no children.", getElementName()) : MessageFormat.format( - "Index {0,number,integer} >= {1,number,integer}", - childIndex, Math.min(pos, 0))); + throw new IndexOutOfBoundsException(isLeaf() ? + MessageFormat.format(resourceBundle.getString("IndexExceedsBoundsException2"), getElementName()) : + MessageFormat.format(resourceBundle.getString("IndexExceedsBoundsException"), + childIndex, Math.min(pos, 0))); } /* (non-Javadoc) @@ -1111,7 +1116,7 @@ return annotation.getCVTerm(index); } throw new IndexOutOfBoundsException(MessageFormat.format( - "No such controlled vocabulary term with index {0,number,integer}.", index)); + resourceBundle.getString("AbstractSBase.getCVTerm"), index)); } /* (non-Javadoc) @@ -1154,16 +1159,15 @@ */ @Override public SBasePlugin getExtension(String nameOrUri) { - // use always the package name in the map PackageParser packageParser = ParserManager.getManager().getPackageParser(nameOrUri); if (packageParser != null) { - return extensions.get(packageParser.getPackageName()); } - throw new IllegalArgumentException(MessageFormat.format("The package namespace or name ''{0}'' is unknown!", nameOrUri)); + throw new IllegalArgumentException(MessageFormat.format( + resourceBundle.getString("AbstractSBase.createPlugin"), nameOrUri)); } /* (non-Javadoc) @@ -1383,7 +1387,8 @@ } } - throw new IllegalArgumentException(MessageFormat.format("The package namespace or name ''{0}'' is unknown!", nameOrUri)); + throw new IllegalArgumentException(MessageFormat.format( + resourceBundle.getString("AbstractSBase.createPlugin"), nameOrUri)); } /* (non-Javadoc) @@ -1616,7 +1621,8 @@ // return false; } - throw new IllegalArgumentException(MessageFormat.format("The package namespace or name ''{0}'' is unknown!", nameOrUri)); + throw new IllegalArgumentException(MessageFormat.format( + resourceBundle.getString("AbstractSBase.createPlugin"), nameOrUri)); } /* (non-Javadoc) @@ -1691,11 +1697,11 @@ if ((sbase != null) && (sbase.getParent() != null)) { if (sbase.getParent() == this) { logger.warn(MessageFormat.format( - "Trying to register {0} ''{1}'', which is already registered under {2} ''{3}''.", + resourceBundle.getString("AbstractSBase.registerChild1"), sbase.getElementName(), sbase, getElementName(), this)); } else { logger.warn(MessageFormat.format( - "{0} ''{1}'' is associated to the different parent ''{2}''. Please remove it there before adding it to this ''{3}'' or add a clone of it to this element.", + resourceBundle.getString("AbstractSBase.registerChild2"), sbase.getClass().getSimpleName(), sbase, sbase.getParent(), this)); } return false; @@ -1743,7 +1749,8 @@ sbase.addAllChangeListeners(listeners); throw new IllegalArgumentException(MessageFormat.format( - "Cannot register {0}.", sbase.getElementName())); + resourceBundle.getString("AbstractSBase.registerChild3"), + sbase.getElementName())); } // TODO - set package version and namespace if needed @@ -1918,7 +1925,7 @@ throw new PropertyNotAvailableException(TreeNodeChangeEvent.metaId, this); } else if (!SyntaxChecker.isValidMetaId(metaId)) { throw new IllegalArgumentException(MessageFormat.format( - "\"{0}\" is not a valid meta-identifier for this {1}.", + resourceBundle.getString("AbstractSBase.setMetaId"), metaId, getElementName())); } } @@ -2031,7 +2038,7 @@ } if (!SBO.checkTerm(term)) { throw new IllegalArgumentException(MessageFormat.format( - "Cannot set invalid SBO term {0,number,integer} because it must not be smaller than zero or larger than 9999999.", + resourceBundle.getString("AbstractSBase.setSBOTerm"), term)); } Integer oldTerm = Integer.valueOf(sboTerm); @@ -2086,8 +2093,10 @@ public void unregisterChild(SBase sbase) { if (logger.isDebugEnabled()) { - logger.debug("unregister called! " + sbase.getElementName() + " " - + (sbase instanceof NamedSBase ? ((NamedSBase) sbase).getId() : "")); + logger.debug(MessageFormat.format( + resourceBundle.getString("AbstractSBase.unregisterChild1"), + sbase.getElementName(), + (sbase instanceof NamedSBase ? ((NamedSBase) sbase).getId() : ""))); } if ((sbase != null)) { @@ -2103,7 +2112,8 @@ // If possible, recursively unregister all ids of the SBase in our model: if ((idManager != null) && !idManager.unregister(sbase)) { - throw new IllegalArgumentException(MessageFormat.format("Cannot unregister {0}.", + throw new IllegalArgumentException(MessageFormat.format( + resourceBundle.getString("AbstractSBase.unregisterChild2"), sbase.getElementName())); } @@ -2125,7 +2135,9 @@ private void unregisterChild(SBasePlugin sbasePlugin) { if (logger.isDebugEnabled()) { - logger.debug("AbstractSBase - #unregisterChild(SBasePlugin) - called on '" + sbasePlugin + "'"); + logger.debug(MessageFormat.format( + resourceBundle.getString("AbstractSBase.unregisterChild3"), + sbasePlugin)); } int childCount = sbasePlugin.getChildCount(); @@ -2223,7 +2235,9 @@ return; } - throw new IllegalArgumentException(MessageFormat.format("The package namespace or name ''{0}'' is unknown!", nameOrUri)); + throw new IllegalArgumentException(MessageFormat.format( + resourceBundle.getString("AbstractSBase.createPlugin"), + nameOrUri)); } @Override Modified: trunk/core/src/org/sbml/jsbml/Annotation.java =================================================================== --- trunk/core/src/org/sbml/jsbml/Annotation.java 2015-04-23 09:46:58 UTC (rev 2231) +++ trunk/core/src/org/sbml/jsbml/Annotation.java 2015-04-23 11:25:34 UTC (rev 2232) @@ -399,7 +399,7 @@ // pos++; // } throw new IndexOutOfBoundsException(MessageFormat.format( - "Index {0,number,integer} >= {1,number,integer}", + resourceBundle.getString("IndexExceedsBoundsException"), childIndex, Math.min(pos, 0))); } Modified: trunk/core/src/org/sbml/jsbml/Constraint.java =================================================================== --- trunk/core/src/org/sbml/jsbml/Constraint.java 2015-04-23 09:46:58 UTC (rev 2231) +++ trunk/core/src/org/sbml/jsbml/Constraint.java 2015-04-23 11:25:34 UTC (rev 2232) @@ -125,7 +125,7 @@ pos++; } throw new IndexOutOfBoundsException(MessageFormat.format( - "Index {0,number,integer} >= {1,number,integer}", + resourceBundle.getString("IndexExceedsBoundsException"), index, Math.min(pos, 0))); } Modified: trunk/core/src/org/sbml/jsbml/Event.java =================================================================== --- trunk/core/src/org/sbml/jsbml/Event.java 2015-04-23 09:46:58 UTC (rev 2231) +++ trunk/core/src/org/sbml/jsbml/Event.java 2015-04-23 11:25:34 UTC (rev 2232) @@ -404,7 +404,7 @@ pos++; } throw new IndexOutOfBoundsException(MessageFormat.format( - "Index {0,number,integer} >= {1,number,integer}", + resourceBundle.getString("IndexExceedsBoundsException"), index, Math.min(pos, 0))); } Modified: trunk/core/src/org/sbml/jsbml/History.java =================================================================== --- trunk/core/src/org/sbml/jsbml/History.java 2015-04-23 09:46:58 UTC (rev 2231) +++ trunk/core/src/org/sbml/jsbml/History.java 2015-04-23 11:25:34 UTC (rev 2232) @@ -184,7 +184,7 @@ pos++; } throw new IndexOutOfBoundsException(MessageFormat.format( - "Index {0,number,integer} >= {1,number,integer}", + resourceBundle.getString("IndexExceedsBoundsException"), childIndex, Math.min(pos, 0))); } Modified: trunk/core/src/org/sbml/jsbml/KineticLaw.java =================================================================== --- trunk/core/src/org/sbml/jsbml/KineticLaw.java 2015-04-23 09:46:58 UTC (rev 2231) +++ trunk/core/src/org/sbml/jsbml/KineticLaw.java 2015-04-23 11:25:34 UTC (rev 2232) @@ -288,7 +288,7 @@ pos++; } throw new IndexOutOfBoundsException(MessageFormat.format( - "Index {0,number,integer} >= {1,number,integer}", + resourceBundle.getString("IndexExceedsBoundsException"), index, Math.min(pos, 0))); } Modified: trunk/core/src/org/sbml/jsbml/Model.java =================================================================== --- trunk/core/src/org/sbml/jsbml/Model.java 2015-04-23 09:46:58 UTC (rev 2231) +++ trunk/core/src/org/sbml/jsbml/Model.java 2015-04-23 11:25:34 UTC (rev 2232) @@ -1876,7 +1876,7 @@ pos++; } throw new IndexOutOfBoundsException(MessageFormat.format( - "Index {0,number,integer} >= {1,number,integer}", + resourceBundle.getString("IndexExceedsBoundsException"), index, Math.min(pos, 0))); } Modified: trunk/core/src/org/sbml/jsbml/Reaction.java =================================================================== --- trunk/core/src/org/sbml/jsbml/Reaction.java 2015-04-23 09:46:58 UTC (rev 2231) +++ trunk/core/src/org/sbml/jsbml/Reaction.java 2015-04-23 11:25:34 UTC (rev 2232) @@ -511,7 +511,7 @@ pos++; } throw new IndexOutOfBoundsException(MessageFormat.format( - "Index {0,number,integer} >= {1,number,integer}", + resourceBundle.getString("IndexExceedsBoundsException"), index, Math.min(pos, 0))); } Modified: trunk/core/src/org/sbml/jsbml/SBMLDocument.java =================================================================== --- trunk/core/src/org/sbml/jsbml/SBMLDocument.java 2015-04-23 09:46:58 UTC (rev 2231) +++ trunk/core/src/org/sbml/jsbml/SBMLDocument.java 2015-04-23 11:25:34 UTC (rev 2232) @@ -662,7 +662,7 @@ return getModel(); } } - throw new IndexOutOfBoundsException(MessageFormat.format("Index {0,number,integer} >= {1,number,integer}", + throw new IndexOutOfBoundsException(MessageFormat.format(resourceBundle.getString("IndexExceedsBoundsException"), index, Math.min(pos, 0))); } Modified: trunk/core/src/org/sbml/jsbml/SpeciesReference.java =================================================================== --- trunk/core/src/org/sbml/jsbml/SpeciesReference.java 2015-04-23 09:46:58 UTC (rev 2231) +++ trunk/core/src/org/sbml/jsbml/SpeciesReference.java 2015-04-23 11:25:34 UTC (rev 2232) @@ -279,7 +279,7 @@ pos++; } throw new IndexOutOfBoundsException(MessageFormat.format( - "Index {0,number,integer} >= {1,number,integer}", + resourceBundle.getString("IndexExceedsBoundsException"), index, Math.min(pos, 0))); } Modified: trunk/core/src/org/sbml/jsbml/UnitDefinition.java =================================================================== --- trunk/core/src/org/sbml/jsbml/UnitDefinition.java 2015-04-23 09:46:58 UTC (rev 2231) +++ trunk/core/src/org/sbml/jsbml/UnitDefinition.java 2015-04-23 11:25:34 UTC (rev 2232) @@ -697,7 +697,7 @@ pos++; } throw new IndexOutOfBoundsException(MessageFormat.format( - "Index {0,number,integer} >= {1,number,integer}", index, + resourceBundle.getString("IndexExceedsBoundsException"), index, + Math.min(pos, 0))); } Modified: trunk/core/src/org/sbml/jsbml/util/TreeNodeAdapter.java =================================================================== --- trunk/core/src/org/sbml/jsbml/util/TreeNodeAdapter.java 2015-04-23 09:46:58 UTC (rev 2231) +++ trunk/core/src/org/sbml/jsbml/util/TreeNodeAdapter.java 2015-04-23 11:25:34 UTC (rev 2232) @@ -176,7 +176,7 @@ } } throw new IndexOutOfBoundsException(MessageFormat.format( - "Index {0,number,integer} >= {1,number,integer}", + resourceBundle.getString("IndexExceedsBoundsException"), childIndex, getChildCount())); } Modified: trunk/extensions/comp/src/org/sbml/jsbml/ext/comp/CompModelPlugin.java =================================================================== --- trunk/extensions/comp/src/org/sbml/jsbml/ext/comp/CompModelPlugin.java 2015-04-23 09:46:58 UTC (rev 2231) +++ trunk/extensions/comp/src/org/sbml/jsbml/ext/comp/CompModelPlugin.java 2015-04-23 11:25:34 UTC (rev 2232) @@ -272,7 +272,7 @@ pos++; } throw new IndexOutOfBoundsException(MessageFormat.format( - "Index {0,number,integer} >= {1,number,integer}", + resourceBundle.getString("IndexExceedsBoundsException"), childIndex, Math.min(pos, 0))); } Modified: trunk/extensions/comp/src/org/sbml/jsbml/ext/comp/CompSBMLDocumentPlugin.java =================================================================== --- trunk/extensions/comp/src/org/sbml/jsbml/ext/comp/CompSBMLDocumentPlugin.java 2015-04-23 09:46:58 UTC (rev 2231) +++ trunk/extensions/comp/src/org/sbml/jsbml/ext/comp/CompSBMLDocumentPlugin.java 2015-04-23 11:25:34 UTC (rev 2232) @@ -600,7 +600,7 @@ pos++; } throw new IndexOutOfBoundsException(MessageFormat.format( - "Index {0,number,integer} >= {1,number,integer}", + resourceBundle.getString("IndexExceedsBoundsException"), childIndex, Math.min(pos, 0))); } Modified: trunk/extensions/comp/src/org/sbml/jsbml/ext/comp/CompSBasePlugin.java =================================================================== --- trunk/extensions/comp/src/org/sbml/jsbml/ext/comp/CompSBasePlugin.java 2015-04-23 09:46:58 UTC (rev 2231) +++ trunk/extensions/comp/src/org/sbml/jsbml/ext/comp/CompSBasePlugin.java 2015-04-23 11:25:34 UTC (rev 2232) @@ -535,7 +535,7 @@ } throw new IndexOutOfBoundsException(MessageFormat.format( - "Index {0,number,integer} >= {1,number,integer}", index, + resourceBundle.getString("IndexExceedsBoundsException"), index, Math.min(pos, 0))); } Modified: trunk/extensions/comp/src/org/sbml/jsbml/ext/comp/SBaseRef.java =================================================================== --- trunk/extensions/comp/src/org/sbml/jsbml/ext/comp/SBaseRef.java 2015-04-23 09:46:58 UTC (rev 2231) +++ trunk/extensions/comp/src/org/sbml/jsbml/ext/comp/SBaseRef.java 2015-04-23 11:25:34 UTC (rev 2232) @@ -485,7 +485,7 @@ } throw new IndexOutOfBoundsException(MessageFormat.format( - "Index {0,number,integer} >= {1,number,integer}", index, + resourceBundle.getString("IndexExceedsBoundsException"), index, Math.min(pos, 0))); } Modified: trunk/extensions/comp/src/org/sbml/jsbml/ext/comp/Submodel.java =================================================================== --- trunk/extensions/comp/src/org/sbml/jsbml/ext/comp/Submodel.java 2015-04-23 09:46:58 UTC (rev 2231) +++ trunk/extensions/comp/src/org/sbml/jsbml/ext/comp/Submodel.java 2015-04-23 11:25:34 UTC (rev 2232) @@ -615,7 +615,7 @@ } throw new IndexOutOfBoundsException(MessageFormat.format( - "Index {0,number,integer} >= {1,number,integer}", index, + resourceBundle.getString("IndexExceedsBoundsException"), index, Math.min(pos, 0))); } Modified: trunk/extensions/distrib/src/org/sbml/jsbml/ext/distrib/DistribFunctionDefinitionPlugin.java =================================================================== --- trunk/extensions/distrib/src/org/sbml/jsbml/ext/distrib/DistribFunctionDefinitionPlugin.java 2015-04-23 09:46:58 UTC (rev 2231) +++ trunk/extensions/distrib/src/org/sbml/jsbml/ext/distrib/DistribFunctionDefinitionPlugin.java 2015-04-23 11:25:34 UTC (rev 2232) @@ -177,7 +177,7 @@ pos++; } throw new IndexOutOfBoundsException(MessageFormat.format( - "Index {0,number,integer} >= {1,number,integer}", index, + resourceBundle.getString("IndexExceedsBoundsException"), index, Math.min(pos, 0))); } Modified: trunk/extensions/distrib/src/org/sbml/jsbml/ext/distrib/DistribSBasePlugin.java =================================================================== --- trunk/extensions/distrib/src/org/sbml/jsbml/ext/distrib/DistribSBasePlugin.java 2015-04-23 09:46:58 UTC (rev 2231) +++ trunk/extensions/distrib/src/org/sbml/jsbml/ext/distrib/DistribSBasePlugin.java 2015-04-23 11:25:34 UTC (rev 2232) @@ -185,7 +185,7 @@ pos++; } throw new IndexOutOfBoundsException(MessageFormat.format( - "Index {0,number,integer} >= {1,number,integer}", index, + resourceBundle.getString("IndexExceedsBoundsException"), index, Math.min(pos, 0))); } Modified: trunk/extensions/distrib/src/org/sbml/jsbml/ext/distrib/DrawFromDistribution.java =================================================================== --- trunk/extensions/distrib/src/org/sbml/jsbml/ext/distrib/DrawFromDistribution.java 2015-04-23 09:46:58 UTC (rev 2231) +++ trunk/extensions/distrib/src/org/sbml/jsbml/ext/distrib/DrawFromDistribution.java 2015-04-23 11:25:34 UTC (rev 2232) @@ -479,7 +479,7 @@ } throw new IndexOutOfBoundsException(MessageFormat.format( - "Index {0,number,integer} >= {1,number,integer}", index, + resourceBundle.getString("IndexExceedsBoundsException"), index, Math.min(pos, 0))); } Modified: trunk/extensions/distrib/src/org/sbml/jsbml/ext/distrib/Uncertainty.java =================================================================== --- trunk/extensions/distrib/src/org/sbml/jsbml/ext/distrib/Uncertainty.java 2015-04-23 09:46:58 UTC (rev 2231) +++ trunk/extensions/distrib/src/org/sbml/jsbml/ext/distrib/Uncertainty.java 2015-04-23 11:25:34 UTC (rev 2232) @@ -236,7 +236,7 @@ } throw new IndexOutOfBoundsException( - MessageFormat.format("Index {0,number,integer} >= {1,number,integer}", + MessageFormat.format(resourceBundle.getString("IndexExceedsBoundsException"), index, Math.min(pos, 0))); } Modified: trunk/extensions/dyn/src/org/sbml/jsbml/ext/dyn/DynCompartmentPlugin.java =================================================================== --- trunk/extensions/dyn/src/org/sbml/jsbml/ext/dyn/DynCompartmentPlugin.java 2015-04-23 09:46:58 UTC (rev 2231) +++ trunk/extensions/dyn/src/org/sbml/jsbml/ext/dyn/DynCompartmentPlugin.java 2015-04-23 11:25:34 UTC (rev 2232) @@ -267,7 +267,7 @@ public TreeNode getChildAt(int childIndex) { if (childIndex < 0 || childIndex >= 1) { throw new IndexOutOfBoundsException(MessageFormat.format( - "Index {0,number,integer} >= {1,number,integer}", + resourceBundle.getString("IndexExceedsBoundsException"), childIndex, +Math.min(getChildCount(), 0))); } Modified: trunk/extensions/dyn/src/org/sbml/jsbml/ext/dyn/DynEventPlugin.java =================================================================== --- trunk/extensions/dyn/src/org/sbml/jsbml/ext/dyn/DynEventPlugin.java 2015-04-23 09:46:58 UTC (rev 2231) +++ trunk/extensions/dyn/src/org/sbml/jsbml/ext/dyn/DynEventPlugin.java 2015-04-23 11:25:34 UTC (rev 2232) @@ -293,7 +293,7 @@ public TreeNode getChildAt(int childIndex) { if (childIndex < 0 || childIndex >= 1) { throw new IndexOutOfBoundsException(MessageFormat.format( - "Index {0,number,integer} >= {1,number,integer}", + resourceBundle.getString("IndexExceedsBoundsException"), childIndex, +Math.min(getChildCount(), 0))); } Modified: trunk/extensions/fbc/src/org/sbml/jsbml/ext/fbc/FBCModelPlugin.java =================================================================== --- trunk/extensions/fbc/src/org/sbml/jsbml/ext/fbc/FBCModelPlugin.java 2015-04-23 09:46:58 UTC (rev 2231) +++ trunk/extensions/fbc/src/org/sbml/jsbml/ext/fbc/FBCModelPlugin.java 2015-04-23 11:25:34 UTC (rev 2232) @@ -259,7 +259,7 @@ } throw new IndexOutOfBoundsException(MessageFormat.format( - "Index {0,number,integer} >= {1,number,integer}", + resourceBundle.getString("IndexExceedsBoundsException"), index, Math.min(pos, 0))); } Modified: trunk/extensions/fbc/src/org/sbml/jsbml/ext/fbc/FBCReactionPlugin.java =================================================================== --- trunk/extensions/fbc/src/org/sbml/jsbml/ext/fbc/FBCReactionPlugin.java 2015-04-23 09:46:58 UTC (rev 2231) +++ trunk/extensions/fbc/src/org/sbml/jsbml/ext/fbc/FBCReactionPlugin.java 2015-04-23 11:25:34 UTC (rev 2232) @@ -179,7 +179,7 @@ } throw new IndexOutOfBoundsException( - MessageFormat.format("Index {0,number,integer} >= {1,number,integer}", + MessageFormat.format(resourceBundle.getString("IndexExceedsBoundsException"), index, Math.min(pos, 0))); } Modified: trunk/extensions/fbc/src/org/sbml/jsbml/ext/fbc/FBCSpeciesPlugin.java =================================================================== --- trunk/extensions/fbc/src/org/sbml/jsbml/ext/fbc/FBCSpeciesPlugin.java 2015-04-23 09:46:58 UTC (rev 2231) +++ trunk/extensions/fbc/src/org/sbml/jsbml/ext/fbc/FBCSpeciesPlugin.java 2015-04-23 11:25:34 UTC (rev 2232) @@ -166,7 +166,7 @@ } int pos = 0; throw new IndexOutOfBoundsException(MessageFormat.format( - "Index {0,number,integer} >= {1,number,integer}", + resourceBundle.getString("IndexExceedsBoundsException"), index, + Math.min(pos, 0))); } Modified: trunk/extensions/fbc/src/org/sbml/jsbml/ext/fbc/GeneProteinAssociation.java =================================================================== --- trunk/extensions/fbc/src/org/sbml/jsbml/ext/fbc/GeneProteinAssociation.java 2015-04-23 09:46:58 UTC (rev 2231) +++ trunk/extensions/fbc/src/org/sbml/jsbml/ext/fbc/GeneProteinAssociation.java 2015-04-23 11:25:34 UTC (rev 2232) @@ -158,7 +158,7 @@ pos++; } throw new IndexOutOfBoundsException( - MessageFormat.format("Index {0,number,integer} >= {1,number,integer}", + MessageFormat.format(resourceBundle.getString("IndexExceedsBoundsException"), index, Math.min(pos, 0))); } Modified: trunk/extensions/fbc/src/org/sbml/jsbml/ext/fbc/LogicalOperator.java =================================================================== --- trunk/extensions/fbc/src/org/sbml/jsbml/ext/fbc/LogicalOperator.java 2015-04-23 09:46:58 UTC (rev 2231) +++ trunk/extensions/fbc/src/org/sbml/jsbml/ext/fbc/LogicalOperator.java 2015-04-23 11:25:34 UTC (rev 2232) @@ -223,7 +223,7 @@ return getListOfAssociations().get(index); } throw new IndexOutOfBoundsException( - MessageFormat.format("Index {0,number,integer} >= {1,number,integer}", + MessageFormat.format(resourceBundle.getString("IndexExceedsBoundsException"), index, Math.min(pos, 0))); } Modified: trunk/extensions/fbc/src/org/sbml/jsbml/ext/fbc/Objective.java =================================================================== --- trunk/extensions/fbc/src/org/sbml/jsbml/ext/fbc/Objective.java 2015-04-23 09:46:58 UTC (rev 2231) +++ trunk/extensions/fbc/src/org/sbml/jsbml/ext/fbc/Objective.java 2015-04-23 11:25:34 UTC (rev 2232) @@ -312,7 +312,7 @@ pos++; } throw new IndexOutOfBoundsException(MessageFormat.format( - "Index {0,number,integer} >= {1,number,integer}", + resourceBundle.getString("IndexExceedsBoundsException"), index, Math.min(pos, 0))); } Modified: trunk/extensions/groups/src/org/sbml/jsbml/ext/groups/Group.java =================================================================== --- trunk/extensions/groups/src/org/sbml/jsbml/ext/groups/Group.java 2015-04-23 09:46:58 UTC (rev 2231) +++ trunk/extensions/groups/src/org/sbml/jsbml/ext/groups/Group.java 2015-04-23 11:25:34 UTC (rev 2232) @@ -198,7 +198,7 @@ } throw new IndexOutOfBoundsException(MessageFormat.format( - "Index {0,number,integer} >= {1,number,integer}", index, + resourceBundle.getString("IndexExceedsBoundsException"), index, +Math.min(position, 0))); } Modified: trunk/extensions/groups/src/org/sbml/jsbml/ext/groups/GroupsModelPlugin.java =================================================================== --- trunk/extensions/groups/src/org/sbml/jsbml/ext/groups/GroupsModelPlugin.java 2015-04-23 09:46:58 UTC (rev 2231) +++ trunk/extensions/groups/src/org/sbml/jsbml/ext/groups/GroupsModelPlugin.java 2015-04-23 11:25:34 UTC (rev 2232) @@ -287,7 +287,7 @@ public SBase getChildAt(int childIndex) { if (childIndex < 0 || childIndex >= 1) { throw new IndexOutOfBoundsException(MessageFormat.format( - "Index {0,number,integer} >= {1,number,integer}", childIndex, + resourceBundle.getString("IndexExceedsBoundsException"), childIndex, +Math.min(getChildCount(), 0))); } Modified: trunk/extensions/layout/src/org/sbml/jsbml/ext/layout/BoundingBox.java =================================================================== --- trunk/extensions/layout/src/org/sbml/jsbml/ext/layout/BoundingBox.java 2015-04-23 09:46:58 UTC (rev 2231) +++ trunk/extensions/layout/src/org/sbml/jsbml/ext/layout/BoundingBox.java 2015-04-23 11:25:34 UTC (rev 2232) @@ -229,7 +229,7 @@ pos++; } throw new IndexOutOfBoundsException(MessageFormat.format( - "Index {0,number,integer} >= {1,number,integer}", + resourceBundle.getString("IndexExceedsBoundsException"), index, Math.min(pos, 0))); } Modified: trunk/extensions/layout/src/org/sbml/jsbml/ext/layout/CubicBezier.java =================================================================== --- trunk/extensions/layout/src/org/sbml/jsbml/ext/layout/CubicBezier.java 2015-04-23 09:46:58 UTC (rev 2231) +++ trunk/extensions/layout/src/org/sbml/jsbml/ext/layout/CubicBezier.java 2015-04-23 11:25:34 UTC (rev 2232) @@ -237,7 +237,7 @@ pos++; } throw new IndexOutOfBoundsException(MessageFormat.format( - "Index {0,number,integer} >= {1,number,integer}", + resourceBundle.getString("IndexExceedsBoundsException"), index, Math.min(pos, 0))); } Modified: trunk/extensions/layout/src/org/sbml/jsbml/ext/layout/Curve.java =================================================================== --- trunk/extensions/layout/src/org/sbml/jsbml/ext/layout/Curve.java 2015-04-23 09:46:58 UTC (rev 2231) +++ trunk/extensions/layout/src/org/sbml/jsbml/ext/layout/Curve.java 2015-04-23 11:25:34 UTC (rev 2232) @@ -171,7 +171,7 @@ pos++; } throw new IndexOutOfBoundsException(MessageFormat.format( - "Index {0,number,integer} >= {1,number,integer}", + resourceBundle.getString("IndexExceedsBoundsException"), index, Math.min(pos, 0))); } Modified: trunk/extensions/layout/src/org/sbml/jsbml/ext/layout/GeneralGlyph.java =================================================================== --- trunk/extensions/layout/src/org/sbml/jsbml/ext/layout/GeneralGlyph.java 2015-04-23 09:46:58 UTC (rev 2231) +++ trunk/extensions/layout/src/org/sbml/jsbml/ext/layout/GeneralGlyph.java 2015-04-23 11:25:34 UTC (rev 2232) @@ -525,7 +525,7 @@ pos++; } throw new IndexOutOfBoundsException(MessageFormat.format( - "Index {0,number,integer} >= {1,number,integer}", + resourceBundle.getString("IndexExceedsBoundsException"), index, Math.min(pos, 0))); } Modified: trunk/extensions/layout/src/org/sbml/jsbml/ext/layout/GraphicalObject.java =================================================================== --- trunk/extensions/layout/src/org/sbml/jsbml/ext/layout/GraphicalObject.java 2015-04-23 09:46:58 UTC (rev 2231) +++ trunk/extensions/layout/src/org/sbml/jsbml/ext/layout/GraphicalObject.java 2015-04-23 11:25:34 UTC (rev 2232) @@ -249,7 +249,7 @@ pos++; } throw new IndexOutOfBoundsException(MessageFormat.format( - "Index {0,number,integer} >= {1,number,integer}", + resourceBundle.getString("IndexExceedsBoundsException"), index, Math.min(pos, 0))); } Modified: trunk/extensions/layout/src/org/sbml/jsbml/ext/layout/Layout.java =================================================================== --- trunk/extensions/layout/src/org/sbml/jsbml/ext/layout/Layout.java 2015-04-23 09:46:58 UTC (rev 2231) +++ trunk/extensions/layout/src/org/sbml/jsbml/ext/layout/Layout.java 2015-04-23 11:25:34 UTC (rev 2232) @@ -622,7 +622,7 @@ } } throw new IndexOutOfBoundsException(MessageFormat.format( - "Index {0,number,integer} >= {1,number,integer}", + resourceBundle.getString("IndexExceedsBoundsException"), index, Math.min(pos, 0))); } Modified: trunk/extensions/layout/src/org/sbml/jsbml/ext/layout/LayoutModelPlugin.java =================================================================== --- trunk/extensions/layout/src/org/sbml/jsbml/ext/layout/LayoutModelPlugin.java 2015-04-23 09:46:58 UTC (rev 2231) +++ trunk/extensions/layout/src/org/sbml/jsbml/ext/layout/LayoutModelPlugin.java 2015-04-23 11:25:34 UTC (rev 2232) @@ -215,7 +215,7 @@ } throw new IndexOutOfBoundsException(MessageFormat.format( - "Index {0,number,integer} >= {1,number,integer}", + resourceBundle.getString("IndexExceedsBoundsException"), index, pos)); } Modified: trunk/extensions/layout/src/org/sbml/jsbml/ext/layout/LineSegment.java =================================================================== --- trunk/extensions/layout/src/org/sbml/jsbml/ext/layout/LineSegment.java 2015-04-23 09:46:58 UTC (rev 2231) +++ trunk/extensions/layout/src/org/sbml/jsbml/ext/layout/LineSegment.java 2015-04-23 11:25:34 UTC (rev 2232) @@ -218,7 +218,7 @@ pos++; } throw new IndexOutOfBoundsException(MessageFormat.format( - "Index {0,number,integer} >= {1,number,integer}", + resourceBundle.getString("IndexExceedsBoundsException"), index, Math.min(pos, 0))); } Modified: trunk/extensions/layout/src/org/sbml/jsbml/ext/layout/ReactionGlyph.java =================================================================== --- trunk/extensions/layout/src/org/sbml/jsbml/ext/layout/ReactionGlyph.java 2015-04-23 09:46:58 UTC (rev 2231) +++ trunk/extensions/layout/src/org/sbml/jsbml/ext/layout/ReactionGlyph.java 2015-04-23 11:25:34 UTC (rev 2232) @@ -227,7 +227,7 @@ pos++; } throw new IndexOutOfBoundsException(MessageFormat.format( - "Index {0,number,integer} >= {1,number,integer}", + resourceBundle.getString("IndexExceedsBoundsException"), index, Math.min(pos, 0))); } Modified: trunk/extensions/layout/src/org/sbml/jsbml/ext/layout/ReferenceGlyph.java =================================================================== --- trunk/extensions/layout/src/org/sbml/jsbml/ext/layout/ReferenceGlyph.java 2015-04-23 09:46:58 UTC (rev 2231) +++ trunk/extensions/layout/src/org/sbml/jsbml/ext/layout/ReferenceGlyph.java 2015-04-23 11:25:34 UTC (rev 2232) @@ -179,7 +179,7 @@ } throw new IndexOutOfBoundsException(MessageFormat.format( - "Index {0,number,integer} >= {1,number,integer}", + resourceBundle.getString("IndexExceedsBoundsException"), index, Math.min(pos, 0))); } Modified: trunk/extensions/layout/src/org/sbml/jsbml/ext/layout/SpeciesReferenceGlyph.java =================================================================== --- trunk/extensions/layout/src/org/sbml/jsbml/ext/layout/SpeciesReferenceGlyph.java 2015-04-23 09:46:58 UTC (rev 2231) +++ trunk/extensions/layout/src/org/sbml/jsbml/ext/layout/SpeciesReferenceGlyph.java 2015-04-23 11:25:34 UTC (rev 2232) @@ -178,7 +178,7 @@ } throw new IndexOutOfBoundsException(MessageFormat.format( - "Index {0,number,integer} >= {1,number,integer}", + resourceBundle.getString("IndexExceedsBoundsException"), index, Math.min(pos, 0))); } Modified: trunk/extensions/multi/src/org/sbml/jsbml/ext/multi/MultiCompartmentPlugin.java =================================================================== --- trunk/extensions/multi/src/org/sbml/jsbml/ext/multi/MultiCompartmentPlugin.java 2015-04-23 09:46:58 UTC (rev 2231) +++ trunk/extensions/multi/src/org/sbml/jsbml/ext/multi/MultiCompartmentPlugin.java 2015-04-23 11:25:34 UTC (rev 2232) @@ -531,7 +531,7 @@ } throw new IndexOutOfBoundsException( - MessageFormat.format("Index {0,number,integer} >= {1,number,integer}", + MessageFormat.format(resourceBundle.getString("IndexExceedsBoundsException"), index, Math.min(pos, 0))); } Modified: trunk/extensions/multi/src/org/sbml/jsbml/ext/multi/MultiModelPlugin.java =================================================================== --- trunk/extensions/multi/src/org/sbml/jsbml/ext/multi/MultiModelPlugin.java 2015-04-23 09:46:58 UTC (rev 2231) +++ trunk/extensions/multi/src/org/sbml/jsbml/ext/multi/MultiModelPlugin.java 2015-04-23 11:25:34 UTC (rev 2232) @@ -289,7 +289,7 @@ } throw new IndexOutOfBoundsException(MessageFormat.format( - "Index {0,number,integer} >= {1,number,integer}", + resourceBundle.getString("IndexExceedsBoundsException"), childIndex, Math.min(pos, 0))); } Modified: trunk/extensions/multi/src/org/sbml/jsbml/ext/multi/MultiSimpleSpeciesReferencePlugin.java =================================================================== --- trunk/extensions/multi/src/org/sbml/jsbml/ext/multi/MultiSimpleSpeciesReferencePlugin.java 2015-04-23 09:46:58 UTC (rev 2231) +++ trunk/extensions/multi/src/org/sbml/jsbml/ext/multi/MultiSimpleSpeciesReferencePlugin.java 2015-04-23 11:25:34 UTC (rev 2232) @@ -268,7 +268,7 @@ @Override public TreeNode getChildAt(int index) { throw new IndexOutOfBoundsException( - MessageFormat.format("Index {0,number,integer} >= {1,number,integer}", + MessageFormat.format(resourceBundle.getString("IndexExceedsBoundsException"), index, Math.min(index, 0))); } } Modified: trunk/extensions/multi/src/org/sbml/jsbml/ext/multi/MultiSpeciesPlugin.java =================================================================== --- trunk/extensions/multi/src/org/sbml/jsbml/ext/multi/MultiSpeciesPlugin.java 2015-04-23 09:46:58 UTC (rev 2231) +++ trunk/extensions/multi/src/org/sbml/jsbml/ext/multi/MultiSpeciesPlugin.java 2015-04-23 11:25:34 UTC (rev 2232) @@ -621,7 +621,7 @@ } throw new IndexOutOfBoundsException(MessageFormat.format( - "Index {0,number,integer} >= {1,number,integer}", + resourceBundle.getString("IndexExceedsBoundsException"), childIndex, Math.min(pos, 0))); } Modified: trunk/extensions/multi/src/org/sbml/jsbml/ext/multi/MultiSpeciesReferencePlugin.java =================================================================== --- trunk/extensions/multi/src/org/sbml/jsbml/ext/multi/MultiSpeciesReferencePlugin.java 2015-04-23 09:46:58 UTC (rev 2231) +++ trunk/extensions/multi/src/org/sbml/jsbml/ext/multi/MultiSpeciesReferencePlugin.java 2015-04-23 11:25:34 UTC (rev 2232) @@ -371,7 +371,7 @@ } throw new IndexOutOfBoundsException( - MessageFormat.format("Index {0,number,integer} >= {1,number,integer}", + MessageFormat.format(resourceBundle.getString("IndexExceedsBoundsException"), index, Math.min(pos, 0))); } Modified: trunk/extensions/multi/src/org/sbml/jsbml/ext/multi/SpeciesFeature.java =================================================================== --- trunk/extensions/multi/src/org/sbml/jsbml/ext/multi/SpeciesFeature.java 2015-04-23 09:46:58 UTC (rev 2231) +++ trunk/extensions/multi/src/org/sbml/jsbml/ext/multi/SpeciesFeature.java 2015-04-23 11:25:34 UTC (rev 2232) @@ -627,7 +627,7 @@ } throw new IndexOutOfBoundsException( - MessageFormat.format("Index {0,number,integer} >= {1,number,integer}", + MessageFormat.format(resourceBundle.getString("IndexExceedsBoundsException"), index, Math.min(pos, 0))); } Modified: trunk/extensions/multi/src/org/sbml/jsbml/ext/multi/SpeciesFeatureType.java =================================================================== --- trunk/extensions/multi/src/org/sbml/jsbml/ext/multi/SpeciesFeatureType.java 2015-04-23 09:46:58 UTC (rev 2231) +++ trunk/extensions/multi/src/org/sbml/jsbml/ext/multi/SpeciesFeatureType.java 2015-04-23 11:25:34 UTC (rev 2232) @@ -525,7 +525,7 @@ } throw new IndexOutOfBoundsException(MessageFormat.format( - "Index {0,number,integer} >= {1,number,integer}", + resourceBundle.getString("IndexExceedsBoundsException"), index, Math.min(pos, 0))); } Modified: trunk/extensions/multi/src/org/sbml/jsbml/ext/multi/SpeciesType.java =================================================================== --- trunk/extensions/multi/src/org/sbml/jsbml/ext/multi/SpeciesType.java 2015-04-23 09:46:58 UTC (rev 2231) +++ trunk/extensions/multi/src/org/sbml/jsbml/ext/multi/SpeciesType.java 2015-04-23 11:25:34 UTC (rev 2232) @@ -1297,7 +1297,7 @@ } throw new IndexOutOfBoundsException(MessageFormat.format( - "Index {0,number,integer} >= {1,number,integer}", + resourceBundle.getString("IndexExceedsBoundsException"), index, Math.min(pos, 0))); } Modified: trunk/extensions/multi/src/org/sbml/jsbml/ext/multi/SpeciesTypeComponentMapInProduct.java =================================================================== --- trunk/extensions/multi/src/org/sbml/jsbml/ext/multi/SpeciesTypeComponentMapInProduct.java 2015-04-23 09:46:58 UTC (rev 2231) +++ trunk/extensions/multi/src/org/sbml/jsbml/ext/multi/SpeciesTypeComponentMapInProduct.java 2015-04-23 11:25:34 UTC (rev 2232) @@ -618,7 +618,7 @@ } throw new IndexOutOfBoundsException( - MessageFormat.format("Index {0,number,integer} >= {1,number,integer}", + MessageFormat.format(resourceBundle.getString("IndexExceedsBoundsException"), index, Math.min(pos, 0))); } Modified: trunk/extensions/qual/src/org/sbml/jsbml/ext/qual/QualModelPlugin.java =================================================================== --- trunk/extensions/qual/src/org/sbml/jsbml/ext/qual/QualModelPlugin.java 2015-04-23 09:46:58 UTC (rev 2231) +++ trunk/extensions/qual/src/org/sbml/jsbml/ext/qual/QualModelPlugin.java 2015-04-23 11:25:34 UTC (rev 2232) @@ -190,7 +190,7 @@ pos++; } throw new IndexOutOfBoundsException(MessageFormat.format( - "Index {0,number,integer} >= {1,number,integer}", + resourceBundle.getString("IndexExceedsBoundsException"), childIndex, Math.min(pos, 0))); } Modified: trunk/extensions/qual/src/org/sbml/jsbml/ext/qual/Transition.java =================================================================== --- trunk/extensions/qual/src/org/sbml/jsbml/ext/qual/Transition.java 2015-04-23 09:46:58 UTC (rev 2231) +++ trunk/extensions/qual/src/org/sbml/jsbml/ext/qual/Transition.java 2015-04-23 11:25:34 UTC (rev 2232) @@ -390,7 +390,7 @@ pos++; } throw new IndexOutOfBoundsException(MessageFormat.format( - "Index {0,number,integer} >= {1,number,integer}", + resourceBundle.getString("IndexExceedsBoundsException"), index, Math.min(pos, 0))); } Modified: trunk/extensions/render/src/org/sbml/jsbml/ext/render/GlobalRenderInformation.java =================================================================== --- trunk/extensions/render/src/org/sbml/jsbml/ext/render/GlobalRenderInformation.java 2015-04-23 09:46:58 UTC (rev 2231) +++ trunk/extensions/render/src/org/sbml/jsbml/ext/render/GlobalRenderInformation.java 2015-04-23 11:25:34 UTC (rev 2232) @@ -311,7 +311,7 @@ pos++; } throw new IndexOutOfBoundsException(MessageFormat.format( - "Index {0,number,integer} >= {1,number,integer}", childIndex, + resourceBundle.getString("IndexExceedsBoundsException"), childIndex, Math.min(pos, 0))); } Modified: trunk/extensions/render/src/org/sbml/jsbml/ext/render/GradientBase.java =================================================================== --- trunk/extensions/render/src/org/sbml/jsbml/ext/render/GradientBase.java 2015-04-23 09:46:58 UTC (rev 2231) +++ trunk/extensions/render/src/org/sbml/jsbml/ext/render/GradientBase.java 2015-04-23 11:25:34 UTC (rev 2232) @@ -155,7 +155,7 @@ pos++; } throw new IndexOutOfBoundsException(MessageFormat.format( - "Index {0,number,integer} >= {1,number,integer}", childIndex, + resourceBundle.getString("IndexExceedsBoundsException"), childIndex, Math.min(pos, 0))); } Modified: trunk/extensions/render/src/org/sbml/jsbml/ext/render/GradientStop.java =================================================================== --- trunk/extensions/render/src/org/sbml/jsbml/ext/render/GradientStop.java 2015-04-23 09:46:58 UTC (rev 2231) +++ trunk/extensions/render/src/org/sbml/jsbml/ext/render/GradientStop.java 2015-04-23 11:25:34 UTC (rev 2232) @@ -186,7 +186,7 @@ } int pos = 0; throw new IndexOutOfBoundsException(MessageFormat.format( - "Index {0,number,integer} >= {1,number,integer}", childIndex, + resourceBundle.getString("IndexExceedsBoundsException"), childIndex, Math.min(pos, 0))); } Modified: trunk/extensions/render/src/org/sbml/jsbml/ext/render/Image.java =================================================================== --- trunk/extensions/render/src/org/sbml/jsbml/ext/render/Image.java 2015-04-23 09:46:58 UTC (rev 2231) +++ trunk/extensions/render/src/org/sbml/jsbml/ext/render/Image.java 2015-04-23 11:25:34 UTC (rev 2232) @@ -285,7 +285,7 @@ } int pos = 0; throw new IndexOutOfBoundsException(MessageFormat.format( - "Index {0,number,integer} >= {1,number,integer}", childIndex, + resourceBundle.getString("IndexExceedsBoundsException"), childIndex, Math.min(pos, 0))); } Modified: trunk/extensions/render/src/org/sbml/jsbml/ext/render/LineEnding.java =================================================================== --- trunk/extensions/render/src/org/sbml/jsbml/ext/render/LineEnding.java 2015-04-23 09:46:58 UTC (rev 2231) +++ trunk/extensions/render/src/org/sbml/jsbml/ext/render/LineEnding.java 2015-04-23 11:25:34 UTC (rev 2232) @@ -121,7 +121,7 @@ } int pos = 0; throw new IndexOutOfBoundsException(MessageFormat.format( - "Index {0,number,integer} >= {1,number,integer}", childIndex, + resourceBundle.getString("IndexExceedsBoundsException"), childIndex, Math.min(pos, 0))); } Modified: trunk/extensions/render/src/org/sbml/jsbml/ext/render/LinearGradient.java =================================================================== --- trunk/extensions/render/src/org/sbml/jsbml/ext/render/LinearGradient.java 2015-04-23 09:46:58 UTC (rev 2231) +++ trunk/extensions/render/src/org/sbml/jsbml/ext/render/LinearGradient.java 2015-04-23 11:25:34 UTC (rev 2232) @@ -213,7 +213,7 @@ } int pos = 0; throw new IndexOutOfBoundsException(MessageFormat.format( - "Index {0,number,integer} >= {1,number,integer}", childIndex, + resourceBundle.getString("IndexExceedsBoundsException"), childIndex, Math.min(pos, 0))); } Modified: trunk/extensions/render/src/org/sbml/jsbml/ext/render/LocalRenderInformation.java =================================================================== --- trunk/extensions/render/src/org/sbml/jsbml/ext/render/LocalRenderInformation.java 2015-04-23 09:46:58 UTC (rev 2231) +++ trunk/extensions/render/src/org/sbml/jsbml/ext/render/LocalRenderInformation.java 2015-04-23 11:25:34 UTC (rev 2232) @@ -303,7 +303,7 @@ pos++; } throw new IndexOutOfBoundsException(MessageFormat.format( - "Index {0,number,integer} >= {1,number,integer}", childIndex, + resourceBundle.getString("IndexExceedsBoundsException"), childIndex, Math.min(pos, 0))); } Modified: trunk/extensions/render/src/org/sbml/jsbml/ext/render/Polygon.java =================================================================== --- trunk/extensions/render/src/org/sbml/jsbml/ext/render/Polygon.java 2015-04-23 09:46:58 UTC (rev 2231) +++ trunk/extensions/render/src/org/sbml/jsbml/ext/render/Polygon.java 2015-04-23 11:25:34 UTC (rev 2232) @@ -107,7 +107,7 @@ pos++; } throw new IndexOutOfBoundsException(MessageFormat.format( - "Index {0,number,integer} >= {1,number,integer}", childIndex, + resourceBundle.getString("IndexExceedsBoundsException"), childIndex, Math.min(pos, 0))); } Modified: trunk/extensions/render/src/org/sbml/jsbml/ext/render/Rectangle.java =================================================================== --- trunk/extensions/render/src/org/sbml/jsbml/ext/render/Rectangle.java 2015-04-23 09:46:58 UTC (rev 2231) +++ trunk/extensions/render/src/org/sbml/jsbml/ext/render/Rectangle.java 2015-04-23 11:25:34 UTC (rev 2232) @@ -793,7 +793,7 @@ } int pos = 0; throw new IndexOutOfBoundsException(MessageFormat.format( - "Index {0,number,integer} >= {1,number,integer}", childIndex, + resourceBundle.getString("IndexExceedsBoundsException"), childIndex, Math.min(pos, 0))); } Modified: trunk/extensions/render/src/org/sbml/jsbml/ext/render/RenderCubicBezier.java =================================================================== --- trunk/extensions/render/src/org/sbml/jsbml/ext/render/RenderCubicBezier.java 2015-04-23 09:46:58 UTC (rev 2231) +++ trunk/extensions/render/src/org/sbml/jsbml/ext/render/RenderCubicBezier.java 2015-04-23 11:25:34 UTC (rev 2232)... [truncated message content] |