sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1762706 [1/4] - in /sis/branches/JDK8/core: sis-referencing/src/main/java/org/apache/sis/internal/referencing/ sis-referencing/src/main/java/org/apache/sis/internal/referencing/j2d/ sis-referencing/src/main/java/org/apache/sis/internal/ref...
Date Wed, 28 Sep 2016 20:29:26 GMT
Author: desruisseaux
Date: Wed Sep 28 20:29:26 2016
New Revision: 1762706

URL: http://svn.apache.org/viewvc?rev=1762706&view=rev
Log:
Moved more referencing-specific resources to o.a.s.internal.referencing.Resources.

Modified:
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/Resources.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/Resources.properties
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/Resources_fr.properties
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/ServicesForMetadata.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/j2d/AffineMatrix.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/j2d/ImmutableAffineTransform.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/DatumShiftGridLoader.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/parameter/DefaultParameterValue.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/EPSGFactoryFallback.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/AbstractCS.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/CoordinateSystems.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCartesianCS.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultEllipsoidalCS.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/Normalizer.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/BursaWolfParameters.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultEllipsoid.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/AuthorityFactoryIdentifier.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/CommonAuthorityFactory.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/MultiAuthoritiesFactory.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/EPSGDataAccess.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/EPSGFactory.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/InstallationScriptProvider.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/AbstractCoordinateOperation.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/AbstractSingleOperation.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/CoordinateOperationFinder.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/DefaultConversion.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/DefaultCoordinateOperationFactory.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/DefaultOperationMethod.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/matrix/AffineTransforms2D.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/matrix/Matrices.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/matrix/NonSquareMatrix.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/matrix/Solver.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/AlbersEqualArea.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/ConformalProjection.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/EqualAreaProjection.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/LambertConicConformal.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/ObliqueStereographic.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/ProjectionException.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/TransverseMercator.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/AbstractLinearTransform.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/AbstractMathTransform.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/AbstractMathTransform2D.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/ConcatenatedTransform.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/CoordinateSystemTransform.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/DatumShiftTransform.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/DefaultMathTransformFactory.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/EllipsoidToCentricTransform.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/InterpolatedTransform.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/LinearInterpolator1D.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/TransformSeparator.java
    sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/MercatorMethodComparison.java
    sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors.java
    sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors.properties
    sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors_fr.properties
    sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/resources/IndexedResourceBundle.java

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/Resources.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/Resources.java?rev=1762706&r1=1762705&r2=1762706&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/Resources.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/Resources.java [UTF-8] Wed Sep 28 20:29:26 2016
@@ -18,6 +18,7 @@ package org.apache.sis.internal.referenc
 
 import java.net.URL;
 import java.util.Locale;
+import java.util.Map;
 import java.util.MissingResourceException;
 import javax.annotation.Generated;
 import org.opengis.util.InternationalString;
@@ -65,6 +66,41 @@ public final class Resources extends Ind
         public static final short AmbiguousEllipsoid_1 = 0;
 
         /**
+         * Can not compute the coordinate operation derivative.
+         */
+        public static final short CanNotComputeDerivative = 14;
+
+        /**
+         * Can not concatenate transforms “{0}” and “{1}”.
+         */
+        public static final short CanNotConcatenateTransforms_2 = 15;
+
+        /**
+         * Can not map an axis from the specified coordinate system to the “{0}” direction.
+         */
+        public static final short CanNotMapAxisToDirection_1 = 16;
+
+        /**
+         * Target dimension {0} depends on excluded source dimensions.
+         */
+        public static final short CanNotSeparateTargetDimension_1 = 17;
+
+        /**
+         * Can not transform envelope to a geodetic reference system.
+         */
+        public static final short CanNotTransformEnvelopeToGeodetic = 18;
+
+        /**
+         * Can not use the {0} geodetic parameters: {1}
+         */
+        public static final short CanNotUseGeodeticParameters_2 = 19;
+
+        /**
+         * Axis directions {0} and {1} are colinear.
+         */
+        public static final short ColinearAxisDirections_2 = 20;
+
+        /**
          * This result indicates if a datum shift method has been applied.
          */
         public static final short ConformanceMeansDatumShift = 1;
@@ -76,6 +112,16 @@ public final class Resources extends Ind
         public static final short ConstantProjParameterValue_1 = 2;
 
         /**
+         * Coordinate conversion of transformation from system “{0}” to “{1}” has not been found.
+         */
+        public static final short CoordinateOperationNotFound_2 = 21;
+
+        /**
+         * Origin of temporal datum shall be a date.
+         */
+        public static final short DatumOriginShallBeDate = 22;
+
+        /**
          * Code “{0}” is deprecated and replaced by code {1}. Reason is: {2}
          */
         public static final short DeprecatedCode_3 = 3;
@@ -98,6 +144,36 @@ public final class Resources extends Ind
         public static final short IgnoredServiceProvider_3 = 6;
 
         /**
+         * Coordinate system of class ‘{0}’ can not have axis in the {1} direction.
+         */
+        public static final short IllegalAxisDirection_2 = 23;
+
+        /**
+         * Dimensions of “{0}” operation can not be ({1} → {2}).
+         */
+        public static final short IllegalOperationDimension_3 = 24;
+
+        /**
+         * This operation can not be applied to values of class ‘{0}’.
+         */
+        public static final short IllegalOperationForValueClass_1 = 25;
+
+        /**
+         * Unit of measurement “{1}” is not valid for “{0}” values.
+         */
+        public static final short IllegalUnitFor_2 = 26;
+
+        /**
+         * Incompatible coordinate system types.
+         */
+        public static final short IncompatibleCoordinateSystemTypes = 27;
+
+        /**
+         * Datum of “{1}” shall be “{0}”.
+         */
+        public static final short IncompatibleDatum_2 = 28;
+
+        /**
          * Inverse operation uses this parameter value with opposite sign.
          */
         public static final short InverseOperationUsesOppositeSign = 7;
@@ -108,6 +184,11 @@ public final class Resources extends Ind
         public static final short InverseOperationUsesSameSign = 8;
 
         /**
+         * Latitudes {0} and {1} are opposite.
+         */
+        public static final short LatitudesAreOpposite_2 = 29;
+
+        /**
          * Loading datum shift file “{0}”.
          */
         public static final short LoadingDatumShiftFile_1 = 9;
@@ -124,15 +205,152 @@ public final class Resources extends Ind
         public static final short MismatchedOperationFactories_2 = 11;
 
         /**
+         * Expected the “{0}” prime meridian but found “{1}”.
+         */
+        public static final short MismatchedPrimeMeridian_2 = 30;
+
+        /**
+         * The transform has {2} {0,choice,0#source|1#target} dimension{2,choice,1#|2#s}, while {1} was
+         * expected.
+         */
+        public static final short MismatchedTransformDimension_3 = 31;
+
+        /**
          * Despite its name, this parameter is effectively “{0}”.
          */
         public static final short MisnamedParameter_1 = 12;
 
         /**
+         * No authority was specified for code “{0}”. The expected syntax is “AUTHORITY:CODE”.
+         */
+        public static final short MissingAuthority_1 = 32;
+
+        /**
+         * No horizontal dimension found in “{0}”.
+         */
+        public static final short MissingHorizontalDimension_1 = 33;
+
+        /**
+         * Not enough dimension in ‘MathTransform’ input or output coordinates for the interpolation
+         * points.
+         */
+        public static final short MissingInterpolationOrdinates = 34;
+
+        /**
+         * No spatial or temporal dimension found in “{0}”
+         */
+        public static final short MissingSpatioTemporalDimension_1 = 35;
+
+        /**
+         * No temporal dimension found in “{0}”
+         */
+        public static final short MissingTemporalDimension_1 = 36;
+
+        /**
+         * No vertical dimension found in “{0}”
+         */
+        public static final short MissingVerticalDimension_1 = 37;
+
+        /**
+         * No convergence.
+         */
+        public static final short NoConvergence = 38;
+
+        /**
+         * No convergence for points {0} and {1}.
+         */
+        public static final short NoConvergenceForPoints_2 = 39;
+
+        /**
+         * No code “{2}” from authority “{0}” found for object of type ‘{1}’.
+         */
+        public static final short NoSuchAuthorityCode_3 = 40;
+
+        /**
+         * No operation method found for name or identifier “{0}”.
+         */
+        public static final short NoSuchOperationMethod_1 = 41;
+
+        /**
+         * Non invertible {0}×{1} matrix.
+         */
+        public static final short NonInvertibleMatrix_2 = 42;
+
+        /**
+         * Can not invert the “{0}” operation.
+         */
+        public static final short NonInvertibleOperation_1 = 43;
+
+        /**
+         * Transform is not invertible.
+         */
+        public static final short NonInvertibleTransform = 44;
+
+        /**
+         * Unit conversion from “{0}” to “{1}” is non-linear.
+         */
+        public static final short NonLinearUnitConversion_2 = 45;
+
+        /**
+         * The “{0}” sequence is not monotonic.
+         */
+        public static final short NonMonotonicSequence_1 = 46;
+
+        /**
+         * Axis directions {0} and {1} are not perpendicular.
+         */
+        public static final short NonPerpendicularDirections_2 = 47;
+
+        /**
+         * Scale is not uniform.
+         */
+        public static final short NonUniformScale = 48;
+
+        /**
+         * Matrix is not skew-symmetric.
+         */
+        public static final short NotASkewSymmetricMatrix = 49;
+
+        /**
+         * Transform is not affine.
+         */
+        public static final short NotAnAffineTransform = 50;
+
+        /**
          * This parameter borrowed from the “{0}” projection is not formally a parameter of this
          * projection.
          */
         public static final short NotFormalProjectionParameter_1 = 13;
