diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/AbstractDeprecatedChartTypePane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/AbstractDeprecatedChartTypePane.java index 81578ded56..4dd84beb26 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/AbstractDeprecatedChartTypePane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/AbstractDeprecatedChartTypePane.java @@ -16,6 +16,7 @@ import com.fr.chart.chartattr.Legend; import com.fr.chart.chartattr.Plot; import com.fr.chart.chartattr.Title; import com.fr.chart.chartglyph.ConditionAttr; +import com.fr.design.ChartTypeInterfaceManager; import com.fr.general.ComparatorUtils; import com.fr.general.FRFont; import com.fr.js.NameJavaScriptGroup; @@ -38,6 +39,12 @@ public abstract class AbstractDeprecatedChartTypePane extends AbstractChartTypeP } } + + @Override + protected String[] getTypeTipName() { + return ChartTypeInterfaceManager.getInstance().getSubName(getPlotID()); + } + /** * 更新界面属性 */ diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/AreaPlotPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/AreaPlotPane.java index a84c9ab468..6293ffef01 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/AreaPlotPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/AreaPlotPane.java @@ -32,20 +32,6 @@ public class AreaPlotPane extends AbstractDeprecatedChartTypePane { }; } - @Override - protected String[] getTypeTipName() { - 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"); - return new String[]{ - stack + area, - percent + stack + area, - td + stack + area, - td + percent + stack + area - }; - } - @Override protected String getPlotTypeID() { return ChartConstants.AREA_CHART; diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/BarPlotPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/BarPlotPane.java index 7f68e153ba..33f398c8d8 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/BarPlotPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/BarPlotPane.java @@ -30,23 +30,6 @@ public class BarPlotPane extends AbstractBarPane{ }; } - @Override - protected String[] getTypeTipName() { - 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"); - return new String[]{ - bar, - stack + bar, - percent + stack + bar, - td + bar, - td + bar + "(" + Toolkit.i18nText("Fine-Design_Chart_Direction_Horizontal") + ")", - td + stack + bar, - td + percent + stack + bar - }; - } - @Override protected String[] getTypeLayoutPath() { return new String[]{"/com/fr/design/images/chart/ColumnPlot/layout/0.png", diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/BubblePlotPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/BubblePlotPane.java index d8fe8664cf..84919fdf66 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/BubblePlotPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/BubblePlotPane.java @@ -23,13 +23,6 @@ public class BubblePlotPane extends AbstractDeprecatedChartTypePane { return new String[]{"/com/fr/design/images/chart/BubblePlot/type/0.png",}; } - @Override - protected String[] getTypeTipName() { - return new String[]{ - Toolkit.i18nText("Fine-Design_Chart_Bubble_Chart_OLD") - }; - } - @Override protected String[] getTypeLayoutPath() { return new String[0]; diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/ColumnPlotPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/ColumnPlotPane.java index e6b446b569..98907e285d 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/ColumnPlotPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/ColumnPlotPane.java @@ -29,23 +29,6 @@ public class ColumnPlotPane extends AbstractBarPane{ }; } - @Override - protected String[] getTypeTipName() { - 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"); - return new String[]{ - column, - stack + column, - percent + stack + column, - td + column, - td + column + "(" + Toolkit.i18nText("Fine-Design_Chart_Direction_Horizontal") + ")", - td + stack + column, - td + percent + stack + column - }; - } - @Override protected String[] getTypeLayoutPath() { return new String[]{"/com/fr/design/images/chart/BarPlot/layout/0.png", diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/CustomPlotPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/CustomPlotPane.java index e922d2921b..d2ad172af5 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/CustomPlotPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/CustomPlotPane.java @@ -24,13 +24,6 @@ public class CustomPlotPane extends AbstractDeprecatedChartTypePane { }; } - @Override - protected String[] getTypeTipName() { - return new String[]{ - Toolkit.i18nText("Fine-Design_Chart_Type_Combine") - }; - } - @Override protected String[] getTypeLayoutPath() { return new String[0]; diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/DonutPlotPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/DonutPlotPane.java index 44cdc85275..67d793ccf9 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/DonutPlotPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/DonutPlotPane.java @@ -33,15 +33,6 @@ public class DonutPlotPane extends AbstractDeprecatedChartTypePane { }; } - @Override - protected String[] getTypeTipName() { - String donut = Toolkit.i18nText("Fine-Design_Chart_Type_Donut"); - return new String[]{ - donut, - Toolkit.i18nText("Fine-Design_Chart_3D") + donut - }; - } - @Override protected String[] getTypeLayoutPath() { return new String[]{"/com/fr/design/images/chart/DonutPlot/layout/0.png", diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/FunnelPlotPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/FunnelPlotPane.java index b3706a058a..5682d4d243 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/FunnelPlotPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/FunnelPlotPane.java @@ -28,13 +28,6 @@ public class FunnelPlotPane extends AbstractDeprecatedChartTypePane { }; } - @Override - protected String[] getTypeTipName() { - return new String[]{ - Toolkit.i18nText("Fine-Design_Chart_Type_Funnel") - }; - } - @Override protected String[] getTypeLayoutPath() { return new String[0]; diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/GanttPlotPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/GanttPlotPane.java index f68ee1fc1c..590b2188bb 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/GanttPlotPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/GanttPlotPane.java @@ -22,13 +22,6 @@ public class GanttPlotPane extends AbstractDeprecatedChartTypePane { }; } - @Override - protected String[] getTypeTipName() { - return new String[]{ - Toolkit.i18nText("Fine-Design_Chart_Type_Gantt") - }; - } - @Override protected String getPlotTypeID() { return ChartConstants.GANTT_CHART; diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/GisMapPlotPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/GisMapPlotPane.java index 67906b9e50..f12fe344e8 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/GisMapPlotPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/GisMapPlotPane.java @@ -27,7 +27,7 @@ public class GisMapPlotPane extends AbstractDeprecatedChartTypePane { private static final int GISMAP = 0; private UITextField keyInput; - + public GisMapPlotPane(){ double p = TableLayout.PREFERRED; double f = TableLayout.FILL; @@ -65,6 +65,11 @@ public class GisMapPlotPane extends AbstractDeprecatedChartTypePane { } + @Override + public void reLayout(String chartID){ + + } + @Override protected String[] getTypeIconPath() { return new String[]{"/com/fr/design/images/chart/GisMapPlot/type/0.png", diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/LinePlotPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/LinePlotPane.java index e78bb3ac67..34280ce987 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/LinePlotPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/LinePlotPane.java @@ -19,13 +19,6 @@ public class LinePlotPane extends AbstractDeprecatedChartTypePane { }; } - @Override - protected String[] getTypeTipName() { - return new String[]{ - Toolkit.i18nText("Fine-Design_Chart_Type_Line") - }; - } - @Override protected String[] getTypeLayoutPath() { return new String[0]; diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/MeterPlotPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/MeterPlotPane.java index 791262c0bc..254a4f926e 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/MeterPlotPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/MeterPlotPane.java @@ -30,16 +30,6 @@ public class MeterPlotPane extends AbstractDeprecatedChartTypePane { }; } - @Override - protected String[] getTypeTipName() { - String meter = Toolkit.i18nText("Fine-Design_Chart_Type_Meter"); - return new String[]{ - Toolkit.i18nText("Fine-Design_Chart_Mode_Custom") + meter, - meter + "1", - meter + "2" - }; - } - @Override protected String[] getTypeLayoutPath() { return new String[0]; diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/PiePlotPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/PiePlotPane.java index 56c2c44832..47b03fe3d7 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/PiePlotPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/PiePlotPane.java @@ -34,15 +34,6 @@ public class PiePlotPane extends AbstractDeprecatedChartTypePane { }; } - @Override - protected String[] getTypeTipName() { - String pie = Toolkit.i18nText("Fine-Design_Chart_Type_Pie"); - return new String[]{ - pie, - com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_3D") + pie - }; - } - @Override protected String[] getTypeLayoutPath() { return new String[]{"/com/fr/design/images/chart/PiePlot/layout/0.png", diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/RadarPlotPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/RadarPlotPane.java index df812fe2cb..97925b97b2 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/RadarPlotPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/RadarPlotPane.java @@ -22,13 +22,6 @@ public class RadarPlotPane extends AbstractDeprecatedChartTypePane { }; } - @Override - protected String[] getTypeTipName() { - return new String[]{ - Toolkit.i18nText("Fine-Design_Chart_Type_Radar") - }; - } - @Override protected String getPlotTypeID() { return ChartConstants.RADAR_CHART; diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/RangePlotPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/RangePlotPane.java index 9dfb36b0f0..5564dc84cc 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/RangePlotPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/RangePlotPane.java @@ -23,13 +23,6 @@ public class RangePlotPane extends AbstractDeprecatedChartTypePane { }; } - @Override - protected String[] getTypeTipName() { - return new String[]{ - Toolkit.i18nText("Fine-Design_Chart_Type_Range") - }; - } - @Override protected String getPlotTypeID() { return ChartConstants.RANGE_CHART; diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/StockPlotPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/StockPlotPane.java index 5e896d3b69..b6b0165214 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/StockPlotPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/StockPlotPane.java @@ -22,13 +22,6 @@ public class StockPlotPane extends AbstractDeprecatedChartTypePane { }; } - @Override - protected String[] getTypeTipName() { - return new String[]{ - Toolkit.i18nText("Fine-Design_Chart_Type_Stock") - }; - } - @Override protected String getPlotTypeID() { return ChartConstants.STOCK_CHART; diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/XYScatterPlotPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/XYScatterPlotPane.java index ba6edba06e..67d0a10fde 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/XYScatterPlotPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/XYScatterPlotPane.java @@ -25,13 +25,6 @@ public class XYScatterPlotPane extends AbstractDeprecatedChartTypePane { }; } - @Override - protected String[] getTypeTipName() { - return new String[]{ - Toolkit.i18nText("Fine-Design_Chart_Type_XYScatter") - }; - } - @Override protected String[] getTypeLayoutPath() { return new String[0];