sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1762678 - 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/provider/ sis-referencing/src/main/java/org/apache/sis/referencin...
Date Wed, 28 Sep 2016 15:08:45 GMT
Author: desruisseaux
Date: Wed Sep 28 15:08:45 2016
New Revision: 1762678

URL: http://svn.apache.org/viewvc?rev=1762678&view=rev
Log:
Begin refactoring of some (not all) resources on a per-module basis.
The resources that are likely to be used only by a specific module are stored in an internal package of that module.
The resources that may be shared by more than one resource stay in org.apache.sis.resources package of sis-utility module.
In this commit, only the description or logging messages of sis-referencing are moved. 

Added:
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/Resources.java
      - copied, changed from r1762664, sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/resources/Messages.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/Resources.properties
      - copied, changed from r1762217, sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/resources/Messages.properties
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/Resources_fr.properties
      - copied, changed from r1762217, sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/resources/Messages_fr.properties
Modified:
    sis/branches/JDK8/core/pom.xml
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/PositionalAccuracyConstant.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/SignReversalComment.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/internal/referencing/provider/Equirectangular.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/LambertConformalWest.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/MapProjection.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/TransverseMercatorSouth.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/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/operation/transform/DefaultMathTransformFactory.java
    sis/branches/JDK8/core/sis-utility/pom.xml
    sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/resources/Messages.java
    sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/resources/Messages.properties
    sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/resources/Messages_fr.properties

Modified: sis/branches/JDK8/core/pom.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/pom.xml?rev=1762678&r1=1762677&r2=1762678&view=diff
==============================================================================
--- sis/branches/JDK8/core/pom.xml (original)
+++ sis/branches/JDK8/core/pom.xml Wed Sep 28 15:08:45 2016
@@ -142,7 +142,8 @@
   <build>
     <plugins>
 
-      <!-- Collect JAR files in <root>/target/binaries directory. -->
+      <!-- Compile properties files into resources UTF files and
+           collect JAR files in <root>/target/binaries directory. -->
       <plugin>
         <groupId>org.apache.sis.core</groupId>
         <artifactId>sis-build-helper</artifactId>
@@ -150,6 +151,7 @@
         <executions>
           <execution>
             <goals>
+              <goal>compile-resources</goal>
               <goal>collect-jars</goal>
             </goals>
           </execution>

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/PositionalAccuracyConstant.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/PositionalAccuracyConstant.java?rev=1762678&r1=1762677&r2=1762678&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/PositionalAccuracyConstant.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/PositionalAccuracyConstant.java [UTF-8] Wed Sep 28 15:08:45 2016
@@ -38,7 +38,6 @@ import org.apache.sis.metadata.iso.citat
 import org.apache.sis.metadata.iso.quality.DefaultConformanceResult;
 import org.apache.sis.metadata.iso.quality.DefaultAbsoluteExternalPositionalAccuracy;
 import org.apache.sis.util.resources.Vocabulary;
-import org.apache.sis.util.resources.Messages;
 
 
 /**
@@ -97,7 +96,7 @@ public final class PositionalAccuracyCon
     public static final PositionalAccuracy DATUM_SHIFT_OMITTED;
     static {
         final InternationalString desc = Vocabulary.formatInternational(Vocabulary.Keys.TransformationAccuracy);
-        final InternationalString eval = Messages  .formatInternational(Messages.Keys.ConformanceMeansDatumShift);
+        final InternationalString eval = Resources .formatInternational(Resources.Keys.ConformanceMeansDatumShift);
         DATUM_SHIFT_APPLIED = new PositionalAccuracyConstant(desc, eval, true);
         DATUM_SHIFT_OMITTED = new PositionalAccuracyConstant(desc, eval, false);
     }

Copied: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/Resources.java (from r1762664, sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/resources/Messages.java)
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/Resources.java?p2=sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/Resources.java&p1=sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/resources/Messages.java&r1=1762664&r2=1762678&rev=1762678&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/resources/Messages.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 15:08:45 2016
@@ -14,24 +14,27 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sis.util.resources;
+package org.apache.sis.internal.referencing;
 
 import java.net.URL;
 import java.util.Locale;
 import java.util.MissingResourceException;
 import javax.annotation.Generated;
 import org.opengis.util.InternationalString;
+import org.apache.sis.util.resources.KeyConstants;
+import org.apache.sis.util.resources.IndexedResourceBundle;
+import org.apache.sis.util.resources.ResourceInternationalString;
 
 
 /**
- * Locale-dependent resources for miscellaneous (often logging) messages.
+ * Warning and error messages that are specific to the {@code sis-referencing} module.
  *
  * @author  Martin Desruisseaux (IRD, Geomatys)
- * @since   0.3
+ * @since   0.8
  * @version 0.8
  * @module
  */
