From a5a817f6a722ed592c4dde38f417e66a732f426d Mon Sep 17 00:00:00 2001
From: Fangjie Hu <Fangjie Hu>
Date: Mon, 7 Nov 2016 17:17:03 +0800
Subject: [PATCH] update

---
 .../fr/design/mainframe/chart/gui/ChartTypeButtonPane.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/designer_chart/src/com/fr/design/mainframe/chart/gui/ChartTypeButtonPane.java b/designer_chart/src/com/fr/design/mainframe/chart/gui/ChartTypeButtonPane.java
index a9626e5f54..9de951f4be 100644
--- a/designer_chart/src/com/fr/design/mainframe/chart/gui/ChartTypeButtonPane.java
+++ b/designer_chart/src/com/fr/design/mainframe/chart/gui/ChartTypeButtonPane.java
@@ -52,7 +52,6 @@ public class ChartTypeButtonPane extends BasicBeanPane<ChartCollection> implemen
     private UITextField currentEditingEditor = null;
 
     private ChartTypePane parent = null;
-    private String lastPlotID = StringUtils.EMPTY;
 
     //记录鼠标当前是否在操作添加按钮
     private boolean mouseOnChartTypeButtonPane = false;
@@ -290,7 +289,6 @@ public class ChartTypeButtonPane extends BasicBeanPane<ChartCollection> implemen
      */
     private void changeCollectionSelected(String name) {
         if (editingCollection != null) {
-            lastPlotID = editingCollection.getSelectedChart().getPlot().getPlotID();
             int count = editingCollection.getChartCount();
             for (int i = 0; i < count; i++) {
                 if (ComparatorUtils.equals(name, editingCollection.getChartName(i))) {
@@ -510,6 +508,8 @@ public class ChartTypeButtonPane extends BasicBeanPane<ChartCollection> implemen
 
             if (isEnabled()) {
                 noSelected();
+                //记录改变前的plotID
+                String lastPlotID = editingCollection == null ? StringUtils.EMPTY : editingCollection.getSelectedChart().getPlot().getPlotID();
                 changeCollectionSelected(getButtonName());
                 setSelectedWithFireListener(true);
                 fireSelectedChanged();