Merge pull request #623 in DESIGN/design from ~NEIL/design:10.0 to 10.0

* commit '673fa11ca699145c2668b484733d5c937f4b3b94':
  REPORT-12928 设计器finedb锁住, 可能是多线程加载问题.

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

@@ -56,10 +56,6 @@ public class UpdateActionManager {
     }
 
     public synchronized void dealWithSearchText(final String paneClass, final UpdateAction updateAction) {
-        threadPoolExecutor.allowCoreThreadTimeOut(true);
-        threadPoolExecutor.execute(new Runnable() {
-            @Override
-            public void run() {
         JPanel panel = null;
         try {
             panel = (JPanel) StableUtils.classForName(paneClass).newInstance();
@@ -71,6 +67,4 @@ public class UpdateActionManager {
             FineLoggerFactory.getLogger().error(e.getMessage(), e);
         }
     }
-        });
-    }
 }

designer-realize/src/main/java/com/fr/start/Designer.java

@@ -29,7 +29,6 @@ import com.fr.design.mainframe.JWorkBook;
 import com.fr.design.mainframe.alphafine.component.AlphaFinePane;
 import com.fr.design.mainframe.bbs.UserInfoLabel;
 import com.fr.design.mainframe.bbs.UserInfoPane;
-import com.fr.design.mainframe.templateinfo.TemplateInfoCollector;
 import com.fr.design.mainframe.toolbar.ToolBarMenuDockPlus;
 import com.fr.design.menu.KeySetUtils;
 import com.fr.design.menu.MenuDef;
@@ -54,7 +53,6 @@ import com.fr.stable.xml.XMLTools;
 import com.fr.start.fx.SplashFx;
 import com.fr.start.jni.SplashMac;
 import com.fr.start.module.StartupArgs;
-import com.fr.start.preload.ImagePreLoader;
 import com.fr.start.server.ServerTray;
 import com.fr.workspace.WorkContext;
 
@@ -69,8 +67,6 @@ import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.io.File;
 import java.util.ArrayList;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.ThreadFactory;
 import java.util.concurrent.ThreadPoolExecutor;
@@ -110,8 +106,6 @@ public class Designer extends BaseDesigner {
 
         RestartHelper.deleteRecordFilesWhenStart();
 
-        preloadResource();
-
         SplashContext.getInstance().registerSplash(createSplash());
 
         SplashContext.getInstance().show();
@@ -131,25 +125,6 @@ public class Designer extends BaseDesigner {
 
     }
 
-    private static void preloadResource() {
-        ExecutorService service = Executors.newCachedThreadPool();
-
-        service.submit(new Runnable() {
-            @Override
-            public void run() {
-                new ImagePreLoader();
-            }
-        });
-
-        service.submit(new Runnable() {
-            @Override
-            public void run() {
-                TemplateInfoCollector.getInstance();
-            }
-        });
-        service.shutdown();
-    }
-
     private static SplashStrategy createSplash() {
         // 这里可以开接口加载自定义启动画面
         if (OperatingSystem.isWindows()) {

designer-realize/src/main/java/com/fr/start/module/DesignerActivator.java

@@ -52,6 +52,7 @@ import com.fr.design.mainframe.form.FormReportComponentComposite;
 import com.fr.design.mainframe.loghandler.DesignerLogAppender;
 import com.fr.design.mainframe.loghandler.LogMessageBar;
 import com.fr.design.mainframe.socketio.DesignerSocketIO;
+import com.fr.design.mainframe.templateinfo.TemplateInfoCollector;
 import com.fr.design.module.DesignModuleFactory;
 import com.fr.design.parameter.FormParameterReader;
 import com.fr.design.parameter.ParameterPropertyPane;
@@ -98,9 +99,10 @@ import com.fr.stable.script.ValueConverter;
 import com.fr.stable.xml.ObjectTokenizer;
 import com.fr.stable.xml.ObjectXMLWriterFinder;
 import com.fr.start.BBSGuestPaneProvider;
+import com.fr.start.preload.ImagePreLoader;
 import com.fr.xml.ReportXMLUtils;
 
-import java.awt.*;
+import java.awt.Image;
 import java.awt.image.BufferedImage;
 import java.util.ArrayList;
 import java.util.List;
@@ -176,6 +178,20 @@ public class DesignerActivator extends Activator {
 
     private static void preLoadPane() {
         ExecutorService service = Executors.newCachedThreadPool();
+        service.submit(new Runnable() {
+            @Override
+            public void run() {
+                new ImagePreLoader();
+            }
+        });
+
+        service.submit(new Runnable() {
+            @Override
+            public void run() {
+                TemplateInfoCollector.getInstance();
+            }
+        });
+
         service.submit(new Runnable() {
             @Override
             public void run() {