From 4d6e52d550edeb252c161bba0876f85bcef2002e Mon Sep 17 00:00:00 2001
From: zheng <zheng@finereport.com>
Date: Fri, 14 Sep 2018 09:29:57 +0800
Subject: [PATCH] =?UTF-8?q?static=E6=96=B9=E6=B3=95=E6=8B=BF=E5=87=BA?=
 =?UTF-8?q?=E6=9D=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../table/AbstractTableDataContentPane.java   | 25 ++----
 .../chart/gui/data/table/DataPaneHelper.java  | 84 +++++++++++++++++++
 .../table/SeriesNameUseFieldNamePane.java     | 34 +-------
 .../table/SeriesNameUseFieldValuePane.java    | 39 +++------
 .../ExtendedCustomFieldComboBoxPane.java      | 15 ++--
 .../component/ComboBoxWithButtonPane.java     | 20 +----
 6 files changed, 111 insertions(+), 106 deletions(-)
 create mode 100644 designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/DataPaneHelper.java

diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/AbstractTableDataContentPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/AbstractTableDataContentPane.java
index 1fff1bfe3..df5d99fbd 100644
--- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/AbstractTableDataContentPane.java
+++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/AbstractTableDataContentPane.java
@@ -46,32 +46,17 @@ public abstract class AbstractTableDataContentPane extends BasicBeanPane<ChartCo
 	/**
 	 * 刷新Box的选项.
 	 */
