Browse Source

修改类名称,统一将ThirdChart和Chart4Custom修改为Charts(代表第三方所有的图表)

master
mengao 8 years ago
parent
commit
69723ae228
  1. 6
      designer_chart/src/com/fr/design/ChartTypeInterfaceManager.java
  2. 4
      designer_chart/src/com/fr/design/chart/fun/IndependentChartUIProvider.java
  3. 4
      designer_chart/src/com/fr/design/chart/fun/impl/AbstractIndependentChartUI.java
  4. 4
      designer_chart/src/com/fr/design/chart/fun/impl/AbstractIndependentChartUIWithAPILevel.java
  5. 6
      designer_chart/src/com/fr/design/chart/fun/impl/AbstractIndependentChartsUI.java
  6. 2
      designer_chart/src/com/fr/design/mainframe/chart/ChartsConfigPane.java
  7. 14
      designer_chart/src/com/fr/design/mainframe/chart/ChartsEditPane.java

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

@ -16,7 +16,7 @@ import com.fr.design.gui.core.WidgetOption;
import com.fr.design.gui.frpane.AttributeChangeListener; import com.fr.design.gui.frpane.AttributeChangeListener;
import com.fr.design.mainframe.chart.AbstractChartAttrPane; import com.fr.design.mainframe.chart.AbstractChartAttrPane;
import com.fr.design.mainframe.chart.ChartEditPane; import com.fr.design.mainframe.chart.ChartEditPane;
import com.fr.design.mainframe.chart.ThirdChartConfigPane; import com.fr.design.mainframe.chart.ChartsConfigPane;
import com.fr.design.mainframe.chart.gui.ChartDataPane; import com.fr.design.mainframe.chart.gui.ChartDataPane;
import com.fr.design.mainframe.chart.gui.ChartStylePane; import com.fr.design.mainframe.chart.gui.ChartStylePane;
import com.fr.design.mainframe.chart.gui.data.report.AbstractReportDataContentPane; import com.fr.design.mainframe.chart.gui.data.report.AbstractReportDataContentPane;
@ -432,7 +432,7 @@ public class ChartTypeInterfaceManager extends XMLFileManager implements ExtraCh
return chartTypeInterfaces.get(priority).get(plotID).getChartEditPane(plotID); return chartTypeInterfaces.get(priority).get(plotID).getChartEditPane(plotID);
} }
public ThirdChartConfigPane getChartConfigPane(String plotID) { public ChartsConfigPane getChartConfigPane(String plotID) {
Iterator iterator = chartTypeInterfaces.entrySet().iterator(); Iterator iterator = chartTypeInterfaces.entrySet().iterator();
while (iterator.hasNext()) { while (iterator.hasNext()) {
Map.Entry entry = (Map.Entry) iterator.next(); Map.Entry entry = (Map.Entry) iterator.next();
@ -444,7 +444,7 @@ public class ChartTypeInterfaceManager extends XMLFileManager implements ExtraCh
return getChartConfigPane(ChartTypeManager.CHART_PRIORITY, plotID); return getChartConfigPane(ChartTypeManager.CHART_PRIORITY, plotID);
} }
private ThirdChartConfigPane getChartConfigPane(String priority, String plotID) { private ChartsConfigPane getChartConfigPane(String priority, String plotID) {
return chartTypeInterfaces.get(priority).get(plotID).getChartConfigPane(plotID); return chartTypeInterfaces.get(priority).get(plotID).getChartConfigPane(plotID);
} }

4
designer_chart/src/com/fr/design/chart/fun/IndependentChartUIProvider.java

@ -6,7 +6,7 @@ import com.fr.design.condition.ConditionAttributesPane;
import com.fr.design.gui.frpane.AttributeChangeListener; import com.fr.design.gui.frpane.AttributeChangeListener;
import com.fr.design.mainframe.chart.AbstractChartAttrPane; import com.fr.design.mainframe.chart.AbstractChartAttrPane;
import com.fr.design.mainframe.chart.ChartEditPane; import com.fr.design.mainframe.chart.ChartEditPane;
import com.fr.design.mainframe.chart.ThirdChartConfigPane; import com.fr.design.mainframe.chart.ChartsConfigPane;
import com.fr.design.mainframe.chart.gui.ChartDataPane; import com.fr.design.mainframe.chart.gui.ChartDataPane;
import com.fr.design.mainframe.chart.gui.ChartStylePane; import com.fr.design.mainframe.chart.gui.ChartStylePane;
import com.fr.design.mainframe.chart.gui.data.report.AbstractReportDataContentPane; import com.fr.design.mainframe.chart.gui.data.report.AbstractReportDataContentPane;
@ -94,6 +94,6 @@ public interface IndependentChartUIProvider extends Level {
ChartEditPane getChartEditPane(String plotID); ChartEditPane getChartEditPane(String plotID);
ThirdChartConfigPane getChartConfigPane(String plotID); ChartsConfigPane getChartConfigPane(String plotID);
} }

4
designer_chart/src/com/fr/design/chart/fun/impl/AbstractIndependentChartUI.java

@ -8,7 +8,7 @@ import com.fr.design.condition.ConditionAttributesPane;
import com.fr.design.gui.frpane.AttributeChangeListener; import com.fr.design.gui.frpane.AttributeChangeListener;
import com.fr.design.mainframe.chart.AbstractChartAttrPane; import com.fr.design.mainframe.chart.AbstractChartAttrPane;
import com.fr.design.mainframe.chart.ChartEditPane; import com.fr.design.mainframe.chart.ChartEditPane;
import com.fr.design.mainframe.chart.ThirdChartConfigPane; import com.fr.design.mainframe.chart.ChartsConfigPane;
import com.fr.design.mainframe.chart.gui.ChartDataPane; import com.fr.design.mainframe.chart.gui.ChartDataPane;
import com.fr.design.mainframe.chart.gui.ChartStylePane; import com.fr.design.mainframe.chart.gui.ChartStylePane;
import com.fr.general.ComparatorUtils; import com.fr.general.ComparatorUtils;
@ -60,7 +60,7 @@ public abstract class AbstractIndependentChartUI implements IndependentChartUIPr
public ChartEditPane getChartEditPane(String plotID){ return StableUtils.construct(ChartEditPane.class);} public ChartEditPane getChartEditPane(String plotID){ return StableUtils.construct(ChartEditPane.class);}
public ThirdChartConfigPane getChartConfigPane(String plotID){return null;} public ChartsConfigPane getChartConfigPane(String plotID){return null;}
} }

