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 8c6d8cca4303be4b0ed9e76cd2bb4b38494a4d81
Author: Martin Desruisseaux <martin.desruisse...@geomatys.com>
AuthorDate: Fri Dec 27 12:41:10 2024 +0100
Remove a duplicated localized resource.
---
.../main/org/apache/sis/image/PlanarImage.java | 2 +-
.../main/org/apache/sis/storage/esri/AsciiGridStore.java | 6 +++---
.../main/org/apache/sis/util/resources/Errors.java | 7 +------
.../main/org/apache/sis/util/resources/Errors.properties | 1 -
.../main/org/apache/sis/util/resources/Errors_fr.properties | 1 -
5 files changed, 5 insertions(+), 12 deletions(-)
diff --git
a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/PlanarImage.java
b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/PlanarImage.java
index 353c67ae10..c30a8fefdf 100644
---
a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/PlanarImage.java
+++
b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/PlanarImage.java
@@ -575,7 +575,7 @@ public abstract class PlanarImage implements RenderedImage {
String message =
Resources.format(Resources.Keys.IncompatibleColorModel);
if (!erroneous.isEmpty()) {
String complement = Classes.getShortClassName(colors);
- complement =
Errors.format(Errors.Keys.IllegalValueForProperty_2, complement, erroneous);
+ complement = Errors.format(Errors.Keys.IllegalPropertyValue_2,
complement, erroneous);
message = Resources.concatenate(message, complement);
}
throw new IllegalArgumentException(message);
diff --git
a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/esri/AsciiGridStore.java
b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/esri/AsciiGridStore.java
index f7de0e522a..3306cc6b20 100644
---
a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/esri/AsciiGridStore.java
+++
b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/esri/AsciiGridStore.java
@@ -300,13 +300,13 @@ cellsize: if (value != null) {
nodataValue = Double.parseDouble(nodataText);
} catch (NumberFormatException e) {
nodataValue = Double.NaN;
-
listeners.warning(messageForProperty(Errors.Keys.IllegalValueForProperty_2,
key), e);
+
listeners.warning(messageForProperty(Errors.Keys.IllegalPropertyValue_2, key),
e);
} else {
nodataValue = DEFAULT_NODATA;
nodataText = "null"; // "NaN" is already
understood by `parseDouble(String)`.
}
} catch (NumberFormatException e) {
- throw new
DataStoreContentException(messageForProperty(Errors.Keys.IllegalValueForProperty_2,
key), e);
+ throw new
DataStoreContentException(messageForProperty(Errors.Keys.IllegalPropertyValue_2,
key), e);
}
/*
* Read the auxiliary PRJ file after we finished parsing the
header file.
@@ -336,7 +336,7 @@ cellsize: if (value != null) {
* Returns the error message for an exception or log record.
* Invoke only in contexts where {@link #input} is known to be non-null.
*
- * @param rk {@link Errors.Keys#IllegalValueForProperty_2} or {@link
Errors.Keys#MissingValueForProperty_2}.
+ * @param rk {@link Errors.Keys#IllegalPropertyValue_2} or {@link
Errors.Keys#MissingValueForProperty_2}.
* @param key key of the header property which was requested.
* @return the message to use in the exception to be thrown or the warning
to be logged.
*/
diff --git
a/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/resources/Errors.java
b/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/resources/Errors.java
index 08388f6247..25fac17dbd 100644
---
a/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/resources/Errors.java
+++
b/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/resources/Errors.java
@@ -460,11 +460,6 @@ public class Errors extends IndexedResourceBundle {
*/
public static final short IllegalUnicodeCodePoint_2 = 78;
- /**
- * Illegal value for property “{1}” in “{0}”.
- */
- public static final short IllegalValueForProperty_2 = 79;
-
/**
* Cannot use the {1} format with “{0}”.
*/
@@ -747,7 +742,7 @@ public class Errors extends IndexedResourceBundle {
/**
* Expected the “{0}” value for all members, but found a member with
the “{1}” value.
*/
- public static final short NonUniformValue_2 = 207;
+ public static final short NonUniformValue_2 = 79;
/**
* No element for the “{0}” identifier, or the identifier is a forward
reference.
diff --git
a/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/resources/Errors.properties
b/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/resources/Errors.properties
index bf97140283..d47a9c2d9e 100644
---
a/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/resources/Errors.properties
+++
b/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/resources/Errors.properties
@@ -104,7 +104,6 @@ IllegalPropertyValueClass_3 = Expected an instance of
\u2018{1}\u2019 for
IllegalRange_2 = Range [{0} \u2026 {1}] is not valid.
IllegalSexagesimalField_3 = Sexagesimal angle {0,number} is illegal
because the {1,choice,0#minutes|1#seconds} field cannot take the {2,number}
value.
IllegalUnicodeCodePoint_2 = Value {1} for \u201c{0}\u201d is not a
valid Unicode code point.
-IllegalValueForProperty_2 = Illegal value for property \u201c{1}\u201d
in \u201c{0}\u201d.
IncompatibleFormat_2 = Cannot use the {1} format with
\u201c{0}\u201d.
IncompatiblePropertyValue_1 = Property \u201c{0}\u201d has an
incompatible value.
IncompatibleUnit_1 = Unit \u201c{0}\u201d is incompatible with
current value.
diff --git
a/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/resources/Errors_fr.properties
b/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/resources/Errors_fr.properties
index b1606bf17b..87f3e47e1c 100644
---
a/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/resources/Errors_fr.properties
+++
b/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/resources/Errors_fr.properties
@@ -101,7 +101,6 @@ IllegalPropertyValueClass_3 = Une instance
\u2018{1}\u2019 \u00e9tait atte
IllegalRange_2 = La plage [{0} \u2026 {1}] n\u2019est pas
valide.
IllegalSexagesimalField_3 = L\u2019angle sexag\u00e9simal {0,number}
est invalide parce que le champs des {1,choice,0#minutes|1#secondes} ne peut
pas prendre la valeur {2,number}.
IllegalUnicodeCodePoint_2 = La valeur {1} de
\u00ab\u202f{0}\u202f\u00bb n\u2019est pas un code Unicode valide.
-IllegalValueForProperty_2 = Valeur ill\u00e9gale pour la
propri\u00e9t\u00e9 \u00ab\u202f{1}\u202f\u00bb dans
\u00ab\u202f{0}\u202f\u00bb.
IncompatibleFormat_2 = Le format {1} ne s\u2019applique pas
\u00e0 \u00ab\u202f{0}\u202f\u00bb.
IncompatiblePropertyValue_1 = La valeur de la propri\u00e9t\u00e9
\u00ab\u202f{0}\u202f\u00bb n\u2019est pas compatible.
IncompatibleUnit_1 = L\u2019unit\u00e9
\u00ab\u202f{0}\u202f\u00bb n\u2019est pas compatible avec la valeur actuelle.
