Browse Source

CHART-10603 国际化方法修改

persist/11.0
白岳 5 years ago
parent
commit
33301a27c7
  1. 14
      designer-chart/src/main/java/com/fr/design/chartinterface/AreaIndependentChartInterface.java
  2. 18
      designer-chart/src/main/java/com/fr/design/chartinterface/BarIndependentChartInterface.java
  3. 6
      designer-chart/src/main/java/com/fr/design/chartinterface/BubbleIndependentChartInterface.java
  4. 18
      designer-chart/src/main/java/com/fr/design/chartinterface/ColumnIndependentChartInterface.java
  5. 6
      designer-chart/src/main/java/com/fr/design/chartinterface/CustomIndependentChartInterface.java
  6. 8
      designer-chart/src/main/java/com/fr/design/chartinterface/DonutIndependentChartInterface.java
  7. 6
      designer-chart/src/main/java/com/fr/design/chartinterface/FunnelIndependentChartInterface.java
  8. 6
      designer-chart/src/main/java/com/fr/design/chartinterface/GanttIndependentChartInterface.java
  9. 8
      designer-chart/src/main/java/com/fr/design/chartinterface/GisMapIndependentChartInterface.java
  10. 6
      designer-chart/src/main/java/com/fr/design/chartinterface/LineIndependentChartInterface.java
  11. 6
      designer-chart/src/main/java/com/fr/design/chartinterface/MapIndependentChartInterface.java
  12. 10
      designer-chart/src/main/java/com/fr/design/chartinterface/MeterIndependentChartInterface.java
  13. 8
      designer-chart/src/main/java/com/fr/design/chartinterface/PieIndependentChartInterface.java
  14. 6
      designer-chart/src/main/java/com/fr/design/chartinterface/RadarIndependentChartInterface.java
  15. 6
      designer-chart/src/main/java/com/fr/design/chartinterface/RangeIndependentChartInterface.java
  16. 6
      designer-chart/src/main/java/com/fr/design/chartinterface/StockIndependentChartInterface.java
  17. 6
      designer-chart/src/main/java/com/fr/design/chartinterface/XYScatterIndependentChartInterface.java
  18. 5
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/AreaPlotPane.java
  19. 5
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/BarPlotPane.java
  20. 6
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/BubblePlotPane.java
  21. 5
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/ColumnPlotPane.java
  22. 6
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/CustomPlotPane.java
  23. 7
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/DonutPlotPane.java
  24. 6
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/FunnelPlotPane.java
  25. 6
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/GanttPlotPane.java
  26. 6
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/GisMapPlotPane.java
  27. 6
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/LinePlotPane.java
  28. 4
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/MapPlotPane.java
  29. 5
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/MeterPlotPane.java
  30. 8
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/PiePlotPane.java
  31. 6
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/RadarPlotPane.java
  32. 6
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/RangePlotPane.java
  33. 6
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/StockPlotPane.java
  34. 6
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/XYScatterPlotPane.java

