refactor:plugin use 10.0 not compatible xxx copy from 10.0 code

designer-chart/src/main/java/com/fr/design/chartx/data/map/LineMapAreaLngLatPaneWithComboBox.java

@@ -2,7 +2,7 @@ package com.fr.design.chartx.data.map;
 
 import com.fr.chartx.data.field.diff.LineMapColumnFieldCollection;
 import com.fr.design.chartx.fields.AbstractDataSetFieldsPane;
-import com.fr.design.chartx.fields.diff.LineMapDataSetFieldsPane;
+import com.fr.design.chartx.fields.diff.MapDataSetFieldsPane;
 import com.fr.design.gui.icombobox.UIComboBox;
 import com.fr.design.i18n.Toolkit;
 
@@ -24,15 +24,15 @@ public class LineMapAreaLngLatPaneWithComboBox extends LineMapAreaLngLatPaneWith
     private UIComboBox toLng_tab1;
     private UIComboBox toLat_tab1;
 
-    private LineMapDataSetFieldsPane lineMapDataSetFieldsPane;
+    private MapDataSetFieldsPane mapDataSetFieldsPane;
 
-    public LineMapAreaLngLatPaneWithComboBox(LineMapDataSetFieldsPane lineMapDataSetFieldsPane) {
-        this.lineMapDataSetFieldsPane = lineMapDataSetFieldsPane;
+    public LineMapAreaLngLatPaneWithComboBox(MapDataSetFieldsPane mapDataSetFieldsPane) {
+        this.mapDataSetFieldsPane = mapDataSetFieldsPane;
         initComponents();
     }
 
     protected void initComponents() {
-        if (lineMapDataSetFieldsPane == null) {
+        if (mapDataSetFieldsPane == null) {
             return;
         }
         super.initComponents();
@@ -48,7 +48,7 @@ public class LineMapAreaLngLatPaneWithComboBox extends LineMapAreaLngLatPaneWith
         return createPane(
                 new String[]{Toolkit.i18nText("Fine-Design_Chart_Start_Area_Name"),
                         Toolkit.i18nText("Fine-Design_Chart_End_Area_Name")},
-                lineMapDataSetFieldsPane.createAreaPanel(fromArea_tab0), lineMapDataSetFieldsPane.createAreaPanel(toArea_tab0)
+                mapDataSetFieldsPane.createAreaPanel(fromArea_tab0), mapDataSetFieldsPane.createAreaPanel(toArea_tab0)
         );
     }
 
@@ -64,18 +64,19 @@ public class LineMapAreaLngLatPaneWithComboBox extends LineMapAreaLngLatPaneWith
         }
         return createPane(
                 new String[]{
-                        Toolkit.i18nText("Fine-Design_Chart_Start_Area_Name"),
                         Toolkit.i18nText("Fine-Design_Chart_Start_Longitude"),
                         Toolkit.i18nText("Fine-Design_Chart_Start_Latitude"),
-                        Toolkit.i18nText("Fine-Design_Chart_End_Area_Name"),
+                        Toolkit.i18nText("Fine-Design_Chart_Start_Area_Name"),
                         Toolkit.i18nText("Fine-Design_Chart_End_Longitude"),
-                        Toolkit.i18nText("Fine-Design_Chart_End_Latitude")},
-                lineMapDataSetFieldsPane.createAreaPanel(fromArea_tab1),
+                        Toolkit.i18nText("Fine-Design_Chart_End_Latitude"),
+                        Toolkit.i18nText("Fine-Design_Chart_End_Area_Name")
+                },
                 fromLng_tab1,
                 fromLat_tab1,
-                lineMapDataSetFieldsPane.createAreaPanel(toArea_tab1),
+                fromArea_tab1,
                 toLng_tab1,
-                toLat_tab1);
+                toLat_tab1,
+                toArea_tab1);
     }
 
     protected void populateTab0(LineMapColumnFieldCollection fieldCollection) {

designer-chart/src/main/java/com/fr/design/chartx/data/map/PointMapAreaLngLatPaneWithComboBox.java

@@ -2,7 +2,7 @@ package com.fr.design.chartx.data.map;
 
 import com.fr.chartx.data.field.diff.PointMapColumnFieldCollection;
 import com.fr.design.chartx.fields.AbstractDataSetFieldsPane;
-import com.fr.design.chartx.fields.diff.PointMapDataSetFieldsPane;
+import com.fr.design.chartx.fields.diff.MapDataSetFieldsPane;
 import com.fr.design.gui.icombobox.UIComboBox;
 import com.fr.design.i18n.Toolkit;
 
@@ -20,15 +20,15 @@ public class PointMapAreaLngLatPaneWithComboBox extends PointMapAreaLngLatPaneWi
     private UIComboBox lng_tab1;
     private UIComboBox lat_tab1;
 
-    private PointMapDataSetFieldsPane pointMapDataSetFieldsPane;
+    private MapDataSetFieldsPane mapDataSetFieldsPane;
 
-    public PointMapAreaLngLatPaneWithComboBox(PointMapDataSetFieldsPane pointMapDataSetFieldsPane) {
-        this.pointMapDataSetFieldsPane = pointMapDataSetFieldsPane;
+    public PointMapAreaLngLatPaneWithComboBox(MapDataSetFieldsPane pointMapDataSetFieldsPane) {
+        this.mapDataSetFieldsPane = pointMapDataSetFieldsPane;
         initComponents();
     }
 
     protected void initComponents() {
-        if (pointMapDataSetFieldsPane == null) {
+        if (mapDataSetFieldsPane == null) {
             return;
         }
         super.initComponents();
@@ -41,7 +41,7 @@ public class PointMapAreaLngLatPaneWithComboBox extends PointMapAreaLngLatPaneWi
         }
         return createPane(
                 new String[]{Toolkit.i18nText("Fine-Design_Chart_Area_Name")},
-                pointMapDataSetFieldsPane.createAreaPanel(area_tab0)
+                mapDataSetFieldsPane.createAreaPanel(area_tab0)
         );
     }
 
@@ -53,8 +53,8 @@ public class PointMapAreaLngLatPaneWithComboBox extends PointMapAreaLngLatPaneWi
             lat_tab1 = new UIComboBox();
         }
         return createPane(
-                new String[]{Toolkit.i18nText("Fine-Design_Chart_Area_Name"), Toolkit.i18nText("Fine-Design_Chart_Longitude"), Toolkit.i18nText("Fine-Design_Chart_Latitude")},
-                pointMapDataSetFieldsPane.createAreaPanel(area_tab1), lng_tab1, lat_tab1
+                new String[]{Toolkit.i18nText("Fine-Design_Chart_Longitude"), Toolkit.i18nText("Fine-Design_Chart_Latitude"), Toolkit.i18nText("Fine-Design_Chart_Area_Name")},
+                lng_tab1, lat_tab1, area_tab1
         );
     }
 

