Merge pull request #1133 in DESIGN/design from ~BJORN/design:feature/10.0 to feature/10.0

* commit '894fd9f4adffccf516892642bd57942cf512318e':
  CHART-10603 包名和类型修改
  CHART-10603 getSubName方法修改
  CHART-10603 国际化方法修改
  CHART-10603 旧版本图表的name和path处理

designer-chart/src/main/java/com/fr/design/ChartTypeInterfaceManager.java

@@ -11,23 +11,23 @@ import com.fr.design.beans.BasicBeanPane;
 import com.fr.design.beans.FurtherBasicBeanPane;
 import com.fr.design.chart.fun.ChartTypeUIProvider;
 import com.fr.design.chart.gui.ChartWidgetOption;
-import com.fr.design.chartinterface.AreaIndependentChartInterface;
+import com.fr.design.type.ui.AreaChartTypeUI;
-import com.fr.design.chartinterface.BarIndependentChartInterface;
+import com.fr.design.type.ui.BarChartTypeUI;
-import com.fr.design.chartinterface.BubbleIndependentChartInterface;
+import com.fr.design.type.ui.BubbleChartTypeUI;
-import com.fr.design.chartinterface.ColumnIndependentChartInterface;
+import com.fr.design.type.ui.ColumnChartTypeUI;
-import com.fr.design.chartinterface.CustomIndependentChartInterface;
+import com.fr.design.type.ui.CustomChartTypeUI;
-import com.fr.design.chartinterface.DonutIndependentChartInterface;
+import com.fr.design.type.ui.DonutChartTypeUI;
-import com.fr.design.chartinterface.FunnelIndependentChartInterface;
+import com.fr.design.type.ui.FunnelChartTypeUI;
-import com.fr.design.chartinterface.GanttIndependentChartInterface;
+import com.fr.design.type.ui.GanttChartTypeUI;
-import com.fr.design.chartinterface.GisMapIndependentChartInterface;
+import com.fr.design.type.ui.GisMapChartTypeUI;
-import com.fr.design.chartinterface.LineIndependentChartInterface;
+import com.fr.design.type.ui.LineChartTypeUI;
-import com.fr.design.chartinterface.MapIndependentChartInterface;
+import com.fr.design.type.ui.MapChartTypeUI;
-import com.fr.design.chartinterface.MeterIndependentChartInterface;
+import com.fr.design.type.ui.MeterChartTypeUI;
-import com.fr.design.chartinterface.PieIndependentChartInterface;
+import com.fr.design.type.ui.PieChartTypeUI;
-import com.fr.design.chartinterface.RadarIndependentChartInterface;
+import com.fr.design.type.ui.RadarChartTypeUI;
-import com.fr.design.chartinterface.RangeIndependentChartInterface;
+import com.fr.design.type.ui.RangeChartTypeUI;
-import com.fr.design.chartinterface.StockIndependentChartInterface;
+import com.fr.design.type.ui.StockChartTypeUI;
-import com.fr.design.chartinterface.XYScatterIndependentChartInterface;
+import com.fr.design.type.ui.XYScatterChartTypeUI;
 import com.fr.design.condition.ConditionAttributesPane;
 import com.fr.design.gui.core.WidgetOption;
 import com.fr.design.gui.frpane.AttributeChangeListener;
@@ -205,23 +205,23 @@ public class ChartTypeInterfaceManager implements ExtraChartDesignClassManagerPr
 
     private static void readDefault() {
 
-        addChartTypeInterface(DEPRECATED_CHART_PRIORITY, ChartConstants.COLUMN_CHART, new ColumnIndependentChartInterface());
+        addChartTypeInterface(DEPRECATED_CHART_PRIORITY, ChartConstants.COLUMN_CHART, new ColumnChartTypeUI());
-        addChartTypeInterface(DEPRECATED_CHART_PRIORITY, ChartConstants.LINE_CHART, new LineIndependentChartInterface());
+        addChartTypeInterface(DEPRECATED_CHART_PRIORITY, ChartConstants.LINE_CHART, new LineChartTypeUI());
-        addChartTypeInterface(DEPRECATED_CHART_PRIORITY, ChartConstants.BAR_CHART, new BarIndependentChartInterface());
+        addChartTypeInterface(DEPRECATED_CHART_PRIORITY, ChartConstants.BAR_CHART, new BarChartTypeUI());
-        addChartTypeInterface(DEPRECATED_CHART_PRIORITY, ChartConstants.PIE_CHART, new PieIndependentChartInterface());
+        addChartTypeInterface(DEPRECATED_CHART_PRIORITY, ChartConstants.PIE_CHART, new PieChartTypeUI());
-        addChartTypeInterface(DEPRECATED_CHART_PRIORITY, ChartConstants.AREA_CHART, new AreaIndependentChartInterface());
+        addChartTypeInterface(DEPRECATED_CHART_PRIORITY, ChartConstants.AREA_CHART, new AreaChartTypeUI());
-        addChartTypeInterface(DEPRECATED_CHART_PRIORITY, ChartConstants.SCATTER_CHART, new XYScatterIndependentChartInterface());
+        addChartTypeInterface(DEPRECATED_CHART_PRIORITY, ChartConstants.SCATTER_CHART, new XYScatterChartTypeUI());
-        addChartTypeInterface(DEPRECATED_CHART_PRIORITY, ChartConstants.BUBBLE_CHART, new BubbleIndependentChartInterface());
+        addChartTypeInterface(DEPRECATED_CHART_PRIORITY, ChartConstants.BUBBLE_CHART, new BubbleChartTypeUI());
-        addChartTypeInterface(DEPRECATED_CHART_PRIORITY, ChartConstants.RADAR_CHART, new RadarIndependentChartInterface());
+        addChartTypeInterface(DEPRECATED_CHART_PRIORITY, ChartConstants.RADAR_CHART, new RadarChartTypeUI());
-        addChartTypeInterface(DEPRECATED_CHART_PRIORITY, ChartConstants.STOCK_CHART, new StockIndependentChartInterface());
+        addChartTypeInterface(DEPRECATED_CHART_PRIORITY, ChartConstants.STOCK_CHART, new StockChartTypeUI());
-        addChartTypeInterface(DEPRECATED_CHART_PRIORITY, ChartConstants.METER_CHART, new MeterIndependentChartInterface());
+        addChartTypeInterface(DEPRECATED_CHART_PRIORITY, ChartConstants.METER_CHART, new MeterChartTypeUI());
-        addChartTypeInterface(DEPRECATED_CHART_PRIORITY, ChartConstants.RANGE_CHART, new RangeIndependentChartInterface());
+        addChartTypeInterface(DEPRECATED_CHART_PRIORITY, ChartConstants.RANGE_CHART, new RangeChartTypeUI());
-        addChartTypeInterface(DEPRECATED_CHART_PRIORITY, ChartConstants.CUSTOM_CHART, new CustomIndependentChartInterface());
+        addChartTypeInterface(DEPRECATED_CHART_PRIORITY, ChartConstants.CUSTOM_CHART, new CustomChartTypeUI());
-        addChartTypeInterface(DEPRECATED_CHART_PRIORITY, ChartConstants.GANTT_CHART, new GanttIndependentChartInterface());
+        addChartTypeInterface(DEPRECATED_CHART_PRIORITY, ChartConstants.GANTT_CHART, new GanttChartTypeUI());
-        addChartTypeInterface(DEPRECATED_CHART_PRIORITY, ChartConstants.DONUT_CHART, new DonutIndependentChartInterface());
+        addChartTypeInterface(DEPRECATED_CHART_PRIORITY, ChartConstants.DONUT_CHART, new DonutChartTypeUI());
-        addChartTypeInterface(DEPRECATED_CHART_PRIORITY, ChartConstants.MAP_CHART, new MapIndependentChartInterface());
+        addChartTypeInterface(DEPRECATED_CHART_PRIORITY, ChartConstants.MAP_CHART, new MapChartTypeUI());
-        addChartTypeInterface(DEPRECATED_CHART_PRIORITY, ChartConstants.GIS_CHAER, new GisMapIndependentChartInterface());
+        addChartTypeInterface(DEPRECATED_CHART_PRIORITY, ChartConstants.GIS_CHAER, new GisMapChartTypeUI());
-        addChartTypeInterface(DEPRECATED_CHART_PRIORITY, ChartConstants.FUNNEL_CHART, new FunnelIndependentChartInterface());
+        addChartTypeInterface(DEPRECATED_CHART_PRIORITY, ChartConstants.FUNNEL_CHART, new FunnelChartTypeUI());
     }
 
     private static void addChartTypeInterface(String priority, String plotID, ChartTypeUIProvider provider) {

designer-chart/src/main/java/com/fr/design/chart/fun/impl/AbstractIndependentChartUIWithAPILevel.java

@@ -29,43 +29,33 @@ public abstract class AbstractIndependentChartUIWithAPILevel implements ChartTyp
         return OLD_PLUGIN_LEVEL;
     }
 