+
+        /**
+         * Matrix is singular.
+         */
+        public static final short SingularMatrix = 51;
+
+        /**
+         * Unexpected dimension for a coordinate system of type ‘{0}’.
+         */
+        public static final short UnexpectedDimensionForCS_1 = 52;
+
+        /**
+         * Authority “{0}” is unknown.
+         */
+        public static final short UnknownAuthority_1 = 53;
+
+        /**
+         * Axis direction “{0}” is unknown.
+         */
+        public static final short UnknownAxisDirection_1 = 54;
+
+        /**
+         * This affine transform is unmodifiable.
+         */
+        public static final short UnmodifiableAffineTransform = 55;
+
+        /**
+         * Dimensions have not been specified.
+         */
+        public static final short UnspecifiedDimensions = 56;
     }
 
     /**
@@ -167,6 +385,19 @@ public final class Resources extends Ind
     }
 
     /**
+     * Returns resources in the locale specified in the given property map. This convenience method looks
+     * for the {@link #LOCALE_KEY} entry. If the given map is null, or contains no entry for the locale key,
+     * or the value is not an instance of {@link Locale}, then this method fallback on the default locale.
+     *
+     * @param  properties  the map of properties, or {@code null} if none.
+     * @return resources in the given locale.
+     * @throws MissingResourceException if resources can't be found.
+     */
+    public static Resources getResources(final Map<?,?> properties) throws MissingResourceException {
+        return getResources(getLocale(properties));
+    }
+
+    /**
      * Gets a string for the given key from this resource bundle or one of its parents.
      *
      * @param  key  the key for the desired string.
@@ -174,7 +405,7 @@ public final class Resources extends Ind
      * @throws MissingResourceException if no object for the given key can be found.
      */
     public static String format(final short key) throws MissingResourceException {
-        return getResources(null).getString(key);
+        return getResources((Locale) null).getString(key);
     }
 
     /**
@@ -189,7 +420,7 @@ public final class Resources extends Ind
     public static String format(final short  key,
                                 final Object arg0) throws MissingResourceException
     {
-        return getResources(null).getString(key, arg0);
+        return getResources((Locale) null).getString(key, arg0);
     }
 
     /**
@@ -206,7 +437,7 @@ public final class Resources extends Ind
                                 final Object arg0,
                                 final Object arg1) throws MissingResourceException
     {
-        return getResources(null).getString(key, arg0, arg1);
+        return getResources((Locale) null).getString(key, arg0, arg1);
     }
 
     /**
@@ -225,7 +456,7 @@ public final class Resources extends Ind
                                 final Object arg1,
                                 final Object arg2) throws MissingResourceException
     {
-        return getResources(null).getString(key, arg0, arg1, arg2);
+        return getResources((Locale) null).getString(key, arg0, arg1, arg2);
     }
 
     /**
@@ -246,7 +477,7 @@ public final class Resources extends Ind
                                 final Object arg2,
                                 final Object arg3) throws MissingResourceException
     {
-        return getResources(null).getString(key, arg0, arg1, arg2, arg3);
+        return getResources((Locale) null).getString(key, arg0, arg1, arg2, arg3);
     }
 
     /**

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/Resources.properties
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/Resources.properties?rev=1762706&r1=1762705&r2=1762706&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/Resources.properties [ISO-8859-1] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/Resources.properties [ISO-8859-1] Wed Sep 28 20:29:26 2016
@@ -14,17 +14,68 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-AmbiguousEllipsoid_1             = Ambiguity between inverse flattening and semi minor axis length for \u201c{0}\u201d. Using inverse flattening.
-ConformanceMeansDatumShift       = This result indicates if a datum shift method has been applied.
-ConstantProjParameterValue_1     = This parameter is shown for completeness, but should never have a value different than {0} for this projection.
-DeprecatedCode_3                 = Code \u201c{0}\u201d is deprecated and replaced by code {1}. Reason is: {2}
-FallbackDefaultFactoryVersion_2  = There is no factory for version {1} of \u201c{0}\u201d authority. Fallback on default version for objects creation.
-GeodeticDataBase_4               = {0} geodetic dataset version {1} on \u201c{2}\u201d version {3}.
-IgnoredServiceProvider_3         = More than one service provider of type \u2018{0}\u2019 are declared for \u201c{1}\u201d. Only the first provider (an instance of \u2018{2}\u2019) will be used.
-InverseOperationUsesSameSign     = Inverse operation uses the same parameter value.
-InverseOperationUsesOppositeSign = Inverse operation uses this parameter value with opposite sign.
-LoadingDatumShiftFile_1          = Loading datum shift file \u201c{0}\u201d.
-MismatchedOperationFactories_2   = No coordinate operation from \u201c{0}\u201d to \u201c{1}\u201d because of mismatched factories.
-MismatchedEllipsoidAxisLength_3  = The \u201c{1}\u201d parameter could have been omitted. But it has been given a value of {2} which does not match the definition of the \u201c{0}\u201d ellipsoid.
-MisnamedParameter_1              = Despite its name, this parameter is effectively \u201c{0}\u201d.
-NotFormalProjectionParameter_1   = This parameter borrowed from the \u201c{0}\u201d projection is not formally a parameter of this projection.
+
+#
+# Information messages or non-fatal warnings
+#
+AmbiguousEllipsoid_1              = Ambiguity between inverse flattening and semi minor axis length for \u201c{0}\u201d. Using inverse flattening.
+ConformanceMeansDatumShift        = This result indicates if a datum shift method has been applied.
+ConstantProjParameterValue_1      = This parameter is shown for completeness, but should never have a value different than {0} for this projection.
+DeprecatedCode_3                  = Code \u201c{0}\u201d is deprecated and replaced by code {1}. Reason is: {2}
+FallbackDefaultFactoryVersion_2   = There is no factory for version {1} of \u201c{0}\u201d authority. Fallback on default version for objects creation.
+GeodeticDataBase_4                = {0} geodetic dataset version {1} on \u201c{2}\u201d version {3}.
+IgnoredServiceProvider_3          = More than one service provider of type \u2018{0}\u2019 are declared for \u201c{1}\u201d. Only the first provider (an instance of \u2018{2}\u2019) will be used.
+InverseOperationUsesSameSign      = Inverse operation uses the same parameter value.
+InverseOperationUsesOppositeSign  = Inverse operation uses this parameter value with opposite sign.
+LoadingDatumShiftFile_1           = Loading datum shift file \u201c{0}\u201d.
+MismatchedEllipsoidAxisLength_3   = The \u201c{1}\u201d parameter could have been omitted. But it has been given a value of {2} which does not match the definition of the \u201c{0}\u201d ellipsoid.
+MismatchedOperationFactories_2    = No coordinate operation from \u201c{0}\u201d to \u201c{1}\u201d because of mismatched factories.
+MisnamedParameter_1               = Despite its name, this parameter is effectively \u201c{0}\u201d.
+NotFormalProjectionParameter_1    = This parameter borrowed from the \u201c{0}\u201d projection is not formally a parameter of this projection.
+
+#
+# Error messages (to be used in exceptions)
+#
+CanNotConcatenateTransforms_2     = Can not concatenate transforms \u201c{0}\u201d and \u201c{1}\u201d.
+CanNotComputeDerivative           = Can not compute the coordinate operation derivative.
+CanNotMapAxisToDirection_1        = Can not map an axis from the specified coordinate system to the \u201c{0}\u201d direction.
+CanNotSeparateTargetDimension_1   = Target dimension {0} depends on excluded source dimensions.
+CanNotTransformEnvelopeToGeodetic = Can not transform envelope to a geodetic reference system.
+CanNotUseGeodeticParameters_2     = Can not use the {0} geodetic parameters: {1}
+ColinearAxisDirections_2          = Axis directions {0} and {1} are colinear.
+CoordinateOperationNotFound_2     = Coordinate conversion of transformation from system \u201c{0}\u201d to \u201c{1}\u201d has not been found.
+DatumOriginShallBeDate            = Origin of temporal datum shall be a date.
+IllegalAxisDirection_2            = Coordinate system of class \u2018{0}\u2019 can not have axis in the {1} direction.
+IllegalOperationDimension_3       = Dimensions of \u201c{0}\u201d operation can not be ({1} \u2192 {2}).
+IllegalOperationForValueClass_1   = This operation can not be applied to values of class \u2018{0}\u2019.
+IllegalUnitFor_2                  = Unit of measurement \u201c{1}\u201d is not valid for \u201c{0}\u201d values.
+IncompatibleCoordinateSystemTypes = Incompatible coordinate system types.
+IncompatibleDatum_2               = Datum of \u201c{1}\u201d shall be \u201c{0}\u201d.
+LatitudesAreOpposite_2            = Latitudes {0} and {1} are opposite.
+MismatchedPrimeMeridian_2         = Expected the \u201c{0}\u201d prime meridian but found \u201c{1}\u201d.
+MismatchedTransformDimension_3    = The transform has {2} {0,choice,0#source|1#target} dimension{2,choice,1#|2#s}, while {1} was expected.
+MissingAuthority_1                = No authority was specified for code \u201c{0}\u201d. The expected syntax is \u201cAUTHORITY:CODE\u201d.
+MissingInterpolationOrdinates     = Not enough dimension in \u2018MathTransform\u2019 input or output coordinates for the interpolation points.
+MissingHorizontalDimension_1      = No horizontal dimension found in \u201c{0}\u201d.
+MissingVerticalDimension_1        = No vertical dimension found in \u201c{0}\u201d
+MissingTemporalDimension_1        = No temporal dimension found in \u201c{0}\u201d
+MissingSpatioTemporalDimension_1  = No spatial or temporal dimension found in \u201c{0}\u201d
+NoConvergence                     = No convergence.
+NoConvergenceForPoints_2          = No convergence for points {0} and {1}.
+NonInvertibleMatrix_2             = Non invertible {0}\u00d7{1} matrix.
+NonInvertibleOperation_1          = Can not invert the \u201c{0}\u201d operation.
+NonInvertibleTransform            = Transform is not invertible.
+NonLinearUnitConversion_2         = Unit conversion from \u201c{0}\u201d to \u201c{1}\u201d is non-linear.
+NonMonotonicSequence_1            = The \u201c{0}\u201d sequence is not monotonic.
+NonPerpendicularDirections_2      = Axis directions {0} and {1} are not perpendicular.
+NonUniformScale                   = Scale is not uniform.
+NotAnAffineTransform              = Transform is not affine.
+NotASkewSymmetricMatrix           = Matrix is not skew-symmetric.
+NoSuchAuthorityCode_3             = No code \u201c{2}\u201d from authority \u201c{0}\u201d found for object of type \u2018{1}\u2019.
+NoSuchOperationMethod_1           = No operation method found for name or identifier \u201c{0}\u201d.
+SingularMatrix                    = Matrix is singular.
+UnexpectedDimensionForCS_1        = Unexpected dimension for a coordinate system of type \u2018{0}\u2019.
+UnknownAuthority_1                = Authority \u201c{0}\u201d is unknown.
+UnknownAxisDirection_1            = Axis direction \u201c{0}\u201d is unknown.
+UnmodifiableAffineTransform       = This affine transform is unmodifiable.
+UnspecifiedDimensions             = Dimensions have not been specified.

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/Resources_fr.properties
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/Resources_fr.properties?rev=1762706&r1=1762705&r2=1762706&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/Resources_fr.properties [ISO-8859-1] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/Resources_fr.properties [ISO-8859-1] Wed Sep 28 20:29:26 2016
@@ -21,17 +21,68 @@
 #   U+202F NARROW NO-BREAK SPACE  before  ; ! and ?
 #   U+00A0 NO-BREAK SPACE         before  :
 #
-AmbiguousEllipsoid_1             = Ambigu\u00eft\u00e9 entre l\u2019aplatissement et la longueur du semi-axe mineur pour \u00ab\u202f{0}\u202f\u00bb. Utilise l\u2019aplatissement.
-ConformanceMeansDatumShift       = Ce r\u00e9sultat indique si un changement de r\u00e9f\u00e9rentiel a \u00e9t\u00e9 appliqu\u00e9.
-ConstantProjParameterValue_1     = Ce param\u00e8tre est montr\u00e9 pour \u00eatre plus complet, mais sa valeur ne devrait jamais \u00eatre diff\u00e9rente de {0} pour cette projection.
-DeprecatedCode_3                 = Le code \u00ab\u202f{0}\u202f\u00bb est d\u00e9pr\u00e9ci\u00e9 et remplac\u00e9 par le code {1}. La raison est\u00a0: {2}
-FallbackDefaultFactoryVersion_2  = Il n\u2019y a pas de fabrique pour la version {1} de l\u2019autorit\u00e9 \u00ab\u202f{0}\u202f\u00bb. Les objets seront cr\u00e9\u00e9s avec la version par d\u00e9faut.
-GeodeticDataBase_4               = Base de donn\u00e9es g\u00e9od\u00e9sique {0} version {1} sur \u00ab\u202f{2}\u202f\u00bb version {3}.
-IgnoredServiceProvider_3         = Plusieurs fournisseurs de service de type \u2018{0}\u2019 sont d\u00e9clar\u00e9s pour \u00ab\u202f{1}\u202f\u00bb. Seul le premier fournisseur (une instance de \u2018{2}\u2019) sera utilis\u00e9.
-InverseOperationUsesSameSign     = L\u2019op\u00e9ration inverse utilise la m\u00eame valeur pour ce param\u00e8tre.
-InverseOperationUsesOppositeSign = L\u2019op\u00e9ration inverse utilise ce param\u00e8tre avec la valeur de signe oppos\u00e9.
-LoadingDatumShiftFile_1          = Chargement du fichier de changement de r\u00e9f\u00e9rentiel \u00ab\u202f{0}\u202f\u00bb.
-MismatchedOperationFactories_2   = Il n\u2019y a pas d\u2019op\u00e9rations allant de \u00ab\u202f{0}\u202f\u00bb vers \u00ab\u202f{1}\u202f\u00bb parce que ces derniers sont associ\u00e9s \u00e0 deux fabriques diff\u00e9rentes.
-MismatchedEllipsoidAxisLength_3  = Le param\u00e8tre \u00ab\u202f{1}\u202f\u00bb aurait pu \u00eatre omis. Mais il lui a \u00e9t\u00e9 donn\u00e9 la valeur {2} qui ne correspond pas \u00e0 la d\u00e9finition de l\u2019ellipso\u00efde \u00ab\u202f{0}\u202f\u00bb.
-MisnamedParameter_1              = Malgr\u00e9 son nom, ce param\u00e8tre produit en r\u00e9alit\u00e9 l\u2019effet d\u2019un \u00ab\u202f{0}\u202f\u00bb.
-NotFormalProjectionParameter_1   = Ce param\u00e8tre emprunt\u00e9 \u00e0 la projection \u00ab\u202f{0}\u202f\u00bb n\u2019est pas formellement un param\u00e8tre de cette projection.
+
+#
+# Information messages or non-fatal warnings
+#
+AmbiguousEllipsoid_1              = Ambigu\u00eft\u00e9 entre l\u2019aplatissement et la longueur du semi-axe mineur pour \u00ab\u202f{0}\u202f\u00bb. Utilise l\u2019aplatissement.
+ConformanceMeansDatumShift        = Ce r\u00e9sultat indique si un changement de r\u00e9f\u00e9rentiel a \u00e9t\u00e9 appliqu\u00e9.
+ConstantProjParameterValue_1      = Ce param\u00e8tre est montr\u00e9 pour \u00eatre plus complet, mais sa valeur ne devrait jamais \u00eatre diff\u00e9rente de {0} pour cette projection.
+DeprecatedCode_3                  = Le code \u00ab\u202f{0}\u202f\u00bb est d\u00e9pr\u00e9ci\u00e9 et remplac\u00e9 par le code {1}. La raison est\u00a0: {2}
+FallbackDefaultFactoryVersion_2   = Il n\u2019y a pas de fabrique pour la version {1} de l\u2019autorit\u00e9 \u00ab\u202f{0}\u202f\u00bb. Les objets seront cr\u00e9\u00e9s avec la version par d\u00e9faut.
+GeodeticDataBase_4                = Base de donn\u00e9es g\u00e9od\u00e9sique {0} version {1} sur \u00ab\u202f{2}\u202f\u00bb version {3}.
+IgnoredServiceProvider_3          = Plusieurs fournisseurs de service de type \u2018{0}\u2019 sont d\u00e9clar\u00e9s pour \u00ab\u202f{1}\u202f\u00bb. Seul le premier fournisseur (une instance de \u2018{2}\u2019) sera utilis\u00e9.
+InverseOperationUsesSameSign      = L\u2019op\u00e9ration inverse utilise la m\u00eame valeur pour ce param\u00e8tre.
+InverseOperationUsesOppositeSign  = L\u2019op\u00e9ration inverse utilise ce param\u00e8tre avec la valeur de signe oppos\u00e9.
+LoadingDatumShiftFile_1           = Chargement du fichier de changement de r\u00e9f\u00e9rentiel \u00ab\u202f{0}\u202f\u00bb.
+MismatchedEllipsoidAxisLength_3   = Le param\u00e8tre \u00ab\u202f{1}\u202f\u00bb aurait pu \u00eatre omis. Mais il lui a \u00e9t\u00e9 donn\u00e9 la valeur {2} qui ne correspond pas \u00e0 la d\u00e9finition de l\u2019ellipso\u00efde \u00ab\u202f{0}\u202f\u00bb.
+MismatchedOperationFactories_2    = Il n\u2019y a pas d\u2019op\u00e9rations allant de \u00ab\u202f{0}\u202f\u00bb vers \u00ab\u202f{1}\u202f\u00bb parce que ces derniers sont associ\u00e9s \u00e0 deux fabriques diff\u00e9rentes.
+MisnamedParameter_1               = Malgr\u00e9 son nom, ce param\u00e8tre produit en r\u00e9alit\u00e9 l\u2019effet d\u2019un \u00ab\u202f{0}\u202f\u00bb.
+NotFormalProjectionParameter_1    = Ce param\u00e8tre emprunt\u00e9 \u00e0 la projection \u00ab\u202f{0}\u202f\u00bb n\u2019est pas formellement un param\u00e8tre de cette projection.
+
+#
+# Error messages (to be used in exceptions)
+#
+CanNotConcatenateTransforms_2     = Les transformations \u00ab\u202f{0}\u202f\u00bb et \u00ab\u202f{1}\u202f\u00bb ne peuvent pas \u00eatre combin\u00e9es.
+CanNotComputeDerivative           = La d\u00e9riv\u00e9 de l\u2019op\u00e9ration sur les coordonn\u00e9es ne peut pas \u00eatre calcul\u00e9e.
+CanNotMapAxisToDirection_1        = Aucun axe du syst\u00e8me de coordonn\u00e9es sp\u00e9cifi\u00e9 n\u2019a pu \u00eatre associ\u00e9 \u00e0 la direction \u00ab\u202f{0}\u202f\u00bb.
+CanNotSeparateTargetDimension_1   = La dimension de destination {0} d\u00e9pend de dimensions sources qui ont \u00e9t\u00e9 exclues.
+CanNotTransformEnvelopeToGeodetic = Ne peut pas transformer l\u2019enveloppe vers un r\u00e9f\u00e9rentiel g\u00e9od\u00e9sique.
+CanNotUseGeodeticParameters_2     = Ne peut pas utiliser les param\u00e8tres g\u00e9od\u00e9siques {0}\u202f: {1}
+ColinearAxisDirections_2          = Les directions d\u2019axes {0} et {1} sont colin\u00e9aires.
+CoordinateOperationNotFound_2     = La conversion ou transformation des coordonn\u00e9es du syst\u00e8me \u00ab\u202f{0}\u202f\u00bb vers \u00ab\u202f{1}\u202f\u00bb n\u2019a pas \u00e9t\u00e9 trouv\u00e9e.
+DatumOriginShallBeDate            = L\u2019origine d\u2019un r\u00e9f\u00e9rentiel temporel doit \u00eatre une date.
+IllegalAxisDirection_2            = Les syst\u00e8mes de coordonn\u00e9es de classe \u2018{0}\u2019 ne peuvent pas avoir d\u2019axe dans la direction \u00ab\u202f{1}\u202f\u00bb.
+IllegalOperationDimension_3       = Les dimensions de l\u2019op\u00e9ration \u00ab\u202f{0}\u202f\u00bb ne peuvent pas \u00eatre ({1} \u2192 {2}).
+IllegalOperationForValueClass_1   = Cette op\u00e9ration ne peut pas s\u2019appliquer aux valeurs de classe \u2018{0}\u2019.
+IllegalUnitFor_2                  = L\u2019unit\u00e9 de mesure \u00ab\u202f{1}\u202f\u00bb n\u2019est pas valide pour les valeurs de \u00ab\u202f{0}\u202f\u00bb.
+IncompatibleCoordinateSystemTypes = Types de syst\u00e8mes de coordonn\u00e9es incompatibles.
+IncompatibleDatum_2               = Le r\u00e9f\u00e9rentiel de \u00ab\u202f{1}\u202f\u00bb doit \u00eatre \u00ab\u202f{0}\u202f\u00bb.
+LatitudesAreOpposite_2            = Les latitudes {0} et {1} sont oppos\u00e9es.
+MismatchedPrimeMeridian_2         = Le m\u00e9ridien d\u2019origine \u00ab\u202f{0}\u202f\u00bb \u00e9tait attendu, mais \u00ab\u202f{1}\u202f\u00bb a \u00e9t\u00e9 trouv\u00e9.
+MismatchedTransformDimension_3    = La {0,choice,0#source|1#destination} de la transformation a {2} dimension{2,choice,1#|2#s}, alors qu\u2019on en attendait {1}.
+MissingAuthority_1                = Aucune autorit\u00e9 n\u2019a \u00e9t\u00e9 sp\u00e9cifi\u00e9e pour le code \u00ab\u202f{0}\u202f\u00bb. Le format attendu est \u00ab\u202fAUTORIT\u00c9:CODE\u202f\u00bb.
+MissingInterpolationOrdinates     = La dimension des coordonn\u00e9es en entr\u00e9 ou en sortie du \u2018MathTransform\u2019 n\u2019est pas suffisante pour contenir les points d\u2019interpolation.
+MissingHorizontalDimension_1      = Aucune dimension horizontale n\u2019a \u00e9t\u00e9 trouv\u00e9e dans \u00ab\u202f{0}\u202f\u00bb.
+MissingVerticalDimension_1        = Aucune dimension verticale n\u2019a \u00e9t\u00e9 trouv\u00e9e dans \u00ab\u202f{0}\u202f\u00bb.
+MissingTemporalDimension_1        = Aucune dimension temporelle n\u2019a \u00e9t\u00e9 trouv\u00e9e dans \u00ab\u202f{0}\u202f\u00bb.
+MissingSpatioTemporalDimension_1  = Aucune dimension spatiale ou temporelle n\u2019a \u00e9t\u00e9 trouv\u00e9e dans \u00ab\u202f{0}\u202f\u00bb.
+NoConvergence                     = Le calcul ne converge pas.
+NoConvergenceForPoints_2          = Le calcul ne converge pas pour les points {0} et {1}.
+NonInvertibleMatrix_2             = Matrice {0}\u00d7{1} non inversible.
+NonInvertibleOperation_1          = Ne peut pas inverser l\u2019op\u00e9ration \u00ab\u202f{0}\u202f\u00bb.
+NonInvertibleTransform            = La transformation n\u2019est pas inversible.
+NonLinearUnitConversion_2         = La conversion des unit\u00e9s \u00ab\u202f{0}\u202f\u00bb vers \u00ab\u202f{1}\u202f\u00bb n\u2019est pas lin\u00e9aire.
+NonMonotonicSequence_1            = La s\u00e9quence \u00ab\u202f{0}\u202f\u00bb n\u2019est pas monotone.
+NonPerpendicularDirections_2      = Les directions {0} et {1} ne sont pas perpendiculaires.
+NonUniformScale                   = L\u2019\u00e9chelle n\u2019est pas uniforme.
+NotAnAffineTransform              = La transformation n\u2019est pas affine.
+NotASkewSymmetricMatrix           = La matrice n\u2019est pas antisym\u00e9trique.
+NoSuchAuthorityCode_3             = Aucun code \u00ab\u202f{2}\u202f\u00bb de l\u2019autorit\u00e9 \u00ab\u202f{0}\u202f\u00bb n\u2019a \u00e9t\u00e9 trouv\u00e9 pour un objet de type \u2018{1}\u2019.
+NoSuchOperationMethod_1           = Aucune m\u00e9thode n\u2019a \u00e9t\u00e9 trouv\u00e9e pour le nom ou l\u2019identifiant \u00ab\u202f{0}\u202f\u00bb.
+SingularMatrix                    = La matrice est singuli\u00e8re.
+UnexpectedDimensionForCS_1        = Dimension inattendue pour un syst\u00e8me de coordonn\u00e9es de type \u2018{0}\u2019.
+UnknownAuthority_1                = L\u2019autorit\u00e9 \u00ab\u202f{0}\u202f\u00bb n\u2019est pas reconnue.
+UnknownAxisDirection_1            = La direction d\u2019axe \u00ab\u202f{0}\u202f\u00bb n\u2019est pas reconnue.
+UnmodifiableAffineTransform       = Cette transformation affine n\u2019est pas modifiable.
+UnspecifiedDimensions             = Les dimensions n\u2019ont pas \u00e9t\u00e9 sp\u00e9cifi\u00e9es.

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/ServicesForMetadata.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/ServicesForMetadata.java?rev=1762706&r1=1762705&r2=1762706&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/ServicesForMetadata.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/ServicesForMetadata.java [UTF-8] Wed Sep 28 20:29:26 2016
@@ -124,12 +124,13 @@ public final class ServicesForMetadata e
 
     /**
      * Creates an exception message for a spatial, vertical or temporal dimension not found.
+     * The given key must be one of {@code Resources.Keys} constants.
      */
