From 8012b0afc4fa19a21dce1a108c23da03f1a998ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=99=BD=E5=B2=B3?= <445798420@qq.com>
Date: Wed, 4 Mar 2020 16:29:08 +0800
Subject: [PATCH] CHART-11090

---
 .../designer/data/VanChartMapDataPane.java    | 26 +++++++------------
 1 file changed, 9 insertions(+), 17 deletions(-)

diff --git a/designer-chart/src/main/java/com/fr/van/chart/map/designer/data/VanChartMapDataPane.java b/designer-chart/src/main/java/com/fr/van/chart/map/designer/data/VanChartMapDataPane.java
index 87143268f9..a6fdd49ce6 100644
--- a/designer-chart/src/main/java/com/fr/van/chart/map/designer/data/VanChartMapDataPane.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/map/designer/data/VanChartMapDataPane.java
@@ -1,12 +1,9 @@
 package com.fr.van.chart.map.designer.data;
 
-import com.fr.chart.chartattr.Chart;
 import com.fr.chart.chartattr.ChartCollection;
 import com.fr.design.gui.frpane.AttributeChangeListener;
 import com.fr.design.mainframe.chart.gui.ChartDataPane;
 import com.fr.design.mainframe.chart.gui.data.NormalChartDataPane;
-import com.fr.plugin.chart.map.MapMatchResult;
-import com.fr.plugin.chart.map.VanChartMapPlot;
 import com.fr.plugin.chart.map.data.VanMapDefinition;
 import com.fr.plugin.chart.type.MapType;
 
@@ -57,31 +54,26 @@ public class VanChartMapDataPane extends ChartDataPane {
 
         repeatLayout(collection);
 
-        MapMatchResult matchResult = ((VanChartMapPlot) collection.getSelectedChartProvider(Chart.class).getPlot()).getMatchResult();
-
-        ChartCollection areaClone;
-        ChartCollection pointClone;
-        ChartCollection lineClone;
         switch (mapType) {
             case AREA:
-                areaClone = MapDataPaneHelper.getAreaMapChartCollection(collection);
+                ChartCollection areaClone = MapDataPaneHelper.getAreaMapChartCollection(collection);
                 contentsPane.populate(areaClone);
                 break;
             case POINT:
-                pointClone = MapDataPaneHelper.getPointMapChartCollection(collection);
+                ChartCollection pointClone = MapDataPaneHelper.getPointMapChartCollection(collection);
                 contentsPane.populate(pointClone);
                 break;
             case LINE:
-                lineClone = MapDataPaneHelper.getLineMapChartCollection(collection);
+                ChartCollection lineClone = MapDataPaneHelper.getLineMapChartCollection(collection);
                 contentsPane.populate(lineClone);
                 break;
             case CUSTOM:
-                areaClone = MapDataPaneHelper.getAreaMapChartCollection(collection);
-                pointClone = MapDataPaneHelper.getPointMapChartCollection(collection);
-                lineClone = MapDataPaneHelper.getLineMapChartCollection(collection);
-                ((CustomMapChartDataContentsPane) contentsPane).populateAreaMap(areaClone);
-                ((CustomMapChartDataContentsPane) contentsPane).populatePointMap(pointClone);
-                ((CustomMapChartDataContentsPane) contentsPane).populateLineMap(lineClone);
+                ChartCollection areaClone1 = MapDataPaneHelper.getAreaMapChartCollection(collection);
+                ChartCollection pointClone1 = MapDataPaneHelper.getPointMapChartCollection(collection);
+                ChartCollection lineClone1 = MapDataPaneHelper.getLineMapChartCollection(collection);
+                ((CustomMapChartDataContentsPane) contentsPane).populateAreaMap(areaClone1);
+                ((CustomMapChartDataContentsPane) contentsPane).populatePointMap(pointClone1);
+                ((CustomMapChartDataContentsPane) contentsPane).populateLineMap(lineClone1);
         }
 
     }