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 2466fc7ddff63f720bda1af23f118cfea8585b02
Merge: f636f75504 9b511f4d6a
Author: Martin Desruisseaux <martin.desruisse...@geomatys.com>
AuthorDate: Tue Mar 12 20:17:32 2024 +0100
Merge branch 'geoapi-3.1'
.../main/org/apache/sis/xml/bind/cat/CodeListAdapter.java | 4 +++-
.../main/org/apache/sis/xml/bind/metadata/replace/SensorType.java | 6 ++++--
.../main/org/apache/sis/referencing/GeodeticCalculator.java | 2 +-
.../operation/transform/DefaultMathTransformFactory.java | 2 +-
.../main/org/apache/sis/storage/netcdf/base/RasterResource.java | 2 +-
.../main/org/apache/sis/util/collection/CodeListSet.java | 4 +++-
.../main/org/apache/sis/util/collection/DefaultTreeTable.java | 2 +-
.../main/org/apache/sis/util/privy/CodeLists.java | 4 +++-
.../test/org/apache/sis/util/collection/LargeCodeList.java | 6 ++++--
.../main/org/apache/sis/gui/referencing/PositionableProjection.java | 6 ++++--
10 files changed, 25 insertions(+), 13 deletions(-)
diff --cc
endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/metadata/replace/SensorType.java
index 195808a474,2c96b8d2af..7a50418449
---
a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/metadata/replace/SensorType.java
+++
b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/metadata/replace/SensorType.java
@@@ -22,6 -20,6 +20,10 @@@ import org.opengis.annotation.UML
import org.opengis.annotation.Specification;
import org.opengis.util.CodeList;
++// Specific to the main branch:
++import java.util.List;
++import java.util.ArrayList;
++
/**
* The code list for {@code <gmi:MI_SensorTypeCode>}.
diff --cc
endorsed/src/org.apache.sis.util/main/org/apache/sis/util/collection/CodeListSet.java
index 95c9c2ff39,92e0be6861..432b03b807
---
a/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/collection/CodeListSet.java
+++
b/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/collection/CodeListSet.java
@@@ -27,7 -27,6 +27,9 @@@ import org.opengis.util.CodeList
import org.apache.sis.util.privy.CheckedArrayList;
import org.apache.sis.util.resources.Errors;
++// Specific to the main branch:
++import org.apache.sis.util.privy.CodeLists;
++
/**
* A specialized {@code Set} implementation for use with {@link CodeList}
values.
diff --cc
endorsed/src/org.apache.sis.util/main/org/apache/sis/util/privy/CodeLists.java
index 7843f929d2,323e2cb003..271f6bdfdc
---
a/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/privy/CodeLists.java
+++
b/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/privy/CodeLists.java
@@@ -26,6 -25,9 +25,9 @@@ import org.apache.sis.util.CharSequence
import org.apache.sis.util.Characters.Filter;
import org.apache.sis.util.resources.Errors;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.util.ControlledVocabulary;
++// Specific to the main branch:
++import java.lang.reflect.Array;
+
/**
* Implementation of some {@link org.apache.sis.util.iso.Types} methods
needed by {@code org.apache.sis.util} module.
diff --cc
endorsed/src/org.apache.sis.util/test/org/apache/sis/util/collection/LargeCodeList.java
index 08002fb18c,17954d32fb..c3841a0373
---
a/endorsed/src/org.apache.sis.util/test/org/apache/sis/util/collection/LargeCodeList.java
+++
b/endorsed/src/org.apache.sis.util/test/org/apache/sis/util/collection/LargeCodeList.java
@@@ -23,6 -21,6 +21,10 @@@ import org.opengis.util.CodeList
// Test dependencies
import static org.junit.jupiter.api.Assertions.*;
++// Specific to the main branch:
++import java.util.List;
++import java.util.ArrayList;
++
/**
* A code list containing more than 64 elements. This implementation can be
used by tests
diff --cc
optional/src/org.apache.sis.gui/main/org/apache/sis/gui/referencing/PositionableProjection.java
index ab5b9b262e,0f7237ee39..16981e045b
---
a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/referencing/PositionableProjection.java
+++
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/referencing/PositionableProjection.java
@@@ -39,6 -37,6 +37,10 @@@ import org.apache.sis.util.resources.Er
import org.apache.sis.util.logging.Logging;
import static org.apache.sis.gui.internal.LogHandler.LOGGER;
++// Specific to the main branch:
++import java.util.List;
++import java.util.ArrayList;
++
/**
* Provider of map projections centered on a point of interest.
