Revision 39087

View differences:

branches/v2_0_0_prep/libraries/org.gvsig.symbology/org.gvsig.symbology.swing/org.gvsig.symbology.swing.api/src/main/java/org/gvsig/app/gui/styling/MultiShapeSymbolSelector.java
125 125

  
126 126

  
127 127
	public Object getSelectedObject() {
128
	    
128 129
		IMultiShapeSymbol sym = SymbologyLocator.getSymbologyManager().createMultiShapeSymbol();
129
		sym.setMarkerSymbol((IMarkerSymbol) markerSelector.getSelectedObject());
130
		sym.setLineSymbol((ILineSymbol) lineSelector.getSelectedObject());
131
		sym.setFillSymbol((IFillSymbol) fillSelector.getSelectedObject());
132
		return sym;
130
		
131
		IMarkerSymbol ims = (IMarkerSymbol) markerSelector.getSelectedObject();
132
		ILineSymbol ils = (ILineSymbol) lineSelector.getSelectedObject();
133
		IFillSymbol ifs = (IFillSymbol) fillSelector.getSelectedObject();
134
		
135
		if (ims == null || ils == null || ifs == null) {
136
            /*
137
             * If one of the symbols is null, it's because the user
138
             * has cancelled so those who have called this method must
139
             * deal with null (many of them where already checking before
140
             * this change)
141
             */
142
            return null;
143
		} else {
144
            sym.setMarkerSymbol(ims);
145
            sym.setLineSymbol(ils);
146
            sym.setFillSymbol(ifs);
147
            return sym;
148
		}
149
		
150
		
133 151
	}
134 152

  
135 153
	public void setSymbol(Object symbol) {

Also available in: Unified diff