合并代码或者修改冲突时 merge错误 改回正确的

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

@@ -31,45 +31,53 @@ public class MinMaxValuePane extends JPanel {
     protected UITextField secUnitField;
 
 	public MinMaxValuePane() {
-        minCheckBox = new UICheckBox(Inter.getLocText(new String[]{"Custom", "Min_Value"}));
+		minCheckBox = new UICheckBox(Inter.getLocText(new String[]{"Custom", "Min_Value"}));
-        minValueField = new UITextField(6);
+		minValueField = new UITextField(6);
-        maxCheckBox = new UICheckBox(Inter.getLocText(new String[]{"Custom", "Max_Value"}));
+		maxCheckBox = new UICheckBox(Inter.getLocText(new String[]{"Custom", "Max_Value"}));
-        maxValueField = new UITextField(6);
+		maxValueField = new UITextField(6);
-        isCustomMainUnitBox = new UICheckBox(Inter.getLocText("FR-Chart_MainGraduationUnit"));
+		isCustomMainUnitBox = new UICheckBox(Inter.getLocText("FR-Chart_MainGraduationUnit"));
-        mainUnitField = new UITextField(6);
+		mainUnitField = new UITextField(6);
-        isCustomSecUnitBox = new UICheckBox(Inter.getLocText("FR-Chart_SecondGraduationUnit"));
+		isCustomSecUnitBox = new UICheckBox(Inter.getLocText("FR-Chart_SecondGraduationUnit"));
-        secUnitField = new UITextField(6);
+		secUnitField = new UITextField(6);
+
 		double p = TableLayout.PREFERRED;
 		double f = TableLayout.FILL;
-		double[] columnSize = { p, f };
+		double[] columnSize = {p, f};
-        double[] rowSize = { p, p, p, p};
 
-		Component[][] components  = getPanelComponents();
+		Component[][] components = getPanelComponents();
-		JPanel panel = TableLayoutHelper.createTableLayoutPane(components ,rowSize,columnSize);
+		JPanel panel = TableLayoutHelper.createTableLayoutPane(components, getRowSize(p), columnSize);
 		this.setLayout(new BorderLayout());
-		this.add(panel,BorderLayout.CENTER);
+		this.add(panel, BorderLayout.CENTER);
+		addComponentListener(components);
+	}
 
-        for(int i = 0; i < components.length; i++) {
+	protected double[] getRowSize(double p) {
-			((UICheckBox)components[i][0]).addActionListener(new ActionListener() {
+		return new double[]{p, p, p, p};
+	}
+
+	public 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();
 				}
 			});
-			ChartSwingUtils.addListener((UICheckBox)components[i][0], (UITextField)components[i][1]);
+			ChartSwingUtils.addListener((UICheckBox) components[i][0], (UITextField) components[i][1]);
 		}
 	}
+
 	protected Component[][] getPanelComponents() {
-		return 	new Component[][]{
+		return new Component[][]{
-                new Component[]{minCheckBox, minValueField},
+				new Component[]{minCheckBox, minValueField},
-                new Component[]{maxCheckBox, maxValueField},
+				new Component[]{maxCheckBox, maxValueField},
-                new Component[]{isCustomMainUnitBox, mainUnitField},
+				new Component[]{isCustomMainUnitBox, mainUnitField},
-                new Component[]{isCustomSecUnitBox, secUnitField},
+				new Component[]{isCustomSecUnitBox, secUnitField},
 		};
 	}
 
-	private void checkBoxUse() {
+	protected void checkBoxUse() {
 		minValueField.setEnabled(minCheckBox.isSelected());
 		maxValueField.setEnabled(maxCheckBox.isSelected());