-    public AbstractChartAttrPane[] getAttrPaneArray(AttributeChangeListener listener){
+    public AbstractChartAttrPane[] getAttrPaneArray(AttributeChangeListener listener) {
         return new AbstractChartAttrPane[0];
     }
 
-    public ChartDataPane getChartDataPane(AttributeChangeListener listener){
+    public ChartDataPane getChartDataPane(AttributeChangeListener listener) {
         return new ChartDataPane(listener);
     }
 
-    //todo@bjornrefactor 适配旧版本图表后 删掉下面两个方法
-    @Override
-    public String getName() {
-        return null;
-    }
-
     @Override
     public String[] getSubName() {
-        return new String[0];
+        return new String[]{getName()};
-    }
-
-    @Override
-    public String[] getDemoImagePath() {
-        return new String[0];
     }
 
     /**
      * 是否使用默认的界面，为了避免界面来回切换
+     *
      * @return 是否使用默认的界面
      */
-    public boolean isUseDefaultPane(){
+    public boolean isUseDefaultPane() {
         return true;
     }
 
-    public BasicBeanPane<Plot> getPlotSeriesPane(ChartStylePane parent, Plot plot){
+    public BasicBeanPane<Plot> getPlotSeriesPane(ChartStylePane parent, Plot plot) {
         return getPlotSeriesPane();
     }
 
-    public BasicBeanPane<Plot> getPlotSeriesPane(){
+    public BasicBeanPane<Plot> getPlotSeriesPane() {
         return null;
     }
 
@@ -78,11 +68,15 @@ public abstract class AbstractIndependentChartUIWithAPILevel implements ChartTyp
         return true;
     }
 
-    public ConditionAttributesPane getPlotConditionPane(Plot plot){
+    public ConditionAttributesPane getPlotConditionPane(Plot plot) {
         return new DataSeriesConditionPane();
     }
 
-    public ChartEditPane getChartEditPane(String plotID){ return StableUtils.construct(ChartEditPane.class);}
+    public ChartEditPane getChartEditPane(String plotID) {
+        return StableUtils.construct(ChartEditPane.class);
+    }
 
-    public ChartsConfigPane getChartConfigPane(String plotID){return null;}
+    public ChartsConfigPane getChartConfigPane(String plotID) {
+        return null;
+    }
 }

designer-chart/src/main/java/com/fr/design/chartinterface/BarIndependentChartInterface.java

@@ -1,55 +0,0 @@
-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.chart.series.SeriesCondition.impl.Bar2DTrendLineDSConditionPane;
-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.mainframe.chart.gui.ChartDataPane;
-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.CategoryPlotReportDataContentPane;
-import com.fr.design.mainframe.chart.gui.data.table.AbstractTableDataContentPane;
-import com.fr.design.mainframe.chart.gui.data.table.CategoryPlotTableDataContentPane;
-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;
-
-/**
- * Created by eason on 15/4/21.
- */
-public class BarIndependentChartInterface extends AbstractIndependentChartUIWithAPILevel {
-
-    public AbstractChartTypePane getPlotTypePane(){
-        return new BarPlotPane();
-    }
-
-    public AbstractTableDataContentPane getTableDataSourcePane(Plot plot, ChartDataPane parent){
-        return new CategoryPlotTableDataContentPane(parent);
-    }
-
-    public AbstractReportDataContentPane getReportDataSourcePane(Plot plot, ChartDataPane parent){
-        return new CategoryPlotReportDataContentPane(parent);
-    }
-
-    public BasicBeanPane<Plot> getPlotSeriesPane(ChartStylePane parent, Plot plot){
-        return plot.isSupport3D() ? new Bar3DSeriesPane(parent, plot) : new Bar2DSeriesPane(parent, plot);
-    }
-
-    public ConditionAttributesPane getPlotConditionPane(Plot plot){
-        return plot.isSupport3D() ? new Bar3DPlotDataSeriesConditionPane()
-                                    : (plot.isSupportTrendLine() ? new Bar2DTrendLineDSConditionPane() : new BarPlotDataSeriesConditionPane());
-    }
-
-    /**
-     *图标路径
-     * @return 图标路径
-     */
-    public String getIconPath(){
-        return "com/fr/design/images/form/toolbar/ChartF-Bar.png";
-    }
-
-}

designer-chart/src/main/java/com/fr/design/chartinterface/ColumnIndependentChartInterface.java

@@ -1,55 +0,0 @@
-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.chart.series.SeriesCondition.impl.Bar2DTrendLineDSConditionPane;
-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.mainframe.chart.gui.ChartDataPane;
-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.CategoryPlotMoreCateReportDataContentPane;
-import com.fr.design.mainframe.chart.gui.data.table.AbstractTableDataContentPane;
-import com.fr.design.mainframe.chart.gui.data.table.CategoryPlotMoreCateTableDataContentPane;
-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;
-
-/**
- * Created by eason on 15/4/21.
- */
-public class ColumnIndependentChartInterface extends AbstractIndependentChartUIWithAPILevel {
-
-    public AbstractChartTypePane getPlotTypePane(){
-        return new ColumnPlotPane();
-    }
-
-
-    public AbstractTableDataContentPane getTableDataSourcePane(Plot plot, ChartDataPane parent){
-        return new CategoryPlotMoreCateTableDataContentPane(parent);
-    }
-
-    public AbstractReportDataContentPane getReportDataSourcePane(Plot plot, ChartDataPane parent){
-        return new CategoryPlotMoreCateReportDataContentPane(parent);
-    }
-
-    public BasicBeanPane<Plot> getPlotSeriesPane(ChartStylePane parent, Plot plot){
-        return plot.isSupport3D() ? new Bar3DSeriesPane(parent, plot) : new Bar2DSeriesPane(parent, plot);
-    }
-
-    public ConditionAttributesPane getPlotConditionPane(Plot plot){
-        return plot.isSupport3D() ? new Bar3DPlotDataSeriesConditionPane()
-                : (plot.isSupportTrendLine() ? new Bar2DTrendLineDSConditionPane() : new BarPlotDataSeriesConditionPane());
-    }
-
-    /**
-     *图标路径
-     * @return 图标路径
-     */
-    public String getIconPath(){
-        return "com/fr/design/images/form/toolbar/ChartF-Column.png";
-    }
-}

designer-chart/src/main/java/com/fr/design/chartinterface/GisMapIndependentChartInterface.java

@@ -1,36 +0,0 @@
-package com.fr.design.chartinterface;
-
-import com.fr.chart.chartattr.Plot;
-import com.fr.design.chart.fun.impl.AbstractIndependentChartUIWithAPILevel;
-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;
-
-/**
- * Created by eason on 15/4/21.
- */
-public class GisMapIndependentChartInterface extends AbstractIndependentChartUIWithAPILevel {
-
-
-    public AbstractChartTypePane getPlotTypePane(){
-        return new GisMapPlotPane();
-    }
-
-    public AbstractTableDataContentPane getTableDataSourcePane(Plot plot, ChartDataPane parent){
-        return null;
-    }
-
-    public AbstractReportDataContentPane getReportDataSourcePane(Plot plot, ChartDataPane parent){
-        return null;
-    }
-    /**
-     *图标路径
-     * @return 图标路径
-     */
-    public String getIconPath(){
-        return "com/fr/design/images/form/toolbar/ChartF-Gis.png";
-    }
-
-}

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

designer-chart/src/main/java/com/fr/design/type/ui/AreaChartTypeUI.java

@@ -1,4 +1,4 @@
-package com.fr.design.chartinterface;
+package com.fr.design.type.ui;
 
 import com.fr.chart.chartattr.Plot;
 import com.fr.design.beans.BasicBeanPane;
@@ -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;
@@ -20,34 +21,65 @@ import com.fr.design.mainframe.chart.gui.type.AreaPlotPane;
 /**
  * Created by eason on 15/4/21.
  */
-public class AreaIndependentChartInterface extends AbstractIndependentChartUIWithAPILevel {
+public class AreaChartTypeUI extends AbstractIndependentChartUIWithAPILevel {
 
-    public AbstractChartTypePane getPlotTypePane(){
+    public AbstractChartTypePane getPlotTypePane() {
         return new AreaPlotPane();
     }
 
-    public AbstractTableDataContentPane getTableDataSourcePane(Plot plot, ChartDataPane parent){
+    public AbstractTableDataContentPane getTableDataSourcePane(Plot plot, ChartDataPane parent) {
         return new CategoryPlotTableDataContentPane(parent);
     }
 
-    public AbstractReportDataContentPane getReportDataSourcePane(Plot plot, ChartDataPane parent){
+    public AbstractReportDataContentPane getReportDataSourcePane(Plot plot, ChartDataPane parent) {
         return new CategoryPlotReportDataContentPane(parent);
     }
 
-    public BasicBeanPane<Plot> getPlotSeriesPane(ChartStylePane parent, Plot plot){
+    public BasicBeanPane<Plot> getPlotSeriesPane(ChartStylePane parent, Plot plot) {
         return plot.isSupport3D() ? new Area3DSeriesPane(parent, plot) : new AreaSeriesPane(parent, plot);
     }
 
-    public ConditionAttributesPane getPlotConditionPane(Plot plot){
+    public ConditionAttributesPane getPlotConditionPane(Plot plot) {
         return plot.isSupport3D() ? new Area3DPlotDataSeriesConditionPane() : new AreaPlotDataSeriesCondtionPane();
     }
 
     /**
-     *图标路径
+     * 图标路径
+     *
      * @return 图标路径
      */
-    public String getIconPath(){
+    public String getIconPath() {
         return "com/fr/design/images/form/toolbar/ChartF-Area.png";
     }
 
+    @Override
+    public String getName() {
+        return Toolkit.i18nText("Fine-Design_Chart_Type_Area");
+    }
+
+    @Override
+    public String[] getSubName() {
+        String chartName = Toolkit.i18nText("Fine-Design_Chart_Type_Area");
+        String stackChartName = Toolkit.i18nText("Fine-Design_Chart_Type_Stacked") + chartName;
+        String perStackChartName = Toolkit.i18nText("Fine-Design_Chart_Use_Percent") + stackChartName;
+        String stackChartName3D = Toolkit.i18nText("Fine-Design_Chart_3D") + stackChartName;
+        String perStackChartName3D = Toolkit.i18nText("Fine-Design_Chart_3D") + perStackChartName;
+
+        return new String[]{
+                stackChartName,
+                perStackChartName,
+                stackChartName3D,
+                perStackChartName3D
+        };
+    }
+
+    @Override
+    public String[] getDemoImagePath() {
+        return new String[]{
+                "com/fr/plugin/chart/demo/image/areastacked.png",
+                "com/fr/plugin/chart/demo/image/areastackedpercent.png",
+                "com/fr/plugin/chart/demo/image/areastacked3D.png",
+                "com/fr/plugin/chart/demo/image/areastackedpercent3D.png",
+        };
+    }
 }

designer-chart/src/main/java/com/fr/design/type/ui/BarChartTypeUI.java

@@ -0,0 +1,97 @@
+package com.fr.design.type.ui;
+
+import com.fr.chart.chartattr.Plot;
+import com.fr.design.beans.BasicBeanPane;
+import com.fr.design.chart.fun.impl.AbstractIndependentChartUIWithAPILevel;
+import com.fr.design.chart.series.SeriesCondition.impl.Bar2DTrendLineDSConditionPane;
+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;
+import com.fr.design.mainframe.chart.gui.data.report.CategoryPlotReportDataContentPane;
+import com.fr.design.mainframe.chart.gui.data.table.AbstractTableDataContentPane;
+import com.fr.design.mainframe.chart.gui.data.table.CategoryPlotTableDataContentPane;
+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;
+
+/**
+ * Created by eason on 15/4/21.
+ */
+public class BarChartTypeUI extends AbstractIndependentChartUIWithAPILevel {
+
+    public AbstractChartTypePane getPlotTypePane() {
+        return new BarPlotPane();
+    }
+
+    public AbstractTableDataContentPane getTableDataSourcePane(Plot plot, ChartDataPane parent) {
+        return new CategoryPlotTableDataContentPane(parent);
+    }
+
+    public AbstractReportDataContentPane getReportDataSourcePane(Plot plot, ChartDataPane parent) {
+        return new CategoryPlotReportDataContentPane(parent);
+    }
+
+    public BasicBeanPane<Plot> getPlotSeriesPane(ChartStylePane parent, Plot plot) {
+        return plot.isSupport3D() ? new Bar3DSeriesPane(parent, plot) : new Bar2DSeriesPane(parent, plot);
+    }
+
+    public ConditionAttributesPane getPlotConditionPane(Plot plot) {
+        return plot.isSupport3D() ? new Bar3DPlotDataSeriesConditionPane()
+                : (plot.isSupportTrendLine() ? new Bar2DTrendLineDSConditionPane() : new BarPlotDataSeriesConditionPane());
+    }
+
+    /**
+     * 图标路径
+     *
+     * @return 图标路径
+     */
+    public String getIconPath() {
+        return "com/fr/design/images/form/toolbar/ChartF-Bar.png";
+    }
+
+    @Override
+    public String getName() {
+        return Toolkit.i18nText("Fine-Design_Chart_Type_Bar");
+    }
+
+    @Override
+    public String[] getSubName() {
+        String chartName = Toolkit.i18nText("Fine-Design_Chart_Type_Bar");
+        String stackChartName = Toolkit.i18nText("Fine-Design_Chart_Type_Stacked") + chartName;
+        String perStackChartName = Toolkit.i18nText("Fine-Design_Chart_Use_Percent") + stackChartName;
+        String chartName3D = Toolkit.i18nText("Fine-Design_Chart_3D") + chartName;
+        String chartNameHoriz3D = chartName3D + "(" + Toolkit.i18nText("Fine-Design_Report_Utils_Left_To_Right") + ")";
+        String stackChartName3D = Toolkit.i18nText("Fine-Design_Chart_3D") + stackChartName;
+        String perStackChartName3D = Toolkit.i18nText("Fine-Design_Chart_3D") + perStackChartName;
+
+        //依次，条形图-旧版本、堆积条形图-旧版本、百分比堆积条形图-旧版本、三维条形图-旧版本、三维条形图-旧版本(横向)、三维堆积条形图-旧版本、三维百分比堆积条形图-旧版本
+        return new String[]{
+                chartName,
+                stackChartName,
+                perStackChartName,
+                chartName3D,
+                chartNameHoriz3D,
+                stackChartName3D,
+                perStackChartName3D
+        };
+    }
+
+    @Override
+    public String[] getDemoImagePath() {
+        return new String[]{
+                "com/fr/plugin/chart/demo/image/bar.png",
+                "com/fr/plugin/chart/demo/image/barstacked.png",
+                "com/fr/plugin/chart/demo/image/barstackedpercent.png",
+                "com/fr/plugin/chart/demo/image/bar3D.png",
+                "com/fr/plugin/chart/demo/image/bar3D(cross).png",
+                "com/fr/plugin/chart/demo/image/barstacked3D.png",
+                "com/fr/plugin/chart/demo/image/barstackedpercent3D.png"
+        };
+    }
+
+}

designer-chart/src/main/java/com/fr/design/type/ui/BubbleChartTypeUI.java

@@ -1,10 +1,11 @@
-package com.fr.design.chartinterface;
+package com.fr.design.type.ui;
 
 import com.fr.chart.chartattr.Plot;
 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;
@@ -18,7 +19,7 @@ import com.fr.design.mainframe.chart.gui.type.BubblePlotPane;
 /**
  * Created by eason on 15/4/21.
  */
-public class BubbleIndependentChartInterface extends AbstractIndependentChartUIWithAPILevel {
+public class BubbleChartTypeUI extends AbstractIndependentChartUIWithAPILevel {
 
     public AbstractChartTypePane getPlotTypePane(){
         return new BubblePlotPane();
@@ -48,4 +49,22 @@ public class BubbleIndependentChartInterface extends AbstractIndependentChartUIW
         return new BubblePlotDataSeriesConditionPane();
     }
 
+    @Override
+    public String getName() {
+        return Toolkit.i18nText("Fine-Design_Chart_Bubble_Chart_OLD");
+    }
+
+    @Override
+    public String[] getSubName() {
+        return new String[]{
+                Toolkit.i18nText("Fine-Design_Chart_Bubble_Chart_OLD")
+        };
+    }
+
+    @Override
+    public String[] getDemoImagePath() {
+        return new String[]{
+                "com/fr/plugin/chart/demo/image/bubble.png"
+        };
+    }
 }

designer-chart/src/main/java/com/fr/design/type/ui/ColumnChartTypeUI.java

@@ -0,0 +1,97 @@
+package com.fr.design.type.ui;
+
+import com.fr.chart.chartattr.Plot;
+import com.fr.design.beans.BasicBeanPane;
+import com.fr.design.chart.fun.impl.AbstractIndependentChartUIWithAPILevel;
+import com.fr.design.chart.series.SeriesCondition.impl.Bar2DTrendLineDSConditionPane;
+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;
+import com.fr.design.mainframe.chart.gui.data.report.CategoryPlotMoreCateReportDataContentPane;
+import com.fr.design.mainframe.chart.gui.data.table.AbstractTableDataContentPane;
+import com.fr.design.mainframe.chart.gui.data.table.CategoryPlotMoreCateTableDataContentPane;
+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;
+
+/**
+ * Created by eason on 15/4/21.
+ */
+public class ColumnChartTypeUI extends AbstractIndependentChartUIWithAPILevel {
+
+    public AbstractChartTypePane getPlotTypePane() {
+        return new ColumnPlotPane();
+    }
+
+
+    public AbstractTableDataContentPane getTableDataSourcePane(Plot plot, ChartDataPane parent) {
+        return new CategoryPlotMoreCateTableDataContentPane(parent);
+    }
+
+    public AbstractReportDataContentPane getReportDataSourcePane(Plot plot, ChartDataPane parent) {
+        return new CategoryPlotMoreCateReportDataContentPane(parent);
+    }
+
+    public BasicBeanPane<Plot> getPlotSeriesPane(ChartStylePane parent, Plot plot) {
+        return plot.isSupport3D() ? new Bar3DSeriesPane(parent, plot) : new Bar2DSeriesPane(parent, plot);
+    }
+
+    public ConditionAttributesPane getPlotConditionPane(Plot plot) {
+        return plot.isSupport3D() ? new Bar3DPlotDataSeriesConditionPane()
+                : (plot.isSupportTrendLine() ? new Bar2DTrendLineDSConditionPane() : new BarPlotDataSeriesConditionPane());
+    }
+
+    /**
+     * 图标路径
+     *
+     * @return 图标路径
+     */
+    public String getIconPath() {
+        return "com/fr/design/images/form/toolbar/ChartF-Column.png";
+    }
+
+    @Override
+    public String getName() {
+        return Toolkit.i18nText("Fine-Design_Chart_Type_Column");
+    }
+
+    @Override
+    public String[] getSubName() {
+        String chartName = Toolkit.i18nText("Fine-Design_Chart_Type_Column");
+        String stackChartName = Toolkit.i18nText("Fine-Design_Chart_Type_Stacked") + chartName;
+        String perStackChartName = Toolkit.i18nText("Fine-Design_Chart_Use_Percent") + stackChartName;
+        String chartName3D =   Toolkit.i18nText("Fine-Design_Chart_3D")+ chartName;
+        String chartNameHoriz3D = chartName3D + "(" + Toolkit.i18nText("Fine-Design_Report_Utils_Left_To_Right") + ")";
+        String stackChartName3D = Toolkit.i18nText("Fine-Design_Chart_3D") + stackChartName;
+        String perStackChartName3D = Toolkit.i18nText("Fine-Design_Chart_3D")  + perStackChartName;
+
+        //依次，柱形图-旧版本、堆积柱形图-旧版本、百分比堆积柱形图-旧版本、三维柱形图-旧版本、三维柱形图-旧版本(横向)、三维堆积柱形图-旧版本、三维百分比堆积柱形图-旧版本
+        return new String[]{
+                chartName,
+                stackChartName,
+                perStackChartName,
+                chartName3D,
+                chartNameHoriz3D,
+                stackChartName3D,
+                perStackChartName3D
+        };
+    }
+
+    @Override
+    public String[] getDemoImagePath() {
+        return new String[]{
+                "com/fr/plugin/chart/demo/image/column.png",
+                "com/fr/plugin/chart/demo/image/columnstacked.png",
+                "com/fr/plugin/chart/demo/image/columnstackedpercent.png",
+                "com/fr/plugin/chart/demo/image/column3D.png",
+                "com/fr/plugin/chart/demo/image/column3D(cross).png",
+                "com/fr/plugin/chart/demo/image/columnstacked3D.png",
+                "com/fr/plugin/chart/demo/image/columnstackedpercent3D.png"
+        };
+    }
+}

designer-chart/src/main/java/com/fr/design/type/ui/CustomChartTypeUI.java

@@ -1,10 +1,11 @@
-package com.fr.design.chartinterface;
+package com.fr.design.type.ui;
 
 import com.fr.chart.chartattr.Plot;
 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;
@@ -18,35 +19,54 @@ import com.fr.design.mainframe.chart.gui.type.CustomPlotPane;
 /**
  * Created by eason on 15/4/21.
  */
-public class CustomIndependentChartInterface extends AbstractIndependentChartUIWithAPILevel {
+public class CustomChartTypeUI extends AbstractIndependentChartUIWithAPILevel {
 
 
-    public AbstractChartTypePane getPlotTypePane(){
+    public AbstractChartTypePane getPlotTypePane() {
         return new CustomPlotPane();
     }
 
-    public AbstractTableDataContentPane getTableDataSourcePane(Plot plot, ChartDataPane parent){
+    public AbstractTableDataContentPane getTableDataSourcePane(Plot plot, ChartDataPane parent) {
         return new CategoryPlotTableDataContentPane(parent);
     }
 
-    public AbstractReportDataContentPane getReportDataSourcePane(Plot plot, ChartDataPane parent){
+    public AbstractReportDataContentPane getReportDataSourcePane(Plot plot, ChartDataPane parent) {
         return new CategoryPlotReportDataContentPane(parent);
     }
 
-    public BasicBeanPane<Plot> getPlotSeriesPane(ChartStylePane parent, Plot plot){
+    public BasicBeanPane<Plot> getPlotSeriesPane(ChartStylePane parent, Plot plot) {
         return new CustomSeriesPane(parent, plot);
     }
 
-    public ConditionAttributesPane getPlotConditionPane(Plot plot){
+    public ConditionAttributesPane getPlotConditionPane(Plot plot) {
         return new DataSeriesCustomConditionPane();
     }
 
     /**
-     *图标路径
+     * 图标路径
+     *
      * @return 图标路径
      */
-    public String getIconPath(){
+    public String getIconPath() {
         return "com/fr/design/images/form/toolbar/ChartF-Comb_Chart.png";
     }
 
+    @Override
+    public String getName() {
+        return Toolkit.i18nText("Fine-Design_Chart_Type_Combine");
+    }
+
+    @Override
+    public String[] getSubName() {
+        return new String[]{
+                Toolkit.i18nText("Fine-Design_Chart_Type_Combine")
+        };
+    }
+
+    @Override
+    public String[] getDemoImagePath() {
+        return new String[]{
+                "com/fr/plugin/chart/demo/image/custom.png"
+        };
+    }
 }

designer-chart/src/main/java/com/fr/design/type/ui/DonutChartTypeUI.java

@@ -1,4 +1,4 @@
-package com.fr.design.chartinterface;
+package com.fr.design.type.ui;
 
 import com.fr.chart.chartattr.Plot;
 import com.fr.design.beans.BasicBeanPane;
@@ -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;
@@ -20,35 +21,56 @@ import com.fr.design.mainframe.chart.gui.type.DonutPlotPane;
 /**
  * Created by eason on 15/4/21.
  */
-public class DonutIndependentChartInterface extends AbstractIndependentChartUIWithAPILevel {
+public class DonutChartTypeUI extends AbstractIndependentChartUIWithAPILevel {
 
 
-    public AbstractChartTypePane getPlotTypePane(){
+    public AbstractChartTypePane getPlotTypePane() {
         return new DonutPlotPane();
     }
 
-    public AbstractTableDataContentPane getTableDataSourcePane(Plot plot, ChartDataPane parent){
+    public AbstractTableDataContentPane getTableDataSourcePane(Plot plot, ChartDataPane parent) {
         return new CategoryPlotTableDataContentPane(parent);
     }
 
-    public AbstractReportDataContentPane getReportDataSourcePane(Plot plot, ChartDataPane parent){
+    public AbstractReportDataContentPane getReportDataSourcePane(Plot plot, ChartDataPane parent) {
         return new CategoryPlotReportDataContentPane(parent);
     }
 
-    public BasicBeanPane<Plot> getPlotSeriesPane(ChartStylePane parent, Plot plot){
+    public BasicBeanPane<Plot> getPlotSeriesPane(ChartStylePane parent, Plot plot) {
         return plot.isSupport3D() ? new Donut3DSeriesPane(parent, plot) : new Donut2DSeriesPane(parent, plot);
     }
-    
+
-    public ConditionAttributesPane getPlotConditionPane(Plot plot){
+    public ConditionAttributesPane getPlotConditionPane(Plot plot) {
         return plot.isSupport3D() ? new DataSeriesConditionPane() : new Donut2DPlotDataSeriesConditionPane();
     }
 
     /**
-     *图标路径
+     * 图标路径
+     *
      * @return 图标路径
      */
-    public String getIconPath(){
+    public String getIconPath() {
         return "com/fr/design/images/form/toolbar/ChartF-Donut.png";
     }
 
+    @Override
+    public String getName() {
+        return Toolkit.i18nText("Fine-Design_Chart_Type_Donut");
+    }
+
+    @Override
+    public String[] getSubName() {
+        return new String[]{
+                Toolkit.i18nText("Fine-Design_Chart_Type_Donut"),
+                Toolkit.i18nText("Fine-Design_Chart_3D") + Toolkit.i18nText("Fine-Design_Chart_Type_Donut")
+        };
+    }
+
+    @Override
+    public String[] getDemoImagePath() {
+        return new String[]{
+                "com/fr/plugin/chart/demo/image/donut2D.png",
+                "com/fr/plugin/chart/demo/image/donut3D.png"
+        };
+    }
 }

designer-chart/src/main/java/com/fr/design/type/ui/FunnelChartTypeUI.java

@@ -1,10 +1,11 @@
-package com.fr.design.chartinterface;
+package com.fr.design.type.ui;
 
 import com.fr.chart.chartattr.Plot;
 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;
@@ -18,7 +19,7 @@ import com.fr.design.mainframe.chart.gui.type.FunnelPlotPane;
 /**
  * Created by eason on 15/4/21.
  */
-public class FunnelIndependentChartInterface extends AbstractIndependentChartUIWithAPILevel {
+public class FunnelChartTypeUI extends AbstractIndependentChartUIWithAPILevel {
 
 
     public AbstractChartTypePane getPlotTypePane(){
@@ -49,4 +50,22 @@ public class FunnelIndependentChartInterface extends AbstractIndependentChartUIW
         return "com/fr/design/images/form/toolbar/ChartF-Funnel.png";
     }
 
+    @Override
+    public String getName() {
+        return Toolkit.i18nText("Fine-Design_Chart_Type_Funnel");
+    }
+
+    @Override
+    public String[] getSubName() {
+        return new String[]{
+                Toolkit.i18nText("Fine-Design_Chart_Type_Funnel")
+        };
+    }
+
+    @Override
+    public String[] getDemoImagePath() {
+        return new String[]{
+                "com/fr/plugin/chart/demo/image/funnel.png"
+        };
+    }
 }

designer-chart/src/main/java/com/fr/design/type/ui/GanttChartTypeUI.java

@@ -1,9 +1,10 @@
-package com.fr.design.chartinterface;
+package com.fr.design.type.ui;
 
 import com.fr.chart.chartattr.Plot;
 import com.fr.design.chart.fun.impl.AbstractIndependentChartUIWithAPILevel;
 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;
@@ -15,7 +16,7 @@ import com.fr.design.mainframe.chart.gui.type.GanttPlotPane;
 /**
  * Created by eason on 15/4/21.
  */
-public class GanttIndependentChartInterface extends AbstractIndependentChartUIWithAPILevel {
+public class GanttChartTypeUI extends AbstractIndependentChartUIWithAPILevel {
 
 
     public AbstractChartTypePane getPlotTypePane(){
@@ -42,4 +43,22 @@ public class GanttIndependentChartInterface extends AbstractIndependentChartUIWi
         return "com/fr/design/images/form/toolbar/ChartF-Gantt.png";
     }
 
+    @Override
+    public String getName() {
+        return Toolkit.i18nText("Fine-Design_Chart_Type_Gantt");
+    }
+
+    @Override
+    public String[] getSubName() {
+        return new String[]{
+                Toolkit.i18nText("Fine-Design_Chart_Type_Gantt")
+        };
+    }
+
+    @Override
+    public String[] getDemoImagePath() {
+        return new String[]{
+                "com/fr/plugin/chart/demo/image/gantt.png"
+        };
+    }
 }

designer-chart/src/main/java/com/fr/design/type/ui/GisMapChartTypeUI.java

@@ -0,0 +1,59 @@
+package com.fr.design.type.ui;
+
+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;
+
+/**
+ * Created by eason on 15/4/21.
+ */
+public class GisMapChartTypeUI extends AbstractIndependentChartUIWithAPILevel {
+
+
+    public AbstractChartTypePane getPlotTypePane() {
+        return new GisMapPlotPane();
+    }
+
+    public AbstractTableDataContentPane getTableDataSourcePane(Plot plot, ChartDataPane parent) {
+        return null;
+    }
+
+    public AbstractReportDataContentPane getReportDataSourcePane(Plot plot, ChartDataPane parent) {
+        return null;
+    }
+
+    /**
+     * 图标路径
+     *
+     * @return 图标路径
+     */
+    public String getIconPath() {
+        return "com/fr/design/images/form/toolbar/ChartF-Gis.png";
+    }
+
+    @Override
+    public String getName() {
+        return Toolkit.i18nText("Fine-Design_Chart_GIS_Map_OLD");
+    }
+
+    @Override
+    public String[] getSubName() {
+        return new String[]{
+                Toolkit.i18nText("Fine-Design_Chart_Map_BaiduMap"),
+                Toolkit.i18nText("Fine-Design_Chart_Map_GoogleMap")
+        };
+    }
+
+    @Override
+    public String[] getDemoImagePath() {
+        return new String[]{
+                "com/fr/plugin/chart/demo/image/gismap.png",
+                "com/fr/plugin/chart/demo/image/gismap.png"
+        };
+    }
+}

designer-chart/src/main/java/com/fr/design/type/ui/LineChartTypeUI.java

@@ -1,4 +1,4 @@
-package com.fr.design.chartinterface;
+package com.fr.design.type.ui;
 
 import com.fr.chart.chartattr.Plot;
 import com.fr.design.beans.BasicBeanPane;
@@ -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;
@@ -19,35 +20,54 @@ import com.fr.design.mainframe.chart.gui.type.LinePlotPane;
 /**
  * Created by eason on 15/4/21.
  */
-public class LineIndependentChartInterface extends AbstractIndependentChartUIWithAPILevel {
+public class LineChartTypeUI extends AbstractIndependentChartUIWithAPILevel {
 
 
-    public AbstractChartTypePane getPlotTypePane(){
+    public AbstractChartTypePane getPlotTypePane() {
         return new LinePlotPane();
     }
 
-    public AbstractTableDataContentPane getTableDataSourcePane(Plot plot, ChartDataPane parent){
+    public AbstractTableDataContentPane getTableDataSourcePane(Plot plot, ChartDataPane parent) {
         return new CategoryPlotMoreCateTableDataContentPane(parent);
     }
 
-    public AbstractReportDataContentPane getReportDataSourcePane(Plot plot, ChartDataPane parent){
+    public AbstractReportDataContentPane getReportDataSourcePane(Plot plot, ChartDataPane parent) {
         return new CategoryPlotMoreCateReportDataContentPane(parent);
     }
 
-    public BasicBeanPane<Plot> getPlotSeriesPane(ChartStylePane parent, Plot plot){
+    public BasicBeanPane<Plot> getPlotSeriesPane(ChartStylePane parent, Plot plot) {
         return new LineSeriesPane(parent, plot);
     }
 
-    public ConditionAttributesPane getPlotConditionPane(Plot plot){
+    public ConditionAttributesPane getPlotConditionPane(Plot plot) {
         return plot.isSupportTrendLine() ? new LinePlotDataSeriesConditionPane() : new DataSeriesConditionPane();
     }
 
     /**
-     *图标路径
+     * 图标路径
+     *
      * @return 图标路径
      */
-    public String getIconPath(){
+    public String getIconPath() {
         return "com/fr/design/images/form/toolbar/ChartF-Line.png";
     }
 
+    @Override
+    public String getName() {
+        return Toolkit.i18nText("Fine-Design_Chart_Type_Line");
+    }
+
+    @Override
+    public String[] getSubName() {
+        return new String[]{
+                Toolkit.i18nText("Fine-Design_Chart_Type_Line")
+        };
+    }
+
+    @Override
+    public String[] getDemoImagePath() {
+        return new String[]{
+                "com/fr/plugin/chart/demo/image/line.png"
+        };
+    }
 }

designer-chart/src/main/java/com/fr/design/type/ui/MapChartTypeUI.java

@@ -1,10 +1,11 @@
-package com.fr.design.chartinterface;
+package com.fr.design.type.ui;
 
 import com.fr.chart.chartattr.Plot;
 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;
@@ -16,7 +17,7 @@ import com.fr.design.mainframe.chart.gui.type.MapPlotPane;
 /**
  * Created by eason on 15/4/21.
  */
-public class MapIndependentChartInterface extends AbstractIndependentChartUIWithAPILevel {
+public class MapChartTypeUI extends AbstractIndependentChartUIWithAPILevel {
 
 
     public AbstractChartTypePane getPlotTypePane(){
@@ -47,4 +48,22 @@ public class MapIndependentChartInterface extends AbstractIndependentChartUIWith
         return "com/fr/design/images/form/toolbar/Chart-Map.png";
     }
 
+    @Override
+    public String getName() {
+        return Toolkit.i18nText("Fine-Design_Chart_SVG_MAP");
+    }
+
+    @Override
+    public String[] getSubName() {
+        return new String[]{
+                Toolkit.i18nText("Fine-Design_Chart_SVG_MAP")
+        };
+    }
+
+    @Override
+    public String[] getDemoImagePath() {
+        return new String[]{
+                "com/fr/plugin/chart/demo/image/map.png"
+        };
+    }
 }

designer-chart/src/main/java/com/fr/design/type/ui/MeterChartTypeUI.java

@@ -1,8 +1,9 @@
-package com.fr.design.chartinterface;
+package com.fr.design.type.ui;
 
 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;
@@ -16,31 +17,54 @@ import com.fr.design.mainframe.chart.gui.type.MeterPlotPane;
 /**
  * Created by eason on 15/4/21.
  */
-public class MeterIndependentChartInterface extends AbstractIndependentChartUIWithAPILevel {
+public class MeterChartTypeUI extends AbstractIndependentChartUIWithAPILevel {
 
 
-    public AbstractChartTypePane getPlotTypePane(){
+    public AbstractChartTypePane getPlotTypePane() {
         return new MeterPlotPane();
     }
 
-    public AbstractTableDataContentPane getTableDataSourcePane(Plot plot, ChartDataPane parent){
+    public AbstractTableDataContentPane getTableDataSourcePane(Plot plot, ChartDataPane parent) {
         return new MeterPlotTableDataContentPane(parent);
     }
 
-    public AbstractReportDataContentPane getReportDataSourcePane(Plot plot, ChartDataPane parent){
+    public AbstractReportDataContentPane getReportDataSourcePane(Plot plot, ChartDataPane parent) {
         return new MeterPlotReportDataContentPane(parent);
     }
 
-    public BasicBeanPane<Plot> getPlotSeriesPane(ChartStylePane parent, Plot plot){
+    public BasicBeanPane<Plot> getPlotSeriesPane(ChartStylePane parent, Plot plot) {
         return new MeterSeriesPane(parent, plot);
     }
 
     /**
-     *图标路径
+     * 图标路径
+     *
      * @return 图标路径
      */
-    public String getIconPath(){
+    public String getIconPath() {
         return "com/fr/design/images/form/toolbar/ChartF-Meter.png";
     }
 
+    @Override
+    public String getName() {
+        return Toolkit.i18nText("Fine-Design_Chart_Type_Meter");
+    }
+
+    @Override
+    public String[] getSubName() {
+        return new String[]{
+                Toolkit.i18nText("Fine-Design_Chart_Type_Meter"),
+                Toolkit.i18nText("Fine-Design_Chart_Type_Meter"),
+                Toolkit.i18nText("Fine-Design_Chart_Type_Meter")
+        };
+    }
+
+    @Override
+    public String[] getDemoImagePath() {
+        return new String[]{
+                "com/fr/plugin/chart/demo/image/meter.png",
+                "com/fr/plugin/chart/demo/image/meterblue.png",
+                "com/fr/plugin/chart/demo/image/metersimple.png"
+        };
+    }
 }

designer-chart/src/main/java/com/fr/design/type/ui/PieChartTypeUI.java

@@ -1,4 +1,4 @@
-package com.fr.design.chartinterface;
+package com.fr.design.type.ui;
 
 import com.fr.chart.chartattr.Plot;
 import com.fr.design.beans.BasicBeanPane;
@@ -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;
@@ -20,35 +21,57 @@ import com.fr.design.mainframe.chart.gui.type.PiePlotPane;
 /**
  * Created by eason on 15/4/21.
  */
-public class PieIndependentChartInterface extends AbstractIndependentChartUIWithAPILevel {
+public class PieChartTypeUI extends AbstractIndependentChartUIWithAPILevel {
 
 
-    public AbstractChartTypePane getPlotTypePane(){
+    public AbstractChartTypePane getPlotTypePane() {
         return new PiePlotPane();
     }
 
-    public AbstractTableDataContentPane getTableDataSourcePane(Plot plot, ChartDataPane parent){
+    public AbstractTableDataContentPane getTableDataSourcePane(Plot plot, ChartDataPane parent) {
         return new PiePlotTableDataContentPane(parent);
     }
 
-    public AbstractReportDataContentPane getReportDataSourcePane(Plot plot, ChartDataPane parent){
+    public AbstractReportDataContentPane getReportDataSourcePane(Plot plot, ChartDataPane parent) {
         return new PiePlotReportDataContentPane(parent);
     }
 
-    public BasicBeanPane<Plot> getPlotSeriesPane(ChartStylePane parent, Plot plot){
+    public BasicBeanPane<Plot> getPlotSeriesPane(ChartStylePane parent, Plot plot) {
         return plot.isSupport3D() ? new Pie3DSeriesPane(parent, plot) : new Pie2DSeriesPane(parent, plot);
     }
 
-    public ConditionAttributesPane getPlotConditionPane(Plot plot){
+    public ConditionAttributesPane getPlotConditionPane(Plot plot) {
         return plot.isSupport3D() ? new Pie3DPlotDataSeriesConditionPane() : new PiePlotDataSeriesConditionPane();
     }
 
     /**
-     *图标路径
+     * 图标路径
+     *
      * @return 图标路径
      */
-    public String getIconPath(){
+    public String getIconPath() {
         return "com/fr/design/images/form/toolbar/ChartF-Pie.png";
     }
 
+    @Override
+    public String getName() {
+        return Toolkit.i18nText("Fine-Design_Chart_Type_Pie");
+    }
+
+    @Override
+    public String[] getSubName() {
+        return new String[]{
+                Toolkit.i18nText("Fine-Design_Chart_Type_Pie"),
+                Toolkit.i18nText("Fine-Design_Chart_3D") + Toolkit.i18nText("Fine-Design_Chart_Type_Pie")
+        };
+    }
+
+    @Override
+    public String[] getDemoImagePath() {
+        return new String[]{
+                "com/fr/plugin/chart/demo/image/pie.png",
+                "com/fr/plugin/chart/demo/image/pie3D.png",
+        };
+    }
+
 }

designer-chart/src/main/java/com/fr/design/type/ui/RadarChartTypeUI.java

@@ -1,10 +1,11 @@
-package com.fr.design.chartinterface;
+package com.fr.design.type.ui;
 
 import com.fr.chart.chartattr.Plot;
 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;
@@ -18,7 +19,7 @@ import com.fr.design.mainframe.chart.gui.type.RadarPlotPane;
 /**
  * Created by eason on 15/4/21.
  */
-public class RadarIndependentChartInterface extends AbstractIndependentChartUIWithAPILevel {
+public class RadarChartTypeUI extends AbstractIndependentChartUIWithAPILevel {
 
 
     public AbstractChartTypePane getPlotTypePane(){
@@ -50,4 +51,22 @@ public class RadarIndependentChartInterface extends AbstractIndependentChartUIWi
         return "com/fr/design/images/form/toolbar/ChartF-Radar.png";
     }
 
+    @Override
+    public String getName() {
+        return Toolkit.i18nText("Fine-Design_Chart_Type_Radar");
+    }
+
+    @Override
+    public String[] getSubName() {
+        return new String[]{
+                Toolkit.i18nText("Fine-Design_Chart_Type_Radar")
+        };
+    }
+
+    @Override
+    public String[] getDemoImagePath() {
+        return new String[]{
+                "com/fr/plugin/chart/demo/image/radar.png"
+        };
+    }
 }

designer-chart/src/main/java/com/fr/design/type/ui/RangeChartTypeUI.java

@@ -1,8 +1,9 @@
-package com.fr.design.chartinterface;
+package com.fr.design.type.ui;
 
 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;
@@ -16,7 +17,7 @@ import com.fr.design.mainframe.chart.gui.type.RangePlotPane;
 /**
  * Created by eason on 15/4/21.
  */
-public class RangeIndependentChartInterface extends AbstractIndependentChartUIWithAPILevel {
+public class RangeChartTypeUI extends AbstractIndependentChartUIWithAPILevel {
 
 
     public AbstractChartTypePane getPlotTypePane(){
@@ -43,4 +44,22 @@ public class RangeIndependentChartInterface extends AbstractIndependentChartUIWi
         return "com/fr/design/images/form/toolbar/ChartF-Range_Chart.png";
     }
 
+    @Override
+    public String getName() {
+        return Toolkit.i18nText("Fine-Design_Chart_Type_Range");
+    }
+
+    @Override
+    public String[] getSubName() {
+        return new String[]{
+                Toolkit.i18nText("Fine-Design_Chart_Type_Range")
+        };
+    }
+
+    @Override
+    public String[] getDemoImagePath() {
+        return new String[]{
+                "com/fr/plugin/chart/demo/image/range.png"
+        };
+    }
 }

designer-chart/src/main/java/com/fr/design/type/ui/StockChartTypeUI.java

@@ -1,4 +1,4 @@
-package com.fr.design.chartinterface;
+package com.fr.design.type.ui;
 
 import com.fr.chart.chartattr.Plot;
 import com.fr.design.beans.BasicBeanPane;
@@ -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;
@@ -19,7 +20,7 @@ import com.fr.design.mainframe.chart.gui.type.StockPlotPane;
 /**
  * Created by eason on 15/4/21.
  */
-public class StockIndependentChartInterface extends AbstractIndependentChartUIWithAPILevel {
+public class StockChartTypeUI extends AbstractIndependentChartUIWithAPILevel {
 
 
     public AbstractChartTypePane getPlotTypePane(){
@@ -50,4 +51,22 @@ public class StockIndependentChartInterface extends AbstractIndependentChartUIWi
         return "com/fr/design/images/form/toolbar/ChartF-Stock.png";
     }
 
+    @Override
+    public String getName() {
+        return Toolkit.i18nText("Fine-Design_Chart_Type_Stock");
+    }
+
+    @Override
+    public String[] getSubName() {
+        return new String[]{
+                Toolkit.i18nText("Fine-Design_Chart_Type_Stock")
+        };
+    }
+
+    @Override
+    public String[] getDemoImagePath() {
+        return new String[]{
+                "com/fr/plugin/chart/demo/image/stock.png"
+        };
+    }
 }

designer-chart/src/main/java/com/fr/design/type/ui/XYScatterChartTypeUI.java

@@ -1,4 +1,4 @@
-package com.fr.design.chartinterface;
+package com.fr.design.type.ui;
 
 import com.fr.chart.chartattr.Plot;
 import com.fr.design.beans.BasicBeanPane;
@@ -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;
@@ -19,36 +20,55 @@ import com.fr.design.mainframe.chart.gui.type.XYScatterPlotPane;
 /**
  * Created by eason on 15/4/21.
  */
-public class XYScatterIndependentChartInterface extends AbstractIndependentChartUIWithAPILevel {
+public class XYScatterChartTypeUI extends AbstractIndependentChartUIWithAPILevel {
 
 
-    public AbstractChartTypePane getPlotTypePane(){
+    public AbstractChartTypePane getPlotTypePane() {
         return new XYScatterPlotPane();
     }
 
 
-    public AbstractTableDataContentPane getTableDataSourcePane(Plot plot, ChartDataPane parent){
+    public AbstractTableDataContentPane getTableDataSourcePane(Plot plot, ChartDataPane parent) {
         return new XYScatterPlotTableDataContentPane(parent);
     }
 
-    public AbstractReportDataContentPane getReportDataSourcePane(Plot plot, ChartDataPane parent){
+    public AbstractReportDataContentPane getReportDataSourcePane(Plot plot, ChartDataPane parent) {
         return new XYScatterPlotReportDataContentPane(parent);
     }
 
-    public BasicBeanPane<Plot> getPlotSeriesPane(ChartStylePane parent, Plot plot){
+    public BasicBeanPane<Plot> getPlotSeriesPane(ChartStylePane parent, Plot plot) {
         return new XYScatterSeriesPane(parent, plot);
     }
 
-    public ConditionAttributesPane getPlotConditionPane(Plot plot){
+    public ConditionAttributesPane getPlotConditionPane(Plot plot) {
         return plot.isSupportTrendLine() ? new XYScatterPlotDataSeriesConditionPane() : new DataSeriesConditionPane();
     }
 
     /**
-     *图标路径
+     * 图标路径
+     *
      * @return 图标路径
      */
-    public String getIconPath(){
+    public String getIconPath() {
         return "com/fr/design/images/form/toolbar/ChartF-XYScatter.png";
     }
 
+    @Override
+    public String getName() {
+        return Toolkit.i18nText("Fine-Design_Chart_Type_XYScatter");
+    }
+
+    @Override
+    public String[] getSubName() {
+        return new String[]{
+                Toolkit.i18nText("Fine-Design_Chart_Type_XYScatter")
+        };
+    }
+
+    @Override
+    public String[] getDemoImagePath() {
+        return new String[]{
+                "com/fr/plugin/chart/demo/image/point.png"
+        };
+    }
 }