/ - Diff - | gvSIG desktop 1 - gvSIG

trunk/libraries/libFMap/src/com/iver/cit/gvsig/fmap/rendering/SingleSymbolLegend.java
201	201	return getClass().getName();
202	202	}
203	203
	204	public boolean isSuitableForShapeType(int shapeType) {
	205	return getShapeType() == shapeType;
	206	}
204	207
205	208	}

      * @author Vicente Caballero Navarro
      */
     public class SymbolLegendEvent extends ClassificationLegendEvent {
     	/**
     /**
     	 * <p>Previous symbol style.</p>
     	 */
     	private ISymbol oldValue;
     	private ISymbol oldSymbol;
     	/**
     	 * <p>New symbol style.</p>
     	 */
     	private ISymbol newValue;
     	private ISymbol newSymbol;
     	/**
     	 * <p>Creates a new symbol legend event.</p>
-...
     	 * @param oldValue previous symbol style
     	 * @param newValue new symbol style
     	 */
     	public SymbolLegendEvent(ISymbol oldValue, ISymbol newValue) {
     		this.oldValue = oldValue;
     		this.newValue = newValue;
     	public SymbolLegendEvent(ISymbol oldSymbol, ISymbol newSymbol) {
     		this.oldSymbol = oldSymbol;
     		this.newSymbol = newSymbol;
+    	}
     	/**
-...
+    	 *
     	 * @return the previous symbol style
     	 */
     	public ISymbol getOldValue() {
     		return oldValue;
     	public ISymbol getOldSymbol() {
     		return oldSymbol;
+    	}
     	/**
-...
+    	 *
     	 * @return the new symbol style
     	 */
     	public ISymbol getNewValue() {
     		return newValue;
     	public ISymbol getNewSymbol() {
     		return newSymbol;
+    	}
     	/**

trunk/libraries/libFMap/src/com/iver/cit/gvsig/fmap/rendering/IVectorLegend.java
137	137	public ZSort getZSort();
138	138
139	139	public void setZSort(ZSort zSort);
	140
	141	public boolean isSuitableForShapeType(int shapeType);
140	142	}

trunk/libraries/libFMap/src/com/iver/cit/gvsig/fmap/rendering/ZSort.java
305	305	}
306	306
307	307	public boolean symbolChanged(SymbolLegendEvent e) {
308		replaceSymbol(e.getOldValue(), e.getNewValue());
	308	replaceSymbol(e.getOldSymbol(), e.getNewSymbol());
309	309	return true;
310	310	}
311	311
312	312
313	313	public boolean classifiedSymbolChange(SymbolLegendEvent e) {
314		replaceSymbol(e.getOldValue(), e.getNewValue());
	314	replaceSymbol(e.getOldSymbol(), e.getNewSymbol());
315	315	return true;
316	316	}
317	317

     	public void addSymbol(Object key, ISymbol symbol) {
     		symbols.put(key, symbol);
     		keys.add(key);
     		fireClassifiedSymbolChangeEvent(new SymbolLegendEvent(null, symbol));
+    	}
     	/*
-...
     		ISymbol theSymbol = getSymbolByInterval(interval);
     //
     //		if (shapeType == FShape.POLYGON && theSymbol instanceof IMarkerSymbol) {
     //			// transform it to a fill symbol
     //			MarkerFillSymbol aux = new MarkerFillSymbol();
     //			// tell the fill style to draw the IMarkerSymbol
     //			// as a IFillSymbol centering it in the shape polygon
     //			// centroid and applying offset (if any).
     //			aux.setMarker((IMarkerSymbol) theSymbol);
     //			SimpleMarkerFillPropertiesStyle p = new SimpleMarkerFillPropertiesStyle();
     //			p.setFillStyle(SimpleMarkerFillPropertiesStyle.SINGLE_CENTERED_SYMBOL);
     //			aux.setMarkerFillProperties(p);
     //			theSymbol = aux;
     //		}
     		if (theSymbol != null) {
     			return theSymbol;
     		} else if (useDefaultSymbol) {
-...
+    	}
     	public void setDefaultSymbol(ISymbol s) {
     	    ISymbol old = defaultSymbol;
     		if (s == null) throw new NullPointerException("Default symbol cannot be null");
     		defaultSymbol = s;
     		fireDefaultSymbolChangedEvent(new SymbolLegendEvent(old, defaultSymbol));
+    	}
     	public void setClassifyingFieldNames(String[] fieldNames) {
-...
     	public void delSymbol(Object obj) {
     		keys.remove(obj);
     		symbols.remove(obj);
     		fireClassifiedSymbolChangeEvent(
     				new SymbolLegendEvent(
     						symbols.remove(obj),
     						null));
+    	}

trunk/libraries/libFMap/src/com/iver/cit/gvsig/fmap/rendering/AbstractClassifiedVectorLegend.java
104	104	this.zSort = zSort;
105	105	addLegendListener(zSort);
106	106	}
	107
	108
	109	public boolean isSuitableForShapeType(int shapeType) {
	110	return getShapeType() == shapeType;
	111	}
107	112	}

     		for (int i = 0; i < layers.length; i++) {
     			newLayers.add(layers[i]);
+    		}
     		newLayers.add(layerIndex, newLayer);
     		layers = (IMarkerSymbol[]) newLayers.toArray(new IMarkerSymbol[0]);
     		try {
     			newLayers.add(layerIndex, newLayer);
     			layers = (IMarkerSymbol[]) newLayers.toArray(new IMarkerSymbol[0]);
     		} catch (ArrayStoreException asEx) {
     			throw new ClassCastException(newLayer.getClassName()+" is not an IMarkerSymbol");
+    		}
+    	}
     	public boolean removeLayer(ISymbol layer) {

     		for (int i = 0; i < layers.length; i++) {
     			newLayers.add(layers[i]);
+    		}
     		newLayers.add(layerIndex, newLayer);
     		layers = (IFillSymbol[]) newLayers.toArray(new IFillSymbol[0]);
     		try {
     			newLayers.add(layerIndex, newLayer);
     			layers = (IFillSymbol[]) newLayers.toArray(new IFillSymbol[0]);
     		} catch (ArrayStoreException asEx) {
     			throw new ClassCastException(newLayer.getClassName()+" is not an IFillSymbol");
+    		}
+    	}
     	public boolean removeLayer(ISymbol layer) {

     		for (int i = 0; i < layers.length; i++) {
     			newLayers.add(layers[i]);
+    		}
     		newLayers.add(layerIndex, newLayer);
     		layers = newLayers.toArray(new ILineSymbol[0]);
     		try {
     			newLayers.add(layerIndex, newLayer);
     			layers = newLayers.toArray(new ILineSymbol[0]);
     		} catch (ArrayStoreException asEx) {
     			throw new ClassCastException(newLayer.getClassName()+" is not an ILineSymbol");
+    		}
+    	}
     	public boolean removeLayer(ISymbol layer) {

     						// check shape type
     //						if (l.getShapeType() != 0 && m.getShapeType() != l.getShapeType()) {
     						if(l.getDefaultSymbol().getSymbolType() != m.getShapeType()){
     						if((l.getDefaultSymbol().getSymbolType() != m.getShapeType())
     								&& !l.isSuitableForShapeType(m.getShapeType())){
     							errors |= LegendDriverException.LAYER_SHAPETYPE_MISMATCH;
+    						}
-...
     			// should be unreachable code
     			throw new Error ("file_not_found");
     		} catch (MarshalException e) {
     			throw new Error ("file_not_found");
     			throw new Error ("file_corrupt");
     		} catch (ValidationException e) {
     			// should be unreachable code
     			throw new Error ("ValidationException");

     	public static final int LEGEND_TYPE_NOT_YET_SUPPORTED = 16;
     	public static final int SYMBOL_TYPE_NOT_YET_SUPPORTED = 32;
     	// Geometry exceptions
     	public static final int LAYER_SHAPETYPE_MISMATCH = 64;
-...
     	// Filesystem Exceptions
     	public static final int SYSTEM_ERROR = 1048576;
     	// Parsing Errors
     	public static final int LAYER_NAME_NOT_SPECIFIED = 2097152;
     	public static final int LAYER_NAME_NOT_FOUND = 4194304;
     	public static final int UNSUPPORTED_LEGEND_CREATION_FOR_DRIVER = 8388608;
     	private int type;
     	public LegendDriverException(int type) {

| gvSIG desktop 1

Revision 20778