4
designer_chart/src/com/fr/design/chart/fun/impl/AbstractIndependentChartUIWithAPILevel.java

@ -8,7 +8,7 @@ import com.fr.design.condition.ConditionAttributesPane;
import com.fr.design.gui.frpane.AttributeChangeListener; import com.fr.design.gui.frpane.AttributeChangeListener;
import com.fr.design.mainframe.chart.AbstractChartAttrPane; import com.fr.design.mainframe.chart.AbstractChartAttrPane;
import com.fr.design.mainframe.chart.ChartEditPane; import com.fr.design.mainframe.chart.ChartEditPane;
import com.fr.design.mainframe.chart.ThirdChartConfigPane; import com.fr.design.mainframe.chart.ChartsConfigPane;
import com.fr.design.mainframe.chart.gui.ChartDataPane; import com.fr.design.mainframe.chart.gui.ChartDataPane;
import com.fr.design.mainframe.chart.gui.ChartStylePane; import com.fr.design.mainframe.chart.gui.ChartStylePane;
import com.fr.general.ComparatorUtils; import com.fr.general.ComparatorUtils;
@ -71,5 +71,5 @@ public abstract class AbstractIndependentChartUIWithAPILevel implements Independ
public ChartEditPane getChartEditPane(String plotID){ return StableUtils.construct(ChartEditPane.class);} public ChartEditPane getChartEditPane(String plotID){ return StableUtils.construct(ChartEditPane.class);}
public ThirdChartConfigPane getChartConfigPane(String plotID){return null;} public ChartsConfigPane getChartConfigPane(String plotID){return null;}
} }

6
designer_chart/src/com/fr/design/chart/fun/impl/AbstractIndependentChartUI4Custom.java → designer_chart/src/com/fr/design/chart/fun/impl/AbstractIndependentChartsUI.java

