sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject [sis] 03/03: Move `PlanarCanvas` and dependencies in public package. They were already visible because of `MapCanvas` extending `PlanarCanvas`.
Date Mon, 13 Apr 2020 21:06:06 GMT
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

commit f9154f79ed896eef69b1038d5cede66ebfc06e13
Author: Martin Desruisseaux <martin.desruisseaux@geomatys.com>
AuthorDate: Mon Apr 13 22:50:07 2020 +0200

    Move `PlanarCanvas` and dependencies in public package. They were already visible because
of `MapCanvas` extending `PlanarCanvas`.
---
 .../src/main/java/org/apache/sis/gui/map/MapCanvas.java           | 4 ++--
 .../src/main/java/org/apache/sis/gui/map/StatusBar.java           | 2 +-
 .../src/main/java/org/apache/sis/internal/map/GridCanvas.java     | 2 ++
 .../src/main/java/org/apache/sis/internal/map/Presentation.java   | 1 +
 .../src/main/java/org/apache/sis/internal/map/package-info.java   | 1 -
 .../java/org/apache/sis/{internal/map => portrayal}/Canvas.java   | 2 +-
 .../org/apache/sis/{internal/map => portrayal}/CanvasContext.java | 2 +-
 .../org/apache/sis/{internal/map => portrayal}/CanvasExtent.java  | 2 +-
 .../java/org/apache/sis/{internal/map => portrayal}/MapItem.java  | 4 ++--
 .../java/org/apache/sis/{internal/map => portrayal}/MapLayer.java | 2 +-
 .../org/apache/sis/{internal/map => portrayal}/MapLayers.java     | 2 +-
 .../org/apache/sis/{internal/map => portrayal}/Observable.java    | 2 +-
 .../org/apache/sis/{internal/map => portrayal}/PlanarCanvas.java  | 2 +-
 .../apache/sis/{internal/map => portrayal}/RenderException.java   | 2 +-
 .../org/apache/sis/{internal/map => portrayal}/package-info.java  | 8 ++------
 15 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/application/sis-javafx/src/main/java/org/apache/sis/gui/map/MapCanvas.java b/application/sis-javafx/src/main/java/org/apache/sis/gui/map/MapCanvas.java
index 10ce967..fec92f2 100644
--- a/application/sis-javafx/src/main/java/org/apache/sis/gui/map/MapCanvas.java
+++ b/application/sis-javafx/src/main/java/org/apache/sis/gui/map/MapCanvas.java
@@ -52,8 +52,8 @@ import org.apache.sis.util.ArgumentChecks;
 import org.apache.sis.util.logging.Logging;
 import org.apache.sis.internal.util.Numerics;
 import org.apache.sis.internal.gui.BackgroundThreads;
-import org.apache.sis.internal.map.PlanarCanvas;
-import org.apache.sis.internal.map.RenderException;
+import org.apache.sis.portrayal.PlanarCanvas;
+import org.apache.sis.portrayal.RenderException;
 import org.apache.sis.internal.system.Modules;
 
 
diff --git a/application/sis-javafx/src/main/java/org/apache/sis/gui/map/StatusBar.java b/application/sis-javafx/src/main/java/org/apache/sis/gui/map/StatusBar.java
index fb794b7..baf82c0 100644
--- a/application/sis-javafx/src/main/java/org/apache/sis/gui/map/StatusBar.java
+++ b/application/sis-javafx/src/main/java/org/apache/sis/gui/map/StatusBar.java
@@ -49,7 +49,7 @@ import org.apache.sis.geometry.GeneralDirectPosition;
 import org.apache.sis.geometry.CoordinateFormat;
 import org.apache.sis.coverage.grid.GridGeometry;
 import org.apache.sis.coverage.grid.GridExtent;
-import org.apache.sis.internal.map.RenderException;
+import org.apache.sis.portrayal.RenderException;
 import org.apache.sis.internal.util.Strings;
 import org.apache.sis.measure.Units;
 import org.apache.sis.util.Classes;