-    private static String dimensionNotFound(final short errorKey, final CoordinateReferenceSystem crs) {
+    private static String dimensionNotFound(final short resourceKey, final CoordinateReferenceSystem crs) {
         if (crs == null) {
             return Errors.format(Errors.Keys.UnspecifiedCRS);
         } else {
-            return Errors.format(errorKey, crs.getName());
+            return Resources.format(resourceKey, crs.getName());
         }
     }
 
@@ -159,7 +160,7 @@ public final class ServicesForMetadata e
                 try {
                     operation = factory.createOperation(crs, normalizedCRS);
                 } catch (FactoryException e) {
-                    throw new TransformException(Errors.format(Errors.Keys.CanNotTransformEnvelopeToGeodetic), e);
+                    throw new TransformException(Resources.format(Resources.Keys.CanNotTransformEnvelopeToGeodetic), e);
                 }
                 envelope = Envelopes.transform(operation, envelope);
             }
@@ -244,7 +245,7 @@ public final class ServicesForMetadata e
             if (crs != null) {
                 normalizedCRS = CommonCRS.defaultGeographic();
             } else if (envelope.getDimension() != 2) {
-                throw new TransformException(dimensionNotFound(Errors.Keys.MissingHorizontalDimension_1, crs));
+                throw new TransformException(dimensionNotFound(Resources.Keys.MissingHorizontalDimension_1, crs));
             }
         }
         setGeographicExtent(envelope, target, crs, normalizedCRS);
