From fbb8ce52bc895594d978f684f7795a6504d61cdf Mon Sep 17 00:00:00 2001
From: richie <jihua.me@gmail.com>
Date: Tue, 24 Jul 2018 23:32:09 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=A7=E7=BB=AD=E6=94=B9=E6=94=B9=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../design/chart/gui/active/action/SetChartStyleAciton.java  | 2 +-
 .../chart/gui/active/action/SetDataLabelStyleAction.java     | 2 +-
 .../design/chart/gui/active/action/SetPlotStyleAction.java   | 2 +-
 .../design/chart/gui/active/action/SetTitleStyleAction.java  | 2 +-
 .../fr/design/chart/report/GisMapReportDataContentPane.java  | 2 +-
 .../main/java/com/fr/design/chart/report/MapDataPane.java    | 4 ++--
 .../com/fr/design/chart/report/MapMoreReportIndexPane.java   | 5 +++--
 .../com/fr/design/chart/report/MapMoreTableIndexPane.java    | 5 +++--
 .../com/fr/design/chart/report/MapReportDataSinglePane.java  | 5 +++--
 .../main/java/com/fr/design/chart/report/MapSinglePane.java  | 2 +-
 .../com/fr/design/chart/report/MapTableDataSinglePane.java   | 5 +++--
 11 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/designer-chart/src/main/java/com/fr/design/chart/gui/active/action/SetChartStyleAciton.java b/designer-chart/src/main/java/com/fr/design/chart/gui/active/action/SetChartStyleAciton.java