diff --git a/core/sis-portrayal/src/main/java/org/apache/sis/internal/map/GridCanvas.java
b/core/sis-portrayal/src/main/java/org/apache/sis/internal/map/GridCanvas.java
index 32369e4..8605e12 100644
--- a/core/sis-portrayal/src/main/java/org/apache/sis/internal/map/GridCanvas.java
+++ b/core/sis-portrayal/src/main/java/org/apache/sis/internal/map/GridCanvas.java
@@ -27,6 +27,8 @@ import org.apache.sis.geometry.Envelopes;
 import org.apache.sis.geometry.GeneralEnvelope;
 import org.apache.sis.internal.referencing.j2d.AffineTransform2D;
 import org.apache.sis.internal.referencing.provider.Affine;
+import org.apache.sis.portrayal.PlanarCanvas;
+import org.apache.sis.portrayal.RenderException;
 import org.apache.sis.referencing.CRS;
 import org.apache.sis.referencing.CommonCRS;
 import org.apache.sis.referencing.crs.DefaultDerivedCRS;
diff --git a/core/sis-portrayal/src/main/java/org/apache/sis/internal/map/Presentation.java
b/core/sis-portrayal/src/main/java/org/apache/sis/internal/map/Presentation.java
index e1b88fe..6dca273 100644
--- a/core/sis-portrayal/src/main/java/org/apache/sis/internal/map/Presentation.java
+++ b/core/sis-portrayal/src/main/java/org/apache/sis/internal/map/Presentation.java
@@ -19,6 +19,7 @@ package org.apache.sis.internal.map;
 import org.opengis.feature.Feature;
 import org.apache.sis.storage.DataStore;
 import org.apache.sis.coverage.grid.GridCoverage;
