From edae2bdcbf58abc88d3943320457c636b41e8158 Mon Sep 17 00:00:00 2001
From: "Wim.Zhai" <Wim.Zhai@fanruan.com>
Date: Mon, 4 Nov 2019 14:09:06 +0800
Subject: [PATCH] =?UTF-8?q?style=20=E8=BF=98=E9=9C=80=E6=8C=89=E5=9B=BE?=
 =?UTF-8?q?=E8=A1=A8=E7=B1=BB=E5=9E=8B=E5=88=87=E6=8D=A2=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E9=9D=A2=E6=9D=BF=20#CHART-4248?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/fr/design/chartx/AbstractChartDataPane.java  |  2 +-
 .../fr/design/chartx/AbstractVanSingleDataPane.java  |  7 +++----
 .../com/fr/design/chartx/CustomChartDataPane.java    |  8 ++++----
 .../com/fr/design/chartx/GanttChartDataPane.java     |  5 ++---
 .../fr/design/mainframe/chart/gui/ChartDataPane.java |  8 ++------
 .../bubble/BubbleIndependentVanChartInterface.java   | 12 ++----------
 .../designer/FunnelIndependentVanChartInterface.java |  3 +--
 .../MultiPieIndependentVanChartInterface.java        |  3 +--
 .../scatter/ScatterIndependentVanChartInterface.java |  3 +--
 .../structure/desinger/VanStructureChartTypeUI.java  |  3 +--
 .../vanchart/AbstractIndependentVanChartUI.java      |  3 +--
 .../vanchart/AbstractMultiCategoryVanChartUI.java    |  3 +--
 .../WordCloudIndependentVanChartInterface.java       |  3 +--
 13 files changed, 21 insertions(+), 42 deletions(-)

diff --git a/designer-chart/src/main/java/com/fr/design/chartx/AbstractChartDataPane.java b/designer-chart/src/main/java/com/fr/design/chartx/AbstractChartDataPane.java
index aa776f489..61359d91b 100644
--- a/designer-chart/src/main/java/com/fr/design/chartx/AbstractChartDataPane.java
+++ b/designer-chart/src/main/java/com/fr/design/chartx/AbstractChartDataPane.java
@@ -32,7 +32,7 @@ public abstract class AbstractChartDataPane<T extends ChartDataDefinitionProvide
         }
 
         this.removeAll();
-        this.add(createContentPane(chart), BorderLayout.CENTER);
+        this.add(createContentPane(), BorderLayout.CENTER);
 
         ChartDataDefinitionProvider dataSetCollection = chart.getChartDataDefinition();
 
diff --git a/designer-chart/src/main/java/com/fr/design/chartx/AbstractVanSingleDataPane.java b/designer-chart/src/main/java/com/fr/design/chartx/AbstractVanSingleDataPane.java
index 4104a8558..1db85d8c5 100644
--- a/designer-chart/src/main/java/com/fr/design/chartx/AbstractVanSingleDataPane.java
+++ b/designer-chart/src/main/java/com/fr/design/chartx/AbstractVanSingleDataPane.java
@@ -3,7 +3,6 @@ package com.fr.design.chartx;
 import com.fr.chartx.data.AbstractDataDefinition;
 import com.fr.design.chartx.single.SingleDataPane;
 import com.fr.design.gui.frpane.AttributeChangeListener;
-import com.fr.plugin.chart.vanchart.VanChart;
 
 import javax.swing.JPanel;
 
@@ -19,12 +18,12 @@ public abstract class AbstractVanSingleDataPane extends AbstractChartDataPane<Ab
     }
 
     @Override
