Revision 37947 trunk/libraries/libFMap/src/com/iver/cit/gvsig/fmap/layers/LayerFactory.java

View differences:

LayerFactory.java
223 223
				WithDefaultLegend aux = (WithDefaultLegend) d;
224 224

  
225 225
					adapter.start();
226
					layer.setLegend((IVectorLegend) aux.getDefaultLegend());
227

  
226
					if (aux.getDefaultLegend() != null) {
227
						layer.setLegend((IVectorLegend) aux.getDefaultLegend());	
228
					}
228 229
					ILabelingStrategy labeler = aux.getDefaultLabelingStrategy();
229
					if (labeler instanceof AttrInTableLabelingStrategy) {
230
						((AttrInTableLabelingStrategy) labeler).setLayer(layer);
230
					if (labeler != null) {
231
						if (labeler instanceof AttrInTableLabelingStrategy) {
232
							((AttrInTableLabelingStrategy) labeler).setLayer(layer);
233
						}
234
						layer.setLabelingStrategy(labeler);
235
						layer.setIsLabeled(true); 
231 236
					}
232
					layer.setLabelingStrategy(labeler);
233
					layer.setIsLabeled(true); // TODO: ac? no s'hauria de detectar si t? etiquetes?????
234 237
					adapter.stop();
235 238

  
236 239
			} else {

Also available in: Unified diff