You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sis.apache.org by de...@apache.org on 2016/12/31 07:33:02 UTC
svn commit: r1776697 [4/5] - in /sis/branches/JDK7: ./
application/sis-console/src/main/java/org/apache/sis/console/
core/sis-build-helper/src/main/java/org/apache/sis/util/resources/
core/sis-feature/src/main/java/org/apache/sis/feature/ core/sis-feat...
Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors.java?rev=1776697&r1=1776696&r2=1776697&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors.java [UTF-8] Sat Dec 31 07:33:01 2016
@@ -67,295 +67,270 @@ public final class Errors extends Indexe
/**
* Name \u201c{2}\u201d is ambiguous because it can be understood as either \u201c{0}\u201d or \u201c{1}\u201d.
*/
- public static final short AmbiguousName_3 = 0;
+ public static final short AmbiguousName_3 = 1;
/**
* No element can be added to this set because properties \u2018{0}\u2019 and \u2018{1}\u2019 are mutually
* exclusive.
*/
- public static final short CanNotAddToExclusiveSet_2 = 1;
+ public static final short CanNotAddToExclusiveSet_2 = 2;
/**
* Can not assign units \u201c{1}\u201d to dimension \u201c{0}\u201d.
*/
- public static final short CanNotAssignUnitToDimension_2 = 2;
+ public static final short CanNotAssignUnitToDimension_2 = 3;
/**
* Can not assign \u201c{1}\u201d to \u201c{0}\u201d.
*/
- public static final short CanNotAssign_2 = 3;
+ public static final short CanNotAssign_2 = 4;
/**
* Can not compute \u201c{0}\u201d.
*/
- public static final short CanNotCompute_1 = 4;
+ public static final short CanNotCompute_1 = 5;
/**
* Can not connect to \u201c{0}\u201d.
*/
- public static final short CanNotConnectTo_1 = 5;
+ public static final short CanNotConnectTo_1 = 6;
/**
* Can not convert from type \u2018{0}\u2019 to type \u2018{1}\u2019.
*/
- public static final short CanNotConvertFromType_2 = 6;
+ public static final short CanNotConvertFromType_2 = 7;
/**
* Can not convert value \u201c{0}\u201d to type \u2018{1}\u2019.
*/
- public static final short CanNotConvertValue_2 = 7;
+ public static final short CanNotConvertValue_2 = 8;
/**
* Can not open \u201c{0}\u201d.
*/
- public static final short CanNotOpen_1 = 8;
+ public static final short CanNotOpen_1 = 9;
/**
* Can not parse \u201c{1}\u201d as a file in the {0} format.
*/
- public static final short CanNotParseFile_2 = 9;
-
- /**
- * Can not parse line {2} of \u201c{1}\u201d as part of a file in the {0} format.
- */
- public static final short CanNotParseFile_3 = 168;
-
- /**
- * Can not parse line {2} (after column {3}) of \u201c{1}\u201d as part of a file in the {0} format.
- */
- public static final short CanNotParseFile_4 = 169;
+ public static final short CanNotParseFile_2 = 10;
/**
* Can not read property \u201c{1}\u201d in file \u201c{0}\u201d.
*/
- public static final short CanNotReadPropertyInFile_2 = 10;
+ public static final short CanNotReadPropertyInFile_2 = 11;
/**
* Can not read \u201c{0}\u201d.
*/
- public static final short CanNotRead_1 = 11;
+ public static final short CanNotRead_1 = 12;
/**
* Can not represent \u201c{1}\u201d in a strictly standard-compliant {0} format.
*/
- public static final short CanNotRepresentInFormat_2 = 12;
+ public static final short CanNotRepresentInFormat_2 = 13;
/**
* Can not set a value for parameter \u201c{0}\u201d.
*/
- public static final short CanNotSetParameterValue_1 = 13;
+ public static final short CanNotSetParameterValue_1 = 14;
/**
* Can not set a value for property \u201c{0}\u201d.
*/
- public static final short CanNotSetPropertyValue_1 = 14;
+ public static final short CanNotSetPropertyValue_1 = 15;
/**
* Can not transform envelope.
*/
- public static final short CanNotTransformEnvelope = 15;
+ public static final short CanNotTransformEnvelope = 16;
/**
* Can not write \u201c{1}\u201d as a file in the {0} format.
*/
- public static final short CanNotWriteFile_2 = 171;
+ public static final short CanNotWriteFile_2 = 17;
/**
* Circular reference.
*/
- public static final short CircularReference = 16;
+ public static final short CircularReference = 18;
/**
* Class \u2018{0}\u2019 is not final.
*/
- public static final short ClassNotFinal_1 = 17;
+ public static final short ClassNotFinal_1 = 19;
/**
* Can not clone an object of type \u2018{0}\u2019.
*/
- public static final short CloneNotSupported_1 = 18;
-
- /**
- * This {0} reader is closed.
- */
- public static final short ClosedReader_1 = 19;
-
- /**
- * This {0} writer is closed.
- */
- public static final short ClosedWriter_1 = 166;
+ public static final short CloneNotSupported_1 = 20;
/**
* Database error while creating a \u2018{0}\u2019 object for the \u201c{1}\u201d identifier.
*/
- public static final short DatabaseError_2 = 20;
+ public static final short DatabaseError_2 = 21;
/**
* Thread \u201c{0}\u201d is dead.
*/
- public static final short DeadThread_1 = 21;
+ public static final short DeadThread_1 = 22;
/**
* This instance of \u2018{0}\u2019 has been disposed.
*/
- public static final short DisposedInstanceOf_1 = 22;
+ public static final short DisposedInstanceOf_1 = 23;
/**
* Element \u201c{0}\u201d is duplicated.
*/
- public static final short DuplicatedElement_1 = 23;
+ public static final short DuplicatedElement_1 = 24;
/**
* Name or identifier \u201c{0}\u201d is used more than once.
*/
- public static final short DuplicatedIdentifier_1 = 24;
+ public static final short DuplicatedIdentifier_1 = 25;
/**
* Option \u201c{0}\u201d is duplicated.
*/
- public static final short DuplicatedOption_1 = 25;
+ public static final short DuplicatedOption_1 = 26;
/**
* Element \u201c{0}\u201d is already present.
*/
- public static final short ElementAlreadyPresent_1 = 26;
+ public static final short ElementAlreadyPresent_1 = 27;
/**
* Element \u201c{0}\u201d has not been found.
*/
- public static final short ElementNotFound_1 = 27;
+ public static final short ElementNotFound_1 = 28;
/**
* Argument \u2018{0}\u2019 shall not be empty.
*/
- public static final short EmptyArgument_1 = 28;
+ public static final short EmptyArgument_1 = 29;
/**
* The dictionary shall contain at least one entry.
*/
- public static final short EmptyDictionary = 29;
+ public static final short EmptyDictionary = 30;
/**
* Envelope must be at least two-dimensional and non-empty.
*/
- public static final short EmptyEnvelope2D = 30;
+ public static final short EmptyEnvelope2D = 31;
/**
* Property named \u201c{0}\u201d shall not be empty.
*/
- public static final short EmptyProperty_1 = 31;
+ public static final short EmptyProperty_1 = 32;
/**
* An error occurred in file \u201c{0}\u201d at Line {1}.
*/
- public static final short ErrorInFileAtLine_2 = 32;
+ public static final short ErrorInFileAtLine_2 = 33;
/**
* Error in \u201c{0}\u201d: {1}
*/
- public static final short ErrorIn_2 = 33;
+ public static final short ErrorIn_2 = 34;
/**
* Argument \u2018{0}\u2019 shall not contain more than {1} elements. A number of {2} is excessive.
*/
- public static final short ExcessiveArgumentSize_3 = 34;
+ public static final short ExcessiveArgumentSize_3 = 35;
/**
* A size of {1} elements is excessive for the \u201c{0}\u201d list.
*/
- public static final short ExcessiveListSize_2 = 35;
+ public static final short ExcessiveListSize_2 = 36;
/**
* For this algorithm, {0} is an excessive number of dimensions.
*/
- public static final short ExcessiveNumberOfDimensions_1 = 36;
+ public static final short ExcessiveNumberOfDimensions_1 = 37;
/**
* No factory of kind \u2018{0}\u2019 found.
*/
- public static final short FactoryNotFound_1 = 37;
+ public static final short FactoryNotFound_1 = 38;
/**
* File \u201c{0}\u201d has not been found.
*/
- public static final short FileNotFound_1 = 38;
+ public static final short FileNotFound_1 = 39;
/**
* Attribute \u201c{0}\u201d is not allowed for an object of type \u2018{1}\u2019.
*/
- public static final short ForbiddenAttribute_2 = 39;
+ public static final short ForbiddenAttribute_2 = 40;
/**
* Property \u201c{0}\u201d is not allowed.
*/
- public static final short ForbiddenProperty_1 = 40;
+ public static final short ForbiddenProperty_1 = 41;
/**
* Argument \u2018{0}\u2019 can not be an instance of \u2018{1}\u2019.
*/
- public static final short IllegalArgumentClass_2 = 41;
+ public static final short IllegalArgumentClass_2 = 42;
/**
* Argument \u2018{0}\u2019 can not be an instance of \u2018{2}\u2019. Expected an instance of \u2018{1}\u2019 or derived
* type.
*/
- public static final short IllegalArgumentClass_3 = 42;
+ public static final short IllegalArgumentClass_3 = 43;
/**
* Argument \u2018{0}\u2019 can not take the \u201c{1}\u201d value, because the \u2018{2}\u2019 field can not take the \u201c{3}\u201d
* value.
*/
- public static final short IllegalArgumentField_4 = 43;
+ public static final short IllegalArgumentField_4 = 44;
/**
* Argument \u2018{0}\u2019 can not take the \u201c{1}\u201d value.
*/
- public static final short IllegalArgumentValue_2 = 44;
+ public static final short IllegalArgumentValue_2 = 45;
/**
* Illegal bits pattern: {0}.
*/
- public static final short IllegalBitsPattern_1 = 45;
+ public static final short IllegalBitsPattern_1 = 46;
/**
* Coordinate reference system can not be of type \u2018{0}\u2019.
*/
- public static final short IllegalCRSType_1 = 46;
+ public static final short IllegalCRSType_1 = 47;
/**
* The \u201c{2}\u201d character in \u201c{1}\u201d is not permitted by the \u201c{0}\u201d format.
*/
- public static final short IllegalCharacterForFormat_3 = 47;
+ public static final short IllegalCharacterForFormat_3 = 48;
/**
* The \u201c{1}\u201d character can not be used for \u201c{0}\u201d.
*/
- public static final short IllegalCharacter_2 = 48;
+ public static final short IllegalCharacter_2 = 49;
/**
* Class \u2018{1}\u2019 is illegal. It must be \u2018{0}\u2019 or a derived class.
*/
- public static final short IllegalClass_2 = 49;
+ public static final short IllegalClass_2 = 50;
/**
* Coordinate system can not be \u201c{0}\u201d.
*/
- public static final short IllegalCoordinateSystem_1 = 50;
+ public static final short IllegalCoordinateSystem_1 = 51;
/**
* The \u201c{1}\u201d pattern can not be applied to formating of objects of type \u2018{0}\u2019.
*/
- public static final short IllegalFormatPatternForClass_2 = 51;
+ public static final short IllegalFormatPatternForClass_2 = 52;
/**
* \u201c{1}\u201d is not a valid identifier for the \u201c{0}\u201d code space.
*/
- public static final short IllegalIdentifierForCodespace_2 = 52;
-
- /**
- * The {0} reader does not accept inputs of type \u2018{1}\u2019.
- */
- public static final short IllegalInputTypeForReader_2 = 53;
+ public static final short IllegalIdentifierForCodespace_2 = 53;
/**
* The \u201c{0}\u201d language is not recognized.
@@ -378,11 +353,6 @@ public final class Errors extends Indexe
public static final short IllegalOrdinateRange_3 = 57;
/**
- * The {0} writer does not accept outputs of type \u2018{1}\u2019.
- */
- public static final short IllegalOutputTypeForWriter_2 = 165;
-
- /**
* Property \u201c{0}\u201d does not accept instances of \u2018{1}\u2019.
*/
public static final short IllegalPropertyValueClass_2 = 58;
@@ -416,519 +386,519 @@ public final class Errors extends Indexe
* The \u201c{0}\u201d unit of measurement has dimension of \u2018{1}\u2019 ({2}). It is incompatible with
* dimension of \u2018{3}\u2019 ({4}).
*/
- public static final short IncompatibleUnitDimension_5 = 163;
+ public static final short IncompatibleUnitDimension_5 = 64;
/**
* Unit \u201c{0}\u201d is incompatible with current value.
*/
- public static final short IncompatibleUnit_1 = 64;
+ public static final short IncompatibleUnit_1 = 65;
/**
* Units \u201c{0}\u201d and \u201c{1}\u201d are incompatible.
*/
- public static final short IncompatibleUnits_2 = 65;
+ public static final short IncompatibleUnits_2 = 66;
/**
* Value \u201c{1}\u201d of attribute \u2018{0}\u2019 is inconsistent with other attributes.
*/
- public static final short InconsistentAttribute_2 = 66;
+ public static final short InconsistentAttribute_2 = 67;
/**
* Expected \u201c{0}\u201d namespace for \u201c{1}\u201d.
*/
- public static final short InconsistentNamespace_2 = 67;
+ public static final short InconsistentNamespace_2 = 68;
/**
* Inconsistent table columns.
*/
- public static final short InconsistentTableColumns = 68;
+ public static final short InconsistentTableColumns = 69;
/**
* Unit of measurement \u201c{0}\u201d is inconsistent with coordinate system axes.
*/
- public static final short InconsistentUnitsForCS_1 = 69;
+ public static final short InconsistentUnitsForCS_1 = 70;
/**
* Index {0} is out of bounds.
*/
- public static final short IndexOutOfBounds_1 = 70;
+ public static final short IndexOutOfBounds_1 = 71;
/**
* Indices ({0}, {1}) are out of bounds.
*/
- public static final short IndicesOutOfBounds_2 = 71;
+ public static final short IndicesOutOfBounds_2 = 72;
/**
* Argument \u2018{0}\u2019 can not take an infinite value.
*/
- public static final short InfiniteArgumentValue_1 = 72;
+ public static final short InfiniteArgumentValue_1 = 73;
/**
* Argument \u2018{0}\u2019 shall contain at least {1} elements. A number of {2} is insufficient.
*/
- public static final short InsufficientArgumentSize_3 = 73;
+ public static final short InsufficientArgumentSize_3 = 74;
/**
* A different value is already associated to the \u201c{0}\u201d key.
*/
- public static final short KeyCollision_1 = 74;
+ public static final short KeyCollision_1 = 75;
/**
* Attribute \u201c{0}\u201d is mandatory for an object of type \u2018{1}\u2019.
*/
- public static final short MandatoryAttribute_2 = 75;
+ public static final short MandatoryAttribute_2 = 76;
/**
* Mismatched array lengths.
*/
- public static final short MismatchedArrayLengths = 76;
+ public static final short MismatchedArrayLengths = 77;
/**
* The coordinate reference system must be the same for all objects.
*/
- public static final short MismatchedCRS = 77;
+ public static final short MismatchedCRS = 78;
/**
* The \u201c{0}\u201d coordinate reference system has {1} dimension{1,choice,1#|2#s}, but the given
* geometry is {2}-dimensional.
*/
- public static final short MismatchedDimensionForCRS_3 = 78;
+ public static final short MismatchedDimensionForCRS_3 = 79;
/**
* Mismatched object dimensions: {0}D and {1}D.
*/
- public static final short MismatchedDimension_2 = 79;
+ public static final short MismatchedDimension_2 = 80;
/**
* Argument \u2018{0}\u2019 has {2} dimension{2,choice,1#|2#s}, while {1} was expected.
*/
- public static final short MismatchedDimension_3 = 80;
+ public static final short MismatchedDimension_3 = 81;
/**
* The grid geometry must be the same for \u201c{0}\u201d and \u201c{1}\u201d.
*/
- public static final short MismatchedGridGeometry_2 = 81;
+ public static final short MismatchedGridGeometry_2 = 82;
/**
* Mismatched matrix sizes: expected {0}�{1} but got {2}�{3}.
*/
- public static final short MismatchedMatrixSize_4 = 82;
+ public static final short MismatchedMatrixSize_4 = 83;
/**
* Missing a \u2018{1}\u2019 character in \u201c{0}\u201d element.
*/
- public static final short MissingCharacterInElement_2 = 83;
+ public static final short MissingCharacterInElement_2 = 84;
/**
* Missing a \u201c{1}\u201d component in \u201c{0}\u201d.
*/
- public static final short MissingComponentInElement_2 = 84;
+ public static final short MissingComponentInElement_2 = 85;
/**
* JAXB context has not been specified.
*/
- public static final short MissingJAXBContext = 170;
+ public static final short MissingJAXBContext = 86;
/**
* This operation requires the \u201c{0}\u201d module.
*/
- public static final short MissingRequiredModule_1 = 85;
+ public static final short MissingRequiredModule_1 = 87;
/**
* Missing value for \u201c{0}\u201d option.
*/
- public static final short MissingValueForOption_1 = 86;
+ public static final short MissingValueForOption_1 = 88;
/**
* Missing value for \u201c{0}\u201d property.
*/
- public static final short MissingValueForProperty_1 = 87;
+ public static final short MissingValueForProperty_1 = 89;
/**
* Missing value in the \u201c{0}\u201d column.
*/
- public static final short MissingValueInColumn_1 = 88;
+ public static final short MissingValueInColumn_1 = 90;
/**
* Options \u201c{0}\u201d and \u201c{1}\u201d are mutually exclusive.
*/
- public static final short MutuallyExclusiveOptions_2 = 89;
+ public static final short MutuallyExclusiveOptions_2 = 91;
/**
* Argument \u2018{0}\u2019 shall not be negative. The given value was {1}.
*/
- public static final short NegativeArgument_2 = 90;
+ public static final short NegativeArgument_2 = 92;
/**
* Can not create a \u201c{0}\u201d array of negative length.
*/
- public static final short NegativeArrayLength_1 = 91;
+ public static final short NegativeArrayLength_1 = 93;
/**
* Nested \u201c{0}\u201d elements are not allowed.
*/
- public static final short NestedElementNotAllowed_1 = 167;
+ public static final short NestedElementNotAllowed_1 = 94;
/**
* No value is associated to \u201c{0}\u201d.
*/
- public static final short NoSuchValue_1 = 92;
+ public static final short NoSuchValue_1 = 95;
/**
* Node \u201c{0}\u201d can not be a child of itself.
*/
- public static final short NodeChildOfItself_1 = 93;
+ public static final short NodeChildOfItself_1 = 96;
/**
* Node \u201c{0}\u201d already has another parent.
*/
- public static final short NodeHasAnotherParent_1 = 94;
+ public static final short NodeHasAnotherParent_1 = 97;
/**
* Node \u201c{0}\u201d has no parent.
*/
- public static final short NodeHasNoParent_1 = 95;
+ public static final short NodeHasNoParent_1 = 98;
/**
* Node \u201c{0}\u201d is a leaf.
*/
- public static final short NodeIsLeaf_1 = 96;
+ public static final short NodeIsLeaf_1 = 99;
/**
* \u201c{0}\u201d is not an angular unit.
*/
- public static final short NonAngularUnit_1 = 97;
+ public static final short NonAngularUnit_1 = 100;
/**
* Missing a \u2018{1}\u2019 parenthesis in \u201c{0}\u201d.
*/
- public static final short NonEquilibratedParenthesis_2 = 98;
+ public static final short NonEquilibratedParenthesis_2 = 101;
/**
* Conversion is not invertible.
*/
- public static final short NonInvertibleConversion = 99;
+ public static final short NonInvertibleConversion = 102;
/**
* \u201c{0}\u201d is not a linear unit.
*/
- public static final short NonLinearUnit_1 = 100;
+ public static final short NonLinearUnit_1 = 103;
/**
* The scale of measurement for \u201c{0}\u201d unit is not a ratio scale.
*/
- public static final short NonRatioUnit_1 = 162;
+ public static final short NonRatioUnit_1 = 104;
/**
* \u201c{0}\u201d is not a scale unit.
*/
- public static final short NonScaleUnit_1 = 101;
+ public static final short NonScaleUnit_1 = 105;
/**
* \u201c{0}\u201d is not a fundamental or derived unit.
*/
- public static final short NonSystemUnit_1 = 161;
+ public static final short NonSystemUnit_1 = 106;
/**
* \u201c{0}\u201d is not a time unit.
*/
- public static final short NonTemporalUnit_1 = 102;
+ public static final short NonTemporalUnit_1 = 107;
/**
* No element for the \u201c{0}\u201d identifier, or the identifier is a forward reference.
*/
- public static final short NotABackwardReference_1 = 103;
+ public static final short NotABackwardReference_1 = 108;
/**
* \u201c{0}\u201d is not a key-value pair.
*/
- public static final short NotAKeyValuePair_1 = 104;
+ public static final short NotAKeyValuePair_1 = 109;
/**
* Argument \u2018{0}\u2019 shall not be NaN (Not-a-Number).
*/
- public static final short NotANumber_1 = 105;
+ public static final short NotANumber_1 = 110;
/**
* Class \u2018{0}\u2019 is not a primitive type wrapper.
*/
- public static final short NotAPrimitiveWrapper_1 = 106;
+ public static final short NotAPrimitiveWrapper_1 = 111;
/**
* Text \u201c{0}\u201d is not a Unicode identifier.
*/
- public static final short NotAUnicodeIdentifier_1 = 107;
+ public static final short NotAUnicodeIdentifier_1 = 112;
/**
* Argument \u2018{0}\u2019 shall not be null.
*/
- public static final short NullArgument_1 = 108;
+ public static final short NullArgument_1 = 113;
/**
* \u2018{0}\u2019 collection does not accept null elements.
*/
- public static final short NullCollectionElement_1 = 109;
+ public static final short NullCollectionElement_1 = 114;
/**
* Null key is not allowed in this dictionary.
*/
- public static final short NullMapKey = 110;
+ public static final short NullMapKey = 115;
/**
* Null values are not allowed in this dictionary.
*/
- public static final short NullMapValue = 111;
+ public static final short NullMapValue = 116;
/**
* Unexpected null value in record \u201c{2}\u201d for the column \u201c{1}\u201d in table \u201c{0}\u201d.
*/
- public static final short NullValueInTable_3 = 112;
+ public static final short NullValueInTable_3 = 117;
/**
* Array length is {0}, while we expected an even length.
*/
- public static final short OddArrayLength_1 = 113;
+ public static final short OddArrayLength_1 = 118;
/**
* Coordinate is outside the domain of validity.
*/
- public static final short OutsideDomainOfValidity = 114;
+ public static final short OutsideDomainOfValidity = 119;
/**
* No property named \u201c{1}\u201d has been found in \u201c{0}\u201d.
*/
- public static final short PropertyNotFound_2 = 115;
+ public static final short PropertyNotFound_2 = 120;
/**
* Record \u201c{1}\u201d is already defined in schema \u201c{0}\u201d.
*/
- public static final short RecordAlreadyDefined_2 = 116;
+ public static final short RecordAlreadyDefined_2 = 121;
/**
* No record found in \u201c{0}\u201d table for \u201c{1}\u201d key.
*/
- public static final short RecordNotFound_2 = 164;
+ public static final short RecordNotFound_2 = 122;
/**
* Recursive call while creating an object for the \u201c{0}\u201d key.
*/
- public static final short RecursiveCreateCallForKey_1 = 117;
+ public static final short RecursiveCreateCallForKey_1 = 123;
/**
* A decimal separator is required.
*/
- public static final short RequireDecimalSeparator = 118;
+ public static final short RequireDecimalSeparator = 124;
/**
* Thread \u201c{0}\u201d seems stalled.
*/
- public static final short StalledThread_1 = 119;
+ public static final short StalledThread_1 = 125;
/**
* Table \u201c{0}\u201d has not been found.
*/
- public static final short TableNotFound_1 = 120;
+ public static final short TableNotFound_1 = 126;
/**
* Expected at least {0} argument{0,choice,1#|2#s}, but got {1}.
*/
- public static final short TooFewArguments_2 = 121;
+ public static final short TooFewArguments_2 = 127;
/**
* Too few occurrences of \u201c{1}\u201d. Expected at least {0} of them.
*/
- public static final short TooFewOccurrences_2 = 122;
+ public static final short TooFewOccurrences_2 = 128;
/**
* Expected at most {0} argument{0,choice,1#|2#s}, but got {1}.
*/
- public static final short TooManyArguments_2 = 123;
+ public static final short TooManyArguments_2 = 129;
/**
* Too many occurrences of \u201c{1}\u201d. The maximum is {0}.
*/
- public static final short TooManyOccurrences_2 = 124;
+ public static final short TooManyOccurrences_2 = 130;
/**
* Tree depth exceeds the maximum.
*/
- public static final short TreeDepthExceedsMaximum = 125;
+ public static final short TreeDepthExceedsMaximum = 131;
/**
* Ordering between \u201c{0}\u201d and \u201c{1}\u201d elements is undefined.
*/
- public static final short UndefinedOrderingForElements_2 = 126;
+ public static final short UndefinedOrderingForElements_2 = 132;
/**
* Expected an array of length {0}, but got {1}.
*/
- public static final short UnexpectedArrayLength_2 = 127;
+ public static final short UnexpectedArrayLength_2 = 133;
/**
* Unexpected change in \u2018{0}\u2019.
*/
- public static final short UnexpectedChange_1 = 128;
+ public static final short UnexpectedChange_1 = 134;
/**
* The \u201c{1}\u201d characters after \u201c{0}\u201d were unexpected.
*/
- public static final short UnexpectedCharactersAfter_2 = 129;
+ public static final short UnexpectedCharactersAfter_2 = 135;
/**
* Text for \u2018{0}\u2019 was expected to {1,choice,0#begin|1#end} with \u201c{2}\u201d, but found \u201c{3}\u201d.
*/
- public static final short UnexpectedCharactersAtBound_4 = 130;
+ public static final short UnexpectedCharactersAtBound_4 = 136;
/**
* Unexpected end of file while reading \u201c{0}\u201d.
*/
- public static final short UnexpectedEndOfFile_1 = 131;
+ public static final short UnexpectedEndOfFile_1 = 137;
/**
* More characters were expected at the end of \u201c{0}\u201d.
*/
- public static final short UnexpectedEndOfString_1 = 132;
+ public static final short UnexpectedEndOfString_1 = 138;
/**
* File \u201c{1}\u201d seems to be encoded in an other format than {0}.
*/
- public static final short UnexpectedFileFormat_2 = 133;
+ public static final short UnexpectedFileFormat_2 = 139;
/**
* Parameter \u201c{0}\u201d was not expected.
*/
- public static final short UnexpectedParameter_1 = 134;
+ public static final short UnexpectedParameter_1 = 140;
/**
* Property \u201c{1}\u201d was not expected in \u201c{0}\u201d.
*/
- public static final short UnexpectedProperty_2 = 135;
+ public static final short UnexpectedProperty_2 = 141;
/**
* Unexpected scale factor {1} for unit of measurement \u201c{0}\u201d.
*/
- public static final short UnexpectedScaleFactorForUnit_2 = 136;
+ public static final short UnexpectedScaleFactorForUnit_2 = 142;
/**
* Expected \u201c{0}\u201d to reference an instance of \u2018{1}\u2019, but found an instance of \u2018{2}\u2019.
*/
- public static final short UnexpectedTypeForReference_3 = 137;
+ public static final short UnexpectedTypeForReference_3 = 143;
/**
* Unexpected value \u201c{1}\u201d in \u201c{0}\u201d element.
*/
- public static final short UnexpectedValueInElement_2 = 138;
+ public static final short UnexpectedValueInElement_2 = 144;
/**
* Command \u201c{0}\u201d is not recognized.
*/
- public static final short UnknownCommand_1 = 139;
+ public static final short UnknownCommand_1 = 145;
/**
* \u201c{1}\u201d is not a known or supported value for the \u2018{0}\u2019 enumeration.
*/
- public static final short UnknownEnumValue_2 = 140;
+ public static final short UnknownEnumValue_2 = 146;
/**
* Keyword \u201c{0}\u201d is unknown.
*/
- public static final short UnknownKeyword_1 = 141;
+ public static final short UnknownKeyword_1 = 147;
/**
* Option \u201c{0}\u201d is not recognized.
*/
- public static final short UnknownOption_1 = 142;
+ public static final short UnknownOption_1 = 148;
/**
* Type \u2018{0}\u2019 is unknown in this context.
*/
- public static final short UnknownType_1 = 143;
+ public static final short UnknownType_1 = 149;
/**
* Unit \u201c{0}\u201d is not recognized.
*/
- public static final short UnknownUnit_1 = 144;
+ public static final short UnknownUnit_1 = 150;
/**
* The cell at column \u201c{1}\u201d of row \u201c{0}\u201d is unmodifiable.
*/
- public static final short UnmodifiableCellValue_2 = 145;
+ public static final short UnmodifiableCellValue_2 = 151;
/**
* This metadata is not modifiable.
*/
- public static final short UnmodifiableMetadata = 146;
+ public static final short UnmodifiableMetadata = 152;
/**
* This instance of \u2018{0}\u2019 is not modifiable.
*/
- public static final short UnmodifiableObject_1 = 147;
+ public static final short UnmodifiableObject_1 = 153;
/**
* Text \u201c{1}\u201d can not be parsed as an object of type \u2018{0}\u2019.
*/
- public static final short UnparsableStringForClass_2 = 148;
+ public static final short UnparsableStringForClass_2 = 154;
/**
* Text \u201c{1}\u201d can not be parsed as an object of type \u2018{0}\u2019, because of the \u201c{2}\u201d characters.
*/
- public static final short UnparsableStringForClass_3 = 149;
+ public static final short UnparsableStringForClass_3 = 155;
/**
* Can not parse \u201c{1}\u201d in element \u201c{0}\u201d.
*/
- public static final short UnparsableStringInElement_2 = 150;
+ public static final short UnparsableStringInElement_2 = 156;
/**
* Coordinate reference system has not been specified.
*/
- public static final short UnspecifiedCRS = 151;
+ public static final short UnspecifiedCRS = 157;
/**
* No format is specified for objects of class \u2018{0}\u2019.
*/
- public static final short UnspecifiedFormatForClass_1 = 152;
+ public static final short UnspecifiedFormatForClass_1 = 158;
/**
* Version {1} of {0} format is not supported.
*/
- public static final short UnsupportedFormatVersion_2 = 153;
+ public static final short UnsupportedFormatVersion_2 = 159;
/**
* Can not handle this instance of \u2018{0}\u2019 because arbitrary implementations are not yet
* supported.
*/
- public static final short UnsupportedImplementation_1 = 154;
+ public static final short UnsupportedImplementation_1 = 160;
/**
* The \u201c{0}\u201d interpolation is unsupported.
*/
- public static final short UnsupportedInterpolation_1 = 155;
+ public static final short UnsupportedInterpolation_1 = 161;
/**
* The \u2018{0}\u2019 operation is unsupported.
*/
- public static final short UnsupportedOperation_1 = 156;
+ public static final short UnsupportedOperation_1 = 162;
/**
* The \u2018{0}\u2019 type is unsupported.
*/
- public static final short UnsupportedType_1 = 157;
+ public static final short UnsupportedType_1 = 163;
/**
* A value is already defined for \u201c{0}\u201d.
*/
- public static final short ValueAlreadyDefined_1 = 158;
+ public static final short ValueAlreadyDefined_1 = 164;
/**
* Value \u2018{0}\u2019 = {1} is invalid. Expected a number greater than 0.
*/
- public static final short ValueNotGreaterThanZero_2 = 159;
+ public static final short ValueNotGreaterThanZero_2 = 165;
/**
* Value \u2018{0}\u2019 = {3} is invalid. Expected a value in the [{1} \u2026 {2}] range.
*/
- public static final short ValueOutOfRange_4 = 160;
+ public static final short ValueOutOfRange_4 = 166;
}
/**
Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors.properties
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors.properties?rev=1776697&r1=1776696&r2=1776697&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors.properties [ISO-8859-1] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors.properties [ISO-8859-1] Sat Dec 31 07:33:01 2016
@@ -34,8 +34,6 @@ CanNotConvertValue_2 = Can
CanNotCompute_1 = Can not compute \u201c{0}\u201d.
CanNotOpen_1 = Can not open \u201c{0}\u201d.
CanNotParseFile_2 = Can not parse \u201c{1}\u201d as a file in the {0} format.
-CanNotParseFile_3 = Can not parse line {2} of \u201c{1}\u201d as part of a file in the {0} format.
-CanNotParseFile_4 = Can not parse line {2} (after column {3}) of \u201c{1}\u201d as part of a file in the {0} format.
CanNotRead_1 = Can not read \u201c{0}\u201d.
CanNotReadPropertyInFile_2 = Can not read property \u201c{1}\u201d in file \u201c{0}\u201d.
CanNotRepresentInFormat_2 = Can not represent \u201c{1}\u201d in a strictly standard-compliant {0} format.
@@ -46,8 +44,6 @@ CanNotWriteFile_2 = Can
CircularReference = Circular reference.
ClassNotFinal_1 = Class \u2018{0}\u2019 is not final.
CloneNotSupported_1 = Can not clone an object of type \u2018{0}\u2019.
-ClosedReader_1 = This {0} reader is closed.
-ClosedWriter_1 = This {0} writer is closed.
DatabaseError_2 = Database error while creating a \u2018{0}\u2019 object for the \u201c{1}\u201d identifier.
DeadThread_1 = Thread \u201c{0}\u201d is dead.
DisposedInstanceOf_1 = This instance of \u2018{0}\u2019 has been disposed.
@@ -81,8 +77,6 @@ IllegalCoordinateSystem_1 = Coor
IllegalCRSType_1 = Coordinate reference system can not be of type \u2018{0}\u2019.
IllegalFormatPatternForClass_2 = The \u201c{1}\u201d pattern can not be applied to formating of objects of type \u2018{0}\u2019.
IllegalIdentifierForCodespace_2 = \u201c{1}\u201d is not a valid identifier for the \u201c{0}\u201d code space.
-IllegalInputTypeForReader_2 = The {0} reader does not accept inputs of type \u2018{1}\u2019.
-IllegalOutputTypeForWriter_2 = The {0} writer does not accept outputs of type \u2018{1}\u2019.
IllegalLanguageCode_1 = The \u201c{0}\u201d language is not recognized.
IllegalMemberType_2 = Member \u201c{0}\u201d can not be associated to type \u201c{1}\u201d.
IllegalOptionValue_2 = Option \u2018{0}\u2019 can not take the \u201c{1}\u201d value.
Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors_fr.properties
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors_fr.properties?rev=1776697&r1=1776696&r2=1776697&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors_fr.properties [ISO-8859-1] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors_fr.properties [ISO-8859-1] Sat Dec 31 07:33:01 2016
@@ -31,8 +31,6 @@ CanNotConvertValue_2 = La v
CanNotCompute_1 = Ne peut pas calculer \u00ab\u202f{0}\u202f\u00bb.
CanNotOpen_1 = Ne peut pas ouvrir \u00ab\u202f{0}\u202f\u00bb.
CanNotParseFile_2 = Ne peut pas lire \u00ab\u202f{1}\u202f\u00bb comme un fichier au format {0}.
-CanNotParseFile_3 = Ne peut pas lire la ligne {2} de \u00ab\u202f{1}\u202f\u00bb comme une partie d\u2019un fichier au format {0}.
-CanNotParseFile_4 = Ne peut pas lire la ligne {2} (apr\u00e8s la colonne {3}) de \u00ab\u202f{1}\u202f\u00bb comme une partie d\u2019un fichier au format {0}.
CanNotRead_1 = Ne peut pas lire \u00ab\u202f{0}\u202f\u00bb.
CanNotReadPropertyInFile_2 = Ne peut pas lire la propri\u00e9t\u00e9 \u00ab\u202f{1}\u202f\u00bb dans le fichier \u00ab\u202f{0}\u202f\u00bb.
CanNotRepresentInFormat_2 = Ne peut pas repr\u00e9senter \u00ab\u202f{1}\u202f\u00bb dans un format {0} strictement conforme.
@@ -43,8 +41,6 @@ CanNotWriteFile_2 = Ne p
CircularReference = R\u00e9f\u00e9rence circulaire.
ClassNotFinal_1 = La classe \u2018{0}\u2019 n\u2019est pas finale.
CloneNotSupported_1 = Un objet de type \u2018{0}\u2019 ne peut pas \u00eatre clon\u00e9.
-ClosedReader_1 = Ce lecteur {0} est ferm\u00e9.
-ClosedWriter_1 = Cet encodeur {0} est ferm\u00e9.
DatabaseError_2 = Erreur de base de donn\u00e9es lors de la cr\u00e9ation d\u2019un objet \u2018{0}\u2019 pour l\u2019identifiant \u00ab\u202f{1}\u202f\u00bb.
DeadThread_1 = La t\u00e2che \u00ab\u202f{0}\u202f\u00bb est morte.
DisposedInstanceOf_1 = Cette instance de \u2018{0}\u2019 a \u00e9t\u00e9 dispos\u00e9e.
@@ -78,8 +74,6 @@ IllegalCoordinateSystem_1 = Le s
IllegalCRSType_1 = Le syst\u00e8me de r\u00e9f\u00e9rence des coordonn\u00e9es ne peut pas \u00eatre de type \u2018{0}\u2019.
IllegalFormatPatternForClass_2 = Le mod\u00e8le \u00ab\u202f{1}\u202f\u00bb ne peut pas \u00eatre appliqu\u00e9 au formatage d\u2019objets de type \u2018{0}\u2019.
IllegalIdentifierForCodespace_2 = \u00ab\u202f{1}\u202f\u00bb n\u2019est pas un identifiant valide pour l\u2019espace de codes \u00ab\u202f{0}\u202f\u00bb.
-IllegalInputTypeForReader_2 = Le lecteur {0} n\u2019accepte pas des entr\u00e9s de type \u2018{1}\u2019.
-IllegalOutputTypeForWriter_2 = Le l\u2019encodeur {0} n\u2019accepte pas des sorties de type \u2018{1}\u2019.
IllegalLanguageCode_1 = Le code de langue \u00ab\u202f{0}\u202f\u00bb n\u2019est pas reconnu.
IllegalMemberType_2 = Le membre \u00ab\u202f{0}\u202f\u00bb ne peut pas \u00eatre associ\u00e9 au type \u00ab\u202f{1}\u202f\u00bb.
IllegalOptionValue_2 = L\u2019option \u2018{0}\u2019 n\u2019accepte pas la valeur \u00ab\u202f{1}\u202f\u00bb.
Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/IndexedResourceBundle.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/IndexedResourceBundle.java?rev=1776697&r1=1776696&r2=1776697&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/IndexedResourceBundle.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/IndexedResourceBundle.java [UTF-8] Sat Dec 31 07:33:01 2016
@@ -90,6 +90,14 @@ public class IndexedResourceBundle exten
private static final int MAX_STRING_LENGTH = 200;
/**
+ * First valid key index.
+ * We start at 1 rather than 0 in order to keep value 0 available for meaning "no localized message".
+ *
+ * @since 0.8
+ */
+ static final int FIRST = 1;
+
+ /**
* The path of the binary file containing resources, or {@code null} if there is no resources
* or if the resources have already been loaded. The resources may be a file or an entry in a
* JAR file.
@@ -97,12 +105,11 @@ public class IndexedResourceBundle exten
private URL resources;
/**
- * The array of resources. Keys are an array index. For example, the value for key "14" is
- * {@code values[14]}. This array will be loaded only when first needed. We should not load
- * it at construction time, because some {@code ResourceBundle} objects will never ask for
- * values. This is particularly the case for parent resources of {@code Resources_fr_CA},
- * {@code Resources_en}, {@code Resources_de}, etc., which will only be used if a key has
- * not been found in the child resources.
+ * The array of resources. Keys are an array index plus {@value #FIRST}. For example the value for key "14" is
+ * {@code values[13]}. This array will be loaded only when first needed. We should not load it at construction
+ * time, because some {@code ResourceBundle} objects will never ask for values. This is particularly the case
+ * for parent resources of {@code Resources_fr_CA}, {@code Resources_en}, {@code Resources_de}, etc. which will
+ * only be used if a key has not been found in the child resources.
*
* @see #ensureLoaded(String)
*/
@@ -235,7 +242,7 @@ public class IndexedResourceBundle exten
}
final String lineSeparator = System.lineSeparator();
final String[] values = ensureLoaded(null);
- for (int i=0; i<values.length; i++) {
+ for (int i=0; i < values.length; i++) {
final String key = keys [i];
final String value = values[i];
if (key != null && value != null) {
@@ -283,7 +290,7 @@ public class IndexedResourceBundle exten
* into an error record. Note that the message must be logged outside
* the synchronized block, otherwise there is dead locks!
*/
- final Locale locale = getLocale(); // Sometime null with IBM's JDK.
+ final Locale locale = getLocale(); // Sometime null with IBM's JDK.
final String baseName = getClass().getCanonicalName();
final String methodName = (key != null) ? "getObject" : "getKeys";
final LogRecord record = new LogRecord(Level.FINER, "Loaded resources for {0} from bundle \"{1}\".");
@@ -301,14 +308,12 @@ public class IndexedResourceBundle exten
}
} catch (IOException exception) {
record.setLevel (Level.WARNING);
- record.setMessage(exception.getMessage()); // For administrator, use system locale.
+ record.setMessage(exception.getMessage()); // For administrator, use system locale.
record.setThrown (exception);
Logging.log(IndexedResourceBundle.class, methodName, record);
- final MissingResourceException error = new MissingResourceException(
- Exceptions.getLocalizedMessage(exception, locale), // For users, use requested locale.
- baseName, key);
- error.initCause(exception);
- throw error;
+ throw (MissingResourceException) new MissingResourceException(
+ Exceptions.getLocalizedMessage(exception, locale), // For users, use requested locale.
+ baseName, key).initCause(exception);
}
/*
* Now, logs the message. This message is provided only in English.
@@ -346,7 +351,7 @@ public class IndexedResourceBundle exten
protected final Object handleGetObject(final String key) {
// Synchronization performed by 'ensureLoaded'
final String[] values = ensureLoaded(key);
- short keyID;
+ int keyID;
try {
keyID = Short.parseShort(key);
} catch (NumberFormatException exception) {
@@ -359,9 +364,10 @@ public class IndexedResourceBundle exten
} catch (ReflectiveOperationException e) {
e.addSuppressed(exception);
Logging.recoverableException(Logging.getLogger(Loggers.LOCALIZATION), getClass(), "handleGetObject", e);
- return null; // This is okay as of 'handleGetObject' contract.
+ return null; // This is okay as of 'handleGetObject' contract.
}
}
+ keyID -= FIRST;
return (keyID >= 0 && keyID < values.length) ? values[keyID] : null;
}
Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/KeyConstants.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/KeyConstants.java?rev=1776697&r1=1776696&r2=1776697&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/KeyConstants.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/KeyConstants.java [UTF-8] Sat Dec 31 07:33:01 2016
@@ -42,8 +42,8 @@ public class KeyConstants {
private final Class<?> keysClass;
/**
- * The key names. This is usually not needed, but may be created from the {@code Keys}
- * inner class in some occasions.
+ * The key names in the exact same order than {@link IndexedResourceBundle#values}.
+ * This is usually not needed, but may be created from the {@code Keys} inner class in some occasions.
*
* @see #getKeyNames()
* @see #getKeyName(short)
@@ -80,7 +80,7 @@ public class KeyConstants {
names = new String[fields.length];
for (final Field field : fields) {
if (Modifier.isStatic(field.getModifiers()) && field.getType() == Short.TYPE) {
- final int index = ((Short) field.get(null)) & 0xFFFF;
+ final int index = (((Short) field.get(null)) & 0xFFFF) - IndexedResourceBundle.FIRST;
if (index >= length) {
length = index + 1;
if (length > names.length) {
@@ -105,9 +105,9 @@ public class KeyConstants {
* our {@link IndexedResourceBundle#handleGetObject(String)} implementation.
*/
final String getKeyName(final short index) {
- final int i = index & 0xFFFF;
+ final int i = (index & 0xFFFF) - IndexedResourceBundle.FIRST;
final String[] keys = getKeyNames();
- if (i < keys.length) {
+ if (i >= 0 && i < keys.length) {
final String key = keys[i];
if (key != null) {
return key;
Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/Loader.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/Loader.java?rev=1776697&r1=1776696&r2=1776697&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/Loader.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/Loader.java [UTF-8] Sat Dec 31 07:33:01 2016
@@ -23,7 +23,6 @@ import java.util.Collections;
import java.util.ResourceBundle;
import java.lang.reflect.InvocationTargetException;
import java.io.IOException;
-import org.apache.sis.util.Exceptions;
/**
@@ -61,8 +60,8 @@ final class Loader extends ResourceBundl
* Returns the formats supported by this loader.
* The only supported format is {@code "apache-sis.utf"}.
*
- * @param baseName Ignored.
- * @return The supported formats.
+ * @param baseName ignored.
+ * @return the supported formats.
*/
@Override
public List<String> getFormats(String baseName) {
@@ -82,12 +81,12 @@ final class Loader extends ResourceBundl
/**
* Instantiates a new resource bundle.
*
- * @param baseName The fully qualified name of the base resource bundle.
- * @param locale The locale for which the resource bundle should be instantiated.
- * @param format Ignored since this loader supports only one format.
- * @param loader The class loader to use.
- * @param reload Ignored since this loader do not supports resource expiration.
- * @return The resource bundle instance, or null if none could be found.
+ * @param baseName the fully qualified name of the base resource bundle.
+ * @param locale the locale for which the resource bundle should be instantiated.
+ * @param format ignored since this loader supports only one format.
+ * @param loader the class loader to use.
+ * @param reload ignored since this loader does not support resource expiration.
+ * @return the resource bundle instance, or null if none could be found.
*/
@Override
public ResourceBundle newBundle(final String baseName, final Locale locale,
@@ -117,9 +116,7 @@ final class Loader extends ResourceBundl
try {
return (ResourceBundle) classe.getDeclaredConstructor(URL.class).newInstance(resources);
} catch (NoSuchMethodException | InvocationTargetException e) {
- InstantiationException exception = new InstantiationException(Exceptions.getLocalizedMessage(e, locale));
- exception.initCause(e);
- throw exception;
+ throw (InstantiationException) new InstantiationException(e.toString()).initCause(e);
}
}
}
Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/Messages.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/Messages.java?rev=1776697&r1=1776696&r2=1776697&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/Messages.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/Messages.java [UTF-8] Sat Dec 31 07:33:01 2016
@@ -58,161 +58,161 @@ public final class Messages extends Inde
/**
* {0} \u201c{1}\u201d is already registered. The second instance will be ignored.
*/
- public static final short AlreadyRegistered_2 = 0;
+ public static final short AlreadyRegistered_2 = 1;
/**
* Can not create the {0} schema in database.
*/
- public static final short CanNotCreateSchema_1 = 1;
+ public static final short CanNotCreateSchema_1 = 2;
/**
* Can not instantiate the object of type \u2018{0}\u2019 identified by \u201c{1}\u201d. Reason is:{2}
*/
- public static final short CanNotInstantiateForIdentifier_3 = 2;
+ public static final short CanNotInstantiateForIdentifier_3 = 3;
/**
* Changed the container capacity from {0} to {1} elements.
*/
- public static final short ChangedContainerCapacity_2 = 3;
+ public static final short ChangedContainerCapacity_2 = 4;
/**
* Configuration of \u201c{0}\u201d received on {1} in {2} seconds.
*/
- public static final short ConfigurationOf_3 = 4;
+ public static final short ConfigurationOf_3 = 5;
/**
* Connected to geospatial database on \u201c{0}\u201d.
*/
- public static final short ConnectedToGeospatialDatabase_1 = 30;
+ public static final short ConnectedToGeospatialDatabase_1 = 6;
/**
* Created an instance of \u2018{0}\u2019 from the \u201c{1}\u201d identifier in {2} seconds.
*/
- public static final short CreateDurationFromIdentifier_3 = 5;
+ public static final short CreateDurationFromIdentifier_3 = 7;
/**
* Created an instance of \u2018{0}\u2019 in {1} seconds.
*/
- public static final short CreateDuration_2 = 6;
+ public static final short CreateDuration_2 = 8;
/**
* Created an instance of \u2018{0}\u2019 named \u201c{1}\u201d with the \u201c{2}\u201d identifier.
*/
- public static final short CreatedIdentifiedObject_3 = 7;
+ public static final short CreatedIdentifiedObject_3 = 9;
/**
* Created an instance of \u2018{0}\u2019 named \u201c{1}\u201d.
*/
- public static final short CreatedNamedObject_2 = 8;
+ public static final short CreatedNamedObject_2 = 10;
/**
* Creating {0} schema in the \u201c{1}\u201d database.
*/
- public static final short CreatingSchema_2 = 9;
+ public static final short CreatingSchema_2 = 11;
/**
* The {0} environment variable is defined, but the given \u201c{1}\u201d value is not an existing
* directory.
*/
- public static final short DataDirectoryDoesNotExist_2 = 10;
+ public static final short DataDirectoryDoesNotExist_2 = 12;
/**
* Apache SIS is not authorized to access the \u201c{1}\u201d sub-directory in the directory given by the
* {0} environment variable.
*/
- public static final short DataDirectoryNotAccessible_2 = 11;
+ public static final short DataDirectoryNotAccessible_2 = 13;
/**
* Apache SIS is not authorized to read information given by the \u201c{0}\u201d environment variable.
*/
- public static final short DataDirectoryNotAuthorized_1 = 12;
+ public static final short DataDirectoryNotAuthorized_1 = 14;
/**
* The \u201c{1}\u201d directory specified by the {0} environment variable exists but is not readable.
*/
- public static final short DataDirectoryNotReadable_2 = 13;
+ public static final short DataDirectoryNotReadable_2 = 15;
/**
* The \u201c{0}\u201d environment variable is not set.
*/
- public static final short DataDirectoryNotSpecified_1 = 14;
+ public static final short DataDirectoryNotSpecified_1 = 16;
/**
* Apache SIS can not write in the \u201c{1}\u201d directory given by the {0} environment variable.
*/
- public static final short DataDirectoryNotWritable_2 = 15;
+ public static final short DataDirectoryNotWritable_2 = 17;
/**
* Environment variable {0} specifies the \u201c{1}\u201d data directory.
*/
- public static final short DataDirectory_2 = 16;
+ public static final short DataDirectory_2 = 18;
/**
* Property \u201c{0}\u201d has been discarded in favor of \u201c{1}\u201d, because those two properties are
* mutually exclusive.
*/
- public static final short DiscardedExclusiveProperty_2 = 17;
+ public static final short DiscardedExclusiveProperty_2 = 19;
/**
* Ignored properties after the first occurrence of \u2018{0}\u2019.
*/
- public static final short IgnoredPropertiesAfterFirst_1 = 18;
+ public static final short IgnoredPropertiesAfterFirst_1 = 20;
/**
* Ignored property associated to \u2018{0}\u2019.
*/
- public static final short IgnoredPropertyAssociatedTo_1 = 19;
+ public static final short IgnoredPropertyAssociatedTo_1 = 21;
/**
* Parsing of \u201c{0}\u201d done, but some elements were ignored.
*/
- public static final short IncompleteParsing_1 = 20;
+ public static final short IncompleteParsing_1 = 22;
/**
* Inserted {0} records in {1} seconds.
*/
- public static final short InsertDuration_2 = 21;
+ public static final short InsertDuration_2 = 23;
/**
* No object associated to the \u201c{0}\u201d JNDI name.
*/
- public static final short JNDINotSpecified_1 = 22;
+ public static final short JNDINotSpecified_1 = 24;
/**
* Text were discarded for some locales.
*/
- public static final short LocalesDiscarded = 23;
+ public static final short LocalesDiscarded = 25;
/**
* This \u201c{0}\u201d formatting is a departure from standard format.
*/
- public static final short NonConformFormatting_1 = 24;
+ public static final short NonConformFormatting_1 = 26;
/**
* Optional module \u201c{0}\u201d requested but not found.
*/
- public static final short OptionalModuleNotFound_1 = 25;
+ public static final short OptionalModuleNotFound_1 = 27;
/**
* Property \u201c{0}\u201d is hidden by \u201c{1}\u201d.
*/
- public static final short PropertyHiddenBy_2 = 26;
+ public static final short PropertyHiddenBy_2 = 28;
/**
* The text contains unknown elements:
*/
- public static final short UnknownElementsInText = 27;
+ public static final short UnknownElementsInText = 29;
/**
* Loading of \u201c{0}\u201d done, but some records were ignored because of unrecognized keywords: {1}
*/
- public static final short UnknownKeywordInRecord_2 = 28;
+ public static final short UnknownKeywordInRecord_2 = 30;
/**
* Can not parse \u201c{1}\u201d as an instance of \u2018{0}\u2019. The value is stored as plain text instead, but
* will be ignored by some processing.
*/
- public static final short UnparsableValueStoredAsText_2 = 29;
+ public static final short UnparsableValueStoredAsText_2 = 31;
}
/**
Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/ResourceInternationalString.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/ResourceInternationalString.java?rev=1776697&r1=1776696&r2=1776697&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/ResourceInternationalString.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/ResourceInternationalString.java [UTF-8] Sat Dec 31 07:33:01 2016
@@ -169,9 +169,7 @@ public abstract class ResourceInternatio
try {
key = getKeyConstants().getKeyValue(in.readUTF());
} catch (ReflectiveOperationException cause) {
- InvalidObjectException e = new InvalidObjectException(cause.toString());
- e.initCause(cause);
- throw e;
+ throw (InvalidObjectException) new InvalidObjectException(cause.toString()).initCause(cause);
}
}
}
Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/Vocabulary.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/Vocabulary.java?rev=1776697&r1=1776696&r2=1776697&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/Vocabulary.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/Vocabulary.java [UTF-8] Sat Dec 31 07:33:01 2016
@@ -59,592 +59,592 @@ public final class Vocabulary extends In
/**
* Accuracy
*/
- public static final short Accuracy = 109;
+ public static final short Accuracy = 1;
/**
* Aliases
*/
- public static final short Aliases = 74;
+ public static final short Aliases = 2;
/**
* Angle
*/
- public static final short Angle = 0;
+ public static final short Angle = 3;
/**
* Degrees
*/
- public static final short AngularDegrees = 1;
+ public static final short AngularDegrees = 4;
/**
* Minutes
*/
- public static final short AngularMinutes = 2;
+ public static final short AngularMinutes = 5;
/**
* Seconds
*/
- public static final short AngularSeconds = 3;
+ public static final short AngularSeconds = 6;
/**
* Attributes
*/
- public static final short Attributes = 4;
+ public static final short Attributes = 7;
/**
* Axis changes
*/
- public static final short AxisChanges = 98;
+ public static final short AxisChanges = 8;
/**
* Barometric altitude
*/
- public static final short BarometricAltitude = 5;
+ public static final short BarometricAltitude = 9;
/**
* Cardinality
*/
- public static final short Cardinality = 76;
+ public static final short Cardinality = 10;
/**
* Caused by {0}
*/
- public static final short CausedBy_1 = 107;
+ public static final short CausedBy_1 = 11;
/**
* Character encoding
*/
- public static final short CharacterEncoding = 6;
+ public static final short CharacterEncoding = 12;
/**
* Characteristics
*/
- public static final short Characteristics = 85;
+ public static final short Characteristics = 13;
/**
* Classpath
*/
- public static final short Classpath = 7;
+ public static final short Classpath = 14;
/**
* {0} code
*/
- public static final short Code_1 = 8;
+ public static final short Code_1 = 15;
/**
* Commands
*/
- public static final short Commands = 9;
+ public static final short Commands = 16;
/**
* Constant pressure surface
*/
- public static final short ConstantPressureSurface = 19;
+ public static final short ConstantPressureSurface = 17;
/**
* Container
*/
- public static final short Container = 92;
+ public static final short Container = 18;
/**
* Correlation
*/
- public static final short Correlation = 83;
+ public static final short Correlation = 19;
/**
* Current date and time
*/
- public static final short CurrentDateTime = 10;
+ public static final short CurrentDateTime = 20;
/**
* Current directory
*/
- public static final short CurrentDirectory = 11;
+ public static final short CurrentDirectory = 21;
/**
* Cycle omitted
*/
- public static final short CycleOmitted = 12;
+ public static final short CycleOmitted = 22;
/**
* Database
*/
- public static final short DataBase = 96;
+ public static final short DataBase = 23;
/**
* Data directory
*/
- public static final short DataDirectory = 88;
+ public static final short DataDirectory = 24;
/**
* Datum
*/
- public static final short Datum = 99;
+ public static final short Datum = 25;
/**
* Datum shift
*/
- public static final short DatumShift = 100;
+ public static final short DatumShift = 26;
/**
* Daylight time
*/
- public static final short DaylightTime = 13;
+ public static final short DaylightTime = 27;
/**
* Default value
*/
- public static final short DefaultValue = 71;
+ public static final short DefaultValue = 28;
/**
* Deprecated
*/
- public static final short Deprecated = 117;
+ public static final short Deprecated = 29;
/**
* Derived from {0}
*/
- public static final short DerivedFrom_1 = 108;
+ public static final short DerivedFrom_1 = 30;
/**
* Description
*/
- public static final short Description = 75;
+ public static final short Description = 31;
/**
* Destination
*/
- public static final short Destination = 14;
+ public static final short Destination = 32;
/**
* Details
*/
- public static final short Details = 110;
+ public static final short Details = 33;
/**
* Dimensions
*/
- public static final short Dimensions = 15;
+ public static final short Dimensions = 34;
/**
* Directory
*/
- public static final short Directory = 16;
+ public static final short Directory = 35;
/**
* \u2033
*/
- public static final short DittoMark = 82;
+ public static final short DittoMark = 36;
/**
* Domain
*/
- public static final short Domain = 113;
+ public static final short Domain = 37;
/**
* Dublin Julian
*/
- public static final short DublinJulian = 17;
+ public static final short DublinJulian = 38;
/**
* Ellipsoid
*/
- public static final short Ellipsoid = 70;
+ public static final short Ellipsoid = 39;
/**
* Ellipsoid change
*/
- public static final short EllipsoidChange = 101;
+ public static final short EllipsoidChange = 40;
/**
* Ellipsoidal height
*/
- public static final short EllipsoidalHeight = 18;
+ public static final short EllipsoidalHeight = 41;
/**
* Geocentric
*/
- public static final short Geocentric = 102;
+ public static final short Geocentric = 42;
/**
* Geocentric conversion
*/
- public static final short GeocentricConversion = 103;
+ public static final short GeocentricConversion = 43;
/**
* Geocentric radius
*/
- public static final short GeocentricRadius = 104;
+ public static final short GeocentricRadius = 44;
/**
* Geodetic dataset
*/
- public static final short GeodeticDataset = 95;
+ public static final short GeodeticDataset = 45;
/**
* Height
*/
- public static final short Height = 69;
+ public static final short Height = 46;
/**
* Identifier
*/
- public static final short Identifier = 20;
+ public static final short Identifier = 47;
/**
* Identity
*/
- public static final short Identity = 105;
+ public static final short Identity = 48;
/**
* Implementation
*/
- public static final short Implementation = 21;
+ public static final short Implementation = 49;
/**
* \u2002in\u2002
*/
- public static final short InBetweenWords = 87;
+ public static final short InBetweenWords = 50;
/**
* Index
*/
- public static final short Index = 22;
+ public static final short Index = 51;
/**
* Invalid
*/
- public static final short Invalid = 89;
+ public static final short Invalid = 52;
/**
* Inverse operation
*/
- public static final short InverseOperation = 106;
+ public static final short InverseOperation = 53;
/**
* Java extensions
*/
- public static final short JavaExtensions = 23;
+ public static final short JavaExtensions = 54;
/**
* Java home directory
*/
- public static final short JavaHome = 24;
+ public static final short JavaHome = 55;
/**
* Julian
*/
- public static final short Julian = 25;
+ public static final short Julian = 56;
/**
* Latitude
*/
- public static final short Latitude = 26;
+ public static final short Latitude = 57;
/**
* Legend
*/
- public static final short Legend = 97;
+ public static final short Legend = 58;
/**
* Level
*/
- public static final short Level = 94;
+ public static final short Level = 59;
/**
* Libraries
*/
- public static final short Libraries = 27;
+ public static final short Libraries = 60;
/**
* Local configuration
*/
- public static final short LocalConfiguration = 28;
+ public static final short LocalConfiguration = 61;
/**
* Locale
*/
- public static final short Locale = 29;
+ public static final short Locale = 62;
/**
* Localization
*/
- public static final short Localization = 30;
+ public static final short Localization = 63;
/**
* Logging
*/
- public static final short Logging = 31;
+ public static final short Logging = 64;
/**
* Longitude
*/
- public static final short Longitude = 32;
+ public static final short Longitude = 65;
/**
* Mandatory
*/
- public static final short Mandatory = 77;
+ public static final short Mandatory = 66;
/**
* Maximum value
*/
- public static final short MaximumValue = 33;
+ public static final short MaximumValue = 67;
/**
* Mean value
*/
- public static final short MeanValue = 34;
+ public static final short MeanValue = 68;
/**
* Methods
*/
- public static final short Methods = 111;
+ public static final short Methods = 69;
/**
* Minimum value
*/
- public static final short MinimumValue = 35;
+ public static final short MinimumValue = 70;
/**
* Modified Julian
*/
- public static final short ModifiedJulian = 36;
+ public static final short ModifiedJulian = 71;
/**
* Name
*/
- public static final short Name = 37;
+ public static final short Name = 72;
/**
* None
*/
- public static final short None = 91;
+ public static final short None = 73;
/**
* Note
*/
- public static final short Note = 114;
+ public static final short Note = 74;
/**
* Number of \u2018NaN\u2019
*/
- public static final short NumberOfNaN = 38;
+ public static final short NumberOfNaN = 75;
/**
* Number of values
*/
- public static final short NumberOfValues = 39;
+ public static final short NumberOfValues = 76;
/**
* Obligation
*/
- public static final short Obligation = 78;
+ public static final short Obligation = 77;
/**
* {0} ({1} of {2})
*/
- public static final short Of_3 = 40;
+ public static final short Of_3 = 78;
/**
* Offset
*/
- public static final short Offset = 41;
+ public static final short Offset = 79;
/**
* Operating system
*/
- public static final short OperatingSystem = 42;
+ public static final short OperatingSystem = 80;
/**
* Operations
*/
- public static final short Operations = 112;
+ public static final short Operations = 81;
/**
* Optional
*/
- public static final short Optional = 79;
+ public static final short Optional = 82;
/**
* Options
*/
- public static final short Options = 43;
+ public static final short Options = 83;
/**
* Other surface
*/
- public static final short OtherSurface = 44;
+ public static final short OtherSurface = 84;
/**
* Others
*/
- public static final short Others = 45;
+ public static final short Others = 85;
/**
* Paths
*/
- public static final short Paths = 46;
+ public static final short Paths = 86;
/**
* \u201c{0}\u201d
*/
- public static final short Quoted_1 = 86;
+ public static final short Quoted_1 = 87;
/**
* Remarks
*/
- public static final short Remarks = 116;
+ public static final short Remarks = 88;
/**
* Remote configuration
*/
- public static final short RemoteConfiguration = 93;
+ public static final short RemoteConfiguration = 89;
/**
* Root
*/
- public static final short Root = 47;
+ public static final short Root = 90;
/**
* Root Mean Square
*/
- public static final short RootMeanSquare = 48;
+ public static final short RootMeanSquare = 91;
/**
* Scale
*/
- public static final short Scale = 49;
+ public static final short Scale = 92;
/**
* Source
*/
- public static final short Source = 50;
+ public static final short Source = 93;
/**
* Standard deviation
*/
- public static final short StandardDeviation = 51;
+ public static final short StandardDeviation = 94;
/**
* Subset of {0}
*/
- public static final short SubsetOf_1 = 115;
+ public static final short SubsetOf_1 = 95;
/**
* Superseded by {0}.
*/
- public static final short SupersededBy_1 = 84;
+ public static final short SupersededBy_1 = 96;
/**
* Temporal
*/
- public static final short Temporal = 66;
+ public static final short Temporal = 97;
/**
* Temporary files
*/
- public static final short TemporaryFiles = 52;
+ public static final short TemporaryFiles = 98;
/**
* Time
*/
- public static final short Time = 67;
+ public static final short Time = 99;
/**
* {0} time
*/
- public static final short Time_1 = 53;
+ public static final short Time_1 = 100;
/**
* Timezone
*/
- public static final short Timezone = 54;
+ public static final short Timezone = 101;
/**
* Transformation
*/
- public static final short Transformation = 80;
+ public static final short Transformation = 102;
/**
* Transformation accuracy
*/
- public static final short TransformationAccuracy = 81;
+ public static final short TransformationAccuracy = 103;
/**
* Truncated Julian
*/
- public static final short TruncatedJulian = 55;
+ public static final short TruncatedJulian = 104;
/**
* Type
*/
- public static final short Type = 56;
+ public static final short Type = 105;
/**
* Unavailable content.
*/
- public static final short UnavailableContent = 57;
+ public static final short UnavailableContent = 106;
/**
* Units
*/
- public static final short Units = 72;
+ public static final short Units = 107;
/**
* Unnamed
*/
- public static final short Unnamed = 65;
+ public static final short Unnamed = 108;
/**
* Untitled
*/
- public static final short Untitled = 58;
+ public static final short Untitled = 109;
/**
* User home directory
*/
- public static final short UserHome = 59;
+ public static final short UserHome = 110;
/**
* Value
*/
- public static final short Value = 60;
+ public static final short Value = 111;
/**
* Value domain
*/
- public static final short ValueDomain = 73;
+ public static final short ValueDomain = 112;
/**
* Variables
*/
- public static final short Variables = 61;
+ public static final short Variables = 113;
/**
* {0} version {1}
*/
- public static final short Version_2 = 62;
+ public static final short Version_2 = 114;
/**
* Versions
*/
- public static final short Versions = 63;
+ public static final short Versions = 115;
/**
* Vertical
*/
- public static final short Vertical = 68;
+ public static final short Vertical = 116;
/**
* Warnings
*/
- public static final short Warnings = 90;
+ public static final short Warnings = 117;
/**
* World
*/
- public static final short World = 64;
+ public static final short World = 118;
}
/**
Modified: sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/internal/util/LocalizedParseExceptionTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/internal/util/LocalizedParseExceptionTest.java?rev=1776697&r1=1776696&r2=1776697&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/internal/util/LocalizedParseExceptionTest.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/internal/util/LocalizedParseExceptionTest.java [UTF-8] Sat Dec 31 07:33:01 2016
@@ -69,7 +69,7 @@ public final strictfp class LocalizedPar
@Test
public void testResourceKeyForText() {
final ParseException e = new LocalizedParseException(
- Locale.CANADA, Errors.Keys.NodeHasNoParent_1, "Some text to parse", 5);
+ Locale.CANADA, Errors.Keys.NodeHasNoParent_1, new Object[] {"text"}, 5);
String message = e.getLocalizedMessage();
assertTrue(message, message.contains("Node \u201ctext\u201d has no parent."));
}
Modified: sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/test/Assert.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/test/Assert.java?rev=1776697&r1=1776696&r2=1776697&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/test/Assert.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/test/Assert.java [UTF-8] Sat Dec 31 07:33:01 2016
@@ -18,6 +18,7 @@ package org.apache.sis.test;
import java.util.Set;
import java.util.Map;
+import java.util.Objects;
import java.util.Collection;
import java.util.Enumeration;
import java.util.LinkedHashSet;
@@ -36,9 +37,6 @@ import org.apache.sis.util.ComparisonMod
import org.apache.sis.util.Exceptions;
import org.apache.sis.util.Classes;
-// Branch-dependent imports
-import java.util.Objects;
-
/**
* Assertion methods used by the SIS project in addition of the JUnit and GeoAPI assertions.
Modified: sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/test/foreigner/SerializableTableColumn.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/test/foreigner/SerializableTableColumn.java?rev=1776697&r1=1776696&r2=1776697&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/test/foreigner/SerializableTableColumn.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/test/foreigner/SerializableTableColumn.java [UTF-8] Sat Dec 31 07:33:01 2016
@@ -53,9 +53,9 @@ public final strictfp class Serializable
/**
* Creates a new instance for the given type of values.
*
- * @param field The programmatic name of the static final field holding this constant.
- * @param type Base type of all values in the column identified by this instance.
- * @param header The text to display as column header.
+ * @param field the programmatic name of the static final field holding this constant.
+ * @param type base type of all values in the column identified by this instance.
+ * @param header the text to display as column header.
*/
private SerializableTableColumn(final String field, final Class<V> type, final CharSequence header) {
super(type, header);
@@ -65,16 +65,14 @@ public final strictfp class Serializable
/**
* Invoked on deserialization for resolving this instance to one of the predefined constants.
*
- * @return One of the predefined constants.
- * @throws InvalidObjectException If this instance can not be resolved.
+ * @return one of the predefined constants.
+ * @throws InvalidObjectException if this instance can not be resolved.
*/
private Object readResolve() throws ObjectStreamException {
try {
return SerializableTableColumn.class.getField(field).get(null);
- } catch (Exception cause) { // Many exceptions, including unchecked ones.
- InvalidObjectException e = new InvalidObjectException(cause.toString());
- e.initCause(cause);
- throw e;
+ } catch (Exception cause) { // Many exceptions, including unchecked ones.
+ throw (InvalidObjectException) new InvalidObjectException(cause.toString()).initCause(cause);
}
}
}
Modified: sis/branches/JDK7/storage/sis-earth-observation/src/main/java/org/apache/sis/storage/earthobservation/LandsatStore.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/storage/sis-earth-observation/src/main/java/org/apache/sis/storage/earthobservation/LandsatStore.java?rev=1776697&r1=1776696&r2=1776697&view=diff
==============================================================================
--- sis/branches/JDK7/storage/sis-earth-observation/src/main/java/org/apache/sis/storage/earthobservation/LandsatStore.java [UTF-8] (original)
+++ sis/branches/JDK7/storage/sis-earth-observation/src/main/java/org/apache/sis/storage/earthobservation/LandsatStore.java [UTF-8] Sat Dec 31 07:33:01 2016
@@ -27,8 +27,7 @@ import org.apache.sis.storage.DataStoreE
import org.apache.sis.storage.DataStoreReferencingException;
import org.apache.sis.storage.UnsupportedStorageException;
import org.apache.sis.storage.StorageConnector;
-import org.apache.sis.util.resources.Errors;
-import org.apache.sis.util.Classes;
+import org.apache.sis.setup.OptionKey;
import org.apache.sis.util.Debug;
@@ -96,8 +95,8 @@ public class LandsatStore extends DataSt
source = connector.getStorageAs(Reader.class);
connector.closeAllExcept(source);
if (source == null) {
- throw new UnsupportedStorageException(errors().getString(Errors.Keys.IllegalInputTypeForReader_2,
- "Landsat", Classes.getClass(connector.getStorage())));
+ throw new UnsupportedStorageException(super.getLocale(), "Landsat",
+ connector.getStorage(), connector.getOption(OptionKey.OPEN_OPTIONS));
}
}
@@ -137,14 +136,6 @@ public class LandsatStore extends DataSt
}
/**
- * Returns the error resources in the current locale.
- */
- private Errors errors() {
- // Must use "super" because LandsatStore construction may not be finished.
- return Errors.getResources(super.getLocale());
- }
-
- /**
* Returns a string representation of this Landsat store for debugging purpose.
* The content of the string returned by this method may change in any future SIS version.
*