1.添加dock栏图标

Author: xwintop

pom.xml

@@ -48,25 +48,6 @@
       <scope>provided</scope>
     </dependency>
 
-    <dependency>
-      <groupId>org.openjfx</groupId>
-      <artifactId>javafx-graphics</artifactId>
-      <version>${javafx.version}</version>
-      <classifier>win</classifier>
-    </dependency>
-    <dependency>
-      <groupId>org.openjfx</groupId>
-      <artifactId>javafx-graphics</artifactId>
-      <version>${javafx.version}</version>
-      <classifier>linux</classifier>
-    </dependency>
-    <dependency>
-      <groupId>org.openjfx</groupId>
-      <artifactId>javafx-graphics</artifactId>
-      <version>${javafx.version}</version>
-      <classifier>mac</classifier>
-    </dependency>
-
     <!-- https://mvnrepository.com/artifact/io.github.classgraph/classgraph -->
     <!-- https://github.com/classgraph/classgraph -->
     <dependency>

src/main/java/com/xwintop/xJavaFxTool/XJavaFxToolApplication.java

@@ -15,6 +15,8 @@
 import javafx.stage.Stage;
 import lombok.extern.slf4j.Slf4j;
 
+import javax.imageio.ImageIO;
+import java.awt.*;
 import java.io.IOException;
 import java.util.ResourceBundle;
 
@@ -38,6 +40,9 @@ public void start(Stage primaryStage) throws Exception {
         FxApp.init(primaryStage, LOGO_PATH);
         FxApp.styleSheets.add(XJavaFxToolApplication.class.getResource("/css/jfoenix-main.css").toExternalForm());
 
+        //设置dock栏图标
+        Taskbar.getTaskbar().setIconImage(ImageIO.read(XJavaFxToolApplication.class.getResourceAsStream(LOGO_PATH)));
+
         primaryStage.setResizable(true);
         primaryStage.setTitle(RESOURCE_BUNDLE.getString("Title") + Config.xJavaFxToolVersions);
         primaryStage.setOnCloseRequest(this::confirmExit);

src/main/java/com/xwintop/xJavaFxTool/controller/IndexController.java

@@ -23,7 +23,6 @@
 import javafx.fxml.FXML;
 import javafx.fxml.FXMLLoader;
 import javafx.scene.Parent;
-import javafx.scene.control.ContextMenu;
 import javafx.scene.control.Menu;
 import javafx.scene.control.MenuItem;
 import javafx.scene.control.Tab;
@@ -32,9 +31,8 @@
 import lombok.Getter;
 import lombok.Setter;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang3.BooleanUtils;
-import org.apache.commons.lang3.time.DateFormatUtils;
+import org.apache.commons.lang3.StringUtils;
 
 import java.io.File;
 import java.net.URL;

src/main/java/com/xwintop/xJavaFxTool/plugin/PluginParser.java

@@ -21,8 +21,6 @@
 import java.util.jar.JarFile;
 import java.util.stream.Collectors;
 
-import static org.apache.commons.lang.StringUtils.defaultString;
-
 /**
  * 用来解析插件文件中的 toolFxmlLoaderConfiguration.xml
  */
@@ -90,7 +88,7 @@ private static String getTitleFromResourceBundle(File pluginFile, ClassLoader cl
         String titleResourceBundleKey = getChildNodeText(pluginElement, "title");
         ClassLoader tmpClassLoader = classLoader == null ? PluginClassLoader.create(pluginFile) : classLoader;
         ResourceBundle resourceBundle = ResourceBundle.getBundle(bundleName, Config.defaultLocale, tmpClassLoader);
-        return resourceBundle.getString(defaultString(titleResourceBundleKey, "Title"));
+        return resourceBundle.getString(StringUtils.defaultString(titleResourceBundleKey, "Title"));
     }
 
     private static String getChildNodeText(Element element, String childNode) {

src/main/java/com/xwintop/xJavaFxTool/utils/ResourceUtils.java

@@ -7,7 +7,7 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 public class ResourceUtils {