This is an automated email from the ASF dual-hosted git repository.
desruisseaux pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/sis.git
commit d98b7a3e07c67d1fa6c8367c6cb7117c750e42c2
Merge: 65771ca1ee 9696bd8bfe
Author: Martin Desruisseaux <martin.desruisse...@geomatys.com>
AuthorDate: Tue Apr 9 17:11:48 2024 +0200
Merge branch 'geoapi-3.1'.
.../sis/buildtools/coding/ReorganizeImports.java | 11 +++-----
.../apache/sis/metadata/ModifiableMetadata.java | 11 ++++++--
.../apache/sis/metadata/iso/extent/Extents.java | 4 +--
.../iso/quality/AbstractTemporalQuality.java | 1 -
...DefaultNonQuantitativeAttributeCorrectness.java | 1 -
.../metadata/simple/SimpleIdentifiedObject.java | 6 +++--
.../org/apache/sis/xml/PooledUnmarshaller.java | 2 +-
.../sis/util/iso/DefaultRecordSchemaTest.java | 2 +-
.../apache/sis/util/iso/DefaultRecordTypeTest.java | 1 +
.../sis/referencing/EPSGFactoryFallback.java | 15 ++++++-----
.../sis/referencing/crs/DefaultImageCRSTest.java | 2 +-
.../apache/sis/referencing/crs/HardCodedCRS.java | 4 ++-
.../sis/util/DefaultInternationalString.java | 30 ++++++++--------------
.../main/org/apache/sis/util/Locales.java | 17 ++++++------
.../test/org/apache/sis/test/LoggingWatcher.java | 8 ++++--
.../org/apache/sis/gui/referencing/CRSChooser.java | 7 ++---
16 files changed, 64 insertions(+), 58 deletions(-)
diff --cc
endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/quality/AbstractTemporalQuality.java
index 318c7d2c5e,72846865a5..f0d9e6d7bc
---
a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/quality/AbstractTemporalQuality.java
+++
b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/quality/AbstractTemporalQuality.java
@@@ -108,8 -106,7 +108,7 @@@ public class AbstractTemporalQuality ex
* @return a SIS implementation containing the values of the given object
(may be the
* given object itself), or {@code null} if the argument was null.
*/
- @SuppressWarnings("deprecation")
- public static AbstractTemporalQuality castOrCopy(final TemporalQuality
object) {
+ public static AbstractTemporalQuality castOrCopy(final TemporalAccuracy
object) {
if (object instanceof AccuracyOfATimeMeasurement) {
return
DefaultAccuracyOfATimeMeasurement.castOrCopy((AccuracyOfATimeMeasurement)
object);
}
diff --cc
endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/quality/DefaultNonQuantitativeAttributeCorrectness.java
index 9200bab2c5,0e880847f1..2540a74d36
---
a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/quality/DefaultNonQuantitativeAttributeCorrectness.java
+++
b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/quality/DefaultNonQuantitativeAttributeCorrectness.java
@@@ -99,8 -98,10 +99,7 @@@ public class DefaultNonQuantitativeAttr
* @return a SIS implementation containing the values of the given object
(may be the
* given object itself), or {@code null} if the argument was null.
*/
- @SuppressWarnings("deprecation")
- public static DefaultNonQuantitativeAttributeCorrectness castOrCopy(final
NonQuantitativeAttributeCorrectness object) {
- if (object instanceof NonQuantitativeAttributeAccuracy) {
- return
DefaultNonQuantitativeAttributeAccuracy.castOrCopy((NonQuantitativeAttributeAccuracy)
object);
- }
+ public static DefaultNonQuantitativeAttributeCorrectness castOrCopy(final
NonQuantitativeAttributeAccuracy object) {
if (object == null || object instanceof
DefaultNonQuantitativeAttributeCorrectness) {
return (DefaultNonQuantitativeAttributeCorrectness) object;
}
diff --cc
endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/simple/SimpleIdentifiedObject.java
index 4c43f12d45,4ea1c59659..10281bd0bf
---
a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/simple/SimpleIdentifiedObject.java
+++
b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/simple/SimpleIdentifiedObject.java
@@@ -238,9 -192,10 +239,10 @@@ public class SimpleIdentifiedObject imp
*/
@Override
public String toString() {
+ @SuppressWarnings("LocalVariableHidesMemberVariable")
- final Identifier name = this.name;
++ final ReferenceIdentifier name = this.name;
final String code, codespace;
final Citation authority;
- final ReferenceIdentifier name = this.name;
if (name != null) {
code = name.getCode();
codespace = name.getCodeSpace();
diff --cc
endorsed/src/org.apache.sis.metadata/test/org/apache/sis/util/iso/DefaultRecordSchemaTest.java
index ae1f4b6366,0a61396e4d..966e38cdb6
---
a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/util/iso/DefaultRecordSchemaTest.java
+++
b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/util/iso/DefaultRecordSchemaTest.java
@@@ -45,7 -45,7 +45,7 @@@ public final class DefaultRecordSchemaT
* Tests {@link DefaultRecordSchema#createRecordType(CharSequence, Map)}.
*/
@Test
- @SuppressWarnings("deprecation")
- @SuppressWarnings({"deprecation", "removal"})
++ @SuppressWarnings("removal")
public void testCreateRecordType() {
final var schema = new DefaultRecordSchema(null, null, "MySchema");
final var fields = new LinkedHashMap<CharSequence,Class<?>>(8);
