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 3adfcd615c Import order in preparation for merge.
3adfcd615c is described below
commit 3adfcd615cb638dcc1de5b7d69ecb96b2b869832
Author: Martin Desruisseaux <[email protected]>
AuthorDate: Thu Nov 23 13:59:36 2023 +0100
Import order in preparation for merge.
---
.../org/apache/sis/storage/shapefile/ListingPropertyVisitor.java | 5 ++++-
.../main/org/apache/sis/storage/shapefile/ShapefileStore.java | 9 ++++-----
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git
a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/ListingPropertyVisitor.java
b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/ListingPropertyVisitor.java
index 819d9340d0..c3f55427fd 100644
---
a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/ListingPropertyVisitor.java
+++
b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/ListingPropertyVisitor.java
@@ -17,8 +17,11 @@
package org.apache.sis.storage.shapefile;
import java.util.Collection;
+import org.opengis.util.CodeList;
import org.apache.sis.filter.internal.FunctionNames;
import org.apache.sis.filter.internal.Visitor;
+
+// Specific to the geoapi-3.1 and geoapi-4.0 branches:
import org.opengis.filter.BetweenComparisonOperator;
import org.opengis.filter.Filter;
import org.opengis.filter.Expression;
@@ -26,7 +29,7 @@ import org.opengis.filter.ValueReference;
import org.opengis.filter.ComparisonOperatorName;
import org.opengis.filter.LikeOperator;
import org.opengis.filter.LogicalOperator;
-import org.opengis.util.CodeList;
+
/**
* Expression visitor that returns a list of all Feature attributs requiered
by this expression.
diff --git
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
index ec68d29f9d..f17560575a 100644
---
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
@@ -48,13 +48,13 @@ import java.util.logging.Level;
import java.util.logging.Logger;
import java.util.stream.Stream;
import java.util.stream.StreamSupport;
-import org.apache.sis.feature.Features;
-import org.apache.sis.geometry.wrapper.Geometries;
+import org.opengis.util.CodeList;
import org.opengis.geometry.Envelope;
import org.opengis.metadata.Metadata;
import org.opengis.parameter.ParameterValueGroup;
import org.opengis.referencing.crs.CoordinateReferenceSystem;
+import org.opengis.referencing.operation.TransformException;
import org.opengis.util.FactoryException;
import org.opengis.util.GenericName;
import org.apache.sis.feature.builder.AttributeRole;
@@ -66,6 +66,7 @@ import org.apache.sis.filter.Optimization;
import org.apache.sis.filter.internal.FunctionNames;
import org.apache.sis.geometry.Envelopes;
import org.apache.sis.geometry.GeneralEnvelope;
+import org.apache.sis.geometry.wrapper.Geometries;
import org.apache.sis.io.stream.ChannelDataInput;
import org.apache.sis.io.stream.ChannelDataOutput;
import org.apache.sis.io.stream.IOUtilities;
@@ -101,12 +102,12 @@ import org.locationtech.jts.geom.MultiPoint;
import org.locationtech.jts.geom.MultiPolygon;
import org.locationtech.jts.geom.Point;
import org.locationtech.jts.geom.Polygon;
-import org.opengis.feature.AttributeType;
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
import org.opengis.feature.Feature;
import org.opengis.feature.FeatureType;
import org.opengis.feature.PropertyType;
+import org.opengis.feature.AttributeType;
import org.opengis.filter.Expression;
import org.opengis.filter.Filter;
import org.opengis.filter.Literal;
@@ -114,8 +115,6 @@ import org.opengis.filter.LogicalOperator;
import org.opengis.filter.LogicalOperatorName;
import org.opengis.filter.SpatialOperatorName;
import org.opengis.filter.ValueReference;
-import org.opengis.referencing.operation.TransformException;
-import org.opengis.util.CodeList;
/**
