From 6a6469cb357c61865ae0df11e0e5c2d97bfbb6b1 Mon Sep 17 00:00:00 2001
From: hades <hades@fanraun.com>
Date: Thu, 21 May 2020 20:30:15 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-32105=20=E8=A1=A8=E5=8D=95=E5=85=B3?=
 =?UTF-8?q?=E9=97=AD=E5=90=8E=20JForm=E5=AF=B9=E8=B1=A1=E6=9C=AA=E9=87=8A?=
 =?UTF-8?q?=E6=94=BE=20=E5=AF=BC=E8=87=B4=E8=AE=BE=E8=AE=A1=E5=99=A8?=
 =?UTF-8?q?=E6=9C=80=E7=BB=88=E5=8F=91=E7=94=9Foom?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/fr/design/mainframe/JForm.java   | 32 ++++++++++++-------
 1 file changed, 20 insertions(+), 12 deletions(-)

diff --git a/designer-form/src/main/java/com/fr/design/mainframe/JForm.java b/designer-form/src/main/java/com/fr/design/mainframe/JForm.java
index ff59a52d4d..e2112f4f37 100644
--- a/designer-form/src/main/java/com/fr/design/mainframe/JForm.java
+++ b/designer-form/src/main/java/com/fr/design/mainframe/JForm.java
@@ -128,6 +128,8 @@ public class JForm extends JTemplate<Form, FormUndoState> implements BaseJForm<F
     //FORM_TAB代表是否点击编辑，用于点击编辑前后菜单的显示
     protected int index = FORM_TAB;
 
+    private PluginEventListener pluginListener;
+
     public JForm() {
         super(new Form(new WBorderLayout("form")), "Form");
 
@@ -151,18 +153,18 @@ public class JForm extends JTemplate<Form, FormUndoState> implements BaseJForm<F
                 return context.contain(PropertyItemPaneProvider.XML_TAG);
             }
         };
-        PluginListenerRegistration.getInstance().listen(PluginEventType.AfterRun,
-                new PluginEventListener(PropertyItemPaneProvider.LAST) {
-                    @Override
-                    public void on(PluginEvent event) {
-                        PluginContext context = event.getContext();
-                        PluginRuntime runtime = context.getRuntime();
-                        Set<PropertyItemPaneProvider> providers = runtime.get(PropertyItemPaneProvider.XML_TAG);
-                        for (PropertyItemPaneProvider provider : providers) {
-                            addPane(provider);
-                        }
-                    }
-                }, filter);
+        this.pluginListener = new PluginEventListener(PropertyItemPaneProvider.LAST) {
+            @Override
+            public void on(PluginEvent event) {
+                PluginContext context = event.getContext();
+                PluginRuntime runtime = context.getRuntime();
+                Set<PropertyItemPaneProvider> providers = runtime.get(PropertyItemPaneProvider.XML_TAG);
+                for (PropertyItemPaneProvider provider : providers) {
+                    addPane(provider);
+                }
+            }
+        };
+        PluginListenerRegistration.getInstance().listen(PluginEventType.AfterRun, this.pluginListener, filter);
     }
 
     private void initPluginPane() {
@@ -1038,4 +1040,10 @@ public class JForm extends JTemplate<Form, FormUndoState> implements BaseJForm<F
         // richer:form文件 daniel 改成三个字
         fileChooser.addChooseFILEFilter(new ChooseFileFilter(FileExtension.FRM, appName + Toolkit.i18nText("Fine-Design_Report_Template_File")));
     }
+
+    @Override
+    public void whenClose() {
+        // stop的时候 pluginListener 和 PluginFilter 都会移除
+        PluginListenerRegistration.getInstance().stopListen(this.pluginListener);
+    }
 }