Merge pull request #813 in BA/design from ~MANGO/design:dev to dev

* commit '5f68195875d229f011c065c416d618243e60ea41':
  加上之前合并冲突被删掉的国际化
  修改设计器最大最小值，与releas分支同步

designer_base/src/com/fr/design/locale/designer.properties

@@ -587,4 +587,8 @@ FR-Designer_Mouse_Click_Tips=
 FR-Designer-Move_Tab_First=move to first
 FR-Designer-Move_Tab_End=move to end
 FR-Designer-Move_Tab_Next=move to next
-FR-Designer-Move_Tab_Prev=move to previous
+FR-Designer-Move_Tab_Prev=move to previous
+FR-Designer_AxisReversed=AxisValue
+FR-Designer_Logarithmic=Logarithmic
+FR-Designer_Chart_Log_Base=Log Base
+FR-Designer_Chart_F_Radar_Axis=Chart_F_Radar_Axis

designer_base/src/com/fr/design/locale/designer_en_US.properties

@@ -587,4 +587,8 @@ FR-Designer_Mouse_Click_Tips=The background of the mouse to click the button, in
 FR-Designer-Move_Tab_First=move to first
 FR-Designer-Move_Tab_End=move to end
 FR-Designer-Move_Tab_Next=move to next
-FR-Designer-Move_Tab_Prev=move to previous
+FR-Designer-Move_Tab_Prev=move to previous
+FR-Designer_AxisReversed=Axis in reverse order
+FR-Designer_Logarithmic=Log scale
+FR-Designer_Chart_Log_Base=Log Base
+FR-Designer_Chart_F_Radar_Axis=Value Axis

designer_base/src/com/fr/design/locale/designer_ja_JP.properties

@@ -555,3 +555,7 @@ FR-Designer_Initial_Background_Tips=
 FR-Designer_Mouse_Move_Tips=
 FR-Designer_Mouse_Click_Tips=
 FR-Designer_Plugin_Should_Update_Please_Contact_Developer=
+FR-Designer_AxisReversed=\u8EF8\u9006\u9806
+FR-Designer_Logarithmic=\u5BFE\u6570\u76EE\u76DB\u308A
+FR-Designer_Chart_Log_Base=\u5E95\u6570
+FR-Designer_Chart_F_Radar_Axis=\u5782\u76F4\u8EF8

designer_base/src/com/fr/design/locale/designer_ko_KR.properties

@@ -551,4 +551,8 @@ FR-Designer_Background_Image_Select=
 FR-Designer_Initial_Background_Tips=
 FR-Designer_Mouse_Move_Tips=
 FR-Designer_Mouse_Click_Tips=
-FR-Designer_Plugin_Should_Update_Please_Contact_Developer=
+FR-Designer_Plugin_Should_Update_Please_Contact_Developer=
+FR-Designer_AxisReversed=\uCD95\uC5ED\uC21C
+FR-Designer_Logarithmic=\uB85C\uADF8\uB208\uAE08
+FR-Designer_Chart_Log_Base=\uAE30\uC218
+FR-Designer_Chart_F_Radar_Axis=\uAC12\uCD95

designer_base/src/com/fr/design/locale/designer_zh_CN.properties

@@ -588,3 +588,7 @@ FR-Designer_Background_Image_Select=\u9009\u62E9\u56FE\u7247
 FR-Designer_Initial_Background_Tips=\u6309\u94AE\u7684\u521D\u59CB\u80CC\u666F
 FR-Designer_Mouse_Move_Tips=\u9F20\u6807\u79FB\u52A8\u5230\u6309\u94AE\u4E0A\u7684\u80CC\u666F\uFF0C\u82E5\u65E0\u5219\u4E0D\u6539\u53D8\u80CC\u666F
 FR-Designer_Mouse_Click_Tips=\u9F20\u6807\u70B9\u51FB\u6309\u94AE\u65F6\u80CC\u666F\uFF0C\u82E5\u65E0\u5219\u4E0D\u6539\u53D8\u80CC\u666F
+FR-Designer_AxisReversed=\u8F74\u9006\u5E8F
+FR-Designer_Logarithmic=\u5BF9\u6570\u523B\u5EA6
+FR-Designer_Chart_Log_Base=\u5E95\u6570
+FR-Designer_Chart_F_Radar_Axis=\u503C\u8F74

designer_base/src/com/fr/design/locale/designer_zh_TW.properties

@@ -575,4 +575,8 @@ FR-Designer_Background_Clear=
 FR-Designer_Background_Image_Select=
 FR-Designer_Initial_Background_Tips=
 FR-Designer_Mouse_Move_Tips=
-FR-Designer_Mouse_Click_Tips=
+FR-Designer_Mouse_Click_Tips=
+FR-Designer_AxisReversed=\u8EF8\u9006\u5E8F
+FR-Designer_Logarithmic=\u5C0D\u6578\u523B\u5EA6
+FR-Designer_Chart_Log_Base=\u5E95\u6578
+FR-Designer_Chart_F_Radar_Axis=\u503C\u8EF8

designer_chart/src/com/fr/design/chart/axis/MinMaxValuePane.java

@@ -55,19 +55,23 @@ public class MinMaxValuePane extends JPanel {
 		return new double[]{p, p, p, p};
 	}
 
-	public void addComponentListener(Component[][] components) {
+	protected void addComponentListener(Component[][] components) {
 		for (int i = 0; i < components.length; i++) {
-			((UICheckBox) components[i][0]).addActionListener(new ActionListener() {
-
-				@Override
-				public void actionPerformed(ActionEvent e) {
-					checkBoxUse();
-				}
-			});
+			addListener((UICheckBox) components[i][0]);
 			ChartSwingUtils.addListener((UICheckBox) components[i][0], (UITextField) components[i][1]);
 		}
 	}
 
+	protected void  addListener(UICheckBox checkBox) {
+		checkBox.addActionListener(new ActionListener() {
+
+			@Override
+			public void actionPerformed(ActionEvent e) {
+				checkBoxUse();
+			}
+		});
+	}
+
 	protected Component[][] getPanelComponents() {
 		return new Component[][]{
 				new Component[]{minCheckBox, minValueField},
@@ -77,7 +81,7 @@ public class MinMaxValuePane extends JPanel {
 		};
 	}
 
-	protected void checkBoxUse() {
+	private void checkBoxUse() {
 		minValueField.setEnabled(minCheckBox.isSelected());
 		maxValueField.setEnabled(maxCheckBox.isSelected());
 
@@ -108,7 +112,7 @@ public class MinMaxValuePane extends JPanel {
 			if(axis.getMinValue() != null) {
 				minValueField.setText(axis.getMinValue().toString());
 			}
-		} 
+		}
 
 		// 最大值
 		if (axis.isCustomMaxValue()) {
@@ -116,7 +120,7 @@ public class MinMaxValuePane extends JPanel {
 			if(axis.getMaxValue() != null) {
 				maxValueField.setText(axis.getMaxValue().toString());
 			}
-		} 
+		}
 
 		// 主次刻度单位
 		if (axis.isCustomMainUnit()) {
@@ -124,7 +128,7 @@ public class MinMaxValuePane extends JPanel {
 			if(axis.getMainUnit() != null) {
 				mainUnitField.setText(axis.getMainUnit().toString());
 			}
-		} 
+		}
 
 		if(axis.isCustomSecUnit()) {
 			isCustomSecUnitBox.setSelected(true);