From 51c0b98170d1fdc6a92a5974360c0041ccc5c2c9 Mon Sep 17 00:00:00 2001
From: "Wim.Zhai" <Wim.Zhai@fanruan.com>
Date: Sun, 3 Nov 2019 10:37:53 +0800
Subject: [PATCH] =?UTF-8?q?CHART-4248=20=E9=87=8D=E5=91=BD=E5=90=8D?=
 =?UTF-8?q?=E9=9D=9E=E6=8A=BD=E8=B1=A1=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AbstractCellDataFieldsWithSeriesValuePane.java     |  8 ++++----
 .../diff/AbstractDataSetFieldsWithSeriesValuePane.java |  8 ++++----
 .../chartx/fields/diff/FunnelCellDataFieldsPane.java   | 10 +++++-----
 .../chartx/fields/diff/FunnelDataSetFieldsPane.java    | 10 +++++-----
 4 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/designer-chart/src/main/java/com/fr/design/chartx/fields/diff/AbstractCellDataFieldsWithSeriesValuePane.java b/designer-chart/src/main/java/com/fr/design/chartx/fields/diff/AbstractCellDataFieldsWithSeriesValuePane.java
index 21f86633a..1ac1952aa 100644
--- a/designer-chart/src/main/java/com/fr/design/chartx/fields/diff/AbstractCellDataFieldsWithSeriesValuePane.java
+++ b/designer-chart/src/main/java/com/fr/design/chartx/fields/diff/AbstractCellDataFieldsWithSeriesValuePane.java
@@ -1,6 +1,6 @@
 package com.fr.design.chartx.fields.diff;
 
-import com.fr.chartx.data.field.diff.AbstractColumnFieldCollectionWithSeriesValue;
+import com.fr.chartx.data.field.diff.ColumnFieldCollectionWithSeriesValue;
 import com.fr.design.chartx.component.CellDataSeriesValueCorrelationPane;
 import com.fr.design.chartx.fields.AbstractCellDataFieldsPane;
 
@@ -10,7 +10,7 @@ import java.awt.BorderLayout;
 /**
  * Created by shine on 2019/6/4.
  */
-public abstract class AbstractCellDataFieldsWithSeriesValuePane<T extends AbstractColumnFieldCollectionWithSeriesValue>
+public abstract class AbstractCellDataFieldsWithSeriesValuePane<T extends ColumnFieldCollectionWithSeriesValue>
         extends AbstractCellDataFieldsPane<T> {
 
     private CellDataSeriesValueCorrelationPane seriesValueFieldsPane;
@@ -41,11 +41,11 @@ public abstract class AbstractCellDataFieldsWithSeriesValuePane<T extends Abstra
         this.seriesValueFieldsPane = seriesValueFieldsPane;
     }
 
