Revision 20024 trunk/libraries/libFMap/src/com/iver/cit/gvsig/fmap/core/symbols/MultiShapeSymbol.java

View differences:

MultiShapeSymbol.java
36 36
	private String desc;
37 37
	private int referenceSystem;
38 38
	private MultiShapeSymbol symSelect;
39
	
39

  
40 40
	public Color getLineColor() {
41 41
		return line.getColor();
42 42
	}
......
134 134
		int bMarker = 0;
135 135
		int aMarker = 0;
136 136

  
137
		if (marker!=null) {
137
		 if (marker!=null && marker.getColor() != null) {
138 138
			rMarker = marker.getColor().getRed();
139 139
			gMarker = marker.getColor().getGreen();
140 140
			bMarker = marker.getColor().getBlue();
......
146 146
		int bLine = 0;
147 147
		int aLine = 0;
148 148

  
149
		if (line != null) {
149
		 if (line != null  && line.getColor() != null) {
150 150
			rLine = line.getColor().getRed();
151 151
			gLine = line.getColor().getGreen();
152 152
			bLine = line.getColor().getBlue();
......
204 204
			XMLEntity fillXML = fill.getXMLEntity();
205 205
			fillXML.putProperty("id", "fill");
206 206
			xml.addChild(fillXML);
207
			
208
	
207

  
208

  
209 209
		}
210 210
		return xml;
211 211
	}
......
229 229
		if (myXML != null)
230 230
			fill = (IFillSymbol) SymbologyFactory.
231 231
						createSymbolFromXML(myXML, null);
232
		
233
		
232

  
233

  
234 234
	}
235 235

  
236 236
	public String getDescription() {
......
550 550

  
551 551
	public void setHasOutline(boolean hasOutline) {
552 552
		// TODO Auto-generated method stub
553
		
553

  
554 554
	}
555 555

  
556 556
}

Also available in: Unified diff