From efa70cac0a51765ce8b98cd16105ce974168dacc Mon Sep 17 00:00:00 2001
From: hades <hades@fanraun.com>
Date: Tue, 12 Jan 2021 11:14:58 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-46585=20=E5=88=87=E6=8D=A2=E5=B7=A5?=
 =?UTF-8?q?=E4=BD=9C=E7=9B=AE=E5=BD=95=E6=97=B6=20=E5=85=88=E7=A7=BB?=
 =?UTF-8?q?=E9=99=A4=E5=90=8E=E6=B7=BB=E5=8A=A0=E6=8F=92=E4=BB=B6=E7=9B=91?=
 =?UTF-8?q?=E5=90=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fr/design/PluginClassRefreshManager.java  | 38 +++++++++++--------
 1 file changed, 23 insertions(+), 15 deletions(-)

diff --git a/designer-base/src/main/java/com/fr/design/PluginClassRefreshManager.java b/designer-base/src/main/java/com/fr/design/PluginClassRefreshManager.java
index 711dd29759..3fa0266ed0 100644
--- a/designer-base/src/main/java/com/fr/design/PluginClassRefreshManager.java
+++ b/designer-base/src/main/java/com/fr/design/PluginClassRefreshManager.java
@@ -39,6 +39,23 @@ public class PluginClassRefreshManager {
         }
     };
 
+    private final PluginEventListener beforeAllPluginActive = new PluginEventListener() {
+        @Override
+        public void on(PluginEvent event) {
+            removePluginListener();
+        }
+    };
+
+    private final PluginEventListener afterAllPluginsActive = new PluginEventListener() {
+        @Override
+        public void on(PluginEvent event) {
+            addPluginListener();
+            if (DesignerLaunchStatus.getStatus() != DesignerLaunchStatus.WORKSPACE_INIT_COMPLETE) {
+                HistoryTemplateListCache.getInstance().reloadAllEditingTemplate();
+            }
+        }
+    };
+
 
     public static PluginClassRefreshManager getInstance() {
         return INSTANCE;
@@ -50,29 +67,20 @@ public class PluginClassRefreshManager {
     }
 
     private PluginClassRefreshManager() {
-        PluginListenerRegistration.getInstance().listen(PluginEventType.BeforeAllActive, new PluginEventListener() {
-            @Override
-            public void on(PluginEvent event) {
-                removePluginListener();
-            }
-        });
-        PluginListenerRegistration.getInstance().listen(PluginEventType.AfterAllActive, new PluginEventListener() {
-            @Override
-            public void on(PluginEvent event) {
-                addPluginListener();
-                if (DesignerLaunchStatus.getStatus() != DesignerLaunchStatus.WORKSPACE_INIT_COMPLETE) {
-                    HistoryTemplateListCache.getInstance().reloadAllEditingTemplate();
-                }
-            }
-        });
+        PluginListenerRegistration.getInstance().listen(PluginEventType.BeforeAllActive, beforeAllPluginActive);
+        PluginListenerRegistration.getInstance().listen(PluginEventType.AfterAllActive, afterAllPluginsActive);
     }
 
     public void removePluginListener() {
         PluginListenerRegistration.getInstance().stopListen(this.pluginAfterRunEventListener);
+        PluginListenerRegistration.getInstance().stopListen(this.beforeAllPluginActive);
+        PluginListenerRegistration.getInstance().stopListen(this.afterAllPluginsActive);
     }
 
     public void addPluginListener() {
         PluginListenerRegistration.getInstance().listen(PluginEventType.AfterRun, this.pluginAfterRunEventListener);
+        PluginListenerRegistration.getInstance().listen(PluginEventType.BeforeAllActive, beforeAllPluginActive);
+        PluginListenerRegistration.getInstance().listen(PluginEventType.AfterAllActive, afterAllPluginsActive);
     }
 
 }