This is an automated email from the ASF dual-hosted git repository.
desruisseaux pushed a commit to branch geoapi-3.1
in repository https://gitbox.apache.org/repos/asf/sis.git
commit 72bf4148b1dd4297b86abc71990622b6a16fa5f9
Merge: f173cc01f5 770e730bd6
Author: Martin Desruisseaux <martin.desruisse...@geomatys.com>
AuthorDate: Sat Apr 6 00:39:36 2024 +0200
Merge automatic import reorganization.
.../test/org/apache/sis/metadata/PropertyAccessorTest.java | 2 +-
.../test/org/apache/sis/test/mock/VerticalCRSMock.java | 2 +-
.../main/org/apache/sis/coordinate/DefaultCoordinateMetadata.java | 2 +-
.../main/org/apache/sis/referencing/CRS.java | 2 +-
.../main/org/apache/sis/referencing/crs/DefaultCompoundCRS.java | 8 ++++----
.../main/org/apache/sis/referencing/crs/DefaultImageCRS.java | 6 ++++--
.../main/org/apache/sis/referencing/crs/SubTypes.java | 4 +++-
.../main/org/apache/sis/referencing/cs/DefaultUserDefinedCS.java | 4 +++-
.../main/org/apache/sis/referencing/cs/SubTypes.java | 4 +++-
.../main/org/apache/sis/referencing/datum/DefaultImageDatum.java | 4 +++-
.../org/apache/sis/referencing/datum/DefaultVerticalDatum.java | 2 +-
.../main/org/apache/sis/referencing/datum/SubTypes.java | 2 ++
.../org/apache/sis/referencing/internal/EPSGFactoryProxy.java | 4 +++-
.../org/apache/sis/referencing/internal/EPSGFactoryProxyCRS.java | 4 +++-
.../apache/sis/referencing/internal/EPSGFactoryProxyDatum.java | 4 +++-
.../main/org/apache/sis/xml/bind/referencing/CD_ImageDatum.java | 4 +++-
.../org/apache/sis/xml/bind/referencing/CS_UserDefinedCS.java | 4 +++-
.../test/org/apache/sis/io/wkt/WKTParserTest.java | 4 +---
.../apache/sis/referencing/report/CoordinateReferenceSystems.java | 2 +-
.../test/org/apache/sis/test/integration/MetadataTest.java | 8 ++++----
20 files changed, 48 insertions(+), 28 deletions(-)
diff --cc
endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/PropertyAccessorTest.java
index b3389026ae,9bbd7005c4..be198665a2
---
a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/PropertyAccessorTest.java
+++
b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/PropertyAccessorTest.java
@@@ -62,16 -62,15 +62,16 @@@ import org.apache.sis.metadata.iso.cita
import static org.apache.sis.test.TestUtilities.getSingleton;
import static org.apache.sis.metadata.Assertions.assertTitleEquals;
+// Specific to the main and geoapi-3.1 branches:
+import org.opengis.metadata.citation.ResponsibleParty;
+import org.opengis.referencing.ReferenceIdentifier;
+
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
import org.opengis.metadata.content.AttributeGroup;
- import org.opengis.referencing.datum.DatumEnsemble;
import org.opengis.referencing.ObjectDomain;
+ import org.opengis.referencing.datum.DatumEnsemble;
import org.opengis.temporal.Duration;
-// Specific to the geoapi-4.0 branch:
-import org.opengis.metadata.citation.Responsibility;
-
/**
* Tests the {@link PropertyAccessor} class. Every tests in this class
instantiates directly a
diff --cc
endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultImageCRS.java
index 3a5f1d5a7d,e9e58b45d8..1a466619d6
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultImageCRS.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultImageCRS.java
@@@ -32,6 -30,9 +30,10 @@@ import org.apache.sis.referencing.cs.Ab
import org.apache.sis.metadata.privy.ImplementationHelper;
import org.apache.sis.io.wkt.Formatter;
-// Specific to the geoapi-4.0 branch:
-import org.apache.sis.referencing.datum.DefaultImageDatum;
++// Specific to the main and geoapi-3.1 branches:
++import org.opengis.referencing.crs.ImageCRS;
++import org.opengis.referencing.datum.ImageDatum;
+
/**
* A 2-dimensional engineering coordinate reference system applied to
locations in images.
diff --cc
endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/SubTypes.java
index 1053074749,2b160b158a..635941e542
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/SubTypes.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/SubTypes.java
@@@ -37,6 -36,6 +36,9 @@@ import org.opengis.referencing.datum.Ge
import org.apache.sis.referencing.IdentifiedObjects;
import org.apache.sis.referencing.cs.AxesConvention;
++// Specific to the main and geoapi-3.1 branches:
++import org.opengis.referencing.crs.ImageCRS;
++
/**
* Implementation of {@link AbstractCRS} methods that require knowledge about
subclasses.
diff --cc
endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/cs/DefaultUserDefinedCS.java
index 86b26fc3d1,304f1a38dd..525b514ee2
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/cs/DefaultUserDefinedCS.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/cs/DefaultUserDefinedCS.java
@@@ -19,9 -19,8 +19,11 @@@ package org.apache.sis.referencing.cs
import java.util.Map;
import jakarta.xml.bind.annotation.XmlType;
import jakarta.xml.bind.annotation.XmlRootElement;
- import org.opengis.referencing.cs.UserDefinedCS;
import org.opengis.referencing.cs.CoordinateSystemAxis;
++// Specific to the main and geoapi-3.1 branches:
++import org.opengis.referencing.cs.UserDefinedCS;
++
/**
* A 2- or 3-dimensional coordinate system for any combination of coordinate
axes not covered by other CS types.
diff --cc
endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/cs/SubTypes.java
index 3a74904d43,47f7d4b422..f18e654f86
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/cs/SubTypes.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/cs/SubTypes.java
@@@ -30,7 -30,6 +30,9 @@@ import org.opengis.referencing.cs.TimeC
import org.opengis.referencing.cs.VerticalCS;
import org.apache.sis.referencing.privy.AxisDirections;
++// Specific to the main and geoapi-3.1 branches:
++import org.opengis.referencing.cs.UserDefinedCS;
++
/**
* Implementation of {@link AbstractCS} methods that require knowledge about
subclasses.
diff --cc
endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/DefaultImageDatum.java
index 819c0cac25,2dabc1c611..958903d8d5
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/DefaultImageDatum.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/DefaultImageDatum.java
@@@ -31,6 -30,6 +30,9 @@@ import org.apache.sis.io.wkt.Formatter
import org.apache.sis.io.wkt.Convention;
import org.apache.sis.util.ComparisonMode;
++// Specific to the main and geoapi-3.1 branches:
++import org.opengis.referencing.datum.ImageDatum;
++
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
import org.opengis.metadata.Identifier;
diff --cc
endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/SubTypes.java
index 49e765c5a5,e5a7af5fcc..74cad8909c
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/SubTypes.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/SubTypes.java
@@@ -21,8 -21,7 +21,10 @@@ import org.opengis.referencing.datum.Ge
import org.opengis.referencing.datum.VerticalDatum;
import org.opengis.referencing.datum.TemporalDatum;
import org.opengis.referencing.datum.EngineeringDatum;
+
++// Specific to the main and geoapi-3.1 branches:
+import org.opengis.referencing.datum.ImageDatum;
+
/**
* Implementation of {@link AbstractDatum} methods that require knowledge
about subclasses.
diff --cc
endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/internal/EPSGFactoryProxyCRS.java
index 0f6ca0aa37,d257e5d221..3a44045d7f
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/internal/EPSGFactoryProxyCRS.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/internal/EPSGFactoryProxyCRS.java
@@@ -30,6 -29,6 +29,9 @@@ import org.opengis.referencing.crs.Vert
import org.opengis.util.FactoryException;
import org.apache.sis.referencing.CRS;
++// Specific to the main and geoapi-3.1 branches:
++import org.opengis.referencing.crs.ImageCRS;
++
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
import org.opengis.referencing.crs.ParametricCRS;
diff --cc
endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/internal/EPSGFactoryProxyDatum.java
index ae1f696a1d,399d5dd277..33dc34e3c2
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/internal/EPSGFactoryProxyDatum.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/internal/EPSGFactoryProxyDatum.java
@@@ -28,6 -27,6 +27,9 @@@ import org.opengis.referencing.datum.Ve
import org.opengis.util.FactoryException;
import org.apache.sis.referencing.CRS;
++// Specific to the main and geoapi-3.1 branches:
++import org.opengis.referencing.datum.ImageDatum;
++
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
import org.opengis.referencing.datum.ParametricDatum;
diff --cc
endorsed/src/org.apache.sis.referencing/main/org/apache/sis/xml/bind/referencing/CD_ImageDatum.java
index d0574355b3,2e1c5d77f1..b3eaa6bb7b
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/xml/bind/referencing/CD_ImageDatum.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/xml/bind/referencing/CD_ImageDatum.java
@@@ -20,7 -20,6 +20,9 @@@ import jakarta.xml.bind.annotation.XmlE
import org.apache.sis.xml.bind.gco.PropertyType;
import org.apache.sis.referencing.datum.DefaultImageDatum;
++// Specific to the main and geoapi-3.1 branches:
++import org.opengis.referencing.datum.ImageDatum;
++
/**
* JAXB adapter mapping implementing class to the GeoAPI interface. See
diff --cc
endorsed/src/org.apache.sis.referencing/main/org/apache/sis/xml/bind/referencing/CS_UserDefinedCS.java
index 41ee56e38c,488042cc75..c1022ef664
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/xml/bind/referencing/CS_UserDefinedCS.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/xml/bind/referencing/CS_UserDefinedCS.java
@@@ -20,7 -20,6 +20,9 @@@ import jakarta.xml.bind.annotation.XmlE
import org.apache.sis.referencing.cs.DefaultUserDefinedCS;
import org.apache.sis.xml.bind.gco.PropertyType;
++// Specific to the main and geoapi-3.1 branches:
++import org.opengis.referencing.cs.UserDefinedCS;
++
/**
* JAXB adapter mapping implementing class to the GeoAPI interface. See
