From ce29ce9ff5039b102896e6ad8c2d299d5ad0e12a Mon Sep 17 00:00:00 2001
From: "Wim.Zhai" <Wim.Zhai@fanruan.com>
Date: Wed, 12 Sep 2018 16:35:52 +0800
Subject: [PATCH 1/2] what happen?

---
 .../design/mainframe/chart/gui/data/TableDataPane.java   | 2 +-
 .../chart/AbstractExtendedChartReportDataPane.java       | 9 +++++----
 .../chart/AbstractExtendedChartTableDataPane.java        | 2 +-
 .../com/fr/extended/chart/AbstractExtendedStylePane.java | 2 +-
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/TableDataPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/TableDataPane.java
index 5248fb08b1..09d92c9780 100644
--- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/TableDataPane.java
+++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/TableDataPane.java
@@ -81,7 +81,7 @@ public class TableDataPane extends FurtherBasicBeanPane<ChartCollection>{
 	 * @return 返回标题.
 	 */
 	public String title4PopupWindow() {
-		return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Tabledata");
+		return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_TableData");
 	}
 
 
diff --git a/designer-chart/src/main/java/com/fr/extended/chart/AbstractExtendedChartReportDataPane.java b/designer-chart/src/main/java/com/fr/extended/chart/AbstractExtendedChartReportDataPane.java
index 9e4a84f038..8420c7d5ce 100644
--- a/designer-chart/src/main/java/com/fr/extended/chart/AbstractExtendedChartReportDataPane.java
+++ b/designer-chart/src/main/java/com/fr/extended/chart/AbstractExtendedChartReportDataPane.java
@@ -11,8 +11,7 @@ import com.fr.design.mainframe.chart.gui.data.report.AbstractReportDataContentPa
 import javax.swing.BorderFactory;
 import javax.swing.JPanel;
 import javax.swing.SwingConstants;
-import java.awt.BorderLayout;
-import java.awt.Component;
+import java.awt.*;
 import java.util.Arrays;
 
 /**
@@ -32,7 +31,9 @@ public abstract class AbstractExtendedChartReportDataPane<T extends AbstractData
 
         Component[][] components = new Component[len][2];
         for (int i = 0; i < len; i++) {
-            components[i] = new Component[]{new UILabel(labels[i], SwingConstants.LEFT), formulaPanes[i]};
+            Component formulaPane = formulaPanes[i];
+            formulaPane.setPreferredSize(new Dimension(100, 20));
+            components[i] = new Component[]{new UILabel(labels[i], SwingConstants.LEFT), formulaPane};
         }
 
         double p = TableLayout.PREFERRED;
@@ -42,7 +43,7 @@ public abstract class AbstractExtendedChartReportDataPane<T extends AbstractData
         Arrays.fill(rowSize, p);
 
         JPanel panel = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, 24, 6);
-        panel.setBorder(BorderFactory.createEmptyBorder(0, 24, 0, 15));
+        panel.setBorder(BorderFactory.createEmptyBorder(0, 20, 0, 15));
 
 
         this.setLayout(new BorderLayout());
diff --git a/designer-chart/src/main/java/com/fr/extended/chart/AbstractExtendedChartTableDataPane.java b/designer-chart/src/main/java/com/fr/extended/chart/AbstractExtendedChartTableDataPane.java
index f9beeca2bd..ab61de5d1d 100644
--- a/designer-chart/src/main/java/com/fr/extended/chart/AbstractExtendedChartTableDataPane.java
+++ b/designer-chart/src/main/java/com/fr/extended/chart/AbstractExtendedChartTableDataPane.java
@@ -47,7 +47,7 @@ public abstract class AbstractExtendedChartTableDataPane<T extends AbstractDataC
 
         if (hasFunction()) {
             function = new CalculateComboBox();
-            components[len] = new Component[]{new UILabel("function", SwingConstants.LEFT), function};
+            components[len] = new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Summary_Method"), SwingConstants.LEFT), function};
         }
 
         double p = TableLayout.PREFERRED;
diff --git a/designer-chart/src/main/java/com/fr/extended/chart/AbstractExtendedStylePane.java b/designer-chart/src/main/java/com/fr/extended/chart/AbstractExtendedStylePane.java
index 3346c03eca..fe6c493ff8 100644
--- a/designer-chart/src/main/java/com/fr/extended/chart/AbstractExtendedStylePane.java
+++ b/designer-chart/src/main/java/com/fr/extended/chart/AbstractExtendedStylePane.java
@@ -34,7 +34,7 @@ public abstract class AbstractExtendedStylePane<T extends AbstractChart> extends
     public AbstractExtendedStylePane() {
     }
 
-    public AbstractExtendedStylePane(AttributeChangeListener listener) {
+    public      AbstractExtendedStylePane(AttributeChangeListener listener) {
         this.listener = listener;
     }
 

From e42e066b5779e8b12fa9939b43652d0ff47e9b4b Mon Sep 17 00:00:00 2001
From: "Wim.Zhai" <Wim.Zhai@fanruan.com>
Date: Wed, 12 Sep 2018 16:49:54 +0800
Subject: [PATCH 2/2] formatter

---
 .../chart/AbstractExtendedChartReportDataPane.java         | 7 +++----
 .../com/fr/extended/chart/AbstractExtendedStylePane.java   | 2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/designer-chart/src/main/java/com/fr/extended/chart/AbstractExtendedChartReportDataPane.java b/designer-chart/src/main/java/com/fr/extended/chart/AbstractExtendedChartReportDataPane.java
index 4cd7ccc1c7..1cfe2bf6b3 100644
--- a/designer-chart/src/main/java/com/fr/extended/chart/AbstractExtendedChartReportDataPane.java
+++ b/designer-chart/src/main/java/com/fr/extended/chart/AbstractExtendedChartReportDataPane.java
@@ -11,7 +11,8 @@ import com.fr.design.mainframe.chart.gui.data.report.AbstractReportDataContentPa
 import javax.swing.BorderFactory;
 import javax.swing.JPanel;
 import javax.swing.SwingConstants;
-import java.awt.*;
+import java.awt.BorderLayout;
+import java.awt.Component;
 import java.util.Arrays;
 
 /**
@@ -31,9 +32,7 @@ public abstract class AbstractExtendedChartReportDataPane<T extends AbstractData
 
         Component[][] components = new Component[len][2];
         for (int i = 0; i < len; i++) {
-            Component formulaPane = formulaPanes[i];
-            formulaPane.setPreferredSize(new Dimension(100, 20));
-            components[i] = new Component[]{new UILabel(labels[i], SwingConstants.LEFT), formulaPane};
+            components[i] = new Component[]{new UILabel(labels[i], SwingConstants.LEFT), formulaPanes[i]};
         }
 
         double p = TableLayout.PREFERRED;
diff --git a/designer-chart/src/main/java/com/fr/extended/chart/AbstractExtendedStylePane.java b/designer-chart/src/main/java/com/fr/extended/chart/AbstractExtendedStylePane.java
index fe6c493ff8..3346c03eca 100644
--- a/designer-chart/src/main/java/com/fr/extended/chart/AbstractExtendedStylePane.java
+++ b/designer-chart/src/main/java/com/fr/extended/chart/AbstractExtendedStylePane.java
@@ -34,7 +34,7 @@ public abstract class AbstractExtendedStylePane<T extends AbstractChart> extends
     public AbstractExtendedStylePane() {
     }
 
-    public      AbstractExtendedStylePane(AttributeChangeListener listener) {
+    public AbstractExtendedStylePane(AttributeChangeListener listener) {
         this.listener = listener;
     }