Merge branch 'release/11.0' of ssh://code.fineres.com:7999/~carlson/design into release/11.0

designer-base/src/main/java/com/fr/design/carton/EventDispatchThreadHangMonitor.java

@@ -1,6 +1,7 @@
 package com.fr.design.carton;
 
 import com.fr.concurrent.FineExecutors;
+import com.fr.design.ui.util.UIUtil;
 import com.fr.json.JSONObject;
 import com.fr.log.FineLoggerFactory;
 import com.fr.stable.ArrayUtils;
@@ -314,7 +315,7 @@ public final class EventDispatchThreadHangMonitor extends EventQueue {
      * 将swing中默认的EventQueue换成自己的
      */
     public static void initMonitoring() {
-        Toolkit.getDefaultToolkit().getSystemEventQueue().push(INSTANCE);
+        UIUtil.invokeLaterIfNeeded(() -> Toolkit.getDefaultToolkit().getSystemEventQueue().push(INSTANCE));
     }
 
     /**

designer-base/src/main/java/com/fr/design/data/datapane/connect/ConnectionListPane.java

@@ -209,7 +209,7 @@ public class ConnectionListPane extends JListControlPane implements ConnectionSh
              * @return
              */
             private boolean needUpdate0(Connection origin, Connection connection) {
-                return  !connection.equals(origin) || !isEmbedConnection(connection);
+                return !connection.equals(origin) || !isEmbedConnection(connection);
             }
 
             /**
@@ -257,12 +257,21 @@ public class ConnectionListPane extends JListControlPane implements ConnectionSh
     }
 
     private boolean saveByOldWay(List<String> removedConnNames, List<ConnectionBean> addedOrUpdatedConnections) {
+        final int remaining = ConnectionConfig.getInstance().getRemainingCon(removedConnNames.size(), addedOrUpdatedConnections.size());
         try {
             return Configurations.modify(new WorkerFacade(ConnectionConfig.class) {
                 @Override
                 public void run() {
                     removedConnNames.forEach(n -> ConnectionConfig.getInstance().removeConnection(n));
-                    addedOrUpdatedConnections.forEach(cb -> ConnectionConfig.getInstance().addConnection(cb.getName(), cb.getConnection()));
+                    int innerRemaining = remaining;
+                    for (ConnectionBean cb : addedOrUpdatedConnections) {
+                        if (innerRemaining > 0) {
+                            ConnectionConfig.getInstance().addConnectionWithoutCheck(cb.getName(), cb.getConnection());
+                            innerRemaining--;
+                        } else {
+                            break;
+                        }
+                    }
                 }
             });
         } catch (Exception e) {

designer-base/src/main/java/com/fr/design/extra/PluginUtils.java

@@ -10,8 +10,8 @@ import com.fr.json.JSONObject;
 import com.fr.log.FineLoggerFactory;
 import com.fr.plugin.PluginVerifyException;
 import com.fr.plugin.basic.version.Version;
-import com.fr.plugin.basic.version.VersionIntervalType;
 import com.fr.plugin.basic.version.VersionIntervalFactory;
+import com.fr.plugin.basic.version.VersionIntervalType;
 import com.fr.plugin.context.PluginContext;
 import com.fr.plugin.context.PluginMarker;
 import com.fr.plugin.error.PluginBaseErrorCode;
@@ -23,7 +23,7 @@ import com.fr.stable.ProductConstants;
 import com.fr.stable.StableUtils;
 import com.fr.stable.StringUtils;
 
-import javax.swing.*;
+import javax.swing.JOptionPane;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
@@ -47,9 +47,10 @@ public class PluginUtils {
 
 
     public static PluginMarker createPluginMarker(String pluginInfo) {
-        //todo 判空
-        String[] plugin = pluginInfo.split("_");
-        return PluginMarker.create(plugin[0], plugin[1]);
+        int splitIndex = pluginInfo.lastIndexOf("_");
+        String pluginID = pluginInfo.substring(0, splitIndex);
+        String version = pluginInfo.substring(splitIndex + 1);
+        return PluginMarker.create(pluginID, version);
     }
 
     public static JSONObject getLatestPluginInfo(String pluginID) throws Exception {

designer-base/src/main/java/com/fr/design/mainframe/JNullTemplate.java

@@ -204,4 +204,14 @@ public class JNullTemplate extends JTemplate {
     public int getToolBarHeight() {
         return 0;
     }
+    
+    @Override
+    public String getPath() {
+        return null;
+    }
+    
+    @Override
+    public void refreshToolArea() {
+        DesignerContext.getDesignerFrame().resetToolkitByPlus(this);
+    }
 }