-	public static void refreshBoxItems(UIComboBox box, List list) {
-		if (box == null) {
-			return;
-		}
-		
-		Object ob = box.getSelectedItem();
-		box.removeAllItems();
-		
-		int length = list.size();
-		for(int i = 0; i < length; i++) {
-			box.addItem(list.get(i));
-		}
-		
-		box.getModel().setSelectedItem(ob);
+	protected void refreshBoxItems(UIComboBox box, List list) {
+		DataPaneHelper.refreshBoxItems(box, list);
 	}
 
     /**
      * 清空box里所有东西
      * @param box 容器
      */
-	public static void clearBoxItems(UIComboBox box) {
-		if (box == null) {
-			return;
-        }
-        box.removeAllItems();
-    }
+	protected void clearBoxItems(UIComboBox box) {
+		DataPaneHelper.clearBoxItems(box);
+	}
 	
 	protected ItemListener tooltipListener = new ItemListener() {
 
diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/DataPaneHelper.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/DataPaneHelper.java
new file mode 100644
index 000000000..3fb9d6a63
--- /dev/null
+++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/DataPaneHelper.java
@@ -0,0 +1,84 @@
+package com.fr.design.mainframe.chart.gui.data.table;
+
+import com.fr.data.util.function.DataFunction;
+import com.fr.data.util.function.NoneFunction;
+import com.fr.design.gui.icombobox.UIComboBox;
+import com.fr.design.mainframe.chart.gui.data.CalculateComboBox;
+import com.fr.general.ComparatorUtils;
+import com.fr.log.FineLoggerFactory;
+
+import java.util.List;
+
+/**
+ * Created by shine on 2018/9/14.
+ */
+public class DataPaneHelper {
+    /**
+     * 刷新Box的选项.
+     */
+    public static void refreshBoxItems(UIComboBox box, List list) {
+        if (box == null) {
+            return;
+        }
+
+        Object ob = box.getSelectedItem();
+        box.removeAllItems();
+
+        int length = list.size();
+        for (int i = 0; i < length; i++) {
+            box.addItem(list.get(i));
+        }
+
+        box.getModel().setSelectedItem(ob);
+    }
+
+    /**
+     * 清空box里所有东西
+     *
+     * @param box 容器
+     */
+    public static void clearBoxItems(UIComboBox box) {
+        if (box != null) {
+            box.removeAllItems();
+        }
+    }
+
+    /**
+     * 根据公式 获取 公式组件下拉框选项
+     *
+     * @param function
+     * @return
+     */
+    public static String getFunctionString(DataFunction function) {
+        for (int i = 0; i < CalculateComboBox.CLASS_ARRAY.length; i++) {
+            Class tmp = function.getClass();
+            if (ComparatorUtils.equals(tmp, CalculateComboBox.CLASS_ARRAY[i])) {
+                return CalculateComboBox.CALCULATE_ARRAY[i];
+            }
+        }
+        return CalculateComboBox.CALCULATE_ARRAY[0];
+    }
+
+    /**
+     * 根据公式组件下拉选中项 获取对应公式
+     *
+     * @param name
+     * @return
+     */
+    public static DataFunction getFunctionByName(String name) {
+        int index = 0;
+        for (int i = 0; i < CalculateComboBox.CALCULATE_ARRAY.length; i++) {
+            if (ComparatorUtils.equals(name, CalculateComboBox.CALCULATE_ARRAY[i])) {
+                index = i;
+            }
+        }
+        try {
+            return (DataFunction) CalculateComboBox.CLASS_ARRAY[index].newInstance();
+        } catch (InstantiationException e) {
+            FineLoggerFactory.getLogger().error("Function Error");
+        } catch (IllegalAccessException e) {
+            FineLoggerFactory.getLogger().error("Function Error");
+        }
+        return new NoneFunction();
+    }
+}
diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/SeriesNameUseFieldNamePane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/SeriesNameUseFieldNamePane.java
index ada1a424f..73c800f9e 100644
--- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/SeriesNameUseFieldNamePane.java
+++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/SeriesNameUseFieldNamePane.java
@@ -5,7 +5,6 @@ import com.fr.base.chart.chartdata.TopDefinitionProvider;
 import com.fr.chart.chartattr.ChartCollection;
 import com.fr.chart.chartdata.ChartSummaryColumn;
 import com.fr.chart.chartdata.MoreNameCDDefinition;
-import com.fr.data.util.function.DataFunction;
 import com.fr.data.util.function.NoneFunction;
 import com.fr.design.beans.FurtherBasicBeanPane;
 import com.fr.design.event.UIObserver;
@@ -18,8 +17,6 @@ import com.fr.design.gui.itextfield.UITextField;
 import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
 import com.fr.design.mainframe.chart.gui.data.CalculateComboBox;
-import com.fr.general.ComparatorUtils;
-import com.fr.log.FineLoggerFactory;
 import com.fr.stable.StringUtils;
 
 import javax.swing.JComponent;
@@ -201,7 +198,7 @@ public class SeriesNameUseFieldNamePane extends FurtherBasicBeanPane<ChartCollec
             List<Object[]> list = new ArrayList<Object[]>();
             for (int i = 0; i < chartSummaryColumnArray.length; i++) {
                 ChartSummaryColumn column = chartSummaryColumnArray[i];
-                String[] nameArray = {column.getName(), column.getCustomName(), getFunctionString(column.getFunction())};
+                String[] nameArray = {column.getName(), column.getCustomName(), DataPaneHelper.getFunctionString(column.getFunction())};
                 list.add(nameArray);
             }
             seriesDataPane.populateBean(list);
@@ -215,16 +212,6 @@ public class SeriesNameUseFieldNamePane extends FurtherBasicBeanPane<ChartCollec
         this.populateBean(collection,true);
     }
 
-    public static String getFunctionString(DataFunction function) {
-        for (int i = 0; i < CalculateComboBox.CLASS_ARRAY.length; i++) {
-            Class tmp = function.getClass();
-            if (ComparatorUtils.equals(tmp, CalculateComboBox.CLASS_ARRAY[i])) {
-                return CalculateComboBox.CALCULATE_ARRAY[i];
-            }
-        }
-        return CalculateComboBox.CALCULATE_ARRAY[0];
-    }
-
     protected MoreNameCDDefinition createMoreNameCDDefinition() {
         return new MoreNameCDDefinition();
     }
@@ -249,7 +236,7 @@ public class SeriesNameUseFieldNamePane extends FurtherBasicBeanPane<ChartCollec
             String second = Utils.objectToString(line[1]);
             if(isNeedSummary){
                 String third = Utils.objectToString(line[2]);
-                dataArray[i] = new ChartSummaryColumn(first, second, getFcuntionByName(third));
+                dataArray[i] = new ChartSummaryColumn(first, second, DataPaneHelper.getFunctionByName(third));
             } else{
                 dataArray[i] = new ChartSummaryColumn(first,second,new NoneFunction());
             }
@@ -258,23 +245,6 @@ public class SeriesNameUseFieldNamePane extends FurtherBasicBeanPane<ChartCollec
         collection.getSelectedChart().setFilterDefinition(moreDefinition);
     }
 
