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 4319faa72f173e01b4e71c6f809a9d2af7f0ba61
Author: Martin Desruisseaux <martin.desruisse...@geomatys.com>
AuthorDate: Sun Aug 20 14:35:44 2023 +0200
Rename the internal packages of the `org.apache.sis.gui` module.
Since they are not exported, the `internal` name convention is not needed
anymore.
---
.../org/apache/sis/internal/system/CommonExecutor.java | 2 +-
optional/build.gradle.kts | 2 +-
optional/src/org.apache.sis.gui/bundle/bin/sisfx | 2 +-
optional/src/org.apache.sis.gui/bundle/bin/sisfx.bat | 2 +-
.../services/org.apache.sis.setup.InstallationResources | 2 +-
optional/src/org.apache.sis.gui/main/module-info.java | 2 +-
.../main/org/apache/sis/gui/AboutDialog.java | 2 +-
.../main/org/apache/sis/gui/DataViewer.java | 12 ++++++------
.../main/org/apache/sis/gui/RecentFiles.java | 4 ++--
.../main/org/apache/sis/gui/SystemMonitor.java | 6 +++---
.../{internal/gui/control => gui/controls}/ColorCell.java | 2 +-
.../gui/control => gui/controls}/ColorColumnHandler.java | 2 +-
.../{internal/gui/control => gui/controls}/ColorRamp.java | 6 +++---
.../gui/control => gui/controls}/FormatApplicator.java | 4 ++--
.../gui/control => gui/controls}/FormatTableCell.java | 4 ++--
.../gui/control => gui/controls}/SyncWindowList.java | 4 ++--
.../gui/control => gui/controls}/TabularWidget.java | 2 +-
.../gui/control => gui/controls}/ValueColorMapper.java | 6 +++---
.../gui/control => gui/controls}/package-info.java | 2 +-
.../main/org/apache/sis/gui/coverage/BandRangeTable.java | 2 +-
.../main/org/apache/sis/gui/coverage/CellFormat.java | 4 ++--
.../main/org/apache/sis/gui/coverage/CoverageCanvas.java | 10 +++++-----
.../main/org/apache/sis/gui/coverage/CoverageControls.java | 10 +++++-----
.../main/org/apache/sis/gui/coverage/CoverageExplorer.java | 10 +++++-----
.../main/org/apache/sis/gui/coverage/CoverageStyling.java | 8 ++++----
.../main/org/apache/sis/gui/coverage/GridControls.java | 2 +-
.../main/org/apache/sis/gui/coverage/GridError.java | 4 ++--
.../org/apache/sis/gui/coverage/GridSliceSelector.java | 2 +-
.../main/org/apache/sis/gui/coverage/GridTile.java | 2 +-
.../main/org/apache/sis/gui/coverage/GridView.java | 8 ++++----
.../main/org/apache/sis/gui/coverage/GridViewSkin.java | 4 ++--
.../org/apache/sis/gui/coverage/ImagePropertyExplorer.java | 10 +++++-----
.../main/org/apache/sis/gui/coverage/IsolineRenderer.java | 4 ++--
.../main/org/apache/sis/gui/coverage/ViewAndControls.java | 2 +-
.../main/org/apache/sis/gui/dataset/ExpandableList.java | 2 +-
.../main/org/apache/sis/gui/dataset/FeatureList.java | 2 +-
.../main/org/apache/sis/gui/dataset/FeatureLoader.java | 2 +-
.../main/org/apache/sis/gui/dataset/FeatureTable.java | 7 +++----
.../main/org/apache/sis/gui/dataset/LogViewer.java | 10 +++++-----
.../main/org/apache/sis/gui/dataset/PathAction.java | 2 +-
.../main/org/apache/sis/gui/dataset/ResourceCell.java | 8 ++++----
.../main/org/apache/sis/gui/dataset/ResourceExplorer.java | 6 +++---
.../main/org/apache/sis/gui/dataset/ResourceItem.java | 8 ++++----
.../main/org/apache/sis/gui/dataset/ResourceTree.java | 10 +++++-----
.../main/org/apache/sis/gui/dataset/WindowHandler.java | 12 ++++++------
.../main/org/apache/sis/gui/dataset/WindowManager.java | 4 ++--
.../{internal/gui => gui/internal}/BackgroundThreads.java | 4 ++--
.../sis/{internal/gui => gui/internal}/ColorName.java | 2 +-
.../sis/{internal/gui => gui/internal}/DataFormats.java | 2 +-
.../{internal/gui => gui/internal}/DataStoreOpener.java | 2 +-
.../{internal/gui => gui/internal}/ExceptionReporter.java | 2 +-
.../gui => gui/internal}/FixedHeaderColumnSize.java | 2 +-
.../sis/{internal/gui => gui/internal}/GUIUtilities.java | 2 +-
.../gui => gui/internal}/IdentityValueFactory.java | 2 +-
.../sis/{internal/gui => gui/internal}/ImageConverter.java | 4 ++--
.../gui => gui/internal}/ImmutableObjectProperty.java | 2 +-
.../sis/{internal/gui => gui/internal}/LogHandler.java | 2 +-
.../sis/{internal/gui => gui/internal}/MouseDrags.java | 2 +-
.../gui => gui/internal}/NonNullObjectProperty.java | 2 +-
.../sis/{internal/gui => gui/internal}/PrivateAccess.java | 2 +-
.../gui => gui/internal}/PropertyValueFormats.java | 2 +-
.../gui => gui/internal}/PropertyValueFormatter.java | 2 +-
.../sis/{internal/gui => gui/internal}/PropertyView.java | 2 +-
.../sis/{internal/gui => gui/internal}/RecentChoices.java | 2 +-
.../sis/{internal/gui => gui/internal}/Resources.java | 2 +-
.../{internal/gui => gui/internal}/Resources.properties | 0
.../sis/{internal/gui => gui/internal}/Resources_en.java | 2 +-
.../sis/{internal/gui => gui/internal}/Resources_fr.java | 2 +-
.../{internal/gui => gui/internal}/Resources_fr.properties | 0
.../apache/sis/{internal/gui => gui/internal}/Styles.java | 4 ++--
.../sis/{internal/gui => gui/internal}/ToolbarButton.java | 2 +-
.../{internal/gui => gui/internal}/io/FileAccessItem.java | 2 +-
.../{internal/gui => gui/internal}/io/FileAccessView.java | 8 ++++----
.../gui => gui/internal/io}/OptionalDataDownloader.java | 5 ++++-
.../{internal/gui => gui/internal}/io/package-info.java | 4 ++--
.../sis/{internal/gui => gui/internal}/package-info.java | 2 +-
.../main/org/apache/sis/gui/map/GestureFollower.java | 2 +-
.../main/org/apache/sis/gui/map/MapCanvas.java | 12 ++++++------
.../main/org/apache/sis/gui/map/MapMenu.java | 4 ++--
.../main/org/apache/sis/gui/map/OperationFinder.java | 2 +-
.../main/org/apache/sis/gui/map/StatusBar.java | 12 ++++++------
.../main/org/apache/sis/gui/map/ValuesFormatter.java | 2 +-
.../main/org/apache/sis/gui/map/ValuesFromCoverage.java | 4 ++--
.../main/org/apache/sis/gui/map/ValuesUnderCursor.java | 2 +-
.../org/apache/sis/gui/metadata/IdentificationInfo.java | 2 +-
.../main/org/apache/sis/gui/metadata/MetadataSummary.java | 6 +++---
.../main/org/apache/sis/gui/metadata/MetadataTree.java | 10 +++++-----
.../main/org/apache/sis/gui/metadata/Section.java | 2 +-
.../org/apache/sis/gui/metadata/StandardMetadataTree.java | 6 +++---
.../main/org/apache/sis/gui/metadata/VerboseFormats.java | 2 +-
.../org/apache/sis/gui/referencing/AuthorityCodes.java | 4 ++--
.../main/org/apache/sis/gui/referencing/CRSChooser.java | 10 +++++-----
.../main/org/apache/sis/gui/referencing/Code.java | 2 +-
.../main/org/apache/sis/gui/referencing/MenuSync.java | 4 ++--
.../apache/sis/gui/referencing/ObjectStringConverter.java | 2 +-
.../apache/sis/gui/referencing/PositionableProjection.java | 4 ++--
.../apache/sis/gui/referencing/RecentReferenceSystems.java | 14 +++++++-------
.../main/org/apache/sis/gui/referencing/Utils.java | 2 +-
.../main/org/apache/sis/gui/referencing/WKTPane.java | 2 +-
.../org/apache/sis/{internal => gui}/setup/FXFinder.java | 2 +-
.../org/apache/sis/{internal => gui}/setup/Inflater.java | 2 +-
.../org/apache/sis/{internal => gui}/setup/Wizard.java | 2 +-
.../org/apache/sis/{internal => gui}/setup/WizardPage.java | 2 +-
.../apache/sis/{internal => gui}/setup/package-info.java | 2 +-
.../gui/control => gui/controls}/ValueColorMapperApp.java | 6 +++---
.../org/apache/sis/gui/coverage/CoverageCanvasApp.java | 2 +-
.../org/apache/sis/gui/coverage/CoverageStylingApp.java | 4 ++--
.../test/org/apache/sis/gui/coverage/GridViewApp.java | 2 +-
.../{internal/gui => gui/internal}/GUIUtilitiesTest.java | 2 +-
.../test/org/apache/sis/gui/referencing/CRSChooserApp.java | 2 +-
110 files changed, 219 insertions(+), 217 deletions(-)
diff --git
a/endorsed/src/org.apache.sis.util/main/org/apache/sis/internal/system/CommonExecutor.java
b/endorsed/src/org.apache.sis.util/main/org/apache/sis/internal/system/CommonExecutor.java
index 8b8e47e837..e3f78d73c9 100644
---
a/endorsed/src/org.apache.sis.util/main/org/apache/sis/internal/system/CommonExecutor.java
+++
b/endorsed/src/org.apache.sis.util/main/org/apache/sis/internal/system/CommonExecutor.java
@@ -46,7 +46,7 @@ import java.util.concurrent.atomic.AtomicInteger;
* @author Martin Desruisseaux (Geomatys)
* @version 1.1
*
- * @see org.apache.sis.internal.gui.BackgroundThreads
+ * @see org.apache.sis.gui.internal.BackgroundThreads
* @see java.util.concurrent.ForkJoinPool#commonPool()
*
* @since 1.1
diff --git a/optional/build.gradle.kts b/optional/build.gradle.kts
index 0dbdae7fc9..f77fbd58d7 100644
--- a/optional/build.gradle.kts
+++ b/optional/build.gradle.kts
@@ -130,7 +130,7 @@ tasks.test {
patchForTests(args);
addRead (args, "org.apache.sis.util",
"ALL-UNNAMED")
addExport(args, "org.apache.sis.util", "org.apache.sis.test",
"ALL-UNNAMED")
- addExport(args, "org.apache.sis.gui", "org.apache.sis.internal.gui",
"ALL-UNNAMED")
+ addExport(args, "org.apache.sis.gui", "org.apache.sis.gui.internal",
"ALL-UNNAMED")
setAllJvmArgs(args)
testLogging {
events("FAILED", "STANDARD_OUT", "STANDARD_ERROR")
diff --git a/optional/src/org.apache.sis.gui/bundle/bin/sisfx
b/optional/src/org.apache.sis.gui/bundle/bin/sisfx
index 0e4b5d2015..6729e5f211 100755
--- a/optional/src/org.apache.sis.gui/bundle/bin/sisfx
+++ b/optional/src/org.apache.sis.gui/bundle/bin/sisfx
@@ -26,7 +26,7 @@ export SIS_DATA
if [ -z "$PATH_TO_FX" ]
then
- java --class-path "$BASE_DIR/lib/*" org.apache.sis.internal.setup.FXFinder
$BASE_DIR/conf/setenv.sh
+ java --class-path "$BASE_DIR/lib/*" org.apache.sis.gui.setup.FXFinder
$BASE_DIR/conf/setenv.sh
if [ $? -ne 0 ]
then
exit
diff --git a/optional/src/org.apache.sis.gui/bundle/bin/sisfx.bat
b/optional/src/org.apache.sis.gui/bundle/bin/sisfx.bat
index 8b628c6679..999bc5ed4a 100644
--- a/optional/src/org.apache.sis.gui/bundle/bin/sisfx.bat
+++ b/optional/src/org.apache.sis.gui/bundle/bin/sisfx.bat
@@ -21,7 +21,7 @@ CALL "%BASE_DIR%\conf\setenv.bat"
SET SIS_DATA=%BASE_DIR%\data
IF "%PATH_TO_FX%"=="" (
- java --class-path "%BASE_DIR%\lib\*"
org.apache.sis.internal.setup.FXFinder "%BASE_DIR%\conf\setenv.bat"
+ java --class-path "%BASE_DIR%\lib\*" org.apache.sis.gui.setup.FXFinder
"%BASE_DIR%\conf\setenv.bat"
IF %ERRORLEVEL% GEQ 1 EXIT /B 1
CALL "%BASE_DIR%\conf\setenv.bat"
)
diff --git
a/optional/src/org.apache.sis.gui/main/META-INF/services/org.apache.sis.setup.InstallationResources
b/optional/src/org.apache.sis.gui/main/META-INF/services/org.apache.sis.setup.InstallationResources
index b18639ffe9..62ae574a16 100644
---
a/optional/src/org.apache.sis.gui/main/META-INF/services/org.apache.sis.setup.InstallationResources
+++
b/optional/src/org.apache.sis.gui/main/META-INF/services/org.apache.sis.setup.InstallationResources
@@ -1,4 +1,4 @@
# Workaround for Maven bug https://issues.apache.org/jira/browse/MNG-7855
# The content of this file is automatically derived from module-info.class
file.
# Should be used only if the JAR file was on class-path rather than
module-path.
-org.apache.sis.internal.gui.OptionalDataDownloader
+org.apache.sis.gui.internal.io.OptionalDataDownloader
diff --git a/optional/src/org.apache.sis.gui/main/module-info.java
b/optional/src/org.apache.sis.gui/main/module-info.java
index f1a15fadd5..96119af63c 100644
--- a/optional/src/org.apache.sis.gui/main/module-info.java
+++ b/optional/src/org.apache.sis.gui/main/module-info.java
@@ -41,7 +41,7 @@ module org.apache.sis.gui {
requires org.apache.sis.referencing.gazetteer;
provides org.apache.sis.setup.InstallationResources
- with org.apache.sis.internal.gui.OptionalDataDownloader;
+ with org.apache.sis.gui.internal.io.OptionalDataDownloader;
exports org.apache.sis.gui;
exports org.apache.sis.gui.metadata;
diff --git
a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/AboutDialog.java
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/AboutDialog.java
index 144367e72b..376eb4a13e 100644
--- a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/AboutDialog.java
+++ b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/AboutDialog.java
@@ -21,7 +21,7 @@ import javafx.scene.control.Alert;
import javafx.scene.control.DialogPane;
import javafx.scene.control.Label;
import org.apache.sis.gui.metadata.MetadataTree;
-import org.apache.sis.internal.gui.Resources;
+import org.apache.sis.gui.internal.Resources;
import org.apache.sis.util.resources.Vocabulary;
import org.apache.sis.util.Version;
import org.apache.sis.setup.About;
diff --git
a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/DataViewer.java
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/DataViewer.java
index f024134961..2c040b574f 100644
--- a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/DataViewer.java
+++ b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/DataViewer.java
@@ -43,12 +43,12 @@ import javafx.scene.image.Image;
import javafx.stage.Screen;
import javafx.stage.Stage;
import org.apache.sis.gui.dataset.ResourceExplorer;
-import org.apache.sis.internal.gui.BackgroundThreads;
-import org.apache.sis.internal.gui.ExceptionReporter;
-import org.apache.sis.internal.gui.LogHandler;
-import org.apache.sis.internal.gui.Resources;
-import org.apache.sis.internal.gui.RecentChoices;
-import org.apache.sis.internal.gui.Styles;
+import org.apache.sis.gui.internal.BackgroundThreads;
+import org.apache.sis.gui.internal.ExceptionReporter;
+import org.apache.sis.gui.internal.LogHandler;
+import org.apache.sis.gui.internal.Resources;
+import org.apache.sis.gui.internal.RecentChoices;
+import org.apache.sis.gui.internal.Styles;
import org.apache.sis.internal.storage.Capability;
import org.apache.sis.internal.storage.StoreMetadata;
import org.apache.sis.storage.DataStoreProvider;
diff --git
a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/RecentFiles.java
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/RecentFiles.java
index 0bccac802e..2510e0513d 100644
--- a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/RecentFiles.java
+++ b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/RecentFiles.java
@@ -26,8 +26,8 @@ import javafx.scene.control.MenuItem;
import javafx.collections.ObservableList;
import org.apache.sis.gui.dataset.ResourceEvent;
import org.apache.sis.gui.dataset.ResourceExplorer;
-import org.apache.sis.internal.gui.Resources;
-import org.apache.sis.internal.gui.RecentChoices;
+import org.apache.sis.gui.internal.Resources;
+import org.apache.sis.gui.internal.RecentChoices;
import org.apache.sis.internal.system.Configuration;
import org.apache.sis.util.ArraysExt;
diff --git
a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/SystemMonitor.java
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/SystemMonitor.java
index c154c55e74..8f66996b08 100644
--- a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/SystemMonitor.java
+++ b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/SystemMonitor.java
@@ -26,9 +26,9 @@ import javafx.scene.Scene;
import javafx.scene.control.Tab;
import javafx.scene.control.TabPane;
import org.apache.sis.gui.dataset.LogViewer;
-import org.apache.sis.internal.gui.Resources;
-import org.apache.sis.internal.gui.DataStoreOpener;
-import org.apache.sis.internal.gui.io.FileAccessView;
+import org.apache.sis.gui.internal.Resources;
+import org.apache.sis.gui.internal.DataStoreOpener;
+import org.apache.sis.gui.internal.io.FileAccessView;
import org.apache.sis.internal.storage.io.ChannelFactory;
import org.apache.sis.util.resources.Vocabulary;
diff --git
a/optional/src/org.apache.sis.gui/main/org/apache/sis/internal/gui/control/ColorCell.java
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/controls/ColorCell.java
similarity index 99%
rename from
optional/src/org.apache.sis.gui/main/org/apache/sis/internal/gui/control/ColorCell.java
rename to
optional/src/org.apache.sis.gui/main/org/apache/sis/gui/controls/ColorCell.java
index c4a206d230..1b754b92a4 100644
---
a/optional/src/org.apache.sis.gui/main/org/apache/sis/internal/gui/control/ColorCell.java
+++
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/controls/ColorCell.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.gui.control;
+package org.apache.sis.gui.controls;
import javafx.collections.ObservableList;
import javafx.event.ActionEvent;
diff --git
a/optional/src/org.apache.sis.gui/main/org/apache/sis/internal/gui/control/ColorColumnHandler.java
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/controls/ColorColumnHandler.java
similarity index 99%
rename from
optional/src/org.apache.sis.gui/main/org/apache/sis/internal/gui/control/ColorColumnHandler.java
rename to
optional/src/org.apache.sis.gui/main/org/apache/sis/gui/controls/ColorColumnHandler.java
index 27a25dc25a..ae4270681e 100644
---
a/optional/src/org.apache.sis.gui/main/org/apache/sis/internal/gui/control/ColorColumnHandler.java
+++
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/controls/ColorColumnHandler.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.gui.control;
+package org.apache.sis.gui.controls;
import javafx.util.Callback;
import javafx.scene.input.KeyCode;
diff --git
a/optional/src/org.apache.sis.gui/main/org/apache/sis/internal/gui/control/ColorRamp.java
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/controls/ColorRamp.java
similarity index 98%
rename from
optional/src/org.apache.sis.gui/main/org/apache/sis/internal/gui/control/ColorRamp.java
rename to
optional/src/org.apache.sis.gui/main/org/apache/sis/gui/controls/ColorRamp.java
index d4572999e7..fb0cc25046 100644
---
a/optional/src/org.apache.sis.gui/main/org/apache/sis/internal/gui/control/ColorRamp.java
+++
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/controls/ColorRamp.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.gui.control;
+package org.apache.sis.gui.controls;
import java.util.Arrays;
import java.util.Objects;
@@ -25,8 +25,8 @@ import javafx.scene.paint.CycleMethod;
import javafx.scene.paint.LinearGradient;
import javafx.scene.paint.Paint;
import javafx.scene.paint.Stop;
-import org.apache.sis.internal.gui.ColorName;
-import org.apache.sis.internal.gui.GUIUtilities;
+import org.apache.sis.gui.internal.ColorName;
+import org.apache.sis.gui.internal.GUIUtilities;
import org.apache.sis.util.resources.Vocabulary;
diff --git
a/optional/src/org.apache.sis.gui/main/org/apache/sis/internal/gui/control/FormatApplicator.java
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/controls/FormatApplicator.java
similarity index 99%
rename from
optional/src/org.apache.sis.gui/main/org/apache/sis/internal/gui/control/FormatApplicator.java
rename to
optional/src/org.apache.sis.gui/main/org/apache/sis/gui/controls/FormatApplicator.java
index 7e12c37cd5..c55db14d5b 100644
---
a/optional/src/org.apache.sis.gui/main/org/apache/sis/internal/gui/control/FormatApplicator.java
+++
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/controls/FormatApplicator.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.gui.control;
+package org.apache.sis.gui.controls;
import java.math.BigDecimal;
import java.text.Format;
@@ -30,7 +30,7 @@ import javafx.beans.value.ChangeListener;
import javafx.beans.value.ObservableValue;
import javafx.beans.property.ReadOnlyProperty;
import javafx.beans.InvalidationListener;
-import org.apache.sis.internal.gui.Styles;
+import org.apache.sis.gui.internal.Styles;
import org.apache.sis.util.CharSequences;
diff --git
a/optional/src/org.apache.sis.gui/main/org/apache/sis/internal/gui/control/FormatTableCell.java
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/controls/FormatTableCell.java
similarity index 99%
rename from
optional/src/org.apache.sis.gui/main/org/apache/sis/internal/gui/control/FormatTableCell.java
rename to
optional/src/org.apache.sis.gui/main/org/apache/sis/gui/controls/FormatTableCell.java
index b19febfc7b..4373945bf0 100644
---
a/optional/src/org.apache.sis.gui/main/org/apache/sis/internal/gui/control/FormatTableCell.java
+++
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/controls/FormatTableCell.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.gui.control;
+package org.apache.sis.gui.controls;
import java.text.Format;
import java.text.DecimalFormat;
@@ -28,7 +28,7 @@ import javafx.scene.control.TableColumn;
import javafx.scene.control.TablePosition;
import javafx.scene.control.TableView;
import javafx.scene.control.TextField;
-import org.apache.sis.internal.gui.Styles;
+import org.apache.sis.gui.internal.Styles;
/**
diff --git
a/optional/src/org.apache.sis.gui/main/org/apache/sis/internal/gui/control/SyncWindowList.java
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/controls/SyncWindowList.java
similarity index 99%
rename from
optional/src/org.apache.sis.gui/main/org/apache/sis/internal/gui/control/SyncWindowList.java
rename to
optional/src/org.apache.sis.gui/main/org/apache/sis/gui/controls/SyncWindowList.java
index 97c57499d9..20b514bf34 100644
---
a/optional/src/org.apache.sis.gui/main/org/apache/sis/internal/gui/control/SyncWindowList.java
+++
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/controls/SyncWindowList.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.gui.control;
+package org.apache.sis.gui.controls;
import java.util.List;
import javafx.collections.ListChangeListener;
@@ -31,7 +31,7 @@ import org.apache.sis.util.resources.Vocabulary;
import org.apache.sis.gui.dataset.WindowHandler;
import org.apache.sis.gui.map.MapCanvas;
import org.apache.sis.gui.map.GestureFollower;
-import org.apache.sis.internal.gui.Resources;
+import org.apache.sis.gui.internal.Resources;
import org.apache.sis.internal.util.UnmodifiableArrayList;
diff --git
a/optional/src/org.apache.sis.gui/main/org/apache/sis/internal/gui/control/TabularWidget.java
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/controls/TabularWidget.java
similarity index 98%
rename from
optional/src/org.apache.sis.gui/main/org/apache/sis/internal/gui/control/TabularWidget.java
rename to
optional/src/org.apache.sis.gui/main/org/apache/sis/gui/controls/TabularWidget.java
index e3990a43c4..ea5ad9d878 100644
---
a/optional/src/org.apache.sis.gui/main/org/apache/sis/internal/gui/control/TabularWidget.java
+++
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/controls/TabularWidget.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.gui.control;
+package org.apache.sis.gui.controls;
import javafx.util.Callback;
import javafx.beans.value.ObservableValue;
diff --git
a/optional/src/org.apache.sis.gui/main/org/apache/sis/internal/gui/control/ValueColorMapper.java
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/controls/ValueColorMapper.java
similarity index 99%
rename from
optional/src/org.apache.sis.gui/main/org/apache/sis/internal/gui/control/ValueColorMapper.java
rename to
optional/src/org.apache.sis.gui/main/org/apache/sis/gui/controls/ValueColorMapper.java
index c7f2a0c888..b7ce5d0654 100644
---
a/optional/src/org.apache.sis.gui/main/org/apache/sis/internal/gui/control/ValueColorMapper.java
+++
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/controls/ValueColorMapper.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.gui.control;
+package org.apache.sis.gui.controls;
import java.util.Objects;
import java.util.Locale;
@@ -44,8 +44,8 @@ import javafx.scene.control.TextField;
import javafx.scene.control.TableView;
import javafx.scene.control.TableColumn;
import org.apache.sis.internal.util.Numerics;
-import org.apache.sis.internal.gui.Styles;
-import org.apache.sis.internal.gui.Resources;
+import org.apache.sis.gui.internal.Styles;
+import org.apache.sis.gui.internal.Resources;
import org.apache.sis.util.resources.Vocabulary;
diff --git
a/optional/src/org.apache.sis.gui/main/org/apache/sis/internal/gui/control/package-info.java
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/controls/package-info.java
similarity index 96%
rename from
optional/src/org.apache.sis.gui/main/org/apache/sis/internal/gui/control/package-info.java
rename to
optional/src/org.apache.sis.gui/main/org/apache/sis/gui/controls/package-info.java
index f932e882d2..ef8b27c48e 100644
---
a/optional/src/org.apache.sis.gui/main/org/apache/sis/internal/gui/control/package-info.java
+++
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/controls/package-info.java
@@ -27,4 +27,4 @@
* @version 1.4
* @since 1.1
*/
-package org.apache.sis.internal.gui.control;
+package org.apache.sis.gui.controls;
diff --git
a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/coverage/BandRangeTable.java
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/coverage/BandRangeTable.java
index 768d753dba..029945afdf 100644
---
a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/coverage/BandRangeTable.java
+++
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/coverage/BandRangeTable.java
@@ -29,7 +29,7 @@ import org.opengis.util.GenericName;
import org.apache.sis.measure.NumberRange;
import org.apache.sis.coverage.SampleDimension;
import org.apache.sis.util.resources.Vocabulary;
-import org.apache.sis.internal.gui.Styles;
+import org.apache.sis.gui.internal.Styles;
/**
diff --git
a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/coverage/CellFormat.java
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/coverage/CellFormat.java
index 1a587db3ee..7c10e2d645 100644
---
a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/coverage/CellFormat.java
+++
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/coverage/CellFormat.java
@@ -31,8 +31,8 @@ import org.apache.sis.image.PlanarImage;
import org.apache.sis.math.DecimalFunctions;
import org.apache.sis.util.Numbers;
import org.apache.sis.util.Workaround;
-import org.apache.sis.internal.gui.Styles;
-import org.apache.sis.internal.gui.RecentChoices;
+import org.apache.sis.gui.internal.Styles;
+import org.apache.sis.gui.internal.RecentChoices;
/**
diff --git
a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/coverage/CoverageCanvas.java
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/coverage/CoverageCanvas.java
index 893b228927..ba49c0e041 100644
---
a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/coverage/CoverageCanvas.java
+++
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/coverage/CoverageCanvas.java
@@ -70,17 +70,17 @@ import org.apache.sis.portrayal.RenderException;
import org.apache.sis.internal.map.coverage.RenderingWorkaround;
import org.apache.sis.internal.coverage.j2d.TileErrorHandler;
import org.apache.sis.internal.processing.isoline.Isolines;
-import org.apache.sis.internal.gui.BackgroundThreads;
-import org.apache.sis.internal.gui.ExceptionReporter;
-import org.apache.sis.internal.gui.GUIUtilities;
-import org.apache.sis.internal.gui.LogHandler;
+import org.apache.sis.gui.internal.BackgroundThreads;
+import org.apache.sis.gui.internal.ExceptionReporter;
+import org.apache.sis.gui.internal.GUIUtilities;
+import org.apache.sis.gui.internal.LogHandler;
import org.apache.sis.util.logging.Logging;
import org.apache.sis.io.TableAppender;
import org.apache.sis.measure.Units;
import org.apache.sis.util.ArraysExt;
import org.apache.sis.util.Debug;
-import static org.apache.sis.internal.gui.LogHandler.LOGGER;
+import static org.apache.sis.gui.internal.LogHandler.LOGGER;
/**
diff --git
a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/coverage/CoverageControls.java
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/coverage/CoverageControls.java
index 719edb2fb2..42378a625b 100644
---
a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/coverage/CoverageControls.java
+++
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/coverage/CoverageControls.java
@@ -35,11 +35,11 @@ import org.apache.sis.storage.GridCoverageResource;
import org.apache.sis.gui.dataset.WindowHandler;
import org.apache.sis.gui.map.MapMenu;
import org.apache.sis.image.Interpolation;
-import org.apache.sis.internal.gui.GUIUtilities;
-import org.apache.sis.internal.gui.control.ValueColorMapper;
-import org.apache.sis.internal.gui.Styles;
-import org.apache.sis.internal.gui.Resources;
-import org.apache.sis.internal.gui.control.SyncWindowList;
+import org.apache.sis.gui.internal.GUIUtilities;
+import org.apache.sis.gui.controls.ValueColorMapper;
+import org.apache.sis.gui.internal.Styles;
+import org.apache.sis.gui.internal.Resources;
+import org.apache.sis.gui.controls.SyncWindowList;
import org.apache.sis.util.resources.Vocabulary;
diff --git
a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/coverage/CoverageExplorer.java
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/coverage/CoverageExplorer.java
index c3728662f1..6c422505bb 100644
---
a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/coverage/CoverageExplorer.java
+++
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/coverage/CoverageExplorer.java
@@ -35,11 +35,11 @@ import javafx.beans.property.SimpleObjectProperty;
import org.apache.sis.storage.DataStoreException;
import org.apache.sis.storage.GridCoverageResource;
import org.apache.sis.coverage.grid.GridCoverage;
-import org.apache.sis.internal.gui.DataStoreOpener;
-import org.apache.sis.internal.gui.Resources;
-import org.apache.sis.internal.gui.ToolbarButton;
-import org.apache.sis.internal.gui.NonNullObjectProperty;
-import org.apache.sis.internal.gui.PrivateAccess;
+import org.apache.sis.gui.internal.DataStoreOpener;
+import org.apache.sis.gui.internal.Resources;
+import org.apache.sis.gui.internal.ToolbarButton;
+import org.apache.sis.gui.internal.NonNullObjectProperty;
+import org.apache.sis.gui.internal.PrivateAccess;
import org.apache.sis.util.ArgumentChecks;
import org.apache.sis.portrayal.RenderException;
import org.apache.sis.gui.referencing.RecentReferenceSystems;
diff --git
a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/coverage/CoverageStyling.java
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/coverage/CoverageStyling.java
index 07fa93f7e1..f8b53f652f 100644
---
a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/coverage/CoverageStyling.java
+++
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/coverage/CoverageStyling.java
@@ -33,10 +33,10 @@ import javafx.scene.control.ContextMenu;
import org.opengis.util.InternationalString;
import org.apache.sis.coverage.Category;
import org.apache.sis.image.Colorizer;
-import org.apache.sis.internal.gui.Resources;
-import org.apache.sis.internal.gui.ImmutableObjectProperty;
-import org.apache.sis.internal.gui.control.ColorRamp;
-import org.apache.sis.internal.gui.control.ColorColumnHandler;
+import org.apache.sis.gui.internal.Resources;
+import org.apache.sis.gui.internal.ImmutableObjectProperty;
+import org.apache.sis.gui.controls.ColorRamp;
+import org.apache.sis.gui.controls.ColorColumnHandler;
import org.apache.sis.util.resources.Vocabulary;
diff --git
a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/coverage/GridControls.java
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/coverage/GridControls.java
index 94c25a7290..e7e2dd2325 100644
---
a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/coverage/GridControls.java
+++
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/coverage/GridControls.java
@@ -27,7 +27,7 @@ import org.apache.sis.storage.GridCoverageResource;
import org.apache.sis.coverage.grid.GridCoverage;
import org.apache.sis.coverage.SampleDimension;
import org.apache.sis.util.resources.Vocabulary;
-import org.apache.sis.internal.gui.Styles;
+import org.apache.sis.gui.internal.Styles;
/**
diff --git
a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/coverage/GridError.java
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/coverage/GridError.java
index 74855afed8..daf1bfa4e2 100644
---
a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/coverage/GridError.java
+++
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/coverage/GridError.java
@@ -24,8 +24,8 @@ import javafx.scene.control.Label;
import javafx.scene.layout.TilePane;
import javafx.scene.layout.VBox;
import javafx.scene.paint.Color;
-import org.apache.sis.internal.gui.ExceptionReporter;
-import org.apache.sis.internal.gui.Resources;
+import org.apache.sis.gui.internal.ExceptionReporter;
+import org.apache.sis.gui.internal.Resources;
import org.apache.sis.util.resources.Vocabulary;
diff --git
a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/coverage/GridSliceSelector.java
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/coverage/GridSliceSelector.java
index 51f4a0e08d..6132b18bda 100644
---
a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/coverage/GridSliceSelector.java
+++
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/coverage/GridSliceSelector.java
@@ -62,7 +62,7 @@ import org.apache.sis.util.iso.Types;
import org.apache.sis.util.logging.Logging;
import org.apache.sis.util.resources.Vocabulary;
-import static org.apache.sis.internal.gui.LogHandler.LOGGER;
+import static org.apache.sis.gui.internal.LogHandler.LOGGER;
/**
diff --git
a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/coverage/GridTile.java
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/coverage/GridTile.java
index bc19dad184..c25972d335 100644
---
a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/coverage/GridTile.java
+++
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/coverage/GridTile.java
@@ -19,7 +19,7 @@ package org.apache.sis.gui.coverage;
import java.awt.image.Raster;
import java.awt.image.RenderedImage;
import javafx.concurrent.Task;
-import org.apache.sis.internal.gui.BackgroundThreads;
+import org.apache.sis.gui.internal.BackgroundThreads;
/**
diff --git
a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/coverage/GridView.java
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/coverage/GridView.java
index 4e870e46ea..e542c334f0 100644
---
a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/coverage/GridView.java
+++
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/coverage/GridView.java
@@ -41,11 +41,11 @@ import org.apache.sis.coverage.grid.GridGeometry;
import org.apache.sis.coverage.grid.GridCoverage;
import org.apache.sis.storage.DataStoreException;
import org.apache.sis.storage.GridCoverageResource;
-import org.apache.sis.internal.gui.BackgroundThreads;
-import org.apache.sis.internal.gui.LogHandler;
-import org.apache.sis.internal.gui.Styles;
+import org.apache.sis.gui.internal.BackgroundThreads;
+import org.apache.sis.gui.internal.LogHandler;
+import org.apache.sis.gui.internal.Styles;
import org.apache.sis.internal.coverage.j2d.ImageUtilities;
-import org.apache.sis.internal.gui.ExceptionReporter;
+import org.apache.sis.gui.internal.ExceptionReporter;
/**
diff --git
a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/coverage/GridViewSkin.java
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/coverage/GridViewSkin.java
index 6e6e8ca4c4..a870d73b1e 100644
---
a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/coverage/GridViewSkin.java
+++
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/coverage/GridViewSkin.java
@@ -37,8 +37,8 @@ import javafx.scene.input.MouseEvent;
import javafx.scene.input.KeyEvent;
import javafx.event.EventHandler;
import javafx.event.EventType;
-import org.apache.sis.internal.gui.MouseDrags;
-import org.apache.sis.internal.gui.Styles;
+import org.apache.sis.gui.internal.MouseDrags;
+import org.apache.sis.gui.internal.Styles;
/**
diff --git
a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/coverage/ImagePropertyExplorer.java
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/coverage/ImagePropertyExplorer.java
index 6320fb3d8d..ee1d3117e1 100644
---
a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/coverage/ImagePropertyExplorer.java
+++
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/coverage/ImagePropertyExplorer.java
@@ -55,11 +55,11 @@ import org.apache.sis.image.PlanarImage;
import org.apache.sis.image.ResampledImage;
import org.apache.sis.util.CharSequences;
import org.apache.sis.util.resources.Vocabulary;
-import org.apache.sis.internal.gui.Styles;
-import org.apache.sis.internal.gui.PropertyView;
-import org.apache.sis.internal.gui.ImmutableObjectProperty;
-import org.apache.sis.internal.gui.PropertyValueFormatter;
-import org.apache.sis.internal.gui.Resources;
+import org.apache.sis.gui.internal.Styles;
+import org.apache.sis.gui.internal.PropertyView;
+import org.apache.sis.gui.internal.ImmutableObjectProperty;
+import org.apache.sis.gui.internal.PropertyValueFormatter;
+import org.apache.sis.gui.internal.Resources;
/**
diff --git
a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/coverage/IsolineRenderer.java
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/coverage/IsolineRenderer.java
index afd18cecd8..9771ae729b 100644
---
a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/coverage/IsolineRenderer.java
+++
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/coverage/IsolineRenderer.java
@@ -37,10 +37,10 @@ import javafx.collections.ObservableList;
import javafx.collections.ListChangeListener;
import org.opengis.referencing.operation.MathTransform;
import org.opengis.referencing.operation.TransformException;
-import org.apache.sis.internal.gui.control.ColorRamp;
+import org.apache.sis.gui.controls.ColorRamp;
import org.apache.sis.internal.processing.isoline.Isolines;
import org.apache.sis.internal.coverage.j2d.ImageUtilities;
-import org.apache.sis.internal.gui.control.ValueColorMapper.Step;
+import org.apache.sis.gui.controls.ValueColorMapper.Step;
import org.apache.sis.internal.feature.j2d.EmptyShape;
import org.apache.sis.internal.feature.j2d.FlatShape;
import org.apache.sis.util.ArraysExt;
diff --git
a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/coverage/ViewAndControls.java
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/coverage/ViewAndControls.java
index f854d52572..b48d2749ab 100644
---
a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/coverage/ViewAndControls.java
+++
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/coverage/ViewAndControls.java
@@ -31,7 +31,7 @@ import javafx.scene.layout.VBox;
import javafx.scene.text.Font;
import javafx.scene.text.FontWeight;
import javafx.collections.ObservableList;
-import org.apache.sis.internal.gui.Styles;
+import org.apache.sis.gui.internal.Styles;
import org.apache.sis.storage.Resource;
import org.apache.sis.storage.GridCoverageResource;
import org.apache.sis.coverage.grid.GridCoverage;
diff --git
a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/dataset/ExpandableList.java
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/dataset/ExpandableList.java
index ba3bd19aba..d25615ab9f 100644
---
a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/dataset/ExpandableList.java
+++
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/dataset/ExpandableList.java
@@ -32,7 +32,7 @@ import javafx.collections.transformation.TransformationList;
import javafx.scene.layout.Background;
import javafx.scene.layout.BackgroundFill;
import org.apache.sis.internal.util.UnmodifiableArrayList;
-import org.apache.sis.internal.gui.Styles;
+import org.apache.sis.gui.internal.Styles;
import org.opengis.feature.FeatureType;
import org.opengis.feature.Feature;
diff --git
a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/dataset/FeatureList.java
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/dataset/FeatureList.java
index 2128c2de2c..b412fb2676 100644
---
a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/dataset/FeatureList.java
+++
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/dataset/FeatureList.java
@@ -25,7 +25,7 @@ import javafx.collections.ObservableListBase;
import javafx.concurrent.Worker;
import org.opengis.feature.Feature;
import org.apache.sis.storage.FeatureSet;
-import org.apache.sis.internal.gui.BackgroundThreads;
+import org.apache.sis.gui.internal.BackgroundThreads;
import org.apache.sis.internal.util.UnmodifiableArrayList;
import org.apache.sis.util.ArraysExt;
diff --git
a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/dataset/FeatureLoader.java
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/dataset/FeatureLoader.java
index 65af557681..bbd4500e27 100644
---
a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/dataset/FeatureLoader.java
+++
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/dataset/FeatureLoader.java
@@ -28,7 +28,7 @@ import org.opengis.feature.FeatureType;
import org.apache.sis.storage.FeatureSet;
import org.apache.sis.storage.DataStoreException;
import org.apache.sis.util.collection.BackingStoreException;
-import org.apache.sis.internal.gui.Resources;
+import org.apache.sis.gui.internal.Resources;
import org.apache.sis.internal.system.Configuration;
diff --git
a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/dataset/FeatureTable.java
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/dataset/FeatureTable.java
index b8ffecac1e..b82996b3b7 100644
---
a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/dataset/FeatureTable.java
+++
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/dataset/FeatureTable.java
@@ -47,10 +47,9 @@ import org.apache.sis.internal.util.Strings;
import org.apache.sis.util.logging.Logging;
import org.apache.sis.storage.FeatureSet;
import org.apache.sis.internal.feature.AttributeConvention;
-import org.apache.sis.internal.gui.IdentityValueFactory;
-import org.apache.sis.internal.gui.ExceptionReporter;
-
-import static org.apache.sis.internal.gui.LogHandler.LOGGER;
+import org.apache.sis.gui.internal.IdentityValueFactory;
+import org.apache.sis.gui.internal.ExceptionReporter;
+import static org.apache.sis.gui.internal.LogHandler.LOGGER;
/**
diff --git
a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/dataset/LogViewer.java
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/dataset/LogViewer.java
index adb2eff30b..72a38a6941 100644
---
a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/dataset/LogViewer.java
+++
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/dataset/LogViewer.java
@@ -67,11 +67,11 @@ import javafx.util.StringConverter;
import org.apache.sis.gui.Widget;
import org.apache.sis.storage.Resource;
import org.apache.sis.util.resources.Vocabulary;
-import org.apache.sis.internal.gui.Styles;
-import org.apache.sis.internal.gui.LogHandler;
-import org.apache.sis.internal.gui.ExceptionReporter;
-import org.apache.sis.internal.gui.ImmutableObjectProperty;
-import org.apache.sis.internal.gui.Resources;
+import org.apache.sis.gui.internal.Styles;
+import org.apache.sis.gui.internal.LogHandler;
+import org.apache.sis.gui.internal.ExceptionReporter;
+import org.apache.sis.gui.internal.ImmutableObjectProperty;
+import org.apache.sis.gui.internal.Resources;
import org.apache.sis.util.logging.PerformanceLevel;
import org.apache.sis.util.CharSequences;
diff --git
a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/dataset/PathAction.java
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/dataset/PathAction.java
index aba7d0ab10..54ca6bdbd6 100644
---
a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/dataset/PathAction.java
+++
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/dataset/PathAction.java
@@ -29,7 +29,7 @@ import javafx.event.EventHandler;
import javafx.scene.control.TreeCell;
import javafx.scene.input.Clipboard;
import javafx.scene.input.ClipboardContent;
-import org.apache.sis.internal.gui.ExceptionReporter;
+import org.apache.sis.gui.internal.ExceptionReporter;
import org.apache.sis.internal.storage.ResourceOnFileSystem;
import org.apache.sis.internal.storage.URIDataStore;
import org.apache.sis.internal.storage.io.IOUtilities;
diff --git
a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/dataset/ResourceCell.java
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/dataset/ResourceCell.java
index 2078a769fc..66a81bef64 100644
---
a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/dataset/ResourceCell.java
+++
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/dataset/ResourceCell.java
@@ -29,10 +29,10 @@ import org.apache.sis.storage.Resource;
import org.apache.sis.storage.DataStoreException;
import org.apache.sis.internal.storage.URIDataStore;
import org.apache.sis.internal.storage.io.IOUtilities;
-import org.apache.sis.internal.gui.ExceptionReporter;
-import org.apache.sis.internal.gui.DataStoreOpener;
-import org.apache.sis.internal.gui.Resources;
-import org.apache.sis.internal.gui.Styles;
+import org.apache.sis.gui.internal.ExceptionReporter;
+import org.apache.sis.gui.internal.DataStoreOpener;
+import org.apache.sis.gui.internal.Resources;
+import org.apache.sis.gui.internal.Styles;
import org.apache.sis.internal.util.Strings;
import org.apache.sis.util.Classes;
import org.apache.sis.util.Exceptions;
diff --git
a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/dataset/ResourceExplorer.java
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/dataset/ResourceExplorer.java
index 8f2c3d9efe..cc950b5e7e 100644
---
a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/dataset/ResourceExplorer.java
+++
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/dataset/ResourceExplorer.java
@@ -52,9 +52,9 @@ import org.apache.sis.gui.coverage.ImageRequest;
import org.apache.sis.gui.coverage.CoverageExplorer;
import org.apache.sis.util.collection.TreeTable;
import org.apache.sis.util.resources.Vocabulary;
-import org.apache.sis.internal.gui.BackgroundThreads;
-import org.apache.sis.internal.gui.ExceptionReporter;
-import org.apache.sis.internal.gui.LogHandler;
+import org.apache.sis.gui.internal.BackgroundThreads;
+import org.apache.sis.gui.internal.ExceptionReporter;
+import org.apache.sis.gui.internal.LogHandler;
/**
diff --git
a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/dataset/ResourceItem.java
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/dataset/ResourceItem.java
index 64262a1f9d..7fde4ad65f 100644
---
a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/dataset/ResourceItem.java
+++
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/dataset/ResourceItem.java
@@ -30,10 +30,10 @@ import org.apache.sis.storage.Aggregate;
import org.apache.sis.storage.DataStoreException;
import org.apache.sis.storage.aggregate.MergeStrategy;
import org.apache.sis.internal.storage.folder.UnstructuredAggregate;
-import org.apache.sis.internal.gui.DataStoreOpener;
-import org.apache.sis.internal.gui.BackgroundThreads;
-import org.apache.sis.internal.gui.GUIUtilities;
-import org.apache.sis.internal.gui.LogHandler;
+import org.apache.sis.gui.internal.DataStoreOpener;
+import org.apache.sis.gui.internal.BackgroundThreads;
+import org.apache.sis.gui.internal.GUIUtilities;
+import org.apache.sis.gui.internal.LogHandler;
/**
diff --git
a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/dataset/ResourceTree.java
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/dataset/ResourceTree.java
index 1135c37d28..1aecab6394 100644
---
a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/dataset/ResourceTree.java
+++
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/dataset/ResourceTree.java
@@ -41,14 +41,14 @@ import org.apache.sis.storage.Resource;
import org.apache.sis.storage.Aggregate;
import org.apache.sis.storage.DataStore;
import org.apache.sis.internal.storage.io.IOUtilities;
-import org.apache.sis.internal.gui.DataStoreOpener;
-import org.apache.sis.internal.gui.BackgroundThreads;
-import org.apache.sis.internal.gui.ExceptionReporter;
-import org.apache.sis.internal.gui.Resources;
+import org.apache.sis.gui.internal.DataStoreOpener;
+import org.apache.sis.gui.internal.BackgroundThreads;
+import org.apache.sis.gui.internal.ExceptionReporter;
+import org.apache.sis.gui.internal.Resources;
import org.apache.sis.storage.DataStoreProvider;
import org.apache.sis.util.logging.Logging;
-import static org.apache.sis.internal.gui.LogHandler.LOGGER;
+import static org.apache.sis.gui.internal.LogHandler.LOGGER;
/**
diff --git
a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/dataset/WindowHandler.java
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/dataset/WindowHandler.java
index de1a57e3e5..7f78a7a622 100644
---
a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/dataset/WindowHandler.java
+++
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/dataset/WindowHandler.java
@@ -35,16 +35,16 @@ import org.apache.sis.storage.event.CloseEvent;
import org.apache.sis.storage.event.StoreListener;
import org.apache.sis.gui.coverage.CoverageExplorer;
import org.apache.sis.gui.map.MapCanvas;
-import org.apache.sis.internal.gui.BackgroundThreads;
-import org.apache.sis.internal.gui.DataStoreOpener;
-import org.apache.sis.internal.gui.GUIUtilities;
-import org.apache.sis.internal.gui.PrivateAccess;
-import org.apache.sis.internal.gui.Resources;
+import org.apache.sis.gui.internal.BackgroundThreads;
+import org.apache.sis.gui.internal.DataStoreOpener;
+import org.apache.sis.gui.internal.GUIUtilities;
+import org.apache.sis.gui.internal.PrivateAccess;
+import org.apache.sis.gui.internal.Resources;
import org.apache.sis.util.logging.Logging;
import org.apache.sis.util.ArgumentChecks;
import org.apache.sis.util.resources.Errors;
-import static org.apache.sis.internal.gui.LogHandler.LOGGER;
+import static org.apache.sis.gui.internal.LogHandler.LOGGER;
/**
diff --git
a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/dataset/WindowManager.java
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/dataset/WindowManager.java
index b41f20a161..9cc76a9f62 100644
---
a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/dataset/WindowManager.java
+++
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/dataset/WindowManager.java
@@ -31,8 +31,8 @@ import javafx.scene.text.Font;
import javafx.geometry.Rectangle2D;
import javafx.collections.FXCollections;
import javafx.collections.ObservableList;
-import org.apache.sis.internal.gui.Resources;
-import org.apache.sis.internal.gui.ToolbarButton;
+import org.apache.sis.gui.internal.Resources;
+import org.apache.sis.gui.internal.ToolbarButton;
/**
diff --git
a/optional/src/org.apache.sis.gui/main/org/apache/sis/internal/gui/BackgroundThreads.java
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/internal/BackgroundThreads.java
similarity index 98%
rename from
optional/src/org.apache.sis.gui/main/org/apache/sis/internal/gui/BackgroundThreads.java
rename to
optional/src/org.apache.sis.gui/main/org/apache/sis/gui/internal/BackgroundThreads.java
index 10f333b9e0..5f92e7c26a 100644
---
a/optional/src/org.apache.sis.gui/main/org/apache/sis/internal/gui/BackgroundThreads.java
+++
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/internal/BackgroundThreads.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.gui;
+package org.apache.sis.gui.internal;
import java.util.concurrent.Callable;
import java.util.concurrent.Executor;
@@ -33,7 +33,7 @@ import org.apache.sis.storage.DataStoreException;
import org.apache.sis.util.logging.Logging;
import org.apache.sis.util.Exceptions;
-import static org.apache.sis.internal.gui.LogHandler.LOGGER;
+import static org.apache.sis.gui.internal.LogHandler.LOGGER;
/**
diff --git
a/optional/src/org.apache.sis.gui/main/org/apache/sis/internal/gui/ColorName.java
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/internal/ColorName.java
similarity index 98%
rename from
optional/src/org.apache.sis.gui/main/org/apache/sis/internal/gui/ColorName.java
rename to
optional/src/org.apache.sis.gui/main/org/apache/sis/gui/internal/ColorName.java
index 648e3bb7a0..9ccace1371 100644
---
a/optional/src/org.apache.sis.gui/main/org/apache/sis/internal/gui/ColorName.java
+++
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/internal/ColorName.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.gui;
+package org.apache.sis.gui.internal;
import java.util.Map;
import java.util.HashMap;
diff --git
a/optional/src/org.apache.sis.gui/main/org/apache/sis/internal/gui/DataFormats.java
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/internal/DataFormats.java
similarity index 97%
rename from
optional/src/org.apache.sis.gui/main/org/apache/sis/internal/gui/DataFormats.java
rename to
optional/src/org.apache.sis.gui/main/org/apache/sis/gui/internal/DataFormats.java
index 8a0cedeece..c5d214581f 100644
---
a/optional/src/org.apache.sis.gui/main/org/apache/sis/internal/gui/DataFormats.java
+++
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/internal/DataFormats.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.gui;
+package org.apache.sis.gui.internal;
import javafx.scene.input.DataFormat;
import org.apache.sis.internal.storage.xml.AbstractProvider;
diff --git
a/optional/src/org.apache.sis.gui/main/org/apache/sis/internal/gui/DataStoreOpener.java
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/internal/DataStoreOpener.java
similarity index 99%
rename from
optional/src/org.apache.sis.gui/main/org/apache/sis/internal/gui/DataStoreOpener.java
rename to
optional/src/org.apache.sis.gui/main/org/apache/sis/gui/internal/DataStoreOpener.java
index 73424a65f4..3af0405b3c 100644
---
a/optional/src/org.apache.sis.gui/main/org/apache/sis/internal/gui/DataStoreOpener.java
+++
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/internal/DataStoreOpener.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.gui;
+package org.apache.sis.gui.internal;
import java.net.URI;
import java.net.URL;
diff --git
a/optional/src/org.apache.sis.gui/main/org/apache/sis/internal/gui/ExceptionReporter.java
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/internal/ExceptionReporter.java
similarity index 99%
rename from
optional/src/org.apache.sis.gui/main/org/apache/sis/internal/gui/ExceptionReporter.java
rename to
optional/src/org.apache.sis.gui/main/org/apache/sis/gui/internal/ExceptionReporter.java
index ee012211e8..24c4379003 100644
---
a/optional/src/org.apache.sis.gui/main/org/apache/sis/internal/gui/ExceptionReporter.java
+++
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/internal/ExceptionReporter.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.gui;
+package org.apache.sis.gui.internal;
import java.io.PrintWriter;
import java.io.StringWriter;
diff --git
a/optional/src/org.apache.sis.gui/main/org/apache/sis/internal/gui/FixedHeaderColumnSize.java
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/internal/FixedHeaderColumnSize.java
similarity index 98%
rename from
optional/src/org.apache.sis.gui/main/org/apache/sis/internal/gui/FixedHeaderColumnSize.java
rename to
optional/src/org.apache.sis.gui/main/org/apache/sis/gui/internal/FixedHeaderColumnSize.java
index 7e77e2cac4..6cbd1c4dc4 100644
---
a/optional/src/org.apache.sis.gui/main/org/apache/sis/internal/gui/FixedHeaderColumnSize.java
+++
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/internal/FixedHeaderColumnSize.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.gui;
+package org.apache.sis.gui.internal;
import java.util.List;
import javafx.util.Callback;
diff --git
a/optional/src/org.apache.sis.gui/main/org/apache/sis/internal/gui/GUIUtilities.java
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/internal/GUIUtilities.java
similarity index 99%
rename from
optional/src/org.apache.sis.gui/main/org/apache/sis/internal/gui/GUIUtilities.java
rename to
optional/src/org.apache.sis.gui/main/org/apache/sis/gui/internal/GUIUtilities.java
index 33355ee660..4418a429f2 100644
---
a/optional/src/org.apache.sis.gui/main/org/apache/sis/internal/gui/GUIUtilities.java
+++
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/internal/GUIUtilities.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.gui;
+package org.apache.sis.gui.internal;
import java.util.List;
import java.util.ArrayList;
diff --git
a/optional/src/org.apache.sis.gui/main/org/apache/sis/internal/gui/IdentityValueFactory.java
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/internal/IdentityValueFactory.java
similarity index 98%
rename from
optional/src/org.apache.sis.gui/main/org/apache/sis/internal/gui/IdentityValueFactory.java
rename to
optional/src/org.apache.sis.gui/main/org/apache/sis/gui/internal/IdentityValueFactory.java
index c1664db95c..906fb68888 100644
---
a/optional/src/org.apache.sis.gui/main/org/apache/sis/internal/gui/IdentityValueFactory.java
+++
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/internal/IdentityValueFactory.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.gui;
+package org.apache.sis.gui.internal;
import javafx.beans.property.ReadOnlyObjectWrapper;
import javafx.beans.value.ObservableValue;
diff --git
a/optional/src/org.apache.sis.gui/main/org/apache/sis/internal/gui/ImageConverter.java
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/internal/ImageConverter.java
similarity index 99%
rename from
optional/src/org.apache.sis.gui/main/org/apache/sis/internal/gui/ImageConverter.java
rename to
optional/src/org.apache.sis.gui/main/org/apache/sis/gui/internal/ImageConverter.java
index eebf6c0227..373ce300f6 100644
---
a/optional/src/org.apache.sis.gui/main/org/apache/sis/internal/gui/ImageConverter.java
+++
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/internal/ImageConverter.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.gui;
+package org.apache.sis.gui.internal;
import java.util.Map;
import java.util.function.DoubleUnaryOperator;
@@ -43,7 +43,7 @@ import org.apache.sis.util.logging.Logging;
import org.apache.sis.measure.NumberRange;
import org.apache.sis.math.Statistics;
-import static org.apache.sis.internal.gui.LogHandler.LOGGER;
+import static org.apache.sis.gui.internal.LogHandler.LOGGER;
/**
diff --git
a/optional/src/org.apache.sis.gui/main/org/apache/sis/internal/gui/ImmutableObjectProperty.java
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/internal/ImmutableObjectProperty.java
similarity index 98%
rename from
optional/src/org.apache.sis.gui/main/org/apache/sis/internal/gui/ImmutableObjectProperty.java
rename to
optional/src/org.apache.sis.gui/main/org/apache/sis/gui/internal/ImmutableObjectProperty.java
index d1c63c9878..5974cef260 100644
---
a/optional/src/org.apache.sis.gui/main/org/apache/sis/internal/gui/ImmutableObjectProperty.java
+++
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/internal/ImmutableObjectProperty.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.gui;
+package org.apache.sis.gui.internal;
import javafx.beans.InvalidationListener;
import javafx.beans.value.ChangeListener;
diff --git
a/optional/src/org.apache.sis.gui/main/org/apache/sis/internal/gui/LogHandler.java
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/internal/LogHandler.java
similarity index 99%
rename from
optional/src/org.apache.sis.gui/main/org/apache/sis/internal/gui/LogHandler.java
rename to
optional/src/org.apache.sis.gui/main/org/apache/sis/gui/internal/LogHandler.java
index 8f2800ccce..daf6c8cbeb 100644
---
a/optional/src/org.apache.sis.gui/main/org/apache/sis/internal/gui/LogHandler.java
+++
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/internal/LogHandler.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.gui;
+package org.apache.sis.gui.internal;
import java.util.List;
import java.util.ArrayList;
diff --git
a/optional/src/org.apache.sis.gui/main/org/apache/sis/internal/gui/MouseDrags.java
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/internal/MouseDrags.java
similarity index 98%
rename from
optional/src/org.apache.sis.gui/main/org/apache/sis/internal/gui/MouseDrags.java
rename to
optional/src/org.apache.sis.gui/main/org/apache/sis/gui/internal/MouseDrags.java
index b04d00d471..2ccc69bf16 100644
---
a/optional/src/org.apache.sis.gui/main/org/apache/sis/internal/gui/MouseDrags.java
+++
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/internal/MouseDrags.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.gui;
+package org.apache.sis.gui.internal;
import javafx.event.EventHandler;
import javafx.scene.input.MouseEvent;
diff --git
a/optional/src/org.apache.sis.gui/main/org/apache/sis/internal/gui/NonNullObjectProperty.java
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/internal/NonNullObjectProperty.java
similarity index 97%
rename from
optional/src/org.apache.sis.gui/main/org/apache/sis/internal/gui/NonNullObjectProperty.java
rename to
optional/src/org.apache.sis.gui/main/org/apache/sis/gui/internal/NonNullObjectProperty.java
index c8d89ee256..0f69eb61b5 100644
---
a/optional/src/org.apache.sis.gui/main/org/apache/sis/internal/gui/NonNullObjectProperty.java
+++
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/internal/NonNullObjectProperty.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.gui;
+package org.apache.sis.gui.internal;
import java.util.Objects;
import javafx.beans.property.SimpleObjectProperty;
diff --git
a/optional/src/org.apache.sis.gui/main/org/apache/sis/internal/gui/PrivateAccess.java
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/internal/PrivateAccess.java
similarity index 98%
rename from
optional/src/org.apache.sis.gui/main/org/apache/sis/internal/gui/PrivateAccess.java
rename to
optional/src/org.apache.sis.gui/main/org/apache/sis/gui/internal/PrivateAccess.java
index 8426d49a87..75f7db7e7f 100644
---
a/optional/src/org.apache.sis.gui/main/org/apache/sis/internal/gui/PrivateAccess.java
+++
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/internal/PrivateAccess.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.gui;
+package org.apache.sis.gui.internal;
import java.util.function.Consumer;
import java.util.function.BiFunction;
diff --git
a/optional/src/org.apache.sis.gui/main/org/apache/sis/internal/gui/PropertyValueFormats.java
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/internal/PropertyValueFormats.java
similarity index 99%
rename from
optional/src/org.apache.sis.gui/main/org/apache/sis/internal/gui/PropertyValueFormats.java
rename to
optional/src/org.apache.sis.gui/main/org/apache/sis/gui/internal/PropertyValueFormats.java
index 65aac8d385..e37bbabe5b 100644
---
a/optional/src/org.apache.sis.gui/main/org/apache/sis/internal/gui/PropertyValueFormats.java
+++
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/internal/PropertyValueFormats.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.gui;
+package org.apache.sis.gui.internal;
import java.util.Locale;
import java.util.TimeZone;
diff --git
a/optional/src/org.apache.sis.gui/main/org/apache/sis/internal/gui/PropertyValueFormatter.java
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/internal/PropertyValueFormatter.java
similarity index 98%
rename from
optional/src/org.apache.sis.gui/main/org/apache/sis/internal/gui/PropertyValueFormatter.java
rename to
optional/src/org.apache.sis.gui/main/org/apache/sis/gui/internal/PropertyValueFormatter.java
index be6be4a724..c8a5d91c1f 100644
---
a/optional/src/org.apache.sis.gui/main/org/apache/sis/internal/gui/PropertyValueFormatter.java
+++
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/internal/PropertyValueFormatter.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.gui;
+package org.apache.sis.gui.internal;
import java.util.Locale;
import org.apache.sis.util.Classes;
diff --git
a/optional/src/org.apache.sis.gui/main/org/apache/sis/internal/gui/PropertyView.java
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/internal/PropertyView.java
similarity index 99%
rename from
optional/src/org.apache.sis.gui/main/org/apache/sis/internal/gui/PropertyView.java
rename to
optional/src/org.apache.sis.gui/main/org/apache/sis/gui/internal/PropertyView.java
index 412e44268a..a635418cf9 100644
---
a/optional/src/org.apache.sis.gui/main/org/apache/sis/internal/gui/PropertyView.java
+++
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/internal/PropertyView.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.gui;
+package org.apache.sis.gui.internal;
import java.util.Locale;
import java.util.Objects;
diff --git
a/optional/src/org.apache.sis.gui/main/org/apache/sis/internal/gui/RecentChoices.java
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/internal/RecentChoices.java
similarity index 99%
rename from
optional/src/org.apache.sis.gui/main/org/apache/sis/internal/gui/RecentChoices.java
rename to
optional/src/org.apache.sis.gui/main/org/apache/sis/gui/internal/RecentChoices.java
index 9f906e6a22..0ace04d37d 100644
---
a/optional/src/org.apache.sis.gui/main/org/apache/sis/internal/gui/RecentChoices.java
+++
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/internal/RecentChoices.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.gui;
+package org.apache.sis.gui.internal;
import java.io.File;
import java.util.List;
diff --git
a/optional/src/org.apache.sis.gui/main/org/apache/sis/internal/gui/Resources.java
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/internal/Resources.java
similarity index 99%
rename from
optional/src/org.apache.sis.gui/main/org/apache/sis/internal/gui/Resources.java
rename to
optional/src/org.apache.sis.gui/main/org/apache/sis/gui/internal/Resources.java
index 5d141e5df0..5b7e750747 100644
---
a/optional/src/org.apache.sis.gui/main/org/apache/sis/internal/gui/Resources.java
+++
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/internal/Resources.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.gui;
+package org.apache.sis.gui.internal;
import java.io.InputStream;
import java.util.Locale;
diff --git
a/optional/src/org.apache.sis.gui/main/org/apache/sis/internal/gui/Resources.properties
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/internal/Resources.properties
similarity index 100%
rename from
optional/src/org.apache.sis.gui/main/org/apache/sis/internal/gui/Resources.properties
rename to
optional/src/org.apache.sis.gui/main/org/apache/sis/gui/internal/Resources.properties
diff --git
a/optional/src/org.apache.sis.gui/main/org/apache/sis/internal/gui/Resources_en.java
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/internal/Resources_en.java
similarity index 96%
rename from
optional/src/org.apache.sis.gui/main/org/apache/sis/internal/gui/Resources_en.java
rename to
optional/src/org.apache.sis.gui/main/org/apache/sis/gui/internal/Resources_en.java
index 3a334ae837..d0a32ca305 100644
---
a/optional/src/org.apache.sis.gui/main/org/apache/sis/internal/gui/Resources_en.java
+++
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/internal/Resources_en.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.gui;
+package org.apache.sis.gui.internal;
/**
diff --git
a/optional/src/org.apache.sis.gui/main/org/apache/sis/internal/gui/Resources_fr.java
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/internal/Resources_fr.java
similarity index 96%
rename from
optional/src/org.apache.sis.gui/main/org/apache/sis/internal/gui/Resources_fr.java
rename to
optional/src/org.apache.sis.gui/main/org/apache/sis/gui/internal/Resources_fr.java
index 261d4af678..d0fa8bf327 100644
---
a/optional/src/org.apache.sis.gui/main/org/apache/sis/internal/gui/Resources_fr.java
+++
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/internal/Resources_fr.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.gui;
+package org.apache.sis.gui.internal;
/**
diff --git
a/optional/src/org.apache.sis.gui/main/org/apache/sis/internal/gui/Resources_fr.properties
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/internal/Resources_fr.properties
similarity index 100%
rename from
optional/src/org.apache.sis.gui/main/org/apache/sis/internal/gui/Resources_fr.properties
rename to
optional/src/org.apache.sis.gui/main/org/apache/sis/gui/internal/Resources_fr.properties
diff --git
a/optional/src/org.apache.sis.gui/main/org/apache/sis/internal/gui/Styles.java
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/internal/Styles.java
similarity index 98%
rename from
optional/src/org.apache.sis.gui/main/org/apache/sis/internal/gui/Styles.java
rename to
optional/src/org.apache.sis.gui/main/org/apache/sis/gui/internal/Styles.java
index ae5bbc848b..f8c66512c1 100644
---
a/optional/src/org.apache.sis.gui/main/org/apache/sis/internal/gui/Styles.java
+++
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/internal/Styles.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.gui;
+package org.apache.sis.gui.internal;
import java.util.Arrays;
import java.io.IOException;
@@ -32,7 +32,7 @@ import javafx.scene.layout.RowConstraints;
import org.apache.sis.util.logging.Logging;
import org.apache.sis.util.Static;
-import static org.apache.sis.internal.gui.LogHandler.LOGGER;
+import static org.apache.sis.gui.internal.LogHandler.LOGGER;
/**
diff --git
a/optional/src/org.apache.sis.gui/main/org/apache/sis/internal/gui/ToolbarButton.java
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/internal/ToolbarButton.java
similarity index 99%
rename from
optional/src/org.apache.sis.gui/main/org/apache/sis/internal/gui/ToolbarButton.java
rename to
optional/src/org.apache.sis.gui/main/org/apache/sis/gui/internal/ToolbarButton.java
index 6e7a574ed7..11cb4458fb 100644
---
a/optional/src/org.apache.sis.gui/main/org/apache/sis/internal/gui/ToolbarButton.java
+++
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/internal/ToolbarButton.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.gui;
+package org.apache.sis.gui.internal;
import javafx.scene.Node;
import javafx.scene.control.Control;
diff --git
a/optional/src/org.apache.sis.gui/main/org/apache/sis/internal/gui/io/FileAccessItem.java
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/internal/io/FileAccessItem.java
similarity index 99%
rename from
optional/src/org.apache.sis.gui/main/org/apache/sis/internal/gui/io/FileAccessItem.java
rename to
optional/src/org.apache.sis.gui/main/org/apache/sis/gui/internal/io/FileAccessItem.java
index 15b088352b..de0d6206ca 100644
---
a/optional/src/org.apache.sis.gui/main/org/apache/sis/internal/gui/io/FileAccessItem.java
+++
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/internal/io/FileAccessItem.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.gui.io;
+package org.apache.sis.gui.internal.io;
import java.util.List;
import java.util.ListIterator;
diff --git
a/optional/src/org.apache.sis.gui/main/org/apache/sis/internal/gui/io/FileAccessView.java
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/internal/io/FileAccessView.java
similarity index 97%
rename from
optional/src/org.apache.sis.gui/main/org/apache/sis/internal/gui/io/FileAccessView.java
rename to
optional/src/org.apache.sis.gui/main/org/apache/sis/gui/internal/io/FileAccessView.java
index 0de8fef6d6..30b5dee00d 100644
---
a/optional/src/org.apache.sis.gui/main/org/apache/sis/internal/gui/io/FileAccessView.java
+++
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/internal/io/FileAccessView.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.gui.io;
+package org.apache.sis.gui.internal.io;
import java.io.IOException;
import java.io.InputStream;
@@ -29,9 +29,9 @@ import javafx.scene.control.TableColumn;
import javafx.application.Platform;
import org.apache.sis.gui.Widget;
import org.apache.sis.util.resources.Vocabulary;
-import org.apache.sis.internal.gui.FixedHeaderColumnSize;
-import org.apache.sis.internal.gui.ImmutableObjectProperty;
-import org.apache.sis.internal.gui.Resources;
+import org.apache.sis.gui.internal.FixedHeaderColumnSize;
+import org.apache.sis.gui.internal.ImmutableObjectProperty;
+import org.apache.sis.gui.internal.Resources;
import org.apache.sis.internal.storage.io.ChannelFactory;
import org.apache.sis.internal.storage.io.FileCacheByteChannel;
import org.apache.sis.storage.DataStoreException;
diff --git
a/optional/src/org.apache.sis.gui/main/org/apache/sis/internal/gui/OptionalDataDownloader.java
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/internal/io/OptionalDataDownloader.java
similarity index 96%
rename from
optional/src/org.apache.sis.gui/main/org/apache/sis/internal/gui/OptionalDataDownloader.java
rename to
optional/src/org.apache.sis.gui/main/org/apache/sis/gui/internal/io/OptionalDataDownloader.java
index af7e31d0a5..59b745deef 100644
---
a/optional/src/org.apache.sis.gui/main/org/apache/sis/internal/gui/OptionalDataDownloader.java
+++
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/internal/io/OptionalDataDownloader.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.gui;
+package org.apache.sis.gui.internal.io;
import javafx.application.Platform;
import javafx.scene.control.Alert;
@@ -23,6 +23,9 @@ import javafx.scene.control.DialogPane;
import javafx.scene.web.WebView;
import org.opengis.util.FactoryException;
import org.apache.sis.gui.DataViewer;
+import org.apache.sis.gui.internal.BackgroundThreads;
+import org.apache.sis.gui.internal.ExceptionReporter;
+import org.apache.sis.gui.internal.Resources;
import org.apache.sis.internal.system.Fallback;
import org.apache.sis.setup.OptionalInstallations;
diff --git
a/optional/src/org.apache.sis.gui/main/org/apache/sis/internal/gui/io/package-info.java
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/internal/io/package-info.java
similarity index 92%
rename from
optional/src/org.apache.sis.gui/main/org/apache/sis/internal/gui/io/package-info.java
rename to
optional/src/org.apache.sis.gui/main/org/apache/sis/gui/internal/io/package-info.java
index 2f26f52e0a..e7b32b874f 100644
---
a/optional/src/org.apache.sis.gui/main/org/apache/sis/internal/gui/io/package-info.java
+++
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/internal/io/package-info.java
@@ -26,8 +26,8 @@
* @author Martin Desruisseaux (Geomatys)
* @version 1.4
*
- * @see org.apache.sis.internal.gui.DataStoreOpener
+ * @see org.apache.sis.gui.internal.DataStoreOpener
*
* @since 1.2
*/
-package org.apache.sis.internal.gui.io;
+package org.apache.sis.gui.internal.io;
diff --git
a/optional/src/org.apache.sis.gui/main/org/apache/sis/internal/gui/package-info.java
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/internal/package-info.java
similarity index 96%
rename from
optional/src/org.apache.sis.gui/main/org/apache/sis/internal/gui/package-info.java
rename to
optional/src/org.apache.sis.gui/main/org/apache/sis/gui/internal/package-info.java
index ca9e3a4c52..36ff55a38a 100644
---
a/optional/src/org.apache.sis.gui/main/org/apache/sis/internal/gui/package-info.java
+++
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/internal/package-info.java
@@ -28,4 +28,4 @@
* @version 1.4
* @since 1.1
*/
-package org.apache.sis.internal.gui;
+package org.apache.sis.gui.internal;
diff --git
a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/map/GestureFollower.java
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/map/GestureFollower.java
index 7e418f8218..4436d50bf4 100644
---
a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/map/GestureFollower.java
+++
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/map/GestureFollower.java
@@ -40,7 +40,7 @@ import org.apache.sis.portrayal.TransformChangeEvent;
import org.apache.sis.portrayal.CanvasFollower;
import org.apache.sis.util.logging.Logging;
-import static org.apache.sis.internal.gui.LogHandler.LOGGER;
+import static org.apache.sis.gui.internal.LogHandler.LOGGER;
/**
diff --git
a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/map/MapCanvas.java
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/map/MapCanvas.java
index b20c9996f1..209c0113ef 100644
--- a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/map/MapCanvas.java
+++ b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/map/MapCanvas.java
@@ -78,18 +78,18 @@ import org.apache.sis.util.logging.Logging;
import org.apache.sis.internal.util.Numerics;
import org.apache.sis.internal.system.DelayedExecutor;
import org.apache.sis.internal.system.DelayedRunnable;
-import org.apache.sis.internal.gui.BackgroundThreads;
-import org.apache.sis.internal.gui.ExceptionReporter;
-import org.apache.sis.internal.gui.GUIUtilities;
-import org.apache.sis.internal.gui.MouseDrags;
-import org.apache.sis.internal.gui.Resources;
+import org.apache.sis.gui.internal.BackgroundThreads;
+import org.apache.sis.gui.internal.ExceptionReporter;
+import org.apache.sis.gui.internal.GUIUtilities;
+import org.apache.sis.gui.internal.MouseDrags;
+import org.apache.sis.gui.internal.Resources;
import org.apache.sis.internal.referencing.AxisDirections;
import org.apache.sis.internal.referencing.j2d.AffineTransform2D;
import org.apache.sis.portrayal.PlanarCanvas;
import org.apache.sis.portrayal.RenderException;
import org.apache.sis.portrayal.TransformChangeEvent;
-import static org.apache.sis.internal.gui.LogHandler.LOGGER;
+import static org.apache.sis.gui.internal.LogHandler.LOGGER;
import static
org.apache.sis.internal.util.StandardDateFormat.NANOS_PER_MILLISECOND;
diff --git
a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/map/MapMenu.java
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/map/MapMenu.java
index 32ed79a156..29fd56f4da 100644
--- a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/map/MapMenu.java
+++ b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/map/MapMenu.java
@@ -32,8 +32,8 @@ import org.opengis.referencing.ReferenceSystem;
import org.opengis.referencing.operation.TransformException;
import org.apache.sis.gui.referencing.RecentReferenceSystems;
import org.apache.sis.gui.referencing.PositionableProjection;
-import org.apache.sis.internal.gui.ExceptionReporter;
-import org.apache.sis.internal.gui.Resources;
+import org.apache.sis.gui.internal.ExceptionReporter;
+import org.apache.sis.gui.internal.Resources;
import org.apache.sis.referencing.IdentifiedObjects;
import org.apache.sis.util.ArgumentChecks;
diff --git
a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/map/OperationFinder.java
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/map/OperationFinder.java
index 8d641a0ec4..0553895b29 100644
---
a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/map/OperationFinder.java
+++
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/map/OperationFinder.java
@@ -34,7 +34,7 @@ import
org.apache.sis.metadata.iso.extent.DefaultGeographicBoundingBox;
import org.apache.sis.referencing.operation.transform.MathTransforms;
import org.apache.sis.util.logging.Logging;
-import static org.apache.sis.internal.gui.LogHandler.LOGGER;
+import static org.apache.sis.gui.internal.LogHandler.LOGGER;
/**
diff --git
a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/map/StatusBar.java
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/map/StatusBar.java
index 234a81d9ba..cc156be2f4 100644
--- a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/map/StatusBar.java
+++ b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/map/StatusBar.java
@@ -90,16 +90,16 @@ import org.apache.sis.util.resources.Errors;
import org.apache.sis.util.logging.Logging;
import org.apache.sis.gui.Widget;
import org.apache.sis.gui.referencing.RecentReferenceSystems;
-import org.apache.sis.internal.gui.BackgroundThreads;
-import org.apache.sis.internal.gui.ExceptionReporter;
-import org.apache.sis.internal.gui.GUIUtilities;
-import org.apache.sis.internal.gui.Resources;
-import org.apache.sis.internal.gui.Styles;
+import org.apache.sis.gui.internal.BackgroundThreads;
+import org.apache.sis.gui.internal.ExceptionReporter;
+import org.apache.sis.gui.internal.GUIUtilities;
+import org.apache.sis.gui.internal.Resources;
+import org.apache.sis.gui.internal.Styles;
import org.apache.sis.referencing.CRS;
import org.apache.sis.referencing.IdentifiedObjects;
import org.apache.sis.referencing.gazetteer.ReferencingByIdentifiers;
-import static org.apache.sis.internal.gui.LogHandler.LOGGER;
+import static org.apache.sis.gui.internal.LogHandler.LOGGER;
/**
diff --git
a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/map/ValuesFormatter.java
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/map/ValuesFormatter.java
index f2c4cb01ef..96e27b8ed3 100644
---
a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/map/ValuesFormatter.java
+++
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/map/ValuesFormatter.java
@@ -44,7 +44,7 @@ import org.apache.sis.util.Characters;
import org.apache.sis.util.logging.Logging;
import org.apache.sis.internal.util.Numerics;
-import static org.apache.sis.internal.gui.LogHandler.LOGGER;
+import static org.apache.sis.gui.internal.LogHandler.LOGGER;
// Branch-dependent imports
import org.opengis.coverage.CannotEvaluateException;
diff --git
a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/map/ValuesFromCoverage.java
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/map/ValuesFromCoverage.java
index 7c5a6acd35..bd9fd008e2 100644
---
a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/map/ValuesFromCoverage.java
+++
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/map/ValuesFromCoverage.java
@@ -32,8 +32,8 @@ import org.apache.sis.gui.coverage.CoverageCanvas;
import org.apache.sis.coverage.grid.GridExtent;
import org.apache.sis.coverage.grid.GridCoverage;
import org.apache.sis.coverage.SampleDimension;
-import org.apache.sis.internal.gui.GUIUtilities;
-import org.apache.sis.internal.gui.BackgroundThreads;
+import org.apache.sis.gui.internal.GUIUtilities;
+import org.apache.sis.gui.internal.BackgroundThreads;
import org.apache.sis.util.resources.Vocabulary;
diff --git
a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/map/ValuesUnderCursor.java
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/map/ValuesUnderCursor.java
index baa24e3ff8..2c893792f9 100644
---
a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/map/ValuesUnderCursor.java
+++
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/map/ValuesUnderCursor.java
@@ -24,7 +24,7 @@ import org.opengis.geometry.DirectPosition;
import org.apache.sis.gui.coverage.CoverageCanvas;
import org.apache.sis.coverage.grid.GridCoverage;
import org.apache.sis.geometry.GeneralDirectPosition;
-import org.apache.sis.internal.gui.BackgroundThreads;
+import org.apache.sis.gui.internal.BackgroundThreads;
/**
diff --git
a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/metadata/IdentificationInfo.java
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/metadata/IdentificationInfo.java
index abfd0f19d3..ddf12b452b 100644
---
a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/metadata/IdentificationInfo.java
+++
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/metadata/IdentificationInfo.java
@@ -47,7 +47,7 @@ import org.apache.sis.metadata.iso.citation.Citations;
import org.apache.sis.metadata.iso.extent.Extents;
import org.apache.sis.referencing.IdentifiedObjects;
import org.apache.sis.internal.referencing.Formulas;
-import org.apache.sis.internal.gui.BackgroundThreads;
+import org.apache.sis.gui.internal.BackgroundThreads;
import org.apache.sis.measure.Latitude;
import org.apache.sis.measure.Longitude;
import org.apache.sis.measure.Range;
diff --git
a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/metadata/MetadataSummary.java
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/metadata/MetadataSummary.java
index 4ca561aed2..c3f6f3b143 100644
---
a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/metadata/MetadataSummary.java
+++
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/metadata/MetadataSummary.java
@@ -35,9 +35,9 @@ import javafx.scene.layout.VBox;
import org.opengis.metadata.Metadata;
import org.opengis.util.ControlledVocabulary;
import org.opengis.util.InternationalString;
-import org.apache.sis.internal.gui.BackgroundThreads;
-import org.apache.sis.internal.gui.ExceptionReporter;
-import org.apache.sis.internal.gui.Styles;
+import org.apache.sis.gui.internal.BackgroundThreads;
+import org.apache.sis.gui.internal.ExceptionReporter;
+import org.apache.sis.gui.internal.Styles;
import org.apache.sis.internal.util.Strings;
import org.apache.sis.storage.DataStoreException;
import org.apache.sis.storage.Resource;
diff --git
a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/metadata/MetadataTree.java
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/metadata/MetadataTree.java
index 5d642861c9..bc2da545a2 100644
---
a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/metadata/MetadataTree.java
+++
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/metadata/MetadataTree.java
@@ -46,16 +46,16 @@ import javafx.scene.input.ClipboardContent;
import org.opengis.util.InternationalString;
import org.opengis.referencing.IdentifiedObject;
import org.apache.sis.referencing.IdentifiedObjects;
-import org.apache.sis.internal.gui.Resources;
-import org.apache.sis.internal.gui.PropertyView;
-import org.apache.sis.internal.gui.PropertyValueFormatter;
-import org.apache.sis.internal.gui.ExceptionReporter;
+import org.apache.sis.gui.internal.Resources;
+import org.apache.sis.gui.internal.PropertyView;
+import org.apache.sis.gui.internal.PropertyValueFormatter;
+import org.apache.sis.gui.internal.ExceptionReporter;
import org.apache.sis.util.collection.TreeTable;
import org.apache.sis.util.collection.TableColumn;
import org.apache.sis.util.resources.Vocabulary;
import org.apache.sis.util.logging.Logging;
-import static org.apache.sis.internal.gui.LogHandler.LOGGER;
+import static org.apache.sis.gui.internal.LogHandler.LOGGER;
/**
diff --git
a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/metadata/Section.java
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/metadata/Section.java
index c00c9b55b9..beceb317f6 100644
---
a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/metadata/Section.java
+++
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/metadata/Section.java
@@ -35,7 +35,7 @@ import javafx.scene.layout.TilePane;
import org.opengis.metadata.Metadata;
import org.apache.sis.util.ArraysExt;
import org.apache.sis.util.resources.Vocabulary;
-import org.apache.sis.internal.gui.Styles;
+import org.apache.sis.gui.internal.Styles;
/**
diff --git
a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/metadata/StandardMetadataTree.java
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/metadata/StandardMetadataTree.java
index 2bba8423a3..83c7d2bf93 100644
---
a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/metadata/StandardMetadataTree.java
+++
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/metadata/StandardMetadataTree.java
@@ -31,9 +31,9 @@ import org.apache.sis.metadata.AbstractMetadata;
import org.apache.sis.metadata.MetadataStandard;
import org.apache.sis.metadata.ValueExistencePolicy;
import org.apache.sis.internal.xml.LegacyNamespaces;
-import org.apache.sis.internal.gui.ExceptionReporter;
-import org.apache.sis.internal.gui.DataFormats;
-import org.apache.sis.internal.gui.Resources;
+import org.apache.sis.gui.internal.ExceptionReporter;
+import org.apache.sis.gui.internal.DataFormats;
+import org.apache.sis.gui.internal.Resources;
import org.apache.sis.util.collection.TreeTable;
import org.apache.sis.util.collection.TableColumn;
import org.apache.sis.io.wkt.WKTFormat;
diff --git
a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/metadata/VerboseFormats.java
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/metadata/VerboseFormats.java
index ac55a564c5..d42eefce2c 100644
---
a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/metadata/VerboseFormats.java
+++
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/metadata/VerboseFormats.java
@@ -22,7 +22,7 @@ import java.text.Format;
import java.text.DateFormat;
import javax.measure.Unit;
import org.apache.sis.measure.UnitFormat;
-import org.apache.sis.internal.gui.PropertyValueFormats;
+import org.apache.sis.gui.internal.PropertyValueFormats;
/**
diff --git
a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/referencing/AuthorityCodes.java
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/referencing/AuthorityCodes.java
index 72a3d5f8e6..1e6e6b36b1 100644
---
a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/referencing/AuthorityCodes.java
+++
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/referencing/AuthorityCodes.java
@@ -42,10 +42,10 @@ import org.apache.sis.util.logging.Logging;
import org.apache.sis.util.resources.Vocabulary;
import org.apache.sis.util.collection.BackingStoreException;
import org.apache.sis.internal.util.StandardDateFormat;
-import org.apache.sis.internal.gui.BackgroundThreads;
+import org.apache.sis.gui.internal.BackgroundThreads;
import org.apache.sis.internal.util.Strings;
-import static org.apache.sis.internal.gui.LogHandler.LOGGER;
+import static org.apache.sis.gui.internal.LogHandler.LOGGER;
/**
diff --git
a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/referencing/CRSChooser.java
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/referencing/CRSChooser.java
index 0539dd3979..43e9a46b44 100644
---
a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/referencing/CRSChooser.java
+++
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/referencing/CRSChooser.java
@@ -60,11 +60,11 @@ import
org.opengis.referencing.crs.CoordinateReferenceSystem;
import org.opengis.referencing.operation.Conversion;
import org.opengis.referencing.operation.OperationMethod;
import org.apache.sis.internal.referencing.ReferencingUtilities;
-import org.apache.sis.internal.gui.BackgroundThreads;
-import org.apache.sis.internal.gui.ExceptionReporter;
-import org.apache.sis.internal.gui.IdentityValueFactory;
-import org.apache.sis.internal.gui.Resources;
-import org.apache.sis.internal.gui.Styles;
+import org.apache.sis.gui.internal.BackgroundThreads;
+import org.apache.sis.gui.internal.ExceptionReporter;
+import org.apache.sis.gui.internal.IdentityValueFactory;
+import org.apache.sis.gui.internal.Resources;
+import org.apache.sis.gui.internal.Styles;
import org.apache.sis.geometry.ImmutableEnvelope;
import org.apache.sis.metadata.iso.extent.Extents;
import org.apache.sis.util.resources.Vocabulary;
diff --git
a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/referencing/Code.java
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/referencing/Code.java
index 736692b61a..16c700ae36 100644
---
a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/referencing/Code.java
+++
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/referencing/Code.java
@@ -20,7 +20,7 @@ import javafx.geometry.Pos;
import javafx.scene.control.TableCell;
import javafx.scene.control.TableColumn;
import javafx.beans.property.ReadOnlyStringWrapper;
-import org.apache.sis.internal.gui.Styles;
+import org.apache.sis.gui.internal.Styles;
/**
diff --git
a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/referencing/MenuSync.java
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/referencing/MenuSync.java
index b00247059c..90abdb2797 100644
---
a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/referencing/MenuSync.java
+++
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/referencing/MenuSync.java
@@ -34,8 +34,8 @@ import org.opengis.referencing.ReferenceSystem;
import org.opengis.referencing.crs.DerivedCRS;
import org.opengis.referencing.crs.CoordinateReferenceSystem;
import org.apache.sis.internal.referencing.ReferencingUtilities;
-import org.apache.sis.internal.gui.GUIUtilities;
-import org.apache.sis.internal.gui.Resources;
+import org.apache.sis.gui.internal.GUIUtilities;
+import org.apache.sis.gui.internal.Resources;
import org.apache.sis.referencing.IdentifiedObjects;
import org.apache.sis.referencing.gazetteer.GazetteerFactory;
import org.apache.sis.referencing.gazetteer.GazetteerException;
diff --git
a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/referencing/ObjectStringConverter.java
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/referencing/ObjectStringConverter.java
index 01fe4ca2cc..d951f1fd0d 100644
---
a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/referencing/ObjectStringConverter.java
+++
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/referencing/ObjectStringConverter.java
@@ -20,7 +20,7 @@ import java.util.Locale;
import javafx.util.StringConverter;
import org.opengis.referencing.IdentifiedObject;
import org.apache.sis.referencing.IdentifiedObjects;
-import org.apache.sis.internal.gui.Resources;
+import org.apache.sis.gui.internal.Resources;
/**
diff --git
a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/referencing/PositionableProjection.java
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/referencing/PositionableProjection.java
index 43fb18c092..e2ed2d7d8c 100644
---
a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/referencing/PositionableProjection.java
+++
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/referencing/PositionableProjection.java
@@ -25,7 +25,7 @@ import org.opengis.referencing.crs.GeographicCRS;
import org.opengis.referencing.operation.TransformException;
import org.opengis.referencing.crs.CoordinateReferenceSystem;
import org.opengis.referencing.crs.ProjectedCRS;
-import org.apache.sis.internal.gui.Resources;
+import org.apache.sis.gui.internal.Resources;
import org.apache.sis.internal.referencing.GeodeticObjectBuilder;
import org.apache.sis.internal.referencing.ReferencingUtilities;
import org.apache.sis.measure.AngleFormat;
@@ -39,7 +39,7 @@ import org.apache.sis.util.ArgumentChecks;
import org.apache.sis.util.Utilities;
import org.apache.sis.util.logging.Logging;
-import static org.apache.sis.internal.gui.LogHandler.LOGGER;
+import static org.apache.sis.gui.internal.LogHandler.LOGGER;
/**
diff --git
a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/referencing/RecentReferenceSystems.java
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/referencing/RecentReferenceSystems.java
index be35de2eea..eaaba2438d 100644
---
a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/referencing/RecentReferenceSystems.java
+++
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/referencing/RecentReferenceSystems.java
@@ -56,16 +56,16 @@ import org.apache.sis.util.ComparisonMode;
import org.apache.sis.util.Utilities;
import org.apache.sis.util.logging.Logging;
import org.apache.sis.util.resources.Vocabulary;
-import org.apache.sis.internal.gui.BackgroundThreads;
-import org.apache.sis.internal.gui.ExceptionReporter;
-import org.apache.sis.internal.gui.GUIUtilities;
-import org.apache.sis.internal.gui.NonNullObjectProperty;
-import org.apache.sis.internal.gui.OptionalDataDownloader;
-import org.apache.sis.internal.gui.RecentChoices;
+import org.apache.sis.gui.internal.BackgroundThreads;
+import org.apache.sis.gui.internal.ExceptionReporter;
+import org.apache.sis.gui.internal.GUIUtilities;
+import org.apache.sis.gui.internal.NonNullObjectProperty;
+import org.apache.sis.gui.internal.RecentChoices;
+import org.apache.sis.gui.internal.io.OptionalDataDownloader;
import org.apache.sis.internal.util.Strings;
import org.apache.sis.internal.util.UnmodifiableArrayList;
-import static org.apache.sis.internal.gui.LogHandler.LOGGER;
+import static org.apache.sis.gui.internal.LogHandler.LOGGER;
/**
diff --git
a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/referencing/Utils.java
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/referencing/Utils.java
index b3d41e35d6..8c0e322b40 100644
---
a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/referencing/Utils.java
+++
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/referencing/Utils.java
@@ -32,7 +32,7 @@ import org.apache.sis.util.logging.Logging;
import org.apache.sis.referencing.CommonCRS;
import org.apache.sis.referencing.CRS;
-import static org.apache.sis.internal.gui.LogHandler.LOGGER;
+import static org.apache.sis.gui.internal.LogHandler.LOGGER;
/**
diff --git
a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/referencing/WKTPane.java
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/referencing/WKTPane.java
index 87c08fe9a4..2f56da05d3 100644
---
a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/referencing/WKTPane.java
+++
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/referencing/WKTPane.java
@@ -31,7 +31,7 @@ import org.opengis.util.FactoryException;
import org.opengis.referencing.crs.CoordinateReferenceSystem;
import org.apache.sis.io.wkt.Convention;
import org.apache.sis.io.wkt.WKTFormat;
-import org.apache.sis.internal.gui.BackgroundThreads;
+import org.apache.sis.gui.internal.BackgroundThreads;
import org.apache.sis.util.resources.Vocabulary;
import org.apache.sis.util.Exceptions;
diff --git
a/optional/src/org.apache.sis.gui/main/org/apache/sis/internal/setup/FXFinder.java
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/setup/FXFinder.java
similarity index 99%
rename from
optional/src/org.apache.sis.gui/main/org/apache/sis/internal/setup/FXFinder.java
rename to
optional/src/org.apache.sis.gui/main/org/apache/sis/gui/setup/FXFinder.java
index 35bf1a6560..18cfccdac5 100644
---
a/optional/src/org.apache.sis.gui/main/org/apache/sis/internal/setup/FXFinder.java
+++
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/setup/FXFinder.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.setup;
+package org.apache.sis.gui.setup;
import java.io.File;
import java.io.FileNotFoundException;
diff --git
a/optional/src/org.apache.sis.gui/main/org/apache/sis/internal/setup/Inflater.java
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/setup/Inflater.java
similarity index 99%
rename from
optional/src/org.apache.sis.gui/main/org/apache/sis/internal/setup/Inflater.java
rename to
optional/src/org.apache.sis.gui/main/org/apache/sis/gui/setup/Inflater.java
index 88e74a9ba9..84e82eaa0e 100644
---
a/optional/src/org.apache.sis.gui/main/org/apache/sis/internal/setup/Inflater.java
+++
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/setup/Inflater.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.setup;
+package org.apache.sis.gui.setup;
import java.awt.EventQueue;
import java.io.File;
diff --git
a/optional/src/org.apache.sis.gui/main/org/apache/sis/internal/setup/Wizard.java
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/setup/Wizard.java
similarity index 99%
rename from
optional/src/org.apache.sis.gui/main/org/apache/sis/internal/setup/Wizard.java
rename to
optional/src/org.apache.sis.gui/main/org/apache/sis/gui/setup/Wizard.java
index c74fb2353c..2fa4ad52b0 100644
---
a/optional/src/org.apache.sis.gui/main/org/apache/sis/internal/setup/Wizard.java
+++ b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/setup/Wizard.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.setup;
+package org.apache.sis.gui.setup;
import java.awt.BorderLayout;
import java.awt.CardLayout;
diff --git
a/optional/src/org.apache.sis.gui/main/org/apache/sis/internal/setup/WizardPage.java
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/setup/WizardPage.java
similarity index 99%
rename from
optional/src/org.apache.sis.gui/main/org/apache/sis/internal/setup/WizardPage.java
rename to
optional/src/org.apache.sis.gui/main/org/apache/sis/gui/setup/WizardPage.java
index 94c5928a96..1eb557cb17 100644
---
a/optional/src/org.apache.sis.gui/main/org/apache/sis/internal/setup/WizardPage.java
+++
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/setup/WizardPage.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.setup;
+package org.apache.sis.gui.setup;
/**
diff --git
a/optional/src/org.apache.sis.gui/main/org/apache/sis/internal/setup/package-info.java
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/setup/package-info.java
similarity index 96%
rename from
optional/src/org.apache.sis.gui/main/org/apache/sis/internal/setup/package-info.java
rename to
optional/src/org.apache.sis.gui/main/org/apache/sis/gui/setup/package-info.java
index 713c873e9a..9bf41c68db 100644
---
a/optional/src/org.apache.sis.gui/main/org/apache/sis/internal/setup/package-info.java
+++
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/setup/package-info.java
@@ -25,4 +25,4 @@
* @version 1.3
* @since 1.1
*/
-package org.apache.sis.internal.setup;
+package org.apache.sis.gui.setup;
diff --git
a/optional/src/org.apache.sis.gui/test/org/apache/sis/internal/gui/control/ValueColorMapperApp.java
b/optional/src/org.apache.sis.gui/test/org/apache/sis/gui/controls/ValueColorMapperApp.java
similarity index 95%
rename from
optional/src/org.apache.sis.gui/test/org/apache/sis/internal/gui/control/ValueColorMapperApp.java
rename to
optional/src/org.apache.sis.gui/test/org/apache/sis/gui/controls/ValueColorMapperApp.java
index cc804a0b77..b7479dc76d 100644
---
a/optional/src/org.apache.sis.gui/test/org/apache/sis/internal/gui/control/ValueColorMapperApp.java
+++
b/optional/src/org.apache.sis.gui/test/org/apache/sis/gui/controls/ValueColorMapperApp.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.gui.control;
+package org.apache.sis.gui.controls;
import java.util.Locale;
import javafx.stage.Stage;
@@ -24,8 +24,8 @@ import javafx.scene.control.Button;
import javafx.scene.layout.Region;
import javafx.scene.layout.BorderPane;
import javafx.application.Application;
-import org.apache.sis.internal.gui.Styles;
-import org.apache.sis.internal.gui.Resources;
+import org.apache.sis.gui.internal.Styles;
+import org.apache.sis.gui.internal.Resources;
import org.apache.sis.util.resources.Vocabulary;
diff --git
a/optional/src/org.apache.sis.gui/test/org/apache/sis/gui/coverage/CoverageCanvasApp.java
b/optional/src/org.apache.sis.gui/test/org/apache/sis/gui/coverage/CoverageCanvasApp.java
index 12edffd4a8..dafbdeb797 100644
---
a/optional/src/org.apache.sis.gui/test/org/apache/sis/gui/coverage/CoverageCanvasApp.java
+++
b/optional/src/org.apache.sis.gui/test/org/apache/sis/gui/coverage/CoverageCanvasApp.java
@@ -29,7 +29,7 @@ import org.apache.sis.coverage.grid.GridGeometry;
import org.apache.sis.gui.map.StatusBar;
import org.apache.sis.image.TiledImageMock;
import org.apache.sis.image.WritablePixelIterator;
-import org.apache.sis.internal.gui.BackgroundThreads;
+import org.apache.sis.gui.internal.BackgroundThreads;
import org.apache.sis.referencing.CommonCRS;
import org.apache.sis.referencing.operation.transform.MathTransforms;
diff --git
a/optional/src/org.apache.sis.gui/test/org/apache/sis/gui/coverage/CoverageStylingApp.java
b/optional/src/org.apache.sis.gui/test/org/apache/sis/gui/coverage/CoverageStylingApp.java
index ecd19eb50a..6d57ea3f02 100644
---
a/optional/src/org.apache.sis.gui/test/org/apache/sis/gui/coverage/CoverageStylingApp.java
+++
b/optional/src/org.apache.sis.gui/test/org/apache/sis/gui/coverage/CoverageStylingApp.java
@@ -26,8 +26,8 @@ import javafx.scene.layout.BorderPane;
import org.apache.sis.coverage.Category;
import org.apache.sis.coverage.SampleDimension;
import org.apache.sis.util.resources.Vocabulary;
-import org.apache.sis.internal.gui.Resources;
-import org.apache.sis.internal.gui.control.ColorRamp;
+import org.apache.sis.gui.internal.Resources;
+import org.apache.sis.gui.controls.ColorRamp;
import org.apache.sis.measure.Units;
diff --git
a/optional/src/org.apache.sis.gui/test/org/apache/sis/gui/coverage/GridViewApp.java
b/optional/src/org.apache.sis.gui/test/org/apache/sis/gui/coverage/GridViewApp.java
index fe8a65ad33..93d5b9f096 100644
---
a/optional/src/org.apache.sis.gui/test/org/apache/sis/gui/coverage/GridViewApp.java
+++
b/optional/src/org.apache.sis.gui/test/org/apache/sis/gui/coverage/GridViewApp.java
@@ -23,7 +23,7 @@ import javafx.scene.layout.BorderPane;
import javafx.scene.Scene;
import javafx.stage.Stage;
import org.apache.sis.image.TiledImageMock;
-import org.apache.sis.internal.gui.BackgroundThreads;
+import org.apache.sis.gui.internal.BackgroundThreads;
/**
diff --git
a/optional/src/org.apache.sis.gui/test/org/apache/sis/internal/gui/GUIUtilitiesTest.java
b/optional/src/org.apache.sis.gui/test/org/apache/sis/gui/internal/GUIUtilitiesTest.java
similarity index 99%
rename from
optional/src/org.apache.sis.gui/test/org/apache/sis/internal/gui/GUIUtilitiesTest.java
rename to
optional/src/org.apache.sis.gui/test/org/apache/sis/gui/internal/GUIUtilitiesTest.java
index 71cd5a2b5b..f92d7fa17c 100644
---
a/optional/src/org.apache.sis.gui/test/org/apache/sis/internal/gui/GUIUtilitiesTest.java
+++
b/optional/src/org.apache.sis.gui/test/org/apache/sis/gui/internal/GUIUtilitiesTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.gui;
+package org.apache.sis.gui.internal;
import java.util.List;
import javafx.scene.control.TreeItem;
diff --git
a/optional/src/org.apache.sis.gui/test/org/apache/sis/gui/referencing/CRSChooserApp.java
b/optional/src/org.apache.sis.gui/test/org/apache/sis/gui/referencing/CRSChooserApp.java
index f3624574f6..380896b96f 100644
---
a/optional/src/org.apache.sis.gui/test/org/apache/sis/gui/referencing/CRSChooserApp.java
+++
b/optional/src/org.apache.sis.gui/test/org/apache/sis/gui/referencing/CRSChooserApp.java
@@ -24,7 +24,7 @@ import javafx.application.Application;
import javafx.geometry.Insets;
import org.opengis.referencing.crs.CoordinateReferenceSystem;
import org.apache.sis.geometry.GeneralEnvelope;
-import org.apache.sis.internal.gui.BackgroundThreads;
+import org.apache.sis.gui.internal.BackgroundThreads;
import org.apache.sis.referencing.CommonCRS;