@ -7,7 +7,7 @@ import com.fr.design.condition.ConditionAttributesPane;
import com.fr.design.gui.frpane.AttributeChangeListener; import com.fr.design.gui.frpane.AttributeChangeListener;
import com.fr.design.mainframe.chart.AbstractChartAttrPane; import com.fr.design.mainframe.chart.AbstractChartAttrPane;
import com.fr.design.mainframe.chart.ChartEditPane; import com.fr.design.mainframe.chart.ChartEditPane;
import com.fr.design.mainframe.chart.ThirdChartEditPane; import com.fr.design.mainframe.chart.ChartsEditPane;
import com.fr.design.mainframe.chart.gui.ChartDataPane; import com.fr.design.mainframe.chart.gui.ChartDataPane;
import com.fr.design.mainframe.chart.gui.ChartStylePane; import com.fr.design.mainframe.chart.gui.ChartStylePane;
import com.fr.design.mainframe.chart.gui.data.report.AbstractReportDataContentPane; import com.fr.design.mainframe.chart.gui.data.report.AbstractReportDataContentPane;
@ -26,7 +26,7 @@ import com.fr.stable.fun.mark.API;
*/ */
@API(level = IndependentChartUIProvider.CURRENT_API_LEVEL) @API(level = IndependentChartUIProvider.CURRENT_API_LEVEL)
public abstract class AbstractIndependentChartUI4Custom extends AbstractProvider implements IndependentChartUIProvider { public abstract class AbstractIndependentChartsUI extends AbstractProvider implements IndependentChartUIProvider {
public String mark4Provider() { public String mark4Provider() {
return getClass().getName(); return getClass().getName();
@ -97,7 +97,7 @@ public abstract class AbstractIndependentChartUI4Custom extends AbstractProvider
@Override @Override
public ChartEditPane getChartEditPane(String plotID) { public ChartEditPane getChartEditPane(String plotID) {
return new ThirdChartEditPane(); return new ChartsEditPane();
} }
} }

2
designer_chart/src/com/fr/design/mainframe/chart/ThirdChartConfigPane.java → designer_chart/src/com/fr/design/mainframe/chart/ChartsConfigPane.java

@ -8,7 +8,7 @@ import javax.swing.*;
/** /**
* Created by mengao on 2017/5/16. * Created by mengao on 2017/5/16.
*/ */
public class ThirdChartConfigPane extends AbstractChartAttrPane { public class ChartsConfigPane extends AbstractChartAttrPane {
public final static String CHART_STYLE_TITLE = Inter.getLocText("Chart-Style_Name"); public final static String CHART_STYLE_TITLE = Inter.getLocText("Chart-Style_Name");

14
designer_chart/src/com/fr/design/mainframe/chart/ThirdChartEditPane.java → designer_chart/src/com/fr/design/mainframe/chart/ChartsEditPane.java

@ -10,20 +10,20 @@ import java.util.ArrayList;
/** /**
* Created by mengao on 2017/5/3. * Created by mengao on 2017/5/3.
*/ */
public class ThirdChartEditPane extends ChartEditPane { public class ChartsEditPane extends ChartEditPane {
protected ThirdChartConfigPane thirdChartConfigPane; protected ChartsConfigPane chartsConfigPane;
public ThirdChartEditPane() { public ChartsEditPane() {
this.setLayout(new BorderLayout()); this.setLayout(new BorderLayout());
paneList = new ArrayList<AbstractChartAttrPane>(); paneList = new ArrayList<AbstractChartAttrPane>();
dataPane4SupportCell = new ChartDataPane(listener); dataPane4SupportCell = new ChartDataPane(listener);
dataPane4SupportCell.setSupportCellData(true); dataPane4SupportCell.setSupportCellData(true);
thirdChartConfigPane= new ThirdChartConfigPane(); chartsConfigPane = new ChartsConfigPane();
paneList.add(dataPane4SupportCell); paneList.add(dataPane4SupportCell);
paneList.add(thirdChartConfigPane); paneList.add(chartsConfigPane);
createTabsPane(); createTabsPane();
} }
@ -44,9 +44,9 @@ public class ThirdChartEditPane extends ChartEditPane {
} }
dataPane4SupportCell = createChartDataPane(plotID); dataPane4SupportCell = createChartDataPane(plotID);
thirdChartConfigPane= ChartTypeInterfaceManager.getInstance().getChartConfigPane(plotID); chartsConfigPane = ChartTypeInterfaceManager.getInstance().getChartConfigPane(plotID);
paneList.add(dataPane4SupportCell); paneList.add(dataPane4SupportCell);
paneList.add(thirdChartConfigPane); paneList.add(chartsConfigPane);
createTabsPane(); createTabsPane();
} }
Loading…
Cancel
Save