From fadf534930ba580e6f6467b1827d85252d610934 Mon Sep 17 00:00:00 2001 From: Fangjie Hu Date: Wed, 2 Nov 2016 11:54:40 +0800 Subject: [PATCH] update --- .../fr/design/ChartTypeInterfaceManager.java | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/designer_chart/src/com/fr/design/ChartTypeInterfaceManager.java b/designer_chart/src/com/fr/design/ChartTypeInterfaceManager.java index eaa8625302..51d03ab3dc 100644 --- a/designer_chart/src/com/fr/design/ChartTypeInterfaceManager.java +++ b/designer_chart/src/com/fr/design/ChartTypeInterfaceManager.java @@ -288,15 +288,11 @@ public class ChartTypeInterfaceManager extends XMLFileManager implements ExtraCh int index = 0; //处理vanChart - { - Iterator vanChartUI = chartTypeInterfaces.get(ChartTypeManager.vanChartID).entrySet().iterator(); - fetchNames(vanChartUI, names, index++); - } + Iterator vanChartUI = chartTypeInterfaces.get(ChartTypeManager.vanChartID).entrySet().iterator(); + index = fetchNames(vanChartUI, names, index); //处理chart - { - Iterator chartUI = chartTypeInterfaces.get(ChartTypeManager.chartID).entrySet().iterator(); - fetchNames(chartUI, names, index++); - } + Iterator chartUI = chartTypeInterfaces.get(ChartTypeManager.chartID).entrySet().iterator(); + index = fetchNames(chartUI, names, index); //其它图表 Iterator i = chartTypeInterfaces.entrySet().iterator(); while (i.hasNext()){ @@ -304,7 +300,7 @@ public class ChartTypeInterfaceManager extends XMLFileManager implements ExtraCh String chartID = (String) entry.getKey(); if (!(ComparatorUtils.equals(chartID, ChartTypeManager.chartID) || ComparatorUtils.equals(chartID, ChartTypeManager.vanChartID))) { Iterator otherChartUI = chartTypeInterfaces.get(chartID).entrySet().iterator(); - fetchNames(otherChartUI, names, index++); + index = fetchNames(otherChartUI, names, index); } } return names; @@ -313,12 +309,13 @@ public class ChartTypeInterfaceManager extends XMLFileManager implements ExtraCh return new String[0]; } - private void fetchNames(Iterator chartUI, String[] names, int index) { + private int fetchNames(Iterator chartUI, String[] names, int index) { while (chartUI.hasNext()) { Map.Entry chartUIEntry = (Map.Entry) chartUI.next(); IndependentChartUIProvider provider = (IndependentChartUIProvider) chartUIEntry.getValue(); - names[index] = provider.getPlotTypePane().title4PopupWindow(); + names[index++] = provider.getPlotTypePane().title4PopupWindow(); } + return index; } public ChartDataPane getChartDataPane(String plotID, AttributeChangeListener listener) {