-    public static DataFunction getFcuntionByName(String name) {
-        int index = 0;
-        for (int i = 0; i < CalculateComboBox.CALCULATE_ARRAY.length; i++) {
-            if (ComparatorUtils.equals(name, CalculateComboBox.CALCULATE_ARRAY[i])) {
-                index = i;
-            }
-        }
-        try {
-            return (DataFunction) CalculateComboBox.CLASS_ARRAY[index].newInstance();
-        } catch (InstantiationException e) {
-            FineLoggerFactory.getLogger().error("Function Error");
-        } catch (IllegalAccessException e) {
-            FineLoggerFactory.getLogger().error("Function Error");
-        }
-        return new NoneFunction();
-    }
-
     /**
      * 保存为新的ChartCollection
      */
diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/SeriesNameUseFieldValuePane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/SeriesNameUseFieldValuePane.java
index 4b01bea27..efc451f2e 100644
--- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/SeriesNameUseFieldValuePane.java
+++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/SeriesNameUseFieldValuePane.java
@@ -15,9 +15,12 @@ import com.fr.design.mainframe.chart.gui.data.CalculateComboBox;
 import com.fr.design.utils.gui.GUICoreUtils;
 import com.fr.general.ComparatorUtils;
 
-
-import javax.swing.*;
-import java.awt.*;
+import javax.swing.BorderFactory;
+import javax.swing.ComboBoxModel;
+import javax.swing.JPanel;
+import java.awt.BorderLayout;
+import java.awt.Component;
+import java.awt.Dimension;
 import java.awt.event.ItemEvent;
 import java.awt.event.ItemListener;
 import java.util.List;
@@ -155,22 +158,16 @@ public class SeriesNameUseFieldValuePane extends FurtherBasicBeanPane<ChartColle
      * @param list 列表
      */
     public void refreshBoxListWithSelectTableData(List list) {
-        refreshBoxItems(seriesName, list);
-        refreshBoxItems(seriesValue, list);
+        DataPaneHelper.refreshBoxItems(seriesName, list);
+        DataPaneHelper.refreshBoxItems(seriesValue, list);
     }
 
     /**
      * 清空所有的box设置
      */
     public void clearAllBoxList(){
-        clearBoxItems(seriesName);
-        clearBoxItems(seriesValue);
-    }
-
-    private void clearBoxItems(UIComboBox box){
-        if(box != null){
-            box.removeAllItems();
-        }
+        DataPaneHelper.clearBoxItems(seriesName);
+        DataPaneHelper.clearBoxItems(seriesValue);
     }
 
     private boolean boxItemsContainsObject(UIComboBox box,Object item){
@@ -187,22 +184,6 @@ public class SeriesNameUseFieldValuePane extends FurtherBasicBeanPane<ChartColle
         return false;
     }
 
