Merge pull request #935 in DESIGN/design from ~WIM.ZHAI/xdesign:release/10.0 to release/10.0

* commit '7fdcce6b04a20781f68c682668e89d7dd1f075f3':
  fix list
  CHART-3647 删除多余代码

designer-chart/src/main/java/com/fr/van/chart/map/designer/type/VanChartMapSourceChoosePane.java

@@ -2,6 +2,7 @@ package com.fr.van.chart.map.designer.type;
 
 import com.fr.base.Parameter;
 import com.fr.base.Utils;
+import com.fr.decision.webservice.v10.map.WMSFactory;
 import com.fr.design.event.UIObserver;
 import com.fr.design.event.UIObserverListener;
 import com.fr.design.file.HistoryTemplateListPane;
@@ -19,6 +20,7 @@ import com.fr.design.layout.TableLayoutHelper;
 import com.fr.design.mainframe.JTemplate;
 import com.fr.general.ComparatorUtils;
 import com.fr.general.http.HttpClient;
+import com.fr.geojson.helper.GEOJSONHelper;
 import com.fr.plugin.chart.base.GisLayer;
 import com.fr.plugin.chart.base.ViewCenter;
 import com.fr.plugin.chart.map.VanChartMapPlot;
@@ -26,9 +28,7 @@ import com.fr.plugin.chart.map.designer.type.GEOJSONTreeHelper;
 import com.fr.plugin.chart.map.layer.WMSLayer;
 import com.fr.plugin.chart.map.server.ChartGEOJSONHelper;
 import com.fr.plugin.chart.map.server.CompatibleGEOJSONHelper;
-import com.fr.geojson.helper.GEOJSONHelper;
 import com.fr.plugin.chart.map.server.MapLayerConfigManager;
-import com.fr.plugin.chart.service.WMSFactory;
 import com.fr.plugin.chart.type.GISLayerType;
 import com.fr.plugin.chart.type.MapType;
 import com.fr.plugin.chart.type.ZoomLevel;
@@ -57,6 +57,7 @@ import java.awt.event.ItemListener;
 import java.awt.event.MouseEvent;
 import java.awt.event.MouseListener;
 import java.util.ArrayList;
+import java.util.List;
 
 /**
  * Created by Mitisky on 16/5/11.
@@ -392,7 +393,11 @@ public class VanChartMapSourceChoosePane extends JPanel implements UIObserver {
                     }
 
                     String res =  httpClient.getResponseText();
-                    list = WMSFactory.readLayers(res);
+                    List<String> layers = WMSFactory.readLayers(res);
+                    list.clear();
+                    for (String layer : layers) {
+                        list.add(new WMSLayer(layer, false));
+                    }
                     return null;
                 }