index a961a5819..eda97f42f 100644
--- a/designer-chart/src/main/java/com/fr/design/chart/gui/active/action/SetChartStyleAciton.java
+++ b/designer-chart/src/main/java/com/fr/design/chart/gui/active/action/SetChartStyleAciton.java
@@ -18,7 +18,7 @@ public class SetChartStyleAciton extends ChartComponentAction {
 
     public SetChartStyleAciton(ChartComponent chartComponent) {
         super(chartComponent);
-        this.setName(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"DashBoard-ChartFloat", "Style"}));
+        this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Style"));
     }
 
     public void actionPerformed(ActionEvent e) {
diff --git a/designer-chart/src/main/java/com/fr/design/chart/gui/active/action/SetDataLabelStyleAction.java b/designer-chart/src/main/java/com/fr/design/chart/gui/active/action/SetDataLabelStyleAction.java
index f6b553249..262016bfa 100644
--- a/designer-chart/src/main/java/com/fr/design/chart/gui/active/action/SetDataLabelStyleAction.java
+++ b/designer-chart/src/main/java/com/fr/design/chart/gui/active/action/SetDataLabelStyleAction.java
@@ -11,7 +11,7 @@ public class SetDataLabelStyleAction extends ChartComponentAction{
 
 	public SetDataLabelStyleAction(ChartComponent chartComponent) {
 		super(chartComponent);
-		this.setName(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Set", "Data-Label"}));
+		this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Set_Data_Label"));
 	}
 
 	@Override
diff --git a/designer-chart/src/main/java/com/fr/design/chart/gui/active/action/SetPlotStyleAction.java b/designer-chart/src/main/java/com/fr/design/chart/gui/active/action/SetPlotStyleAction.java
index 1d6fd311d..92b7530f1 100644
--- a/designer-chart/src/main/java/com/fr/design/chart/gui/active/action/SetPlotStyleAction.java
+++ b/designer-chart/src/main/java/com/fr/design/chart/gui/active/action/SetPlotStyleAction.java
@@ -19,7 +19,7 @@ public class SetPlotStyleAction extends ChartComponentAction {
 
     public SetPlotStyleAction(ChartComponent chartComponent) {
         super(chartComponent);
-        this.setName(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Set", "ChartF-Plot"}));
+        this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Set_Plot"));
     }
 
     public void actionPerformed(ActionEvent e) {
diff --git a/designer-chart/src/main/java/com/fr/design/chart/gui/active/action/SetTitleStyleAction.java b/designer-chart/src/main/java/com/fr/design/chart/gui/active/action/SetTitleStyleAction.java
index 68b4e16b0..b336475d4 100644
--- a/designer-chart/src/main/java/com/fr/design/chart/gui/active/action/SetTitleStyleAction.java
+++ b/designer-chart/src/main/java/com/fr/design/chart/gui/active/action/SetTitleStyleAction.java
@@ -19,7 +19,7 @@ public class SetTitleStyleAction extends ChartComponentAction {
 
 	public SetTitleStyleAction(ChartComponent chartComponent) {
 		super(chartComponent);
-		this.setName(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Set", "Title", "Style"}));
+		this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Set_Title_Style"));
 	}
 
 	public void actionPerformed(ActionEvent e) {
diff --git a/designer-chart/src/main/java/com/fr/design/chart/report/GisMapReportDataContentPane.java b/designer-chart/src/main/java/com/fr/design/chart/report/GisMapReportDataContentPane.java
index b6e90e843..55063796a 100644
--- a/designer-chart/src/main/java/com/fr/design/chart/report/GisMapReportDataContentPane.java
+++ b/designer-chart/src/main/java/com/fr/design/chart/report/GisMapReportDataContentPane.java
@@ -84,7 +84,7 @@ public class GisMapReportDataContentPane extends FurtherBasicBeanPane<GisMapRepo
 
         this.add(northPane, BorderLayout.NORTH);
 
-        String[] columnNames = new String[]{com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Filed", "Title"}), com.fr.design.i18n.Toolkit.i18nText("Area_Value")};
+        String[] columnNames = new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Area_Title"), com.fr.design.i18n.Toolkit.i18nText("Area_Value")};
         seriesPane = new UICorrelationPane(columnNames) {
             public UITableEditor createUITableEditor() {
                 return new InnerTableEditor();
diff --git a/designer-chart/src/main/java/com/fr/design/chart/report/MapDataPane.java b/designer-chart/src/main/java/com/fr/design/chart/report/MapDataPane.java
index 56f68dc57..25552c2cb 100644
--- a/designer-chart/src/main/java/com/fr/design/chart/report/MapDataPane.java
+++ b/designer-chart/src/main/java/com/fr/design/chart/report/MapDataPane.java
@@ -99,7 +99,7 @@ public class MapDataPane extends DataContentsPane {
 						return list;
 					}
 					protected String title4PopupWindow() {
-						return com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Chart-Map", "Data"});
+						return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Map_Data");
 					}
 				};
 				pane.add(mainPane, BorderLayout.CENTER);
@@ -127,7 +127,7 @@ public class MapDataPane extends DataContentsPane {
      * @return 标题
      */
 	public String title4PopupWindow() {
-		return com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Chart-Map", "Data"});
+		return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Map_Data");
 	}
 
 	@Override
diff --git a/designer-chart/src/main/java/com/fr/design/chart/report/MapMoreReportIndexPane.java b/designer-chart/src/main/java/com/fr/design/chart/report/MapMoreReportIndexPane.java
index d860a9095..b64511ff1 100644
--- a/designer-chart/src/main/java/com/fr/design/chart/report/MapMoreReportIndexPane.java
+++ b/designer-chart/src/main/java/com/fr/design/chart/report/MapMoreReportIndexPane.java
@@ -52,13 +52,14 @@ public class MapMoreReportIndexPane extends BasicBeanPane<MapSingleLayerReportDe
 		this.add(northPane, BorderLayout.NORTH);
 		northPane.setLayout(new FlowLayout(FlowLayout.LEFT));
 		
-		northPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Area_Name") + ":"));
+		northPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Area_Name") + ":"));
 		
 		areaNamePane = new TinyFormulaPane();
 		areaNamePane.setPreferredSize(new Dimension(120, 20));
 		northPane.add(areaNamePane);
 		
-		tabPane = new UICorrelationPane(new String[]{com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Filed", "Title"}), com.fr.design.i18n.Toolkit.i18nText("Area_Value")}){
+		tabPane = new UICorrelationPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Area_Title"),
+				com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Area_Value")){
 			public UITableEditor createUITableEditor() {
 				return new InnerTableEditor();
 			}
diff --git a/designer-chart/src/main/java/com/fr/design/chart/report/MapMoreTableIndexPane.java b/designer-chart/src/main/java/com/fr/design/chart/report/MapMoreTableIndexPane.java
index 8ecae6938..7b2edd98b 100644
--- a/designer-chart/src/main/java/com/fr/design/chart/report/MapMoreTableIndexPane.java
+++ b/designer-chart/src/main/java/com/fr/design/chart/report/MapMoreTableIndexPane.java
@@ -63,13 +63,14 @@ public class MapMoreTableIndexPane extends BasicBeanPane<MapSingleLayerTableDefi
 		this.add(northPane, BorderLayout.NORTH);
 		northPane.setLayout(new FlowLayout(FlowLayout.LEFT));
 		
-		northPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Area_Name") + ":"));
+		northPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Area_Name") + ":"));
 		
 		areaNameBox = new UIComboBox();
 		areaNameBox.setPreferredSize(new Dimension(120, 20));
 		northPane.add(areaNameBox);
 		
-		tabPane = new UICorrelationPane(new String[]{com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Filed", "Title"}), com.fr.design.i18n.Toolkit.i18nText("Area_Value")}){
+		tabPane = new UICorrelationPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Area_Title"),
+				com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Area_Value")){
 			public UITableEditor createUITableEditor() {
 				return new InnerTableEditor();
 			}
diff --git a/designer-chart/src/main/java/com/fr/design/chart/report/MapReportDataSinglePane.java b/designer-chart/src/main/java/com/fr/design/chart/report/MapReportDataSinglePane.java
index 15f8e74cf..317975925 100644
--- a/designer-chart/src/main/java/com/fr/design/chart/report/MapReportDataSinglePane.java
+++ b/designer-chart/src/main/java/com/fr/design/chart/report/MapReportDataSinglePane.java
@@ -50,12 +50,13 @@ public class MapReportDataSinglePane extends FurtherBasicBeanPane<MapSingleLayer
 		
 		northPane.setLayout(new FlowLayout(FlowLayout.CENTER));
 		
-		northPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Area_Name") + ":", SwingConstants.RIGHT));
+		northPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Area_Name") + ":", SwingConstants.RIGHT));
 		areaNamePane = new TinyFormulaPane();
 		areaNamePane.setPreferredSize(new Dimension(120, 20));
 		northPane.add(areaNamePane);
 
-		String[] columnNames = new String[]{com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Filed", "Title"}), com.fr.design.i18n.Toolkit.i18nText("Area_Value")};
+		String[] columnNames = new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Area_Title"),
+				com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Area_Value")};
 		seriesPane = new UICorrelationPane(columnNames) {
 			public UITableEditor createUITableEditor() {
 				return new InnerTableEditor();
diff --git a/designer-chart/src/main/java/com/fr/design/chart/report/MapSinglePane.java b/designer-chart/src/main/java/com/fr/design/chart/report/MapSinglePane.java
index 0536ebb34..76b1e1624 100644
--- a/designer-chart/src/main/java/com/fr/design/chart/report/MapSinglePane.java
+++ b/designer-chart/src/main/java/com/fr/design/chart/report/MapSinglePane.java
@@ -80,7 +80,7 @@ public class MapSinglePane extends FurtherBasicBeanPane<TopDefinitionProvider> {
 	 * 界面标题
 	 */
 	public String title4PopupWindow() {
-		return com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"SingleLayer", "Chart-Map"});
+		return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Single_Layer_Map");
 	}
 
 	/**
diff --git a/designer-chart/src/main/java/com/fr/design/chart/report/MapTableDataSinglePane.java b/designer-chart/src/main/java/com/fr/design/chart/report/MapTableDataSinglePane.java
index da249a9c1..a1b37bb2a 100644
--- a/designer-chart/src/main/java/com/fr/design/chart/report/MapTableDataSinglePane.java
+++ b/designer-chart/src/main/java/com/fr/design/chart/report/MapTableDataSinglePane.java
@@ -65,7 +65,7 @@ public class MapTableDataSinglePane extends FurtherBasicBeanPane<MapSingleLayerT
 		fromTableData.setPreferredSize(new Dimension(180, 20));
 		northPane.add(fromTableData);
 		
-		UILabel nameLabel = new UILabel("    " + com.fr.design.i18n.Toolkit.i18nText("Area_Name") + ":", SwingConstants.RIGHT);
+		UILabel nameLabel = new UILabel("    " + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Area_Name") + ":", SwingConstants.RIGHT);
 		areaNameBox = new UIComboBox();
 		areaNameBox.setPreferredSize(new Dimension(80, 20));
 		
@@ -81,7 +81,8 @@ public class MapTableDataSinglePane extends FurtherBasicBeanPane<MapSingleLayerT
 		
 		pane.add(areaNamePane, BorderLayout.NORTH);
 		
-		String[] titles = {com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Filed", "Title"}), com.fr.design.i18n.Toolkit.i18nText("Area_Value")};
+		String[] titles = {com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Area_Title"),
+				com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Area_Value")};
 		titleValuePane = new UICorrelationPane(titles){
 			public UITableEditor createUITableEditor() {
 				return new InnerTableEditor();