1. 修复插件下载 NPE；2. newui: 下载插件后不将其加到 Classpath

Author: yiding-he

src/main/java/com/xwintop/xJavaFxTool/controller/index/PluginManageController.java

@@ -6,30 +6,33 @@
 import com.xwintop.xJavaFxTool.model.PluginJarInfo;
 import com.xwintop.xJavaFxTool.plugin.PluginManager;
 import com.xwintop.xJavaFxTool.services.index.PluginManageService;
-import com.xwintop.xJavaFxTool.utils.XJavaFxSystemUtil;
 import com.xwintop.xJavaFxTool.view.index.PluginManageView;
 import com.xwintop.xcore.util.javafx.JavaFxViewUtil;
 import com.xwintop.xcore.util.javafx.TooltipUtil;
+import java.io.File;
+import java.io.IOException;
+import java.net.URL;
+import java.util.Map;
+import java.util.ResourceBundle;
+import java.util.function.Consumer;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 import javafx.collections.transformation.FilteredList;
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
 import javafx.fxml.FXMLLoader;
-import javafx.scene.control.*;
+import javafx.scene.control.Button;
+import javafx.scene.control.ContentDisplay;
+import javafx.scene.control.ContextMenu;
+import javafx.scene.control.MenuItem;
+import javafx.scene.control.TableCell;
+import javafx.scene.control.TableColumn;
 import javafx.stage.Window;
 import javafx.util.Callback;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.extern.slf4j.Slf4j;
 
-import java.io.File;
-import java.io.IOException;
-import java.net.URL;
-import java.util.Map;
-import java.util.ResourceBundle;
-import java.util.function.Consumer;
-
 /**
  * @ClassName: PluginManageController
  * @Description: 插件管理
@@ -128,8 +131,6 @@ private void afterDownload(
         downloadButton.setText("已下载");
         downloadButton.setDisable(true);
 
-        XJavaFxSystemUtil.addJarClass(pluginJarInfo.getFile());
-
         pluginDataTableView.refresh();
         PluginManager.getInstance().saveToFile();
         TooltipUtil.showToast("插件 " + dataRow.get("nameTableColumn") + " 下载完成");

src/main/java/com/xwintop/xJavaFxTool/event/AppEvents.java

@@ -1,12 +1,12 @@
 package com.xwintop.xJavaFxTool.event;
 
-import javafx.event.EventType;
-
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.Consumer;
+import javafx.event.EventType;
 
 /**
  * 应用全局事件注册和触发
@@ -22,7 +22,9 @@ public class AppEvents {
      * @param appEvent 事件对象
      */
     public static void fire(AppEvent appEvent) {
-        List<Consumer> handlers = instance.listeners.get(appEvent.getEventType());
+        List<Consumer> handlers = instance.listeners
+            .getOrDefault(appEvent.getEventType(), Collections.emptyList());
+
         for (Consumer handler : handlers) {
             handler.accept(appEvent);
         }

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

@@ -26,6 +26,10 @@ public PluginContainer(ClassLoader parentClassLoader, PluginJarInfo pluginJarInf
         this.pluginJarInfo = pluginJarInfo;
     }
 
+    public PluginJarInfo getPluginJarInfo() {
+        return pluginJarInfo;
+    }
+
     /**
      * 从 ClassLoader 中创建 FXMLLoader 对象
      */

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

@@ -4,9 +4,11 @@
 import com.xwintop.xJavaFxTool.utils.Config;
 import com.xwintop.xcore.javafx.dialog.FxAlerts;
 import com.xwintop.xcore.util.javafx.JavaFxViewUtil;
+import java.lang.ref.WeakReference;
 import java.net.URL;
 import java.util.ResourceBundle;
 import javafx.fxml.FXMLLoader;
+import javafx.scene.Node;
 import javafx.scene.control.Tab;
 import javafx.scene.control.TabPane;
 import javafx.scene.image.Image;
@@ -99,19 +101,27 @@ public static Tab loadIsolatedPluginAsTab(PluginJarInfo plugin, TabPane tabPane)
             }
 
             PluginContainer pluginContainer = new PluginContainer(PluginLoader.class.getClassLoader(), plugin);
+            WeakReference<PluginContainer> containerRef = new WeakReference<>(pluginContainer);
             FXMLLoader generatingCodeFXMLLoader = pluginContainer.createFXMLLoader();
             if (generatingCodeFXMLLoader == null) {
                 return null;
             }
 
-            tab.setContent(generatingCodeFXMLLoader.load());
+            Node root = generatingCodeFXMLLoader.load();
+            Object controller = generatingCodeFXMLLoader.getController();
+
+            tab.setContent(root);
             tabPane.getTabs().add(tab);
             tabPane.getSelectionModel().select(tab);
 
             tab.setOnCloseRequest(
                 event -> {
-                    JavaFxViewUtil.setControllerOnCloseRequest(generatingCodeFXMLLoader.getController(), event);
-                    pluginContainer.unload();
+                    JavaFxViewUtil.setControllerOnCloseRequest(controller, event);
+                    PluginContainer container = containerRef.get();
+                    if (container != null) {
+                        log.info("插件关闭：" + pluginContainer.getPluginJarInfo().getName());
+                        pluginContainer.unload();
+                    }
                 }
             );
 

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

@@ -3,6 +3,9 @@
 import cn.hutool.http.HttpUtil;
 import com.alibaba.fastjson.JSON;
 import com.xwintop.xJavaFxTool.model.PluginJarInfo;
+import com.xwintop.xJavaFxTool.utils.Config;
+import com.xwintop.xJavaFxTool.utils.Config.Keys;
+import com.xwintop.xJavaFxTool.utils.XJavaFxSystemUtil;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
@@ -207,6 +210,11 @@ public File downloadPlugin(
         plugin.setIsDownload(true);
         plugin.setIsEnable(true);
         plugin.setLocalVersionNumber(plugin.getVersionNumber());
+
+        if (!Config.getBoolean(Keys.NewLauncher, false)) {
+            XJavaFxSystemUtil.addJarClass(pluginJarInfo.getFile());
+        }
+
         return file;
     }