This is an automated email from the ASF dual-hosted git repository.
desruisseaux pushed a commit to branch geoapi-4.0
in repository https://gitbox.apache.org/repos/asf/sis.git
commit 224af42b977889c9906fa03343a3fb6bdb7bfbcd
Author: Martin Desruisseaux <martin.desruisse...@geomatys.com>
AuthorDate: Sat Dec 16 12:14:02 2023 +0100
Move a localized resource which was declared in the wrong bundle.
---
.../main/org/apache/sis/metadata/internal/Resources.java | 7 +------
.../main/org/apache/sis/metadata/internal/Resources.properties | 1 -
.../main/org/apache/sis/metadata/internal/Resources_fr.properties | 1 -
.../main/org/apache/sis/io/wkt/Formatter.java | 2 +-
.../main/org/apache/sis/referencing/internal/Resources.java | 5 +++++
.../main/org/apache/sis/referencing/internal/Resources.properties | 1 +
.../org/apache/sis/referencing/internal/Resources_fr.properties | 1 +
7 files changed, 9 insertions(+), 9 deletions(-)
diff --git
a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/internal/Resources.java
b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/internal/Resources.java
index fcec478484..bb29341bfa 100644
---
a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/internal/Resources.java
+++
b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/internal/Resources.java
@@ -68,11 +68,6 @@ public class Resources extends IndexedResourceBundle {
*/
public static final short ElementAlreadyInitialized_1 = 2;
- /**
- * … {0} elements omitted …
- */
- public static final short ElementsOmitted_1 = 4;
-
/**
* Illegal class `{1}`. Specify the `{0}` interface instead.
*/
@@ -82,7 +77,7 @@ public class Resources extends IndexedResourceBundle {
* No {0,choice,0#horizontal|1#vertical|2#temporal|3#spatial or
temporal} dimension has been
* found in “{1}”.
*/
- public static final short MissingDimension_2 = 10;
+ public static final short MissingDimension_2 = 4;
/**
* Multiline record
diff --git
a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/internal/Resources.properties
b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/internal/Resources.properties
index e930fb1f25..0a6f28d9a0 100644
---
a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/internal/Resources.properties
+++
b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/internal/Resources.properties
@@ -22,7 +22,6 @@
BoxCrossesAntiMeridian = Bounding box crosses the antimeridian.
ConnectionAlreadyInitialized_1 = Connection to \u201c{0}\u201d database is
already initialized.
ElementAlreadyInitialized_1 = This metadata element is already
initialized with value \u201c{0}\u201d.
-ElementsOmitted_1 = \u2026 {0} elements omitted \u2026
ExpectedInterface_2 = Illegal class `{1}`. Specify the `{0}`
interface instead.
MissingDimension_2 = No
{0,choice,0#horizontal|1#vertical|2#temporal|3#spatial or temporal} dimension
has been found in \u201c{1}\u201d.
MultilineRecord = Multiline record
diff --git
a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/internal/Resources_fr.properties
b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/internal/Resources_fr.properties
index 885f3f1868..c75fe798ec 100644
---
a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/internal/Resources_fr.properties
+++
b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/internal/Resources_fr.properties
@@ -27,7 +27,6 @@
BoxCrossesAntiMeridian = La bo\u00eete englobante traverse
l\u2019antim\u00e9ridien.
ConnectionAlreadyInitialized_1 = La connexion \u00e0 la base de
donn\u00e9es \u00ab\u202f{0}\u202f\u00bb est d\u00e9j\u00e0 initialis\u00e9e.
ElementAlreadyInitialized_1 = Cet \u00e9l\u00e9ment de
m\u00e9ta-donn\u00e9e est d\u00e9j\u00e0 initialis\u00e9 avec la valeur
\u00ab\u202f{0}\u202f\u00bb.
-ElementsOmitted_1 = \u2026 {0} \u00e9l\u00e9ments omis \u2026
ExpectedInterface_2 = La classe `{1}` est ill\u00e9gale.
Sp\u00e9cifiez l\u2019interface `{0}` \u00e0 la place.
MissingDimension_2 = Aucune dimension
{0,choice,0#horizontale|1#verticale|2#temporelle|3#spatiale ou temporelle}
n\u2019a \u00e9t\u00e9 trouv\u00e9e dans \u00ab\u202f{1}\u202f\u00bb.
MultilineRecord = Enregistrement multilignes
diff --git
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/Formatter.java
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/Formatter.java
index 2074da7e8e..a1010e7bd3 100644
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/Formatter.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/Formatter.java
@@ -73,13 +73,13 @@ import org.apache.sis.util.internal.Constants;
import org.apache.sis.util.internal.StandardDateFormat;
import org.apache.sis.system.Configuration;
import org.apache.sis.metadata.simple.SimpleExtent;
-import org.apache.sis.metadata.internal.Resources;
import org.apache.sis.metadata.iso.extent.Extents;
import org.apache.sis.metadata.iso.citation.Citations;
import org.apache.sis.referencing.AbstractIdentifiedObject;
import org.apache.sis.referencing.ImmutableIdentifier;
import org.apache.sis.referencing.util.WKTKeywords;
import org.apache.sis.referencing.util.WKTUtilities;
+import org.apache.sis.referencing.internal.Resources;
import org.apache.sis.geometry.AbstractDirectPosition;
import org.apache.sis.geometry.AbstractEnvelope;
import org.apache.sis.xml.NilObject;
diff --git
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/internal/Resources.java
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/internal/Resources.java
index 7abce1e979..af196a96b9 100644
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/internal/Resources.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/internal/Resources.java
@@ -214,6 +214,11 @@ public class Resources extends IndexedResourceBundle {
*/
public static final short DuplicatedSpatialComponents_1 = 76;
+ /**
+ * … {0} elements omitted …
+ */
+ public static final short ElementsOmitted_1 = 99;
+
/**
* Compound coordinate reference systems should not contain
ellipsoidal height. Use a
* three-dimensional {0,choice,0#geographic|1#projected} system
instead.
diff --git
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/internal/Resources.properties
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/internal/Resources.properties
index 0e27e2af44..a04045bc48 100644
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/internal/Resources.properties
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/internal/Resources.properties
@@ -25,6 +25,7 @@ AmbiguousEllipsoid_1 = Ambiguity between inverse
flattening and sem
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}
+ElementsOmitted_1 = \u2026 {0} elements omitted \u2026
FallbackDefaultFactoryVersion_2 = There is no local registry 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.
diff --git
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/internal/Resources_fr.properties
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/internal/Resources_fr.properties
index ef2324ec12..92be70805c 100644
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/internal/Resources_fr.properties
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/internal/Resources_fr.properties
@@ -30,6 +30,7 @@ AmbiguousEllipsoid_1 = Ambigu\u00eft\u00e9 entre
l\u2019aplatisseme
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}
+ElementsOmitted_1 = \u2026 {0} \u00e9l\u00e9ments omis \u2026
FallbackDefaultFactoryVersion_2 = Il n\u2019y a pas de registre local 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.