designer-chart/src/main/java/com/fr/design/chartx/fields/diff/AbstractCellDataFieldsWithSeriesValuePane.java

@@ -21,7 +21,7 @@ public abstract class AbstractCellDataFieldsWithSeriesValuePane<T extends Column
         seriesValueFieldsPane = new CellDataSeriesValueCorrelationPane();
 
         if (normalCenter != null) {
-            JPanel panel = new JPanel(new BorderLayout(0,6));
+            JPanel panel = new JPanel(new BorderLayout(0, 6));
             panel.add(normalCenter, BorderLayout.NORTH);
             panel.add(seriesValueFieldsPane, BorderLayout.CENTER);
             return panel;

designer-chart/src/main/java/com/fr/design/chartx/fields/diff/AbstractDataSetFieldsWithSeriesValuePane.java

@@ -5,8 +5,8 @@ import com.fr.design.chartx.component.SeriesValueFieldComboBoxPane;
 import com.fr.design.chartx.fields.AbstractDataSetFieldsPane;
 
 import javax.swing.JPanel;
-import java.util.List;
 import java.awt.BorderLayout;
+import java.util.List;
 
 /**
  * Created by shine on 2019/5/16.
@@ -20,10 +20,10 @@ public abstract class AbstractDataSetFieldsWithSeriesValuePane<T extends ColumnF
     @Override
     protected JPanel createCenterPane() {
         JPanel normalCenter = super.createCenterPane();
-        seriesValueFieldComboBoxPane = new SeriesValueFieldComboBoxPane();
+        getSeriesValueFieldComboBoxPane();
 
         if (normalCenter != null) {
-            JPanel panel = new JPanel(new BorderLayout(0,6));
+            JPanel panel = new JPanel(new BorderLayout(0, 6));
             panel.add(normalCenter, BorderLayout.NORTH);
             panel.add(seriesValueFieldComboBoxPane, BorderLayout.CENTER);
             return panel;
@@ -34,7 +34,14 @@ public abstract class AbstractDataSetFieldsWithSeriesValuePane<T extends ColumnF
 
     public SeriesValueFieldComboBoxPane getSeriesValueFieldComboBoxPane() {
         if (seriesValueFieldComboBoxPane == null) {
-            seriesValueFieldComboBoxPane = new SeriesValueFieldComboBoxPane();
+            seriesValueFieldComboBoxPane = new SeriesValueFieldComboBoxPane() {
+
+                protected boolean seriesComboBoxHasNone() {
+                    return true;
+                }
+
+            };
+
         }
         return seriesValueFieldComboBoxPane;
     }