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 3a2127e98a2b6ba0db1829cf81862cea0fd12fe5
Merge: d68a898653 1a246afc55
Author: Martin Desruisseaux <martin.desruisse...@geomatys.com>
AuthorDate: Wed Jul 10 16:52:40 2024 +0200
Merge of automatic reorganization of imports order.
.../main/org/apache/sis/filter/TemporalOperation.java | 2 +-
.../main/org/apache/sis/temporal/DefaultInstant.java | 4 ++--
.../main/org/apache/sis/temporal/DefaultPeriod.java | 2 +-
.../test/org/apache/sis/temporal/DefaultInstantTest.java | 10 +++++-----
.../test/org/apache/sis/temporal/DefaultPeriodTest.java | 2 ++
.../org/apache/sis/referencing/MultiRegisterOperations.java | 8 +++++---
.../org/apache/sis/referencing/factory/sql/EPSGDataAccess.java | 2 +-
.../apache/sis/referencing/internal/PositionTransformer.java | 2 +-
.../apache/sis/referencing/operation/DefaultConversion.java | 2 +-
.../operation/DefaultCoordinateOperationFactory.java | 2 +-
.../operation/transform/DefaultMathTransformFactory.java | 9 ++++++---
.../org/apache/sis/referencing/privy/CoordinateOperations.java | 2 +-
.../operation/transform/MathTransformFactoryMock.java | 2 +-
.../apache/sis/test/integration/CoordinateOperationTest.java | 2 +-
.../main/org/apache/sis/storage/landsat/MetadataReader.java | 4 +++-
.../main/org/apache/sis/storage/netcdf/base/GridMapping.java | 4 +---
.../main/org/apache/sis/storage/sql/postgis/RasterReader.java | 2 +-
.../main/org/apache/sis/measure/RangeFormat.java | 4 ++--
18 files changed, 36 insertions(+), 29 deletions(-)
diff --cc
endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/DefaultMathTransformFactory.java
index 1d8f013194,051f8187d8..311c3a3d02
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/DefaultMathTransformFactory.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/DefaultMathTransformFactory.java
@@@ -55,9 -52,10 +52,15 @@@ import org.apache.sis.referencing.facto
import org.apache.sis.parameter.DefaultParameterValueGroup;
import org.apache.sis.system.Reflect;
+// Specific to the main and geoapi-3.1 branches:
++import org.opengis.parameter.ParameterDescriptorGroup;
++import org.opengis.referencing.crs.CoordinateReferenceSystem;
+import org.apache.sis.util.resources.Errors;
+
+ // Specific to the geoapi-3.1 and geoapi-4.0 branches:
+ import org.apache.sis.referencing.operation.matrix.Matrices;
+
+
/**
* Low level factory for creating {@linkplain AbstractMathTransform math
transforms}.
* The objects created by this factory do not know what the source and target
coordinate systems mean.
diff --cc
endorsed/src/org.apache.sis.referencing/test/org/apache/sis/test/integration/CoordinateOperationTest.java
index 6946f10f20,ed84528418..89a7682d5d
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/test/integration/CoordinateOperationTest.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/test/integration/CoordinateOperationTest.java
@@@ -43,9 -43,6 +43,9 @@@ import static org.junit.jupiter.api.Ass
import org.apache.sis.referencing.operation.transform.MathTransformTestCase;
import static org.apache.sis.test.Assertions.assertEqualsIgnoreMetadata;
- // Specific to the geoapi-3.1 and geoapi-4.0 branches:
++// Specific to the main and geoapi-3.1 branches:
+import org.apache.sis.referencing.operation.CoordinateOperationContext;
+
/**
* Tests mixing use of EPSG dataset, change of axes convention, application
of math transforms,
