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 f34a356cf9 Post-merge automatic reorganization of imports order. f34a356cf9 is described below commit f34a356cf91425019d2f9354ea8faa23dd41baba Author: Martin Desruisseaux <martin.desruisse...@geomatys.com> AuthorDate: Fri Jul 19 18:22:05 2024 +0200 Post-merge automatic reorganization of imports order. --- .../main/org/apache/sis/metadata/privy/RecordSchemaSIS.java | 2 +- .../main/org/apache/sis/io/wkt/ElementKind.java | 4 +++- .../org/apache/sis/referencing/MultiRegisterOperations.java | 2 +- .../main/org/apache/sis/referencing/crs/AbstractSingleCRS.java | 2 +- .../org/apache/sis/referencing/crs/DefaultGeodeticCRS.java | 2 +- .../org/apache/sis/referencing/crs/DefaultGeographicCRS.java | 2 +- .../org/apache/sis/referencing/crs/DefaultProjectedCRS.java | 2 +- .../org/apache/sis/referencing/datum/DefaultDatumEnsemble.java | 6 +++--- .../main/org/apache/sis/referencing/datum/PseudoDatum.java | 10 +++++++--- 9 files changed, 19 insertions(+), 13 deletions(-) diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/privy/RecordSchemaSIS.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/privy/RecordSchemaSIS.java index dba0d52b2e..b04c4ba188 100644 --- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/privy/RecordSchemaSIS.java +++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/privy/RecordSchemaSIS.java @@ -19,9 +19,9 @@ package org.apache.sis.metadata.privy; import java.util.Map; import java.io.Serializable; import java.io.ObjectStreamException; -import org.apache.sis.metadata.internal.Resources; import org.opengis.util.TypeName; import org.opengis.util.InternationalString; +import org.apache.sis.metadata.internal.Resources; import org.apache.sis.util.privy.Constants; import org.apache.sis.util.iso.DefaultRecordType; import org.apache.sis.util.iso.DefaultRecordSchema; diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/ElementKind.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/ElementKind.java index 6979e1d209..68f1f858db 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/ElementKind.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/ElementKind.java @@ -22,12 +22,14 @@ import org.opengis.metadata.Identifier; import org.opengis.metadata.citation.Citation; import org.opengis.metadata.extent.Extent; import org.opengis.referencing.datum.Datum; -import org.opengis.referencing.datum.DatumEnsemble; import org.opengis.referencing.cs.CoordinateSystemAxis; import org.opengis.referencing.operation.OperationMethod; import org.opengis.parameter.GeneralParameterValue; import org.apache.sis.util.Numbers; +// Specific to the geoapi-3.1 and geoapi-4.0 branches: +import org.opengis.referencing.datum.DatumEnsemble; + /** * Kind of an element in a <i>Well Known Text</i>. diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/MultiRegisterOperations.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/MultiRegisterOperations.java index 4b46c7a044..df73f26de5 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/MultiRegisterOperations.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/MultiRegisterOperations.java @@ -38,7 +38,6 @@ import org.opengis.referencing.operation.CoordinateOperation; import org.opengis.referencing.operation.CoordinateOperationFactory; import org.opengis.referencing.operation.CoordinateOperationAuthorityFactory; import org.opengis.referencing.operation.MathTransformFactory; -import org.apache.sis.referencing.datum.PseudoDatum; import org.apache.sis.referencing.factory.GeodeticObjectFactory; import org.apache.sis.referencing.factory.MultiAuthoritiesFactory; import org.apache.sis.referencing.factory.NoSuchAuthorityFactoryException; @@ -51,6 +50,7 @@ import org.apache.sis.util.iso.AbstractFactory; // Specific to the geoapi-3.1 and geoapi-4.0 branches: import org.opengis.referencing.RegisterOperations; import org.opengis.referencing.crs.SingleCRS; +import org.apache.sis.referencing.datum.PseudoDatum; /** diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/AbstractSingleCRS.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/AbstractSingleCRS.java index 6cff7e3c74..141568dac9 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/AbstractSingleCRS.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/AbstractSingleCRS.java @@ -21,7 +21,6 @@ import java.util.Objects; import jakarta.xml.bind.annotation.XmlType; import jakarta.xml.bind.annotation.XmlSeeAlso; import jakarta.xml.bind.annotation.XmlRootElement; -import org.opengis.metadata.Identifier; import org.opengis.referencing.crs.SingleCRS; import org.opengis.referencing.cs.CoordinateSystem; import org.opengis.referencing.datum.Datum; @@ -36,6 +35,7 @@ import org.apache.sis.referencing.internal.Resources; import org.apache.sis.metadata.privy.ImplementationHelper; // Specific to the geoapi-3.1 and geoapi-4.0 branches: +import org.opengis.metadata.Identifier; import org.opengis.referencing.datum.DatumEnsemble; diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultGeodeticCRS.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultGeodeticCRS.java index a4d5999ad5..7fa342873c 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultGeodeticCRS.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultGeodeticCRS.java @@ -30,7 +30,6 @@ import org.opengis.referencing.crs.GeodeticCRS; import org.opengis.referencing.crs.SingleCRS; import org.opengis.referencing.datum.GeodeticDatum; import org.opengis.referencing.datum.PrimeMeridian; -import org.opengis.metadata.Identifier; import org.apache.sis.referencing.AbstractReferenceSystem; import org.apache.sis.referencing.CRS; import org.apache.sis.referencing.cs.AbstractCS; @@ -46,6 +45,7 @@ import org.apache.sis.measure.Units; // Specific to the geoapi-3.1 and geoapi-4.0 branches: import org.opengis.referencing.datum.DatumEnsemble; +import org.opengis.metadata.Identifier; /** diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultGeographicCRS.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultGeographicCRS.java index fd685ca0b9..d0b69fd740 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultGeographicCRS.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultGeographicCRS.java @@ -44,8 +44,8 @@ import static org.apache.sis.util.privy.Constants.CRS83; import static org.apache.sis.util.privy.Constants.CRS84; // Specific to the geoapi-3.1 and geoapi-4.0 branches: -import org.opengis.metadata.Identifier; import org.opengis.referencing.datum.DatumEnsemble; +import org.opengis.metadata.Identifier; /** diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultProjectedCRS.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultProjectedCRS.java index d5af964f6f..71f39fb368 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultProjectedCRS.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultProjectedCRS.java @@ -41,8 +41,8 @@ import org.apache.sis.util.ComparisonMode; import org.apache.sis.util.Workaround; // Specific to the geoapi-3.1 and geoapi-4.0 branches: -import org.opengis.coordinate.MismatchedDimensionException; import org.opengis.referencing.datum.DatumEnsemble; +import org.opengis.coordinate.MismatchedDimensionException; /** diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/DefaultDatumEnsemble.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/DefaultDatumEnsemble.java index 0da60eed88..1f3615f861 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/DefaultDatumEnsemble.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/DefaultDatumEnsemble.java @@ -19,12 +19,11 @@ package org.apache.sis.referencing.datum; import java.util.Map; import java.util.List; import java.util.Collection; -import java.util.Objects; -import org.apache.sis.io.wkt.Formatter; -import org.apache.sis.io.wkt.Convention; import org.opengis.referencing.IdentifiedObject; import org.opengis.referencing.datum.Datum; import org.opengis.metadata.quality.PositionalAccuracy; +import org.apache.sis.io.wkt.Formatter; +import org.apache.sis.io.wkt.Convention; import org.apache.sis.referencing.AbstractIdentifiedObject; import org.apache.sis.referencing.internal.Resources; import org.apache.sis.referencing.privy.WKTKeywords; @@ -34,6 +33,7 @@ import org.apache.sis.util.Utilities; import org.apache.sis.util.resources.Errors; // Specific to the geoapi-3.1 and geoapi-4.0 branches: +import java.util.Objects; import org.opengis.referencing.datum.DatumEnsemble; diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/PseudoDatum.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/PseudoDatum.java index 75ac98142e..751e780930 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/PseudoDatum.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/PseudoDatum.java @@ -24,14 +24,11 @@ import java.util.Objects; import java.util.Optional; import java.util.NoSuchElementException; import java.util.function.Function; -import java.time.temporal.Temporal; import java.io.Serializable; import org.opengis.util.GenericName; import org.opengis.util.InternationalString; -import org.opengis.metadata.Identifier; import org.opengis.metadata.quality.PositionalAccuracy; import org.opengis.referencing.IdentifiedObject; -import org.opengis.referencing.ObjectDomain; import org.opengis.referencing.datum.*; import org.opengis.referencing.crs.*; import org.apache.sis.util.Utilities; @@ -41,6 +38,13 @@ import org.apache.sis.util.resources.Errors; import org.apache.sis.referencing.IdentifiedObjects; import org.apache.sis.referencing.GeodeticException; +// Specific to the geoapi-3.1 and geoapi-4.0 branches: +import java.time.temporal.Temporal; +import org.opengis.referencing.ObjectDomain; + +// Specific to the geoapi-4.0 branch: +import org.opengis.metadata.Identifier; + /** * A datum ensemble viewed as if it was a single datum for the sake of simplicity.