From d1890ddeb209c591ad548ecc4c723fd339a9d878 Mon Sep 17 00:00:00 2001 From: zheng Date: Thu, 5 Jul 2018 20:44:23 +0800 Subject: [PATCH] =?UTF-8?q?CHART-2556=20=E5=9C=B0=E5=9B=BE=E5=9B=BE?= =?UTF-8?q?=E5=B1=82xml=20=E5=A2=9E=E5=88=A0=E6=94=B9=E6=B2=A1=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E4=BA=86=20=E9=BB=98=E8=AE=A4=E5=80=BC=E8=BF=98?= =?UTF-8?q?=E6=9C=89=E7=82=B9=E9=97=AE=E9=A2=98=20=E6=98=8E=E5=A4=A9?= =?UTF-8?q?=E9=97=AE=E4=B8=8Bable=E6=94=B9=E5=A5=BD=E4=BA=86=E5=86=8D?= =?UTF-8?q?=E6=94=BE=E5=88=B0core=E9=87=8C=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../designer/type/VanChartMapSourceChoosePane.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/designer-chart/src/com/fr/van/chart/map/designer/type/VanChartMapSourceChoosePane.java b/designer-chart/src/com/fr/van/chart/map/designer/type/VanChartMapSourceChoosePane.java index b53628f6f..05a5f02a8 100644 --- a/designer-chart/src/com/fr/van/chart/map/designer/type/VanChartMapSourceChoosePane.java +++ b/designer-chart/src/com/fr/van/chart/map/designer/type/VanChartMapSourceChoosePane.java @@ -119,7 +119,7 @@ public class VanChartMapSourceChoosePane extends JPanel implements UIObserver { private String[] oldParams; private UIObserverListener listener; - private String[] layers = MapLayerConfigManager.getInstance().getLayerItems(); + private String[] layers = MapLayerConfigManager.getLayerItems(); /** * 给组件登记一个观察者监听事件 * @@ -261,7 +261,7 @@ public class VanChartMapSourceChoosePane extends JPanel implements UIObserver { gisLayer.removeAllItems(); - for(String item : MapLayerConfigManager.getInstance().getLayerItems()){ + for (String item : MapLayerConfigManager.getLayerItems()) { gisLayer.addItem(item); } @@ -286,9 +286,9 @@ public class VanChartMapSourceChoosePane extends JPanel implements UIObserver { @Override public Dimension getPreferredSize() { String itemName = Utils.objectToString(gisLayer.getSelectedItem()); - if(MapLayerConfigManager.getInstance().isCustomLayer(itemName)){ + if (MapLayerConfigManager.isCustomLayer(itemName)) { return tileLyaerPane.getPreferredSize(); - }else if(MapLayerConfigManager.getInstance().isCustomWmsLayer(itemName)){ + } else if (MapLayerConfigManager.isCustomWmsLayer(itemName)) { return wmsLayerPane.getPreferredSize(); } return new Dimension(0,0); @@ -297,9 +297,9 @@ public class VanChartMapSourceChoosePane extends JPanel implements UIObserver { for(String itemName : layers){ JPanel pane = new JPanel(); - if(MapLayerConfigManager.getInstance().isCustomLayer(itemName)){ + if (MapLayerConfigManager.isCustomLayer(itemName)) { pane = tileLyaerPane; - }else if(MapLayerConfigManager.getInstance().isCustomWmsLayer(itemName)){ + } else if (MapLayerConfigManager.isCustomWmsLayer(itemName)) { pane = wmsLayerPane; } @@ -681,7 +681,7 @@ public class VanChartMapSourceChoosePane extends JPanel implements UIObserver { String layerName = Utils.objectToString(gisLayer.getSelectedItem()); layer.setLayerName(layerName); - layer.setGisLayerType(MapLayerConfigManager.getInstance().getGisLayerType(layerName)); + layer.setGisLayerType(MapLayerConfigManager.getGisLayerType(layerName)); switch (layer.getGisLayerType()){ case CUSTOM_WMS_LAYER: