From 50f28fc95e35f3f61c61a7e03d7b205654b985ad Mon Sep 17 00:00:00 2001
From: Fangjie Hu <Fangjie Hu>
Date: Tue, 3 Jan 2017 16:37:06 +0800
Subject: [PATCH] =?UTF-8?q?populate=E4=B9=8B=E5=89=8D=EF=BC=8C=E7=A7=BB?=
 =?UTF-8?q?=E9=99=A4=E6=8E=A7=E4=BB=B6=E6=9C=AC=E8=BA=AB=E7=9A=84listener?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/com/fr/design/gui/icombobox/UIComboBox.java         | 4 ++++
 .../design/mainframe/chart/gui/style/ChartTextAttrPane.java | 6 ++++++
 2 files changed, 10 insertions(+)

diff --git a/designer_base/src/com/fr/design/gui/icombobox/UIComboBox.java b/designer_base/src/com/fr/design/gui/icombobox/UIComboBox.java
index d6d149674..4840121b8 100644
--- a/designer_base/src/com/fr/design/gui/icombobox/UIComboBox.java
+++ b/designer_base/src/com/fr/design/gui/icombobox/UIComboBox.java
@@ -160,6 +160,10 @@ public class UIComboBox extends JComboBox implements UIObserver, GlobalNameObser
         uiObserverListener = listener;
     }
 
+    public void removeChangeListener(){
+        uiObserverListener = null;
+    }
+
     /**
      * @return
      */
diff --git a/designer_chart/src/com/fr/design/mainframe/chart/gui/style/ChartTextAttrPane.java b/designer_chart/src/com/fr/design/mainframe/chart/gui/style/ChartTextAttrPane.java
index a52fe010d..1e383dede 100644
--- a/designer_chart/src/com/fr/design/mainframe/chart/gui/style/ChartTextAttrPane.java
+++ b/designer_chart/src/com/fr/design/mainframe/chart/gui/style/ChartTextAttrPane.java
@@ -71,6 +71,7 @@ public class ChartTextAttrPane extends BasicPane {
     }
 
     public void populate(FRFont frFont) {
+        removeAllComboBoxListener();
         if (frFont == null) {
             return;
         }
@@ -85,6 +86,11 @@ public class ChartTextAttrPane extends BasicPane {
         }
     }
 
+    private void removeAllComboBoxListener() {
+        fontNameComboBox.removeChangeListener();
+        fontSizeComboBox.removeChangeListener();
+    }
+
     /**
      * 更新字
      * @return 更新字