14
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.Area3DPlotDataSeriesConditionPane;
import com.fr.design.chart.series.SeriesCondition.impl.AreaPlotDataSeriesCondtionPane; import com.fr.design.chart.series.SeriesCondition.impl.AreaPlotDataSeriesCondtionPane;
import com.fr.design.condition.ConditionAttributesPane; 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.ChartDataPane;
import com.fr.design.mainframe.chart.gui.ChartStylePane; import com.fr.design.mainframe.chart.gui.ChartStylePane;
import com.fr.design.mainframe.chart.gui.data.report.AbstractReportDataContentPane; import com.fr.design.mainframe.chart.gui.data.report.AbstractReportDataContentPane;
@ -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.style.series.AreaSeriesPane;
import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane; import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane;
import com.fr.design.mainframe.chart.gui.type.AreaPlotPane; import com.fr.design.mainframe.chart.gui.type.AreaPlotPane;
import com.fr.locale.InterProviderFactory;
/** /**
* Created by eason on 15/4/21. * Created by eason on 15/4/21.
@ -54,16 +54,16 @@ public class AreaIndependentChartInterface extends AbstractIndependentChartUIWit
@Override @Override
public String getName() { public String getName() {
return InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Area"); return Toolkit.i18nText("Fine-Design_Chart_Type_Area");
} }
@Override @Override
public String[] getSubName() { public String[] getSubName() {
String chartName = InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Area"); String chartName = Toolkit.i18nText("Fine-Design_Chart_Type_Area");
String stackChartName = InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Stacked") + chartName; String stackChartName = Toolkit.i18nText("Fine-Design_Chart_Type_Stacked") + chartName;
String perStackChartName = InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Use_Percent") + stackChartName; String perStackChartName = Toolkit.i18nText("Fine-Design_Chart_Use_Percent") + stackChartName;
String stackChartName3D = InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_3D") + stackChartName; String stackChartName3D = Toolkit.i18nText("Fine-Design_Chart_3D") + stackChartName;
String perStackChartName3D = InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_3D") + perStackChartName; String perStackChartName3D = Toolkit.i18nText("Fine-Design_Chart_3D") + perStackChartName;
return new String[]{ return new String[]{
stackChartName, stackChartName,

18
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.Bar3DPlotDataSeriesConditionPane;
import com.fr.design.chart.series.SeriesCondition.impl.BarPlotDataSeriesConditionPane; import com.fr.design.chart.series.SeriesCondition.impl.BarPlotDataSeriesConditionPane;
import com.fr.design.condition.ConditionAttributesPane; 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.ChartDataPane;
import com.fr.design.mainframe.chart.gui.ChartStylePane; import com.fr.design.mainframe.chart.gui.ChartStylePane;
import com.fr.design.mainframe.chart.gui.data.report.AbstractReportDataContentPane; import com.fr.design.mainframe.chart.gui.data.report.AbstractReportDataContentPane;
@ -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.style.series.Bar3DSeriesPane;
import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane; import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane;
import com.fr.design.mainframe.chart.gui.type.BarPlotPane; import com.fr.design.mainframe.chart.gui.type.BarPlotPane;
import com.fr.locale.InterProviderFactory;
/** /**
* Created by eason on 15/4/21. * Created by eason on 15/4/21.
@ -56,18 +56,18 @@ public class BarIndependentChartInterface extends AbstractIndependentChartUIWith
@Override @Override
public String getName() { public String getName() {
return InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Bar"); return Toolkit.i18nText("Fine-Design_Chart_Type_Bar");
} }
@Override @Override
public String[] getSubName() { public String[] getSubName() {
String chartName = InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Bar"); String chartName = Toolkit.i18nText("Fine-Design_Chart_Type_Bar");
String stackChartName = InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Stacked") + chartName; String stackChartName = Toolkit.i18nText("Fine-Design_Chart_Type_Stacked") + chartName;
String perStackChartName = InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Use_Percent") + stackChartName; String perStackChartName = Toolkit.i18nText("Fine-Design_Chart_Use_Percent") + stackChartName;
String chartName3D = InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_3D") + chartName; String chartName3D = Toolkit.i18nText("Fine-Design_Chart_3D") + chartName;
String chartNameHoriz3D = chartName3D + "(" + InterProviderFactory.getProvider().getLocText("Fine-Engine_Report_Utils_Left_To_Right") + ")"; String chartNameHoriz3D = chartName3D + "(" + Toolkit.i18nText("Fine-Design_Report_Utils_Left_To_Right") + ")";
String stackChartName3D = InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_3D") + stackChartName; String stackChartName3D = Toolkit.i18nText("Fine-Design_Chart_3D") + stackChartName;
String perStackChartName3D = InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_3D") + perStackChartName; String perStackChartName3D = Toolkit.i18nText("Fine-Design_Chart_3D") + perStackChartName;
//依次,条形图-旧版本、堆积条形图-旧版本、百分比堆积条形图-旧版本、三维条形图-旧版本、三维条形图-旧版本(横向)、三维堆积条形图-旧版本、三维百分比堆积条形图-旧版本 //依次,条形图-旧版本、堆积条形图-旧版本、百分比堆积条形图-旧版本、三维条形图-旧版本、三维条形图-旧版本(横向)、三维堆积条形图-旧版本、三维百分比堆积条形图-旧版本
return new String[]{ return new String[]{

6
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.fun.impl.AbstractIndependentChartUIWithAPILevel;
import com.fr.design.chart.series.SeriesCondition.impl.BubblePlotDataSeriesConditionPane; import com.fr.design.chart.series.SeriesCondition.impl.BubblePlotDataSeriesConditionPane;
import com.fr.design.condition.ConditionAttributesPane; 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.ChartDataPane;
import com.fr.design.mainframe.chart.gui.ChartStylePane; import com.fr.design.mainframe.chart.gui.ChartStylePane;
import com.fr.design.mainframe.chart.gui.data.report.AbstractReportDataContentPane; import com.fr.design.mainframe.chart.gui.data.report.AbstractReportDataContentPane;
@ -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.style.series.BubbleSeriesPane;
import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane; import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane;
import com.fr.design.mainframe.chart.gui.type.BubblePlotPane; import com.fr.design.mainframe.chart.gui.type.BubblePlotPane;
import com.fr.locale.InterProviderFactory;
/** /**
* Created by eason on 15/4/21. * Created by eason on 15/4/21.
@ -51,13 +51,13 @@ public class BubbleIndependentChartInterface extends AbstractIndependentChartUIW
@Override @Override
public String getName() { public String getName() {
return InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Bubble_Chart"); return Toolkit.i18nText("Fine-Design_Chart_Bubble_Chart_OLD");
} }
@Override @Override
public String[] getSubName() { public String[] getSubName() {
return new String[]{ return new String[]{
InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Bubble_Chart") Toolkit.i18nText("Fine-Design_Chart_Bubble_Chart_OLD")
}; };
} }

18
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.Bar3DPlotDataSeriesConditionPane;
import com.fr.design.chart.series.SeriesCondition.impl.BarPlotDataSeriesConditionPane; import com.fr.design.chart.series.SeriesCondition.impl.BarPlotDataSeriesConditionPane;
import com.fr.design.condition.ConditionAttributesPane; 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.ChartDataPane;
import com.fr.design.mainframe.chart.gui.ChartStylePane; import com.fr.design.mainframe.chart.gui.ChartStylePane;
import com.fr.design.mainframe.chart.gui.data.report.AbstractReportDataContentPane; import com.fr.design.mainframe.chart.gui.data.report.AbstractReportDataContentPane;
@ -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.style.series.Bar3DSeriesPane;
import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane; import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane;
import com.fr.design.mainframe.chart.gui.type.ColumnPlotPane; import com.fr.design.mainframe.chart.gui.type.ColumnPlotPane;
import com.fr.locale.InterProviderFactory;
/** /**
* Created by eason on 15/4/21. * Created by eason on 15/4/21.
@ -57,18 +57,18 @@ public class ColumnIndependentChartInterface extends AbstractIndependentChartUIW
@Override @Override
public String getName() { public String getName() {
return InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Column"); return Toolkit.i18nText("Fine-Design_Chart_Type_Column");
} }
@Override @Override
public String[] getSubName() { public String[] getSubName() {
String chartName = InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Column"); String chartName = Toolkit.i18nText("Fine-Design_Chart_Type_Column");
String stackChartName = InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Stacked") + chartName; String stackChartName = Toolkit.i18nText("Fine-Design_Chart_Type_Stacked") + chartName;
String perStackChartName = InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Use_Percent") + stackChartName; String perStackChartName = Toolkit.i18nText("Fine-Design_Chart_Use_Percent") + stackChartName;
String chartName3D = InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_3D")+ chartName; String chartName3D = Toolkit.i18nText("Fine-Design_Chart_3D")+ chartName;
String chartNameHoriz3D = chartName3D + "(" + InterProviderFactory.getProvider().getLocText("Fine-Engine_Report_Utils_Left_To_Right") + ")"; String chartNameHoriz3D = chartName3D + "(" + Toolkit.i18nText("Fine-Design_Report_Utils_Left_To_Right") + ")";
String stackChartName3D = InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_3D") + stackChartName; String stackChartName3D = Toolkit.i18nText("Fine-Design_Chart_3D") + stackChartName;
String perStackChartName3D = InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_3D") + perStackChartName; String perStackChartName3D = Toolkit.i18nText("Fine-Design_Chart_3D") + perStackChartName;
//依次,柱形图-旧版本、堆积柱形图-旧版本、百分比堆积柱形图-旧版本、三维柱形图-旧版本、三维柱形图-旧版本(横向)、三维堆积柱形图-旧版本、三维百分比堆积柱形图-旧版本 //依次,柱形图-旧版本、堆积柱形图-旧版本、百分比堆积柱形图-旧版本、三维柱形图-旧版本、三维柱形图-旧版本(横向)、三维堆积柱形图-旧版本、三维百分比堆积柱形图-旧版本
return new String[]{ return new String[]{

6
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.fun.impl.AbstractIndependentChartUIWithAPILevel;
import com.fr.design.chart.series.SeriesCondition.DataSeriesCustomConditionPane; import com.fr.design.chart.series.SeriesCondition.DataSeriesCustomConditionPane;
import com.fr.design.condition.ConditionAttributesPane; 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.ChartDataPane;
import com.fr.design.mainframe.chart.gui.ChartStylePane; import com.fr.design.mainframe.chart.gui.ChartStylePane;
import com.fr.design.mainframe.chart.gui.data.report.AbstractReportDataContentPane; import com.fr.design.mainframe.chart.gui.data.report.AbstractReportDataContentPane;
@ -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.style.series.CustomSeriesPane;
import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane; import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane;
import com.fr.design.mainframe.chart.gui.type.CustomPlotPane; import com.fr.design.mainframe.chart.gui.type.CustomPlotPane;
import com.fr.locale.InterProviderFactory;
/** /**
* Created by eason on 15/4/21. * Created by eason on 15/4/21.
@ -53,13 +53,13 @@ public class CustomIndependentChartInterface extends AbstractIndependentChartUIW
@Override @Override
public String getName() { public String getName() {
return InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Combine"); return Toolkit.i18nText("Fine-Design_Chart_Type_Combine");
} }
@Override @Override
public String[] getSubName() { public String[] getSubName() {
return new String[]{ return new String[]{
InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Combine") Toolkit.i18nText("Fine-Design_Chart_Type_Combine")
}; };
} }

8
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.DataSeriesConditionPane;
import com.fr.design.chart.series.SeriesCondition.impl.Donut2DPlotDataSeriesConditionPane; import com.fr.design.chart.series.SeriesCondition.impl.Donut2DPlotDataSeriesConditionPane;
import com.fr.design.condition.ConditionAttributesPane; 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.ChartDataPane;
import com.fr.design.mainframe.chart.gui.ChartStylePane; import com.fr.design.mainframe.chart.gui.ChartStylePane;
import com.fr.design.mainframe.chart.gui.data.report.AbstractReportDataContentPane; import com.fr.design.mainframe.chart.gui.data.report.AbstractReportDataContentPane;
@ -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.style.series.Donut3DSeriesPane;
import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane; import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane;
import com.fr.design.mainframe.chart.gui.type.DonutPlotPane; import com.fr.design.mainframe.chart.gui.type.DonutPlotPane;
import com.fr.locale.InterProviderFactory;
/** /**
* Created by eason on 15/4/21. * Created by eason on 15/4/21.
@ -55,14 +55,14 @@ public class DonutIndependentChartInterface extends AbstractIndependentChartUIWi
@Override @Override
public String getName() { public String getName() {
return InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Donut"); return Toolkit.i18nText("Fine-Design_Chart_Type_Donut");
} }
@Override @Override
public String[] getSubName() { public String[] getSubName() {
return new String[]{ return new String[]{
InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Donut"), Toolkit.i18nText("Fine-Design_Chart_Type_Donut"),
InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_3D") + InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Donut") Toolkit.i18nText("Fine-Design_Chart_3D") + Toolkit.i18nText("Fine-Design_Chart_Type_Donut")
}; };
} }

6
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.fun.impl.AbstractIndependentChartUIWithAPILevel;
import com.fr.design.chart.series.SeriesCondition.impl.FunnelPlotDataSeriesConditionPane; import com.fr.design.chart.series.SeriesCondition.impl.FunnelPlotDataSeriesConditionPane;
import com.fr.design.condition.ConditionAttributesPane; 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.ChartDataPane;
import com.fr.design.mainframe.chart.gui.ChartStylePane; import com.fr.design.mainframe.chart.gui.ChartStylePane;
import com.fr.design.mainframe.chart.gui.data.report.AbstractReportDataContentPane; import com.fr.design.mainframe.chart.gui.data.report.AbstractReportDataContentPane;
@ -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.style.series.FunnelSeriesPane;
import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane; import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane;
import com.fr.design.mainframe.chart.gui.type.FunnelPlotPane; import com.fr.design.mainframe.chart.gui.type.FunnelPlotPane;
import com.fr.locale.InterProviderFactory;
/** /**
* Created by eason on 15/4/21. * Created by eason on 15/4/21.
@ -52,13 +52,13 @@ public class FunnelIndependentChartInterface extends AbstractIndependentChartUIW
@Override @Override
public String getName() { public String getName() {
return InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Funnel"); return Toolkit.i18nText("Fine-Design_Chart_Type_Funnel");
} }
@Override @Override
public String[] getSubName() { public String[] getSubName() {
return new String[]{ return new String[]{
InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Funnel") Toolkit.i18nText("Fine-Design_Chart_Type_Funnel")
}; };
} }

6
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.fun.impl.AbstractIndependentChartUIWithAPILevel;
import com.fr.design.chart.series.SeriesCondition.impl.GanttPlotDataSeriesConditionPane; import com.fr.design.chart.series.SeriesCondition.impl.GanttPlotDataSeriesConditionPane;
import com.fr.design.condition.ConditionAttributesPane; 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.ChartDataPane;
import com.fr.design.mainframe.chart.gui.data.report.AbstractReportDataContentPane; import com.fr.design.mainframe.chart.gui.data.report.AbstractReportDataContentPane;
import com.fr.design.mainframe.chart.gui.data.report.GanttPlotReportDataContentPane; 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.data.table.GanttPlotTableDataContentPane;
import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane; import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane;
import com.fr.design.mainframe.chart.gui.type.GanttPlotPane; import com.fr.design.mainframe.chart.gui.type.GanttPlotPane;
import com.fr.locale.InterProviderFactory;
/** /**
* Created by eason on 15/4/21. * Created by eason on 15/4/21.
@ -45,13 +45,13 @@ public class GanttIndependentChartInterface extends AbstractIndependentChartUIWi
@Override @Override
public String getName() { public String getName() {
return InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Gantt"); return Toolkit.i18nText("Fine-Design_Chart_Type_Gantt");
} }
@Override @Override
public String[] getSubName() { public String[] getSubName() {
return new String[]{ return new String[]{
InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Gantt") Toolkit.i18nText("Fine-Design_Chart_Type_Gantt")
}; };
} }

8
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.chart.chartattr.Plot;
import com.fr.design.chart.fun.impl.AbstractIndependentChartUIWithAPILevel; 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.ChartDataPane;
import com.fr.design.mainframe.chart.gui.data.report.AbstractReportDataContentPane; 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.data.table.AbstractTableDataContentPane;
import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane; import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane;
import com.fr.design.mainframe.chart.gui.type.GisMapPlotPane; import com.fr.design.mainframe.chart.gui.type.GisMapPlotPane;
import com.fr.locale.InterProviderFactory;
/** /**
* Created by eason on 15/4/21. * Created by eason on 15/4/21.
@ -38,14 +38,14 @@ public class GisMapIndependentChartInterface extends AbstractIndependentChartUIW
@Override @Override
public String getName() { public String getName() {
return InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_GIS_Map"); return Toolkit.i18nText("Fine-Design_Chart_GIS_Map_OLD");
} }
@Override @Override
public String[] getSubName() { public String[] getSubName() {
return new String[]{ return new String[]{
InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Map_BaiduMap"), Toolkit.i18nText("Fine-Design_Chart_Map_BaiduMap"),
InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Map_GoogleMap") Toolkit.i18nText("Fine-Design_Chart_Map_GoogleMap")
}; };
} }

6
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.DataSeriesConditionPane;
import com.fr.design.chart.series.SeriesCondition.impl.LinePlotDataSeriesConditionPane; import com.fr.design.chart.series.SeriesCondition.impl.LinePlotDataSeriesConditionPane;
import com.fr.design.condition.ConditionAttributesPane; 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.ChartDataPane;
import com.fr.design.mainframe.chart.gui.ChartStylePane; import com.fr.design.mainframe.chart.gui.ChartStylePane;
import com.fr.design.mainframe.chart.gui.data.report.AbstractReportDataContentPane; import com.fr.design.mainframe.chart.gui.data.report.AbstractReportDataContentPane;
@ -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.style.series.LineSeriesPane;
import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane; import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane;
import com.fr.design.mainframe.chart.gui.type.LinePlotPane; import com.fr.design.mainframe.chart.gui.type.LinePlotPane;
import com.fr.locale.InterProviderFactory;
/** /**
* Created by eason on 15/4/21. * Created by eason on 15/4/21.
@ -54,13 +54,13 @@ public class LineIndependentChartInterface extends AbstractIndependentChartUIWit
@Override @Override
public String getName() { public String getName() {
return InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Line"); return Toolkit.i18nText("Fine-Design_Chart_Type_Line");
} }
@Override @Override
public String[] getSubName() { public String[] getSubName() {
return new String[]{ return new String[]{
InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Line") Toolkit.i18nText("Fine-Design_Chart_Type_Line")
}; };
} }

6
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.fun.impl.AbstractIndependentChartUIWithAPILevel;
import com.fr.design.chart.series.SeriesCondition.impl.MapPlotDataSeriesConditionPane; import com.fr.design.chart.series.SeriesCondition.impl.MapPlotDataSeriesConditionPane;
import com.fr.design.condition.ConditionAttributesPane; 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.ChartDataPane;
import com.fr.design.mainframe.chart.gui.ChartStylePane; import com.fr.design.mainframe.chart.gui.ChartStylePane;
import com.fr.design.mainframe.chart.gui.data.report.AbstractReportDataContentPane; import com.fr.design.mainframe.chart.gui.data.report.AbstractReportDataContentPane;
@ -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.style.series.MapSeriesPane;
import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane; import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane;
import com.fr.design.mainframe.chart.gui.type.MapPlotPane; import com.fr.design.mainframe.chart.gui.type.MapPlotPane;
import com.fr.locale.InterProviderFactory;
/** /**
* Created by eason on 15/4/21. * Created by eason on 15/4/21.
@ -50,13 +50,13 @@ public class MapIndependentChartInterface extends AbstractIndependentChartUIWith
@Override @Override
public String getName() { public String getName() {
return InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_SVG_MAP"); return Toolkit.i18nText("Fine-Design_Chart_SVG_MAP");
} }
@Override @Override
public String[] getSubName() { public String[] getSubName() {
return new String[]{ return new String[]{
InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_SVG_MAP") Toolkit.i18nText("Fine-Design_Chart_SVG_MAP")
}; };
} }

10
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.chart.chartattr.Plot;
import com.fr.design.beans.BasicBeanPane; import com.fr.design.beans.BasicBeanPane;
import com.fr.design.chart.fun.impl.AbstractIndependentChartUIWithAPILevel; 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.ChartDataPane;
import com.fr.design.mainframe.chart.gui.ChartStylePane; import com.fr.design.mainframe.chart.gui.ChartStylePane;
import com.fr.design.mainframe.chart.gui.data.report.AbstractReportDataContentPane; import com.fr.design.mainframe.chart.gui.data.report.AbstractReportDataContentPane;
@ -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.style.series.MeterSeriesPane;
import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane; import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane;
import com.fr.design.mainframe.chart.gui.type.MeterPlotPane; import com.fr.design.mainframe.chart.gui.type.MeterPlotPane;
import com.fr.locale.InterProviderFactory;
/** /**
* Created by eason on 15/4/21. * Created by eason on 15/4/21.
@ -47,15 +47,15 @@ public class MeterIndependentChartInterface extends AbstractIndependentChartUIWi
@Override @Override
public String getName() { public String getName() {
return InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Meter"); return Toolkit.i18nText("Fine-Design_Chart_Type_Meter");
} }
@Override @Override
public String[] getSubName() { public String[] getSubName() {
return new String[]{ return new String[]{
InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Meter"), Toolkit.i18nText("Fine-Design_Chart_Type_Meter"),
InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Meter"), Toolkit.i18nText("Fine-Design_Chart_Type_Meter"),
InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Meter") Toolkit.i18nText("Fine-Design_Chart_Type_Meter")
}; };
} }

8
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.Pie3DPlotDataSeriesConditionPane;
import com.fr.design.chart.series.SeriesCondition.impl.PiePlotDataSeriesConditionPane; import com.fr.design.chart.series.SeriesCondition.impl.PiePlotDataSeriesConditionPane;
import com.fr.design.condition.ConditionAttributesPane; 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.ChartDataPane;
import com.fr.design.mainframe.chart.gui.ChartStylePane; import com.fr.design.mainframe.chart.gui.ChartStylePane;
import com.fr.design.mainframe.chart.gui.data.report.AbstractReportDataContentPane; import com.fr.design.mainframe.chart.gui.data.report.AbstractReportDataContentPane;
@ -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.style.series.Pie3DSeriesPane;
import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane; import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane;
import com.fr.design.mainframe.chart.gui.type.PiePlotPane; import com.fr.design.mainframe.chart.gui.type.PiePlotPane;
import com.fr.locale.InterProviderFactory;
/** /**
* Created by eason on 15/4/21. * Created by eason on 15/4/21.
@ -55,14 +55,14 @@ public class PieIndependentChartInterface extends AbstractIndependentChartUIWith
@Override @Override
public String getName() { public String getName() {
return InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Pie"); return Toolkit.i18nText("Fine-Design_Chart_Type_Pie");
} }
@Override @Override
public String[] getSubName() { public String[] getSubName() {
return new String[]{ return new String[]{
InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Pie"), Toolkit.i18nText("Fine-Design_Chart_Type_Pie"),
InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_3D") + InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Pie") Toolkit.i18nText("Fine-Design_Chart_3D") + Toolkit.i18nText("Fine-Design_Chart_Type_Pie")
}; };
} }

6
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.fun.impl.AbstractIndependentChartUIWithAPILevel;
import com.fr.design.chart.series.SeriesCondition.impl.RadarPlotDataSeriesConditionPane; import com.fr.design.chart.series.SeriesCondition.impl.RadarPlotDataSeriesConditionPane;
import com.fr.design.condition.ConditionAttributesPane; 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.ChartDataPane;
import com.fr.design.mainframe.chart.gui.ChartStylePane; import com.fr.design.mainframe.chart.gui.ChartStylePane;
import com.fr.design.mainframe.chart.gui.data.report.AbstractReportDataContentPane; import com.fr.design.mainframe.chart.gui.data.report.AbstractReportDataContentPane;
@ -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.style.series.RadarSeriesPane;
import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane; import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane;
import com.fr.design.mainframe.chart.gui.type.RadarPlotPane; import com.fr.design.mainframe.chart.gui.type.RadarPlotPane;
import com.fr.locale.InterProviderFactory;
/** /**
* Created by eason on 15/4/21. * Created by eason on 15/4/21.
@ -53,13 +53,13 @@ public class RadarIndependentChartInterface extends AbstractIndependentChartUIWi
@Override @Override
public String getName() { public String getName() {
return InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Radar"); return Toolkit.i18nText("Fine-Design_Chart_Type_Radar");
} }
@Override @Override
public String[] getSubName() { public String[] getSubName() {
return new String[]{ return new String[]{
InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Radar") Toolkit.i18nText("Fine-Design_Chart_Type_Radar")
}; };
} }

6
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.chart.chartattr.Plot;
import com.fr.design.beans.BasicBeanPane; import com.fr.design.beans.BasicBeanPane;
import com.fr.design.chart.fun.impl.AbstractIndependentChartUIWithAPILevel; 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.ChartDataPane;
import com.fr.design.mainframe.chart.gui.ChartStylePane; import com.fr.design.mainframe.chart.gui.ChartStylePane;
import com.fr.design.mainframe.chart.gui.data.report.AbstractReportDataContentPane; import com.fr.design.mainframe.chart.gui.data.report.AbstractReportDataContentPane;
@ -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.style.series.RangeSeriesPane;
import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane; import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane;
import com.fr.design.mainframe.chart.gui.type.RangePlotPane; import com.fr.design.mainframe.chart.gui.type.RangePlotPane;
import com.fr.locale.InterProviderFactory;
/** /**
* Created by eason on 15/4/21. * Created by eason on 15/4/21.
@ -46,13 +46,13 @@ public class RangeIndependentChartInterface extends AbstractIndependentChartUIWi
@Override @Override
public String getName() { public String getName() {
return InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Range"); return Toolkit.i18nText("Fine-Design_Chart_Type_Range");
} }
@Override @Override
public String[] getSubName() { public String[] getSubName() {
return new String[]{ return new String[]{
InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Range") Toolkit.i18nText("Fine-Design_Chart_Type_Range")
}; };
} }

6
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.DataSeriesConditionPane;
import com.fr.design.chart.series.SeriesCondition.impl.StockPlotDataSeriesConditionPane; import com.fr.design.chart.series.SeriesCondition.impl.StockPlotDataSeriesConditionPane;
import com.fr.design.condition.ConditionAttributesPane; 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.ChartDataPane;
import com.fr.design.mainframe.chart.gui.ChartStylePane; import com.fr.design.mainframe.chart.gui.ChartStylePane;
import com.fr.design.mainframe.chart.gui.data.report.AbstractReportDataContentPane; import com.fr.design.mainframe.chart.gui.data.report.AbstractReportDataContentPane;
@ -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.style.series.StockSeriesPane;
import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane; import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane;
import com.fr.design.mainframe.chart.gui.type.StockPlotPane; import com.fr.design.mainframe.chart.gui.type.StockPlotPane;
import com.fr.locale.InterProviderFactory;
/** /**
* Created by eason on 15/4/21. * Created by eason on 15/4/21.
@ -53,13 +53,13 @@ public class StockIndependentChartInterface extends AbstractIndependentChartUIWi
@Override @Override
public String getName() { public String getName() {
return InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Stock"); return Toolkit.i18nText("Fine-Design_Chart_Type_Stock");
} }
@Override @Override
public String[] getSubName() { public String[] getSubName() {
return new String[]{ return new String[]{
InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Stock") Toolkit.i18nText("Fine-Design_Chart_Type_Stock")
}; };
} }

6
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.DataSeriesConditionPane;
import com.fr.design.chart.series.SeriesCondition.impl.XYScatterPlotDataSeriesConditionPane; import com.fr.design.chart.series.SeriesCondition.impl.XYScatterPlotDataSeriesConditionPane;
import com.fr.design.condition.ConditionAttributesPane; 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.ChartDataPane;
import com.fr.design.mainframe.chart.gui.ChartStylePane; import com.fr.design.mainframe.chart.gui.ChartStylePane;
import com.fr.design.mainframe.chart.gui.data.report.AbstractReportDataContentPane; import com.fr.design.mainframe.chart.gui.data.report.AbstractReportDataContentPane;
@ -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.style.series.XYScatterSeriesPane;
import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane; import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane;
import com.fr.design.mainframe.chart.gui.type.XYScatterPlotPane; import com.fr.design.mainframe.chart.gui.type.XYScatterPlotPane;
import com.fr.locale.InterProviderFactory;
/** /**
* Created by eason on 15/4/21. * Created by eason on 15/4/21.
@ -55,13 +55,13 @@ public class XYScatterIndependentChartInterface extends AbstractIndependentChart
@Override @Override
public String getName() { public String getName() {
return InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_XYScatter"); return Toolkit.i18nText("Fine-Design_Chart_Type_XYScatter");
} }
@Override @Override
public String[] getSubName() { public String[] getSubName() {
return new String[]{ return new String[]{
InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_XYScatter") Toolkit.i18nText("Fine-Design_Chart_Type_XYScatter")
}; };
} }

5
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.chartglyph.ConditionCollection;
import com.fr.chart.charttypes.AreaIndependentChart; import com.fr.chart.charttypes.AreaIndependentChart;
import com.fr.design.i18n.Toolkit; import com.fr.design.i18n.Toolkit;
import com.fr.locale.InterProviderFactory;
/** /**
@ -35,7 +34,7 @@ public class AreaPlotPane extends AbstractDeprecatedChartTypePane {
@Override @Override
protected String[] getTypeTipName() { 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 stack = Toolkit.i18nText("Fine-Design_Chart_Stacked");
String percent = Toolkit.i18nText("Fine-Design_Chart_Use_Percent"); String percent = Toolkit.i18nText("Fine-Design_Chart_Use_Percent");
String td = Toolkit.i18nText("Fine-Design_Chart_3D"); String td = Toolkit.i18nText("Fine-Design_Chart_3D");
@ -143,7 +142,7 @@ public class AreaPlotPane extends AbstractDeprecatedChartTypePane {
* @return 界面标题 * @return 界面标题
*/ */
public String title4PopupWindow() { public String title4PopupWindow() {
return InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Area"); return Toolkit.i18nText("Fine-Design_Chart_Type_Area");
} }
public Chart getDefaultChart() { public Chart getDefaultChart() {

5
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.chartattr.Plot;
import com.fr.chart.charttypes.BarIndependentChart; import com.fr.chart.charttypes.BarIndependentChart;
import com.fr.design.i18n.Toolkit; import com.fr.design.i18n.Toolkit;
import com.fr.locale.InterProviderFactory;
import com.fr.log.FineLoggerFactory; import com.fr.log.FineLoggerFactory;
@ -33,7 +32,7 @@ public class BarPlotPane extends AbstractBarPane{
@Override @Override
protected String[] getTypeTipName() { 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 stack = Toolkit.i18nText("Fine-Design_Chart_Stacked");
String percent = Toolkit.i18nText("Fine-Design_Chart_Use_Percent"); String percent = Toolkit.i18nText("Fine-Design_Chart_Use_Percent");
String td = Toolkit.i18nText("Fine-Design_Chart_3D"); String td = Toolkit.i18nText("Fine-Design_Chart_3D");
@ -67,7 +66,7 @@ public class BarPlotPane extends AbstractBarPane{
* @return 界面标题 * @return 界面标题
*/ */
public String title4PopupWindow() { public String title4PopupWindow() {
return InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Bar"); return Toolkit.i18nText("Fine-Design_Chart_Type_Bar");
} }
protected Plot getSelectedClonedPlot(){ protected Plot getSelectedClonedPlot(){

6
designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/BubblePlotPane.java

@ -4,7 +4,7 @@ import com.fr.chart.base.ChartConstants;
import com.fr.chart.chartattr.BubblePlot; import com.fr.chart.chartattr.BubblePlot;
import com.fr.chart.chartattr.Chart; import com.fr.chart.chartattr.Chart;
import com.fr.chart.charttypes.BubbleIndependentChart; import com.fr.chart.charttypes.BubbleIndependentChart;
import com.fr.locale.InterProviderFactory; import com.fr.design.i18n.Toolkit;
/** /**
@ -26,7 +26,7 @@ public class BubblePlotPane extends AbstractDeprecatedChartTypePane {
@Override @Override
protected String[] getTypeTipName() { protected String[] getTypeTipName() {
return new String[]{ 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 界面标题 * @return 界面标题
*/ */
public String title4PopupWindow() { public String title4PopupWindow() {
return InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Bubble_Chart"); return Toolkit.i18nText("Fine-Design_Chart_Bubble_Chart_OLD");
} }
/** /**

5
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.chartattr.Plot;
import com.fr.chart.charttypes.ColumnIndependentChart; import com.fr.chart.charttypes.ColumnIndependentChart;
import com.fr.design.i18n.Toolkit; import com.fr.design.i18n.Toolkit;
import com.fr.locale.InterProviderFactory;
import com.fr.log.FineLoggerFactory; import com.fr.log.FineLoggerFactory;
@ -32,7 +31,7 @@ public class ColumnPlotPane extends AbstractBarPane{
@Override @Override
protected String[] getTypeTipName() { 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 stack = Toolkit.i18nText("Fine-Design_Chart_Stacked");
String percent = Toolkit.i18nText("Fine-Design_Chart_Use_Percent"); String percent = Toolkit.i18nText("Fine-Design_Chart_Use_Percent");
String td = Toolkit.i18nText("Fine-Design_Chart_3D"); String td = Toolkit.i18nText("Fine-Design_Chart_3D");
@ -65,7 +64,7 @@ public class ColumnPlotPane extends AbstractBarPane{
* @return 界面标题 * @return 界面标题
*/ */
public String title4PopupWindow() { public String title4PopupWindow() {
return InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Column"); return Toolkit.i18nText("Fine-Design_Chart_Type_Column");
} }
protected Plot getSelectedClonedPlot(){ protected Plot getSelectedClonedPlot(){

6
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.base.ChartConstants;
import com.fr.chart.chartattr.Chart; import com.fr.chart.chartattr.Chart;
import com.fr.chart.charttypes.CustomIndependentChart; 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 @Override
protected String[] getTypeTipName() { protected String[] getTypeTipName() {
return new String[]{ 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 界面标题 * @return 界面标题
*/ */
public String title4PopupWindow() { public String title4PopupWindow() {
return InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Combine"); return Toolkit.i18nText("Fine-Design_Chart_Type_Combine");
} }
/** /**

7
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.chartglyph.ConditionCollection;
import com.fr.chart.charttypes.DonutIndependentChart; import com.fr.chart.charttypes.DonutIndependentChart;
import com.fr.design.i18n.Toolkit; import com.fr.design.i18n.Toolkit;
import com.fr.locale.InterProviderFactory;
import com.fr.stable.Constants; import com.fr.stable.Constants;
import java.awt.Color;
import java.text.DecimalFormat; import java.text.DecimalFormat;
import java.awt.Color;
/** /**
* 圆环图的类型界面 * 圆环图的类型界面
@ -36,7 +35,7 @@ public class DonutPlotPane extends AbstractDeprecatedChartTypePane {
@Override @Override
protected String[] getTypeTipName() { 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[]{ return new String[]{
donut, donut,
Toolkit.i18nText("Fine-Design_Chart_3D") + donut Toolkit.i18nText("Fine-Design_Chart_3D") + donut
@ -104,7 +103,7 @@ public class DonutPlotPane extends AbstractDeprecatedChartTypePane {
* @return 标题 * @return 标题
*/ */
public String title4PopupWindow() { public String title4PopupWindow() {
return InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Donut"); return Toolkit.i18nText("Fine-Design_Chart_Type_Donut");
} }
/** /**

6
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.FunnelPlot;
import com.fr.chart.chartattr.Plot; import com.fr.chart.chartattr.Plot;
import com.fr.chart.charttypes.FunnelIndependentChart; import com.fr.chart.charttypes.FunnelIndependentChart;
import com.fr.locale.InterProviderFactory; import com.fr.design.i18n.Toolkit;
import java.text.DecimalFormat; import java.text.DecimalFormat;
@ -31,7 +31,7 @@ public class FunnelPlotPane extends AbstractDeprecatedChartTypePane {
@Override @Override
protected String[] getTypeTipName() { protected String[] getTypeTipName() {
return new String[]{ 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 界面标题 * @return 界面标题
*/ */
public String title4PopupWindow() { public String title4PopupWindow() {
return InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Funnel"); return Toolkit.i18nText("Fine-Design_Chart_Type_Funnel");
} }
/** /**

6
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.base.ChartConstants;
import com.fr.chart.chartattr.Chart; import com.fr.chart.chartattr.Chart;
import com.fr.chart.charttypes.GanttIndependentChart; 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 @Override
protected String[] getTypeTipName() { protected String[] getTypeTipName() {
return new String[]{ 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 界面标题 * @return 界面标题
*/ */
public String title4PopupWindow() { public String title4PopupWindow() {
return InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Gantt"); return Toolkit.i18nText("Fine-Design_Chart_Type_Gantt");
} }
/** /**

6
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.chart.series.PlotStyle.ChartSelectDemoPane;
import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.ilable.UILabel;
import com.fr.design.gui.itextfield.UITextField; import com.fr.design.gui.itextfield.UITextField;
import com.fr.design.i18n.Toolkit;
import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.layout.FRGUIPaneFactory;
import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayout;
import com.fr.design.layout.TableLayoutHelper; import com.fr.design.layout.TableLayoutHelper;
import com.fr.locale.InterProviderFactory;
import com.fr.log.FineLoggerFactory; import com.fr.log.FineLoggerFactory;
import com.fr.stable.AssistUtils; import com.fr.stable.AssistUtils;
@ -74,7 +74,7 @@ public class GisMapPlotPane extends AbstractDeprecatedChartTypePane {
@Override @Override
protected String[] getTypeTipName() { protected String[] getTypeTipName() {
return new String[]{ 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 标题 * @return 标题
*/ */
public String title4PopupWindow() { public String title4PopupWindow() {
return InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_GIS_Map"); return Toolkit.i18nText("Fine-Design_Chart_GIS_Map_OLD");
} }
/** /**

6
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.LinePlot;
import com.fr.chart.chartattr.Plot; import com.fr.chart.chartattr.Plot;
import com.fr.chart.charttypes.LineIndependentChart; import com.fr.chart.charttypes.LineIndependentChart;
import com.fr.locale.InterProviderFactory; import com.fr.design.i18n.Toolkit;
import com.fr.log.FineLoggerFactory; import com.fr.log.FineLoggerFactory;
@ -22,7 +22,7 @@ public class LinePlotPane extends AbstractDeprecatedChartTypePane {
@Override @Override
protected String[] getTypeTipName() { protected String[] getTypeTipName() {
return new String[]{ 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() { public String title4PopupWindow() {
return InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Line"); return Toolkit.i18nText("Fine-Design_Chart_Type_Line");
} }
public Chart getDefaultChart() { public Chart getDefaultChart() {

4
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.chart.charttypes.MapIndependentChart;
import com.fr.design.chart.series.PlotSeries.MapGroupExtensionPane; import com.fr.design.chart.series.PlotSeries.MapGroupExtensionPane;
import com.fr.design.chart.series.PlotStyle.ChartSelectDemoPane; import com.fr.design.chart.series.PlotStyle.ChartSelectDemoPane;
import com.fr.design.i18n.Toolkit;
import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.layout.FRGUIPaneFactory;
import com.fr.locale.InterProviderFactory;
import com.fr.log.FineLoggerFactory; import com.fr.log.FineLoggerFactory;
import javax.swing.JPanel; import javax.swing.JPanel;
@ -72,7 +72,7 @@ public class MapPlotPane extends AbstractDeprecatedChartTypePane {
* @return 界面标题 * @return 界面标题
*/ */
public String title4PopupWindow() { public String title4PopupWindow() {
return InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_SVG_MAP"); return Toolkit.i18nText("Fine-Design_Chart_SVG_MAP");
} }
/** /**

5
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.chartglyph.MeterStyle;
import com.fr.chart.charttypes.MeterIndependentChart; import com.fr.chart.charttypes.MeterIndependentChart;
import com.fr.design.i18n.Toolkit; import com.fr.design.i18n.Toolkit;
import com.fr.locale.InterProviderFactory;
import com.fr.log.FineLoggerFactory; import com.fr.log.FineLoggerFactory;
@ -33,7 +32,7 @@ public class MeterPlotPane extends AbstractDeprecatedChartTypePane {
@Override @Override
protected String[] getTypeTipName() { 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[]{ return new String[]{
Toolkit.i18nText("Fine-Design_Chart_Mode_Custom") + meter, Toolkit.i18nText("Fine-Design_Chart_Mode_Custom") + meter,
meter + "1", meter + "1",
@ -81,7 +80,7 @@ public class MeterPlotPane extends AbstractDeprecatedChartTypePane {
* @return 界面标题 * @return 界面标题
*/ */
public String title4PopupWindow() { public String title4PopupWindow() {
return InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Meter"); return Toolkit.i18nText("Fine-Design_Chart_Type_Meter");
} }
/** /**

8
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.chartattr.Plot;
import com.fr.chart.chartglyph.ConditionCollection; import com.fr.chart.chartglyph.ConditionCollection;
import com.fr.chart.charttypes.PieIndependentChart; import com.fr.chart.charttypes.PieIndependentChart;
import com.fr.locale.InterProviderFactory; import com.fr.design.i18n.Toolkit;
import com.fr.stable.Constants; import com.fr.stable.Constants;
import java.awt.Color;
import java.text.DecimalFormat; import java.text.DecimalFormat;
import java.awt.Color;
/** /**
* 饼图 属性表 选择类型 布局界面. * 饼图 属性表 选择类型 布局界面.
@ -36,7 +36,7 @@ public class PiePlotPane extends AbstractDeprecatedChartTypePane {
@Override @Override
protected String[] getTypeTipName() { 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[]{ return new String[]{
pie, pie,
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_3D") + pie com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_3D") + pie
@ -63,7 +63,7 @@ public class PiePlotPane extends AbstractDeprecatedChartTypePane {
* @return 界面标题 * @return 界面标题
*/ */
public String title4PopupWindow() { 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) { private void createPieCondition(Plot plot) {

6
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.base.ChartConstants;
import com.fr.chart.chartattr.Chart; import com.fr.chart.chartattr.Chart;
import com.fr.chart.charttypes.RadarIndependentChart; 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 @Override
protected String[] getTypeTipName() { protected String[] getTypeTipName() {
return new String[]{ 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 界面标题 * @return 界面标题
*/ */
public String title4PopupWindow() { public String title4PopupWindow() {
return InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Radar"); return Toolkit.i18nText("Fine-Design_Chart_Type_Radar");
} }
/** /**

6
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.Chart;
import com.fr.chart.chartattr.RangePlot; import com.fr.chart.chartattr.RangePlot;
import com.fr.chart.charttypes.RangeIndependentChart; 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 @Override
protected String[] getTypeTipName() { protected String[] getTypeTipName() {
return new String[]{ 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 界面标题 * @return 界面标题
*/ */
public String title4PopupWindow() { public String title4PopupWindow() {
return InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Range"); return Toolkit.i18nText("Fine-Design_Chart_Type_Range");
} }
/** /**

6
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.base.ChartConstants;
import com.fr.chart.chartattr.Chart; import com.fr.chart.chartattr.Chart;
import com.fr.chart.charttypes.StockIndependentChart; 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 @Override
protected String[] getTypeTipName() { protected String[] getTypeTipName() {
return new String[]{ 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 界面标题 * @return 界面标题
*/ */
public String title4PopupWindow() { public String title4PopupWindow() {
return InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Stock"); return Toolkit.i18nText("Fine-Design_Chart_Type_Stock");
} }
/** /**

6
designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/XYScatterPlotPane.java

@ -6,7 +6,7 @@ import com.fr.chart.chartattr.Chart;
import com.fr.chart.chartattr.XYScatterPlot; import com.fr.chart.chartattr.XYScatterPlot;
import com.fr.chart.chartglyph.ConditionAttr; import com.fr.chart.chartglyph.ConditionAttr;
import com.fr.chart.charttypes.XYScatterIndependentChart; import com.fr.chart.charttypes.XYScatterIndependentChart;
import com.fr.locale.InterProviderFactory; import com.fr.design.i18n.Toolkit;
import com.fr.stable.Constants; import com.fr.stable.Constants;
/** /**
@ -28,7 +28,7 @@ public class XYScatterPlotPane extends AbstractDeprecatedChartTypePane {
@Override @Override
protected String[] getTypeTipName() { protected String[] getTypeTipName() {
return new String[]{ return new String[]{
InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_XYScatter") Toolkit.i18nText("Fine-Design_Chart_Type_XYScatter")
}; };
} }
@ -47,7 +47,7 @@ public class XYScatterPlotPane extends AbstractDeprecatedChartTypePane {
* @return 界面标题 * @return 界面标题
*/ */
public String title4PopupWindow() { public String title4PopupWindow() {
return InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_XYScatter"); return Toolkit.i18nText("Fine-Design_Chart_Type_XYScatter");
} }
/** /**

Loading…
Cancel
Save