Browse Source

update

master
Fangjie Hu 8 years ago
parent
commit
fadf534930
  1. 19
      designer_chart/src/com/fr/design/ChartTypeInterfaceManager.java

19
designer_chart/src/com/fr/design/ChartTypeInterfaceManager.java

@ -288,15 +288,11 @@ public class ChartTypeInterfaceManager extends XMLFileManager implements ExtraCh
int index = 0; int index = 0;
//处理vanChart //处理vanChart
{ Iterator vanChartUI = chartTypeInterfaces.get(ChartTypeManager.vanChartID).entrySet().iterator();
Iterator vanChartUI = chartTypeInterfaces.get(ChartTypeManager.vanChartID).entrySet().iterator(); index = fetchNames(vanChartUI, names, index);
fetchNames(vanChartUI, names, index++);
}
//处理chart //处理chart
{ Iterator chartUI = chartTypeInterfaces.get(ChartTypeManager.chartID).entrySet().iterator();
Iterator chartUI = chartTypeInterfaces.get(ChartTypeManager.chartID).entrySet().iterator(); index = fetchNames(chartUI, names, index);
fetchNames(chartUI, names, index++);
}
//其它图表 //其它图表
Iterator i = chartTypeInterfaces.entrySet().iterator(); Iterator i = chartTypeInterfaces.entrySet().iterator();
while (i.hasNext()){ while (i.hasNext()){
@ -304,7 +300,7 @@ public class ChartTypeInterfaceManager extends XMLFileManager implements ExtraCh
String chartID = (String) entry.getKey(); String chartID = (String) entry.getKey();
if (!(ComparatorUtils.equals(chartID, ChartTypeManager.chartID) || ComparatorUtils.equals(chartID, ChartTypeManager.vanChartID))) { if (!(ComparatorUtils.equals(chartID, ChartTypeManager.chartID) || ComparatorUtils.equals(chartID, ChartTypeManager.vanChartID))) {
Iterator otherChartUI = chartTypeInterfaces.get(chartID).entrySet().iterator(); Iterator otherChartUI = chartTypeInterfaces.get(chartID).entrySet().iterator();
fetchNames(otherChartUI, names, index++); index = fetchNames(otherChartUI, names, index);
} }
} }
return names; return names;
@ -313,12 +309,13 @@ public class ChartTypeInterfaceManager extends XMLFileManager implements ExtraCh
return new String[0]; 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()) { while (chartUI.hasNext()) {
Map.Entry chartUIEntry = (Map.Entry) chartUI.next(); Map.Entry chartUIEntry = (Map.Entry) chartUI.next();
IndependentChartUIProvider provider = (IndependentChartUIProvider) chartUIEntry.getValue(); IndependentChartUIProvider provider = (IndependentChartUIProvider) chartUIEntry.getValue();
names[index] = provider.getPlotTypePane().title4PopupWindow(); names[index++] = provider.getPlotTypePane().title4PopupWindow();
} }
return index;
} }
public ChartDataPane getChartDataPane(String plotID, AttributeChangeListener listener) { public ChartDataPane getChartDataPane(String plotID, AttributeChangeListener listener) {

Loading…
Cancel
Save