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 03f1b25080df110aa8c588b35b740d5540a0e136
Merge: c49c79d2c5 ecb7e5eb33
Author: Martin Desruisseaux <martin.desruisse...@geomatys.com>
AuthorDate: Thu May 16 18:26:06 2024 +0200
Merge branch 'geoapi-3.1'.
.../sis/pending/temporal/TemporalUtilities.java | 35 +++++++++++++++++++---
.../org/apache/sis/xml/bind/gml/TM_Primitive.java | 5 ++--
.../MismatchedReferenceSystemException.java | 3 +-
.../sis/referencing/datum/DefaultEllipsoid.java | 17 +++++------
.../operation/AbstractCoordinateOperation.java | 2 +-
.../operation/InverseOperationMethod.java | 2 +-
.../sis/referencing/operation/matrix/Matrices.java | 2 +-
.../operation/provider/ProviderMock.java | 2 +-
.../operation/provider/SeismicBinGridMock.java | 2 +-
9 files changed, 47 insertions(+), 23 deletions(-)
diff --cc
endorsed/src/org.apache.sis.referencing/main/org/apache/sis/geometry/MismatchedReferenceSystemException.java
index a1df07bb6d,a9cc4d189c..76b034d9d8
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/geometry/MismatchedReferenceSystemException.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/geometry/MismatchedReferenceSystemException.java
@@@ -18,15 -18,17 +18,14 @@@ package org.apache.sis.geometry
/**
- * Thrown when the number of bands or sample dimensions specified to a method
- * is not equal to the number expected by a coverage.
+ * Indicates that an object cannot be constructed because of a mismatch in the
- * {@linkplain org.opengis.referencing.ReferenceSystem reference systems} of
- * geometric components.
++ * reference systems of components.
*
- * @author Martin Desruisseaux (Geomatys)
- * @version 1.0
- *
- * @see org.opengis.coordinate.MismatchedDimensionException
- *
- * @since 1.0
+ * @author Martin Desruisseaux (IRD)
+ * @since 0.3
+ * @version 0.3
*/
-public class MismatchedCoverageRangeException extends
IllegalArgumentException {
+public class MismatchedReferenceSystemException extends
IllegalArgumentException {
/**
* Serial number for inter-operability with different versions.
*/
diff --cc
endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/DefaultEllipsoid.java
index 0b5b1b02a9,f85e3f70b7..930e4c1638
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/DefaultEllipsoid.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/DefaultEllipsoid.java
@@@ -43,11 -44,9 +44,9 @@@ import org.apache.sis.referencing.privy
import org.apache.sis.io.wkt.Formatter;
import org.apache.sis.io.wkt.Convention;
import org.apache.sis.measure.Units;
- import static org.apache.sis.util.ArgumentChecks.ensureStrictlyPositive;
- import static org.apache.sis.util.ArgumentChecks.ensureNonNull;
-// 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/test/org/apache/sis/referencing/operation/provider/ProviderMock.java
index 9c7b0568e0,7ff33ebd0a..f2904eb807
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/provider/ProviderMock.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/provider/ProviderMock.java
@@@ -29,7 -29,7 +29,7 @@@ import org.apache.sis.referencing.opera
/**
* Base class of mock provider for coordinate operations not yet implemented
in Apache SIS.
* This is used for operations needed for executing some Well Known Text
(WKT) parsing tests
- * in the {@code org.apache.sis.io.wkt.WKTParserTest} class, without doing
any real coordinate
- * in the {@link org.apache.sis.io.wkt.CRSParserTest} class, without doing
any real coordinate
++ * in the {@code org.apache.sis.io.wkt.CRSParserTest} class, without doing
any real coordinate
* operations with the parsed objects.
*
* <p>Subclasses may be promoted to a real operation if we implement their
formulas in a future Apache SIS version.</p>
diff --cc
endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/provider/SeismicBinGridMock.java
index 5dc74797ec,1ce7cc9481..b025664c34
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/provider/SeismicBinGridMock.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/provider/SeismicBinGridMock.java
@@@ -26,7 -26,7 +26,7 @@@ import org.apache.sis.measure.Units
* The provider for <q>P6 (I = J-90°) seismic bin grid transformation</q>
transformation (EPSG:1049).
*
* This conversion is not yet implemented in Apache SIS, but we need to at
least accept the parameters
- * for a Well Known Text (WKT) parsing test in the {@code
org.apache.sis.io.wkt.WKTParserTest} class.
- * for a Well Known Text (WKT) parsing test in the {@link
org.apache.sis.io.wkt.CRSParserTest} class.
++ * for a Well Known Text (WKT) parsing test in the {@code
org.apache.sis.io.wkt.CRSParserTest} class.
*
* <p>This class may be promoted to a real operation if we implement the
formulas in a future Apache SIS version.</p>
*