-public final class Messages extends IndexedResourceBundle {
+public final class Resources extends IndexedResourceBundle {
     /**
      * Resource keys. This class is used when compiling sources, but no dependencies to
      * {@code Keys} should appear in any resulting class files. Since the Java compiler
@@ -39,7 +42,7 @@ public final class Messages extends Inde
      * pools of compiled classes.
      *
      * @author  Martin Desruisseaux (IRD, Geomatys)
-     * @since   0.3
+     * @since   0.8
      * @module
      */
     @Generated("org.apache.sis.util.resources.IndexedResourceCompiler")
@@ -56,234 +59,80 @@ public final class Messages extends Inde
         }
 
         /**
-         * {0} “{1}” is already registered. The second instance will be ignored.
-         */
-        public static final short AlreadyRegistered_2 = 0;
-
-        /**
          * Ambiguity between inverse flattening and semi minor axis length for “{0}”. Using inverse
          * flattening.
          */
-        public static final short AmbiguousEllipsoid_1 = 30;
-
-        /**
-         * Can not create the {0} schema in database.
-         */
-        public static final short CanNotCreateSchema_1 = 41;
-
-        /**
-         * Can not instantiate the object of type ‘{0}’ identified by “{1}”. Reason is:{2}
-         */
-        public static final short CanNotInstantiateForIdentifier_3 = 35;
-
-        /**
-         * Changed the container capacity from {0} to {1} elements.
-         */
-        public static final short ChangedContainerCapacity_2 = 1;
-
-        /**
-         * Configuration of “{0}” received on {1} in {2} seconds.
-         */
-        public static final short ConfigurationOf_3 = 31;
+        public static final short AmbiguousEllipsoid_1 = 0;
 
         /**
          * This result indicates if a datum shift method has been applied.
          */
-        public static final short ConformanceMeansDatumShift = 8;
+        public static final short ConformanceMeansDatumShift = 1;
 
         /**
          * This parameter is shown for completeness, but should never have a value different than {0}
          * for this projection.
          */
-        public static final short ConstantProjParameterValue_1 = 11;
-
-        /**
-         * Created an instance of ‘{0}’ from the “{1}” identifier in {2} seconds.
-         */
-        public static final short CreateDurationFromIdentifier_3 = 33;
-
-        /**
-         * Created an instance of ‘{0}’ in {1} seconds.
-         */
-        public static final short CreateDuration_2 = 34;
-
-        /**
-         * Created an instance of ‘{0}’ named “{1}” with the “{2}” identifier.
-         */
-        public static final short CreatedIdentifiedObject_3 = 17;
-
-        /**
-         * Created an instance of ‘{0}’ named “{1}”.
-         */
-        public static final short CreatedNamedObject_2 = 16;
-
-        /**
-         * Creating {0} schema in the “{1}” database.
-         */
-        public static final short CreatingSchema_2 = 39;
-
-        /**
-         * {0} dataset version {1} on “{2}” version {3}.
-         */
-        public static final short DataBase_4 = 28;
-
-        /**
-         * The {0} environment variable is defined, but the given “{1}” value is not an existing
-         * directory.
-         */
-        public static final short DataDirectoryDoesNotExist_2 = 20;
-
-        /**
-         * Apache SIS is not authorized to access the “{1}” sub-directory in the directory given by the
-         * {0} environment variable.
-         */
-        public static final short DataDirectoryNotAccessible_2 = 26;
-
-        /**
-         * Apache SIS is not authorized to read information given by the “{0}” environment variable.
-         */
-        public static final short DataDirectoryNotAuthorized_1 = 25;
-
-        /**
-         * The “{1}” directory specified by the {0} environment variable exists but is not readable.
-         */
-        public static final short DataDirectoryNotReadable_2 = 21;
-
-        /**
-         * The “{0}” environment variable is not set.
-         */
-        public static final short DataDirectoryNotSpecified_1 = 22;
-
-        /**
-         * Apache SIS can not write in the “{1}” directory given by the {0} environment variable.
-         */
-        public static final short DataDirectoryNotWritable_2 = 23;
-
-        /**
-         * Environment variable {0} specifies the “{1}” data directory.
-         */
-        public static final short DataDirectory_2 = 24;
+        public static final short ConstantProjParameterValue_1 = 2;
 
         /**
          * Code “{0}” is deprecated and replaced by code {1}. Reason is: {2}
          */
-        public static final short DeprecatedCode_3 = 29;
-
-        /**
-         * Property “{0}” has been discarded in favor of “{1}”, because those two properties are
-         * mutually exclusive.
-         */
-        public static final short DiscardedExclusiveProperty_2 = 2;
+        public static final short DeprecatedCode_3 = 3;
 
         /**
          * There is no factory for version {1} of “{0}” authority. Fallback on default version for
          * objects creation.
          */
-        public static final short FallbackDefaultFactoryVersion_2 = 38;
+        public static final short FallbackDefaultFactoryVersion_2 = 4;
 
         /**
-         * Ignored properties after the first occurrence of ‘{0}’.
+         * {0} geodetic dataset version {1} on “{2}” version {3}.
          */
-        public static final short IgnoredPropertiesAfterFirst_1 = 6;
-
-        /**
-         * Ignored property associated to ‘{0}’.
-         */
-        public static final short IgnoredPropertyAssociatedTo_1 = 7;
+        public static final short GeodeticDataBase_4 = 5;
 
         /**
          * More than one service provider of type ‘{0}’ are declared for “{1}”. Only the first provider
          * (an instance of ‘{2}’) will be used.
          */
-        public static final short IgnoredServiceProvider_3 = 36;
-
-        /**
-         * Parsing of “{0}” done, but some elements were ignored.
-         */
-        public static final short IncompleteParsing_1 = 14;
-
-        /**
-         * Inserted {0} records in {1} seconds.
-         */
-        public static final short InsertDuration_2 = 40;
+        public static final short IgnoredServiceProvider_3 = 6;
 
         /**
          * Inverse operation uses this parameter value with opposite sign.
          */
-        public static final short InverseOperationUsesOppositeSign = 42;
+        public static final short InverseOperationUsesOppositeSign = 7;
 
         /**
          * Inverse operation uses the same parameter value.
          */
-        public static final short InverseOperationUsesSameSign = 43;
-
-        /**
-         * No object associated to the “{0}” JNDI name.
-         */
-        public static final short JNDINotSpecified_1 = 32;
+        public static final short InverseOperationUsesSameSign = 8;
 
         /**
          * Loading datum shift file “{0}”.
          */
-        public static final short LoadingDatumShiftFile_1 = 27;
-
-        /**
-         * Text were discarded for some locales.
-         */
-        public static final short LocalesDiscarded = 3;
+        public static final short LoadingDatumShiftFile_1 = 9;
 
         /**
          * The “{1}” parameter could have been omitted. But it has been given a value of {2} which does
          * not match the definition of the “{0}” ellipsoid.
          */
-        public static final short MismatchedEllipsoidAxisLength_3 = 9;
+        public static final short MismatchedEllipsoidAxisLength_3 = 10;
 
         /**
          * No coordinate operation from “{0}” to “{1}” because of mismatched factories.
          */
-        public static final short MismatchedOperationFactories_2 = 37;
+        public static final short MismatchedOperationFactories_2 = 11;
 
         /**
          * Despite its name, this parameter is effectively “{0}”.
          */
-        public static final short MisnamedParameter_1 = 18;
-
-        /**
-         * This “{0}” formatting is a departure from standard format.
-         */
-        public static final short NonConformFormatting_1 = 15;
+        public static final short MisnamedParameter_1 = 12;
 
         /**
          * This parameter borrowed from the “{0}” projection is not formally a parameter of this
          * projection.
          */
-        public static final short NotFormalProjectionParameter_1 = 10;
-
-        /**
-         * Optional module “{0}” requested but not found.
-         */
-        public static final short OptionalModuleNotFound_1 = 12;
-
-        /**
-         * Property “{0}” is hidden by “{1}”.
-         */
-        public static final short PropertyHiddenBy_2 = 4;
-
-        /**
-         * The text contains unknown elements:
-         */
-        public static final short UnknownElementsInText = 13;
-
-        /**
-         * Loading of “{0}” done, but some records were ignored because of unrecognized keywords: {1}
-         */
-        public static final short UnknownKeywordInRecord_2 = 19;
-
-        /**
-         * Can not parse “{1}” as an instance of ‘{0}’. The value is stored as plain text instead, but
-         * will be ignored by some processing.
-         */
-        public static final short UnparsableValueStoredAsText_2 = 5;
+        public static final short NotFormalProjectionParameter_1 = 13;
     }
 
     /**
@@ -292,7 +141,7 @@ public final class Messages extends Inde
      * @param resources  the path of the binary file containing resources, or {@code null} if
      *        there is no resources. The resources may be a file or an entry in a JAR file.
      */