@@ -263,7 +264,7 @@ public final class ServicesForMetadata e
         final CoordinateReferenceSystem crs = envelope.getCoordinateReferenceSystem();
         final VerticalCRS verticalCRS = CRS.getVerticalComponent(crs, true);
         if (verticalCRS == null && envelope.getDimension() != 1) {
-            throw new TransformException(dimensionNotFound(Errors.Keys.MissingVerticalDimension_1, crs));
+            throw new TransformException(dimensionNotFound(Resources.Keys.MissingVerticalDimension_1, crs));
         }
         setVerticalExtent(envelope, target, crs, verticalCRS);
     }
@@ -281,7 +282,7 @@ public final class ServicesForMetadata e
         final CoordinateReferenceSystem crs = envelope.getCoordinateReferenceSystem();
         final TemporalCRS temporalCRS = CRS.getTemporalComponent(crs);
         if (temporalCRS == null) { // Mandatory for the conversion from numbers to dates.
-            throw new TransformException(dimensionNotFound(Errors.Keys.MissingTemporalDimension_1, crs));
+            throw new TransformException(dimensionNotFound(Resources.Keys.MissingTemporalDimension_1, crs));
         }
         setTemporalExtent(envelope, target, crs, temporalCRS);
     }
@@ -302,7 +303,7 @@ public final class ServicesForMetadata e
         final VerticalCRS verticalCRS = CRS.getVerticalComponent(crs, true);
         final TemporalCRS temporalCRS = CRS.getTemporalComponent(crs);
         if (horizontalCRS == null && verticalCRS == null && temporalCRS == null) {
-            throw new TransformException(dimensionNotFound(Errors.Keys.MissingSpatioTemporalDimension_1, crs));
+            throw new TransformException(dimensionNotFound(Resources.Keys.MissingSpatioTemporalDimension_1, crs));
         }
         /*
          * Try to set the geographic bounding box first, because this operation may fail with a
@@ -369,7 +370,7 @@ public final class ServicesForMetadata e
         final VerticalCRS verticalCRS = CRS.getVerticalComponent(crs, true);
         final TemporalCRS temporalCRS = CRS.getTemporalComponent(crs);
         if (horizontalCRS == null && verticalCRS == null && temporalCRS == null) {
-            throw new TransformException(dimensionNotFound(Errors.Keys.MissingSpatioTemporalDimension_1, crs));
+            throw new TransformException(dimensionNotFound(Resources.Keys.MissingSpatioTemporalDimension_1, crs));
         }
         if (horizontalCRS != null) {
             final DefaultGeographicBoundingBox extent = new DefaultGeographicBoundingBox();

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/j2d/AffineMatrix.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/j2d/AffineMatrix.java?rev=1762706&r1=1762705&r2=1762706&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/j2d/AffineMatrix.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/j2d/AffineMatrix.java [UTF-8] Wed Sep 28 20:29:26 2016
@@ -20,10 +20,10 @@ import java.util.Arrays;
 import java.io.Serializable;
 import java.awt.geom.AffineTransform;
 import org.opengis.referencing.operation.Matrix;
+import org.apache.sis.internal.referencing.Resources;
 import org.apache.sis.internal.referencing.ExtendedPrecisionMatrix;
 import org.apache.sis.referencing.operation.matrix.Matrices;
 import org.apache.sis.util.ArgumentChecks;
-import org.apache.sis.util.resources.Errors;
 
 
 /**
@@ -168,7 +168,7 @@ final class AffineMatrix implements Exte
      */
     @Override
     public final void setElement(final int row, final int column, final double value) {
-        throw new UnsupportedOperationException(Errors.format(Errors.Keys.UnmodifiableAffineTransform));
+        throw new UnsupportedOperationException(Resources.format(Resources.Keys.UnmodifiableAffineTransform));
     }
 
     /**

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/j2d/ImmutableAffineTransform.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/j2d/ImmutableAffineTransform.java?rev=1762706&r1=1762705&r2=1762706&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/j2d/ImmutableAffineTransform.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/j2d/ImmutableAffineTransform.java [UTF-8] Wed Sep 28 20:29:26 2016
@@ -18,7 +18,7 @@ package org.apache.sis.internal.referenc
 
 import java.awt.geom.AffineTransform;
 import java.awt.geom.NoninvertibleTransformException;
-import org.apache.sis.util.resources.Errors;
+import org.apache.sis.internal.referencing.Resources;
 
 
 /**
@@ -81,7 +81,7 @@ public class ImmutableAffineTransform ex
      * @throws UnsupportedOperationException if this affine transform is immutable.
      */
     protected void checkPermission() throws UnsupportedOperationException {
-        throw new UnsupportedOperationException(Errors.format(Errors.Keys.UnmodifiableAffineTransform));
+        throw new UnsupportedOperationException(Resources.format(Resources.Keys.UnmodifiableAffineTransform));
     }
 
     /**

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/DatumShiftGridLoader.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/DatumShiftGridLoader.java?rev=1762706&r1=1762705&r2=1762706&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/DatumShiftGridLoader.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/DatumShiftGridLoader.java [UTF-8] Wed Sep 28 20:29:26 2016
@@ -16,6 +16,7 @@
  */
 package org.apache.sis.internal.referencing.provider;
 
