Revision 31807

View differences:

trunk/libraries/libFMap/src/com/iver/cit/gvsig/fmap/drivers/dxf/DXFMemoryDriver.java
169 169
		try {
170 170
			dxfFeatureFile.load();
171 171
		} catch (Exception e1) {
172
			throw new FileNotFoundDriverException(getName(),e1);
172
//			throw new FileNotFoundDriverException(getName(),e1);
173 173
		}
174 174
		features = (IObjList.vector) ((DxfFeatureMaker) featureMaker)
175 175
				.getObjects();
trunk/libraries/libFMap/src/com/iver/cit/gvsig/fmap/rendering/VectorialUniqueValueLegend.java
722 722
		// porque parece que no funciona bien el metodo get sobre un
723 723
		// TreeMap cuyas claves son Values. Si se consigue que funcione
724 724
		// correctamente, eliminar este metodo.
725
		if (key==null)
726
			return null;
725 727
		ISymbol symbol = null;
726 728
		Set<Entry<Value, ISymbol>> entrySet = symbols.entrySet();
727 729
		Iterator<Entry<Value, ISymbol>> it = entrySet.iterator();
trunk/libraries/libFMap/src/com/iver/cit/gvsig/fmap/rendering/styling/labeling/AttrInTableLabelingStrategy.java
125 125
				boolean reproject=layer.getProjection()!=null && !layer.getProjection().getAbrev().equals(
126 126
						layer.getMapContext().getViewPort().getProjection().getAbrev()) &&
127 127
						(layer.getCoordTrans()!=null);
128
				
129
				
128

  
129

  
130 130
				if ((idTextField == -1) || (idTextField >= recordSet.getFieldCount())) {
131 131
					System.err.println("Ha habido un error. Se ha perdido el campo de etiquetado. Probablemente por quitar un join o edici?n externa.");
132 132
					return;
......
247 247
		xml.putProperty("labelingStrategy", "labelingStrategy");
248 248

  
249 249
		try {
250
			if(getHeightField() != null)
251
				xml.putProperty("HeightField", getHeightField());
250
			String height=getHeightField();
251
			if( height!= null)
252
				xml.putProperty("HeightField", height);
252 253
		} catch (ReadDriverException e) {
253 254
			Logger.getAnonymousLogger().log(Level.SEVERE, "Acessing TextHeight field.\n"+e.getMessage());
254 255
		}
255 256

  
256 257
		try {
257
			if(getColorField() != null)
258
				xml.putProperty("ColorField", getColorField());
258
			String color=getColorField();
259
			if(color != null)
260
				xml.putProperty("ColorField", color);
259 261
		} catch (ReadDriverException e) {
260 262
			Logger.getAnonymousLogger().log(Level.SEVERE, "Acessing ColorField field.\n"+e.getMessage());
261 263
		}
262 264

  
263 265
		try {
264
			if(getTextField() != null)
265
				xml.putProperty("TextField", getTextField());
266
			String text=getTextField();
267
			if(text != null)
268
				xml.putProperty("TextField", text);
266 269
		} catch (ReadDriverException e) {
267 270
			Logger.getAnonymousLogger().log(Level.SEVERE, "Acessing TextField field.\n"+e.getMessage());
268 271
		}
269 272

  
270 273
		try {
271
			if (getRotationField() != null)
272
				xml.putProperty("RotationField", getRotationField());
274
			String rotation=getRotationField();
275
			if (rotation != null)
276
				xml.putProperty("RotationField", rotation);
273 277
		} catch (ReadDriverException e) {
274 278
			Logger.getAnonymousLogger().log(Level.SEVERE, "Acessing RotationField field.\n"+e.getMessage());
275 279
		}
......
308 312
	public String getTextField() throws ReadDriverException {
309 313
		if (idTextField == -1) return null;
310 314
		try {
311
			String fieldName = ((SelectableDataSource) layer.getRecordset()).getFieldAlias(idTextField); 
315
			String fieldName = ((SelectableDataSource) layer.getRecordset()).getFieldAlias(idTextField);
312 316
			return fieldName;
313 317
		}
314 318
		catch (ArrayIndexOutOfBoundsException e) {

Also available in: Unified diff