-    Messages(final URL resources) {
+    public Resources(final URL resources) {
         super(resources);
     }
 
@@ -313,8 +162,8 @@ public final class Messages extends Inde
      * @return resources in the given locale.
      * @throws MissingResourceException if resources can't be found.
      */
-    public static Messages getResources(final Locale locale) throws MissingResourceException {
-        return getBundle(Messages.class, locale);
+    public static Resources getResources(final Locale locale) throws MissingResourceException {
+        return getBundle(Resources.class, locale);
     }
 
     /**

Copied: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/Resources.properties (from r1762217, sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/resources/Messages.properties)
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/Resources.properties?p2=sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/Resources.properties&p1=sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/resources/Messages.properties&r1=1762217&r2=1762678&rev=1762678&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/resources/Messages.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 15:08:45 2016
@@ -14,48 +14,17 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-AlreadyRegistered_2              = {0} \u201c{1}\u201d is already registered. The second instance will be ignored.
 AmbiguousEllipsoid_1             = Ambiguity between inverse flattening and semi minor axis length for \u201c{0}\u201d. Using inverse flattening.
-CanNotCreateSchema_1             = Can not create the {0} schema in database.
-# In following message, the first characters of parameter {2} should be a line separator ("\r", "\n" or "\r\n").
-CanNotInstantiateForIdentifier_3 = Can not instantiate the object of type \u2018{0}\u2019 identified by \u201c{1}\u201d. Reason is:{2}
-ChangedContainerCapacity_2       = Changed the container capacity from {0} to {1} elements.
-ConfigurationOf_3                = Configuration of \u201c{0}\u201d received on {1} in {2} seconds.
 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.
-CreatedNamedObject_2             = Created an instance of \u2018{0}\u2019 named \u201c{1}\u201d.
-CreatedIdentifiedObject_3        = Created an instance of \u2018{0}\u2019 named \u201c{1}\u201d with the \u201c{2}\u201d identifier.
-CreateDuration_2                 = Created an instance of \u2018{0}\u2019 in {1} seconds.
-CreateDurationFromIdentifier_3   = Created an instance of \u2018{0}\u2019 from the \u201c{1}\u201d identifier in {2} seconds.
-CreatingSchema_2                 = Creating {0} schema in the \u201c{1}\u201d database.
-DataBase_4                       = {0} dataset version {1} on \u201c{2}\u201d version {3}.
-DataDirectory_2                  = Environment variable {0} specifies the \u201c{1}\u201d data directory.
-DataDirectoryDoesNotExist_2      = The {0} environment variable is defined, but the given \u201c{1}\u201d value is not an existing directory.
-DataDirectoryNotAccessible_2     = Apache SIS is not authorized to access the \u201c{1}\u201d sub-directory in the directory given by the {0} environment variable.
-DataDirectoryNotAuthorized_1     = Apache SIS is not authorized to read information given by the \u201c{0}\u201d environment variable.
-DataDirectoryNotReadable_2       = The \u201c{1}\u201d directory specified by the {0} environment variable exists but is not readable.
-DataDirectoryNotSpecified_1      = The \u201c{0}\u201d environment variable is not set.
-DataDirectoryNotWritable_2       = Apache SIS can not write in the \u201c{1}\u201d directory given by the {0} environment variable.
 DeprecatedCode_3                 = Code \u201c{0}\u201d is deprecated and replaced by code {1}. Reason is: {2}
-DiscardedExclusiveProperty_2     = Property \u201c{0}\u201d has been discarded in favor of \u201c{1}\u201d, because those two properties are mutually exclusive.
 FallbackDefaultFactoryVersion_2  = There is no factory for version {1} of \u201c{0}\u201d authority. Fallback on default version for objects creation.
-IgnoredPropertiesAfterFirst_1    = Ignored properties after the first occurrence of \u2018{0}\u2019.
-IgnoredPropertyAssociatedTo_1    = Ignored property associated to \u2018{0}\u2019.
+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.
-IncompleteParsing_1              = Parsing of \u201c{0}\u201d done, but some elements were ignored.
-InsertDuration_2                 = Inserted {0} records in {1} seconds.
 InverseOperationUsesSameSign     = Inverse operation uses the same parameter value.
 InverseOperationUsesOppositeSign = Inverse operation uses this parameter value with opposite sign.
-JNDINotSpecified_1               = No object associated to the \u201c{0}\u201d JNDI name.
 LoadingDatumShiftFile_1          = Loading datum shift file \u201c{0}\u201d.
-LocalesDiscarded                 = Text were discarded for some locales.
-OptionalModuleNotFound_1         = Optional module \u201c{0}\u201d requested but not found.
-PropertyHiddenBy_2               = Property \u201c{0}\u201d is hidden by \u201c{1}\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.
-NonConformFormatting_1           = This \u201c{0}\u201d formatting is a departure from standard format.
 NotFormalProjectionParameter_1   = This parameter borrowed from the \u201c{0}\u201d projection is not formally a parameter of this projection.
-UnknownElementsInText            = The text contains unknown elements:
-UnknownKeywordInRecord_2         = Loading of \u201c{0}\u201d done, but some records were ignored because of unrecognized keywords: {1}
-UnparsableValueStoredAsText_2    = 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.

Copied: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/Resources_fr.properties (from r1762217, sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/resources/Messages_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?p2=sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/Resources_fr.properties&p1=sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/resources/Messages_fr.properties&r1=1762217&r2=1762678&rev=1762678&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/resources/Messages_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 15:08:45 2016
@@ -21,48 +21,17 @@
 #   U+202F NARROW NO-BREAK SPACE  before  ; ! and ?
 #   U+00A0 NO-BREAK SPACE         before  :
 #
-AlreadyRegistered_2              = Le {0} \u00ab\u202f{1}\u202f\u00bb est d\u00e9j\u00e0 inscrit dans le registre. La seconde instance sera ignor\u00e9e.
 AmbiguousEllipsoid_1             = Ambigu\u00eft\u00e9 entre l\u2019aplatissement et la longueur du semi-axe mineur pour \u00ab\u202f{0}\u202f\u00bb. Utilise l\u2019aplatissement.
-CanNotCreateSchema_1             = Ne peut pas cr\u00e9er le sch\u00e9ma {0} dans la base de donn\u00e9es.
-# In following message, the first characters of parameter {2} should be a line separator ("\r", "\n" or "\r\n").
-CanNotInstantiateForIdentifier_3 = Ne peut pas cr\u00e9er l\u2019objet de type \u2018{0}\u2019 identifi\u00e9 par \u00ab\u202f{1}\u202f\u00bb. La raison est\u00a0:{2}
-ChangedContainerCapacity_2       = Changement de la capacit\u00e9 du conteneur de {0} vers {1} \u00e9l\u00e9ments.
-ConfigurationOf_3                = Configuration de \u00ab\u202f{0}\u202f\u00bb re\u00e7ue le {1} en {2} secondes.
 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.
-CreatedNamedObject_2             = Cr\u00e9ation d\u2019une instance de \u2018{0}\u2019 nomm\u00e9e \u00ab\u202f{1}\u202f\u00bb.
-CreatedIdentifiedObject_3        = Cr\u00e9ation d\u2019une instance de \u2018{0}\u2019 nomm\u00e9e \u00ab\u202f{1}\u202f\u00bb avec l\u2019identifiant \u00ab\u202f{2}\u202f\u00bb.
-CreateDuration_2                 = Cr\u00e9ation d\u2019une instance de \u2018{0}\u2019 en {1} secondes.
-CreateDurationFromIdentifier_3   = Cr\u00e9ation d\u2019une instance de \u2018{0}\u2019 \u00e0 partir de l\u2019identifiant \u00ab\u202f{1}\u202f\u00bb en {2} secondes.
-CreatingSchema_2                 = Cr\u00e9ation du sch\u00e9ma {0} dans la base de donn\u00e9es \u00ab\u202f{1}\u202f\u00bb.
-DataBase_4                       = Base de donn\u00e9es {0} version {1} sur \u00ab\u202f{2}\u202f\u00bb version {3}.
-DataDirectory_2                  = La variable environnementale {0} sp\u00e9cifie le r\u00e9pertoire de donn\u00e9es \u00ab\u202f{1}\u202f\u00bb.
-DataDirectoryDoesNotExist_2      = La variable environnementale {0} est bien d\u00e9finie, mais sa valeur \u00ab\u202f{1}\u202f\u00bb n\u2019est pas un r\u00e9pertoire existant.
-DataDirectoryNotAccessible_2     = Apache SIS n\u2019a pas l\u2019autorisation d\u2019acc\u00e9der au sous-r\u00e9pertoire \u00ab\u202f{1}\u202f\u00bb dans le r\u00e9pertoire donn\u00e9 par la variable environnementale {0}.
-DataDirectoryNotAuthorized_1     = Apache SIS n\u2019a pas l\u2019autorisation de lire des informations donn\u00e9es par la variable environnementale \u00ab\u202f{0}\u202f\u00bb.
-DataDirectoryNotReadable_2       = Le r\u00e9pertoire \u00ab\u202f{1}\u202f\u00bb sp\u00e9cifi\u00e9 par la variable environnementale {0} existe bien mais ne peut pas \u00eatre lu.
-DataDirectoryNotSpecified_1      = La variable environnementale \u00ab\u202f{0}\u202f\u00bb n\u2019est pas d\u00e9finie.
-DataDirectoryNotWritable_2       = Apache SIS ne peut pas \u00e9crire dans le r\u00e9pertoire \u00ab\u202f{1}\u202f\u00bb sp\u00e9cifi\u00e9e par la variable environnementale {0}.
 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}
-DiscardedExclusiveProperty_2     = La propri\u00e9t\u00e9 \u00ab\u202f{0}\u202f\u00bb a \u00e9t\u00e9 \u00e9cart\u00e9e en faveur de \u00ab\u202f{1}\u202f\u00bb, parce que ces deux propri\u00e9t\u00e9s sont mutuellement exclusives.
 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.
-IgnoredPropertiesAfterFirst_1    = Des propri\u00e9t\u00e9s ont \u00e9t\u00e9 ignor\u00e9es apr\u00e8s la premi\u00e8re occurrence de \u2018{0}\u2019.
-IgnoredPropertyAssociatedTo_1    = Une propri\u00e9t\u00e9 associ\u00e9e \u00e0 \u2018{0}\u2019 a \u00e9t\u00e9 ignor\u00e9e.
+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.
-IncompleteParsing_1              = La lecture de \u00ab\u202f{0}\u202f\u00bb a \u00e9t\u00e9 faite, mais en ignorant certains \u00e9l\u00e9ments.
-InsertDuration_2                 = {0} enregistrements ont \u00e9t\u00e9 ajout\u00e9s en {1} secondes.
 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.
-JNDINotSpecified_1               = Aucun objet n\u2019est associ\u00e9 au nom JNDI \u00ab\u202f{0}\u202f\u00bb.
 LoadingDatumShiftFile_1          = Chargement du fichier de changement de r\u00e9f\u00e9rentiel \u00ab\u202f{0}\u202f\u00bb.
-LocalesDiscarded                 = Des textes ont \u00e9t\u00e9 ignor\u00e9s pour certaines langues.
-OptionalModuleNotFound_1         = Le module optionnel \u00ab\u202f{0}\u202f\u00bb a \u00e9t\u00e9 demand\u00e9 mais n\u2019a pas \u00e9t\u00e9 trouv\u00e9.
-PropertyHiddenBy_2               = La propri\u00e9t\u00e9 \u00ab\u202f{0}\u202f\u00bb est masqu\u00e9e par \u00ab\u202f{1}\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.
-NonConformFormatting_1           = Cette \u00e9criture de \u00ab\u202f{0}\u202f\u00bb d\u00e9vie du format standard.
 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.
-UnknownElementsInText            = Le texte contient des \u00e9l\u00e9ments inconnus\u00a0:
-UnknownKeywordInRecord_2         = La lecture de \u00ab\u202f{0}\u202f\u00bb a \u00e9t\u00e9 faite, mais en ignorant certains enregistrements \u00e0 cause de mots-cl\u00e9s non reconnus: {1}
-UnparsableValueStoredAsText_2    = La valeur \u00ab\u202f{1}\u202f\u00bb ne peut pas \u00eatre interpr\u00e9t\u00e9e comme une instance de \u2018{0}\u2019. Elle est donc m\u00e9moris\u00e9e sous sa forme textuelle, mais sera ignor\u00e9e par certains traitements.

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/SignReversalComment.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/SignReversalComment.java?rev=1762678&r1=1762677&r2=1762678&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/SignReversalComment.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/SignReversalComment.java [UTF-8] Wed Sep 28 15:08:45 2016
@@ -20,7 +20,6 @@ import java.util.Locale;
 import java.io.Serializable;
 import java.io.ObjectStreamException;
 import org.apache.sis.util.iso.AbstractInternationalString;
-import org.apache.sis.util.resources.Messages;
 
 
 /**
@@ -73,9 +72,9 @@ public final class SignReversalComment e
      */
     @Override
     public String toString(final Locale locale) {
-        return Messages.getResources(locale).getString(opposite
-                ? Messages.Keys.InverseOperationUsesOppositeSign
-                : Messages.Keys.InverseOperationUsesSameSign);
+        return Resources.getResources(locale).getString(opposite
+                ? Resources.Keys.InverseOperationUsesOppositeSign
+                : Resources.Keys.InverseOperationUsesSameSign);
     }
 
     /**

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=1762678&r1=1762677&r2=1762678&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 15:08:45 2016
@@ -24,9 +24,9 @@ import java.nio.ByteBuffer;
 import java.nio.channels.ReadableByteChannel;
 import org.opengis.util.FactoryException;
 import org.apache.sis.util.resources.Errors;
-import org.apache.sis.util.resources.Messages;
 import org.apache.sis.util.logging.Logging;
 import org.apache.sis.internal.system.Loggers;
+import org.apache.sis.internal.referencing.Resources;
 import org.apache.sis.referencing.factory.FactoryDataException;
 import org.apache.sis.referencing.factory.MissingFactoryResourceException;
 
@@ -146,7 +146,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 = Messages.getResources(null).getLogRecord(Level.FINE, Messages.Keys.LoadingDatumShiftFile_1, file);
+        final LogRecord record = Resources.getResources(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/internal/referencing/provider/Equirectangular.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/Equirectangular.java?rev=1762678&r1=1762677&r2=1762678&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/Equirectangular.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/Equirectangular.java [UTF-8] Wed Sep 28 15:08:45 2016
@@ -32,9 +32,9 @@ import org.apache.sis.referencing.operat
 import org.apache.sis.referencing.operation.transform.ContextualParameters;
 import org.apache.sis.referencing.operation.transform.MathTransforms;
 import org.apache.sis.internal.referencing.j2d.ParameterizedAffine;
+import org.apache.sis.internal.referencing.Resources;
 import org.apache.sis.internal.util.DoubleDouble;
 import org.apache.sis.internal.util.Constants;
-import org.apache.sis.util.resources.Messages;
 
 import static java.lang.Math.*;
 
@@ -173,7 +173,7 @@ public final class Equirectangular exten
                 .addName(Citations.NETCDF,  "latitude_of_projection_origin")
                 .addName(Citations.GEOTIFF, "ProjCenterLat")
                 .addName(Citations.PROJ4,   "lat_0")
-                .setRemarks(Messages.formatInternational(Messages.Keys.ConstantProjParameterValue_1, 0))
+                .setRemarks(Resources.formatInternational(Resources.Keys.ConstantProjParameterValue_1, 0))
                 .setRequired(false));
 
         // Do not declare the ESRI "Equidistant_Cylindrical" projection name below,

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/LambertConformalWest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/LambertConformalWest.java?rev=1762678&r1=1762677&r2=1762678&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/LambertConformalWest.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/LambertConformalWest.java [UTF-8] Wed Sep 28 15:08:45 2016
@@ -19,8 +19,8 @@ package org.apache.sis.internal.referenc
 import javax.xml.bind.annotation.XmlTransient;
 import org.opengis.parameter.ParameterDescriptor;
 import org.opengis.parameter.ParameterDescriptorGroup;
+import org.apache.sis.internal.referencing.Resources;
 import org.apache.sis.parameter.ParameterBuilder;
-import org.apache.sis.util.resources.Messages;
 
 
 /**
@@ -68,7 +68,7 @@ public final class LambertConformalWest
         final ParameterBuilder builder = builder();
         FALSE_WESTING = createShift(builder
                 .addNamesAndIdentifiers(LambertConformal1SP.FALSE_EASTING)
-                .setRemarks(Messages.formatInternational(Messages.Keys.MisnamedParameter_1, "False westing")));
+                .setRemarks(Resources.formatInternational(Resources.Keys.MisnamedParameter_1, "False westing")));
 
         PARAMETERS = builder
                 .addIdentifier(IDENTIFIER)

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/MapProjection.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/MapProjection.java?rev=1762678&r1=1762677&r2=1762678&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/MapProjection.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/MapProjection.java [UTF-8] Wed Sep 28 15:08:45 2016
@@ -35,6 +35,7 @@ import org.opengis.parameter.ParameterNo
 import org.opengis.referencing.operation.MathTransform;
 import org.opengis.referencing.operation.MathTransformFactory;
 import org.opengis.referencing.operation.Projection;
+import org.apache.sis.internal.referencing.Resources;
 import org.apache.sis.internal.util.Constants;
 import org.apache.sis.measure.MeasurementRange;
 import org.apache.sis.referencing.NamedIdentifier;
@@ -44,7 +45,6 @@ import org.apache.sis.parameter.DefaultP
 import org.apache.sis.parameter.ParameterBuilder;
 import org.apache.sis.parameter.Parameters;
 import org.apache.sis.util.resources.Errors;
-import org.apache.sis.util.resources.Messages;
 import org.apache.sis.util.Debug;
 
 import static org.opengis.metadata.Identifier.AUTHORITY_KEY;
@@ -355,6 +355,6 @@ public abstract class MapProjection exte
      * @return a remarks saying that the parameter is actually defined in {@code origin}.
      */
     static InternationalString notFormalParameter(final String origin) {
-        return Messages.formatInternational(Messages.Keys.NotFormalProjectionParameter_1, origin);
+        return Resources.formatInternational(Resources.Keys.NotFormalProjectionParameter_1, origin);
     }
 }

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/TransverseMercatorSouth.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/TransverseMercatorSouth.java?rev=1762678&r1=1762677&r2=1762678&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/TransverseMercatorSouth.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/TransverseMercatorSouth.java [UTF-8] Wed Sep 28 15:08:45 2016
@@ -22,8 +22,8 @@ import org.opengis.parameter.ParameterDe
 import org.apache.sis.metadata.iso.citation.Citations;
 import org.apache.sis.parameter.ParameterBuilder;
 import org.apache.sis.parameter.Parameters;
+import org.apache.sis.internal.referencing.Resources;
 import org.apache.sis.referencing.operation.projection.NormalizedProjection;
-import org.apache.sis.util.resources.Messages;
 
 
 /**
@@ -59,7 +59,7 @@ public final class TransverseMercatorSou
         final ParameterBuilder builder = builder();
         final ParameterDescriptor<Double> falseSouthing = createShift(builder
                 .addNamesAndIdentifiers(FALSE_NORTHING)
-                .setRemarks(Messages.formatInternational(Messages.Keys.MisnamedParameter_1, "False southing")));
+                .setRemarks(Resources.formatInternational(Resources.Keys.MisnamedParameter_1, "False southing")));
 
         PARAMETERS = builder
                 .addIdentifier(IDENTIFIER)

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=1762678&r1=1762677&r2=1762678&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 15:08:45 2016
@@ -29,10 +29,10 @@ import org.apache.sis.util.Debug;
 import org.apache.sis.util.Classes;
 import org.apache.sis.util.iso.DefaultNameSpace;
 import org.apache.sis.util.resources.Vocabulary;
-import org.apache.sis.util.resources.Messages;
 import org.apache.sis.util.logging.Logging;
 import org.apache.sis.internal.system.Loggers;
 import org.apache.sis.internal.metadata.NameMeaning;
+import org.apache.sis.internal.referencing.Resources;
 
 // Branch-dependent imports
 import java.util.Objects;
@@ -261,7 +261,7 @@ final class AuthorityFactoryIdentifier {
      * @param used The factory which will be used.
      */
     void logConflict(final AuthorityFactory used) {
-        log(Messages.getResources(null).getLogRecord(Level.WARNING, Messages.Keys.IgnoredServiceProvider_3,
+        log(Resources.getResources(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(Messages.getResources(null).getLogRecord(Level.WARNING, Messages.Keys.FallbackDefaultFactoryVersion_2,
+        log(Resources.getResources(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/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=1762678&r1=1762677&r2=1762678&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 15:08:45 2016
@@ -52,12 +52,12 @@ import org.apache.sis.internal.util.Coll
 import org.apache.sis.internal.util.LazySet;
 import org.apache.sis.internal.util.LazySynchronizedIterator;
 import org.apache.sis.internal.util.SetOfUnknownSize;
+import org.apache.sis.internal.referencing.Resources;
 import org.apache.sis.util.ArraysExt;
 import org.apache.sis.util.CharSequences;
 import org.apache.sis.util.ArgumentChecks;
 import org.apache.sis.util.logging.Logging;
 import org.apache.sis.util.resources.Errors;
-import org.apache.sis.util.resources.Messages;
 import org.apache.sis.util.iso.DefaultNameSpace;
 import org.apache.sis.util.collection.BackingStoreException;
 
@@ -1452,8 +1452,8 @@ 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 = Messages.getResources(null).getLogRecord(Level.WARNING,
-                Messages.Keys.MismatchedOperationFactories_2, sourceCRS, targetCRS);
+        final LogRecord record = Resources.getResources(null).getLogRecord(Level.WARNING,
+                Resources.Keys.MismatchedOperationFactories_2, sourceCRS, targetCRS);
         record.setLoggerName(Loggers.CRS_FACTORY);
         Logging.log(MultiAuthoritiesFactory.class, "createFromCoordinateReferenceSystemCodes", record);
         return super.createFromCoordinateReferenceSystemCodes(sourceCRS, targetCRS);

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=1762678&r1=1762677&r2=1762678&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 15:08:45 2016
@@ -73,6 +73,7 @@ import org.apache.sis.internal.referenci
 import org.apache.sis.internal.referencing.EPSGParameterDomain;
 import org.apache.sis.internal.referencing.ReferencingUtilities;
 import org.apache.sis.internal.referencing.SignReversalComment;
+import org.apache.sis.internal.referencing.Resources;
 import org.apache.sis.internal.referencing.Formulas;
 import org.apache.sis.internal.system.Loggers;
 import org.apache.sis.internal.system.Semaphores;
@@ -101,7 +102,6 @@ import org.apache.sis.referencing.factor
 import org.apache.sis.util.iso.SimpleInternationalString;
 import org.apache.sis.util.iso.DefaultNameSpace;
 import org.apache.sis.util.resources.Vocabulary;
-import org.apache.sis.util.resources.Messages;
 import org.apache.sis.util.resources.Errors;
 import org.apache.sis.util.logging.Logging;
 import org.apache.sis.util.ArgumentChecks;
@@ -462,7 +462,7 @@ addURIs:    for (int i=0; ; i++) {
                     case 2: {
                         url = metadata.getURL();
                         function = OnLineFunction.valueOf(CONNECTION);
-                        description = Messages.formatInternational(Messages.Keys.DataBase_4,
+                        description = Resources.formatInternational(Resources.Keys.GeodeticDataBase_4,
                                 Constants.EPSG, version, metadata.getDatabaseProductName(),
                                 Version.valueOf(metadata.getDatabaseMajorVersion(),
                                                 metadata.getDatabaseMinorVersion()));
@@ -1041,7 +1041,7 @@ addURIs:    for (int i=0; ; i++) {
             }
         }
         if (!quiet) {
-            LogRecord record = Messages.getResources(locale).getLogRecord(Level.WARNING, Messages.Keys.DeprecatedCode_3,
+            LogRecord record = Resources.getResources(locale).getLogRecord(Level.WARNING, Resources.Keys.DeprecatedCode_3,
                     Constants.EPSG + DefaultNameSpace.DEFAULT_SEPARATOR + code, replacedBy, reason);
             record.setLoggerName(Loggers.CRS_FACTORY);
             Logging.log(EPSGDataAccess.class, method, record);
@@ -1893,8 +1893,8 @@ addURIs:    for (int i=0; ; i++) {
                     if (!Double.isNaN(semiMinorAxis)) {
                         // Both 'inverseFlattening' and 'semiMinorAxis' are defined.
                         // Log a warning and create the ellipsoid using the inverse flattening.
-                        final LogRecord record = Messages.getResources(getLocale()).getLogRecord(Level.WARNING,
-                                Messages.Keys.AmbiguousEllipsoid_1, Constants.EPSG + DefaultNameSpace.DEFAULT_SEPARATOR + code);
+                        final LogRecord record = Resources.getResources(getLocale()).getLogRecord(Level.WARNING,
+                                Resources.Keys.AmbiguousEllipsoid_1, Constants.EPSG + DefaultNameSpace.DEFAULT_SEPARATOR + code);
                         record.setLoggerName(Loggers.CRS_FACTORY);
                         Logging.log(EPSGDataAccess.class, "createEllipsoid", record);
                     }

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/DefaultMathTransformFactory.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/DefaultMathTransformFactory.java?rev=1762678&r1=1762677&r2=1762678&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/DefaultMathTransformFactory.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/DefaultMathTransformFactory.java [UTF-8] Wed Sep 28 15:08:45 2016
@@ -62,6 +62,7 @@ import org.apache.sis.internal.referenci
 import org.apache.sis.internal.referencing.provider.AbstractProvider;
 import org.apache.sis.internal.referencing.provider.VerticalOffset;
 import org.apache.sis.internal.referencing.provider.Providers;
+import org.apache.sis.internal.referencing.Resources;
 import org.apache.sis.internal.system.Loggers;
 import org.apache.sis.metadata.iso.citation.Citations;
 import org.apache.sis.parameter.DefaultParameterValueGroup;
@@ -79,7 +80,6 @@ import org.apache.sis.util.collection.We
 import org.apache.sis.util.iso.AbstractFactory;
 import org.apache.sis.util.logging.Logging;
 import org.apache.sis.util.resources.Errors;
-import org.apache.sis.util.resources.Messages;
 
 
 /**
@@ -808,8 +808,8 @@ public class DefaultMathTransformFactory
                 }
                 final boolean isIvfDefinitive;
                 if (mismatchedParam != null) {
-                    final LogRecord record = Messages.getResources(null).getLogRecord(Level.WARNING,
-                            Messages.Keys.MismatchedEllipsoidAxisLength_3, ellipsoid.getName().getCode(),
+                    final LogRecord record = Resources.getResources(null).getLogRecord(Level.WARNING,
+                            Resources.Keys.MismatchedEllipsoidAxisLength_3, ellipsoid.getName().getCode(),
                             mismatchedParam.getDescriptor().getName().getCode(), mismatchedValue);
                     record.setLoggerName(Loggers.COORDINATE_OPERATION);
                     Logging.log(DefaultMathTransformFactory.class, "createParameterizedTransform", record);

Modified: sis/branches/JDK8/core/sis-utility/pom.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-utility/pom.xml?rev=1762678&r1=1762677&r2=1762678&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-utility/pom.xml (original)
+++ sis/branches/JDK8/core/sis-utility/pom.xml Wed Sep 28 15:08:45 2016
@@ -114,20 +114,6 @@ Miscellaneous utilities.
   <build>
     <plugins>
 
-      <!-- Compile properties files into resources UTF files. -->
-      <plugin>
-        <groupId>org.apache.sis.core</groupId>
-        <artifactId>sis-build-helper</artifactId>
-        <version>${sis.plugin.version}</version>
-        <executions>
-          <execution>
-            <goals>
-              <goal>compile-resources</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-
       <!-- Package as OSGi bundle -->
       <plugin>
         <groupId>org.apache.felix</groupId>

Modified: sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/resources/Messages.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/resources/Messages.java?rev=1762678&r1=1762677&r2=1762678&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/resources/Messages.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/resources/Messages.java [UTF-8] Wed Sep 28 15:08:45 2016
@@ -61,229 +61,153 @@ public final class Messages extends Inde
         public static final short AlreadyRegistered_2 = 0;
 
         /**
-         * Ambiguity between inverse flattening and semi minor axis length for “{0}”. Using inverse
-         * flattening.
-         */
-        public static final short AmbiguousEllipsoid_1 = 30;
-
-        /**
          * Can not create the {0} schema in database.
          */
-        public static final short CanNotCreateSchema_1 = 41;
+        public static final short CanNotCreateSchema_1 = 1;
 
         /**
          * Can not instantiate the object of type ‘{0}’ identified by “{1}”. Reason is:{2}
          */
-        public static final short CanNotInstantiateForIdentifier_3 = 35;
+        public static final short CanNotInstantiateForIdentifier_3 = 2;
 
         /**
          * Changed the container capacity from {0} to {1} elements.
          */
-        public static final short ChangedContainerCapacity_2 = 1;
+        public static final short ChangedContainerCapacity_2 = 3;
 
         /**
          * Configuration of “{0}” received on {1} in {2} seconds.
          */
-        public static final short ConfigurationOf_3 = 31;
-
-        /**
-         * This result indicates if a datum shift method has been applied.
-         */
-        public static final short ConformanceMeansDatumShift = 8;
-
-        /**
-         * This parameter is shown for completeness, but should never have a value different than {0}
-         * for this projection.
-         */
-        public static final short ConstantProjParameterValue_1 = 11;
+        public static final short ConfigurationOf_3 = 4;
 
         /**
          * Created an instance of ‘{0}’ from the “{1}” identifier in {2} seconds.
          */
-        public static final short CreateDurationFromIdentifier_3 = 33;
+        public static final short CreateDurationFromIdentifier_3 = 5;
 
         /**
          * Created an instance of ‘{0}’ in {1} seconds.
          */
-        public static final short CreateDuration_2 = 34;
+        public static final short CreateDuration_2 = 6;
 
         /**
          * Created an instance of ‘{0}’ named “{1}” with the “{2}” identifier.
          */
-        public static final short CreatedIdentifiedObject_3 = 17;
+        public static final short CreatedIdentifiedObject_3 = 7;
 
         /**
          * Created an instance of ‘{0}’ named “{1}”.
          */
-        public static final short CreatedNamedObject_2 = 16;
+        public static final short CreatedNamedObject_2 = 8;
 
         /**
          * Creating {0} schema in the “{1}” database.
          */
-        public static final short CreatingSchema_2 = 39;
-
-        /**
-         * {0} dataset version {1} on “{2}” version {3}.
-         */
-        public static final short DataBase_4 = 28;
+        public static final short CreatingSchema_2 = 9;
 
         /**
          * The {0} environment variable is defined, but the given “{1}” value is not an existing
          * directory.
          */
-        public static final short DataDirectoryDoesNotExist_2 = 20;
+        public static final short DataDirectoryDoesNotExist_2 = 10;
 
         /**
          * Apache SIS is not authorized to access the “{1}” sub-directory in the directory given by the
          * {0} environment variable.
          */
-        public static final short DataDirectoryNotAccessible_2 = 26;
+        public static final short DataDirectoryNotAccessible_2 = 11;
 
         /**
          * Apache SIS is not authorized to read information given by the “{0}” environment variable.
          */
-        public static final short DataDirectoryNotAuthorized_1 = 25;
+        public static final short DataDirectoryNotAuthorized_1 = 12;
 
         /**
          * The “{1}” directory specified by the {0} environment variable exists but is not readable.
          */
-        public static final short DataDirectoryNotReadable_2 = 21;
+        public static final short DataDirectoryNotReadable_2 = 13;
 
         /**
          * The “{0}” environment variable is not set.
          */
-        public static final short DataDirectoryNotSpecified_1 = 22;
+        public static final short DataDirectoryNotSpecified_1 = 14;
 
         /**
          * Apache SIS can not write in the “{1}” directory given by the {0} environment variable.
          */
-        public static final short DataDirectoryNotWritable_2 = 23;
+        public static final short DataDirectoryNotWritable_2 = 15;
 
         /**
          * Environment variable {0} specifies the “{1}” data directory.
          */
-        public static final short DataDirectory_2 = 24;
-
-        /**
-         * Code “{0}” is deprecated and replaced by code {1}. Reason is: {2}
-         */
-        public static final short DeprecatedCode_3 = 29;
+        public static final short DataDirectory_2 = 16;
 
         /**
          * Property “{0}” has been discarded in favor of “{1}”, because those two properties are
          * mutually exclusive.
          */
-        public static final short DiscardedExclusiveProperty_2 = 2;
-
-        /**
-         * There is no factory for version {1} of “{0}” authority. Fallback on default version for
-         * objects creation.
-         */
-        public static final short FallbackDefaultFactoryVersion_2 = 38;
+        public static final short DiscardedExclusiveProperty_2 = 17;
 
         /**
          * Ignored properties after the first occurrence of ‘{0}’.
          */
-        public static final short IgnoredPropertiesAfterFirst_1 = 6;
+        public static final short IgnoredPropertiesAfterFirst_1 = 18;
 
         /**
          * Ignored property associated to ‘{0}’.
          */
-        public static final short IgnoredPropertyAssociatedTo_1 = 7;
-
-        /**
-         * More than one service provider of type ‘{0}’ are declared for “{1}”. Only the first provider
-         * (an instance of ‘{2}’) will be used.
-         */
-        public static final short IgnoredServiceProvider_3 = 36;
+        public static final short IgnoredPropertyAssociatedTo_1 = 19;
 
         /**
          * Parsing of “{0}” done, but some elements were ignored.
          */
-        public static final short IncompleteParsing_1 = 14;
+        public static final short IncompleteParsing_1 = 20;
 
         /**
          * Inserted {0} records in {1} seconds.
          */
-        public static final short InsertDuration_2 = 40;
-
-        /**
-         * Inverse operation uses this parameter value with opposite sign.
-         */
-        public static final short InverseOperationUsesOppositeSign = 42;
-
-        /**
-         * Inverse operation uses the same parameter value.
-         */
-        public static final short InverseOperationUsesSameSign = 43;
+        public static final short InsertDuration_2 = 21;
 
         /**
          * No object associated to the “{0}” JNDI name.
          */
-        public static final short JNDINotSpecified_1 = 32;
-
-        /**
-         * Loading datum shift file “{0}”.
-         */
-        public static final short LoadingDatumShiftFile_1 = 27;
+        public static final short JNDINotSpecified_1 = 22;
 
         /**
          * Text were discarded for some locales.
          */
-        public static final short LocalesDiscarded = 3;
-
-        /**
-         * The “{1}” parameter could have been omitted. But it has been given a value of {2} which does
-         * not match the definition of the “{0}” ellipsoid.
-         */
-        public static final short MismatchedEllipsoidAxisLength_3 = 9;
-
-        /**
-         * No coordinate operation from “{0}” to “{1}” because of mismatched factories.
-         */
-        public static final short MismatchedOperationFactories_2 = 37;
-
-        /**
-         * Despite its name, this parameter is effectively “{0}”.
-         */
-        public static final short MisnamedParameter_1 = 18;
+        public static final short LocalesDiscarded = 23;
 
         /**
          * This “{0}” formatting is a departure from standard format.
          */
-        public static final short NonConformFormatting_1 = 15;
-
-        /**
-         * This parameter borrowed from the “{0}” projection is not formally a parameter of this
-         * projection.
-         */
-        public static final short NotFormalProjectionParameter_1 = 10;
+        public static final short NonConformFormatting_1 = 24;
 
         /**
          * Optional module “{0}” requested but not found.
          */
-        public static final short OptionalModuleNotFound_1 = 12;
+        public static final short OptionalModuleNotFound_1 = 25;
 
         /**
          * Property “{0}” is hidden by “{1}”.
          */
-        public static final short PropertyHiddenBy_2 = 4;
+        public static final short PropertyHiddenBy_2 = 26;
 
         /**
          * The text contains unknown elements:
          */
-        public static final short UnknownElementsInText = 13;
+        public static final short UnknownElementsInText = 27;
 
         /**
          * Loading of “{0}” done, but some records were ignored because of unrecognized keywords: {1}
          */
-        public static final short UnknownKeywordInRecord_2 = 19;
+        public static final short UnknownKeywordInRecord_2 = 28;
 
         /**
          * Can not parse “{1}” as an instance of ‘{0}’. The value is stored as plain text instead, but
          * will be ignored by some processing.
          */
-        public static final short UnparsableValueStoredAsText_2 = 5;
+        public static final short UnparsableValueStoredAsText_2 = 29;
     }
 
     /**

Modified: sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/resources/Messages.properties
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/resources/Messages.properties?rev=1762678&r1=1762677&r2=1762678&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/resources/Messages.properties [ISO-8859-1] (original)
+++ sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/resources/Messages.properties [ISO-8859-1] Wed Sep 28 15:08:45 2016
@@ -15,20 +15,16 @@
 # limitations under the License.
 #
 AlreadyRegistered_2              = {0} \u201c{1}\u201d is already registered. The second instance will be ignored.
-AmbiguousEllipsoid_1             = Ambiguity between inverse flattening and semi minor axis length for \u201c{0}\u201d. Using inverse flattening.
 CanNotCreateSchema_1             = Can not create the {0} schema in database.
 # In following message, the first characters of parameter {2} should be a line separator ("\r", "\n" or "\r\n").
 CanNotInstantiateForIdentifier_3 = Can not instantiate the object of type \u2018{0}\u2019 identified by \u201c{1}\u201d. Reason is:{2}
 ChangedContainerCapacity_2       = Changed the container capacity from {0} to {1} elements.
 ConfigurationOf_3                = Configuration of \u201c{0}\u201d received on {1} in {2} seconds.
-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.
 CreatedNamedObject_2             = Created an instance of \u2018{0}\u2019 named \u201c{1}\u201d.
 CreatedIdentifiedObject_3        = Created an instance of \u2018{0}\u2019 named \u201c{1}\u201d with the \u201c{2}\u201d identifier.
 CreateDuration_2                 = Created an instance of \u2018{0}\u2019 in {1} seconds.
 CreateDurationFromIdentifier_3   = Created an instance of \u2018{0}\u2019 from the \u201c{1}\u201d identifier in {2} seconds.
 CreatingSchema_2                 = Creating {0} schema in the \u201c{1}\u201d database.
-DataBase_4                       = {0} dataset version {1} on \u201c{2}\u201d version {3}.
 DataDirectory_2                  = Environment variable {0} specifies the \u201c{1}\u201d data directory.
 DataDirectoryDoesNotExist_2      = The {0} environment variable is defined, but the given \u201c{1}\u201d value is not an existing directory.
 DataDirectoryNotAccessible_2     = Apache SIS is not authorized to access the \u201c{1}\u201d sub-directory in the directory given by the {0} environment variable.
@@ -36,26 +32,16 @@ DataDirectoryNotAuthorized_1     = Apach
 DataDirectoryNotReadable_2       = The \u201c{1}\u201d directory specified by the {0} environment variable exists but is not readable.
 DataDirectoryNotSpecified_1      = The \u201c{0}\u201d environment variable is not set.
 DataDirectoryNotWritable_2       = Apache SIS can not write in the \u201c{1}\u201d directory given by the {0} environment variable.
-DeprecatedCode_3                 = Code \u201c{0}\u201d is deprecated and replaced by code {1}. Reason is: {2}
 DiscardedExclusiveProperty_2     = Property \u201c{0}\u201d has been discarded in favor of \u201c{1}\u201d, because those two properties are mutually exclusive.
-FallbackDefaultFactoryVersion_2  = There is no factory for version {1} of \u201c{0}\u201d authority. Fallback on default version for objects creation.
 IgnoredPropertiesAfterFirst_1    = Ignored properties after the first occurrence of \u2018{0}\u2019.
 IgnoredPropertyAssociatedTo_1    = Ignored property associated to \u2018{0}\u2019.
-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.
 IncompleteParsing_1              = Parsing of \u201c{0}\u201d done, but some elements were ignored.
 InsertDuration_2                 = Inserted {0} records in {1} seconds.
-InverseOperationUsesSameSign     = Inverse operation uses the same parameter value.
-InverseOperationUsesOppositeSign = Inverse operation uses this parameter value with opposite sign.
 JNDINotSpecified_1               = No object associated to the \u201c{0}\u201d JNDI name.
-LoadingDatumShiftFile_1          = Loading datum shift file \u201c{0}\u201d.
 LocalesDiscarded                 = Text were discarded for some locales.
 OptionalModuleNotFound_1         = Optional module \u201c{0}\u201d requested but not found.
 PropertyHiddenBy_2               = Property \u201c{0}\u201d is hidden by \u201c{1}\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.
 NonConformFormatting_1           = This \u201c{0}\u201d formatting is a departure from standard format.
-NotFormalProjectionParameter_1   = This parameter borrowed from the \u201c{0}\u201d projection is not formally a parameter of this projection.
 UnknownElementsInText            = The text contains unknown elements:
 UnknownKeywordInRecord_2         = Loading of \u201c{0}\u201d done, but some records were ignored because of unrecognized keywords: {1}
 UnparsableValueStoredAsText_2    = 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.

Modified: sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/resources/Messages_fr.properties
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/resources/Messages_fr.properties?rev=1762678&r1=1762677&r2=1762678&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/resources/Messages_fr.properties [ISO-8859-1] (original)
+++ sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/resources/Messages_fr.properties [ISO-8859-1] Wed Sep 28 15:08:45 2016
@@ -22,20 +22,16 @@
 #   U+00A0 NO-BREAK SPACE         before  :
 #
 AlreadyRegistered_2              = Le {0} \u00ab\u202f{1}\u202f\u00bb est d\u00e9j\u00e0 inscrit dans le registre. La seconde instance sera ignor\u00e9e.
-AmbiguousEllipsoid_1             = Ambigu\u00eft\u00e9 entre l\u2019aplatissement et la longueur du semi-axe mineur pour \u00ab\u202f{0}\u202f\u00bb. Utilise l\u2019aplatissement.
 CanNotCreateSchema_1             = Ne peut pas cr\u00e9er le sch\u00e9ma {0} dans la base de donn\u00e9es.
 # In following message, the first characters of parameter {2} should be a line separator ("\r", "\n" or "\r\n").
 CanNotInstantiateForIdentifier_3 = Ne peut pas cr\u00e9er l\u2019objet de type \u2018{0}\u2019 identifi\u00e9 par \u00ab\u202f{1}\u202f\u00bb. La raison est\u00a0:{2}
 ChangedContainerCapacity_2       = Changement de la capacit\u00e9 du conteneur de {0} vers {1} \u00e9l\u00e9ments.
 ConfigurationOf_3                = Configuration de \u00ab\u202f{0}\u202f\u00bb re\u00e7ue le {1} en {2} secondes.
-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.
 CreatedNamedObject_2             = Cr\u00e9ation d\u2019une instance de \u2018{0}\u2019 nomm\u00e9e \u00ab\u202f{1}\u202f\u00bb.
 CreatedIdentifiedObject_3        = Cr\u00e9ation d\u2019une instance de \u2018{0}\u2019 nomm\u00e9e \u00ab\u202f{1}\u202f\u00bb avec l\u2019identifiant \u00ab\u202f{2}\u202f\u00bb.
 CreateDuration_2                 = Cr\u00e9ation d\u2019une instance de \u2018{0}\u2019 en {1} secondes.
 CreateDurationFromIdentifier_3   = Cr\u00e9ation d\u2019une instance de \u2018{0}\u2019 \u00e0 partir de l\u2019identifiant \u00ab\u202f{1}\u202f\u00bb en {2} secondes.
 CreatingSchema_2                 = Cr\u00e9ation du sch\u00e9ma {0} dans la base de donn\u00e9es \u00ab\u202f{1}\u202f\u00bb.
-DataBase_4                       = Base de donn\u00e9es {0} version {1} sur \u00ab\u202f{2}\u202f\u00bb version {3}.
 DataDirectory_2                  = La variable environnementale {0} sp\u00e9cifie le r\u00e9pertoire de donn\u00e9es \u00ab\u202f{1}\u202f\u00bb.
 DataDirectoryDoesNotExist_2      = La variable environnementale {0} est bien d\u00e9finie, mais sa valeur \u00ab\u202f{1}\u202f\u00bb n\u2019est pas un r\u00e9pertoire existant.
 DataDirectoryNotAccessible_2     = Apache SIS n\u2019a pas l\u2019autorisation d\u2019acc\u00e9der au sous-r\u00e9pertoire \u00ab\u202f{1}\u202f\u00bb dans le r\u00e9pertoire donn\u00e9 par la variable environnementale {0}.
@@ -43,26 +39,16 @@ DataDirectoryNotAuthorized_1     = Apach
 DataDirectoryNotReadable_2       = Le r\u00e9pertoire \u00ab\u202f{1}\u202f\u00bb sp\u00e9cifi\u00e9 par la variable environnementale {0} existe bien mais ne peut pas \u00eatre lu.
 DataDirectoryNotSpecified_1      = La variable environnementale \u00ab\u202f{0}\u202f\u00bb n\u2019est pas d\u00e9finie.
 DataDirectoryNotWritable_2       = Apache SIS ne peut pas \u00e9crire dans le r\u00e9pertoire \u00ab\u202f{1}\u202f\u00bb sp\u00e9cifi\u00e9e par la variable environnementale {0}.
-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}
 DiscardedExclusiveProperty_2     = La propri\u00e9t\u00e9 \u00ab\u202f{0}\u202f\u00bb a \u00e9t\u00e9 \u00e9cart\u00e9e en faveur de \u00ab\u202f{1}\u202f\u00bb, parce que ces deux propri\u00e9t\u00e9s sont mutuellement exclusives.
-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.
 IgnoredPropertiesAfterFirst_1    = Des propri\u00e9t\u00e9s ont \u00e9t\u00e9 ignor\u00e9es apr\u00e8s la premi\u00e8re occurrence de \u2018{0}\u2019.
 IgnoredPropertyAssociatedTo_1    = Une propri\u00e9t\u00e9 associ\u00e9e \u00e0 \u2018{0}\u2019 a \u00e9t\u00e9 ignor\u00e9e.
-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.
 IncompleteParsing_1              = La lecture de \u00ab\u202f{0}\u202f\u00bb a \u00e9t\u00e9 faite, mais en ignorant certains \u00e9l\u00e9ments.
 InsertDuration_2                 = {0} enregistrements ont \u00e9t\u00e9 ajout\u00e9s en {1} secondes.
-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.
 JNDINotSpecified_1               = Aucun objet n\u2019est associ\u00e9 au nom JNDI \u00ab\u202f{0}\u202f\u00bb.
-LoadingDatumShiftFile_1          = Chargement du fichier de changement de r\u00e9f\u00e9rentiel \u00ab\u202f{0}\u202f\u00bb.
 LocalesDiscarded                 = Des textes ont \u00e9t\u00e9 ignor\u00e9s pour certaines langues.
 OptionalModuleNotFound_1         = Le module optionnel \u00ab\u202f{0}\u202f\u00bb a \u00e9t\u00e9 demand\u00e9 mais n\u2019a pas \u00e9t\u00e9 trouv\u00e9.
 PropertyHiddenBy_2               = La propri\u00e9t\u00e9 \u00ab\u202f{0}\u202f\u00bb est masqu\u00e9e par \u00ab\u202f{1}\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.
 NonConformFormatting_1           = Cette \u00e9criture de \u00ab\u202f{0}\u202f\u00bb d\u00e9vie du format standard.
-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.
 UnknownElementsInText            = Le texte contient des \u00e9l\u00e9ments inconnus\u00a0:
 UnknownKeywordInRecord_2         = La lecture de \u00ab\u202f{0}\u202f\u00bb a \u00e9t\u00e9 faite, mais en ignorant certains enregistrements \u00e0 cause de mots-cl\u00e9s non reconnus: {1}
 UnparsableValueStoredAsText_2    = La valeur \u00ab\u202f{1}\u202f\u00bb ne peut pas \u00eatre interpr\u00e9t\u00e9e comme une instance de \u2018{0}\u2019. Elle est donc m\u00e9moris\u00e9e sous sa forme textuelle, mais sera ignor\u00e9e par certains traitements.



Mime
View raw message