+import java.util.Locale;
 import java.util.logging.Level;
 import java.util.logging.LogRecord;
 import java.io.EOFException;
@@ -146,7 +147,7 @@ class DatumShiftGridLoader {
      * @param file   The grid file, as a {@link String} or a {@link Path}.
      */
     static void log(final Class<?> caller, final Object file) {
-        final LogRecord record = Resources.getResources(null).getLogRecord(Level.FINE, Resources.Keys.LoadingDatumShiftFile_1, file);
+        final LogRecord record = Resources.getResources((Locale) null).getLogRecord(Level.FINE, Resources.Keys.LoadingDatumShiftFile_1, file);
         record.setLoggerName(Loggers.COORDINATE_OPERATION);
         Logging.log(caller, "createMathTransform", record);
     }

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/parameter/DefaultParameterValue.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/parameter/DefaultParameterValue.java?rev=1762706&r1=1762705&r2=1762706&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/parameter/DefaultParameterValue.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/parameter/DefaultParameterValue.java [UTF-8] Wed Sep 28 20:29:26 2016
@@ -39,6 +39,7 @@ import org.apache.sis.io.wkt.Convention;
 import org.apache.sis.io.wkt.ElementKind;
 import org.apache.sis.internal.jaxb.gml.Measure;
 import org.apache.sis.internal.jaxb.gml.MeasureList;
+import org.apache.sis.internal.referencing.Resources;
 import org.apache.sis.internal.referencing.WKTUtilities;
 import org.apache.sis.internal.metadata.MetadataUtilities;
 import org.apache.sis.internal.metadata.WKTKeywords;
@@ -543,7 +544,7 @@ public class DefaultParameterValue<T> ex
      * Formats an error message for illegal method call for the current value type.
      */
     private String getClassTypeError() {
-        return Errors.format(Errors.Keys.IllegalOperationForValueClass_1,
+        return Resources.format(Resources.Keys.IllegalOperationForValueClass_1,
                 (descriptor != null) ? ((ParameterDescriptor<?>) descriptor).getValueClass() : "?");
     }
 

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/EPSGFactoryFallback.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/EPSGFactoryFallback.java?rev=1762706&r1=1762705&r2=1762706&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/EPSGFactoryFallback.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/EPSGFactoryFallback.java [UTF-8] Wed Sep 28 20:29:26 2016
@@ -39,11 +39,11 @@ import org.apache.sis.metadata.iso.citat
 import org.apache.sis.metadata.iso.citation.DefaultCitation;
 import org.apache.sis.referencing.factory.GeodeticAuthorityFactory;
 import org.apache.sis.internal.referencing.provider.TransverseMercator;
+import org.apache.sis.internal.referencing.Resources;
 import org.apache.sis.internal.util.Constants;
 import org.apache.sis.internal.util.Fallback;
 import org.apache.sis.util.iso.SimpleInternationalString;
 import org.apache.sis.util.iso.DefaultNameSpace;
-import org.apache.sis.util.resources.Errors;
 import org.apache.sis.util.CharSequences;
 import org.apache.sis.util.Debug;
 
@@ -272,8 +272,8 @@ final class EPSGFactoryFallback extends
             default:             type = IdentifiedObject.class; break;
         }
         final String authority = Constants.EPSG + "-subset";
-        final NoSuchAuthorityCodeException e = new NoSuchAuthorityCodeException(Errors.format(
-                Errors.Keys.NoSuchAuthorityCode_3, authority, type, code), authority, code);
+        final NoSuchAuthorityCodeException e = new NoSuchAuthorityCodeException(Resources.format(
+                Resources.Keys.NoSuchAuthorityCode_3, authority, type, code), authority, code);
         e.initCause(cause);
         throw e;
     }

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/AbstractCS.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/AbstractCS.java?rev=1762706&r1=1762705&r2=1762706&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/AbstractCS.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/AbstractCS.java [UTF-8] Wed Sep 28 20:29:26 2016
@@ -36,6 +36,7 @@ import org.apache.sis.referencing.Abstra
 import org.apache.sis.internal.referencing.WKTUtilities;
 import org.apache.sis.internal.metadata.AxisDirections;
 import org.apache.sis.internal.metadata.WKTKeywords;
+import org.apache.sis.internal.referencing.Resources;
 import org.apache.sis.io.wkt.ElementKind;
 import org.apache.sis.io.wkt.Formatter;
 import org.apache.sis.util.ComparisonMode;
