This is an automated email from the ASF dual-hosted git repository. asf-gitbox-commits pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/sis.git
commit 442474f8201bc05548eedbfdbea5e93bc0c852b2 Merge: f81f4d8c8c 4589e86bfb Author: Martin Desruisseaux <[email protected]> AuthorDate: Tue Jun 23 17:51:00 2026 +0200 Merge of automatic reorganization of imports order. .../test/org/apache/sis/coverage/CategoryListTest.java | 2 +- .../main/org/apache/sis/metadata/iso/citation/DefaultTelephone.java | 2 +- .../main/org/apache/sis/metadata/iso/distribution/DefaultFormat.java | 2 +- .../main/org/apache/sis/metadata/iso/distribution/DefaultMedium.java | 2 +- .../main/org/apache/sis/parameter/DefaultParameterDescriptor.java | 2 +- .../apache/sis/referencing/internal/shared/ReferencingUtilities.java | 2 +- .../main/org/apache/sis/referencing/legacy/DefaultImageDatum.java | 2 +- .../main/org/apache/sis/referencing/operation/DefiningConversion.java | 2 +- .../org.apache.sis.storage/main/org/apache/sis/storage/OptionKey.java | 2 +- .../main/org/apache/sis/storage/image/WorldFileStore.java | 2 +- .../main/org/apache/sis/storage/geoheif/CoverageBuilder.java | 4 ++-- .../main/org/apache/sis/storage/geoheif/ImageModel.java | 2 +- .../main/org/apache/sis/storage/gsf/GSFStoreProvider.java | 2 +- .../main/org/apache/sis/storage/shapefile/ShapefileStore.java | 2 +- .../test/org/apache/sis/storage/shapefile/ShapefileStoreTest.java | 2 +- .../main/org/apache/sis/gui/dataset/PathAction.java | 2 +- .../main/org/apache/sis/gui/referencing/FilterByDatum.java | 2 +- 17 files changed, 18 insertions(+), 18 deletions(-) diff --cc endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/citation/DefaultTelephone.java index 8a8db9b788,25b5e4e952..b21217a52d --- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/citation/DefaultTelephone.java +++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/citation/DefaultTelephone.java @@@ -30,17 -31,10 +31,16 @@@ import org.apache.sis.xml.bind.FilterBy import org.apache.sis.xml.internal.shared.LegacyNamespaces; import org.apache.sis.xml.bind.gco.StringAdapter; import org.apache.sis.xml.bind.metadata.code.CI_TelephoneTypeCode; - import org.apache.sis.metadata.TitleProperty; import org.apache.sis.metadata.internal.Dependencies; -// Specific to the geoapi-3.1 and geoapi-4.0 branches: -import org.opengis.metadata.citation.TelephoneType; +// Specific to the main branch: +import org.opengis.util.CodeList; +import org.opengis.annotation.UML; +import static org.opengis.annotation.Obligation.OPTIONAL; +import static org.opengis.annotation.Obligation.MANDATORY; +import static org.opengis.annotation.Specification.ISO_19115; +import org.apache.sis.pending.geoapi.evolution.InterimType; +import org.apache.sis.pending.geoapi.evolution.UnsupportedCodeList; /** diff --cc endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/distribution/DefaultFormat.java index 278e89f737,adab33e990..625d51ae69 --- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/distribution/DefaultFormat.java +++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/distribution/DefaultFormat.java @@@ -35,15 -36,8 +36,14 @@@ import org.apache.sis.xml.internal.shar import org.apache.sis.xml.bind.metadata.MD_Medium; import org.apache.sis.xml.bind.metadata.CI_Citation; import org.apache.sis.util.collection.Containers; - import org.apache.sis.metadata.TitleProperty; import org.apache.sis.metadata.iso.citation.DefaultCitation; +// Specific to the main branch: +import org.opengis.annotation.UML; +import static org.opengis.annotation.Obligation.OPTIONAL; +import static org.opengis.annotation.Obligation.MANDATORY; +import static org.opengis.annotation.Specification.ISO_19115; + /** * Description of the computer language construct that specifies the representation diff --cc endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/internal/shared/ReferencingUtilities.java index 76b851ef5e,ff67fc7471..5f35e8ce3f --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/internal/shared/ReferencingUtilities.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/internal/shared/ReferencingUtilities.java @@@ -49,14 -48,6 +48,15 @@@ import org.apache.sis.referencing.inter import org.apache.sis.referencing.operation.transform.DefaultMathTransformFactory; import org.apache.sis.parameter.DefaultParameterDescriptorGroup; +// Specific to the main branch: +import java.util.Collection; +import java.util.NoSuchElementException; +import org.opengis.referencing.ReferenceIdentifier; ++import org.apache.sis.util.Classes; +import org.apache.sis.pending.geoapi.referencing.MissingMethods; +import org.apache.sis.metadata.internal.shared.Identifiers; +import org.apache.sis.xml.NilObject; + /** * A set of static methods working on GeoAPI referencing objects. diff --cc incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/ShapefileStore.java index 7cd55f97a7,90f5f1096a..0b3e89b78b --- a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/ShapefileStore.java +++ b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/ShapefileStore.java @@@ -110,21 -111,22 +111,20 @@@ import org.apache.sis.util.ArraysExt import org.apache.sis.util.Classes; import org.apache.sis.util.Utilities; import org.apache.sis.util.collection.BackingStoreException; - import org.apache.sis.storage.base.WarningAdapter; -// Specific to the geoapi-3.1 and geoapi-4.0 branches: -import org.opengis.util.CodeList; -import org.opengis.feature.Feature; -import org.opengis.feature.FeatureType; -import org.opengis.feature.PropertyType; -import org.opengis.feature.AttributeType; -import org.opengis.feature.PropertyNotFoundException; -import org.opengis.filter.Expression; -import org.opengis.filter.Filter; -import org.opengis.filter.Literal; -import org.opengis.filter.LogicalOperator; -import org.opengis.filter.LogicalOperatorName; -import org.opengis.filter.SpatialOperatorName; -import org.opengis.filter.ValueReference; -import org.apache.sis.geometry.wrapper.*; +// Specific to the main branch: +import org.apache.sis.feature.AbstractFeature; +import org.apache.sis.feature.DefaultFeatureType; +import org.apache.sis.feature.AbstractIdentifiedType; +import org.apache.sis.feature.DefaultAttributeType; +import org.apache.sis.filter.Expression; +import org.apache.sis.filter.Filter; +import org.apache.sis.geometry.wrapper.Geometries; +import org.apache.sis.pending.geoapi.filter.Literal; +import org.apache.sis.pending.geoapi.filter.LogicalOperator; +import org.apache.sis.pending.geoapi.filter.LogicalOperatorName; +import org.apache.sis.pending.geoapi.filter.SpatialOperatorName; +import org.apache.sis.pending.geoapi.filter.ValueReference; /** diff --cc optional/src/org.apache.sis.gui/main/org/apache/sis/gui/referencing/FilterByDatum.java index 8e2648cf3e,fd4283740f..128447befd --- a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/referencing/FilterByDatum.java +++ b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/referencing/FilterByDatum.java @@@ -33,12 -33,9 +33,12 @@@ import org.opengis.referencing.crs.Temp import org.opengis.referencing.crs.VerticalCRS; import org.opengis.referencing.crs.EngineeringCRS; import org.apache.sis.util.Classes; - import org.apache.sis.referencing.CRS; import org.apache.sis.util.Utilities; + import org.apache.sis.referencing.CRS; +// Specific to the main branch: +import static org.apache.sis.pending.geoapi.referencing.MissingMethods.getDatumEnsemble; + /** * Filter of reference systems that are compatible with the data to render.