+import org.apache.sis.portrayal.MapLayer;
 
 
 /**
diff --git a/core/sis-portrayal/src/main/java/org/apache/sis/internal/map/package-info.java
b/core/sis-portrayal/src/main/java/org/apache/sis/internal/map/package-info.java
index 431b304..304a16e 100644
--- a/core/sis-portrayal/src/main/java/org/apache/sis/internal/map/package-info.java
+++ b/core/sis-portrayal/src/main/java/org/apache/sis/internal/map/package-info.java
@@ -18,7 +18,6 @@
 
 /**
  * Symbology and map representations, together with a rendering engine for display.
- * The {@linkplain org.apache.sis.internal.map.MapItem map item} is the root node of a map.
  *
  * <p><b>WARNING:</b> this package is work in progress and is not yet part
of public API.
  * Some classes in this package will move to public API after we gained enough confidence
diff --git a/core/sis-portrayal/src/main/java/org/apache/sis/internal/map/Canvas.java b/core/sis-portrayal/src/main/java/org/apache/sis/portrayal/Canvas.java
similarity index 99%
rename from core/sis-portrayal/src/main/java/org/apache/sis/internal/map/Canvas.java
rename to core/sis-portrayal/src/main/java/org/apache/sis/portrayal/Canvas.java
index a234e20..c8de211 100644
--- a/core/sis-portrayal/src/main/java/org/apache/sis/internal/map/Canvas.java
+++ b/core/sis-portrayal/src/main/java/org/apache/sis/portrayal/Canvas.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sis.internal.map;
+package org.apache.sis.portrayal;
 
 import java.util.ArrayList;
 import java.util.Locale;
diff --git a/core/sis-portrayal/src/main/java/org/apache/sis/internal/map/CanvasContext.java
b/core/sis-portrayal/src/main/java/org/apache/sis/portrayal/CanvasContext.java
similarity index 99%
rename from core/sis-portrayal/src/main/java/org/apache/sis/internal/map/CanvasContext.java
rename to core/sis-portrayal/src/main/java/org/apache/sis/portrayal/CanvasContext.java
index 6f76f0b..d9efe45 100644
--- a/core/sis-portrayal/src/main/java/org/apache/sis/internal/map/CanvasContext.java
+++ b/core/sis-portrayal/src/main/java/org/apache/sis/portrayal/CanvasContext.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sis.internal.map;
+package org.apache.sis.portrayal;
 
 import java.util.Optional;
 import java.util.OptionalDouble;
diff --git a/core/sis-portrayal/src/main/java/org/apache/sis/internal/map/CanvasExtent.java
b/core/sis-portrayal/src/main/java/org/apache/sis/portrayal/CanvasExtent.java
similarity index 99%
rename from core/sis-portrayal/src/main/java/org/apache/sis/internal/map/CanvasExtent.java
rename to core/sis-portrayal/src/main/java/org/apache/sis/portrayal/CanvasExtent.java
index 85f35cc..3965f10 100644
--- a/core/sis-portrayal/src/main/java/org/apache/sis/internal/map/CanvasExtent.java
+++ b/core/sis-portrayal/src/main/java/org/apache/sis/portrayal/CanvasExtent.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sis.internal.map;
+package org.apache.sis.portrayal;
 
 import java.util.List;
 import org.opengis.geometry.DirectPosition;
diff --git a/core/sis-portrayal/src/main/java/org/apache/sis/internal/map/MapItem.java b/core/sis-portrayal/src/main/java/org/apache/sis/portrayal/MapItem.java
similarity index 99%
rename from core/sis-portrayal/src/main/java/org/apache/sis/internal/map/MapItem.java
rename to core/sis-portrayal/src/main/java/org/apache/sis/portrayal/MapItem.java
index 9cc7289..c233ab9 100644
--- a/core/sis-portrayal/src/main/java/org/apache/sis/internal/map/MapItem.java
+++ b/core/sis-portrayal/src/main/java/org/apache/sis/portrayal/MapItem.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sis.internal.map;
+package org.apache.sis.portrayal;
 
 import java.util.Map;
 import java.util.HashMap;
@@ -25,7 +25,7 @@ import org.opengis.util.InternationalString;
 
 /**
  * Base class of map layer or group of map layers. This base class does not represent graphical
elements.
- * Instead it contains information (data and style) for creating a tree of {@link Presentation}
objects.
+ * Instead it contains information (data and style) for creating a tree of portrayal objects.
  * A {@code MapItem} contains the following properties:
  *
  * <ul>
diff --git a/core/sis-portrayal/src/main/java/org/apache/sis/internal/map/MapLayer.java b/core/sis-portrayal/src/main/java/org/apache/sis/portrayal/MapLayer.java
similarity index 99%
rename from core/sis-portrayal/src/main/java/org/apache/sis/internal/map/MapLayer.java
rename to core/sis-portrayal/src/main/java/org/apache/sis/portrayal/MapLayer.java
index cf0d363..a615814 100644
--- a/core/sis-portrayal/src/main/java/org/apache/sis/internal/map/MapLayer.java
+++ b/core/sis-portrayal/src/main/java/org/apache/sis/portrayal/MapLayer.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sis.internal.map;
+package org.apache.sis.portrayal;
 
 import java.util.Objects;
 import org.opengis.style.Style;
diff --git a/core/sis-portrayal/src/main/java/org/apache/sis/internal/map/MapLayers.java b/core/sis-portrayal/src/main/java/org/apache/sis/portrayal/MapLayers.java
similarity index 99%
rename from core/sis-portrayal/src/main/java/org/apache/sis/internal/map/MapLayers.java
rename to core/sis-portrayal/src/main/java/org/apache/sis/portrayal/MapLayers.java
index 2ea1bc1..e5f8429 100644
--- a/core/sis-portrayal/src/main/java/org/apache/sis/internal/map/MapLayers.java
+++ b/core/sis-portrayal/src/main/java/org/apache/sis/portrayal/MapLayers.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sis.internal.map;
+package org.apache.sis.portrayal;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/core/sis-portrayal/src/main/java/org/apache/sis/internal/map/Observable.java
b/core/sis-portrayal/src/main/java/org/apache/sis/portrayal/Observable.java
similarity index 99%
rename from core/sis-portrayal/src/main/java/org/apache/sis/internal/map/Observable.java
rename to core/sis-portrayal/src/main/java/org/apache/sis/portrayal/Observable.java
index 22e6d48..7372bfa 100644
--- a/core/sis-portrayal/src/main/java/org/apache/sis/internal/map/Observable.java
+++ b/core/sis-portrayal/src/main/java/org/apache/sis/portrayal/Observable.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sis.internal.map;
+package org.apache.sis.portrayal;
 
 import java.util.Map;
 import java.util.HashMap;
diff --git a/core/sis-portrayal/src/main/java/org/apache/sis/internal/map/PlanarCanvas.java
b/core/sis-portrayal/src/main/java/org/apache/sis/portrayal/PlanarCanvas.java
similarity index 99%
rename from core/sis-portrayal/src/main/java/org/apache/sis/internal/map/PlanarCanvas.java
rename to core/sis-portrayal/src/main/java/org/apache/sis/portrayal/PlanarCanvas.java
index f4ed455..ca558e4 100644
--- a/core/sis-portrayal/src/main/java/org/apache/sis/internal/map/PlanarCanvas.java
+++ b/core/sis-portrayal/src/main/java/org/apache/sis/portrayal/PlanarCanvas.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sis.internal.map;
+package org.apache.sis.portrayal;
 
 import java.util.Map;
 import java.util.Locale;
diff --git a/core/sis-portrayal/src/main/java/org/apache/sis/internal/map/RenderException.java
b/core/sis-portrayal/src/main/java/org/apache/sis/portrayal/RenderException.java
similarity index 98%
rename from core/sis-portrayal/src/main/java/org/apache/sis/internal/map/RenderException.java
rename to core/sis-portrayal/src/main/java/org/apache/sis/portrayal/RenderException.java
index ffab9dd..5407338 100644
--- a/core/sis-portrayal/src/main/java/org/apache/sis/internal/map/RenderException.java
+++ b/core/sis-portrayal/src/main/java/org/apache/sis/portrayal/RenderException.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sis.internal.map;
+package org.apache.sis.portrayal;
 
 
 /**
diff --git a/core/sis-portrayal/src/main/java/org/apache/sis/internal/map/package-info.java
b/core/sis-portrayal/src/main/java/org/apache/sis/portrayal/package-info.java
similarity index 77%
copy from core/sis-portrayal/src/main/java/org/apache/sis/internal/map/package-info.java
copy to core/sis-portrayal/src/main/java/org/apache/sis/portrayal/package-info.java
index 431b304..1be1e70 100644
--- a/core/sis-portrayal/src/main/java/org/apache/sis/internal/map/package-info.java
+++ b/core/sis-portrayal/src/main/java/org/apache/sis/portrayal/package-info.java
@@ -18,11 +18,7 @@
 
 /**
  * Symbology and map representations, together with a rendering engine for display.
- * The {@linkplain org.apache.sis.internal.map.MapItem map item} is the root node of a map.
- *
- * <p><b>WARNING:</b> this package is work in progress and is not yet part
of public API.
- * Some classes in this package will move to public API after we gained enough confidence
- * about their stability.</p>
+ * The {@linkplain org.apache.sis.portrayal.MapItem map item} is the root node of a map.
  *
  * <h2>Synchronization</h2>
  * Unless otherwise specified, classes in this package are not thread-safe.
@@ -33,4 +29,4 @@
  * @since   1.1
  * @module
  */
-package org.apache.sis.internal.map;
+package org.apache.sis.portrayal;


Mime
View raw message