CHART-10603 国际化方法修改

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 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[]{
                 stackChartName,

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 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[]{

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")
         };
     }
 

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 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[]{

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")
         };
     }
 

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"),
+                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")
         };
     }
 

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")
         };
     }
 

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")
         };
     }
 

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"),
+                Toolkit.i18nText("Fine-Design_Chart_Map_BaiduMap"),
-                InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Map_GoogleMap")
+                Toolkit.i18nText("Fine-Design_Chart_Map_GoogleMap")
         };
     }
 

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")
         };
     }
 

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")
         };
     }
 

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"),
+                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")
         };
     }
 

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"),
+                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")
         };
     }
 

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")
         };
     }
 

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")
         };
     }
 

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")
         };
     }
 

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")
         };
     }
 

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() {

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(){

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();
 	}
 

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(){

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");
 	}
 
 	/**

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");
     }
 
     /**

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");
     }
 
     /**

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");
 	}
 
 	/**

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");
 	}
 
     /**

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() {

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");
 	}
 
 	/**

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");
     }
 
     /**

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) {

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();
 	}
 

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();
 	}
 

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");
 	}
 
 	/**

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) {