This is an automated email from the ASF dual-hosted git repository.
desruisseaux pushed a commit to branch geoapi-4.0
in repository https://gitbox.apache.org/repos/asf/sis.git
The following commit(s) were added to refs/heads/geoapi-4.0 by this push:
new 03ea47e94c Post-merge automatic import reorder.
03ea47e94c is described below
commit 03ea47e94cade91fea4a7e025ec07e1dac8542ff
Author: Martin Desruisseaux <[email protected]>
AuthorDate: Tue Mar 12 20:11:12 2024 +0100
Post-merge automatic import reorder.
---
.../main/org/apache/sis/referencing/GeodeticCalculator.java | 2 +-
.../main/org/apache/sis/referencing/internal/VerticalDatumTypes.java | 4 +---
.../referencing/operation/transform/DefaultMathTransformFactory.java | 2 +-
.../main/org/apache/sis/storage/netcdf/base/RasterResource.java | 2 +-
.../main/org/apache/sis/util/collection/DefaultTreeTable.java | 2 +-
.../main/org/apache/sis/map/service/Scene2D.java | 1 +
6 files changed, 6 insertions(+), 7 deletions(-)
diff --git
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/GeodeticCalculator.java
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/GeodeticCalculator.java
index 94fdf3cd50..7a33336854 100644
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/GeodeticCalculator.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/GeodeticCalculator.java
@@ -47,10 +47,10 @@ import
org.apache.sis.referencing.operation.transform.DefaultMathTransformFactor
import org.apache.sis.referencing.operation.provider.MapProjection;
import org.apache.sis.referencing.internal.PositionTransformer;
import org.apache.sis.referencing.internal.Resources;
+import org.apache.sis.referencing.internal.Bezier;
import org.apache.sis.referencing.privy.ReferencingUtilities;
import org.apache.sis.referencing.privy.Formulas;
import org.apache.sis.referencing.privy.ShapeUtilities;
-import org.apache.sis.referencing.internal.Bezier;
import org.apache.sis.util.ArgumentChecks;
import org.apache.sis.util.privy.Constants;
import org.apache.sis.util.privy.Numerics;
diff --git
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/internal/VerticalDatumTypes.java
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/internal/VerticalDatumTypes.java
index b7720a9ffd..b6de9fa530 100644
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/internal/VerticalDatumTypes.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/internal/VerticalDatumTypes.java
@@ -17,6 +17,7 @@
package org.apache.sis.referencing.internal;
import java.util.Collection;
+import java.util.function.Predicate;
import javax.measure.Unit;
import org.opengis.util.CodeList;
import org.opengis.util.GenericName;
@@ -29,9 +30,6 @@ import org.apache.sis.util.StringBuilders;
import org.apache.sis.util.privy.CodeLists;
import org.apache.sis.measure.Units;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import java.util.function.Predicate;
-
/**
* Extensions to the standard set of {@link VerticalDatumType}.
diff --git
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
index da747cbc19..39aa89dedb 100644
---
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
@@ -64,12 +64,12 @@ import org.apache.sis.referencing.privy.Formulas;
import org.apache.sis.referencing.privy.CoordinateOperations;
import org.apache.sis.referencing.privy.ReferencingUtilities;
import org.apache.sis.referencing.internal.ParameterizedAffine;
+import org.apache.sis.referencing.internal.Resources;
import org.apache.sis.referencing.operation.DefaultOperationMethod;
import org.apache.sis.referencing.operation.provider.AbstractProvider;
import org.apache.sis.referencing.operation.provider.VerticalOffset;
import org.apache.sis.referencing.operation.provider.GeographicToGeocentric;
import org.apache.sis.referencing.operation.provider.GeocentricToGeographic;
-import org.apache.sis.referencing.internal.Resources;
import org.apache.sis.system.Reflect;
import org.apache.sis.metadata.iso.citation.Citations;
import org.apache.sis.parameter.DefaultParameterValueGroup;
diff --git
a/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/base/RasterResource.java
b/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/base/RasterResource.java
index 5a0b0742f8..8101ff2362 100644
---
a/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/base/RasterResource.java
+++
b/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/base/RasterResource.java
@@ -45,12 +45,12 @@ import org.apache.sis.util.privy.Strings;
import org.apache.sis.coverage.SampleDimension;
import org.apache.sis.coverage.IllegalSampleDimensionException;
import org.apache.sis.coverage.privy.RangeArgument;
+import org.apache.sis.coverage.privy.RasterFactory;
import org.apache.sis.coverage.grid.GridExtent;
import org.apache.sis.coverage.grid.GridCoverage;
import org.apache.sis.coverage.grid.GridGeometry;
import org.apache.sis.coverage.grid.GridDerivation;
import org.apache.sis.coverage.grid.GridRoundingMode;
-import org.apache.sis.coverage.privy.RasterFactory;
import org.apache.sis.math.MathFunctions;
import org.apache.sis.measure.MeasurementRange;
import org.apache.sis.measure.NumberRange;
diff --git
a/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/collection/DefaultTreeTable.java
b/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/collection/DefaultTreeTable.java
index 8e72e93acc..f4a5d30fa7 100644
---
a/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/collection/DefaultTreeTable.java
+++
b/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/collection/DefaultTreeTable.java
@@ -26,8 +26,8 @@ import java.io.Serializable;
import org.apache.sis.util.ArgumentChecks;
import org.apache.sis.util.resources.Errors;
import org.apache.sis.util.privy.Cloner;
-import org.apache.sis.util.internal.Acyclic;
import org.apache.sis.util.privy.UnmodifiableArrayList;
+import org.apache.sis.util.internal.Acyclic;
import org.apache.sis.pending.jdk.JDK19;
import static org.apache.sis.util.collection.Containers.isNullOrEmpty;
diff --git
a/incubator/src/org.apache.sis.portrayal.map/main/org/apache/sis/map/service/Scene2D.java
b/incubator/src/org.apache.sis.portrayal.map/main/org/apache/sis/map/service/Scene2D.java
index 98ff1e4107..d58a599a7e 100644
---
a/incubator/src/org.apache.sis.portrayal.map/main/org/apache/sis/map/service/Scene2D.java
+++
b/incubator/src/org.apache.sis.portrayal.map/main/org/apache/sis/map/service/Scene2D.java
@@ -24,6 +24,7 @@ import javax.measure.quantity.Length;
import org.apache.sis.coverage.grid.GridGeometry;
import org.apache.sis.measure.Units;
+
/**
* Holds the rendering properties.
*
