From 4a78e4b8bb23696f34385d9f7da0726495b0af16 Mon Sep 17 00:00:00 2001 From: Fangjie Hu Date: Wed, 23 Nov 2016 09:34:27 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E9=80=89=E4=B8=AD=E7=9A=84=E5=9B=BE?= =?UTF-8?q?=E8=A1=A8=E4=B8=8D=E8=83=BD=E5=88=A0=E9=99=A4=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../chart/gui/ChartTypeButtonPane.java | 55 +++++++++---------- 1 file changed, 26 insertions(+), 29 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 6c48772b0..2d96eca31 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 @@ -62,20 +62,20 @@ public class ChartTypeButtonPane extends BasicBeanPane implemen private boolean pressOtherButtonWhenEditing = false; -// private AWTEventListener awt = new AWTEventListener() { -// public void eventDispatched(AWTEvent event) { -// //没有进行鼠标点击，则返回 -// if (event instanceof MouseEvent && ((MouseEvent) event).getClickCount() > 0) { -// if (currentEditingEditor != null && !ComparatorUtils.equals(event.getSource(), currentEditingEditor)) { -// stopEditing(); -// if (event.getSource() instanceof ChartChangeButton) { -// ((ChartChangeButton) event.getSource()).mouseClick((MouseEvent) event); -// } -// populateBean(editingCollection); -// } -// } -// } -// }; + /*private AWTEventListener awt = new AWTEventListener() { + public void eventDispatched(AWTEvent event) { + //没有进行鼠标点击，则返回 + if (event instanceof MouseEvent && ((MouseEvent) event).getClickCount() > 0) { + if (currentEditingEditor != null && !ComparatorUtils.equals(event.getSource(), currentEditingEditor)) { + stopEditing(); + if (event.getSource() instanceof ChartChangeButton) { + ((ChartChangeButton) event.getSource()).mouseClick((MouseEvent) event); + } + populateBean(editingCollection); + } + } + } + };*/ public ChartTypeButtonPane(ChartTypePane chartTypePane){ this(); @@ -440,26 +440,23 @@ public class ChartTypeButtonPane extends BasicBeanPane implemen } private void deleteAButton() { - if (indexList.contains(this) && indexList.size() > 1) { - indexList.remove(this); + //先重构属性，在重构面板，否则面板在重构过程中，会重新将属性中的切换图表加到indexList中，导致面板无法删除 + if (editingCollection != null) { + int count = editingCollection.getChartCount(); + for (int i = 0; i < count; i++) { + if (ComparatorUtils.equals(getButtonName(), editingCollection.getChartName(i))) { + editingCollection.removeNameObject(i); + break; + } + } + } + indexList.remove(this); + if (indexList.contains(this) && indexList.size() > 1) { if (this.isSelected()) { indexList.get(0).setSelected(true); changeCollectionSelected(indexList.get(0).getButtonName()); } - - if (editingCollection != null) { - int count = editingCollection.getChartCount(); - 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; - } - } - } } //获取图表收集器的状态 From d648f91191a07798d219bc1537306c4b9865c68c Mon Sep 17 00:00:00 2001 From: Fangjie Hu Date: Wed, 23 Nov 2016 09:41:31 +0800 Subject: [PATCH 2/4] 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 2d96eca31..de88d2ba6 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 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()); From 3e0f3cf8bdfca79201b02f993988dc5ebcd22338 Mon Sep 17 00:00:00 2001 From: Fangjie Hu Date: Wed, 23 Nov 2016 09:42:25 +0800 Subject: [PATCH 3/4] update --- .../com/fr/design/mainframe/chart/gui/ChartTypeButtonPane.java | 3 --- 1 file changed, 3 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 de88d2ba6..e7e283ebe 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,9 +446,6 @@ public class ChartTypeButtonPane extends BasicBeanPane 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; } } From 9f71f778725745bceb353b24c96a467106755f55 Mon Sep 17 00:00:00 2001 From: Fangjie Hu Date: Wed, 23 Nov 2016 10:08:58 +0800 Subject: [PATCH 4/4] update --- .../mainframe/chart/gui/ChartTypeButtonPane.java | 16 ---------------- 1 file changed, 16 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 e7e283ebe..6b6c9a427 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 @@ -61,22 +61,6 @@ public class ChartTypeButtonPane extends BasicBeanPane implemen //所以:stopEditing--选中其他button则响应click之后relayout;普通失焦则直接relayout. private boolean pressOtherButtonWhenEditing = false; - - /*private AWTEventListener awt = new AWTEventListener() { - public void eventDispatched(AWTEvent event) { - //没有进行鼠标点击，则返回 - if (event instanceof MouseEvent && ((MouseEvent) event).getClickCount() > 0) { - if (currentEditingEditor != null && !ComparatorUtils.equals(event.getSource(), currentEditingEditor)) { - stopEditing(); - if (event.getSource() instanceof ChartChangeButton) { - ((ChartChangeButton) event.getSource()).mouseClick((MouseEvent) event); - } - populateBean(editingCollection); - } - } - } - };*/ - public ChartTypeButtonPane(ChartTypePane chartTypePane){ this(); parent = chartTypePane;