move some classes to utility.fx library

xzel23 · Apr 29, 2024 · 04bcf41 · 04bcf41
1 parent 8559c5c
commit 04bcf41
Show file tree

Hide file tree

Showing 9 changed files with 20 additions and 134 deletions.
diff --git a/fx-application/src/main/java/com/dua3/fx/application/FxApplication.java b/fx-application/src/main/java/com/dua3/fx/application/FxApplication.java
@@ -14,6 +14,7 @@
 
 package com.dua3.fx.application;
 
+import com.dua3.cabe.annotations.Nullable;
 import com.dua3.fx.controls.Dialogs;
 import com.dua3.utility.fx.FxUtil;
 import com.dua3.utility.i18n.I18N;
@@ -37,6 +38,8 @@
 import java.io.UncheckedIOException;
 import java.net.URI;
 import java.net.URL;
+import java.net.URLDecoder;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
@@ -132,6 +135,16 @@ public static ResourceBundle getFxAppBundle(Locale locale) {
         return resources;
     }
 
+    /**
+     * Convert a given URI to text.
+     *
+     * @param uri the URI to convert
+     * @return the text representation of the URI
+     */
+    public static String asText(@Nullable URI uri) {
+        return uri == null ? "" : URLDecoder.decode(uri.toString(), StandardCharsets.UTF_8);
+    }
+
     /**
      * Get application main resource bundle.
      *
@@ -251,7 +264,7 @@ protected void updateApplicationTitle() {
 
         if (document != null) {
             String locStr = document.hasLocation() ?
-                    FxUtil.asText(document.getLocation()) :
+                    asText(document.getLocation()) :
                     i18n.get("fx.application.text.untitled");
             boolean dirty = document.isDirty();
 

diff --git a/fx-application/src/main/java/com/dua3/fx/application/FxController.java b/fx-application/src/main/java/com/dua3/fx/application/FxController.java
@@ -271,7 +271,7 @@ protected boolean open(URI uri) {
         } catch (Exception e) {
             LOG.warn("error opening document", e);
             getApp().showErrorDialog(
-                    i18n.format("fx.application.dialog.error.open.document.{0.name}", FxUtil.asText(uri)),
+                    i18n.format("fx.application.dialog.error.open.document.{0.name}", FxApplication.asText(uri)),
                     String.valueOf(e.getLocalizedMessage())
             );
             return false;
@@ -402,7 +402,7 @@ private boolean saveDocumentAndHandleErrors(D document, URI uri) {
         } catch (Exception e) {
             LOG.warn("error saving document", e);
             getApp().showErrorDialog(
-                    i18n.format("fx.application.dialog.error.save.{0.document}", FxUtil.asText(uri)),
+                    i18n.format("fx.application.dialog.error.save.{0.document}", FxApplication.asText(uri)),
                     e.getLocalizedMessage()
             );
             return false;

diff --git a/fx-controls/src/main/java/com/dua3/fx/controls/PinBoard.java b/fx-controls/src/main/java/com/dua3/fx/controls/PinBoard.java
@@ -6,9 +6,9 @@
 package com.dua3.fx.controls;
 
 import com.dua3.fx.util.FxRefresh;
-import com.dua3.fx.util.PlatformHelper;
 import com.dua3.utility.data.Pair;
 import com.dua3.utility.fx.FxUtil;
+import com.dua3.utility.fx.PlatformHelper;
 import com.dua3.utility.lang.LangUtil;
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.ReadOnlyObjectProperty;

diff --git a/fx-controls/src/main/java/com/dua3/fx/controls/StatusBar.java b/fx-controls/src/main/java/com/dua3/fx/controls/StatusBar.java
@@ -15,7 +15,7 @@
 package com.dua3.fx.controls;
 
 import com.dua3.fx.util.FxTaskTracker;
-import com.dua3.fx.util.PlatformHelper;
+import com.dua3.utility.fx.PlatformHelper;
 import javafx.concurrent.Task;
 import javafx.concurrent.Worker.State;
 import javafx.geometry.Pos;

diff --git a/fx-util-db/src/main/java/com/dua3/fx/util/db/FxDbUtil.java b/fx-util-db/src/main/java/com/dua3/fx/util/db/FxDbUtil.java
@@ -14,8 +14,8 @@
 
 package com.dua3.fx.util.db;
 
-import com.dua3.fx.util.PlatformHelper;
 import com.dua3.utility.db.DbUtil;
+import com.dua3.utility.fx.PlatformHelper;
 import javafx.application.Platform;
 import javafx.beans.property.ReadOnlyObjectWrapper;
 import javafx.beans.value.ObservableValue;

diff --git a/fx-util-db/src/main/java/module-info.java b/fx-util-db/src/main/java/module-info.java
@@ -38,4 +38,5 @@
     requires javafx.controls;
     requires javafx.graphics;
     requires static com.dua3.cabe.annotations;
+    requires com.dua3.utility.fx;
 }
diff --git a/fx-util/src/main/java/com/dua3/fx/util/PlatformHelper.java b/fx-util/src/main/java/com/dua3/fx/util/PlatformHelper.java
diff --git a/fx-util/src/main/resources/META-INF/services/com.dua3.utility.data.ImageUtil b/fx-util/src/main/resources/META-INF/services/com.dua3.utility.data.ImageUtil
diff --git a/fx-util/src/main/resources/META-INF/services/com.dua3.utility.text.FontUtil b/fx-util/src/main/resources/META-INF/services/com.dua3.utility.text.FontUtil