还原冲突代码

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

@@ -42,14 +42,14 @@ public class MinMaxValuePane extends JPanel {
 		double p = TableLayout.PREFERRED;
 		double f = TableLayout.FILL;
 		double[] columnSize = { p, f };
-		double[] rowSize = { p, p, p, p, p, p, p, p};
+		double[] rowSize = { p, p, p, p};
 
 		Component[][] components  = getPanelComponents();
 		JPanel panel = TableLayoutHelper.createTableLayoutPane(components ,rowSize,columnSize);
 		this.setLayout(new BorderLayout());
 		this.add(panel,BorderLayout.CENTER);
 
-		for(int i = 0; i < components.length; i+=2) {
+		for(int i = 0; i < components.length; i++) {
 			((UICheckBox)components[i][0]).addActionListener(new ActionListener() {
 
 				@Override
@@ -57,19 +57,15 @@ public class MinMaxValuePane extends JPanel {
 					checkBoxUse();
 				}
 			});
-			ChartSwingUtils.addListener((UICheckBox)components[i][0], (UITextField)components[i+1][0]);
+			ChartSwingUtils.addListener((UICheckBox)components[i][0], (UITextField)components[i][1]);
 		}
 	}
 	protected Component[][] getPanelComponents() {
 		return 	new Component[][]{
-				new Component[]{minCheckBox},
+				new Component[]{minCheckBox, minValueField},
-				new Component[]{minValueField},
+				new Component[]{maxCheckBox, maxValueField},
-				new Component[]{maxCheckBox},
+				new Component[]{isCustomMainUnitBox, mainUnitField},
-				new Component[]{maxValueField},
+				new Component[]{isCustomSecUnitBox, secUnitField},
-				new Component[]{isCustomMainUnitBox},
-				new Component[]{mainUnitField},
-				new Component[]{isCustomSecUnitBox},
-				new Component[]{secUnitField},
 		};
 	}
 

designer_chart/src/com/fr/design/mainframe/chart/gui/style/axis/ChartValuePane.java

@@ -151,11 +151,10 @@ public class ChartValuePane extends ChartAxisUsePane<Axis>{
 		double p = TableLayout.PREFERRED;
 		double f = TableLayout.FILL;
 		double[] columnSize = { LayoutConstants.CHART_ATTR_TOMARGIN,p,f};
-		double[] rowSize = { p, p, p};
+		double[] rowSize = { p, p};
 		Component[][] component = new Component[][]{
 				new Component[]{null,initMinMaxValue(),null},
-				new Component[]{null, addLogarithmicPane2ValuePane(), null},
+				new Component[]{null, addLogarithmicPane2ValuePane(), addLogText()},
-				new Component[]{null, null, addLogText()},
 		};
 		return TableLayoutHelper.createTableLayoutPane(component, rowSize, columnSize);
 	}