-    protected void populateSeriesValuePane(AbstractColumnFieldCollectionWithSeriesValue fieldCollectionWithSeriesValue) {
+    protected void populateSeriesValuePane(ColumnFieldCollectionWithSeriesValue fieldCollectionWithSeriesValue) {
         seriesValueFieldsPane.populateBean(fieldCollectionWithSeriesValue.getSeriesValueCorrelationDefinition());
     }
 
-    protected void updateSeriesValuePane(AbstractColumnFieldCollectionWithSeriesValue fieldCollectionWithSeriesValue) {
+    protected void updateSeriesValuePane(ColumnFieldCollectionWithSeriesValue fieldCollectionWithSeriesValue) {
         seriesValueFieldsPane.updateBean(fieldCollectionWithSeriesValue.getSeriesValueCorrelationDefinition());
     }
 
diff --git a/designer-chart/src/main/java/com/fr/design/chartx/fields/diff/AbstractDataSetFieldsWithSeriesValuePane.java b/designer-chart/src/main/java/com/fr/design/chartx/fields/diff/AbstractDataSetFieldsWithSeriesValuePane.java
index ae47ec9dc..72736907d 100644
--- a/designer-chart/src/main/java/com/fr/design/chartx/fields/diff/AbstractDataSetFieldsWithSeriesValuePane.java
+++ b/designer-chart/src/main/java/com/fr/design/chartx/fields/diff/AbstractDataSetFieldsWithSeriesValuePane.java
@@ -1,6 +1,6 @@
 package com.fr.design.chartx.fields.diff;
 
-import com.fr.chartx.data.field.diff.AbstractColumnFieldCollectionWithSeriesValue;
+import com.fr.chartx.data.field.diff.ColumnFieldCollectionWithSeriesValue;
 import com.fr.design.chartx.component.SeriesValueFieldComboBoxPane;
 import com.fr.design.chartx.fields.AbstractDataSetFieldsPane;
 
@@ -12,7 +12,7 @@ import java.awt.BorderLayout;
  * Created by shine on 2019/5/16.
  * 带有 自定义系列名（fr表现为 系列名使用字段名） 的字段集合 的一个pane
  */
-public abstract class AbstractDataSetFieldsWithSeriesValuePane<T extends AbstractColumnFieldCollectionWithSeriesValue>
+public abstract class AbstractDataSetFieldsWithSeriesValuePane<T extends ColumnFieldCollectionWithSeriesValue>
         extends AbstractDataSetFieldsPane<T> {
 
     private SeriesValueFieldComboBoxPane seriesValueFieldComboBoxPane;
@@ -61,11 +61,11 @@ public abstract class AbstractDataSetFieldsWithSeriesValuePane<T extends Abstrac
         seriesValueFieldComboBoxPane.refreshBoxListWithSelectTableData(columnNameList);
     }
 
-    protected void populateSeriesValuePane(AbstractColumnFieldCollectionWithSeriesValue fieldCollectionWithSeriesValue) {
+    protected void populateSeriesValuePane(ColumnFieldCollectionWithSeriesValue fieldCollectionWithSeriesValue) {
         seriesValueFieldComboBoxPane.populateBean(fieldCollectionWithSeriesValue.getSeriesValueCorrelationDefinition());
     }
 
-    protected void updateSeriesValuePane(AbstractColumnFieldCollectionWithSeriesValue fieldCollectionWithSeriesValue) {
+    protected void updateSeriesValuePane(ColumnFieldCollectionWithSeriesValue fieldCollectionWithSeriesValue) {
         seriesValueFieldComboBoxPane.updateBean(fieldCollectionWithSeriesValue.getSeriesValueCorrelationDefinition());
     }
 }
diff --git a/designer-chart/src/main/java/com/fr/design/chartx/fields/diff/FunnelCellDataFieldsPane.java b/designer-chart/src/main/java/com/fr/design/chartx/fields/diff/FunnelCellDataFieldsPane.java
index 1e001e5fb..abf40ea52 100644
--- a/designer-chart/src/main/java/com/fr/design/chartx/fields/diff/FunnelCellDataFieldsPane.java
+++ b/designer-chart/src/main/java/com/fr/design/chartx/fields/diff/FunnelCellDataFieldsPane.java
@@ -1,7 +1,7 @@
 package com.fr.design.chartx.fields.diff;
 
 import com.fr.chartx.data.field.SeriesValueCorrelationDefinition;
-import com.fr.chartx.data.field.diff.AbstractColumnFieldCollectionWithSeriesValue;
+import com.fr.chartx.data.field.diff.ColumnFieldCollectionWithSeriesValue;
 import com.fr.design.chartx.component.AbstractSingleFilterPane;
 import com.fr.design.formula.TinyFormulaPane;
 import com.fr.design.i18n.Toolkit;
@@ -14,7 +14,7 @@ import java.awt.BorderLayout;
 /**
  * Created by Wim on 2019/10/23.
  */
-public class FunnelCellDataFieldsPane extends AbstractCellDataFieldsWithSeriesValuePane<AbstractColumnFieldCollectionWithSeriesValue> {
+public class FunnelCellDataFieldsPane extends AbstractCellDataFieldsWithSeriesValuePane<ColumnFieldCollectionWithSeriesValue> {
 
     private AbstractSingleFilterPane filterPane;
 
@@ -50,8 +50,8 @@ public class FunnelCellDataFieldsPane extends AbstractCellDataFieldsWithSeriesVa
     }
 
     @Override
-    public AbstractColumnFieldCollectionWithSeriesValue updateBean() {
-        AbstractColumnFieldCollectionWithSeriesValue fieldCollection = new AbstractColumnFieldCollectionWithSeriesValue();
+    public ColumnFieldCollectionWithSeriesValue updateBean() {
+        ColumnFieldCollectionWithSeriesValue fieldCollection = new ColumnFieldCollectionWithSeriesValue();
         updateSeriesValuePane(fieldCollection);
         SeriesValueCorrelationDefinition seriesValueCorrelationDefinition = fieldCollection.getSeriesValueCorrelationDefinition();
         filterPane.updateBean(seriesValueCorrelationDefinition.getFilterProperties());
@@ -59,7 +59,7 @@ public class FunnelCellDataFieldsPane extends AbstractCellDataFieldsWithSeriesVa
     }
 
     @Override
-    public void populateBean(AbstractColumnFieldCollectionWithSeriesValue ob) {
+    public void populateBean(ColumnFieldCollectionWithSeriesValue ob) {
         populateSeriesValuePane(ob);
         SeriesValueCorrelationDefinition seriesValueCorrelationDefinition = ob.getSeriesValueCorrelationDefinition();
         filterPane.populateBean(seriesValueCorrelationDefinition.getFilterProperties());
diff --git a/designer-chart/src/main/java/com/fr/design/chartx/fields/diff/FunnelDataSetFieldsPane.java b/designer-chart/src/main/java/com/fr/design/chartx/fields/diff/FunnelDataSetFieldsPane.java
index e6adcc289..c24a23b4e 100644
--- a/designer-chart/src/main/java/com/fr/design/chartx/fields/diff/FunnelDataSetFieldsPane.java
+++ b/designer-chart/src/main/java/com/fr/design/chartx/fields/diff/FunnelDataSetFieldsPane.java
@@ -1,7 +1,7 @@
 package com.fr.design.chartx.fields.diff;
 
 import com.fr.chartx.data.field.SeriesValueCorrelationDefinition;
-import com.fr.chartx.data.field.diff.AbstractColumnFieldCollectionWithSeriesValue;
+import com.fr.chartx.data.field.diff.ColumnFieldCollectionWithSeriesValue;
 import com.fr.design.chartx.component.AbstractSingleFilterPane;
 import com.fr.design.gui.icombobox.UIComboBox;
 import com.fr.design.i18n.Toolkit;
@@ -15,7 +15,7 @@ import java.awt.BorderLayout;
 /**
  * Created by Wim on 2019/10/23.
  */
-public class FunnelDataSetFieldsPane extends AbstractDataSetFieldsWithSeriesValuePane<AbstractColumnFieldCollectionWithSeriesValue> {
+public class FunnelDataSetFieldsPane extends AbstractDataSetFieldsWithSeriesValuePane<ColumnFieldCollectionWithSeriesValue> {
 
 
     private AbstractSingleFilterPane filterPane;
@@ -53,8 +53,8 @@ public class FunnelDataSetFieldsPane extends AbstractDataSetFieldsWithSeriesValu
     }
 
     @Override
-    public AbstractColumnFieldCollectionWithSeriesValue updateBean() {
-        AbstractColumnFieldCollectionWithSeriesValue collection = new AbstractColumnFieldCollectionWithSeriesValue();
+    public ColumnFieldCollectionWithSeriesValue updateBean() {
+        ColumnFieldCollectionWithSeriesValue collection = new ColumnFieldCollectionWithSeriesValue();
         updateSeriesValuePane(collection);
         SeriesValueCorrelationDefinition seriesValueCorrelationDefinition = collection.getSeriesValueCorrelationDefinition();
         filterPane.updateBean(seriesValueCorrelationDefinition.getFilterProperties());
@@ -62,7 +62,7 @@ public class FunnelDataSetFieldsPane extends AbstractDataSetFieldsWithSeriesValu
     }
 
     @Override
-    public void populateBean(AbstractColumnFieldCollectionWithSeriesValue ob) {
+    public void populateBean(ColumnFieldCollectionWithSeriesValue ob) {
         populateSeriesValuePane(ob);
         SeriesValueCorrelationDefinition seriesValueCorrelationDefinition = ob.getSeriesValueCorrelationDefinition();
         filterPane.populateBean(seriesValueCorrelationDefinition.getFilterProperties());