Revision 12131 branches/v10/extensions/extAnnotations/src/com/iver/cit/gvsig/fmap/rendering/Annotation_Legend.java

View differences:

Annotation_Legend.java
77 77

  
78 78
	private boolean useDefaultSymbol = false;
79 79

  
80
	private boolean overwrite=true;
80
//	private boolean overwrite=true;
81 81

  
82
	private boolean avoidoverlapping=false;
83

  
84
	private boolean deloverlapping=false;
85

  
82 86
	public Annotation_Legend() {
83 87
		defaultSymbol.setFontSizeInPixels(true);
84 88
		defaultSymbol.setFontColor(Color.black);
......
196 200
		xml.putProperty("labelfield", labelFieldName);
197 201
		xml.putProperty("labelFieldHeight", labelFieldHeight);
198 202
		xml.putProperty("labelFieldRotation", labelFieldRotation);
199
		xml.putProperty("overwrite",overwrite);
203
		xml.putProperty("avoidoverlapping",avoidoverlapping);
204
		xml.putProperty("deloverlapping",deloverlapping);
205
//		xml.putProperty("overwrite",overwrite);
200 206

  
201 207
		xml.putProperty("useDefaultSymbol", useDefaultSymbol);
202 208
		xml.addChild(getDefaultSymbol().getXMLEntity());
......
233 239
		}
234 240

  
235 241
		useDefaultSymbol = xml.getBooleanProperty("useDefaultSymbol");
236
		if (xml.contains("overwrite")){
237
			overwrite=xml.getBooleanProperty("overwrite");
242
		if (xml.contains("avoidoverlapping")){
243
			avoidoverlapping=xml.getBooleanProperty("avoidoverlapping");
244
			deloverlapping=xml.getBooleanProperty("deloverlapping");
238 245
		}
239 246
		defaultSymbol = FSymbol.createFromXML(xml.getChild(0));
240 247

  
......
384 391

  
385 392
	}
386 393

  
387
	public void setIsOverWrite(boolean b) {
388
		overwrite=b;
394
//	public void setIsOverWrite(boolean b) {
395
//		overwrite=b;
396
//
397
//	}
389 398

  
399
//	public boolean isOverWrite() {
400
//		return overwrite;
401
//	}
402

  
403
	public boolean isAvoidOverLapping() {
404
		return avoidoverlapping;
390 405
	}
391 406

  
392
	public boolean isOverWrite() {
393
		return overwrite;
407
	public void setAvoidOverLapping(boolean avoidoverlapping) {
408
		this.avoidoverlapping = avoidoverlapping;
394 409
	}
410

  
411
	public boolean isDelOverLapping() {
412
		return deloverlapping;
413
	}
414

  
415
	public void setDelOverLapping(boolean deloverlapping) {
416
		this.deloverlapping = deloverlapping;
417
	}
395 418
}

Also available in: Unified diff