Merge branch 'release/10.0' of http://cloud.finedevelop.com:2015/scm/~mata.li/designrel into release/10.0

designer-chart/src/com/fr/van/chart/designer/component/marker/VanChartImageMarkerPane.java

@@ -1,6 +1,7 @@
 package com.fr.van.chart.designer.component.marker;
 
 import com.fr.base.background.ImageBackground;
+import com.fr.base.background.ImageFileBackground;
 import com.fr.design.beans.BasicBeanPane;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.gui.ispinner.UISpinner;
@@ -98,7 +99,7 @@ public class VanChartImageMarkerPane extends BasicBeanPane<VanChartAttrMarker> {
     public void updateBean(VanChartAttrMarker marker) {
         marker.setCommon(false);
         marker.setMarkerType(MarkerType.MARKER_NULL);
-        ImageBackground background = (ImageBackground) imageBackgroundPane.updateBean();
+        ImageFileBackground background = (ImageFileBackground) imageBackgroundPane.updateBean();
         background.setLayout(Constants.IMAGE_EXTEND);
         marker.setImageBackground(background);
         marker.setWidth(width.getValue());

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:

designer-realize/src/com/fr/design/webattr/WriteToolBarPane.java

@@ -155,7 +155,7 @@ public class WriteToolBarPane extends AbstractEditToolBarPane {
             webContent = new WebWrite();
         }
         WebWrite webWrite = (WebWrite) webContent;
-        if (webWrite.getSelectedColor() != null) {
+        if (webWrite.isEditRowColor()) {
             colorBox.setSelected(true);
             colorButton.setColor(webWrite.getSelectedColor());
         } else {
@@ -205,9 +205,10 @@ public class WriteToolBarPane extends AbstractEditToolBarPane {
         }
 
         if (colorBox.isSelected()) {
+            webWrite.setEditRowColor(true);
             webWrite.setSelectedColor(colorButton.getColor());
         } else {
-            webWrite.setSelectedColor(null);
+            webWrite.setEditRowColor(false);
         }
 
         webWrite.setUnloadCheck(unloadCheck.isSelected());

designer-realize/src/com/fr/design/webattr/WriteWebSettingPane.java

@@ -120,7 +120,7 @@ public class WriteWebSettingPane extends WebSettingPane<WebWrite> {
         if (webWrite == null) {
             webWrite = new WebWrite();
         }
-        if (webWrite.getSelectedColor() != null) {
+        if (webWrite.isEditRowColor()) {
             colorBox.setSelected(true);
             colorButton.setColor(webWrite.getSelectedColor());
         } else {
@@ -148,9 +148,10 @@ public class WriteWebSettingPane extends WebSettingPane<WebWrite> {
     protected WebWrite updateSubWebSettingBean() {
         WebWrite webWrite = new WebWrite();
         if (colorBox.isSelected()) {
+            webWrite.setEditRowColor(true);
             webWrite.setSelectedColor(colorButton.getColor());
         } else {
-            webWrite.setSelectedColor(null);
+            webWrite.setEditRowColor(false);
         }
         if (topRadioButton.isSelected()) {
             webWrite.setSheetPosition(Constants.TOP);