1.移除多余方法

Author: xwintop

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

@@ -73,15 +73,10 @@ public static FXMLLoader getFXMLLoader() {
     @Override
     public void initialize(URL location, ResourceBundle resources) {
         this.bundle = resources;
-
         initView();
         initEvent();
         initService();
         initNotepad();
-
-        this.indexService.addWebView(XJavaFxToolApplication.RESOURCE_BUNDLE.getString("feedback"), QQ_URL, null);
-        this.tongjiWebView.getEngine().load(STATISTICS_URL);
-        this.tabPaneMain.getSelectionModel().select(0);
     }
 
     private void initNotepad() {
@@ -91,6 +86,9 @@ private void initNotepad() {
     }
 
     private void initView() {
+        this.indexService.addWebView(XJavaFxToolApplication.RESOURCE_BUNDLE.getString("feedback"), QQ_URL, null);
+        this.tongjiWebView.getEngine().load(STATISTICS_URL);
+        this.tabPaneMain.getSelectionModel().select(0);
     }
 
     private void initEvent() {

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

@@ -51,21 +51,17 @@ public class PluginManager {
 
     public static PluginManager getInstance() {
         if (instance == null) {
-            instance = new PluginManager(LOCAL_PLUGINS_PATH);
+            instance = new PluginManager();
         }
         return instance;
     }
 
     //////////////////////////////////////////////////////////////
-
-    private final String localPluginsPath;
-
     private final OkHttpClient pluginDownloader = new OkHttpClient.Builder().addInterceptor(new DownloadProgressInterceptor()).build();
 
     private final List<PluginJarInfo> pluginList = new ArrayList<>(); // 插件列表
 
-    public PluginManager(String localPluginsPath) {
-        this.localPluginsPath = localPluginsPath;
+    public PluginManager() {
         this.loadLocalPluginConfiguration();
     }
 
@@ -98,7 +94,7 @@ public PluginJarInfo getPluginByFxmlPath(String fxmlPath) {
      */
     private void loadLocalPluginConfiguration() {
         try {
-            Path path = Paths.get(this.localPluginsPath);
+            Path path = Paths.get(LOCAL_PLUGINS_PATH);
             if (!Files.exists(path)) {
                 return;
             }
@@ -275,7 +271,7 @@ private void tryDownload(String pluginName, String url, String ua, File file) th
     // 保存配置，如果失败则抛出异常
     public void saveToFile() throws IOException {
         String json = JSON.toJSONString(this.pluginList, true);
-        Path path = Paths.get(this.localPluginsPath);
+        Path path = Paths.get(LOCAL_PLUGINS_PATH);
         if (!Files.exists(path)) {
             Files.createFile(path);
         }

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

@@ -42,19 +42,16 @@ public static void parse(File pluginFile, PluginJarInfo pluginJarInfo) {
      * 解析插件文件，补完 pluginJarInfo 属性
      */
     public static void parse(File pluginFile, PluginJarInfo pluginJarInfo, ClassLoader classLoader) {
-
         if (!pluginFile.exists()) {
             log.error("插件 {} 文件不存在: {}", pluginJarInfo.getName(), pluginFile.getAbsolutePath());
             return;
         }
 
         try (JarFile jarFile = new JarFile(pluginFile)) {
-
             JarEntry entry = jarFile.getJarEntry(ENTRY_NAME);
             if (entry == null) {
                 return;
             }
-
             Element root = createRootElement(jarFile, entry);
             List<Element> menuElements = selectElements(root, "/root/ToolFxmlLoaderConfiguration[@isMenu='true']");
             Element pluginElement = selectSingleElement(root, "/root/ToolFxmlLoaderConfiguration[not(@isMenu)]");
@@ -84,7 +81,6 @@ public static void parse(File pluginFile, PluginJarInfo pluginJarInfo, ClassLoad
             }
 
             pluginJarInfo.setName(StringUtils.defaultString(pluginJarInfo.getName(), title));
-
         } catch (IOException | DocumentException e) {
             throw new AppException(e);
         }

src/main/java/com/xwintop/xJavaFxTool/services/IndexService.java

@@ -27,7 +27,6 @@
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 
-import java.lang.ref.WeakReference;
 import java.util.HashMap;
 import java.util.Locale;
 import java.util.Map;
@@ -131,7 +130,6 @@ public void loadPlugin(PluginJarInfo pluginJarInfo) {
     public static Tab loadIsolatedPluginAsTab(PluginJarInfo plugin, TabPane tabPane, boolean singleWindowBoot) {
         try {
             PluginContainer pluginContainer = new PluginContainer(PluginClassLoader.class.getClassLoader(), plugin);
-            WeakReference<PluginContainer> containerRef = new WeakReference<>(pluginContainer);
             FXMLLoader generatingCodeFXMLLoader = pluginContainer.createFXMLLoader();
             if (generatingCodeFXMLLoader == null) {
                 return null;
@@ -151,25 +149,16 @@ public static Tab loadIsolatedPluginAsTab(PluginJarInfo plugin, TabPane tabPane,
             }
 
             Node root = generatingCodeFXMLLoader.load();
-            Object controller = generatingCodeFXMLLoader.getController();
-            WeakReference<Object> controllerRef = new WeakReference<>(controller);
 
             tab.setContent(root);
             tabPane.getTabs().add(tab);
             tabPane.getSelectionModel().select(tab);
 
             tab.setOnCloseRequest(
                 event -> {
-                    Object ctrl = controllerRef.get();
-                    if (ctrl != null) {
-                        JavaFxViewUtil.setControllerOnCloseRequest(ctrl, event);
-                    }
-
-                    PluginContainer container = containerRef.get();
-                    if (container != null) {
-                        log.info("插件关闭：" + container.getPluginJarInfo().getName());
-                        container.unload();
-                    }
+                    JavaFxViewUtil.setControllerOnCloseRequest(generatingCodeFXMLLoader.getController(), event);
+                    log.info("插件关闭：" + pluginContainer.getPluginJarInfo().getName());
+                    pluginContainer.unload();
                 }
             );