From 9de0784d64ccbb5bfb49f53698620be2867697a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=99=BD=E5=B2=B3?= <445798420@qq.com> Date: Mon, 23 Sep 2019 11:24:13 +0800 Subject: [PATCH 1/4] =?UTF-8?q?CHART-10603=20=E6=97=A7=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E5=9B=BE=E8=A1=A8=E7=9A=84name=E5=92=8Cpath=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...bstractIndependentChartUIWithAPILevel.java | 11 ---- .../AreaIndependentChartInterface.java | 46 ++++++++++++--- .../BarIndependentChartInterface.java | 58 ++++++++++++++++--- .../BubbleIndependentChartInterface.java | 19 ++++++ .../ColumnIndependentChartInterface.java | 56 +++++++++++++++--- .../CustomIndependentChartInterface.java | 34 ++++++++--- .../DonutIndependentChartInterface.java | 38 +++++++++--- .../FunnelIndependentChartInterface.java | 19 ++++++ .../GanttIndependentChartInterface.java | 19 ++++++ .../GisMapIndependentChartInterface.java | 33 +++++++++-- .../LineIndependentChartInterface.java | 34 ++++++++--- .../MapIndependentChartInterface.java | 19 ++++++ .../MeterIndependentChartInterface.java | 36 ++++++++++-- .../PieIndependentChartInterface.java | 37 +++++++++--- .../RadarIndependentChartInterface.java | 19 ++++++ .../RangeIndependentChartInterface.java | 19 ++++++ .../StockIndependentChartInterface.java | 19 ++++++ .../XYScatterIndependentChartInterface.java | 34 ++++++++--- 18 files changed, 470 insertions(+), 80 deletions(-) diff --git a/designer-chart/src/main/java/com/fr/design/chart/fun/impl/AbstractIndependentChartUIWithAPILevel.java b/designer-chart/src/main/java/com/fr/design/chart/fun/impl/AbstractIndependentChartUIWithAPILevel.java index f754a028e6..9a577a5ae6 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/fun/impl/AbstractIndependentChartUIWithAPILevel.java +++ b/designer-chart/src/main/java/com/fr/design/chart/fun/impl/AbstractIndependentChartUIWithAPILevel.java @@ -37,22 +37,11 @@ public abstract class AbstractIndependentChartUIWithAPILevel implements ChartTyp return new ChartDataPane(listener); } - //todo@bjornrefactor 适配旧版本图表后 删掉下面两个方法 - @Override - public String getName() { - return null; - } - @Override public String[] getSubName() { return new String[0]; } - @Override - public String[] getDemoImagePath() { - return new String[0]; - } - /** * 是否使用默认的界面，为了避免界面来回切换 * @return 是否使用默认的界面 diff --git a/designer-chart/src/main/java/com/fr/design/chartinterface/AreaIndependentChartInterface.java b/designer-chart/src/main/java/com/fr/design/chartinterface/AreaIndependentChartInterface.java index ff8a06ac76..61c36eaace 100644 --- a/designer-chart/src/main/java/com/fr/design/chartinterface/AreaIndependentChartInterface.java +++ b/designer-chart/src/main/java/com/fr/design/chartinterface/AreaIndependentChartInterface.java @@ -16,38 +16,70 @@ import com.fr.design.mainframe.chart.gui.style.series.Area3DSeriesPane; import com.fr.design.mainframe.chart.gui.style.series.AreaSeriesPane; import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane; import com.fr.design.mainframe.chart.gui.type.AreaPlotPane; +import com.fr.locale.InterProviderFactory; /** * Created by eason on 15/4/21. */ public class AreaIndependentChartInterface extends AbstractIndependentChartUIWithAPILevel { - public AbstractChartTypePane getPlotTypePane(){ + public AbstractChartTypePane getPlotTypePane() { return new AreaPlotPane(); } - public AbstractTableDataContentPane getTableDataSourcePane(Plot plot, ChartDataPane parent){ + public AbstractTableDataContentPane getTableDataSourcePane(Plot plot, ChartDataPane parent) { return new CategoryPlotTableDataContentPane(parent); } - public AbstractReportDataContentPane getReportDataSourcePane(Plot plot, ChartDataPane parent){ + public AbstractReportDataContentPane getReportDataSourcePane(Plot plot, ChartDataPane parent) { return new CategoryPlotReportDataContentPane(parent); } - public BasicBeanPane getPlotSeriesPane(ChartStylePane parent, Plot plot){ + public BasicBeanPane getPlotSeriesPane(ChartStylePane parent, Plot plot) { return plot.isSupport3D() ? new Area3DSeriesPane(parent, plot) : new AreaSeriesPane(parent, plot); } - public ConditionAttributesPane getPlotConditionPane(Plot plot){ + public ConditionAttributesPane getPlotConditionPane(Plot plot) { return plot.isSupport3D() ? new Area3DPlotDataSeriesConditionPane() : new AreaPlotDataSeriesCondtionPane(); } /** - *图标路径 + * 图标路径 + * * @return 图标路径 */ - public String getIconPath(){ + public String getIconPath() { return "com/fr/design/images/form/toolbar/ChartF-Area.png"; } + @Override + public String getName() { + return InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Area"); + } + + @Override + public String[] getSubName() { + String chartName = InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Area"); + String stackChartName = InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Stacked") + chartName; + String perStackChartName = InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Use_Percent") + stackChartName; + String stackChartName3D = InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_3D") + stackChartName; + String perStackChartName3D = InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_3D") + perStackChartName; + + return new String[]{ + stackChartName, + perStackChartName, + stackChartName3D, + perStackChartName3D + }; + } + + @Override + public String[] getDemoImagePath() { + return new String[]{ + "com/fr/plugin/chart/demo/image/areastacked.png", + "com/fr/plugin/chart/demo/image/areastackedpercent.png", + "com/fr/plugin/chart/demo/image/areastacked3D.png", + "com/fr/plugin/chart/demo/image/areastackedpercent3D.png", + }; + } } \ No newline at end of file diff --git a/designer-chart/src/main/java/com/fr/design/chartinterface/BarIndependentChartInterface.java b/designer-chart/src/main/java/com/fr/design/chartinterface/BarIndependentChartInterface.java index de1160b102..16ab82a217 100644 --- a/designer-chart/src/main/java/com/fr/design/chartinterface/BarIndependentChartInterface.java +++ b/designer-chart/src/main/java/com/fr/design/chartinterface/BarIndependentChartInterface.java @@ -17,39 +17,81 @@ import com.fr.design.mainframe.chart.gui.style.series.Bar2DSeriesPane; import com.fr.design.mainframe.chart.gui.style.series.Bar3DSeriesPane; import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane; import com.fr.design.mainframe.chart.gui.type.BarPlotPane; +import com.fr.locale.InterProviderFactory; /** * Created by eason on 15/4/21. */ public class BarIndependentChartInterface extends AbstractIndependentChartUIWithAPILevel { - public AbstractChartTypePane getPlotTypePane(){ + public AbstractChartTypePane getPlotTypePane() { return new BarPlotPane(); } - public AbstractTableDataContentPane getTableDataSourcePane(Plot plot, ChartDataPane parent){ + public AbstractTableDataContentPane getTableDataSourcePane(Plot plot, ChartDataPane parent) { return new CategoryPlotTableDataContentPane(parent); } - public AbstractReportDataContentPane getReportDataSourcePane(Plot plot, ChartDataPane parent){ + public AbstractReportDataContentPane getReportDataSourcePane(Plot plot, ChartDataPane parent) { return new CategoryPlotReportDataContentPane(parent); } - public BasicBeanPane getPlotSeriesPane(ChartStylePane parent, Plot plot){ + public BasicBeanPane getPlotSeriesPane(ChartStylePane parent, Plot plot) { return plot.isSupport3D() ? new Bar3DSeriesPane(parent, plot) : new Bar2DSeriesPane(parent, plot); } - public ConditionAttributesPane getPlotConditionPane(Plot plot){ + public ConditionAttributesPane getPlotConditionPane(Plot plot) { return plot.isSupport3D() ? new Bar3DPlotDataSeriesConditionPane() - : (plot.isSupportTrendLine() ? new Bar2DTrendLineDSConditionPane() : new BarPlotDataSeriesConditionPane()); + : (plot.isSupportTrendLine() ? new Bar2DTrendLineDSConditionPane() : new BarPlotDataSeriesConditionPane()); } /** - *图标路径 + * 图标路径 + * * @return 图标路径 */ - public String getIconPath(){ + public String getIconPath() { return "com/fr/design/images/form/toolbar/ChartF-Bar.png"; } + @Override + public String getName() { + return InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Bar"); + } + + @Override + public String[] getSubName() { + String chartName = InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Bar"); + String stackChartName = InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Stacked") + chartName; + String perStackChartName = InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Use_Percent") + stackChartName; + String chartName3D = InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_3D") + chartName; + String chartNameHoriz3D = chartName3D + "(" + InterProviderFactory.getProvider().getLocText("Fine-Engine_Report_Utils_Left_To_Right") + ")"; + String stackChartName3D = InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_3D") + stackChartName; + String perStackChartName3D = InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_3D") + perStackChartName; + + //依次，条形图-旧版本、堆积条形图-旧版本、百分比堆积条形图-旧版本、三维条形图-旧版本、三维条形图-旧版本(横向)、三维堆积条形图-旧版本、三维百分比堆积条形图-旧版本 + return new String[]{ + chartName, + stackChartName, + perStackChartName, + chartName3D, + chartNameHoriz3D, + stackChartName3D, + perStackChartName3D + }; + } + + @Override + public String[] getDemoImagePath() { + return new String[]{ + "com/fr/plugin/chart/demo/image/bar.png", + "com/fr/plugin/chart/demo/image/barstacked.png", + "com/fr/plugin/chart/demo/image/barstackedpercent.png", + "com/fr/plugin/chart/demo/image/bar3D.png", + "com/fr/plugin/chart/demo/image/bar3D(cross).png", + "com/fr/plugin/chart/demo/image/barstacked3D.png", + "com/fr/plugin/chart/demo/image/barstackedpercent3D.png" + }; + } + } \ No newline at end of file diff --git a/designer-chart/src/main/java/com/fr/design/chartinterface/BubbleIndependentChartInterface.java b/designer-chart/src/main/java/com/fr/design/chartinterface/BubbleIndependentChartInterface.java index b9d0b232ce..4b47ba5e2f 100644 --- a/designer-chart/src/main/java/com/fr/design/chartinterface/BubbleIndependentChartInterface.java +++ b/designer-chart/src/main/java/com/fr/design/chartinterface/BubbleIndependentChartInterface.java @@ -14,6 +14,7 @@ import com.fr.design.mainframe.chart.gui.data.table.BubblePlotTableDataContentPa import com.fr.design.mainframe.chart.gui.style.series.BubbleSeriesPane; import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane; import com.fr.design.mainframe.chart.gui.type.BubblePlotPane; +import com.fr.locale.InterProviderFactory; /** * Created by eason on 15/4/21. @@ -48,4 +49,22 @@ public class BubbleIndependentChartInterface extends AbstractIndependentChartUIW return new BubblePlotDataSeriesConditionPane(); } + @Override + public String getName() { + return InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Bubble_Chart"); + } + + @Override + public String[] getSubName() { + return new String[]{ + InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Bubble_Chart") + }; + } + + @Override + public String[] getDemoImagePath() { + return new String[]{ + "com/fr/plugin/chart/demo/image/bubble.png" + }; + } } \ No newline at end of file diff --git a/designer-chart/src/main/java/com/fr/design/chartinterface/ColumnIndependentChartInterface.java b/designer-chart/src/main/java/com/fr/design/chartinterface/ColumnIndependentChartInterface.java index 8a9249274f..bb9c3ddb32 100644 --- a/designer-chart/src/main/java/com/fr/design/chartinterface/ColumnIndependentChartInterface.java +++ b/designer-chart/src/main/java/com/fr/design/chartinterface/ColumnIndependentChartInterface.java @@ -17,39 +17,81 @@ import com.fr.design.mainframe.chart.gui.style.series.Bar2DSeriesPane; import com.fr.design.mainframe.chart.gui.style.series.Bar3DSeriesPane; import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane; import com.fr.design.mainframe.chart.gui.type.ColumnPlotPane; +import com.fr.locale.InterProviderFactory; /** * Created by eason on 15/4/21. */ public class ColumnIndependentChartInterface extends AbstractIndependentChartUIWithAPILevel { - public AbstractChartTypePane getPlotTypePane(){ + public AbstractChartTypePane getPlotTypePane() { return new ColumnPlotPane(); } - public AbstractTableDataContentPane getTableDataSourcePane(Plot plot, ChartDataPane parent){ + public AbstractTableDataContentPane getTableDataSourcePane(Plot plot, ChartDataPane parent) { return new CategoryPlotMoreCateTableDataContentPane(parent); } - public AbstractReportDataContentPane getReportDataSourcePane(Plot plot, ChartDataPane parent){ + public AbstractReportDataContentPane getReportDataSourcePane(Plot plot, ChartDataPane parent) { return new CategoryPlotMoreCateReportDataContentPane(parent); } - public BasicBeanPane getPlotSeriesPane(ChartStylePane parent, Plot plot){ + public BasicBeanPane getPlotSeriesPane(ChartStylePane parent, Plot plot) { return plot.isSupport3D() ? new Bar3DSeriesPane(parent, plot) : new Bar2DSeriesPane(parent, plot); } - public ConditionAttributesPane getPlotConditionPane(Plot plot){ + public ConditionAttributesPane getPlotConditionPane(Plot plot) { return plot.isSupport3D() ? new Bar3DPlotDataSeriesConditionPane() : (plot.isSupportTrendLine() ? new Bar2DTrendLineDSConditionPane() : new BarPlotDataSeriesConditionPane()); } /** - *图标路径 + * 图标路径 + * * @return 图标路径 */ - public String getIconPath(){ + public String getIconPath() { return "com/fr/design/images/form/toolbar/ChartF-Column.png"; } + + @Override + public String getName() { + return InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Column"); + } + + @Override + public String[] getSubName() { + String chartName = InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Column"); + String stackChartName = InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Stacked") + chartName; + String perStackChartName = InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Use_Percent") + stackChartName; + String chartName3D = InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_3D")+ chartName; + String chartNameHoriz3D = chartName3D + "(" + InterProviderFactory.getProvider().getLocText("Fine-Engine_Report_Utils_Left_To_Right") + ")"; + String stackChartName3D = InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_3D") + stackChartName; + String perStackChartName3D = InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_3D") + perStackChartName; + + //依次，柱形图-旧版本、堆积柱形图-旧版本、百分比堆积柱形图-旧版本、三维柱形图-旧版本、三维柱形图-旧版本(横向)、三维堆积柱形图-旧版本、三维百分比堆积柱形图-旧版本 + return new String[]{ + chartName, + stackChartName, + perStackChartName, + chartName3D, + chartNameHoriz3D, + stackChartName3D, + perStackChartName3D + }; + } + + @Override + public String[] getDemoImagePath() { + return new String[]{ + "com/fr/plugin/chart/demo/image/column.png", + "com/fr/plugin/chart/demo/image/columnstacked.png", + "com/fr/plugin/chart/demo/image/columnstackedpercent.png", + "com/fr/plugin/chart/demo/image/column3D.png", + "com/fr/plugin/chart/demo/image/column3D(cross).png", + "com/fr/plugin/chart/demo/image/columnstacked3D.png", + "com/fr/plugin/chart/demo/image/columnstackedpercent3D.png" + }; + } } \ No newline at end of file diff --git a/designer-chart/src/main/java/com/fr/design/chartinterface/CustomIndependentChartInterface.java b/designer-chart/src/main/java/com/fr/design/chartinterface/CustomIndependentChartInterface.java index 584cdb5e1e..7e3520446b 100644 --- a/designer-chart/src/main/java/com/fr/design/chartinterface/CustomIndependentChartInterface.java +++ b/designer-chart/src/main/java/com/fr/design/chartinterface/CustomIndependentChartInterface.java @@ -14,6 +14,7 @@ import com.fr.design.mainframe.chart.gui.data.table.CategoryPlotTableDataContent import com.fr.design.mainframe.chart.gui.style.series.CustomSeriesPane; import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane; import com.fr.design.mainframe.chart.gui.type.CustomPlotPane; +import com.fr.locale.InterProviderFactory; /** * Created by eason on 15/4/21. @@ -21,32 +22,51 @@ import com.fr.design.mainframe.chart.gui.type.CustomPlotPane; public class CustomIndependentChartInterface extends AbstractIndependentChartUIWithAPILevel { - public AbstractChartTypePane getPlotTypePane(){ + public AbstractChartTypePane getPlotTypePane() { return new CustomPlotPane(); } - public AbstractTableDataContentPane getTableDataSourcePane(Plot plot, ChartDataPane parent){ + public AbstractTableDataContentPane getTableDataSourcePane(Plot plot, ChartDataPane parent) { return new CategoryPlotTableDataContentPane(parent); } - public AbstractReportDataContentPane getReportDataSourcePane(Plot plot, ChartDataPane parent){ + public AbstractReportDataContentPane getReportDataSourcePane(Plot plot, ChartDataPane parent) { return new CategoryPlotReportDataContentPane(parent); } - public BasicBeanPane getPlotSeriesPane(ChartStylePane parent, Plot plot){ + public BasicBeanPane getPlotSeriesPane(ChartStylePane parent, Plot plot) { return new CustomSeriesPane(parent, plot); } - public ConditionAttributesPane getPlotConditionPane(Plot plot){ + public ConditionAttributesPane getPlotConditionPane(Plot plot) { return new DataSeriesCustomConditionPane(); } /** - *图标路径 + * 图标路径 + * * @return 图标路径 */ - public String getIconPath(){ + public String getIconPath() { return "com/fr/design/images/form/toolbar/ChartF-Comb_Chart.png"; } + @Override + public String getName() { + return InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Combine"); + } + + @Override + public String[] getSubName() { + return new String[]{ + InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Combine") + }; + } + + @Override + public String[] getDemoImagePath() { + return new String[]{ + "com/fr/plugin/chart/demo/image/custom.png" + }; + } } \ No newline at end of file diff --git a/designer-chart/src/main/java/com/fr/design/chartinterface/DonutIndependentChartInterface.java b/designer-chart/src/main/java/com/fr/design/chartinterface/DonutIndependentChartInterface.java index 8b5894384a..d8df6a59be 100644 --- a/designer-chart/src/main/java/com/fr/design/chartinterface/DonutIndependentChartInterface.java +++ b/designer-chart/src/main/java/com/fr/design/chartinterface/DonutIndependentChartInterface.java @@ -16,6 +16,7 @@ import com.fr.design.mainframe.chart.gui.style.series.Donut2DSeriesPane; import com.fr.design.mainframe.chart.gui.style.series.Donut3DSeriesPane; import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane; import com.fr.design.mainframe.chart.gui.type.DonutPlotPane; +import com.fr.locale.InterProviderFactory; /** * Created by eason on 15/4/21. @@ -23,32 +24,53 @@ import com.fr.design.mainframe.chart.gui.type.DonutPlotPane; public class DonutIndependentChartInterface extends AbstractIndependentChartUIWithAPILevel { - public AbstractChartTypePane getPlotTypePane(){ + public AbstractChartTypePane getPlotTypePane() { return new DonutPlotPane(); } - public AbstractTableDataContentPane getTableDataSourcePane(Plot plot, ChartDataPane parent){ + public AbstractTableDataContentPane getTableDataSourcePane(Plot plot, ChartDataPane parent) { return new CategoryPlotTableDataContentPane(parent); } - public AbstractReportDataContentPane getReportDataSourcePane(Plot plot, ChartDataPane parent){ + public AbstractReportDataContentPane getReportDataSourcePane(Plot plot, ChartDataPane parent) { return new CategoryPlotReportDataContentPane(parent); } - public BasicBeanPane getPlotSeriesPane(ChartStylePane parent, Plot plot){ + public BasicBeanPane getPlotSeriesPane(ChartStylePane parent, Plot plot) { return plot.isSupport3D() ? new Donut3DSeriesPane(parent, plot) : new Donut2DSeriesPane(parent, plot); } - - public ConditionAttributesPane getPlotConditionPane(Plot plot){ + + public ConditionAttributesPane getPlotConditionPane(Plot plot) { return plot.isSupport3D() ? new DataSeriesConditionPane() : new Donut2DPlotDataSeriesConditionPane(); } /** - *图标路径 + * 图标路径 + * * @return 图标路径 */ - public String getIconPath(){ + public String getIconPath() { return "com/fr/design/images/form/toolbar/ChartF-Donut.png"; } + @Override + public String getName() { + return InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Donut"); + } + + @Override + public String[] getSubName() { + return new String[]{ + InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Donut"), + InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_3D") + InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Donut") + }; + } + + @Override + public String[] getDemoImagePath() { + return new String[]{ + "com/fr/plugin/chart/demo/image/donut2D.png", + "com/fr/plugin/chart/demo/image/donut3D.png" + }; + } } \ No newline at end of file diff --git a/designer-chart/src/main/java/com/fr/design/chartinterface/FunnelIndependentChartInterface.java b/designer-chart/src/main/java/com/fr/design/chartinterface/FunnelIndependentChartInterface.java index 75ca4e6f82..267048706c 100644 --- a/designer-chart/src/main/java/com/fr/design/chartinterface/FunnelIndependentChartInterface.java +++ b/designer-chart/src/main/java/com/fr/design/chartinterface/FunnelIndependentChartInterface.java @@ -14,6 +14,7 @@ import com.fr.design.mainframe.chart.gui.data.table.PiePlotTableDataContentPane; import com.fr.design.mainframe.chart.gui.style.series.FunnelSeriesPane; import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane; import com.fr.design.mainframe.chart.gui.type.FunnelPlotPane; +import com.fr.locale.InterProviderFactory; /** * Created by eason on 15/4/21. @@ -49,4 +50,22 @@ public class FunnelIndependentChartInterface extends AbstractIndependentChartUIW return "com/fr/design/images/form/toolbar/ChartF-Funnel.png"; } + @Override + public String getName() { + return InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Funnel"); + } + + @Override + public String[] getSubName() { + return new String[]{ + InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Funnel") + }; + } + + @Override + public String[] getDemoImagePath() { + return new String[]{ + "com/fr/plugin/chart/demo/image/funnel.png" + }; + } } \ No newline at end of file diff --git a/designer-chart/src/main/java/com/fr/design/chartinterface/GanttIndependentChartInterface.java b/designer-chart/src/main/java/com/fr/design/chartinterface/GanttIndependentChartInterface.java index b032b7ca25..33a0d8de2d 100644 --- a/designer-chart/src/main/java/com/fr/design/chartinterface/GanttIndependentChartInterface.java +++ b/designer-chart/src/main/java/com/fr/design/chartinterface/GanttIndependentChartInterface.java @@ -11,6 +11,7 @@ import com.fr.design.mainframe.chart.gui.data.table.AbstractTableDataContentPane import com.fr.design.mainframe.chart.gui.data.table.GanttPlotTableDataContentPane; import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane; import com.fr.design.mainframe.chart.gui.type.GanttPlotPane; +import com.fr.locale.InterProviderFactory; /** * Created by eason on 15/4/21. @@ -42,4 +43,22 @@ public class GanttIndependentChartInterface extends AbstractIndependentChartUIWi return "com/fr/design/images/form/toolbar/ChartF-Gantt.png"; } + @Override + public String getName() { + return InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Gantt"); + } + + @Override + public String[] getSubName() { + return new String[]{ + InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Gantt") + }; + } + + @Override + public String[] getDemoImagePath() { + return new String[]{ + "com/fr/plugin/chart/demo/image/gantt.png" + }; + } } \ No newline at end of file diff --git a/designer-chart/src/main/java/com/fr/design/chartinterface/GisMapIndependentChartInterface.java b/designer-chart/src/main/java/com/fr/design/chartinterface/GisMapIndependentChartInterface.java index 04cdbd8b29..9fc6767405 100644 --- a/designer-chart/src/main/java/com/fr/design/chartinterface/GisMapIndependentChartInterface.java +++ b/designer-chart/src/main/java/com/fr/design/chartinterface/GisMapIndependentChartInterface.java @@ -7,6 +7,7 @@ import com.fr.design.mainframe.chart.gui.data.report.AbstractReportDataContentPa import com.fr.design.mainframe.chart.gui.data.table.AbstractTableDataContentPane; import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane; import com.fr.design.mainframe.chart.gui.type.GisMapPlotPane; +import com.fr.locale.InterProviderFactory; /** * Created by eason on 15/4/21. @@ -14,23 +15,45 @@ import com.fr.design.mainframe.chart.gui.type.GisMapPlotPane; public class GisMapIndependentChartInterface extends AbstractIndependentChartUIWithAPILevel { - public AbstractChartTypePane getPlotTypePane(){ + public AbstractChartTypePane getPlotTypePane() { return new GisMapPlotPane(); } - public AbstractTableDataContentPane getTableDataSourcePane(Plot plot, ChartDataPane parent){ + public AbstractTableDataContentPane getTableDataSourcePane(Plot plot, ChartDataPane parent) { return null; } - public AbstractReportDataContentPane getReportDataSourcePane(Plot plot, ChartDataPane parent){ + public AbstractReportDataContentPane getReportDataSourcePane(Plot plot, ChartDataPane parent) { return null; } + /** - *图标路径 + * 图标路径 + * * @return 图标路径 */ - public String getIconPath(){ + public String getIconPath() { return "com/fr/design/images/form/toolbar/ChartF-Gis.png"; } + @Override + public String getName() { + return InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_GIS_Map"); + } + + @Override + public String[] getSubName() { + return new String[]{ + InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Map_BaiduMap"), + InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Map_GoogleMap") + }; + } + + @Override + public String[] getDemoImagePath() { + return new String[]{ + "com/fr/plugin/chart/demo/image/gismap.png", + "com/fr/plugin/chart/demo/image/gismap.png" + }; + } } \ No newline at end of file diff --git a/designer-chart/src/main/java/com/fr/design/chartinterface/LineIndependentChartInterface.java b/designer-chart/src/main/java/com/fr/design/chartinterface/LineIndependentChartInterface.java index a133a200ac..2e9dbbceb4 100644 --- a/designer-chart/src/main/java/com/fr/design/chartinterface/LineIndependentChartInterface.java +++ b/designer-chart/src/main/java/com/fr/design/chartinterface/LineIndependentChartInterface.java @@ -15,6 +15,7 @@ import com.fr.design.mainframe.chart.gui.data.table.CategoryPlotMoreCateTableDat import com.fr.design.mainframe.chart.gui.style.series.LineSeriesPane; import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane; import com.fr.design.mainframe.chart.gui.type.LinePlotPane; +import com.fr.locale.InterProviderFactory; /** * Created by eason on 15/4/21. @@ -22,32 +23,51 @@ import com.fr.design.mainframe.chart.gui.type.LinePlotPane; public class LineIndependentChartInterface extends AbstractIndependentChartUIWithAPILevel { - public AbstractChartTypePane getPlotTypePane(){ + public AbstractChartTypePane getPlotTypePane() { return new LinePlotPane(); } - public AbstractTableDataContentPane getTableDataSourcePane(Plot plot, ChartDataPane parent){ + public AbstractTableDataContentPane getTableDataSourcePane(Plot plot, ChartDataPane parent) { return new CategoryPlotMoreCateTableDataContentPane(parent); } - public AbstractReportDataContentPane getReportDataSourcePane(Plot plot, ChartDataPane parent){ + public AbstractReportDataContentPane getReportDataSourcePane(Plot plot, ChartDataPane parent) { return new CategoryPlotMoreCateReportDataContentPane(parent); } - public BasicBeanPane getPlotSeriesPane(ChartStylePane parent, Plot plot){ + public BasicBeanPane getPlotSeriesPane(ChartStylePane parent, Plot plot) { return new LineSeriesPane(parent, plot); } - public ConditionAttributesPane getPlotConditionPane(Plot plot){ + public ConditionAttributesPane getPlotConditionPane(Plot plot) { return plot.isSupportTrendLine() ? new LinePlotDataSeriesConditionPane() : new DataSeriesConditionPane(); } /** - *图标路径 + * 图标路径 + * * @return 图标路径 */ - public String getIconPath(){ + public String getIconPath() { return "com/fr/design/images/form/toolbar/ChartF-Line.png"; } + @Override + public String getName() { + return InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Line"); + } + + @Override + public String[] getSubName() { + return new String[]{ + InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Line") + }; + } + + @Override + public String[] getDemoImagePath() { + return new String[]{ + "com/fr/plugin/chart/demo/image/line.png" + }; + } } \ No newline at end of file diff --git a/designer-chart/src/main/java/com/fr/design/chartinterface/MapIndependentChartInterface.java b/designer-chart/src/main/java/com/fr/design/chartinterface/MapIndependentChartInterface.java index 2fc17e1476..3189041df4 100644 --- a/designer-chart/src/main/java/com/fr/design/chartinterface/MapIndependentChartInterface.java +++ b/designer-chart/src/main/java/com/fr/design/chartinterface/MapIndependentChartInterface.java @@ -12,6 +12,7 @@ import com.fr.design.mainframe.chart.gui.data.table.AbstractTableDataContentPane import com.fr.design.mainframe.chart.gui.style.series.MapSeriesPane; import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane; import com.fr.design.mainframe.chart.gui.type.MapPlotPane; +import com.fr.locale.InterProviderFactory; /** * Created by eason on 15/4/21. @@ -47,4 +48,22 @@ public class MapIndependentChartInterface extends AbstractIndependentChartUIWith return "com/fr/design/images/form/toolbar/Chart-Map.png"; } + @Override + public String getName() { + return InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_SVG_MAP"); + } + + @Override + public String[] getSubName() { + return new String[]{ + InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_SVG_MAP") + }; + } + + @Override + public String[] getDemoImagePath() { + return new String[]{ + "com/fr/plugin/chart/demo/image/map.png" + }; + } } \ No newline at end of file diff --git a/designer-chart/src/main/java/com/fr/design/chartinterface/MeterIndependentChartInterface.java b/designer-chart/src/main/java/com/fr/design/chartinterface/MeterIndependentChartInterface.java index ce1f5b07bf..2ace3c94ea 100644 --- a/designer-chart/src/main/java/com/fr/design/chartinterface/MeterIndependentChartInterface.java +++ b/designer-chart/src/main/java/com/fr/design/chartinterface/MeterIndependentChartInterface.java @@ -12,6 +12,7 @@ import com.fr.design.mainframe.chart.gui.data.table.MeterPlotTableDataContentPan import com.fr.design.mainframe.chart.gui.style.series.MeterSeriesPane; import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane; import com.fr.design.mainframe.chart.gui.type.MeterPlotPane; +import com.fr.locale.InterProviderFactory; /** * Created by eason on 15/4/21. @@ -19,28 +20,51 @@ import com.fr.design.mainframe.chart.gui.type.MeterPlotPane; public class MeterIndependentChartInterface extends AbstractIndependentChartUIWithAPILevel { - public AbstractChartTypePane getPlotTypePane(){ + public AbstractChartTypePane getPlotTypePane() { return new MeterPlotPane(); } - public AbstractTableDataContentPane getTableDataSourcePane(Plot plot, ChartDataPane parent){ + public AbstractTableDataContentPane getTableDataSourcePane(Plot plot, ChartDataPane parent) { return new MeterPlotTableDataContentPane(parent); } - public AbstractReportDataContentPane getReportDataSourcePane(Plot plot, ChartDataPane parent){ + public AbstractReportDataContentPane getReportDataSourcePane(Plot plot, ChartDataPane parent) { return new MeterPlotReportDataContentPane(parent); } - public BasicBeanPane getPlotSeriesPane(ChartStylePane parent, Plot plot){ + public BasicBeanPane getPlotSeriesPane(ChartStylePane parent, Plot plot) { return new MeterSeriesPane(parent, plot); } /** - *图标路径 + * 图标路径 + * * @return 图标路径 */ - public String getIconPath(){ + public String getIconPath() { return "com/fr/design/images/form/toolbar/ChartF-Meter.png"; } + @Override + public String getName() { + return InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Meter"); + } + + @Override + public String[] getSubName() { + return new String[]{ + InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Meter"), + InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Meter"), + InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Meter") + }; + } + + @Override + public String[] getDemoImagePath() { + return new String[]{ + "com/fr/plugin/chart/demo/image/meter.png", + "com/fr/plugin/chart/demo/image/meterblue.png", + "com/fr/plugin/chart/demo/image/metersimple.png" + }; + } } \ No newline at end of file diff --git a/designer-chart/src/main/java/com/fr/design/chartinterface/PieIndependentChartInterface.java b/designer-chart/src/main/java/com/fr/design/chartinterface/PieIndependentChartInterface.java index 0583186ebf..d03cefeff5 100644 --- a/designer-chart/src/main/java/com/fr/design/chartinterface/PieIndependentChartInterface.java +++ b/designer-chart/src/main/java/com/fr/design/chartinterface/PieIndependentChartInterface.java @@ -16,6 +16,7 @@ import com.fr.design.mainframe.chart.gui.style.series.Pie2DSeriesPane; import com.fr.design.mainframe.chart.gui.style.series.Pie3DSeriesPane; import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane; import com.fr.design.mainframe.chart.gui.type.PiePlotPane; +import com.fr.locale.InterProviderFactory; /** * Created by eason on 15/4/21. @@ -23,32 +24,54 @@ import com.fr.design.mainframe.chart.gui.type.PiePlotPane; public class PieIndependentChartInterface extends AbstractIndependentChartUIWithAPILevel { - public AbstractChartTypePane getPlotTypePane(){ + public AbstractChartTypePane getPlotTypePane() { return new PiePlotPane(); } - public AbstractTableDataContentPane getTableDataSourcePane(Plot plot, ChartDataPane parent){ + public AbstractTableDataContentPane getTableDataSourcePane(Plot plot, ChartDataPane parent) { return new PiePlotTableDataContentPane(parent); } - public AbstractReportDataContentPane getReportDataSourcePane(Plot plot, ChartDataPane parent){ + public AbstractReportDataContentPane getReportDataSourcePane(Plot plot, ChartDataPane parent) { return new PiePlotReportDataContentPane(parent); } - public BasicBeanPane getPlotSeriesPane(ChartStylePane parent, Plot plot){ + public BasicBeanPane getPlotSeriesPane(ChartStylePane parent, Plot plot) { return plot.isSupport3D() ? new Pie3DSeriesPane(parent, plot) : new Pie2DSeriesPane(parent, plot); } - public ConditionAttributesPane getPlotConditionPane(Plot plot){ + public ConditionAttributesPane getPlotConditionPane(Plot plot) { return plot.isSupport3D() ? new Pie3DPlotDataSeriesConditionPane() : new PiePlotDataSeriesConditionPane(); } /** - *图标路径 + * 图标路径 + * * @return 图标路径 */ - public String getIconPath(){ + public String getIconPath() { return "com/fr/design/images/form/toolbar/ChartF-Pie.png"; } + @Override + public String getName() { + return InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Pie"); + } + + @Override + public String[] getSubName() { + return new String[]{ + InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Pie"), + InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_3D") + InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Pie") + }; + } + + @Override + public String[] getDemoImagePath() { + return new String[]{ + "com/fr/plugin/chart/demo/image/pie.png", + "com/fr/plugin/chart/demo/image/pie3D.png", + }; + } + } \ No newline at end of file diff --git a/designer-chart/src/main/java/com/fr/design/chartinterface/RadarIndependentChartInterface.java b/designer-chart/src/main/java/com/fr/design/chartinterface/RadarIndependentChartInterface.java index 04ca36dcbc..5abd70b2f7 100644 --- a/designer-chart/src/main/java/com/fr/design/chartinterface/RadarIndependentChartInterface.java +++ b/designer-chart/src/main/java/com/fr/design/chartinterface/RadarIndependentChartInterface.java @@ -14,6 +14,7 @@ import com.fr.design.mainframe.chart.gui.data.table.CategoryPlotTableDataContent import com.fr.design.mainframe.chart.gui.style.series.RadarSeriesPane; import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane; import com.fr.design.mainframe.chart.gui.type.RadarPlotPane; +import com.fr.locale.InterProviderFactory; /** * Created by eason on 15/4/21. @@ -50,4 +51,22 @@ public class RadarIndependentChartInterface extends AbstractIndependentChartUIWi return "com/fr/design/images/form/toolbar/ChartF-Radar.png"; } + @Override + public String getName() { + return InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Radar"); + } + + @Override + public String[] getSubName() { + return new String[]{ + InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Radar") + }; + } + + @Override + public String[] getDemoImagePath() { + return new String[]{ + "com/fr/plugin/chart/demo/image/radar.png" + }; + } } \ No newline at end of file diff --git a/designer-chart/src/main/java/com/fr/design/chartinterface/RangeIndependentChartInterface.java b/designer-chart/src/main/java/com/fr/design/chartinterface/RangeIndependentChartInterface.java index 85866c339e..6b584271d0 100644 --- a/designer-chart/src/main/java/com/fr/design/chartinterface/RangeIndependentChartInterface.java +++ b/designer-chart/src/main/java/com/fr/design/chartinterface/RangeIndependentChartInterface.java @@ -12,6 +12,7 @@ import com.fr.design.mainframe.chart.gui.data.table.CategoryPlotTableDataContent import com.fr.design.mainframe.chart.gui.style.series.RangeSeriesPane; import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane; import com.fr.design.mainframe.chart.gui.type.RangePlotPane; +import com.fr.locale.InterProviderFactory; /** * Created by eason on 15/4/21. @@ -43,4 +44,22 @@ public class RangeIndependentChartInterface extends AbstractIndependentChartUIWi return "com/fr/design/images/form/toolbar/ChartF-Range_Chart.png"; } + @Override + public String getName() { + return InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Range"); + } + + @Override + public String[] getSubName() { + return new String[]{ + InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Range") + }; + } + + @Override + public String[] getDemoImagePath() { + return new String[]{ + "com/fr/plugin/chart/demo/image/range.png" + }; + } } \ No newline at end of file diff --git a/designer-chart/src/main/java/com/fr/design/chartinterface/StockIndependentChartInterface.java b/designer-chart/src/main/java/com/fr/design/chartinterface/StockIndependentChartInterface.java index 7d73d8594f..eaebb0084c 100644 --- a/designer-chart/src/main/java/com/fr/design/chartinterface/StockIndependentChartInterface.java +++ b/designer-chart/src/main/java/com/fr/design/chartinterface/StockIndependentChartInterface.java @@ -15,6 +15,7 @@ import com.fr.design.mainframe.chart.gui.data.table.StockPlotTableDataContentPan import com.fr.design.mainframe.chart.gui.style.series.StockSeriesPane; import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane; import com.fr.design.mainframe.chart.gui.type.StockPlotPane; +import com.fr.locale.InterProviderFactory; /** * Created by eason on 15/4/21. @@ -50,4 +51,22 @@ public class StockIndependentChartInterface extends AbstractIndependentChartUIWi return "com/fr/design/images/form/toolbar/ChartF-Stock.png"; } + @Override + public String getName() { + return InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Stock"); + } + + @Override + public String[] getSubName() { + return new String[]{ + InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Stock") + }; + } + + @Override + public String[] getDemoImagePath() { + return new String[]{ + "com/fr/plugin/chart/demo/image/stock.png" + }; + } } \ No newline at end of file diff --git a/designer-chart/src/main/java/com/fr/design/chartinterface/XYScatterIndependentChartInterface.java b/designer-chart/src/main/java/com/fr/design/chartinterface/XYScatterIndependentChartInterface.java index 64de95eae1..d268998c6f 100644 --- a/designer-chart/src/main/java/com/fr/design/chartinterface/XYScatterIndependentChartInterface.java +++ b/designer-chart/src/main/java/com/fr/design/chartinterface/XYScatterIndependentChartInterface.java @@ -15,6 +15,7 @@ import com.fr.design.mainframe.chart.gui.data.table.XYScatterPlotTableDataConten import com.fr.design.mainframe.chart.gui.style.series.XYScatterSeriesPane; import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane; import com.fr.design.mainframe.chart.gui.type.XYScatterPlotPane; +import com.fr.locale.InterProviderFactory; /** * Created by eason on 15/4/21. @@ -22,33 +23,52 @@ import com.fr.design.mainframe.chart.gui.type.XYScatterPlotPane; public class XYScatterIndependentChartInterface extends AbstractIndependentChartUIWithAPILevel { - public AbstractChartTypePane getPlotTypePane(){ + public AbstractChartTypePane getPlotTypePane() { return new XYScatterPlotPane(); } - public AbstractTableDataContentPane getTableDataSourcePane(Plot plot, ChartDataPane parent){ + public AbstractTableDataContentPane getTableDataSourcePane(Plot plot, ChartDataPane parent) { return new XYScatterPlotTableDataContentPane(parent); } - public AbstractReportDataContentPane getReportDataSourcePane(Plot plot, ChartDataPane parent){ + public AbstractReportDataContentPane getReportDataSourcePane(Plot plot, ChartDataPane parent) { return new XYScatterPlotReportDataContentPane(parent); } - public BasicBeanPane getPlotSeriesPane(ChartStylePane parent, Plot plot){ + public BasicBeanPane getPlotSeriesPane(ChartStylePane parent, Plot plot) { return new XYScatterSeriesPane(parent, plot); } - public ConditionAttributesPane getPlotConditionPane(Plot plot){ + public ConditionAttributesPane getPlotConditionPane(Plot plot) { return plot.isSupportTrendLine() ? new XYScatterPlotDataSeriesConditionPane() : new DataSeriesConditionPane(); } /** - *图标路径 + * 图标路径 + * * @return 图标路径 */ - public String getIconPath(){ + public String getIconPath() { return "com/fr/design/images/form/toolbar/ChartF-XYScatter.png"; } + @Override + public String getName() { + return InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_XYScatter"); + } + + @Override + public String[] getSubName() { + return new String[]{ + InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_XYScatter") + }; + } + + @Override + public String[] getDemoImagePath() { + return new String[]{ + "com/fr/plugin/chart/demo/image/point.png" + }; + } } \ No newline at end of file From 33301a27c7c0f56c883b85c17cc8d47bedf2d1d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=99=BD=E5=B2=B3?= <445798420@qq.com> Date: Mon, 23 Sep 2019 15:20:52 +0800 Subject: [PATCH 2/4] =?UTF-8?q?CHART-10603=20=E5=9B=BD=E9=99=85=E5=8C=96?= =?UTF-8?q?=E6=96=B9=E6=B3=95=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AreaIndependentChartInterface.java | 14 +++++++------- .../BarIndependentChartInterface.java | 18 +++++++++--------- .../BubbleIndependentChartInterface.java | 6 +++--- .../ColumnIndependentChartInterface.java | 18 +++++++++--------- .../CustomIndependentChartInterface.java | 6 +++--- .../DonutIndependentChartInterface.java | 8 ++++---- .../FunnelIndependentChartInterface.java | 6 +++--- .../GanttIndependentChartInterface.java | 6 +++--- .../GisMapIndependentChartInterface.java | 8 ++++---- .../LineIndependentChartInterface.java | 6 +++--- .../MapIndependentChartInterface.java | 6 +++--- .../MeterIndependentChartInterface.java | 10 +++++----- .../PieIndependentChartInterface.java | 8 ++++---- .../RadarIndependentChartInterface.java | 6 +++--- .../RangeIndependentChartInterface.java | 6 +++--- .../StockIndependentChartInterface.java | 6 +++--- .../XYScatterIndependentChartInterface.java | 6 +++--- .../mainframe/chart/gui/type/AreaPlotPane.java | 13 ++++++------- .../mainframe/chart/gui/type/BarPlotPane.java | 5 ++--- .../chart/gui/type/BubblePlotPane.java | 10 +++++----- .../chart/gui/type/ColumnPlotPane.java | 5 ++--- .../chart/gui/type/CustomPlotPane.java | 6 +++--- .../chart/gui/type/DonutPlotPane.java | 7 +++---- .../chart/gui/type/FunnelPlotPane.java | 6 +++--- .../chart/gui/type/GanttPlotPane.java | 6 +++--- .../chart/gui/type/GisMapPlotPane.java | 6 +++--- .../mainframe/chart/gui/type/LinePlotPane.java | 6 +++--- .../mainframe/chart/gui/type/MapPlotPane.java | 4 ++-- .../chart/gui/type/MeterPlotPane.java | 5 ++--- .../mainframe/chart/gui/type/PiePlotPane.java | 8 ++++---- .../chart/gui/type/RadarPlotPane.java | 8 ++++---- .../chart/gui/type/RangePlotPane.java | 8 ++++---- .../chart/gui/type/StockPlotPane.java | 6 +++--- .../chart/gui/type/XYScatterPlotPane.java | 12 ++++++------ 34 files changed, 130 insertions(+), 135 deletions(-) diff --git a/designer-chart/src/main/java/com/fr/design/chartinterface/AreaIndependentChartInterface.java b/designer-chart/src/main/java/com/fr/design/chartinterface/AreaIndependentChartInterface.java index 61c36eaace..52c111c188 100644 --- a/designer-chart/src/main/java/com/fr/design/chartinterface/AreaIndependentChartInterface.java +++ b/designer-chart/src/main/java/com/fr/design/chartinterface/AreaIndependentChartInterface.java @@ -6,6 +6,7 @@ import com.fr.design.chart.fun.impl.AbstractIndependentChartUIWithAPILevel; import com.fr.design.chart.series.SeriesCondition.impl.Area3DPlotDataSeriesConditionPane; import com.fr.design.chart.series.SeriesCondition.impl.AreaPlotDataSeriesCondtionPane; import com.fr.design.condition.ConditionAttributesPane; +import com.fr.design.i18n.Toolkit; import com.fr.design.mainframe.chart.gui.ChartDataPane; import com.fr.design.mainframe.chart.gui.ChartStylePane; import com.fr.design.mainframe.chart.gui.data.report.AbstractReportDataContentPane; @@ -16,7 +17,6 @@ import com.fr.design.mainframe.chart.gui.style.series.Area3DSeriesPane; import com.fr.design.mainframe.chart.gui.style.series.AreaSeriesPane; import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane; import com.fr.design.mainframe.chart.gui.type.AreaPlotPane; -import com.fr.locale.InterProviderFactory; /** * Created by eason on 15/4/21. @@ -54,16 +54,16 @@ public class AreaIndependentChartInterface extends AbstractIndependentChartUIWit @Override public String getName() { - return InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Area"); + return Toolkit.i18nText("Fine-Design_Chart_Type_Area"); } @Override public String[] getSubName() { - String chartName = InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Area"); - String stackChartName = InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Stacked") + chartName; - String perStackChartName = InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Use_Percent") + stackChartName; - String stackChartName3D = InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_3D") + stackChartName; - String perStackChartName3D = InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_3D") + perStackChartName; + String chartName = Toolkit.i18nText("Fine-Design_Chart_Type_Area"); + String stackChartName = Toolkit.i18nText("Fine-Design_Chart_Type_Stacked") + chartName; + String perStackChartName = Toolkit.i18nText("Fine-Design_Chart_Use_Percent") + stackChartName; + String stackChartName3D = Toolkit.i18nText("Fine-Design_Chart_3D") + stackChartName; + String perStackChartName3D = Toolkit.i18nText("Fine-Design_Chart_3D") + perStackChartName; return new String[]{ stackChartName, diff --git a/designer-chart/src/main/java/com/fr/design/chartinterface/BarIndependentChartInterface.java b/designer-chart/src/main/java/com/fr/design/chartinterface/BarIndependentChartInterface.java index 16ab82a217..7c7eda32e8 100644 --- a/designer-chart/src/main/java/com/fr/design/chartinterface/BarIndependentChartInterface.java +++ b/designer-chart/src/main/java/com/fr/design/chartinterface/BarIndependentChartInterface.java @@ -7,6 +7,7 @@ import com.fr.design.chart.series.SeriesCondition.impl.Bar2DTrendLineDSCondition import com.fr.design.chart.series.SeriesCondition.impl.Bar3DPlotDataSeriesConditionPane; import com.fr.design.chart.series.SeriesCondition.impl.BarPlotDataSeriesConditionPane; import com.fr.design.condition.ConditionAttributesPane; +import com.fr.design.i18n.Toolkit; import com.fr.design.mainframe.chart.gui.ChartDataPane; import com.fr.design.mainframe.chart.gui.ChartStylePane; import com.fr.design.mainframe.chart.gui.data.report.AbstractReportDataContentPane; @@ -17,7 +18,6 @@ import com.fr.design.mainframe.chart.gui.style.series.Bar2DSeriesPane; import com.fr.design.mainframe.chart.gui.style.series.Bar3DSeriesPane; import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane; import com.fr.design.mainframe.chart.gui.type.BarPlotPane; -import com.fr.locale.InterProviderFactory; /** * Created by eason on 15/4/21. @@ -56,18 +56,18 @@ public class BarIndependentChartInterface extends AbstractIndependentChartUIWith @Override public String getName() { - return InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Bar"); + return Toolkit.i18nText("Fine-Design_Chart_Type_Bar"); } @Override public String[] getSubName() { - String chartName = InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Bar"); - String stackChartName = InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Stacked") + chartName; - String perStackChartName = InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Use_Percent") + stackChartName; - String chartName3D = InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_3D") + chartName; - String chartNameHoriz3D = chartName3D + "(" + InterProviderFactory.getProvider().getLocText("Fine-Engine_Report_Utils_Left_To_Right") + ")"; - String stackChartName3D = InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_3D") + stackChartName; - String perStackChartName3D = InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_3D") + perStackChartName; + String chartName = Toolkit.i18nText("Fine-Design_Chart_Type_Bar"); + String stackChartName = Toolkit.i18nText("Fine-Design_Chart_Type_Stacked") + chartName; + String perStackChartName = Toolkit.i18nText("Fine-Design_Chart_Use_Percent") + stackChartName; + String chartName3D = Toolkit.i18nText("Fine-Design_Chart_3D") + chartName; + String chartNameHoriz3D = chartName3D + "(" + Toolkit.i18nText("Fine-Design_Report_Utils_Left_To_Right") + ")"; + String stackChartName3D = Toolkit.i18nText("Fine-Design_Chart_3D") + stackChartName; + String perStackChartName3D = Toolkit.i18nText("Fine-Design_Chart_3D") + perStackChartName; //依次，条形图-旧版本、堆积条形图-旧版本、百分比堆积条形图-旧版本、三维条形图-旧版本、三维条形图-旧版本(横向)、三维堆积条形图-旧版本、三维百分比堆积条形图-旧版本 return new String[]{ diff --git a/designer-chart/src/main/java/com/fr/design/chartinterface/BubbleIndependentChartInterface.java b/designer-chart/src/main/java/com/fr/design/chartinterface/BubbleIndependentChartInterface.java index 4b47ba5e2f..8409a31c7d 100644 --- a/designer-chart/src/main/java/com/fr/design/chartinterface/BubbleIndependentChartInterface.java +++ b/designer-chart/src/main/java/com/fr/design/chartinterface/BubbleIndependentChartInterface.java @@ -5,6 +5,7 @@ import com.fr.design.beans.BasicBeanPane; import com.fr.design.chart.fun.impl.AbstractIndependentChartUIWithAPILevel; import com.fr.design.chart.series.SeriesCondition.impl.BubblePlotDataSeriesConditionPane; import com.fr.design.condition.ConditionAttributesPane; +import com.fr.design.i18n.Toolkit; import com.fr.design.mainframe.chart.gui.ChartDataPane; import com.fr.design.mainframe.chart.gui.ChartStylePane; import com.fr.design.mainframe.chart.gui.data.report.AbstractReportDataContentPane; @@ -14,7 +15,6 @@ import com.fr.design.mainframe.chart.gui.data.table.BubblePlotTableDataContentPa import com.fr.design.mainframe.chart.gui.style.series.BubbleSeriesPane; import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane; import com.fr.design.mainframe.chart.gui.type.BubblePlotPane; -import com.fr.locale.InterProviderFactory; /** * Created by eason on 15/4/21. @@ -51,13 +51,13 @@ public class BubbleIndependentChartInterface extends AbstractIndependentChartUIW @Override public String getName() { - return InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Bubble_Chart"); + return Toolkit.i18nText("Fine-Design_Chart_Bubble_Chart_OLD"); } @Override public String[] getSubName() { return new String[]{ - InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Bubble_Chart") + Toolkit.i18nText("Fine-Design_Chart_Bubble_Chart_OLD") }; } diff --git a/designer-chart/src/main/java/com/fr/design/chartinterface/ColumnIndependentChartInterface.java b/designer-chart/src/main/java/com/fr/design/chartinterface/ColumnIndependentChartInterface.java index bb9c3ddb32..4c87320a30 100644 --- a/designer-chart/src/main/java/com/fr/design/chartinterface/ColumnIndependentChartInterface.java +++ b/designer-chart/src/main/java/com/fr/design/chartinterface/ColumnIndependentChartInterface.java @@ -7,6 +7,7 @@ import com.fr.design.chart.series.SeriesCondition.impl.Bar2DTrendLineDSCondition import com.fr.design.chart.series.SeriesCondition.impl.Bar3DPlotDataSeriesConditionPane; import com.fr.design.chart.series.SeriesCondition.impl.BarPlotDataSeriesConditionPane; import com.fr.design.condition.ConditionAttributesPane; +import com.fr.design.i18n.Toolkit; import com.fr.design.mainframe.chart.gui.ChartDataPane; import com.fr.design.mainframe.chart.gui.ChartStylePane; import com.fr.design.mainframe.chart.gui.data.report.AbstractReportDataContentPane; @@ -17,7 +18,6 @@ import com.fr.design.mainframe.chart.gui.style.series.Bar2DSeriesPane; import com.fr.design.mainframe.chart.gui.style.series.Bar3DSeriesPane; import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane; import com.fr.design.mainframe.chart.gui.type.ColumnPlotPane; -import com.fr.locale.InterProviderFactory; /** * Created by eason on 15/4/21. @@ -57,18 +57,18 @@ public class ColumnIndependentChartInterface extends AbstractIndependentChartUIW @Override public String getName() { - return InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Column"); + return Toolkit.i18nText("Fine-Design_Chart_Type_Column"); } @Override public String[] getSubName() { - String chartName = InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Column"); - String stackChartName = InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Stacked") + chartName; - String perStackChartName = InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Use_Percent") + stackChartName; - String chartName3D = InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_3D")+ chartName; - String chartNameHoriz3D = chartName3D + "(" + InterProviderFactory.getProvider().getLocText("Fine-Engine_Report_Utils_Left_To_Right") + ")"; - String stackChartName3D = InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_3D") + stackChartName; - String perStackChartName3D = InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_3D") + perStackChartName; + String chartName = Toolkit.i18nText("Fine-Design_Chart_Type_Column"); + String stackChartName = Toolkit.i18nText("Fine-Design_Chart_Type_Stacked") + chartName; + String perStackChartName = Toolkit.i18nText("Fine-Design_Chart_Use_Percent") + stackChartName; + String chartName3D = Toolkit.i18nText("Fine-Design_Chart_3D")+ chartName; + String chartNameHoriz3D = chartName3D + "(" + Toolkit.i18nText("Fine-Design_Report_Utils_Left_To_Right") + ")"; + String stackChartName3D = Toolkit.i18nText("Fine-Design_Chart_3D") + stackChartName; + String perStackChartName3D = Toolkit.i18nText("Fine-Design_Chart_3D") + perStackChartName; //依次，柱形图-旧版本、堆积柱形图-旧版本、百分比堆积柱形图-旧版本、三维柱形图-旧版本、三维柱形图-旧版本(横向)、三维堆积柱形图-旧版本、三维百分比堆积柱形图-旧版本 return new String[]{ diff --git a/designer-chart/src/main/java/com/fr/design/chartinterface/CustomIndependentChartInterface.java b/designer-chart/src/main/java/com/fr/design/chartinterface/CustomIndependentChartInterface.java index 7e3520446b..b8a0db59f2 100644 --- a/designer-chart/src/main/java/com/fr/design/chartinterface/CustomIndependentChartInterface.java +++ b/designer-chart/src/main/java/com/fr/design/chartinterface/CustomIndependentChartInterface.java @@ -5,6 +5,7 @@ import com.fr.design.beans.BasicBeanPane; import com.fr.design.chart.fun.impl.AbstractIndependentChartUIWithAPILevel; import com.fr.design.chart.series.SeriesCondition.DataSeriesCustomConditionPane; import com.fr.design.condition.ConditionAttributesPane; +import com.fr.design.i18n.Toolkit; import com.fr.design.mainframe.chart.gui.ChartDataPane; import com.fr.design.mainframe.chart.gui.ChartStylePane; import com.fr.design.mainframe.chart.gui.data.report.AbstractReportDataContentPane; @@ -14,7 +15,6 @@ import com.fr.design.mainframe.chart.gui.data.table.CategoryPlotTableDataContent import com.fr.design.mainframe.chart.gui.style.series.CustomSeriesPane; import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane; import com.fr.design.mainframe.chart.gui.type.CustomPlotPane; -import com.fr.locale.InterProviderFactory; /** * Created by eason on 15/4/21. @@ -53,13 +53,13 @@ public class CustomIndependentChartInterface extends AbstractIndependentChartUIW @Override public String getName() { - return InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Combine"); + return Toolkit.i18nText("Fine-Design_Chart_Type_Combine"); } @Override public String[] getSubName() { return new String[]{ - InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Combine") + Toolkit.i18nText("Fine-Design_Chart_Type_Combine") }; } diff --git a/designer-chart/src/main/java/com/fr/design/chartinterface/DonutIndependentChartInterface.java b/designer-chart/src/main/java/com/fr/design/chartinterface/DonutIndependentChartInterface.java index d8df6a59be..5dd5f970ad 100644 --- a/designer-chart/src/main/java/com/fr/design/chartinterface/DonutIndependentChartInterface.java +++ b/designer-chart/src/main/java/com/fr/design/chartinterface/DonutIndependentChartInterface.java @@ -6,6 +6,7 @@ import com.fr.design.chart.fun.impl.AbstractIndependentChartUIWithAPILevel; import com.fr.design.chart.series.SeriesCondition.DataSeriesConditionPane; import com.fr.design.chart.series.SeriesCondition.impl.Donut2DPlotDataSeriesConditionPane; import com.fr.design.condition.ConditionAttributesPane; +import com.fr.design.i18n.Toolkit; import com.fr.design.mainframe.chart.gui.ChartDataPane; import com.fr.design.mainframe.chart.gui.ChartStylePane; import com.fr.design.mainframe.chart.gui.data.report.AbstractReportDataContentPane; @@ -16,7 +17,6 @@ import com.fr.design.mainframe.chart.gui.style.series.Donut2DSeriesPane; import com.fr.design.mainframe.chart.gui.style.series.Donut3DSeriesPane; import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane; import com.fr.design.mainframe.chart.gui.type.DonutPlotPane; -import com.fr.locale.InterProviderFactory; /** * Created by eason on 15/4/21. @@ -55,14 +55,14 @@ public class DonutIndependentChartInterface extends AbstractIndependentChartUIWi @Override public String getName() { - return InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Donut"); + return Toolkit.i18nText("Fine-Design_Chart_Type_Donut"); } @Override public String[] getSubName() { return new String[]{ - InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Donut"), - InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_3D") + InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Donut") + Toolkit.i18nText("Fine-Design_Chart_Type_Donut"), + Toolkit.i18nText("Fine-Design_Chart_3D") + Toolkit.i18nText("Fine-Design_Chart_Type_Donut") }; } diff --git a/designer-chart/src/main/java/com/fr/design/chartinterface/FunnelIndependentChartInterface.java b/designer-chart/src/main/java/com/fr/design/chartinterface/FunnelIndependentChartInterface.java index 267048706c..c0ad1d1b66 100644 --- a/designer-chart/src/main/java/com/fr/design/chartinterface/FunnelIndependentChartInterface.java +++ b/designer-chart/src/main/java/com/fr/design/chartinterface/FunnelIndependentChartInterface.java @@ -5,6 +5,7 @@ import com.fr.design.beans.BasicBeanPane; import com.fr.design.chart.fun.impl.AbstractIndependentChartUIWithAPILevel; import com.fr.design.chart.series.SeriesCondition.impl.FunnelPlotDataSeriesConditionPane; import com.fr.design.condition.ConditionAttributesPane; +import com.fr.design.i18n.Toolkit; import com.fr.design.mainframe.chart.gui.ChartDataPane; import com.fr.design.mainframe.chart.gui.ChartStylePane; import com.fr.design.mainframe.chart.gui.data.report.AbstractReportDataContentPane; @@ -14,7 +15,6 @@ import com.fr.design.mainframe.chart.gui.data.table.PiePlotTableDataContentPane; import com.fr.design.mainframe.chart.gui.style.series.FunnelSeriesPane; import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane; import com.fr.design.mainframe.chart.gui.type.FunnelPlotPane; -import com.fr.locale.InterProviderFactory; /** * Created by eason on 15/4/21. @@ -52,13 +52,13 @@ public class FunnelIndependentChartInterface extends AbstractIndependentChartUIW @Override public String getName() { - return InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Funnel"); + return Toolkit.i18nText("Fine-Design_Chart_Type_Funnel"); } @Override public String[] getSubName() { return new String[]{ - InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Funnel") + Toolkit.i18nText("Fine-Design_Chart_Type_Funnel") }; } diff --git a/designer-chart/src/main/java/com/fr/design/chartinterface/GanttIndependentChartInterface.java b/designer-chart/src/main/java/com/fr/design/chartinterface/GanttIndependentChartInterface.java index 33a0d8de2d..50d81e9b94 100644 --- a/designer-chart/src/main/java/com/fr/design/chartinterface/GanttIndependentChartInterface.java +++ b/designer-chart/src/main/java/com/fr/design/chartinterface/GanttIndependentChartInterface.java @@ -4,6 +4,7 @@ import com.fr.chart.chartattr.Plot; import com.fr.design.chart.fun.impl.AbstractIndependentChartUIWithAPILevel; import com.fr.design.chart.series.SeriesCondition.impl.GanttPlotDataSeriesConditionPane; import com.fr.design.condition.ConditionAttributesPane; +import com.fr.design.i18n.Toolkit; import com.fr.design.mainframe.chart.gui.ChartDataPane; import com.fr.design.mainframe.chart.gui.data.report.AbstractReportDataContentPane; import com.fr.design.mainframe.chart.gui.data.report.GanttPlotReportDataContentPane; @@ -11,7 +12,6 @@ import com.fr.design.mainframe.chart.gui.data.table.AbstractTableDataContentPane import com.fr.design.mainframe.chart.gui.data.table.GanttPlotTableDataContentPane; import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane; import com.fr.design.mainframe.chart.gui.type.GanttPlotPane; -import com.fr.locale.InterProviderFactory; /** * Created by eason on 15/4/21. @@ -45,13 +45,13 @@ public class GanttIndependentChartInterface extends AbstractIndependentChartUIWi @Override public String getName() { - return InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Gantt"); + return Toolkit.i18nText("Fine-Design_Chart_Type_Gantt"); } @Override public String[] getSubName() { return new String[]{ - InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Gantt") + Toolkit.i18nText("Fine-Design_Chart_Type_Gantt") }; } diff --git a/designer-chart/src/main/java/com/fr/design/chartinterface/GisMapIndependentChartInterface.java b/designer-chart/src/main/java/com/fr/design/chartinterface/GisMapIndependentChartInterface.java index 9fc6767405..9191c0ed17 100644 --- a/designer-chart/src/main/java/com/fr/design/chartinterface/GisMapIndependentChartInterface.java +++ b/designer-chart/src/main/java/com/fr/design/chartinterface/GisMapIndependentChartInterface.java @@ -2,12 +2,12 @@ package com.fr.design.chartinterface; import com.fr.chart.chartattr.Plot; import com.fr.design.chart.fun.impl.AbstractIndependentChartUIWithAPILevel; +import com.fr.design.i18n.Toolkit; import com.fr.design.mainframe.chart.gui.ChartDataPane; import com.fr.design.mainframe.chart.gui.data.report.AbstractReportDataContentPane; import com.fr.design.mainframe.chart.gui.data.table.AbstractTableDataContentPane; import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane; import com.fr.design.mainframe.chart.gui.type.GisMapPlotPane; -import com.fr.locale.InterProviderFactory; /** * Created by eason on 15/4/21. @@ -38,14 +38,14 @@ public class GisMapIndependentChartInterface extends AbstractIndependentChartUIW @Override public String getName() { - return InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_GIS_Map"); + return Toolkit.i18nText("Fine-Design_Chart_GIS_Map_OLD"); } @Override public String[] getSubName() { return new String[]{ - InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Map_BaiduMap"), - InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Map_GoogleMap") + Toolkit.i18nText("Fine-Design_Chart_Map_BaiduMap"), + Toolkit.i18nText("Fine-Design_Chart_Map_GoogleMap") }; } diff --git a/designer-chart/src/main/java/com/fr/design/chartinterface/LineIndependentChartInterface.java b/designer-chart/src/main/java/com/fr/design/chartinterface/LineIndependentChartInterface.java index 2e9dbbceb4..dedc716673 100644 --- a/designer-chart/src/main/java/com/fr/design/chartinterface/LineIndependentChartInterface.java +++ b/designer-chart/src/main/java/com/fr/design/chartinterface/LineIndependentChartInterface.java @@ -6,6 +6,7 @@ import com.fr.design.chart.fun.impl.AbstractIndependentChartUIWithAPILevel; import com.fr.design.chart.series.SeriesCondition.DataSeriesConditionPane; import com.fr.design.chart.series.SeriesCondition.impl.LinePlotDataSeriesConditionPane; import com.fr.design.condition.ConditionAttributesPane; +import com.fr.design.i18n.Toolkit; import com.fr.design.mainframe.chart.gui.ChartDataPane; import com.fr.design.mainframe.chart.gui.ChartStylePane; import com.fr.design.mainframe.chart.gui.data.report.AbstractReportDataContentPane; @@ -15,7 +16,6 @@ import com.fr.design.mainframe.chart.gui.data.table.CategoryPlotMoreCateTableDat import com.fr.design.mainframe.chart.gui.style.series.LineSeriesPane; import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane; import com.fr.design.mainframe.chart.gui.type.LinePlotPane; -import com.fr.locale.InterProviderFactory; /** * Created by eason on 15/4/21. @@ -54,13 +54,13 @@ public class LineIndependentChartInterface extends AbstractIndependentChartUIWit @Override public String getName() { - return InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Line"); + return Toolkit.i18nText("Fine-Design_Chart_Type_Line"); } @Override public String[] getSubName() { return new String[]{ - InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Line") + Toolkit.i18nText("Fine-Design_Chart_Type_Line") }; } diff --git a/designer-chart/src/main/java/com/fr/design/chartinterface/MapIndependentChartInterface.java b/designer-chart/src/main/java/com/fr/design/chartinterface/MapIndependentChartInterface.java index 3189041df4..7f10760b16 100644 --- a/designer-chart/src/main/java/com/fr/design/chartinterface/MapIndependentChartInterface.java +++ b/designer-chart/src/main/java/com/fr/design/chartinterface/MapIndependentChartInterface.java @@ -5,6 +5,7 @@ import com.fr.design.beans.BasicBeanPane; import com.fr.design.chart.fun.impl.AbstractIndependentChartUIWithAPILevel; import com.fr.design.chart.series.SeriesCondition.impl.MapPlotDataSeriesConditionPane; import com.fr.design.condition.ConditionAttributesPane; +import com.fr.design.i18n.Toolkit; import com.fr.design.mainframe.chart.gui.ChartDataPane; import com.fr.design.mainframe.chart.gui.ChartStylePane; import com.fr.design.mainframe.chart.gui.data.report.AbstractReportDataContentPane; @@ -12,7 +13,6 @@ import com.fr.design.mainframe.chart.gui.data.table.AbstractTableDataContentPane import com.fr.design.mainframe.chart.gui.style.series.MapSeriesPane; import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane; import com.fr.design.mainframe.chart.gui.type.MapPlotPane; -import com.fr.locale.InterProviderFactory; /** * Created by eason on 15/4/21. @@ -50,13 +50,13 @@ public class MapIndependentChartInterface extends AbstractIndependentChartUIWith @Override public String getName() { - return InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_SVG_MAP"); + return Toolkit.i18nText("Fine-Design_Chart_SVG_MAP"); } @Override public String[] getSubName() { return new String[]{ - InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_SVG_MAP") + Toolkit.i18nText("Fine-Design_Chart_SVG_MAP") }; } diff --git a/designer-chart/src/main/java/com/fr/design/chartinterface/MeterIndependentChartInterface.java b/designer-chart/src/main/java/com/fr/design/chartinterface/MeterIndependentChartInterface.java index 2ace3c94ea..81bf22089c 100644 --- a/designer-chart/src/main/java/com/fr/design/chartinterface/MeterIndependentChartInterface.java +++ b/designer-chart/src/main/java/com/fr/design/chartinterface/MeterIndependentChartInterface.java @@ -3,6 +3,7 @@ package com.fr.design.chartinterface; import com.fr.chart.chartattr.Plot; import com.fr.design.beans.BasicBeanPane; import com.fr.design.chart.fun.impl.AbstractIndependentChartUIWithAPILevel; +import com.fr.design.i18n.Toolkit; import com.fr.design.mainframe.chart.gui.ChartDataPane; import com.fr.design.mainframe.chart.gui.ChartStylePane; import com.fr.design.mainframe.chart.gui.data.report.AbstractReportDataContentPane; @@ -12,7 +13,6 @@ import com.fr.design.mainframe.chart.gui.data.table.MeterPlotTableDataContentPan import com.fr.design.mainframe.chart.gui.style.series.MeterSeriesPane; import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane; import com.fr.design.mainframe.chart.gui.type.MeterPlotPane; -import com.fr.locale.InterProviderFactory; /** * Created by eason on 15/4/21. @@ -47,15 +47,15 @@ public class MeterIndependentChartInterface extends AbstractIndependentChartUIWi @Override public String getName() { - return InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Meter"); + return Toolkit.i18nText("Fine-Design_Chart_Type_Meter"); } @Override public String[] getSubName() { return new String[]{ - InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Meter"), - InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Meter"), - InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Meter") + Toolkit.i18nText("Fine-Design_Chart_Type_Meter"), + Toolkit.i18nText("Fine-Design_Chart_Type_Meter"), + Toolkit.i18nText("Fine-Design_Chart_Type_Meter") }; } diff --git a/designer-chart/src/main/java/com/fr/design/chartinterface/PieIndependentChartInterface.java b/designer-chart/src/main/java/com/fr/design/chartinterface/PieIndependentChartInterface.java index d03cefeff5..4a1bd36ae6 100644 --- a/designer-chart/src/main/java/com/fr/design/chartinterface/PieIndependentChartInterface.java +++ b/designer-chart/src/main/java/com/fr/design/chartinterface/PieIndependentChartInterface.java @@ -6,6 +6,7 @@ import com.fr.design.chart.fun.impl.AbstractIndependentChartUIWithAPILevel; import com.fr.design.chart.series.SeriesCondition.impl.Pie3DPlotDataSeriesConditionPane; import com.fr.design.chart.series.SeriesCondition.impl.PiePlotDataSeriesConditionPane; import com.fr.design.condition.ConditionAttributesPane; +import com.fr.design.i18n.Toolkit; import com.fr.design.mainframe.chart.gui.ChartDataPane; import com.fr.design.mainframe.chart.gui.ChartStylePane; import com.fr.design.mainframe.chart.gui.data.report.AbstractReportDataContentPane; @@ -16,7 +17,6 @@ import com.fr.design.mainframe.chart.gui.style.series.Pie2DSeriesPane; import com.fr.design.mainframe.chart.gui.style.series.Pie3DSeriesPane; import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane; import com.fr.design.mainframe.chart.gui.type.PiePlotPane; -import com.fr.locale.InterProviderFactory; /** * Created by eason on 15/4/21. @@ -55,14 +55,14 @@ public class PieIndependentChartInterface extends AbstractIndependentChartUIWith @Override public String getName() { - return InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Pie"); + return Toolkit.i18nText("Fine-Design_Chart_Type_Pie"); } @Override public String[] getSubName() { return new String[]{ - InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Pie"), - InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_3D") + InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Pie") + Toolkit.i18nText("Fine-Design_Chart_Type_Pie"), + Toolkit.i18nText("Fine-Design_Chart_3D") + Toolkit.i18nText("Fine-Design_Chart_Type_Pie") }; } diff --git a/designer-chart/src/main/java/com/fr/design/chartinterface/RadarIndependentChartInterface.java b/designer-chart/src/main/java/com/fr/design/chartinterface/RadarIndependentChartInterface.java index 5abd70b2f7..128c65849b 100644 --- a/designer-chart/src/main/java/com/fr/design/chartinterface/RadarIndependentChartInterface.java +++ b/designer-chart/src/main/java/com/fr/design/chartinterface/RadarIndependentChartInterface.java @@ -5,6 +5,7 @@ import com.fr.design.beans.BasicBeanPane; import com.fr.design.chart.fun.impl.AbstractIndependentChartUIWithAPILevel; import com.fr.design.chart.series.SeriesCondition.impl.RadarPlotDataSeriesConditionPane; import com.fr.design.condition.ConditionAttributesPane; +import com.fr.design.i18n.Toolkit; import com.fr.design.mainframe.chart.gui.ChartDataPane; import com.fr.design.mainframe.chart.gui.ChartStylePane; import com.fr.design.mainframe.chart.gui.data.report.AbstractReportDataContentPane; @@ -14,7 +15,6 @@ import com.fr.design.mainframe.chart.gui.data.table.CategoryPlotTableDataContent import com.fr.design.mainframe.chart.gui.style.series.RadarSeriesPane; import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane; import com.fr.design.mainframe.chart.gui.type.RadarPlotPane; -import com.fr.locale.InterProviderFactory; /** * Created by eason on 15/4/21. @@ -53,13 +53,13 @@ public class RadarIndependentChartInterface extends AbstractIndependentChartUIWi @Override public String getName() { - return InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Radar"); + return Toolkit.i18nText("Fine-Design_Chart_Type_Radar"); } @Override public String[] getSubName() { return new String[]{ - InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Radar") + Toolkit.i18nText("Fine-Design_Chart_Type_Radar") }; } diff --git a/designer-chart/src/main/java/com/fr/design/chartinterface/RangeIndependentChartInterface.java b/designer-chart/src/main/java/com/fr/design/chartinterface/RangeIndependentChartInterface.java index 6b584271d0..475904ad92 100644 --- a/designer-chart/src/main/java/com/fr/design/chartinterface/RangeIndependentChartInterface.java +++ b/designer-chart/src/main/java/com/fr/design/chartinterface/RangeIndependentChartInterface.java @@ -3,6 +3,7 @@ package com.fr.design.chartinterface; import com.fr.chart.chartattr.Plot; import com.fr.design.beans.BasicBeanPane; import com.fr.design.chart.fun.impl.AbstractIndependentChartUIWithAPILevel; +import com.fr.design.i18n.Toolkit; import com.fr.design.mainframe.chart.gui.ChartDataPane; import com.fr.design.mainframe.chart.gui.ChartStylePane; import com.fr.design.mainframe.chart.gui.data.report.AbstractReportDataContentPane; @@ -12,7 +13,6 @@ import com.fr.design.mainframe.chart.gui.data.table.CategoryPlotTableDataContent import com.fr.design.mainframe.chart.gui.style.series.RangeSeriesPane; import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane; import com.fr.design.mainframe.chart.gui.type.RangePlotPane; -import com.fr.locale.InterProviderFactory; /** * Created by eason on 15/4/21. @@ -46,13 +46,13 @@ public class RangeIndependentChartInterface extends AbstractIndependentChartUIWi @Override public String getName() { - return InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Range"); + return Toolkit.i18nText("Fine-Design_Chart_Type_Range"); } @Override public String[] getSubName() { return new String[]{ - InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Range") + Toolkit.i18nText("Fine-Design_Chart_Type_Range") }; } diff --git a/designer-chart/src/main/java/com/fr/design/chartinterface/StockIndependentChartInterface.java b/designer-chart/src/main/java/com/fr/design/chartinterface/StockIndependentChartInterface.java index eaebb0084c..5b3a858fe2 100644 --- a/designer-chart/src/main/java/com/fr/design/chartinterface/StockIndependentChartInterface.java +++ b/designer-chart/src/main/java/com/fr/design/chartinterface/StockIndependentChartInterface.java @@ -6,6 +6,7 @@ import com.fr.design.chart.fun.impl.AbstractIndependentChartUIWithAPILevel; import com.fr.design.chart.series.SeriesCondition.DataSeriesConditionPane; import com.fr.design.chart.series.SeriesCondition.impl.StockPlotDataSeriesConditionPane; import com.fr.design.condition.ConditionAttributesPane; +import com.fr.design.i18n.Toolkit; import com.fr.design.mainframe.chart.gui.ChartDataPane; import com.fr.design.mainframe.chart.gui.ChartStylePane; import com.fr.design.mainframe.chart.gui.data.report.AbstractReportDataContentPane; @@ -15,7 +16,6 @@ import com.fr.design.mainframe.chart.gui.data.table.StockPlotTableDataContentPan import com.fr.design.mainframe.chart.gui.style.series.StockSeriesPane; import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane; import com.fr.design.mainframe.chart.gui.type.StockPlotPane; -import com.fr.locale.InterProviderFactory; /** * Created by eason on 15/4/21. @@ -53,13 +53,13 @@ public class StockIndependentChartInterface extends AbstractIndependentChartUIWi @Override public String getName() { - return InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Stock"); + return Toolkit.i18nText("Fine-Design_Chart_Type_Stock"); } @Override public String[] getSubName() { return new String[]{ - InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Stock") + Toolkit.i18nText("Fine-Design_Chart_Type_Stock") }; } diff --git a/designer-chart/src/main/java/com/fr/design/chartinterface/XYScatterIndependentChartInterface.java b/designer-chart/src/main/java/com/fr/design/chartinterface/XYScatterIndependentChartInterface.java index d268998c6f..13cf662e20 100644 --- a/designer-chart/src/main/java/com/fr/design/chartinterface/XYScatterIndependentChartInterface.java +++ b/designer-chart/src/main/java/com/fr/design/chartinterface/XYScatterIndependentChartInterface.java @@ -6,6 +6,7 @@ import com.fr.design.chart.fun.impl.AbstractIndependentChartUIWithAPILevel; import com.fr.design.chart.series.SeriesCondition.DataSeriesConditionPane; import com.fr.design.chart.series.SeriesCondition.impl.XYScatterPlotDataSeriesConditionPane; import com.fr.design.condition.ConditionAttributesPane; +import com.fr.design.i18n.Toolkit; import com.fr.design.mainframe.chart.gui.ChartDataPane; import com.fr.design.mainframe.chart.gui.ChartStylePane; import com.fr.design.mainframe.chart.gui.data.report.AbstractReportDataContentPane; @@ -15,7 +16,6 @@ import com.fr.design.mainframe.chart.gui.data.table.XYScatterPlotTableDataConten import com.fr.design.mainframe.chart.gui.style.series.XYScatterSeriesPane; import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane; import com.fr.design.mainframe.chart.gui.type.XYScatterPlotPane; -import com.fr.locale.InterProviderFactory; /** * Created by eason on 15/4/21. @@ -55,13 +55,13 @@ public class XYScatterIndependentChartInterface extends AbstractIndependentChart @Override public String getName() { - return InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_XYScatter"); + return Toolkit.i18nText("Fine-Design_Chart_Type_XYScatter"); } @Override public String[] getSubName() { return new String[]{ - InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_XYScatter") + Toolkit.i18nText("Fine-Design_Chart_Type_XYScatter") }; } diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/AreaPlotPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/AreaPlotPane.java index 483a4f09f7..a84c9ab468 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/AreaPlotPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/AreaPlotPane.java @@ -9,7 +9,6 @@ import com.fr.chart.chartattr.Plot; import com.fr.chart.chartglyph.ConditionCollection; import com.fr.chart.charttypes.AreaIndependentChart; import com.fr.design.i18n.Toolkit; -import com.fr.locale.InterProviderFactory; /** @@ -35,7 +34,7 @@ public class AreaPlotPane extends AbstractDeprecatedChartTypePane { @Override protected String[] getTypeTipName() { - String area = InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Area"); + String area = Toolkit.i18nText("Fine-Design_Chart_Type_Area"); String stack = Toolkit.i18nText("Fine-Design_Chart_Stacked"); String percent = Toolkit.i18nText("Fine-Design_Chart_Use_Percent"); String td = Toolkit.i18nText("Fine-Design_Chart_3D"); @@ -79,7 +78,7 @@ public class AreaPlotPane extends AbstractDeprecatedChartTypePane { } else { typeDemo.get(STACK_AREA_CHART).isPressing = true; } - } + } } else if(plot instanceof Area3DPlot) { Area3DPlot threeDPlot = (Area3DPlot)plot; if(threeDPlot.isStacked()) { @@ -90,7 +89,7 @@ public class AreaPlotPane extends AbstractDeprecatedChartTypePane { } } } - + checkDemosBackground(); } @@ -121,13 +120,13 @@ public class AreaPlotPane extends AbstractDeprecatedChartTypePane { } /** - * 保存界面属性 + * 保存界面属性 */ public void updateBean(Chart chart) { chart.switchPlot(getSelectedClonedPlot()); super.updateBean(chart); } - + private void createAreaCondition(Plot plot) { ConditionCollection collection = plot.getConditionCollection(); AttrAlpha alpha = (AttrAlpha) collection.getDefaultAttr().getExisted(AttrAlpha.class); @@ -143,7 +142,7 @@ public class AreaPlotPane extends AbstractDeprecatedChartTypePane { * @return 界面标题 */ public String title4PopupWindow() { - return InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Area"); + return Toolkit.i18nText("Fine-Design_Chart_Type_Area"); } public Chart getDefaultChart() { diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/BarPlotPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/BarPlotPane.java index 1a3808a6a6..7f68e153ba 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/BarPlotPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/BarPlotPane.java @@ -7,7 +7,6 @@ import com.fr.chart.chartattr.Chart; import com.fr.chart.chartattr.Plot; import com.fr.chart.charttypes.BarIndependentChart; import com.fr.design.i18n.Toolkit; -import com.fr.locale.InterProviderFactory; import com.fr.log.FineLoggerFactory; @@ -33,7 +32,7 @@ public class BarPlotPane extends AbstractBarPane{ @Override protected String[] getTypeTipName() { - String bar = InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Bar"); + String bar = Toolkit.i18nText("Fine-Design_Chart_Type_Bar"); String stack = Toolkit.i18nText("Fine-Design_Chart_Stacked"); String percent = Toolkit.i18nText("Fine-Design_Chart_Use_Percent"); String td = Toolkit.i18nText("Fine-Design_Chart_3D"); @@ -67,7 +66,7 @@ public class BarPlotPane extends AbstractBarPane{ * @return 界面标题 */ public String title4PopupWindow() { - return InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Bar"); + return Toolkit.i18nText("Fine-Design_Chart_Type_Bar"); } protected Plot getSelectedClonedPlot(){ diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/BubblePlotPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/BubblePlotPane.java index 551a975235..d8fe8664cf 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/BubblePlotPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/BubblePlotPane.java @@ -4,12 +4,12 @@ import com.fr.chart.base.ChartConstants; import com.fr.chart.chartattr.BubblePlot; import com.fr.chart.chartattr.Chart; import com.fr.chart.charttypes.BubbleIndependentChart; -import com.fr.locale.InterProviderFactory; +import com.fr.design.i18n.Toolkit; /** * 气泡图 属性表 选择类型 布局界面. - * + * * @author kunsnat E-mail:kunsnat@gmail.com * @version 创建时间：2012-12-25 下午06:56:47 */ @@ -26,7 +26,7 @@ public class BubblePlotPane extends AbstractDeprecatedChartTypePane { @Override protected String[] getTypeTipName() { return new String[]{ - InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Bubble_Chart") + Toolkit.i18nText("Fine-Design_Chart_Bubble_Chart_OLD") }; } @@ -45,7 +45,7 @@ public class BubblePlotPane extends AbstractDeprecatedChartTypePane { * @return 界面标题 */ public String title4PopupWindow() { - return InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Bubble_Chart"); + return Toolkit.i18nText("Fine-Design_Chart_Bubble_Chart_OLD"); } /** @@ -70,7 +70,7 @@ public class BubblePlotPane extends AbstractDeprecatedChartTypePane { */ public void populateBean(Chart chart) { typeDemo.get(0).isPressing = true; - + checkDemosBackground(); } diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/ColumnPlotPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/ColumnPlotPane.java index e421bdeba2..e6b446b569 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/ColumnPlotPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/ColumnPlotPane.java @@ -6,7 +6,6 @@ import com.fr.chart.chartattr.Chart; import com.fr.chart.chartattr.Plot; import com.fr.chart.charttypes.ColumnIndependentChart; import com.fr.design.i18n.Toolkit; -import com.fr.locale.InterProviderFactory; import com.fr.log.FineLoggerFactory; @@ -32,7 +31,7 @@ public class ColumnPlotPane extends AbstractBarPane{ @Override protected String[] getTypeTipName() { - String column = InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Column"); + String column = Toolkit.i18nText("Fine-Design_Chart_Type_Column"); String stack = Toolkit.i18nText("Fine-Design_Chart_Stacked"); String percent = Toolkit.i18nText("Fine-Design_Chart_Use_Percent"); String td = Toolkit.i18nText("Fine-Design_Chart_3D"); @@ -65,7 +64,7 @@ public class ColumnPlotPane extends AbstractBarPane{ * @return 界面标题 */ public String title4PopupWindow() { - return InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Column"); + return Toolkit.i18nText("Fine-Design_Chart_Type_Column"); } protected Plot getSelectedClonedPlot(){ diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/CustomPlotPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/CustomPlotPane.java index f81b1168ce..e922d2921b 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/CustomPlotPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/CustomPlotPane.java @@ -3,7 +3,7 @@ package com.fr.design.mainframe.chart.gui.type; import com.fr.chart.base.ChartConstants; import com.fr.chart.chartattr.Chart; import com.fr.chart.charttypes.CustomIndependentChart; -import com.fr.locale.InterProviderFactory; +import com.fr.design.i18n.Toolkit; /** @@ -27,7 +27,7 @@ public class CustomPlotPane extends AbstractDeprecatedChartTypePane { @Override protected String[] getTypeTipName() { return new String[]{ - InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Combine") + Toolkit.i18nText("Fine-Design_Chart_Type_Combine") }; } @@ -46,7 +46,7 @@ public class CustomPlotPane extends AbstractDeprecatedChartTypePane { * @return 界面标题 */ public String title4PopupWindow() { - return InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Combine"); + return Toolkit.i18nText("Fine-Design_Chart_Type_Combine"); } /** diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/DonutPlotPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/DonutPlotPane.java index 0b57d225df..44cdc85275 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/DonutPlotPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/DonutPlotPane.java @@ -11,11 +11,10 @@ import com.fr.chart.chartattr.Plot; import com.fr.chart.chartglyph.ConditionCollection; import com.fr.chart.charttypes.DonutIndependentChart; import com.fr.design.i18n.Toolkit; -import com.fr.locale.InterProviderFactory; import com.fr.stable.Constants; -import java.awt.Color; import java.text.DecimalFormat; +import java.awt.Color; /** * 圆环图的类型界面 @@ -36,7 +35,7 @@ public class DonutPlotPane extends AbstractDeprecatedChartTypePane { @Override protected String[] getTypeTipName() { - String donut = InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Donut"); + String donut = Toolkit.i18nText("Fine-Design_Chart_Type_Donut"); return new String[]{ donut, Toolkit.i18nText("Fine-Design_Chart_3D") + donut @@ -104,7 +103,7 @@ public class DonutPlotPane extends AbstractDeprecatedChartTypePane { * @return 标题 */ public String title4PopupWindow() { - return InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Donut"); + return Toolkit.i18nText("Fine-Design_Chart_Type_Donut"); } /** diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/FunnelPlotPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/FunnelPlotPane.java index 1b00f7a2aa..b3706a058a 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/FunnelPlotPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/FunnelPlotPane.java @@ -7,7 +7,7 @@ import com.fr.chart.chartattr.Chart; import com.fr.chart.chartattr.FunnelPlot; import com.fr.chart.chartattr.Plot; import com.fr.chart.charttypes.FunnelIndependentChart; -import com.fr.locale.InterProviderFactory; +import com.fr.design.i18n.Toolkit; import java.text.DecimalFormat; @@ -31,7 +31,7 @@ public class FunnelPlotPane extends AbstractDeprecatedChartTypePane { @Override protected String[] getTypeTipName() { return new String[]{ - InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Funnel") + Toolkit.i18nText("Fine-Design_Chart_Type_Funnel") }; } @@ -50,7 +50,7 @@ public class FunnelPlotPane extends AbstractDeprecatedChartTypePane { * @return 界面标题 */ public String title4PopupWindow() { - return InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Funnel"); + return Toolkit.i18nText("Fine-Design_Chart_Type_Funnel"); } /** diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/GanttPlotPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/GanttPlotPane.java index 1bae398b52..f68ee1fc1c 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/GanttPlotPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/GanttPlotPane.java @@ -3,7 +3,7 @@ package com.fr.design.mainframe.chart.gui.type; import com.fr.chart.base.ChartConstants; import com.fr.chart.chartattr.Chart; import com.fr.chart.charttypes.GanttIndependentChart; -import com.fr.locale.InterProviderFactory; +import com.fr.design.i18n.Toolkit; /** @@ -25,7 +25,7 @@ public class GanttPlotPane extends AbstractDeprecatedChartTypePane { @Override protected String[] getTypeTipName() { return new String[]{ - InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Gantt") + Toolkit.i18nText("Fine-Design_Chart_Type_Gantt") }; } @@ -48,7 +48,7 @@ public class GanttPlotPane extends AbstractDeprecatedChartTypePane { * @return 界面标题 */ public String title4PopupWindow() { - return InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Gantt"); + return Toolkit.i18nText("Fine-Design_Chart_Type_Gantt"); } /** diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/GisMapPlotPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/GisMapPlotPane.java index e15b0c4b15..67906b9e50 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/GisMapPlotPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/GisMapPlotPane.java @@ -8,10 +8,10 @@ import com.fr.chart.charttypes.GisMapIndependentChart; import com.fr.design.chart.series.PlotStyle.ChartSelectDemoPane; import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.itextfield.UITextField; +import com.fr.design.i18n.Toolkit; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; -import com.fr.locale.InterProviderFactory; import com.fr.log.FineLoggerFactory; import com.fr.stable.AssistUtils; @@ -74,7 +74,7 @@ public class GisMapPlotPane extends AbstractDeprecatedChartTypePane { @Override protected String[] getTypeTipName() { return new String[]{ - InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_GIS_Map") + Toolkit.i18nText("Fine-Design_Chart_GIS_Map_OLD") }; } @@ -174,7 +174,7 @@ public class GisMapPlotPane extends AbstractDeprecatedChartTypePane { * @return 标题 */ public String title4PopupWindow() { - return InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_GIS_Map"); + return Toolkit.i18nText("Fine-Design_Chart_GIS_Map_OLD"); } /** diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/LinePlotPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/LinePlotPane.java index e5e23d2bcf..e78bb3ac67 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/LinePlotPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/LinePlotPane.java @@ -5,7 +5,7 @@ import com.fr.chart.chartattr.Chart; import com.fr.chart.chartattr.LinePlot; import com.fr.chart.chartattr.Plot; import com.fr.chart.charttypes.LineIndependentChart; -import com.fr.locale.InterProviderFactory; +import com.fr.design.i18n.Toolkit; import com.fr.log.FineLoggerFactory; @@ -22,7 +22,7 @@ public class LinePlotPane extends AbstractDeprecatedChartTypePane { @Override protected String[] getTypeTipName() { return new String[]{ - InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Line") + Toolkit.i18nText("Fine-Design_Chart_Type_Line") }; } @@ -84,7 +84,7 @@ public class LinePlotPane extends AbstractDeprecatedChartTypePane { } public String title4PopupWindow() { - return InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Line"); + return Toolkit.i18nText("Fine-Design_Chart_Type_Line"); } public Chart getDefaultChart() { diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/MapPlotPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/MapPlotPane.java index 2b606fc064..9880739265 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/MapPlotPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/MapPlotPane.java @@ -9,8 +9,8 @@ import com.fr.chart.chartattr.Plot; import com.fr.chart.charttypes.MapIndependentChart; import com.fr.design.chart.series.PlotSeries.MapGroupExtensionPane; import com.fr.design.chart.series.PlotStyle.ChartSelectDemoPane; +import com.fr.design.i18n.Toolkit; import com.fr.design.layout.FRGUIPaneFactory; -import com.fr.locale.InterProviderFactory; import com.fr.log.FineLoggerFactory; import javax.swing.JPanel; @@ -72,7 +72,7 @@ public class MapPlotPane extends AbstractDeprecatedChartTypePane { * @return 界面标题 */ public String title4PopupWindow() { - return InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_SVG_MAP"); + return Toolkit.i18nText("Fine-Design_Chart_SVG_MAP"); } /** diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/MeterPlotPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/MeterPlotPane.java index 94527c04bb..791262c0bc 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/MeterPlotPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/MeterPlotPane.java @@ -7,7 +7,6 @@ import com.fr.chart.chartattr.Plot; import com.fr.chart.chartglyph.MeterStyle; import com.fr.chart.charttypes.MeterIndependentChart; import com.fr.design.i18n.Toolkit; -import com.fr.locale.InterProviderFactory; import com.fr.log.FineLoggerFactory; @@ -33,7 +32,7 @@ public class MeterPlotPane extends AbstractDeprecatedChartTypePane { @Override protected String[] getTypeTipName() { - String meter = InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Meter"); + String meter = Toolkit.i18nText("Fine-Design_Chart_Type_Meter"); return new String[]{ Toolkit.i18nText("Fine-Design_Chart_Mode_Custom") + meter, meter + "1", @@ -81,7 +80,7 @@ public class MeterPlotPane extends AbstractDeprecatedChartTypePane { * @return 界面标题 */ public String title4PopupWindow() { - return InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Meter"); + return Toolkit.i18nText("Fine-Design_Chart_Type_Meter"); } /** diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/PiePlotPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/PiePlotPane.java index 4212d76c48..56c2c44832 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/PiePlotPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/PiePlotPane.java @@ -10,11 +10,11 @@ import com.fr.chart.chartattr.PiePlot; import com.fr.chart.chartattr.Plot; import com.fr.chart.chartglyph.ConditionCollection; import com.fr.chart.charttypes.PieIndependentChart; -import com.fr.locale.InterProviderFactory; +import com.fr.design.i18n.Toolkit; import com.fr.stable.Constants; -import java.awt.Color; import java.text.DecimalFormat; +import java.awt.Color; /** * 饼图 属性表 选择类型 布局界面. @@ -36,7 +36,7 @@ public class PiePlotPane extends AbstractDeprecatedChartTypePane { @Override protected String[] getTypeTipName() { - String pie = InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Pie"); + String pie = Toolkit.i18nText("Fine-Design_Chart_Type_Pie"); return new String[]{ pie, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_3D") + pie @@ -63,7 +63,7 @@ public class PiePlotPane extends AbstractDeprecatedChartTypePane { * @return 界面标题 */ public String title4PopupWindow() { - return InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Pie"); + return Toolkit.i18nText("Fine-Design_Chart_Type_Pie"); } private void createPieCondition(Plot plot) { diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/RadarPlotPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/RadarPlotPane.java index e3e55cb853..df812fe2cb 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/RadarPlotPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/RadarPlotPane.java @@ -3,7 +3,7 @@ package com.fr.design.mainframe.chart.gui.type; import com.fr.chart.base.ChartConstants; import com.fr.chart.chartattr.Chart; import com.fr.chart.charttypes.RadarIndependentChart; -import com.fr.locale.InterProviderFactory; +import com.fr.design.i18n.Toolkit; /** @@ -25,7 +25,7 @@ public class RadarPlotPane extends AbstractDeprecatedChartTypePane { @Override protected String[] getTypeTipName() { return new String[]{ - InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Radar") + Toolkit.i18nText("Fine-Design_Chart_Type_Radar") }; } @@ -49,7 +49,7 @@ public class RadarPlotPane extends AbstractDeprecatedChartTypePane { * @return 界面标题 */ public String title4PopupWindow() { - return InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Radar"); + return Toolkit.i18nText("Fine-Design_Chart_Type_Radar"); } /** @@ -67,7 +67,7 @@ public class RadarPlotPane extends AbstractDeprecatedChartTypePane { */ public void populateBean(Chart chart) { typeDemo.get(RADAR).isPressing = true; - + checkDemosBackground(); } diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/RangePlotPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/RangePlotPane.java index c685b4c3be..9dfb36b0f0 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/RangePlotPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/RangePlotPane.java @@ -4,7 +4,7 @@ import com.fr.chart.base.ChartConstants; import com.fr.chart.chartattr.Chart; import com.fr.chart.chartattr.RangePlot; import com.fr.chart.charttypes.RangeIndependentChart; -import com.fr.locale.InterProviderFactory; +import com.fr.design.i18n.Toolkit; /** @@ -26,7 +26,7 @@ public class RangePlotPane extends AbstractDeprecatedChartTypePane { @Override protected String[] getTypeTipName() { return new String[]{ - InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Range") + Toolkit.i18nText("Fine-Design_Chart_Type_Range") }; } @@ -50,7 +50,7 @@ public class RangePlotPane extends AbstractDeprecatedChartTypePane { * @return 界面标题 */ public String title4PopupWindow() { - return InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Range"); + return Toolkit.i18nText("Fine-Design_Chart_Type_Range"); } /** @@ -70,7 +70,7 @@ public class RangePlotPane extends AbstractDeprecatedChartTypePane { */ public void populateBean(Chart chart) { typeDemo.get(RANGE).isPressing = true; - + checkDemosBackground(); } diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/StockPlotPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/StockPlotPane.java index c8c88fae1b..5e896d3b69 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/StockPlotPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/StockPlotPane.java @@ -3,7 +3,7 @@ package com.fr.design.mainframe.chart.gui.type; import com.fr.chart.base.ChartConstants; import com.fr.chart.chartattr.Chart; import com.fr.chart.charttypes.StockIndependentChart; -import com.fr.locale.InterProviderFactory; +import com.fr.design.i18n.Toolkit; /** @@ -25,7 +25,7 @@ public class StockPlotPane extends AbstractDeprecatedChartTypePane { @Override protected String[] getTypeTipName() { return new String[]{ - InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Stock") + Toolkit.i18nText("Fine-Design_Chart_Type_Stock") }; } @@ -49,7 +49,7 @@ public class StockPlotPane extends AbstractDeprecatedChartTypePane { * @return 界面标题 */ public String title4PopupWindow() { - return InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Stock"); + return Toolkit.i18nText("Fine-Design_Chart_Type_Stock"); } /** diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/XYScatterPlotPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/XYScatterPlotPane.java index eab3a98378..ba6edba06e 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/XYScatterPlotPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/XYScatterPlotPane.java @@ -6,11 +6,11 @@ import com.fr.chart.chartattr.Chart; import com.fr.chart.chartattr.XYScatterPlot; import com.fr.chart.chartglyph.ConditionAttr; import com.fr.chart.charttypes.XYScatterIndependentChart; -import com.fr.locale.InterProviderFactory; +import com.fr.design.i18n.Toolkit; import com.fr.stable.Constants; /** - * 散点图 属性表 选择类型 布局界面. + * 散点图 属性表 选择类型 布局界面. * @author kunsnat E-mail:kunsnat@gmail.com * @version 创建时间：2012-12-25 下午08:33:55 */ @@ -28,7 +28,7 @@ public class XYScatterPlotPane extends AbstractDeprecatedChartTypePane { @Override protected String[] getTypeTipName() { return new String[]{ - InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_XYScatter") + Toolkit.i18nText("Fine-Design_Chart_Type_XYScatter") }; } @@ -47,11 +47,11 @@ public class XYScatterPlotPane extends AbstractDeprecatedChartTypePane { * @return 界面标题 */ public String title4PopupWindow() { - return InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_XYScatter"); + return Toolkit.i18nText("Fine-Design_Chart_Type_XYScatter"); } /** - * 保存界面内容 + * 保存界面内容 */ public void updateBean(Chart chart) { @@ -61,7 +61,7 @@ public class XYScatterPlotPane extends AbstractDeprecatedChartTypePane { XYScatterPlot plot = new XYScatterPlot(); chart.switchPlot(plot); - + ConditionAttr conditionAttr = plot.getConditionCollection().getDefaultAttr(); AttrLineStyle lineStyle = (AttrLineStyle) conditionAttr.getConditionInType(AttrLineStyle.XML_TAG); if (lineStyle != null) { From 79ced2d8221dca3e8411f897766634c51e547806 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=99=BD=E5=B2=B3?= <445798420@qq.com> Date: Mon, 23 Sep 2019 15:23:27 +0800 Subject: [PATCH 3/4] =?UTF-8?q?CHART-10603=20getSubName=E6=96=B9=E6=B3=95?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...bstractIndependentChartUIWithAPILevel.java | 23 +++++++++++-------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/designer-chart/src/main/java/com/fr/design/chart/fun/impl/AbstractIndependentChartUIWithAPILevel.java b/designer-chart/src/main/java/com/fr/design/chart/fun/impl/AbstractIndependentChartUIWithAPILevel.java index 9a577a5ae6..f6a1b20fc7 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/fun/impl/AbstractIndependentChartUIWithAPILevel.java +++ b/designer-chart/src/main/java/com/fr/design/chart/fun/impl/AbstractIndependentChartUIWithAPILevel.java @@ -29,32 +29,33 @@ public abstract class AbstractIndependentChartUIWithAPILevel implements ChartTyp return OLD_PLUGIN_LEVEL; } - public AbstractChartAttrPane[] getAttrPaneArray(AttributeChangeListener listener){ + public AbstractChartAttrPane[] getAttrPaneArray(AttributeChangeListener listener) { return new AbstractChartAttrPane[0]; } - public ChartDataPane getChartDataPane(AttributeChangeListener listener){ + public ChartDataPane getChartDataPane(AttributeChangeListener listener) { return new ChartDataPane(listener); } @Override public String[] getSubName() { - return new String[0]; + return new String[]{getName()}; } /** * 是否使用默认的界面，为了避免界面来回切换 + * * @return 是否使用默认的界面 */ - public boolean isUseDefaultPane(){ + public boolean isUseDefaultPane() { return true; } - public BasicBeanPane getPlotSeriesPane(ChartStylePane parent, Plot plot){ + public BasicBeanPane getPlotSeriesPane(ChartStylePane parent, Plot plot) { return getPlotSeriesPane(); } - public BasicBeanPane getPlotSeriesPane(){ + public BasicBeanPane getPlotSeriesPane() { return null; } @@ -67,11 +68,15 @@ public abstract class AbstractIndependentChartUIWithAPILevel implements ChartTyp return true; } - public ConditionAttributesPane getPlotConditionPane(Plot plot){ + public ConditionAttributesPane getPlotConditionPane(Plot plot) { return new DataSeriesConditionPane(); } - public ChartEditPane getChartEditPane(String plotID){ return StableUtils.construct(ChartEditPane.class);} + public ChartEditPane getChartEditPane(String plotID) { + return StableUtils.construct(ChartEditPane.class); + } - public ChartsConfigPane getChartConfigPane(String plotID){return null;} + public ChartsConfigPane getChartConfigPane(String plotID) { + return null; + } } From 894fd9f4adffccf516892642bd57942cf512318e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=99=BD=E5=B2=B3?= <445798420@qq.com> Date: Mon, 23 Sep 2019 15:55:04 +0800 Subject: [PATCH 4/4] =?UTF-8?q?CHART-10603=20=E5=8C=85=E5=90=8D=E5=92=8C?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fr/design/ChartTypeInterfaceManager.java | 68 +++++++++---------- .../ui/AreaChartTypeUI.java} | 4 +- .../ui/BarChartTypeUI.java} | 4 +- .../ui/BubbleChartTypeUI.java} | 4 +- .../ui/ColumnChartTypeUI.java} | 4 +- .../ui/CustomChartTypeUI.java} | 4 +- .../ui/DonutChartTypeUI.java} | 4 +- .../ui/FunnelChartTypeUI.java} | 4 +- .../ui/GanttChartTypeUI.java} | 4 +- .../ui/GisMapChartTypeUI.java} | 4 +- .../ui/LineChartTypeUI.java} | 4 +- .../ui/MapChartTypeUI.java} | 4 +- .../ui/MeterChartTypeUI.java} | 4 +- .../ui/PieChartTypeUI.java} | 4 +- .../ui/RadarChartTypeUI.java} | 4 +- .../ui/RangeChartTypeUI.java} | 4 +- .../ui/StockChartTypeUI.java} | 4 +- .../ui/XYScatterChartTypeUI.java} | 4 +- 18 files changed, 68 insertions(+), 68 deletions(-) rename designer-chart/src/main/java/com/fr/design/{chartinterface/AreaIndependentChartInterface.java => type/ui/AreaChartTypeUI.java} (96%) rename designer-chart/src/main/java/com/fr/design/{chartinterface/BarIndependentChartInterface.java => type/ui/BarChartTypeUI.java} (97%) rename designer-chart/src/main/java/com/fr/design/{chartinterface/BubbleIndependentChartInterface.java => type/ui/BubbleChartTypeUI.java} (94%) rename designer-chart/src/main/java/com/fr/design/{chartinterface/ColumnIndependentChartInterface.java => type/ui/ColumnChartTypeUI.java} (97%) rename designer-chart/src/main/java/com/fr/design/{chartinterface/CustomIndependentChartInterface.java => type/ui/CustomChartTypeUI.java} (94%) rename designer-chart/src/main/java/com/fr/design/{chartinterface/DonutIndependentChartInterface.java => type/ui/DonutChartTypeUI.java} (95%) rename designer-chart/src/main/java/com/fr/design/{chartinterface/FunnelIndependentChartInterface.java => type/ui/FunnelChartTypeUI.java} (94%) rename designer-chart/src/main/java/com/fr/design/{chartinterface/GanttIndependentChartInterface.java => type/ui/GanttChartTypeUI.java} (93%) rename designer-chart/src/main/java/com/fr/design/{chartinterface/GisMapIndependentChartInterface.java => type/ui/GisMapChartTypeUI.java} (92%) rename designer-chart/src/main/java/com/fr/design/{chartinterface/LineIndependentChartInterface.java => type/ui/LineChartTypeUI.java} (95%) rename designer-chart/src/main/java/com/fr/design/{chartinterface/MapIndependentChartInterface.java => type/ui/MapChartTypeUI.java} (94%) rename designer-chart/src/main/java/com/fr/design/{chartinterface/MeterIndependentChartInterface.java => type/ui/MeterChartTypeUI.java} (94%) rename designer-chart/src/main/java/com/fr/design/{chartinterface/PieIndependentChartInterface.java => type/ui/PieChartTypeUI.java} (95%) rename designer-chart/src/main/java/com/fr/design/{chartinterface/RadarIndependentChartInterface.java => type/ui/RadarChartTypeUI.java} (94%) rename designer-chart/src/main/java/com/fr/design/{chartinterface/RangeIndependentChartInterface.java => type/ui/RangeChartTypeUI.java} (94%) rename designer-chart/src/main/java/com/fr/design/{chartinterface/StockIndependentChartInterface.java => type/ui/StockChartTypeUI.java} (94%) rename designer-chart/src/main/java/com/fr/design/{chartinterface/XYScatterIndependentChartInterface.java => type/ui/XYScatterChartTypeUI.java} (94%) diff --git a/designer-chart/src/main/java/com/fr/design/ChartTypeInterfaceManager.java b/designer-chart/src/main/java/com/fr/design/ChartTypeInterfaceManager.java index 03b073a621..b9950256f3 100644 --- a/designer-chart/src/main/java/com/fr/design/ChartTypeInterfaceManager.java +++ b/designer-chart/src/main/java/com/fr/design/ChartTypeInterfaceManager.java @@ -11,23 +11,23 @@ import com.fr.design.beans.BasicBeanPane; import com.fr.design.beans.FurtherBasicBeanPane; import com.fr.design.chart.fun.ChartTypeUIProvider; import com.fr.design.chart.gui.ChartWidgetOption; -import com.fr.design.chartinterface.AreaIndependentChartInterface; -import com.fr.design.chartinterface.BarIndependentChartInterface; -import com.fr.design.chartinterface.BubbleIndependentChartInterface; -import com.fr.design.chartinterface.ColumnIndependentChartInterface; -import com.fr.design.chartinterface.CustomIndependentChartInterface; -import com.fr.design.chartinterface.DonutIndependentChartInterface; -import com.fr.design.chartinterface.FunnelIndependentChartInterface; -import com.fr.design.chartinterface.GanttIndependentChartInterface; -import com.fr.design.chartinterface.GisMapIndependentChartInterface; -import com.fr.design.chartinterface.LineIndependentChartInterface; -import com.fr.design.chartinterface.MapIndependentChartInterface; -import com.fr.design.chartinterface.MeterIndependentChartInterface; -import com.fr.design.chartinterface.PieIndependentChartInterface; -import com.fr.design.chartinterface.RadarIndependentChartInterface; -import com.fr.design.chartinterface.RangeIndependentChartInterface; -import com.fr.design.chartinterface.StockIndependentChartInterface; -import com.fr.design.chartinterface.XYScatterIndependentChartInterface; +import com.fr.design.type.ui.AreaChartTypeUI; +import com.fr.design.type.ui.BarChartTypeUI; +import com.fr.design.type.ui.BubbleChartTypeUI; +import com.fr.design.type.ui.ColumnChartTypeUI; +import com.fr.design.type.ui.CustomChartTypeUI; +import com.fr.design.type.ui.DonutChartTypeUI; +import com.fr.design.type.ui.FunnelChartTypeUI; +import com.fr.design.type.ui.GanttChartTypeUI; +import com.fr.design.type.ui.GisMapChartTypeUI; +import com.fr.design.type.ui.LineChartTypeUI; +import com.fr.design.type.ui.MapChartTypeUI; +import com.fr.design.type.ui.MeterChartTypeUI; +import com.fr.design.type.ui.PieChartTypeUI; +import com.fr.design.type.ui.RadarChartTypeUI; +import com.fr.design.type.ui.RangeChartTypeUI; +import com.fr.design.type.ui.StockChartTypeUI; +import com.fr.design.type.ui.XYScatterChartTypeUI; import com.fr.design.condition.ConditionAttributesPane; import com.fr.design.gui.core.WidgetOption; import com.fr.design.gui.frpane.AttributeChangeListener; @@ -205,23 +205,23 @@ public class ChartTypeInterfaceManager implements ExtraChartDesignClassManagerPr private static void readDefault() { - addChartTypeInterface(DEPRECATED_CHART_PRIORITY, ChartConstants.COLUMN_CHART, new ColumnIndependentChartInterface()); - addChartTypeInterface(DEPRECATED_CHART_PRIORITY, ChartConstants.LINE_CHART, new LineIndependentChartInterface()); - addChartTypeInterface(DEPRECATED_CHART_PRIORITY, ChartConstants.BAR_CHART, new BarIndependentChartInterface()); - addChartTypeInterface(DEPRECATED_CHART_PRIORITY, ChartConstants.PIE_CHART, new PieIndependentChartInterface()); - addChartTypeInterface(DEPRECATED_CHART_PRIORITY, ChartConstants.AREA_CHART, new AreaIndependentChartInterface()); - addChartTypeInterface(DEPRECATED_CHART_PRIORITY, ChartConstants.SCATTER_CHART, new XYScatterIndependentChartInterface()); - addChartTypeInterface(DEPRECATED_CHART_PRIORITY, ChartConstants.BUBBLE_CHART, new BubbleIndependentChartInterface()); - addChartTypeInterface(DEPRECATED_CHART_PRIORITY, ChartConstants.RADAR_CHART, new RadarIndependentChartInterface()); - addChartTypeInterface(DEPRECATED_CHART_PRIORITY, ChartConstants.STOCK_CHART, new StockIndependentChartInterface()); - addChartTypeInterface(DEPRECATED_CHART_PRIORITY, ChartConstants.METER_CHART, new MeterIndependentChartInterface()); - addChartTypeInterface(DEPRECATED_CHART_PRIORITY, ChartConstants.RANGE_CHART, new RangeIndependentChartInterface()); - addChartTypeInterface(DEPRECATED_CHART_PRIORITY, ChartConstants.CUSTOM_CHART, new CustomIndependentChartInterface()); - addChartTypeInterface(DEPRECATED_CHART_PRIORITY, ChartConstants.GANTT_CHART, new GanttIndependentChartInterface()); - addChartTypeInterface(DEPRECATED_CHART_PRIORITY, ChartConstants.DONUT_CHART, new DonutIndependentChartInterface()); - addChartTypeInterface(DEPRECATED_CHART_PRIORITY, ChartConstants.MAP_CHART, new MapIndependentChartInterface()); - addChartTypeInterface(DEPRECATED_CHART_PRIORITY, ChartConstants.GIS_CHAER, new GisMapIndependentChartInterface()); - addChartTypeInterface(DEPRECATED_CHART_PRIORITY, ChartConstants.FUNNEL_CHART, new FunnelIndependentChartInterface()); + addChartTypeInterface(DEPRECATED_CHART_PRIORITY, ChartConstants.COLUMN_CHART, new ColumnChartTypeUI()); + addChartTypeInterface(DEPRECATED_CHART_PRIORITY, ChartConstants.LINE_CHART, new LineChartTypeUI()); + addChartTypeInterface(DEPRECATED_CHART_PRIORITY, ChartConstants.BAR_CHART, new BarChartTypeUI()); + addChartTypeInterface(DEPRECATED_CHART_PRIORITY, ChartConstants.PIE_CHART, new PieChartTypeUI()); + addChartTypeInterface(DEPRECATED_CHART_PRIORITY, ChartConstants.AREA_CHART, new AreaChartTypeUI()); + addChartTypeInterface(DEPRECATED_CHART_PRIORITY, ChartConstants.SCATTER_CHART, new XYScatterChartTypeUI()); + addChartTypeInterface(DEPRECATED_CHART_PRIORITY, ChartConstants.BUBBLE_CHART, new BubbleChartTypeUI()); + addChartTypeInterface(DEPRECATED_CHART_PRIORITY, ChartConstants.RADAR_CHART, new RadarChartTypeUI()); + addChartTypeInterface(DEPRECATED_CHART_PRIORITY, ChartConstants.STOCK_CHART, new StockChartTypeUI()); + addChartTypeInterface(DEPRECATED_CHART_PRIORITY, ChartConstants.METER_CHART, new MeterChartTypeUI()); + addChartTypeInterface(DEPRECATED_CHART_PRIORITY, ChartConstants.RANGE_CHART, new RangeChartTypeUI()); + addChartTypeInterface(DEPRECATED_CHART_PRIORITY, ChartConstants.CUSTOM_CHART, new CustomChartTypeUI()); + addChartTypeInterface(DEPRECATED_CHART_PRIORITY, ChartConstants.GANTT_CHART, new GanttChartTypeUI()); + addChartTypeInterface(DEPRECATED_CHART_PRIORITY, ChartConstants.DONUT_CHART, new DonutChartTypeUI()); + addChartTypeInterface(DEPRECATED_CHART_PRIORITY, ChartConstants.MAP_CHART, new MapChartTypeUI()); + addChartTypeInterface(DEPRECATED_CHART_PRIORITY, ChartConstants.GIS_CHAER, new GisMapChartTypeUI()); + addChartTypeInterface(DEPRECATED_CHART_PRIORITY, ChartConstants.FUNNEL_CHART, new FunnelChartTypeUI()); } private static void addChartTypeInterface(String priority, String plotID, ChartTypeUIProvider provider) { diff --git a/designer-chart/src/main/java/com/fr/design/chartinterface/AreaIndependentChartInterface.java b/designer-chart/src/main/java/com/fr/design/type/ui/AreaChartTypeUI.java similarity index 96% rename from designer-chart/src/main/java/com/fr/design/chartinterface/AreaIndependentChartInterface.java rename to designer-chart/src/main/java/com/fr/design/type/ui/AreaChartTypeUI.java index 52c111c188..60e52f2425 100644 --- a/designer-chart/src/main/java/com/fr/design/chartinterface/AreaIndependentChartInterface.java +++ b/designer-chart/src/main/java/com/fr/design/type/ui/AreaChartTypeUI.java @@ -1,4 +1,4 @@ -package com.fr.design.chartinterface; +package com.fr.design.type.ui; import com.fr.chart.chartattr.Plot; import com.fr.design.beans.BasicBeanPane; @@ -21,7 +21,7 @@ import com.fr.design.mainframe.chart.gui.type.AreaPlotPane; /** * Created by eason on 15/4/21. */ -public class AreaIndependentChartInterface extends AbstractIndependentChartUIWithAPILevel { +public class AreaChartTypeUI extends AbstractIndependentChartUIWithAPILevel { public AbstractChartTypePane getPlotTypePane() { return new AreaPlotPane(); diff --git a/designer-chart/src/main/java/com/fr/design/chartinterface/BarIndependentChartInterface.java b/designer-chart/src/main/java/com/fr/design/type/ui/BarChartTypeUI.java similarity index 97% rename from designer-chart/src/main/java/com/fr/design/chartinterface/BarIndependentChartInterface.java rename to designer-chart/src/main/java/com/fr/design/type/ui/BarChartTypeUI.java index 7c7eda32e8..16300178b5 100644 --- a/designer-chart/src/main/java/com/fr/design/chartinterface/BarIndependentChartInterface.java +++ b/designer-chart/src/main/java/com/fr/design/type/ui/BarChartTypeUI.java @@ -1,4 +1,4 @@ -package com.fr.design.chartinterface; +package com.fr.design.type.ui; import com.fr.chart.chartattr.Plot; import com.fr.design.beans.BasicBeanPane; @@ -22,7 +22,7 @@ import com.fr.design.mainframe.chart.gui.type.BarPlotPane; /** * Created by eason on 15/4/21. */ -public class BarIndependentChartInterface extends AbstractIndependentChartUIWithAPILevel { +public class BarChartTypeUI extends AbstractIndependentChartUIWithAPILevel { public AbstractChartTypePane getPlotTypePane() { return new BarPlotPane(); diff --git a/designer-chart/src/main/java/com/fr/design/chartinterface/BubbleIndependentChartInterface.java b/designer-chart/src/main/java/com/fr/design/type/ui/BubbleChartTypeUI.java similarity index 94% rename from designer-chart/src/main/java/com/fr/design/chartinterface/BubbleIndependentChartInterface.java rename to designer-chart/src/main/java/com/fr/design/type/ui/BubbleChartTypeUI.java index 8409a31c7d..eedb93c259 100644 --- a/designer-chart/src/main/java/com/fr/design/chartinterface/BubbleIndependentChartInterface.java +++ b/designer-chart/src/main/java/com/fr/design/type/ui/BubbleChartTypeUI.java @@ -1,4 +1,4 @@ -package com.fr.design.chartinterface; +package com.fr.design.type.ui; import com.fr.chart.chartattr.Plot; import com.fr.design.beans.BasicBeanPane; @@ -19,7 +19,7 @@ import com.fr.design.mainframe.chart.gui.type.BubblePlotPane; /** * Created by eason on 15/4/21. */ -public class BubbleIndependentChartInterface extends AbstractIndependentChartUIWithAPILevel { +public class BubbleChartTypeUI extends AbstractIndependentChartUIWithAPILevel { public AbstractChartTypePane getPlotTypePane(){ return new BubblePlotPane(); diff --git a/designer-chart/src/main/java/com/fr/design/chartinterface/ColumnIndependentChartInterface.java b/designer-chart/src/main/java/com/fr/design/type/ui/ColumnChartTypeUI.java similarity index 97% rename from designer-chart/src/main/java/com/fr/design/chartinterface/ColumnIndependentChartInterface.java rename to designer-chart/src/main/java/com/fr/design/type/ui/ColumnChartTypeUI.java index 4c87320a30..4597ec5098 100644 --- a/designer-chart/src/main/java/com/fr/design/chartinterface/ColumnIndependentChartInterface.java +++ b/designer-chart/src/main/java/com/fr/design/type/ui/ColumnChartTypeUI.java @@ -1,4 +1,4 @@ -package com.fr.design.chartinterface; +package com.fr.design.type.ui; import com.fr.chart.chartattr.Plot; import com.fr.design.beans.BasicBeanPane; @@ -22,7 +22,7 @@ import com.fr.design.mainframe.chart.gui.type.ColumnPlotPane; /** * Created by eason on 15/4/21. */ -public class ColumnIndependentChartInterface extends AbstractIndependentChartUIWithAPILevel { +public class ColumnChartTypeUI extends AbstractIndependentChartUIWithAPILevel { public AbstractChartTypePane getPlotTypePane() { return new ColumnPlotPane(); diff --git a/designer-chart/src/main/java/com/fr/design/chartinterface/CustomIndependentChartInterface.java b/designer-chart/src/main/java/com/fr/design/type/ui/CustomChartTypeUI.java similarity index 94% rename from designer-chart/src/main/java/com/fr/design/chartinterface/CustomIndependentChartInterface.java rename to designer-chart/src/main/java/com/fr/design/type/ui/CustomChartTypeUI.java index b8a0db59f2..ce47e17760 100644 --- a/designer-chart/src/main/java/com/fr/design/chartinterface/CustomIndependentChartInterface.java +++ b/designer-chart/src/main/java/com/fr/design/type/ui/CustomChartTypeUI.java @@ -1,4 +1,4 @@ -package com.fr.design.chartinterface; +package com.fr.design.type.ui; import com.fr.chart.chartattr.Plot; import com.fr.design.beans.BasicBeanPane; @@ -19,7 +19,7 @@ import com.fr.design.mainframe.chart.gui.type.CustomPlotPane; /** * Created by eason on 15/4/21. */ -public class CustomIndependentChartInterface extends AbstractIndependentChartUIWithAPILevel { +public class CustomChartTypeUI extends AbstractIndependentChartUIWithAPILevel { public AbstractChartTypePane getPlotTypePane() { diff --git a/designer-chart/src/main/java/com/fr/design/chartinterface/DonutIndependentChartInterface.java b/designer-chart/src/main/java/com/fr/design/type/ui/DonutChartTypeUI.java similarity index 95% rename from designer-chart/src/main/java/com/fr/design/chartinterface/DonutIndependentChartInterface.java rename to designer-chart/src/main/java/com/fr/design/type/ui/DonutChartTypeUI.java index 5dd5f970ad..f75bbe3ba6 100644 --- a/designer-chart/src/main/java/com/fr/design/chartinterface/DonutIndependentChartInterface.java +++ b/designer-chart/src/main/java/com/fr/design/type/ui/DonutChartTypeUI.java @@ -1,4 +1,4 @@ -package com.fr.design.chartinterface; +package com.fr.design.type.ui; import com.fr.chart.chartattr.Plot; import com.fr.design.beans.BasicBeanPane; @@ -21,7 +21,7 @@ import com.fr.design.mainframe.chart.gui.type.DonutPlotPane; /** * Created by eason on 15/4/21. */ -public class DonutIndependentChartInterface extends AbstractIndependentChartUIWithAPILevel { +public class DonutChartTypeUI extends AbstractIndependentChartUIWithAPILevel { public AbstractChartTypePane getPlotTypePane() { diff --git a/designer-chart/src/main/java/com/fr/design/chartinterface/FunnelIndependentChartInterface.java b/designer-chart/src/main/java/com/fr/design/type/ui/FunnelChartTypeUI.java similarity index 94% rename from designer-chart/src/main/java/com/fr/design/chartinterface/FunnelIndependentChartInterface.java rename to designer-chart/src/main/java/com/fr/design/type/ui/FunnelChartTypeUI.java index c0ad1d1b66..d6c850381c 100644 --- a/designer-chart/src/main/java/com/fr/design/chartinterface/FunnelIndependentChartInterface.java +++ b/designer-chart/src/main/java/com/fr/design/type/ui/FunnelChartTypeUI.java @@ -1,4 +1,4 @@ -package com.fr.design.chartinterface; +package com.fr.design.type.ui; import com.fr.chart.chartattr.Plot; import com.fr.design.beans.BasicBeanPane; @@ -19,7 +19,7 @@ import com.fr.design.mainframe.chart.gui.type.FunnelPlotPane; /** * Created by eason on 15/4/21. */ -public class FunnelIndependentChartInterface extends AbstractIndependentChartUIWithAPILevel { +public class FunnelChartTypeUI extends AbstractIndependentChartUIWithAPILevel { public AbstractChartTypePane getPlotTypePane(){ diff --git a/designer-chart/src/main/java/com/fr/design/chartinterface/GanttIndependentChartInterface.java b/designer-chart/src/main/java/com/fr/design/type/ui/GanttChartTypeUI.java similarity index 93% rename from designer-chart/src/main/java/com/fr/design/chartinterface/GanttIndependentChartInterface.java rename to designer-chart/src/main/java/com/fr/design/type/ui/GanttChartTypeUI.java index 50d81e9b94..9e0b8184ca 100644 --- a/designer-chart/src/main/java/com/fr/design/chartinterface/GanttIndependentChartInterface.java +++ b/designer-chart/src/main/java/com/fr/design/type/ui/GanttChartTypeUI.java @@ -1,4 +1,4 @@ -package com.fr.design.chartinterface; +package com.fr.design.type.ui; import com.fr.chart.chartattr.Plot; import com.fr.design.chart.fun.impl.AbstractIndependentChartUIWithAPILevel; @@ -16,7 +16,7 @@ import com.fr.design.mainframe.chart.gui.type.GanttPlotPane; /** * Created by eason on 15/4/21. */ -public class GanttIndependentChartInterface extends AbstractIndependentChartUIWithAPILevel { +public class GanttChartTypeUI extends AbstractIndependentChartUIWithAPILevel { public AbstractChartTypePane getPlotTypePane(){ diff --git a/designer-chart/src/main/java/com/fr/design/chartinterface/GisMapIndependentChartInterface.java b/designer-chart/src/main/java/com/fr/design/type/ui/GisMapChartTypeUI.java similarity index 92% rename from designer-chart/src/main/java/com/fr/design/chartinterface/GisMapIndependentChartInterface.java rename to designer-chart/src/main/java/com/fr/design/type/ui/GisMapChartTypeUI.java index 9191c0ed17..e7aa6195ac 100644 --- a/designer-chart/src/main/java/com/fr/design/chartinterface/GisMapIndependentChartInterface.java +++ b/designer-chart/src/main/java/com/fr/design/type/ui/GisMapChartTypeUI.java @@ -1,4 +1,4 @@ -package com.fr.design.chartinterface; +package com.fr.design.type.ui; import com.fr.chart.chartattr.Plot; import com.fr.design.chart.fun.impl.AbstractIndependentChartUIWithAPILevel; @@ -12,7 +12,7 @@ import com.fr.design.mainframe.chart.gui.type.GisMapPlotPane; /** * Created by eason on 15/4/21. */ -public class GisMapIndependentChartInterface extends AbstractIndependentChartUIWithAPILevel { +public class GisMapChartTypeUI extends AbstractIndependentChartUIWithAPILevel { public AbstractChartTypePane getPlotTypePane() { diff --git a/designer-chart/src/main/java/com/fr/design/chartinterface/LineIndependentChartInterface.java b/designer-chart/src/main/java/com/fr/design/type/ui/LineChartTypeUI.java similarity index 95% rename from designer-chart/src/main/java/com/fr/design/chartinterface/LineIndependentChartInterface.java rename to designer-chart/src/main/java/com/fr/design/type/ui/LineChartTypeUI.java index dedc716673..4967b864c4 100644 --- a/designer-chart/src/main/java/com/fr/design/chartinterface/LineIndependentChartInterface.java +++ b/designer-chart/src/main/java/com/fr/design/type/ui/LineChartTypeUI.java @@ -1,4 +1,4 @@ -package com.fr.design.chartinterface; +package com.fr.design.type.ui; import com.fr.chart.chartattr.Plot; import com.fr.design.beans.BasicBeanPane; @@ -20,7 +20,7 @@ import com.fr.design.mainframe.chart.gui.type.LinePlotPane; /** * Created by eason on 15/4/21. */ -public class LineIndependentChartInterface extends AbstractIndependentChartUIWithAPILevel { +public class LineChartTypeUI extends AbstractIndependentChartUIWithAPILevel { public AbstractChartTypePane getPlotTypePane() { diff --git a/designer-chart/src/main/java/com/fr/design/chartinterface/MapIndependentChartInterface.java b/designer-chart/src/main/java/com/fr/design/type/ui/MapChartTypeUI.java similarity index 94% rename from designer-chart/src/main/java/com/fr/design/chartinterface/MapIndependentChartInterface.java rename to designer-chart/src/main/java/com/fr/design/type/ui/MapChartTypeUI.java index 7f10760b16..da09ed48e5 100644 --- a/designer-chart/src/main/java/com/fr/design/chartinterface/MapIndependentChartInterface.java +++ b/designer-chart/src/main/java/com/fr/design/type/ui/MapChartTypeUI.java @@ -1,4 +1,4 @@ -package com.fr.design.chartinterface; +package com.fr.design.type.ui; import com.fr.chart.chartattr.Plot; import com.fr.design.beans.BasicBeanPane; @@ -17,7 +17,7 @@ import com.fr.design.mainframe.chart.gui.type.MapPlotPane; /** * Created by eason on 15/4/21. */ -public class MapIndependentChartInterface extends AbstractIndependentChartUIWithAPILevel { +public class MapChartTypeUI extends AbstractIndependentChartUIWithAPILevel { public AbstractChartTypePane getPlotTypePane(){ diff --git a/designer-chart/src/main/java/com/fr/design/chartinterface/MeterIndependentChartInterface.java b/designer-chart/src/main/java/com/fr/design/type/ui/MeterChartTypeUI.java similarity index 94% rename from designer-chart/src/main/java/com/fr/design/chartinterface/MeterIndependentChartInterface.java rename to designer-chart/src/main/java/com/fr/design/type/ui/MeterChartTypeUI.java index 81bf22089c..cafef9ea24 100644 --- a/designer-chart/src/main/java/com/fr/design/chartinterface/MeterIndependentChartInterface.java +++ b/designer-chart/src/main/java/com/fr/design/type/ui/MeterChartTypeUI.java @@ -1,4 +1,4 @@ -package com.fr.design.chartinterface; +package com.fr.design.type.ui; import com.fr.chart.chartattr.Plot; import com.fr.design.beans.BasicBeanPane; @@ -17,7 +17,7 @@ import com.fr.design.mainframe.chart.gui.type.MeterPlotPane; /** * Created by eason on 15/4/21. */ -public class MeterIndependentChartInterface extends AbstractIndependentChartUIWithAPILevel { +public class MeterChartTypeUI extends AbstractIndependentChartUIWithAPILevel { public AbstractChartTypePane getPlotTypePane() { diff --git a/designer-chart/src/main/java/com/fr/design/chartinterface/PieIndependentChartInterface.java b/designer-chart/src/main/java/com/fr/design/type/ui/PieChartTypeUI.java similarity index 95% rename from designer-chart/src/main/java/com/fr/design/chartinterface/PieIndependentChartInterface.java rename to designer-chart/src/main/java/com/fr/design/type/ui/PieChartTypeUI.java index 4a1bd36ae6..3e82d26dc8 100644 --- a/designer-chart/src/main/java/com/fr/design/chartinterface/PieIndependentChartInterface.java +++ b/designer-chart/src/main/java/com/fr/design/type/ui/PieChartTypeUI.java @@ -1,4 +1,4 @@ -package com.fr.design.chartinterface; +package com.fr.design.type.ui; import com.fr.chart.chartattr.Plot; import com.fr.design.beans.BasicBeanPane; @@ -21,7 +21,7 @@ import com.fr.design.mainframe.chart.gui.type.PiePlotPane; /** * Created by eason on 15/4/21. */ -public class PieIndependentChartInterface extends AbstractIndependentChartUIWithAPILevel { +public class PieChartTypeUI extends AbstractIndependentChartUIWithAPILevel { public AbstractChartTypePane getPlotTypePane() { diff --git a/designer-chart/src/main/java/com/fr/design/chartinterface/RadarIndependentChartInterface.java b/designer-chart/src/main/java/com/fr/design/type/ui/RadarChartTypeUI.java similarity index 94% rename from designer-chart/src/main/java/com/fr/design/chartinterface/RadarIndependentChartInterface.java rename to designer-chart/src/main/java/com/fr/design/type/ui/RadarChartTypeUI.java index 128c65849b..e994bb5756 100644 --- a/designer-chart/src/main/java/com/fr/design/chartinterface/RadarIndependentChartInterface.java +++ b/designer-chart/src/main/java/com/fr/design/type/ui/RadarChartTypeUI.java @@ -1,4 +1,4 @@ -package com.fr.design.chartinterface; +package com.fr.design.type.ui; import com.fr.chart.chartattr.Plot; import com.fr.design.beans.BasicBeanPane; @@ -19,7 +19,7 @@ import com.fr.design.mainframe.chart.gui.type.RadarPlotPane; /** * Created by eason on 15/4/21. */ -public class RadarIndependentChartInterface extends AbstractIndependentChartUIWithAPILevel { +public class RadarChartTypeUI extends AbstractIndependentChartUIWithAPILevel { public AbstractChartTypePane getPlotTypePane(){ diff --git a/designer-chart/src/main/java/com/fr/design/chartinterface/RangeIndependentChartInterface.java b/designer-chart/src/main/java/com/fr/design/type/ui/RangeChartTypeUI.java similarity index 94% rename from designer-chart/src/main/java/com/fr/design/chartinterface/RangeIndependentChartInterface.java rename to designer-chart/src/main/java/com/fr/design/type/ui/RangeChartTypeUI.java index 475904ad92..b75daf11ad 100644 --- a/designer-chart/src/main/java/com/fr/design/chartinterface/RangeIndependentChartInterface.java +++ b/designer-chart/src/main/java/com/fr/design/type/ui/RangeChartTypeUI.java @@ -1,4 +1,4 @@ -package com.fr.design.chartinterface; +package com.fr.design.type.ui; import com.fr.chart.chartattr.Plot; import com.fr.design.beans.BasicBeanPane; @@ -17,7 +17,7 @@ import com.fr.design.mainframe.chart.gui.type.RangePlotPane; /** * Created by eason on 15/4/21. */ -public class RangeIndependentChartInterface extends AbstractIndependentChartUIWithAPILevel { +public class RangeChartTypeUI extends AbstractIndependentChartUIWithAPILevel { public AbstractChartTypePane getPlotTypePane(){ diff --git a/designer-chart/src/main/java/com/fr/design/chartinterface/StockIndependentChartInterface.java b/designer-chart/src/main/java/com/fr/design/type/ui/StockChartTypeUI.java similarity index 94% rename from designer-chart/src/main/java/com/fr/design/chartinterface/StockIndependentChartInterface.java rename to designer-chart/src/main/java/com/fr/design/type/ui/StockChartTypeUI.java index 5b3a858fe2..14917575de 100644 --- a/designer-chart/src/main/java/com/fr/design/chartinterface/StockIndependentChartInterface.java +++ b/designer-chart/src/main/java/com/fr/design/type/ui/StockChartTypeUI.java @@ -1,4 +1,4 @@ -package com.fr.design.chartinterface; +package com.fr.design.type.ui; import com.fr.chart.chartattr.Plot; import com.fr.design.beans.BasicBeanPane; @@ -20,7 +20,7 @@ import com.fr.design.mainframe.chart.gui.type.StockPlotPane; /** * Created by eason on 15/4/21. */ -public class StockIndependentChartInterface extends AbstractIndependentChartUIWithAPILevel { +public class StockChartTypeUI extends AbstractIndependentChartUIWithAPILevel { public AbstractChartTypePane getPlotTypePane(){ diff --git a/designer-chart/src/main/java/com/fr/design/chartinterface/XYScatterIndependentChartInterface.java b/designer-chart/src/main/java/com/fr/design/type/ui/XYScatterChartTypeUI.java similarity index 94% rename from designer-chart/src/main/java/com/fr/design/chartinterface/XYScatterIndependentChartInterface.java rename to designer-chart/src/main/java/com/fr/design/type/ui/XYScatterChartTypeUI.java index 13cf662e20..9bf5b787d9 100644 --- a/designer-chart/src/main/java/com/fr/design/chartinterface/XYScatterIndependentChartInterface.java +++ b/designer-chart/src/main/java/com/fr/design/type/ui/XYScatterChartTypeUI.java @@ -1,4 +1,4 @@ -package com.fr.design.chartinterface; +package com.fr.design.type.ui; import com.fr.chart.chartattr.Plot; import com.fr.design.beans.BasicBeanPane; @@ -20,7 +20,7 @@ import com.fr.design.mainframe.chart.gui.type.XYScatterPlotPane; /** * Created by eason on 15/4/21. */ -public class XYScatterIndependentChartInterface extends AbstractIndependentChartUIWithAPILevel { +public class XYScatterChartTypeUI extends AbstractIndependentChartUIWithAPILevel { public AbstractChartTypePane getPlotTypePane() {