1.修改首页布局

Author: xwintop

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

@@ -263,7 +263,7 @@ private void addLogConsoleAction(ActionEvent event) {
     private void pluginManageAction() throws Exception {
         FXMLLoader fXMLLoader = PluginManageController.getFXMLLoader();
         Parent root = fXMLLoader.load();
-        PluginManageController pluginManageController = fXMLLoader.getController();
+//        PluginManageController pluginManageController = fXMLLoader.getController();
 /*
         pluginManageController.setOnPluginDownloaded(jarFile -> {
             try {

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

@@ -11,7 +11,6 @@
 /**
  * 应用全局事件注册和触发
  */
-@SuppressWarnings({"unchecked", "rawtypes"})
 public class AppEvents {
 
     private static final AppEvents instance = new AppEvents();
@@ -22,8 +21,7 @@ public class AppEvents {
      * @param appEvent 事件对象
      */
     public static void fire(AppEvent appEvent) {
-        List<Consumer> handlers = instance.listeners
-            .getOrDefault(appEvent.getEventType(), Collections.emptyList());
+        List<Consumer> handlers = instance.listeners.getOrDefault(appEvent.getEventType(), Collections.emptyList());
 
         for (Consumer handler : handlers) {
             handler.accept(appEvent);

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

@@ -61,8 +61,7 @@ public static PluginManager getInstance() {
 
     private final String localPluginsPath;
 
-    private final OkHttpClient pluginDownloader =
-        new OkHttpClient.Builder().addInterceptor(new DownloadProgressInterceptor()).build();
+    private final OkHttpClient pluginDownloader = new OkHttpClient.Builder().addInterceptor(new DownloadProgressInterceptor()).build();
 
     private final List<PluginJarInfo> pluginList = new ArrayList<>(); // 插件列表
 

src/main/java/com/xwintop/xJavaFxTool/services/index/PluginManageService.java

@@ -17,8 +17,6 @@
 import java.util.Map;
 import java.util.function.Consumer;
 
-import static org.apache.commons.lang3.StringUtils.substringBeforeLast;
-
 /**
  * 插件管理
  *
@@ -47,7 +45,6 @@ public void getPluginList() {
     }
 
     public void addDataRow(PluginJarInfo plugin) {
-
         Map<String, String> dataRow = new HashMap<>();
         dataRow.put("nameTableColumn", plugin.getName());
         dataRow.put("synopsisTableColumn", plugin.getSynopsis());
@@ -91,8 +88,7 @@ protected void execute() throws Exception {
         };
 
         Window controllerWindow = pluginManageController.getWindow();
-        FxProgressDialog dialog = FxProgressDialog
-            .create(controllerWindow, progressTask, "正在下载插件 " + pluginJarInfo.getName() + "...");
+        FxProgressDialog dialog = FxProgressDialog.create(controllerWindow, progressTask, "正在下载插件 " + pluginJarInfo.getName() + "...");
 
         progressTask.setOnCancelled(event -> {
             throw new AppException("下载被取消。");
@@ -132,18 +128,15 @@ public void searchPlugin(String keyword) {
 
     private boolean isPluginDataMatch(Map<String, String> map, String keyword) {
         return map.entrySet().stream().anyMatch(
-            entry ->
-                !entry.getKey().equals("downloadUrl") &&
-                    entry.getValue().toLowerCase().contains(keyword.toLowerCase())
+            entry -> !entry.getKey().equals("downloadUrl") && entry.getValue().toLowerCase().contains(keyword.toLowerCase())
         );
     }
 
     /**
      * 判断插件是否启用
      */
-    @SuppressWarnings("BooleanMethodIsAlwaysInverted")
     public static boolean isPluginEnabled(String fileName) {
-        String jarName = substringBeforeLast(fileName, "-");
+        String jarName = StringUtils.substringBeforeLast(fileName, "-");
         PluginJarInfo pluginJarInfo = PluginManager.getInstance().getPlugin(jarName);
         if (pluginJarInfo == null) {
             return false;

src/main/java/com/xwintop/xJavaFxTool/view/IndexView.java

@@ -4,6 +4,7 @@
 import javafx.fxml.FXML;
 import javafx.fxml.Initializable;
 import javafx.scene.control.*;
+import javafx.scene.layout.VBox;
 import javafx.scene.web.WebView;
 import lombok.Getter;
 import lombok.Setter;
@@ -39,4 +40,7 @@ public abstract class IndexView implements Initializable {
 
     @FXML
     protected WebView tongjiWebView;
+
+    @FXML
+    protected VBox pluginCategories;
 }

src/main/resources/com/xwintop/xJavaFxTool/fxmlView/Index.fxml

@@ -82,7 +82,7 @@
                                     <Insets top="5.0" />
                                  </VBox.margin>
                               </HBox>
-                              <VBox fx:id="pluginCategories" />
+                              <VBox fx:id="pluginCategories" alignment="TOP_CENTER"/>
                            </children>
                         </VBox>
                      </content>