@@ -175,12 +176,12 @@ public class AbstractCS extends Abstract
              */
             switch (validateAxis(direction, unit)) {
                 case INVALID_DIRECTION: {
-                    throw new IllegalArgumentException(Errors.getResources(properties).getString(
-                            Errors.Keys.IllegalAxisDirection_2, getClass(), direction));
+                    throw new IllegalArgumentException(Resources.getResources(properties).getString(
+                            Resources.Keys.IllegalAxisDirection_2, getClass(), direction));
                 }
                 case INVALID_UNIT: {
-                    throw new IllegalArgumentException(Errors.getResources(properties).getString(
-                            Errors.Keys.IllegalUnitFor_2, name, unit));
+                    throw new IllegalArgumentException(Resources.getResources(properties).getString(
+                            Resources.Keys.IllegalUnitFor_2, name, unit));
                 }
             }
             /*
@@ -194,8 +195,8 @@ public class AbstractCS extends Abstract
                     final AxisDirection other = axes[j].getDirection();
                     final AxisDirection abs = AxisDirections.absolute(other);
                     if (dir.equals(abs) && !abs.equals(AxisDirection.FUTURE)) {
-                        throw new IllegalArgumentException(Errors.getResources(properties).getString(
-                                Errors.Keys.ColinearAxisDirections_2, direction, other));
+                        throw new IllegalArgumentException(Resources.getResources(properties).getString(
+                                Resources.Keys.ColinearAxisDirections_2, direction, other));
                     }
                 }
             }

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/CoordinateSystems.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/CoordinateSystems.java?rev=1762706&r1=1762705&r2=1762706&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/CoordinateSystems.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/CoordinateSystems.java [UTF-8] Wed Sep 28 20:29:26 2016
@@ -32,8 +32,8 @@ import org.apache.sis.measure.Units;
 import org.apache.sis.util.Static;
 import org.apache.sis.util.Classes;
 import org.apache.sis.util.CharSequences;
-import org.apache.sis.util.resources.Errors;
 import org.apache.sis.internal.metadata.AxisDirections;
+import org.apache.sis.internal.referencing.Resources;
 import org.apache.sis.referencing.operation.matrix.Matrices;
 import org.apache.sis.referencing.operation.matrix.MatrixSIS;
 
@@ -100,7 +100,7 @@ public final class CoordinateSystems ext
             assert candidate == AxisDirections.valueOf(meridian.toString());
             return candidate;
         }
-        throw new IllegalArgumentException(Errors.format(Errors.Keys.UnknownAxisDirection_1, name));
+        throw new IllegalArgumentException(Resources.format(Resources.Keys.UnknownAxisDirection_1, name));
     }
 
     /**
@@ -287,7 +287,7 @@ public final class CoordinateSystems ext
         ensureNonNull("sourceCS", sourceCS);
         ensureNonNull("targetCS", targetCS);
         if (!Classes.implementSameInterfaces(sourceCS.getClass(), targetCS.getClass(), CoordinateSystem.class)) {
-            throw new IllegalArgumentException(Errors.format(Errors.Keys.IncompatibleCoordinateSystemTypes));
+            throw new IllegalArgumentException(Resources.format(Resources.Keys.IncompatibleCoordinateSystemTypes));
         }
         final AxisDirection[] srcAxes = getAxisDirections(sourceCS);
         final AxisDirection[] dstAxes = getAxisDirections(targetCS);
@@ -327,8 +327,8 @@ public final class CoordinateSystems ext
                 }
                 final UnitConverter converter = sourceUnit.getConverterToAny(targetUnit);
                 if (!(converter instanceof LinearConverter)) {
-                    throw new ConversionException(Errors.format(
-                              Errors.Keys.NonLinearUnitConversion_2, sourceUnit, targetUnit));
+                    throw new ConversionException(Resources.format(
+                              Resources.Keys.NonLinearUnitConversion_2, sourceUnit, targetUnit));
                 }
                 final double offset = converter.convert(0);
                 final double scale  = Units.derivative(converter, 0);

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCartesianCS.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCartesianCS.java?rev=1762706&r1=1762705&r2=1762706&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCartesianCS.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCartesianCS.java [UTF-8] Wed Sep 28 20:29:26 2016
@@ -22,7 +22,7 @@ import javax.xml.bind.annotation.XmlRoot
 import org.opengis.referencing.cs.CartesianCS;
 import org.opengis.referencing.cs.AxisDirection;
 import org.opengis.referencing.cs.CoordinateSystemAxis;
-import org.apache.sis.util.resources.Errors;
+import org.apache.sis.internal.referencing.Resources;
 import org.apache.sis.measure.Angle;
 
 
@@ -196,8 +196,8 @@ public class DefaultCartesianCS extends
                  * they are not really for Cartesian CS because we do not know the grid geometry.
                  */
                 if (angle != null && Math.abs(angle.degrees()) != 90) {
-                    throw new IllegalArgumentException(Errors.getResources(properties).getString(
-                            Errors.Keys.NonPerpendicularDirections_2, axis0, axis1));
+                    throw new IllegalArgumentException(Resources.getResources(properties).getString(
+                            Resources.Keys.NonPerpendicularDirections_2, axis0, axis1));
                 }
             }
         }

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultEllipsoidalCS.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultEllipsoidalCS.java?rev=1762706&r1=1762705&r2=1762706&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultEllipsoidalCS.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultEllipsoidalCS.java [UTF-8] Wed Sep 28 20:29:26 2016
@@ -24,7 +24,7 @@ import org.opengis.referencing.cs.Ellips
 import org.opengis.referencing.cs.AxisDirection;
 import org.opengis.referencing.cs.CoordinateSystemAxis;
 import org.apache.sis.internal.metadata.AxisDirections;
-import org.apache.sis.util.resources.Errors;
+import org.apache.sis.internal.referencing.Resources;
 import org.apache.sis.measure.Units;
 
 
@@ -206,8 +206,8 @@ public class DefaultEllipsoidalCS extend
         while (--i >= 0) {
             final AxisDirection direction = super.getAxis(i).getDirection();
             if (AxisDirections.isVertical(direction) && --n < 0) {
-                throw new IllegalArgumentException(Errors.getResources(properties).getString(
-                        Errors.Keys.IllegalAxisDirection_2, EllipsoidalCS.class, direction));
+                throw new IllegalArgumentException(Resources.getResources(properties).getString(
+                        Resources.Keys.IllegalAxisDirection_2, EllipsoidalCS.class, direction));
             }
         }
     }

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/Normalizer.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/Normalizer.java?rev=1762706&r1=1762705&r2=1762706&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/Normalizer.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/Normalizer.java [UTF-8] Wed Sep 28 20:29:26 2016
@@ -31,8 +31,8 @@ import org.opengis.referencing.cs.Spheri
 import org.opengis.referencing.cs.CylindricalCS;
 import org.opengis.referencing.cs.PolarCS;
 import org.apache.sis.internal.metadata.AxisDirections;
+import org.apache.sis.internal.referencing.Resources;
 import org.apache.sis.referencing.IdentifiedObjects;
-import org.apache.sis.util.resources.Errors;
 import org.apache.sis.util.CharSequences;
 import org.apache.sis.util.ArraysExt;
 import org.apache.sis.measure.Units;
@@ -254,7 +254,7 @@ final class Normalizer implements Compar
                 c = unit.getConverterToAny(newUnit);
             } catch (ConversionException e) {
                 // Use IllegalStateException because the public API is an AbstractCS member method.
-                throw new IllegalStateException(Errors.format(Errors.Keys.IllegalUnitFor_2, "axis", unit), e);
+                throw new IllegalStateException(Resources.format(Resources.Keys.IllegalUnitFor_2, "axis", unit), e);
             }
             double minimum = c.convert(axis.getMinimumValue());
             double maximum = c.convert(axis.getMaximumValue());

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/BursaWolfParameters.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/BursaWolfParameters.java?rev=1762706&r1=1762705&r2=1762706&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/BursaWolfParameters.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/BursaWolfParameters.java [UTF-8] Wed Sep 28 20:29:26 2016
@@ -25,14 +25,15 @@ import org.opengis.referencing.datum.Pri
 import org.opengis.referencing.operation.Matrix;
 import org.apache.sis.referencing.operation.matrix.Matrix4;
 import org.apache.sis.referencing.operation.matrix.Matrices;
+import org.apache.sis.referencing.operation.matrix.MatrixSIS;
+import org.apache.sis.referencing.IdentifiedObjects;
 import org.apache.sis.io.wkt.FormattableObject;
 import org.apache.sis.io.wkt.Formatter;
 import org.apache.sis.util.Utilities;
 import org.apache.sis.util.resources.Errors;
 import org.apache.sis.internal.util.DoubleDouble;
 import org.apache.sis.internal.metadata.WKTKeywords;
-import org.apache.sis.referencing.IdentifiedObjects;
-import org.apache.sis.referencing.operation.matrix.MatrixSIS;
+import org.apache.sis.internal.referencing.Resources;
 
 import static java.lang.Math.abs;
 import static org.apache.sis.util.ArgumentChecks.*;
