d0813

designer-chart/src/main/java/com/fr/design/chart/series/PlotSeries/MapCustomPane.java

@@ -91,7 +91,7 @@ refreshAreaNameBox();
             tableDataNameBox.setPreferredSize(new Dimension(200, 20));
             northPane.add(tableDataNameBox);
 
-            northPane.add(new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Filed", "Field"}) + ":"));
+            northPane.add(new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Region_Field") + ":"));
 
             areaString = new FilterComboBox<String>();
             areaString.setPreferredSize(new Dimension(120, 20));
@@ -229,7 +229,7 @@ refreshAreaNameBox();
 
 	@Override
 	protected String title4PopupWindow() {
-		return com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Datasource-User_Defined", "Chart-Map"});
+		return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Custom_Map");
 	}
 
 	/**

designer-chart/src/main/java/com/fr/design/chart/series/PlotSeries/MapDefiAreaNamePane.java

@@ -158,7 +158,7 @@ public class MapDefiAreaNamePane extends BasicBeanPane<String> implements Abstrc
 
 	@Override
 	protected String title4PopupWindow() {
-		return com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Define", "Area_Name"});
+		return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Define_Area_Name");
 	}
 
 	/**

designer-chart/src/main/java/com/fr/design/chart/series/PlotSeries/MapGroupExtensionPane.java

@@ -300,7 +300,7 @@ public class MapGroupExtensionPane extends BasicPane implements UIObserver {
 	}
 
 	private JMenuItem createLayerItem(final String oldName) {
-		JMenuItem corrItem = new JMenuItem(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Filed", "Corresponding_Fields"}));
+		JMenuItem corrItem = new JMenuItem(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Map_Corresponding_Fields"));
 		corrItem.addActionListener(new ActionListener() {
 			public void actionPerformed(ActionEvent e) {
 				final MapDefiAreaNamePane namedPane = new MapDefiAreaNamePane();

designer-chart/src/main/java/com/fr/design/chart/series/PlotSeries/UIGroupExtensionPane.java

@@ -431,7 +431,7 @@ public class UIGroupExtensionPane extends BasicPane {
 					};
 					isPressOnDelete = true;
 					bp.setLayout(new BorderLayout());
-					bp.add(new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Delete", "Chart-Map"}) + "?", SwingConstants.CENTER));
+					bp.add(new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Delete_Map") + "?", SwingConstants.CENTER));
 
                     clearLastListSelection(list);
 

designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/ConditionTrendLinePane.java

@@ -63,7 +63,7 @@ public class ConditionTrendLinePane extends BasicBeanPane<ConditionTrendLine> {
 		JPanel typePane = FRGUIPaneFactory.createY_AXISBoxInnerContainer_S_Pane();
 		pane.add(typePane);
 		
-		typePane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Chart_Trend", "Type"}), null));
+		typePane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Trend_Type"), null));
 		
 		JPanel buttonPane = FRGUIPaneFactory.createBoxFlowInnerContainer_S_Pane();
 		typePane.add(buttonPane);
@@ -97,7 +97,7 @@ public class ConditionTrendLinePane extends BasicBeanPane<ConditionTrendLine> {
 	
 	private JPanel initExtendsPane() {
 		JPanel extendsPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();		// 前推倒推设置
-		extendsPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Chart_Trend", "Forecast"}), null));
+		extendsPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Trend_Forecast"), null));
 		
 		extendsPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Chart_TrendLine_Forward") + ":"));
 		extendsPane.add(forwardLabel = new UITextField("0", 5));

designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/DataSeriesAttrPane.java

@@ -43,7 +43,7 @@ public class DataSeriesAttrPane extends JListControlPane {
 
     @Override
     protected String title4PopupWindow() {
-        return com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Condition", "Display"});
+        return com.fr.design.i18n.Toolkit.i18nText("Chart-Condition_Display");
     }
 
     public void populate(Plot plot) {

designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/DataSeriesConditionPane.java

@@ -166,7 +166,7 @@ public class DataSeriesConditionPane extends ConditionAttributesPane<ConditionAt
 
     @Override
     protected String title4PopupWindow() {
-        return com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Condition", "Display"});
+        return com.fr.design.i18n.Toolkit.i18nText("Chart-Condition_Display");
     }
 
     /**

designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/LabelAxisPositionPane.java

@@ -29,7 +29,7 @@ public class LabelAxisPositionPane extends ConditionAttrSingleConditionPane<Data
     public LabelAxisPositionPane(ConditionAttributesPane conditionAttributesPane, boolean isRemove) {
         super(conditionAttributesPane, isRemove);
 
-        nameLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"ChartF-Axis", "Selection"}));
+        nameLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Axis_Selection"));
         if (isRemove) {
             this.add(nameLabel);
         }

designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/TrendLineControlPane.java

@@ -26,7 +26,7 @@ public class TrendLineControlPane extends JListControlPane {
 	
 	@Override
 	protected String title4PopupWindow() {
-		return com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Edit", "Chart_TrendLine"});
+		return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Edit_Trendline");
 	}
 	
 	public void populate(AttrTrendLine trendLineList) {

designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/TrendLinePane.java

@@ -34,7 +34,7 @@ public class TrendLinePane extends ConditionAttrSingleConditionPane<DataSeriesCo
         super(conditionAttributesPane, isRemove);
         nameLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Chart_TrendLine"));
 
-        editTrendLineButton = new UIButton(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Edit", "Chart_TrendLine"}));
+        editTrendLineButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Edit_Trendline"));
         editTrendLineButton.addActionListener(new ActionListener() {
             public void actionPerformed(ActionEvent e) {
                 final TrendLineControlPane controlPane = new TrendLineControlPane();

designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/BubbleSeriesPane.java

@@ -51,12 +51,12 @@ public class BubbleSeriesPane extends AbstractPlotSeriesPane{
 	}
 
 	protected void initCom(){
-		String[] nameArray = {com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Chart_Bubble", "Chart_Area"}),
+		String[] nameArray = {com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Bubble_Area"),
 				com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Bubble_Width")};
 		Integer[] valueArray = {BubblePlot.BUBBLE_AREA, BubblePlot.BUBBLE_WIDTH};
 		bubbleMean = new UIButtonGroup<Integer>(nameArray, valueArray);
 		zoomTime = new UITextField();
-		isMinus = new UICheckBox(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Display", "Chart_Negative_Bubble"}));
+		isMinus = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Display_Negative"));
 	}
 
 	@Override

designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/VanChartTimeAxisPane.java

@@ -229,7 +229,7 @@ public class VanChartTimeAxisPane extends VanChartBaseAxisPane {
 
         private void initMain() {
             // 主要刻度单位
-            mainTickBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Custom", "Plugin-ChartF_MainType"}));
+            mainTickBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Custom_Main_Type"));
             mainUnitField = new UITextField();
             mainUnitField.setPreferredSize(new Dimension(20, 20));
             mainType = new UIComboBox(TYPES);
@@ -245,7 +245,7 @@ public class VanChartTimeAxisPane extends VanChartBaseAxisPane {
 
         private void initSecond() {
             // 次要刻度单位
-            secondTickBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Custom", "Plugin-ChartF_SecType"}));
+            secondTickBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Custom_Second_Type"));
             secondUnitField = new UITextField();
             secondUnitField.setPreferredSize(new Dimension(20, 20));
             secondType = new UIComboBox(TYPES);

designer-chart/src/main/java/com/fr/van/chart/designer/style/background/AlertLineListControlPane.java

@@ -35,7 +35,7 @@ public class AlertLineListControlPane extends VanChartUIListControlPane {
     }
 
     protected String getAddItemText() {
-        return com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Plugin-Chart_Add_Line","Plugin-ChartF_AlertLine"});
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Add_Alert_Line");
     }
 
     protected ShortCut4JControlPane[] createShortcuts() {

designer-chart/src/main/java/com/fr/van/chart/line/VanChartLinePlotPane.java

@@ -27,7 +27,7 @@ public class VanChartLinePlotPane extends AbstractVanChartTypePane {
     protected String[] getTypeTipName() {
         return new String[]{
                 com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Type_Line"),
-                com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"FR-Chart-Type_Stacked","FR-Chart-Type_Line"}),
+                com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Stacked_Line"),
                 com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Mode_Custom")
         };
     }

designer-chart/src/main/java/com/fr/van/chart/range/component/GradualIntervalConfigPane.java

@@ -73,7 +73,7 @@ public class GradualIntervalConfigPane extends JPanel{
     protected Component[][] getPaneComponents(){
         return new Component[][]{
                 new Component[]{minMaxValuePane, null},
-                new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"FR-Chart-Color_Subject", "FR-Chart-Color_Color"})), colorSelectBox},
+                new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Subject_Color")), colorSelectBox},
                 new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Value_Divided_stage")), numberDragPane},
                 new Component[]{null, legendGradientBar},
         };

designer-chart/src/main/java/com/fr/van/chart/range/component/SectionIntervalConfigPane.java

@@ -28,7 +28,7 @@ public class SectionIntervalConfigPane extends MapColorPickerPaneWithFormula {
     protected Component[][] createComponents(){
         return new Component[][]{
                 new Component[]{null,null},
-                new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"FR-Chart-Color_Subject", "FR-Chart-Color_Color"})), getFillStyleCombox()},
+                new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Subject_Color")), getFillStyleCombox()},
                 new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Value_Divided_stage")), getRegionNumPane()},
                 new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Range_Num")),getDesignTypeButtonGroup()},