-    protected JPanel createContentPane(VanChart vanChart) {
-        singleDataPane = createSingleDataPane(vanChart);
+    protected JPanel createContentPane() {
+        singleDataPane = createSingleDataPane();
         return singleDataPane;
     }
 
-    protected abstract SingleDataPane createSingleDataPane(VanChart vanChart);
+    protected abstract SingleDataPane createSingleDataPane();
 
     @Override
     protected void populate(AbstractDataDefinition dataDefinition) {
diff --git a/designer-chart/src/main/java/com/fr/design/chartx/CustomChartDataPane.java b/designer-chart/src/main/java/com/fr/design/chartx/CustomChartDataPane.java
index af94057b5..bb63ac805 100644
--- a/designer-chart/src/main/java/com/fr/design/chartx/CustomChartDataPane.java
+++ b/designer-chart/src/main/java/com/fr/design/chartx/CustomChartDataPane.java
@@ -24,13 +24,13 @@ import com.fr.van.chart.custom.component.VanChartCustomPlotUITabGroup;
 
 import javax.swing.BorderFactory;
 import javax.swing.JPanel;
+import java.awt.BorderLayout;
+import java.awt.CardLayout;
+import java.awt.Dimension;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.awt.BorderLayout;
-import java.awt.CardLayout;
-import java.awt.Dimension;
 
 /**
  * @author Bjorn
@@ -73,7 +73,7 @@ public class CustomChartDataPane extends ChartDataPane {
             final VanChartPlot vanChartPlot = customPlotList.get(i);
             paneList.add(new AbstractVanSingleDataPane(listener) {
                 @Override
-                protected SingleDataPane createSingleDataPane(VanChart vanChart) {
+                protected SingleDataPane createSingleDataPane() {
                     return createSingleDataPaneByPlot(vanChartPlot);
                 }
             });
diff --git a/designer-chart/src/main/java/com/fr/design/chartx/GanttChartDataPane.java b/designer-chart/src/main/java/com/fr/design/chartx/GanttChartDataPane.java
index 4398027bc..d172d7ba5 100644
--- a/designer-chart/src/main/java/com/fr/design/chartx/GanttChartDataPane.java
+++ b/designer-chart/src/main/java/com/fr/design/chartx/GanttChartDataPane.java
@@ -5,7 +5,6 @@ import com.fr.design.chartx.fields.diff.MultiCategoryCellDataFieldsPane;
 import com.fr.design.chartx.fields.diff.MultiCategoryDataSetFieldsPane;
 import com.fr.design.chartx.single.SingleDataPane;
 import com.fr.design.gui.frpane.AttributeChangeListener;
-import com.fr.plugin.chart.vanchart.VanChart;
 import com.fr.van.chart.map.designer.VanChartGroupPane;
 
 import javax.swing.JPanel;
@@ -22,13 +21,13 @@ public class GanttChartDataPane extends AbstractChartDataPane<GanttChartDataDefi
     protected JPanel createContentPane() {
         dataPane = new AbstractVanSingleDataPane(listener) {
             @Override
-            protected SingleDataPane createSingleDataPane(VanChart vanChart) {
+            protected SingleDataPane createSingleDataPane() {
                 return new SingleDataPane(new MultiCategoryDataSetFieldsPane(), new MultiCategoryCellDataFieldsPane());
             }
         };
         linkPane = new AbstractVanSingleDataPane(listener) {
             @Override
-            protected SingleDataPane createSingleDataPane(VanChart vanChart) {
+            protected SingleDataPane createSingleDataPane() {
                 return new SingleDataPane(new MultiCategoryDataSetFieldsPane(), new MultiCategoryCellDataFieldsPane());
             }
         };
diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/ChartDataPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/ChartDataPane.java
index 4d961b3c3..ad549c5af 100644
--- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/ChartDataPane.java
+++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/ChartDataPane.java
@@ -10,10 +10,9 @@ import com.fr.design.mainframe.chart.AbstractChartAttrPane;
 import com.fr.design.mainframe.chart.PaneTitleConstants;
 import com.fr.design.mainframe.chart.gui.data.DataContentsPane;
 import com.fr.design.mainframe.chart.gui.data.NormalChartDataPane;
-import com.fr.plugin.chart.vanchart.VanChart;
 
-import javax.swing.*;
-import java.awt.*;
+import javax.swing.JPanel;
+import java.awt.BorderLayout;
 
 public class ChartDataPane extends AbstractChartAttrPane {
 
@@ -36,9 +35,6 @@ public class ChartDataPane extends AbstractChartAttrPane {
 		return contentsPane;
 	}
 
-	protected JPanel createContentPane(VanChart vanChart){
-		return createContentPane();
-	}
 
 	/**
 	 * 界面标题
diff --git a/designer-chart/src/main/java/com/fr/van/chart/bubble/BubbleIndependentVanChartInterface.java b/designer-chart/src/main/java/com/fr/van/chart/bubble/BubbleIndependentVanChartInterface.java
index 1206d0fd3..c648c09c7 100644
--- a/designer-chart/src/main/java/com/fr/van/chart/bubble/BubbleIndependentVanChartInterface.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/bubble/BubbleIndependentVanChartInterface.java
@@ -6,8 +6,6 @@ import com.fr.design.beans.BasicBeanPane;
 import com.fr.design.chartx.AbstractVanSingleDataPane;
 import com.fr.design.chartx.fields.diff.ScatterCellDataFieldsPane;
 import com.fr.design.chartx.fields.diff.ScatterDataSetFieldsPane;
-import com.fr.design.chartx.fields.diff.SingleCategoryCellDataFieldsPane;
-import com.fr.design.chartx.fields.diff.SingleCategoryDataSetFieldsPane;
 import com.fr.design.chartx.single.SingleDataPane;
 import com.fr.design.condition.ConditionAttributesPane;
 import com.fr.design.gui.frpane.AttributeChangeListener;
@@ -20,7 +18,6 @@ import com.fr.design.mainframe.chart.gui.data.report.BubblePlotReportDataContent
 import com.fr.design.mainframe.chart.gui.data.table.AbstractTableDataContentPane;
 import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane;
 import com.fr.plugin.chart.bubble.VanChartBubblePlot;
-import com.fr.plugin.chart.vanchart.VanChart;
 import com.fr.van.chart.bubble.data.VanChartBubblePlotTableDataContentPane;
 import com.fr.van.chart.designer.other.VanChartInteractivePaneWithOutSort;
 import com.fr.van.chart.designer.other.VanChartOtherPane;
@@ -127,13 +124,8 @@ public class BubbleIndependentVanChartInterface extends AbstractIndependentVanCh
     public ChartDataPane getChartDataPane(AttributeChangeListener listener) {
         return new AbstractVanSingleDataPane(listener) {
             @Override
-            protected SingleDataPane createSingleDataPane(VanChart vanChart) {
-                VanChartBubblePlot bubblePlot = vanChart.getPlot();
-                if (bubblePlot.isForceBubble()) {
-                    return new SingleDataPane(new SingleCategoryDataSetFieldsPane(), new SingleCategoryCellDataFieldsPane());
-                } else {
-                    return new SingleDataPane(new ScatterDataSetFieldsPane(), new ScatterCellDataFieldsPane());
-                }
+            protected SingleDataPane createSingleDataPane() {
+                return new SingleDataPane(new ScatterDataSetFieldsPane(), new ScatterCellDataFieldsPane());
             }
         };
     }
diff --git a/designer-chart/src/main/java/com/fr/van/chart/funnel/designer/FunnelIndependentVanChartInterface.java b/designer-chart/src/main/java/com/fr/van/chart/funnel/designer/FunnelIndependentVanChartInterface.java
index c9f3b977c..c45aa17c3 100644
--- a/designer-chart/src/main/java/com/fr/van/chart/funnel/designer/FunnelIndependentVanChartInterface.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/funnel/designer/FunnelIndependentVanChartInterface.java
@@ -17,7 +17,6 @@ import com.fr.design.mainframe.chart.gui.data.report.AbstractReportDataContentPa
 import com.fr.design.mainframe.chart.gui.data.table.AbstractTableDataContentPane;
 import com.fr.design.mainframe.chart.gui.data.table.PiePlotTableDataContentPane;
 import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane;
-import com.fr.plugin.chart.vanchart.VanChart;
 import com.fr.van.chart.designer.data.OneDimensionalPlotReportDataContentPane;
 import com.fr.van.chart.designer.other.VanChartInteractivePaneWithOutSort;
 import com.fr.van.chart.designer.other.VanChartOtherPane;
@@ -99,7 +98,7 @@ public class FunnelIndependentVanChartInterface extends AbstractIndependentVanCh
     public ChartDataPane getChartDataPane(AttributeChangeListener listener) {
         return new AbstractVanSingleDataPane(listener) {
             @Override
-            protected SingleDataPane createSingleDataPane(VanChart vanChart) {
+            protected SingleDataPane createSingleDataPane() {
                 return new SingleDataPane(new FunnelDataSetFieldsPane(), new FunnelCellDataFieldsPane());
             }
         };
diff --git a/designer-chart/src/main/java/com/fr/van/chart/multilayer/MultiPieIndependentVanChartInterface.java b/designer-chart/src/main/java/com/fr/van/chart/multilayer/MultiPieIndependentVanChartInterface.java
index 36bc74ae6..9b1aa395f 100644
--- a/designer-chart/src/main/java/com/fr/van/chart/multilayer/MultiPieIndependentVanChartInterface.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/multilayer/MultiPieIndependentVanChartInterface.java
@@ -12,7 +12,6 @@ import com.fr.design.i18n.Toolkit;
 import com.fr.design.mainframe.chart.gui.ChartDataPane;
 import com.fr.design.mainframe.chart.gui.ChartStylePane;
 import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane;
-import com.fr.plugin.chart.vanchart.VanChart;
 import com.fr.van.chart.multilayer.other.VanChartMultiPieConditionPane;
 import com.fr.van.chart.multilayer.style.VanChartMultiPieSeriesPane;
 import com.fr.van.chart.vanchart.AbstractIndependentVanChartUI;
@@ -47,7 +46,7 @@ public class MultiPieIndependentVanChartInterface extends AbstractIndependentVan
     public ChartDataPane getChartDataPane(AttributeChangeListener listener) {
         return new AbstractVanSingleDataPane(listener) {
             @Override
-            protected SingleDataPane createSingleDataPane(VanChart vanChart) {
+            protected SingleDataPane createSingleDataPane() {
                 return new SingleDataPane(new MultiPieDataSetFieldsPane(), new MultiPieCellDataFieldsPane());
             }
         };
diff --git a/designer-chart/src/main/java/com/fr/van/chart/scatter/ScatterIndependentVanChartInterface.java b/designer-chart/src/main/java/com/fr/van/chart/scatter/ScatterIndependentVanChartInterface.java
index d8b7a875b..7d3a7df48 100644
--- a/designer-chart/src/main/java/com/fr/van/chart/scatter/ScatterIndependentVanChartInterface.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/scatter/ScatterIndependentVanChartInterface.java
@@ -18,7 +18,6 @@ import com.fr.design.mainframe.chart.gui.data.report.AbstractReportDataContentPa
 import com.fr.design.mainframe.chart.gui.data.report.BubblePlotReportDataContentPane;
 import com.fr.design.mainframe.chart.gui.data.table.AbstractTableDataContentPane;
 import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane;
-import com.fr.plugin.chart.vanchart.VanChart;
 import com.fr.van.chart.designer.other.VanChartInteractivePaneWithOutSort;
 import com.fr.van.chart.designer.other.VanChartOtherPane;
 import com.fr.van.chart.designer.other.zoom.ZoomPane;
@@ -113,7 +112,7 @@ public class ScatterIndependentVanChartInterface extends AbstractIndependentVanC
     public ChartDataPane getChartDataPane(AttributeChangeListener listener) {
         return new AbstractVanSingleDataPane(listener) {
             @Override
-            protected SingleDataPane createSingleDataPane(VanChart vanChart) {
+            protected SingleDataPane createSingleDataPane() {
                 return new SingleDataPane(new ScatterDataSetFieldsPane(), new ScatterCellDataFieldsPane());
             }
         };
diff --git a/designer-chart/src/main/java/com/fr/van/chart/structure/desinger/VanStructureChartTypeUI.java b/designer-chart/src/main/java/com/fr/van/chart/structure/desinger/VanStructureChartTypeUI.java
index 3238a51b5..19f5abd5a 100644
--- a/designer-chart/src/main/java/com/fr/van/chart/structure/desinger/VanStructureChartTypeUI.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/structure/desinger/VanStructureChartTypeUI.java
@@ -16,7 +16,6 @@ import com.fr.design.mainframe.chart.gui.ChartStylePane;
 import com.fr.design.mainframe.chart.gui.data.report.AbstractReportDataContentPane;
 import com.fr.design.mainframe.chart.gui.data.table.AbstractTableDataContentPane;
 import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane;
-import com.fr.plugin.chart.vanchart.VanChart;
 import com.fr.van.chart.designer.other.VanChartInteractivePaneWithOutSort;
 import com.fr.van.chart.designer.other.VanChartOtherPane;
 import com.fr.van.chart.designer.other.zoom.ZoomPane;
@@ -108,7 +107,7 @@ public class VanStructureChartTypeUI extends AbstractIndependentVanChartUI {
     public ChartDataPane getChartDataPane(AttributeChangeListener listener) {
         return new AbstractVanSingleDataPane(listener) {
             @Override
-            protected SingleDataPane createSingleDataPane(VanChart vanChart) {
+            protected SingleDataPane createSingleDataPane() {
                 return new SingleDataPane(new StructureDataSetFieldsPane(), new StructureCellDataFieldsPane());
             }
         };
diff --git a/designer-chart/src/main/java/com/fr/van/chart/vanchart/AbstractIndependentVanChartUI.java b/designer-chart/src/main/java/com/fr/van/chart/vanchart/AbstractIndependentVanChartUI.java
index 3e4d32503..39e22492f 100644
--- a/designer-chart/src/main/java/com/fr/van/chart/vanchart/AbstractIndependentVanChartUI.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/vanchart/AbstractIndependentVanChartUI.java
@@ -13,7 +13,6 @@ import com.fr.design.mainframe.chart.gui.data.report.AbstractReportDataContentPa
 import com.fr.design.mainframe.chart.gui.data.report.CategoryPlotReportDataContentPane;
 import com.fr.design.mainframe.chart.gui.data.table.AbstractTableDataContentPane;
 import com.fr.design.mainframe.chart.gui.data.table.CategoryPlotTableDataContentPane;
-import com.fr.plugin.chart.vanchart.VanChart;
 import com.fr.van.chart.designer.other.VanChartOtherPane;
 import com.fr.van.chart.designer.style.VanChartStylePane;
 
@@ -56,7 +55,7 @@ public abstract class AbstractIndependentVanChartUI extends AbstractIndependentC
     public ChartDataPane getChartDataPane(AttributeChangeListener listener) {
         return new AbstractVanSingleDataPane(listener) {
             @Override
-            protected SingleDataPane createSingleDataPane(VanChart vanChart) {
+            protected SingleDataPane createSingleDataPane() {
                 return new SingleDataPane(new SingleCategoryDataSetFieldsPane(), new SingleCategoryCellDataFieldsPane());
             }
         };
diff --git a/designer-chart/src/main/java/com/fr/van/chart/vanchart/AbstractMultiCategoryVanChartUI.java b/designer-chart/src/main/java/com/fr/van/chart/vanchart/AbstractMultiCategoryVanChartUI.java
index 1505b09ca..6cd2743fe 100644
--- a/designer-chart/src/main/java/com/fr/van/chart/vanchart/AbstractMultiCategoryVanChartUI.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/vanchart/AbstractMultiCategoryVanChartUI.java
@@ -15,7 +15,6 @@ import com.fr.design.mainframe.chart.gui.data.report.CategoryPlotReportDataConte
 import com.fr.design.mainframe.chart.gui.data.table.AbstractTableDataContentPane;
 import com.fr.design.mainframe.chart.gui.data.table.CategoryPlotTableDataContentPane;
 import com.fr.plugin.chart.attr.plot.VanChartPlot;
-import com.fr.plugin.chart.vanchart.VanChart;
 import com.fr.van.chart.designer.data.VanChartMoreCateReportDataContentPane;
 import com.fr.van.chart.designer.data.VanChartMoreCateTableDataContentPane;
 import com.fr.van.chart.designer.other.VanChartInteractivePane;
@@ -70,7 +69,7 @@ public abstract class AbstractMultiCategoryVanChartUI extends AbstractIndependen
     public ChartDataPane getChartDataPane(AttributeChangeListener listener) {
         return new AbstractVanSingleDataPane(listener) {
             @Override
-            protected SingleDataPane createSingleDataPane(VanChart vanChart) {
+            protected SingleDataPane createSingleDataPane() {
                 return new SingleDataPane(new MultiCategoryDataSetFieldsPane(), new MultiCategoryCellDataFieldsPane());
             }
         };
diff --git a/designer-chart/src/main/java/com/fr/van/chart/wordcloud/designer/WordCloudIndependentVanChartInterface.java b/designer-chart/src/main/java/com/fr/van/chart/wordcloud/designer/WordCloudIndependentVanChartInterface.java
index b40f5f76c..b978d9355 100644
--- a/designer-chart/src/main/java/com/fr/van/chart/wordcloud/designer/WordCloudIndependentVanChartInterface.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/wordcloud/designer/WordCloudIndependentVanChartInterface.java
@@ -15,7 +15,6 @@ import com.fr.design.mainframe.chart.AbstractChartAttrPane;
 import com.fr.design.mainframe.chart.gui.ChartDataPane;
 import com.fr.design.mainframe.chart.gui.ChartStylePane;
 import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane;
-import com.fr.plugin.chart.vanchart.VanChart;
 import com.fr.van.chart.designer.other.VanChartInteractivePaneWithOutSort;
 import com.fr.van.chart.designer.other.VanChartOtherPane;
 import com.fr.van.chart.designer.other.zoom.ZoomPane;
@@ -103,7 +102,7 @@ public class WordCloudIndependentVanChartInterface extends AbstractIndependentVa
     public ChartDataPane getChartDataPane(AttributeChangeListener listener) {
         return new AbstractVanSingleDataPane(listener) {
             @Override
-            protected SingleDataPane createSingleDataPane(VanChart vanChart) {
+            protected SingleDataPane createSingleDataPane() {
                 return new SingleDataPane(new WordCloudDataSetFieldsPane(), new WordCloudCellDataFieldsPane());
             }
         };