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 1a7a2aac78 Post-merge automatic import reorganization.
1a7a2aac78 is described below
commit 1a7a2aac78a9b258e4574bf97b6fc06a3dacdeed
Author: Martin Desruisseaux <[email protected]>
AuthorDate: Sat Feb 3 12:03:02 2024 +0100
Post-merge automatic import reorganization.
---
.../org/apache/sis/console/OperationParser.java | 2 +-
.../sis/geometry/wrapper/GeometryWrapper.java | 2 +-
.../apache/sis/geometry/wrapper/jts/Wrapper.java | 2 +-
.../main/org/apache/sis/xml/util/URISource.java | 2 +-
.../apache/sis/map/service/GraphicsPortrayer.java | 1 +
.../apache/sis/map/service/RenderingException.java | 1 +
.../main/org/apache/sis/map/service/Scene2D.java | 1 +
.../org/apache/sis/map/service/StylePainter.java | 1 +
.../apache/sis/map/service/se1/LineToScene2D.java | 23 +++++++++++-----------
.../apache/sis/map/service/se1/PointToScene2D.java | 3 ++-
.../sis/map/service/se1/PolygonToScene2D.java | 3 ++-
.../sis/map/service/se1/PresentationToScene2D.java | 12 +++++------
.../sis/map/service/se1/RasterToScene2D.java | 11 ++++++-----
.../apache/sis/map/service/se1/RenderedShape.java | 1 +
.../org/apache/sis/map/service/se1/SEPainter.java | 1 +
.../sis/map/service/se1/SymbolizerCache.java | 1 +
.../sis/map/service/se1/SymbolizerToScene2D.java | 7 ++++---
.../apache/sis/map/service/se1/TextToScene2D.java | 3 ++-
.../sis/map/service/GraphicsPortrayerTest.java | 17 +++++++++-------
19 files changed, 55 insertions(+), 39 deletions(-)
diff --git
a/endorsed/src/org.apache.sis.console/main/org/apache/sis/console/OperationParser.java
b/endorsed/src/org.apache.sis.console/main/org/apache/sis/console/OperationParser.java
index 6c019724ac..e673da12c0 100644
---
a/endorsed/src/org.apache.sis.console/main/org/apache/sis/console/OperationParser.java
+++
b/endorsed/src/org.apache.sis.console/main/org/apache/sis/console/OperationParser.java
@@ -18,10 +18,10 @@ package org.apache.sis.console;
import java.util.Optional;
import org.opengis.metadata.Metadata;
+import org.opengis.referencing.operation.CoordinateOperation;
import org.apache.sis.storage.DataStoreException;
import org.apache.sis.storage.StorageConnector;
import org.apache.sis.storage.base.PRJDataStore;
-import org.opengis.referencing.operation.CoordinateOperation;
/**
diff --git
a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/GeometryWrapper.java
b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/GeometryWrapper.java
index 882fa1e96d..7771d235e7 100644
---
a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/GeometryWrapper.java
+++
b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/GeometryWrapper.java
@@ -28,6 +28,7 @@ import org.opengis.geometry.Geometry;
import org.opengis.geometry.DirectPosition;
import org.opengis.referencing.crs.CoordinateReferenceSystem;
import org.opengis.referencing.operation.CoordinateOperation;
+import org.opengis.referencing.operation.MathTransform;
import org.opengis.referencing.operation.TransformException;
import org.opengis.util.FactoryException;
import org.apache.sis.geometry.GeneralEnvelope;
@@ -47,7 +48,6 @@ import org.opengis.geometry.complex.Complex;
import org.opengis.filter.SpatialOperatorName;
import org.opengis.filter.DistanceOperatorName;
import org.opengis.filter.InvalidFilterValueException;
-import org.opengis.referencing.operation.MathTransform;
/**
diff --git
a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/jts/Wrapper.java
b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/jts/Wrapper.java
index aeede8b8a3..695fe65cd1 100644
---
a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/jts/Wrapper.java
+++
b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/jts/Wrapper.java
@@ -45,6 +45,7 @@ import org.opengis.util.FactoryException;
import org.opengis.geometry.DirectPosition;
import org.opengis.referencing.crs.CoordinateReferenceSystem;
import org.opengis.referencing.operation.CoordinateOperation;
+import org.opengis.referencing.operation.MathTransform;
import org.opengis.referencing.operation.TransformException;
import org.apache.sis.referencing.util.ReferencingUtilities;
import org.apache.sis.geometry.DirectPosition2D;
@@ -64,7 +65,6 @@ import org.apache.sis.filter.sqlmm.SQLMM;
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
import org.opengis.filter.SpatialOperatorName;
import org.opengis.filter.DistanceOperatorName;
-import org.opengis.referencing.operation.MathTransform;
/**
diff --git
a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/util/URISource.java
b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/util/URISource.java
index 38aed58dbe..01f9e74dbf 100644
---
a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/util/URISource.java
+++
b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/util/URISource.java
@@ -17,9 +17,9 @@
package org.apache.sis.xml.util;
import java.io.File;
+import java.io.InputStream;
import java.net.URI;
import java.net.URISyntaxException;
-import java.io.InputStream;
import javax.xml.transform.stream.StreamSource;
import org.apache.sis.util.internal.Strings;
diff --git
a/incubator/src/org.apache.sis.portrayal.map/main/org/apache/sis/map/service/GraphicsPortrayer.java
b/incubator/src/org.apache.sis.portrayal.map/main/org/apache/sis/map/service/GraphicsPortrayer.java
index feb4597426..f3c383200a 100644
---
a/incubator/src/org.apache.sis.portrayal.map/main/org/apache/sis/map/service/GraphicsPortrayer.java
+++
b/incubator/src/org.apache.sis.portrayal.map/main/org/apache/sis/map/service/GraphicsPortrayer.java
@@ -33,6 +33,7 @@ import org.apache.sis.map.SEPortrayer;
import org.apache.sis.style.Style;
import org.apache.sis.util.ArgumentChecks;
+
/**
* Produce rendered image of styled resources.
*
diff --git
a/incubator/src/org.apache.sis.portrayal.map/main/org/apache/sis/map/service/RenderingException.java
b/incubator/src/org.apache.sis.portrayal.map/main/org/apache/sis/map/service/RenderingException.java
index 0257342767..e385b8c0de 100644
---
a/incubator/src/org.apache.sis.portrayal.map/main/org/apache/sis/map/service/RenderingException.java
+++
b/incubator/src/org.apache.sis.portrayal.map/main/org/apache/sis/map/service/RenderingException.java
@@ -16,6 +16,7 @@
*/
package org.apache.sis.map.service;
+
/**
* Exception that may be thrown by a portraying operation.
*
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 e034f4467f..12a25b0533 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
@@ -21,6 +21,7 @@ import java.util.logging.Logger;
import org.apache.sis.coverage.grid.GridGeometry;
import org.apache.sis.util.ArgumentChecks;
+
/**
* Holds the rendering properties.
*
diff --git
a/incubator/src/org.apache.sis.portrayal.map/main/org/apache/sis/map/service/StylePainter.java
b/incubator/src/org.apache.sis.portrayal.map/main/org/apache/sis/map/service/StylePainter.java
index df01ef9047..e7e0532c5d 100644
---
a/incubator/src/org.apache.sis.portrayal.map/main/org/apache/sis/map/service/StylePainter.java
+++
b/incubator/src/org.apache.sis.portrayal.map/main/org/apache/sis/map/service/StylePainter.java
@@ -22,6 +22,7 @@ import org.apache.sis.map.MapLayer;
import org.apache.sis.map.Presentation;
import org.apache.sis.style.Style;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git
a/incubator/src/org.apache.sis.portrayal.map/main/org/apache/sis/map/service/se1/LineToScene2D.java
b/incubator/src/org.apache.sis.portrayal.map/main/org/apache/sis/map/service/se1/LineToScene2D.java
index e28f4dd8de..9ea43249b6 100644
---
a/incubator/src/org.apache.sis.portrayal.map/main/org/apache/sis/map/service/se1/LineToScene2D.java
+++
b/incubator/src/org.apache.sis.portrayal.map/main/org/apache/sis/map/service/se1/LineToScene2D.java
@@ -16,22 +16,11 @@
*/
package org.apache.sis.map.service.se1;
-import org.apache.sis.map.service.Scene2D;
import java.awt.BasicStroke;
import java.awt.Color;
import java.awt.Shape;
import java.util.function.Consumer;
import java.util.stream.Stream;
-import org.apache.sis.feature.internal.AttributeConvention;
-import org.apache.sis.geometry.wrapper.Geometries;
-import org.apache.sis.geometry.wrapper.GeometryWrapper;
-import org.apache.sis.geometry.wrapper.jts.JTS;
-import org.apache.sis.map.Presentation;
-import org.apache.sis.map.SEPresentation;
-import org.apache.sis.map.service.RenderingException;
-import org.apache.sis.referencing.CRS;
-import org.apache.sis.referencing.operation.transform.MathTransforms;
-import org.apache.sis.style.se1.LineSymbolizer;
import org.locationtech.jts.geom.Geometry;
import org.opengis.feature.Feature;
import org.opengis.referencing.crs.CoordinateReferenceSystem;
@@ -40,6 +29,18 @@ import org.opengis.referencing.operation.CoordinateOperation;
import org.opengis.referencing.operation.MathTransform;
import org.opengis.referencing.operation.TransformException;
import org.opengis.util.FactoryException;
+import org.apache.sis.map.Presentation;
+import org.apache.sis.map.SEPresentation;
+import org.apache.sis.map.service.Scene2D;
+import org.apache.sis.map.service.RenderingException;
+import org.apache.sis.feature.internal.AttributeConvention;
+import org.apache.sis.geometry.wrapper.Geometries;
+import org.apache.sis.geometry.wrapper.GeometryWrapper;
+import org.apache.sis.geometry.wrapper.jts.JTS;
+import org.apache.sis.referencing.CRS;
+import org.apache.sis.referencing.operation.transform.MathTransforms;
+import org.apache.sis.style.se1.LineSymbolizer;
+
/**
* Support for LineSymbolizer rendering.
diff --git
a/incubator/src/org.apache.sis.portrayal.map/main/org/apache/sis/map/service/se1/PointToScene2D.java
b/incubator/src/org.apache.sis.portrayal.map/main/org/apache/sis/map/service/se1/PointToScene2D.java
index 4faa39b287..f5863c193f 100644
---
a/incubator/src/org.apache.sis.portrayal.map/main/org/apache/sis/map/service/se1/PointToScene2D.java
+++
b/incubator/src/org.apache.sis.portrayal.map/main/org/apache/sis/map/service/se1/PointToScene2D.java
@@ -16,15 +16,16 @@
*/
package org.apache.sis.map.service.se1;
-import org.apache.sis.map.service.Scene2D;
import java.awt.Shape;
import java.util.function.Consumer;
import java.util.stream.Stream;
import org.apache.sis.map.Presentation;
import org.apache.sis.map.SEPresentation;
+import org.apache.sis.map.service.Scene2D;
import org.apache.sis.map.service.RenderingException;
import org.apache.sis.style.se1.PointSymbolizer;
+
/**
* Support for PointSymbolizer rendering.
*
diff --git
a/incubator/src/org.apache.sis.portrayal.map/main/org/apache/sis/map/service/se1/PolygonToScene2D.java
b/incubator/src/org.apache.sis.portrayal.map/main/org/apache/sis/map/service/se1/PolygonToScene2D.java
index 626424df5d..e617e5277d 100644
---
a/incubator/src/org.apache.sis.portrayal.map/main/org/apache/sis/map/service/se1/PolygonToScene2D.java
+++
b/incubator/src/org.apache.sis.portrayal.map/main/org/apache/sis/map/service/se1/PolygonToScene2D.java
@@ -16,15 +16,16 @@
*/
package org.apache.sis.map.service.se1;
-import org.apache.sis.map.service.Scene2D;
import java.awt.Shape;
import java.util.function.Consumer;
import java.util.stream.Stream;
import org.apache.sis.map.Presentation;
import org.apache.sis.map.SEPresentation;
+import org.apache.sis.map.service.Scene2D;
import org.apache.sis.map.service.RenderingException;
import org.apache.sis.style.se1.PolygonSymbolizer;
+
/**
* Support for PointSymbolizer rendering.
*
diff --git
a/incubator/src/org.apache.sis.portrayal.map/main/org/apache/sis/map/service/se1/PresentationToScene2D.java
b/incubator/src/org.apache.sis.portrayal.map/main/org/apache/sis/map/service/se1/PresentationToScene2D.java
index baa991628c..c479c8018f 100644
---
a/incubator/src/org.apache.sis.portrayal.map/main/org/apache/sis/map/service/se1/PresentationToScene2D.java
+++
b/incubator/src/org.apache.sis.portrayal.map/main/org/apache/sis/map/service/se1/PresentationToScene2D.java
@@ -16,7 +16,6 @@
*/
package org.apache.sis.map.service.se1;
-import org.apache.sis.map.service.Scene2D;
import java.awt.Graphics2D;
import java.awt.Shape;
import java.io.IOException;
@@ -27,17 +26,18 @@ import java.util.function.Consumer;
import java.util.function.Predicate;
import java.util.logging.Level;
import java.util.stream.Stream;
-import org.apache.sis.coverage.grid.GridGeometry;
+import org.opengis.geometry.MismatchedDimensionException;
+import org.opengis.referencing.operation.NoninvertibleTransformException;
+import org.opengis.referencing.operation.TransformException;
+import org.opengis.util.FactoryException;
import org.apache.sis.map.Presentation;
import org.apache.sis.map.SEPresentation;
+import org.apache.sis.map.service.Scene2D;
import org.apache.sis.map.service.RenderingException;
+import org.apache.sis.coverage.grid.GridGeometry;
import org.apache.sis.storage.DataStoreException;
import org.apache.sis.style.se1.Symbolizer;
import org.apache.sis.util.ArgumentChecks;
-import org.opengis.geometry.MismatchedDimensionException;
-import org.opengis.referencing.operation.NoninvertibleTransformException;
-import org.opengis.referencing.operation.TransformException;
-import org.opengis.util.FactoryException;
/**
diff --git
a/incubator/src/org.apache.sis.portrayal.map/main/org/apache/sis/map/service/se1/RasterToScene2D.java
b/incubator/src/org.apache.sis.portrayal.map/main/org/apache/sis/map/service/se1/RasterToScene2D.java
index 4a2560ff01..c5af1045ee 100644
---
a/incubator/src/org.apache.sis.portrayal.map/main/org/apache/sis/map/service/se1/RasterToScene2D.java
+++
b/incubator/src/org.apache.sis.portrayal.map/main/org/apache/sis/map/service/se1/RasterToScene2D.java
@@ -16,27 +16,28 @@
*/
package org.apache.sis.map.service.se1;
-import org.apache.sis.map.service.Scene2D;
import java.awt.Shape;
import java.awt.image.RenderedImage;
import java.util.function.Consumer;
import java.util.logging.Level;
import java.util.stream.Stream;
+import org.opengis.referencing.operation.TransformException;
+import org.apache.sis.map.Presentation;
+import org.apache.sis.map.SEPresentation;
+import org.apache.sis.map.service.Scene2D;
+import org.apache.sis.map.service.RenderingException;
import org.apache.sis.coverage.grid.GridCoverage;
import org.apache.sis.coverage.grid.GridCoverageBuilder;
import org.apache.sis.coverage.grid.GridCoverageProcessor;
import org.apache.sis.coverage.grid.GridDerivation;
import org.apache.sis.coverage.grid.GridExtent;
import org.apache.sis.coverage.grid.GridGeometry;
-import org.apache.sis.map.Presentation;
-import org.apache.sis.map.SEPresentation;
-import org.apache.sis.map.service.RenderingException;
import org.apache.sis.storage.DataStoreException;
import org.apache.sis.storage.GridCoverageResource;
import org.apache.sis.storage.NoSuchDataException;
import org.apache.sis.storage.Resource;
import org.apache.sis.style.se1.RasterSymbolizer;
-import org.opengis.referencing.operation.TransformException;
+
/**
* Support for RasterSymbolizer rendering.
diff --git
a/incubator/src/org.apache.sis.portrayal.map/main/org/apache/sis/map/service/se1/RenderedShape.java
b/incubator/src/org.apache.sis.portrayal.map/main/org/apache/sis/map/service/se1/RenderedShape.java
index cc8cebed55..9f4cb84d7d 100644
---
a/incubator/src/org.apache.sis.portrayal.map/main/org/apache/sis/map/service/se1/RenderedShape.java
+++
b/incubator/src/org.apache.sis.portrayal.map/main/org/apache/sis/map/service/se1/RenderedShape.java
@@ -23,6 +23,7 @@ import java.awt.Shape;
import java.awt.Stroke;
import java.awt.geom.Area;
+
/**
* Combine an AWT Shape and it's rendering options.
*
diff --git
a/incubator/src/org.apache.sis.portrayal.map/main/org/apache/sis/map/service/se1/SEPainter.java
b/incubator/src/org.apache.sis.portrayal.map/main/org/apache/sis/map/service/se1/SEPainter.java
index 7e669636bc..a55523d2c5 100644
---
a/incubator/src/org.apache.sis.portrayal.map/main/org/apache/sis/map/service/se1/SEPainter.java
+++
b/incubator/src/org.apache.sis.portrayal.map/main/org/apache/sis/map/service/se1/SEPainter.java
@@ -26,6 +26,7 @@ import org.apache.sis.map.service.StylePainter;
import org.apache.sis.style.Style;
import org.apache.sis.style.se1.Symbology;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git
a/incubator/src/org.apache.sis.portrayal.map/main/org/apache/sis/map/service/se1/SymbolizerCache.java
b/incubator/src/org.apache.sis.portrayal.map/main/org/apache/sis/map/service/se1/SymbolizerCache.java
index 6057cd4679..0bddfc2b60 100644
---
a/incubator/src/org.apache.sis.portrayal.map/main/org/apache/sis/map/service/se1/SymbolizerCache.java
+++
b/incubator/src/org.apache.sis.portrayal.map/main/org/apache/sis/map/service/se1/SymbolizerCache.java
@@ -16,6 +16,7 @@
*/
package org.apache.sis.map.service.se1;
+
/**
* Subclassed by symbolizer who have resource caches.
* This could contain images or models.
diff --git
a/incubator/src/org.apache.sis.portrayal.map/main/org/apache/sis/map/service/se1/SymbolizerToScene2D.java
b/incubator/src/org.apache.sis.portrayal.map/main/org/apache/sis/map/service/se1/SymbolizerToScene2D.java
index 4d2244cfe2..09b78ae8c3 100644
---
a/incubator/src/org.apache.sis.portrayal.map/main/org/apache/sis/map/service/se1/SymbolizerToScene2D.java
+++
b/incubator/src/org.apache.sis.portrayal.map/main/org/apache/sis/map/service/se1/SymbolizerToScene2D.java
@@ -16,7 +16,6 @@
*/
package org.apache.sis.map.service.se1;
-import org.apache.sis.map.service.Scene2D;
import java.awt.Shape;
import java.util.ArrayList;
import java.util.Collections;
@@ -27,14 +26,16 @@ import java.util.ServiceLoader;
import java.util.function.Consumer;
import java.util.logging.Logger;
import java.util.stream.Stream;
+import org.opengis.feature.Feature;
+import org.opengis.filter.Expression;
import org.apache.sis.map.Presentation;
import org.apache.sis.map.SEPresentation;
+import org.apache.sis.map.service.Scene2D;
import org.apache.sis.map.service.RenderingException;
import org.apache.sis.style.se1.Symbolizer;
import org.apache.sis.util.ArgumentChecks;
import org.apache.sis.util.ObjectConverters;
-import org.opengis.feature.Feature;
-import org.opengis.filter.Expression;
+
/**
* Transforms a {@link Presentation} to Java2D graphics.
diff --git
a/incubator/src/org.apache.sis.portrayal.map/main/org/apache/sis/map/service/se1/TextToScene2D.java
b/incubator/src/org.apache.sis.portrayal.map/main/org/apache/sis/map/service/se1/TextToScene2D.java
index 4a282ff820..8378bfde99 100644
---
a/incubator/src/org.apache.sis.portrayal.map/main/org/apache/sis/map/service/se1/TextToScene2D.java
+++
b/incubator/src/org.apache.sis.portrayal.map/main/org/apache/sis/map/service/se1/TextToScene2D.java
@@ -16,15 +16,16 @@
*/
package org.apache.sis.map.service.se1;
-import org.apache.sis.map.service.Scene2D;
import java.awt.Shape;
import java.util.function.Consumer;
import java.util.stream.Stream;
import org.apache.sis.map.Presentation;
import org.apache.sis.map.SEPresentation;
+import org.apache.sis.map.service.Scene2D;
import org.apache.sis.map.service.RenderingException;
import org.apache.sis.style.se1.TextSymbolizer;
+
/**
* Support for PointSymbolizer rendering.
*
diff --git
a/incubator/src/org.apache.sis.portrayal.map/test/org/apache/sis/map/service/GraphicsPortrayerTest.java
b/incubator/src/org.apache.sis.portrayal.map/test/org/apache/sis/map/service/GraphicsPortrayerTest.java
index c584b16741..5cc5a4b851 100644
---
a/incubator/src/org.apache.sis.portrayal.map/test/org/apache/sis/map/service/GraphicsPortrayerTest.java
+++
b/incubator/src/org.apache.sis.portrayal.map/test/org/apache/sis/map/service/GraphicsPortrayerTest.java
@@ -21,6 +21,12 @@ import java.awt.Rectangle;
import java.awt.image.BufferedImage;
import java.util.Arrays;
import java.util.stream.Stream;
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.geom.LineString;
+import org.opengis.feature.Feature;
+import org.opengis.feature.FeatureType;
import org.apache.sis.coverage.grid.GridExtent;
import org.apache.sis.coverage.grid.GridGeometry;
import org.apache.sis.coverage.grid.GridOrientation;
@@ -37,14 +43,11 @@ import org.apache.sis.style.se1.LineSymbolizer;
import org.apache.sis.style.se1.Rule;
import org.apache.sis.style.se1.Symbolizer;
import org.apache.sis.style.se1.Symbology;
+
+// Test dependencies
import static org.junit.Assert.*;
import org.junit.Test;
-import org.locationtech.jts.geom.Coordinate;
-import org.locationtech.jts.geom.Geometry;
-import org.locationtech.jts.geom.GeometryFactory;
-import org.locationtech.jts.geom.LineString;
-import org.opengis.feature.Feature;
-import org.opengis.feature.FeatureType;
+
/**
*
@@ -153,4 +156,4 @@ public class GraphicsPortrayerTest {
return style;
}
-}
\ No newline at end of file
+}
