Revision 16454

View differences:

trunk/libraries/libFMap/src/com/iver/cit/gvsig/fmap/rendering/SingleSymbolLegend.java
232 232
    	return zSort;
233 233

  
234 234
    }
235
    public void setZSort(ZSort zSort) {
236
    	this.zSort = zSort;
237
    }
238 235

  
236
	public void setZSort(ZSort zSort) {
237
		if (zSort == null) {
238
			removeLegendListener(this.zSort);
239
		}
240
		this.zSort = zSort;
241
		addLegendListener(zSort);
242
	}
239 243

  
244

  
245

  
240 246
	public String getClassName() {
241 247
		return getClass().getName();
242 248
	}
trunk/libraries/libFMap/src/com/iver/cit/gvsig/fmap/rendering/VectorialUniqueValueLegend.java
148 148
    private int shapeType;
149 149
    private String valueType = NullValue.class.getName();
150 150
    private boolean useDefaultSymbol = false;
151
	private ZSort zSort;
152

  
153

  
154
    /**
151
	/**
155 152
     * Constructor method
156 153
     */
157 154
    public VectorialUniqueValueLegend() {
......
221 218
        keys.clear();
222 219
        ISymbol[] olds = symbols.values().toArray(new ISymbol[0]);
223 220
        symbols.clear();
224
        removeLegendListener(zSort);
225
        zSort = null;
221
        removeLegendListener(getZSort());
222
        setZSort(null);
226 223
        
227 224
        fireLegendClearEvent(new LegendClearEvent(olds));
228 225
    }
......
397 394
            xml.putProperty("typeValues",stv);
398 395
        }
399 396
        
400
        if (zSort!=null) {
401
        	XMLEntity xmlZSort = zSort.getXMLEntity();
397
        if (getZSort()!=null) {
398
        	XMLEntity xmlZSort = getZSort().getXMLEntity();
402 399
        	xmlZSort.putProperty("id", "zSort");
403 400
        	xml.addChild(xmlZSort);
404 401
        }
......
519 516
        
520 517
        XMLEntity zSortXML = xml.firstChild("id", "zSort");
521 518
		if (zSortXML != null) {
522
			zSort = new ZSort(this);
519
			ZSort zSort = new ZSort(this);
523 520
			zSort.setXMLEntity(zSortXML);
524 521
			addLegendListener(zSort);
522
			setZSort(zSort);
525 523
		}
526 524
    }
527 525

  
......
658 656
        				null));
659 657
    }
660 658

  
661
	public ZSort getZSort() {
662
		return zSort;
663
	}
664

  
665
	public void setZSort(ZSort zSort) {
666
		this.zSort = zSort;
667
		addLegendListener(zSort);
668
	}
669

  
670 659
	public String getClassName() {
671 660
		return getClass().getName();
672 661
	}
trunk/libraries/libFMap/src/com/iver/cit/gvsig/fmap/rendering/VectorialIntervalLegend.java
65 65
public class VectorialIntervalLegend extends AbstractIntervalLegend {
66 66
    private Color startColor = Color.red;
67 67
    private Color endColor = Color.blue;
68
    private ZSort zSort;
69 68
    /**
70 69
     * Constructor method
71 70
     */
......
318 317
		}
319 318
	}
320 319

  
321
	public ZSort getZSort() {
322
		return zSort;
323
	}
324 320

  
325
	public void setZSort(ZSort zSort) {
326
		// TODO Implement it
327
		throw new Error("Not yet implemented!");
328

  
329
	}
330

  
331 321
	public String getClassName() {
332 322
		return getClass().getName();
333 323
	}
trunk/libraries/libFMap/src/com/iver/cit/gvsig/fmap/rendering/AbstractClassifiedVectorLegend.java
52 52
public abstract class AbstractClassifiedVectorLegend extends AbstractLegend implements IClassifiedVectorLegend {
53 53
	private String[] fieldNames;
54 54
	private int[] fieldTypes;
55
	private ZSort zSort;
55 56
	
56 57
	/**
57 58
	 * Looks for a change in a classified symbol of a legend. To perform
......
91 92
	public void setClassifyingFieldTypes(int[] fieldTypes) {
92 93
		this.fieldTypes =  fieldTypes;
93 94
	}
95
	
96
	public ZSort getZSort() {
97
		return zSort;
98
	}
99
	
100
	public void setZSort(ZSort zSort) {
101
		if (zSort == null) {
102
			removeLegendListener(this.zSort);
103
		}
104
		this.zSort = zSort;
105
		addLegendListener(zSort);
106
	}
94 107
}

Also available in: Unified diff