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 129054c2fa6523e70400e8e7dc892e0fa64faacf
Merge: a5db7e3106 72bf4148b1
Author: Martin Desruisseaux <martin.desruisse...@geomatys.com>
AuthorDate: Sat Apr 6 00:44:34 2024 +0200
Merge automatic import reorganization (for isolating the difference between
branches).
.../apache/sis/coverage/grid/FractionalGridCoordinates.java | 2 +-
.../org/apache/sis/coordinate/DefaultCoordinateMetadata.java | 2 +-
.../sis/pending/geoapi/referencing/DynamicReferenceFrame.java | 1 -
.../main/org/apache/sis/referencing/CRS.java | 2 +-
.../main/org/apache/sis/referencing/crs/DefaultImageCRS.java | 6 ++++--
.../main/org/apache/sis/referencing/crs/SubTypes.java | 4 +++-
.../org/apache/sis/referencing/cs/DefaultUserDefinedCS.java | 4 +++-
.../main/org/apache/sis/referencing/cs/SubTypes.java | 4 +++-
.../org/apache/sis/referencing/datum/DefaultImageDatum.java | 4 +++-
.../main/org/apache/sis/referencing/datum/SubTypes.java | 2 ++
.../apache/sis/referencing/internal/EPSGFactoryProxyCRS.java | 4 +++-
.../apache/sis/referencing/internal/EPSGFactoryProxyDatum.java | 4 +++-
.../main/org/apache/sis/referencing/privy/AxisDirections.java | 4 ++--
.../org/apache/sis/referencing/privy/ReferencingUtilities.java | 8 ++++----
.../org/apache/sis/xml/bind/referencing/CD_ImageDatum.java | 4 +++-
.../org/apache/sis/xml/bind/referencing/CS_UserDefinedCS.java | 4 +++-
.../org/apache/sis/referencing/privy/AxisDirectionsTest.java | 10 +++++-----
.../main/org/apache/sis/math/CompoundDirectPositions.java | 4 +++-
18 files changed, 47 insertions(+), 26 deletions(-)
diff --cc
endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/FractionalGridCoordinates.java
index 7ec5dc53e3,a7e59a1e39..24d03e4e27
---
a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/FractionalGridCoordinates.java
+++
b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/FractionalGridCoordinates.java
@@@ -29,8 -28,9 +28,9 @@@ import org.apache.sis.util.StringBuilde
import org.apache.sis.util.privy.Strings;
import org.apache.sis.util.resources.Errors;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.coverage.PointOutsideCoverageException;
-import org.opengis.coverage.grid.GridCoordinates;
+// Specific to the main branch:
++import org.opengis.referencing.crs.CoordinateReferenceSystem;
+import org.apache.sis.coverage.PointOutsideCoverageException;
/**
diff --cc
endorsed/src/org.apache.sis.referencing/main/org/apache/sis/pending/geoapi/referencing/DynamicReferenceFrame.java
index d2cf1b37cb,f35ee94813..e22df3a479
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/pending/geoapi/referencing/DynamicReferenceFrame.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/pending/geoapi/referencing/DynamicReferenceFrame.java
@@@ -14,14 -14,7 +14,13 @@@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.map.service;
+package org.apache.sis.pending.geoapi.referencing;
+
+import java.time.temporal.Temporal;
+import org.opengis.referencing.datum.Datum;
+import org.opengis.annotation.UML;
-
+import static org.opengis.annotation.Obligation.*;
+import static org.opengis.annotation.Specification.*;
/**
diff --cc
endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/CRS.java
index 763e9465ef,2e81e6e73b..644aac07e6
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/CRS.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/CRS.java
@@@ -91,10 -91,13 +91,10 @@@ import org.apache.sis.util.privy.Numeri
import org.apache.sis.util.resources.Errors;
import org.apache.sis.util.logging.Logging;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.geometry.Geometry;
-import org.opengis.referencing.ObjectDomain;
-import org.opengis.referencing.datum.DynamicReferenceFrame;
-import org.opengis.metadata.extent.BoundingPolygon;
-import org.opengis.metadata.extent.GeographicExtent;
-import org.opengis.coordinate.CoordinateMetadata;
+// Specific to the main branch:
++import org.apache.sis.referencing.internal.Legacy;
+import org.apache.sis.pending.geoapi.referencing.DynamicReferenceFrame;
+import org.apache.sis.coordinate.DefaultCoordinateMetadata;
- import org.apache.sis.referencing.internal.Legacy;
/**
diff --cc
endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/DefaultImageDatum.java
index 8c8528438e,958903d8d5..2c28035e26
---
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,8 -30,11 +30,11 @@@ 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;
+// Specific to the main branch:
+import org.opengis.referencing.ReferenceIdentifier;
/**
diff --cc
endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/internal/EPSGFactoryProxyCRS.java
index 5f15550cbb,3a44045d7f..53aa28b85e
---
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,12 +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;
-
/**
* A factory that redirect all method to another factory. This factory is
normally useless and not used by Apache SIS.
diff --cc
endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/internal/EPSGFactoryProxyDatum.java
index c0c5267763,33dc34e3c2..fba7aefb90
---
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,12 +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;
-
/**
* Same as {@link EPSGFactoryProxyCRS} but for datum.
diff --cc
endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/privy/AxisDirections.java
index 1a2f5be640,9a42c857f1..96a6d5e2ad
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/privy/AxisDirections.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/privy/AxisDirections.java
@@@ -37,9 -35,6 +35,11 @@@ import org.apache.sis.util.iso.Types
import org.apache.sis.measure.Units;
import static org.apache.sis.util.CharSequences.*;
+// Specific to the main branch:
++import org.opengis.annotation.UML;
++import static org.opengis.annotation.Obligation.CONDITIONAL;
+import static org.opengis.annotation.Specification.UNSPECIFIED;
+
/**
* Utilities methods related to {@link AxisDirection}.
diff --cc
endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/privy/ReferencingUtilities.java
index af3a37f029,f2c829b281..6c7b9fe137
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/privy/ReferencingUtilities.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/privy/ReferencingUtilities.java
@@@ -57,12 -55,7 +55,14 @@@ import org.apache.sis.referencing.cs.Ax
import org.apache.sis.referencing.cs.DefaultEllipsoidalCS;
import
org.apache.sis.referencing.operation.transform.DefaultMathTransformFactory;
import
org.apache.sis.referencing.operation.transform.DefaultMathTransformFactory.Context;
- import org.apache.sis.metadata.privy.Identifiers;
- import org.apache.sis.xml.NilObject;
+// Specific to the main branch:
++import java.util.Collection;
++import java.util.NoSuchElementException;
+import org.opengis.referencing.ReferenceIdentifier;
++import org.apache.sis.metadata.privy.Identifiers;
++import org.apache.sis.xml.NilObject;
+
/**
* A set of static methods working on GeoAPI referencing objects.
diff --cc
endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/privy/AxisDirectionsTest.java
index 8dd70537dc,4a347861f2..528027e9ca
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/privy/AxisDirectionsTest.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/privy/AxisDirectionsTest.java
@@@ -37,6 -32,6 +32,11 @@@ import org.apache.sis.referencing.cs.Ha
import org.apache.sis.referencing.cs.HardCodedCS;
import org.apache.sis.test.TestCase;
++// Specific to the main branch:
++import static org.apache.sis.referencing.privy.AxisDirections.AWAY_FROM;
++import static org.apache.sis.referencing.privy.AxisDirections.CLOCKWISE;
++import static
org.apache.sis.referencing.privy.AxisDirections.COUNTER_CLOCKWISE;
++
/**
* Tests the {@link AxisDirections} class.
diff --cc
endorsed/src/org.apache.sis.util/main/org/apache/sis/math/CompoundDirectPositions.java
index 73b59cbd6c,02a0cab9c9..d20a906330
---
a/endorsed/src/org.apache.sis.util/main/org/apache/sis/math/CompoundDirectPositions.java
+++
b/endorsed/src/org.apache.sis.util/main/org/apache/sis/math/CompoundDirectPositions.java
@@@ -18,9 -18,8 +18,11 @@@ package org.apache.sis.math
import java.util.Iterator;
import org.opengis.geometry.DirectPosition;
- import org.opengis.referencing.crs.CoordinateReferenceSystem;
import org.apache.sis.util.resources.Errors;
++// Specific to the main branch:
++import org.opengis.referencing.crs.CoordinateReferenceSystem;
++
/**
* A sequence of {@code DirectPosition}s which is a view over arrays of
coordinate values.
