From d648f91191a07798d219bc1537306c4b9865c68c Mon Sep 17 00:00:00 2001
From: Fangjie Hu <Fangjie Hu>
Date: Wed, 23 Nov 2016 09:41:31 +0800
Subject: [PATCH] update

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

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 2d96eca315..de88d2ba65 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
@@ -446,13 +446,16 @@ public class ChartTypeButtonPane extends BasicBeanPane<ChartCollection> implemen
                 for (int i = 0; i < count; i++) {
                     if (ComparatorUtils.equals(getButtonName(), editingCollection.getChartName(i))) {
                         editingCollection.removeNameObject(i);
+                        /*if (i <= editingCollection.getSelectedIndex()){
+                            editingCollection.setSelectedIndex(editingCollection.getSelectedIndex()-1);
+                        }*/
                         break;
                     }
                 }
             }
 
-            indexList.remove(this);
             if (indexList.contains(this) && indexList.size() > 1) {
+                indexList.remove(this);
                 if (this.isSelected()) {
                     indexList.get(0).setSelected(true);
                     changeCollectionSelected(indexList.get(0).getButtonName());