@@ -248,7 +249,7 @@ public class BursaWolfParameters extends
         if (targetDatum != null) {
             final PrimeMeridian actual = targetDatum.getPrimeMeridian();
             if (actual.getGreenwichLongitude() != 0 && !Utilities.equalsIgnoreMetadata(pm, actual)) {
-                throw new IllegalArgumentException(Errors.format(Errors.Keys.MismatchedPrimeMeridian_2,
+                throw new IllegalArgumentException(Resources.format(Resources.Keys.MismatchedPrimeMeridian_2,
                         IdentifiedObjects.getName(pm, null), IdentifiedObjects.getName(actual, null)));
             }
         }
@@ -530,7 +531,7 @@ public class BursaWolfParameters extends
             throw new IllegalArgumentException(Errors.format(Errors.Keys.MismatchedMatrixSize_4, n, n, numRow, numCol));
         }
         if (!Matrices.isAffine(matrix)) {
-            throw new IllegalArgumentException(Errors.format(Errors.Keys.NotAnAffineTransform));
+            throw new IllegalArgumentException(Resources.format(Resources.Keys.NotAnAffineTransform));
         }
         /*
          * Translation terms, taken "as-is".
@@ -567,7 +568,7 @@ public class BursaWolfParameters extends
          */
         for (int j=0; j < SIZE-1; j++) {
             if (!(abs((matrix.getElement(j,j) - 1)*PPM - dS) <= tolerance)) {
-                throw new IllegalArgumentException(Errors.format(Errors.Keys.NonUniformScale));
+                throw new IllegalArgumentException(Resources.format(Resources.Keys.NonUniformScale));
             }
             for (int i = j+1; i < SIZE-1; i++) {
                 S.setFrom(RS);
@@ -577,7 +578,7 @@ public class BursaWolfParameters extends
                 S.setFrom(RS);
                 S.inverseDivide(getNumber(matrix, i,j));        // Positive rotation term.
                 if (!(abs(value + S.value) <= tolerance)) {     // We expect r1 ≈ -r2
-                    throw new IllegalArgumentException(Errors.format(Errors.Keys.NotASkewSymmetricMatrix));
+                    throw new IllegalArgumentException(Resources.format(Resources.Keys.NotASkewSymmetricMatrix));
                 }
                 S.subtract(value, error);
                 S.multiply(0.5, 0);

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultEllipsoid.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultEllipsoid.java?rev=1762706&r1=1762705&r2=1762706&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultEllipsoid.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultEllipsoid.java [UTF-8] Wed Sep 28 20:29:26 2016
@@ -36,13 +36,13 @@ import org.apache.sis.internal.jaxb.gml.
 import org.apache.sis.internal.jaxb.referencing.SecondDefiningParameter;
 import org.apache.sis.internal.metadata.MetadataUtilities;
 import org.apache.sis.internal.referencing.Formulas;
+import org.apache.sis.internal.referencing.Resources;
 import org.apache.sis.internal.metadata.WKTKeywords;
 import org.apache.sis.referencing.IdentifiedObjects;
 import org.apache.sis.referencing.AbstractIdentifiedObject;
 import org.apache.sis.io.wkt.Formatter;
 import org.apache.sis.io.wkt.Convention;
 import org.apache.sis.util.ComparisonMode;
-import org.apache.sis.util.resources.Errors;
 
 import static java.lang.Math.*;
 import static java.lang.Double.*;
@@ -614,7 +614,7 @@ public class DefaultEllipsoid extends Ab
             return NaN;
         }
         // Other cases: no solution for this algorithm.
-        throw new ArithmeticException(Errors.format(Errors.Keys.NoConvergenceForPoints_2,
+        throw new ArithmeticException(Resources.format(Resources.Keys.NoConvergenceForPoints_2,
                   new DirectPosition2D(toDegrees(λ1), toDegrees(φ1)),
                   new DirectPosition2D(toDegrees(λ2), toDegrees(φ2))));
     }

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/AuthorityFactoryIdentifier.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/AuthorityFactoryIdentifier.java?rev=1762706&r1=1762705&r2=1762706&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/AuthorityFactoryIdentifier.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/AuthorityFactoryIdentifier.java [UTF-8] Wed Sep 28 20:29:26 2016
@@ -261,7 +261,7 @@ final class AuthorityFactoryIdentifier {
      * @param used The factory which will be used.
      */
     void logConflict(final AuthorityFactory used) {
-        log(Resources.getResources(null).getLogRecord(Level.WARNING, Resources.Keys.IgnoredServiceProvider_3,
+        log(Resources.getResources((Locale) null).getLogRecord(Level.WARNING, Resources.Keys.IgnoredServiceProvider_3,
                 TYPES[type], getAuthorityAndVersion(), Classes.getClass(used)));
     }
 
@@ -270,7 +270,7 @@ final class AuthorityFactoryIdentifier {
      * {@code AuthorityFactoryIdentifier} fallback on a default version.
      */
     void logFallback() {
-        log(Resources.getResources(null).getLogRecord(Level.WARNING, Resources.Keys.FallbackDefaultFactoryVersion_2,
+        log(Resources.getResources((Locale) null).getLogRecord(Level.WARNING, Resources.Keys.FallbackDefaultFactoryVersion_2,
                 authority, version));
     }
 

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/CommonAuthorityFactory.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/CommonAuthorityFactory.java?rev=1762706&r1=1762705&r2=1762706&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/CommonAuthorityFactory.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/CommonAuthorityFactory.java [UTF-8] Wed Sep 28 20:29:26 2016
@@ -46,6 +46,7 @@ import org.opengis.referencing.cs.AxisDi
 import org.opengis.referencing.datum.DatumFactory;
 import org.opengis.referencing.datum.EngineeringDatum;
 import org.apache.sis.internal.referencing.GeodeticObjectBuilder;
+import org.apache.sis.internal.referencing.Resources;
 import org.apache.sis.metadata.iso.citation.Citations;
 import org.apache.sis.internal.system.DefaultFactories;
 import org.apache.sis.internal.system.Loggers;
@@ -333,7 +334,7 @@ public class CommonAuthorityFactory exte
                     }
                 }
                 if (!isRecognized) {
-                    throw new NoSuchAuthorityCodeException(Errors.format(Errors.Keys.UnknownAuthority_1,
+                    throw new NoSuchAuthorityCodeException(Resources.format(Resources.Keys.UnknownAuthority_1,
                             CharSequences.trimWhitespaces(code, 0, s)), Constants.OGC, code);
                 }
             }
@@ -679,7 +680,7 @@ public class CommonAuthorityFactory exte
             s = String.valueOf(code);
         }
         if (message == null) {
-            message = Errors.format(Errors.Keys.NoSuchAuthorityCode_3, Constants.EPSG, Unit.class, s);
+            message = Resources.format(Resources.Keys.NoSuchAuthorityCode_3, Constants.EPSG, Unit.class, s);
         }
         throw new NoSuchAuthorityCodeException(message, Constants.EPSG, s);
     }
@@ -713,7 +714,7 @@ public class CommonAuthorityFactory exte
      * @return An exception initialized with an error message built from the specified informations.
      */
     private static NoSuchAuthorityCodeException noSuchAuthorityCode(String localCode, String code, Exception cause) {
-        return (NoSuchAuthorityCodeException) new NoSuchAuthorityCodeException(Errors.format(Errors.Keys.NoSuchAuthorityCode_3,
+        return (NoSuchAuthorityCodeException) new NoSuchAuthorityCodeException(Resources.format(Resources.Keys.NoSuchAuthorityCode_3,
                 Constants.OGC, CoordinateReferenceSystem.class, localCode),
                 Constants.OGC, localCode, code).initCause(cause);
     }

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/MultiAuthoritiesFactory.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/MultiAuthoritiesFactory.java?rev=1762706&r1=1762705&r2=1762706&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/MultiAuthoritiesFactory.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/MultiAuthoritiesFactory.java [UTF-8] Wed Sep 28 20:29:26 2016
@@ -31,6 +31,7 @@ import java.util.concurrent.ConcurrentMa
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.ConcurrentModificationException;
+import java.util.Locale;
 import java.util.logging.Level;
 import java.util.logging.LogRecord;
 import javax.measure.unit.Unit;
@@ -702,7 +703,7 @@ public class MultiAuthoritiesFactory ext
             return factory;
         }
         final String authority = request.getAuthorityAndVersion().toString();
-        throw new NoSuchAuthorityFactoryException(Errors.format(Errors.Keys.UnknownAuthority_1, authority), authority);
+        throw new NoSuchAuthorityFactoryException(Resources.format(Resources.Keys.UnknownAuthority_1, authority), authority);
     }
 
     /**
@@ -734,7 +735,7 @@ public class MultiAuthoritiesFactory ext
         final DefinitionURI uri = DefinitionURI.parse(code);
         if (uri != null) {
             if (uri.authority == null) {
-                throw new NoSuchAuthorityCodeException(Errors.format(Errors.Keys.MissingAuthority_1, code), null, uri.code, code);
+                throw new NoSuchAuthorityCodeException(Resources.format(Resources.Keys.MissingAuthority_1, code), null, uri.code, code);
             }
             final Class<? extends T> type = proxy.type;
             authority  = uri.authority;
@@ -763,7 +764,7 @@ public class MultiAuthoritiesFactory ext
             int end = CharSequences.skipTrailingWhitespaces(code, 0, afterAuthority);
             int start = CharSequences.skipLeadingWhitespaces(code, 0, end);
             if (start >= end) {
-                throw new NoSuchAuthorityCodeException(Errors.format(Errors.Keys.MissingAuthority_1, code), null, code);
+                throw new NoSuchAuthorityCodeException(Resources.format(Resources.Keys.MissingAuthority_1, code), null, code);
             }
             authority = code.substring(start, end);
             /*
@@ -1452,7 +1453,7 @@ public class MultiAuthoritiesFactory ext
          * No coordinate operation because of mismatched factories. This is not illegal (the result is an empty set)
          * but it is worth to notify the user because this case has some chances to be an user error.
          */
-        final LogRecord record = Resources.getResources(null).getLogRecord(Level.WARNING,
+        final LogRecord record = Resources.getResources((Locale) null).getLogRecord(Level.WARNING,
                 Resources.Keys.MismatchedOperationFactories_2, sourceCRS, targetCRS);
         record.setLoggerName(Loggers.CRS_FACTORY);
         Logging.log(MultiAuthoritiesFactory.class, "createFromCoordinateReferenceSystemCodes", record);

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/EPSGDataAccess.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/EPSGDataAccess.java?rev=1762706&r1=1762705&r2=1762706&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/EPSGDataAccess.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/EPSGDataAccess.java [UTF-8] Wed Sep 28 20:29:26 2016
@@ -1663,7 +1663,7 @@ addURIs:    for (int i=0; ; i++) {
                     case "temporal": {
                         final Date originDate;
                         if (anchor == null || anchor.isEmpty()) {
-                            throw new FactoryDataException(error().getString(Errors.Keys.DatumOriginShallBeDate));
+                            throw new FactoryDataException(resources().getString(Resources.Keys.DatumOriginShallBeDate));
                         }
                         if (dateFormat == null) {
                             dateFormat = new StandardDateFormat();
@@ -1672,7 +1672,7 @@ addURIs:    for (int i=0; ; i++) {
                         try {
                             originDate = dateFormat.parse(anchor);
                         } catch (ParseException e) {
-                            throw new FactoryDataException(error().getString(Errors.Keys.DatumOriginShallBeDate), e);
+                            throw new FactoryDataException(resources().getString(Resources.Keys.DatumOriginShallBeDate), e);
                         }
                         datum = datumFactory.createTemporalDatum(properties, originDate);
                         break;
@@ -2173,7 +2173,7 @@ addURIs:    for (int i=0; ; i++) {
                     }
                 }
                 if (cs == null) {
-                    throw new FactoryDataException(error().getString(Errors.Keys.UnexpectedDimensionForCS_1, type));
+                    throw new FactoryDataException(resources().getString(Resources.Keys.UnexpectedDimensionForCS_1, type));
                 }
                 returnValue = ensureSingleton(cs, returnValue, code);
             }
@@ -3357,7 +3357,7 @@ next:               while (r.next()) {
      * @return An exception initialized with an error message built from the specified informations.
      */
     private NoSuchAuthorityCodeException noSuchAuthorityCode(final Class<?> type, final String code) {
-        return new NoSuchAuthorityCodeException(error().getString(Errors.Keys.NoSuchAuthorityCode_3,
+        return new NoSuchAuthorityCodeException(resources().getString(Resources.Keys.NoSuchAuthorityCode_3,
                 Constants.EPSG, type, code), Constants.EPSG, code, code);
     }
 
@@ -3376,6 +3376,13 @@ next:               while (r.next()) {
     }
 
     /**
+     * Minor shortcut for fetching the resources specific to the {@code sis-referencing} module.
+     */
+    private Resources resources() {
+        return Resources.getResources(getLocale());
+    }
+
+    /**
      * Logs a warning about an unexpected but non-fatal exception.
      *
      * @param method    The source method.

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/EPSGFactory.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/EPSGFactory.java?rev=1762706&r1=1762705&r2=1762706&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/EPSGFactory.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/EPSGFactory.java [UTF-8] Wed Sep 28 20:29:26 2016
@@ -38,6 +38,7 @@ import org.opengis.referencing.operation
 import org.opengis.referencing.operation.CoordinateOperationAuthorityFactory;
 import org.opengis.referencing.operation.MathTransformFactory;
 import org.apache.sis.internal.metadata.sql.Initializer;
+import org.apache.sis.internal.referencing.Resources;
 import org.apache.sis.internal.system.DefaultFactories;
 import org.apache.sis.internal.util.Constants;
 import org.apache.sis.referencing.factory.ConcurrentAuthorityFactory;
@@ -46,7 +47,6 @@ import org.apache.sis.util.ArgumentCheck
 import org.apache.sis.util.Classes;
 import org.apache.sis.util.Exceptions;
 import org.apache.sis.util.Localized;
-import org.apache.sis.util.resources.Errors;
 
 
 /**
@@ -293,7 +293,7 @@ public class EPSGFactory extends Concurr
         if (message == null) {
             message = Classes.getShortClassName(e);
         }
-        return Errors.getResources(locale).getString(Errors.Keys.CanNotUseGeodeticParameters_2, Constants.EPSG, message);
+        return Resources.getResources(locale).getString(Resources.Keys.CanNotUseGeodeticParameters_2, Constants.EPSG, message);
     }
 
     /**

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/InstallationScriptProvider.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/InstallationScriptProvider.java?rev=1762706&r1=1762705&r2=1762706&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/InstallationScriptProvider.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/InstallationScriptProvider.java [UTF-8] Wed Sep 28 20:29:26 2016
@@ -33,6 +33,7 @@ import org.apache.sis.util.resources.Err
 import org.apache.sis.util.logging.Logging;
 import org.apache.sis.util.ArgumentChecks;
 import org.apache.sis.setup.InstallationResources;
+import org.apache.sis.internal.referencing.Resources;
 import org.apache.sis.internal.system.DataDirectory;
 import org.apache.sis.internal.system.Loggers;
 import org.apache.sis.internal.util.CollectionsExt;
@@ -213,7 +214,7 @@ public abstract class InstallationScript
         verifyAuthority(authority);
         ArgumentChecks.ensureValidIndex(resources.length, resource);
         if (!Constants.EPSG.equals(authority)) {
-            throw new IllegalStateException(Errors.format(Errors.Keys.UnknownAuthority_1, authority));
+            throw new IllegalStateException(Resources.format(Resources.Keys.UnknownAuthority_1, authority));
         }
         String name = resources[resource];
         final Charset charset;

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/AbstractCoordinateOperation.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/AbstractCoordinateOperation.java?rev=1762706&r1=1762705&r2=1762706&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/AbstractCoordinateOperation.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/AbstractCoordinateOperation.java [UTF-8] Wed Sep 28 20:29:26 2016
@@ -45,7 +45,6 @@ import org.apache.sis.io.wkt.Formattable
 import org.apache.sis.util.iso.Types;
 import org.apache.sis.util.Classes;
 import org.apache.sis.util.ComparisonMode;
-import org.apache.sis.util.resources.Errors;
 import org.apache.sis.util.collection.Containers;
 import org.apache.sis.util.UnsupportedImplementationException;
 import org.apache.sis.util.logging.Logging;
@@ -56,6 +55,7 @@ import org.apache.sis.referencing.operat
 import org.apache.sis.referencing.operation.transform.PassThroughTransform;
 import org.apache.sis.internal.referencing.PositionalAccuracyConstant;
 import org.apache.sis.internal.referencing.ReferencingUtilities;
+import org.apache.sis.internal.referencing.Resources;
 import org.apache.sis.internal.referencing.WKTUtilities;
 import org.apache.sis.internal.metadata.WKTKeywords;
 import org.apache.sis.internal.metadata.MetadataUtilities;
@@ -360,14 +360,14 @@ check:      for (int isTarget=0; ; isTar
                     if (actual == expected || actual < interpDim) {
                         // This check is not strictly necessary as the next check below would catch the error,
                         // but we provide here a hopefully more helpful error message for a common mistake.
-                        throw new IllegalArgumentException(Errors.getResources(properties)
-                                .getString(Errors.Keys.MissingInterpolationOrdinates));
+                        throw new IllegalArgumentException(Resources.getResources(properties)
+                                .getString(Resources.Keys.MissingInterpolationOrdinates));
                     }
                     expected += interpDim;
                 }
                 if (crs != null && actual != expected) {
-                    throw new IllegalArgumentException(Errors.getResources(properties).getString(
-                            Errors.Keys.MismatchedTransformDimension_3, isTarget, expected, actual));
+                    throw new IllegalArgumentException(Resources.getResources(properties).getString(
+                            Resources.Keys.MismatchedTransformDimension_3, isTarget, expected, actual));
                 }
             }
         }

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/AbstractSingleOperation.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/AbstractSingleOperation.java?rev=1762706&r1=1762705&r2=1762706&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/AbstractSingleOperation.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/AbstractSingleOperation.java [UTF-8] Wed Sep 28 20:29:26 2016
@@ -44,6 +44,7 @@ import org.apache.sis.referencing.operat
 import org.apache.sis.internal.jaxb.referencing.CC_OperationParameterGroup;
 import org.apache.sis.internal.jaxb.referencing.CC_OperationMethod;
 import org.apache.sis.internal.jaxb.Context;
+import org.apache.sis.internal.referencing.Resources;
 import org.apache.sis.internal.referencing.ReferencingUtilities;
 import org.apache.sis.internal.metadata.ReferencingServices;
 import org.apache.sis.internal.metadata.MetadataUtilities;
@@ -241,8 +242,8 @@ class AbstractSingleOperation extends Ab
          * has special handling for this operation (a TensorParameters dedicated class, etc.)
          */
         if (!IdentifiedObjects.isHeuristicMatchForName(method, Constants.AFFINE)) {
-            throw new IllegalArgumentException(Errors.getResources(properties).getString(
-                    Errors.Keys.MismatchedTransformDimension_3, isTarget, expected, actual));
+            throw new IllegalArgumentException(Resources.getResources(properties).getString(
+                    Resources.Keys.MismatchedTransformDimension_3, isTarget, expected, actual));
         }
     }
 

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/CoordinateOperationFinder.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/CoordinateOperationFinder.java?rev=1762706&r1=1762705&r2=1762706&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/CoordinateOperationFinder.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/CoordinateOperationFinder.java [UTF-8] Wed Sep 28 20:29:26 2016
@@ -36,6 +36,7 @@ import org.apache.sis.internal.metadata.
 import org.apache.sis.internal.metadata.VerticalDatumTypes;
 import org.apache.sis.internal.metadata.ReferencingServices;
 import org.apache.sis.internal.referencing.ReferencingUtilities;
+import org.apache.sis.internal.referencing.Resources;
 import org.apache.sis.internal.referencing.provider.Geographic2Dto3D;
 import org.apache.sis.internal.referencing.provider.Geographic3Dto2D;
 import org.apache.sis.internal.referencing.provider.GeographicToGeocentric;
@@ -1060,7 +1061,7 @@ public class CoordinateOperationFinder e
      * @return A default error message.
      */
     private static String notFoundMessage(final IdentifiedObject source, final IdentifiedObject target) {
-        return Errors.format(Errors.Keys.CoordinateOperationNotFound_2, CRSPair.label(source), CRSPair.label(target));
+        return Resources.format(Resources.Keys.CoordinateOperationNotFound_2, CRSPair.label(source), CRSPair.label(target));
     }
 
     /**
@@ -1071,6 +1072,6 @@ public class CoordinateOperationFinder e
      * @return A default error message.
      */
     private static String canNotInvert(final GeneralDerivedCRS crs) {
-        return Errors.format(Errors.Keys.NonInvertibleOperation_1, crs.getConversionFromBase().getName().getCode());
+        return Resources.format(Resources.Keys.NonInvertibleOperation_1, crs.getConversionFromBase().getName().getCode());
     }
 }




Mime
View raw message