/trunk/libraries/libFMap/src/com/iver/cit/gvsig/fmap/rendering/ZSort.java - Diff - Application: gvSIG desktop - gvSIG

Revision 25107 trunk/libraries/libFMap/src/com/iver/cit/gvsig/fmap/rendering/ZSort.java

      * Class ZSort is used in order to store information about the symbols
      * which are placed in the Z axis (because a level of symbols has been
      * used).
+     *
+     *
      * @author jaume dominguez faus - jaume.dominguez@iver.es
      */
     public class ZSort implements IPersistence, LegendContentsChangedListener {
-...
     	private static final String ROW_SEPARATOR = ";";
     	private int[][] matrix;
     	private boolean usingZSort;
     	private Hashtable<ISymbol, Integer> symbols = new Hashtable<ISymbol, Integer>();
     	private Hashtable<ISymbol, Integer> symbols = new Hashtable<ISymbol, Integer>();
     	public ZSort(ILegend legend) {
     		initialize(legend);
-...
     		ISymbol[] symbols;
     		if (legend instanceof IClassifiedLegend) {
     			symbols = ((IClassifiedLegend) legend).getSymbols();
     		} else {
     			symbols = new ISymbol[] {legend.getDefaultSymbol()};
+    		}
     		matrix = new int[symbols.length][];
     		for (int i = 0; i < symbols.length; i++) {
     			this.symbols.put(symbols[i], i);
     			int rowLength =  symbols[i] instanceof IMultiLayerSymbol ?
                       	 ((IMultiLayerSymbol) symbols[i]).getLayerCount() :
     			int rowLength =  symbols[i] instanceof IMultiLayerSymbol ?
                       	 ((IMultiLayerSymbol) symbols[i]).getLayerCount() :
 ;
     			matrix[i] = new int[rowLength];
+    		}
-...
     		symbols.clear();
     		usingZSort = false;
     		initialize(e.getNewLegend());
+    	}
     	public String getClassName() {
-...
     		XMLEntity xml = new XMLEntity();
     		xml.putProperty("className", getClassName());
     		/*
     		 * ADVICE:
     		 * don't try to persist symbols!!
     		/*
     		 * ADVICE:
     		 * don't try to persist symbols!!
     		 * they are already persisted by the legend!!!
     		 */
     		xml.putProperty("usingZSort", isUsingZSort());
     		String strMatrix = "";
     		for (int i = 0; i < matrix.length; i++) {
     			int[] row = matrix[i];
-...
+    			}
     			strMatrix += strRow + ROW_SEPARATOR;
+    		}
     		xml.putProperty("matrix", strMatrix);
     		return xml;
+    	}
     	public void setXMLEntity(XMLEntity xml) {
     		setUsingZSort(xml.getBooleanProperty("usingZSort"));
     		/*
     		 * ADVICE:
     		 * don't try to initialize the symbols!!
     		/*
     		 * ADVICE:
     		 * don't try to initialize the symbols!!
     		 * they must be initialized by the legend!!!
     		 */
     		String strMatrix = xml.getStringProperty("matrix");
     		String[] strRows = strMatrix.split(ROW_SEPARATOR);
     		matrix = new int[strRows.length][];
     		for (int i = 0; i < strRows.length; i++) {
     			String[] strColumns = strRows[i].split(COLUMN_SEPARATOR);
-...
     	public int getSymbolLevel(ISymbol layer) {
     		ISymbol[] theSymbols = getSymbols();
     		for (int i = 0; i < theSymbols.length; i++) {
     			ISymbol mySymbol = theSymbols[i];
     			if (mySymbol instanceof IMultiLayerSymbol) {
     				IMultiLayerSymbol multiSym = (IMultiLayerSymbol) mySymbol;
     				for (int j = 0; j < multiSym.getLayerCount(); j++) {
-...
+    					}
+    				}
     			} else {
     				if (mySymbol.equals(layer)) {
     					return matrix[symbols.get(layer)][0];
     //				if (mySymbol.equals(layer)) {
     //					return matrix[symbols.get(layer)][0];
     				 //Cuando la leyenda ha sufrido una clonaci?n, la comparaci?n de arriba no sirve.
     				//FIXME: Pero esto no es del todo bueno.
     				if (mySymbol.getDescription().equals(layer.getDescription())){
     					return matrix[symbols.get(mySymbol)][0];
+    				}
+    			}
+    		}
     //		return 0;
     		return -1;
+    	}
     	public int getTopLevelIndexAllowed() {
     		ISymbol[] symbols = getSymbols();
     		int count=0;
-...
+    		}
     		return count;
+    	}
     	@Override
     	public String toString() {
     		String out = "Symbols:\n---------\n\n";
-...
     			out += "\n";
+    		}
     		return out;
+    	}
+    	}
     	private void replaceSymbol(ISymbol oldSymbol, ISymbol newSymbol) {
     		if (oldSymbol == newSymbol) return;
     		Integer value = symbols.get(oldSymbol);
     		if (newSymbol == null) {
     			// emptying
     			symbols.remove(oldSymbol);
     			matrix[value] = new int[1];
     		} else {
     			symbols.remove(oldSymbol);
     			symbols.put(newSymbol, value);
     			// update matrix values if need
-...
     			if (matrix[value].length == newArrayLength) {
     				/*
     				 * the new row is exactly the same long than the
     				 * old one. Will use the old values
     				 * old one. Will use the old values
     				 */
     				newRow = matrix[value];
     			} else	if (matrix[value].length < newArrayLength) {
-...
     				 * the new row is larger than the old one,
     				 * let's copy all the first values and fill
     				 * the rest with the last copied value
     				 */
     				 */
     				int val=0;
     				for (int i = 0; i < newRow.length; i++) {
     					if (i<matrix[value].length) {
     						val = matrix[value][i];
+    					}
     					newRow[i] = val;
     					newRow[i] = val;
+    				}
     			} else if (matrix[value].length > newArrayLength) {
     				/*
     				 * the new row is smaller than the old one,
     				 * let's copy the first values
     				 * the new row is smaller than the old one,
     				 * let's copy the first values
     				 */
     				for (int i = 0; i < newRow.length; i++) {
     					newRow[i] = matrix[value][i];

Also available in: Unified diff