-    private void refreshBoxItems(UIComboBox box, List list) {
-        if (box == null) {
-            return;
-        }
-
-        Object ob = box.getSelectedItem();
-        box.removeAllItems();
-
-        int length = list.size();
-        for (int i = 0; i < length; i++) {
-            box.addItem(list.get(i));
-        }
-
-        box.getModel().setSelectedItem(ob);
-    }
-
     /**
      * 判断界面是否接受
      * @param ob 接受的对象
diff --git a/designer-chart/src/main/java/com/fr/extended/chart/ExtendedCustomFieldComboBoxPane.java b/designer-chart/src/main/java/com/fr/extended/chart/ExtendedCustomFieldComboBoxPane.java
index 4201812f3..5ff47c128 100644
--- a/designer-chart/src/main/java/com/fr/extended/chart/ExtendedCustomFieldComboBoxPane.java
+++ b/designer-chart/src/main/java/com/fr/extended/chart/ExtendedCustomFieldComboBoxPane.java
@@ -14,8 +14,7 @@ import com.fr.design.gui.itextfield.UITextField;
 import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
 import com.fr.design.mainframe.chart.gui.data.CalculateComboBox;
-import com.fr.design.mainframe.chart.gui.data.table.AbstractTableDataContentPane;
-import com.fr.design.mainframe.chart.gui.data.table.SeriesNameUseFieldNamePane;
+import com.fr.design.mainframe.chart.gui.data.table.DataPaneHelper;
 import com.fr.stable.StringUtils;
 
 import javax.swing.JComponent;
@@ -145,13 +144,13 @@ public class ExtendedCustomFieldComboBoxPane extends UIComboBoxPane<AbstractData
         }
 
         public void clearAllBoxList() {
-            AbstractTableDataContentPane.clearBoxItems(series);
-            AbstractTableDataContentPane.clearBoxItems(value);
+            DataPaneHelper.clearBoxItems(series);
+            DataPaneHelper.clearBoxItems(value);
         }
 
         public void refreshBoxListWithSelectTableData(List columnNameList) {
-            AbstractTableDataContentPane.refreshBoxItems(series, columnNameList);
-            AbstractTableDataContentPane.refreshBoxItems(value, columnNameList);
+            DataPaneHelper.refreshBoxItems(series, columnNameList);
+            DataPaneHelper.refreshBoxItems(value, columnNameList);
         }
 
         @Override
@@ -239,7 +238,7 @@ public class ExtendedCustomFieldComboBoxPane extends UIComboBoxPane<AbstractData
 
             List<Object[]> list = new ArrayList<Object[]>();
             for (ExtendedField field : customFields) {
-                String[] array = {field.getFieldName(), field.getCustomName(), SeriesNameUseFieldNamePane.getFunctionString(field.getDataFunction())};
+                String[] array = {field.getFieldName(), field.getCustomName(), DataPaneHelper.getFunctionString(field.getDataFunction())};
                 list.add(array);
             }
             correlationPane.populateBean(list);
@@ -255,7 +254,7 @@ public class ExtendedCustomFieldComboBoxPane extends UIComboBoxPane<AbstractData
                 ExtendedField field = new ExtendedField(Utils.objectToString(line[0]));
                 field.setCustomName(Utils.objectToString(line[1]));
                 if (line.length > 2) {
-                    field.setDataFunction(SeriesNameUseFieldNamePane.getFcuntionByName(Utils.objectToString(line[2])));
+                    field.setDataFunction(DataPaneHelper.getFunctionByName(Utils.objectToString(line[2])));
                 }
                 customFields.add(field);
             }
diff --git a/designer-chart/src/main/java/com/fr/van/chart/gantt/designer/data/data/component/ComboBoxWithButtonPane.java b/designer-chart/src/main/java/com/fr/van/chart/gantt/designer/data/data/component/ComboBoxWithButtonPane.java
index 75ad743de..c00109db9 100644
--- a/designer-chart/src/main/java/com/fr/van/chart/gantt/designer/data/data/component/ComboBoxWithButtonPane.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/gantt/designer/data/data/component/ComboBoxWithButtonPane.java
@@ -4,6 +4,7 @@ import com.fr.design.event.UIObserverListener;
 import com.fr.design.gui.ibutton.UIButton;
 import com.fr.design.gui.icombobox.UIComboBox;
 import com.fr.design.gui.ilable.UILabel;
+import com.fr.design.mainframe.chart.gui.data.table.DataPaneHelper;
 
 import javax.swing.BorderFactory;
 import javax.swing.Icon;
@@ -62,29 +63,14 @@ public abstract class ComboBoxWithButtonPane extends JPanel {
      * 刷新Box的选项.
      */
     public void refreshBoxItems(java.util.List list) {
-        if(comboBoxName == null) {
-            return;
-        }
-
-        Object ob = comboBoxName.getSelectedItem();
-        comboBoxName.removeAllItems();
-
-        int length = list.size();
-        for(int i = 0; i < length; i++) {
-            comboBoxName.addItem(list.get(i));
-        }
-
-        comboBoxName.getModel().setSelectedItem(ob);
+        DataPaneHelper.refreshBoxItems(comboBoxName, list);
     }
 
     /**
      * 清空box里所有东西
      */
     public void clearBoxItems(){
-        if(comboBoxName == null){
-            return;
-        }
-        comboBoxName.removeAllItems();
+        DataPaneHelper.clearBoxItems(comboBoxName);
 
     }