/ - Diff - Application: gvSIG desktop - gvSIG

     //	protected FeatureStore featureStore;
     	protected int intervalType = NATURAL_INTERVALS;
     	protected boolean useDefaultSymbol = false;
     	private ISymbol nullIntervalSymbol = null;
     	final static private Logger logger = LoggerFactory.getLogger(AbstractIntervalLegend.class);
     	public void addSymbol(Object key, ISymbol symbol) {
     		symbols.put(key, symbol);
     		keys.add(key);
     		if (key == null) {
     			nullIntervalSymbol = symbol;
+    		}
     		else {
     			symbols.put(key, symbol);
     			keys.add(key);
+    		}
     		fireClassifiedSymbolChangeEvent(new SymbolLegendEvent(null, symbol));
+    	}
-...
         public ISymbol getSymbolByInterval(IInterval key) {
     		if (key == null){
     			if (isUseDefaultSymbol()) {
     			if (nullIntervalSymbol != null) {
     				return nullIntervalSymbol;
+    			}
     			else if (isUseDefaultSymbol()) {
     				return defaultSymbol;
+    			}
     			return null;
-...
+    	}
     	public ISymbol[] getSymbols() {
     		return (ISymbol[]) symbols.values().toArray(new ISymbol[0]);
     		ISymbol[] symbolList;
     		if (nullIntervalSymbol == null) {
     			symbolList = new ISymbol[symbols.size()];
     			return (ISymbol[]) symbols.values().toArray(symbolList);
+    		}
     		else {
     			symbolList = new ISymbol[symbols.size() + 1];
     			symbolList[0] = nullIntervalSymbol;
     			int i = 1;
     			for (Iterator iterator = symbols.values().iterator(); iterator
     					.hasNext();) {
     				symbolList[i] = (ISymbol) iterator.next();
     				i++;
+    			}
     			return symbolList;
+    		}
+    	}
     	public String[] getClassifyingFieldNames() {
-...
     	public IInterval getInterval(Object v) {
     		for (int i = 0; i < keys.size(); i++) {
     			if (((IInterval) keys.get(i)).isInInterval(v)) {
     				return (IInterval) keys.get(i);
     		if (v != null ) {
     			for (int i = 0; i < keys.size(); i++) {
     				if (((IInterval) keys.get(i)).isInInterval(v)) {
     					return (IInterval) keys.get(i);
+    				}
+    			}
+    		}

     //    private String valueType = NullValue.class.getName();
         private boolean useDefaultSymbol = false;
         private Color[] selectedColors=null;
     	/**
          * Constructor method
          */
         public VectorialUniqueValueLegend() {
+        }
         private ISymbol nullValueSymbol = null;
         /**
          * Constructor method
-...
+        }
         public void addSymbol(Object key, ISymbol symbol) {
             ISymbol resul;
             resul = (ISymbol)symbols.put(key, symbol);
         	ISymbol resul;
         	if (key == null) {
         		resul = nullValueSymbol;
         		nullValueSymbol = symbol;
+        	}
         	else {
     			resul = (ISymbol) symbols.put(key, symbol);
             if (resul != null) {
             	logger.error("Error: la clave " + key +
                     " ya exist?a. Resul = " + resul);
                 logger.warn("symbol nuevo:" + symbol.getDescription() +
                     " Sviejo= " + resul.getDescription());
             } else {
                 keys.add(key);
+            }
     			if (resul != null) {
     				logger.error("Error: la clave " + key + " ya exist?a. Resul = "
     						+ resul);
     				logger.warn("symbol nuevo:" + symbol.getDescription()
     						+ " Sviejo= " + resul.getDescription());
     			} else {
     				keys.add(key);
+    			}
+        	}
             fireClassifiedSymbolChangeEvent(new SymbolLegendEvent(resul, symbol));
+        }
         public void clear() {
-...
+        }
          public ISymbol[] getSymbols() {
             return (ISymbol[])symbols.values().toArray(new ISymbol[0]);
      		ISymbol[] symbolList;
     		if (nullValueSymbol == null) {
     			symbolList = new ISymbol[symbols.size()];
     			return (ISymbol[]) symbols.values().toArray(symbolList);
+    		}
     		else {
     			symbolList = new ISymbol[symbols.size() + 1];
     			symbolList[0] = nullValueSymbol;
     			int i = 1;
     			for (Iterator iterator = symbols.values().iterator(); iterator
     					.hasNext();) {
     				symbolList[i] = (ISymbol) iterator.next();
     				i++;
+    			}
     			return symbolList;
+    		}
+        }
         public void setClassifyingFieldNames(String[] fNames) {
-...
          * @see com.iver.cit.gvsig.fmap.rendering.UniqueValueLegend#getSymbolByValue(com.hardcode.gdbms.engine.values.Value)
          */
         public ISymbol getSymbolByValue(Object key) {
         	ISymbol symbol = (ISymbol)symbols.get(key);
         	if (symbol!=null) {
         		return symbol;
         	} else if (useDefaultSymbol) {
         		return getDefaultSymbol();
         	ISymbol symbol = null;
         	if (key == null) {
         		symbol = nullValueSymbol;
+        	}
         	return null;
         	else {
         		symbol = (ISymbol)symbols.get(key);
+        	}
         	if (symbol == null && useDefaultSymbol) {
         		symbol = getDefaultSymbol();
+        	}
         	return symbol;
+        }

     				theSymbol = (ISymbol) symbolTable.getFieldValue(row, 0);
     				theSymbol.setDescription((String) symbolTable.getFieldValue(
     						row, 2));
     				auxLegend.addSymbol(new NullIntervalValue(), theSymbol);
     				auxLegend.addSymbol(null, theSymbol);
     			} else {
     				theInterval = (IInterval) symbolTable.getFieldValue(row, 1);
     				theSymbol = (ISymbol) symbolTable.getFieldValue(row, 0);
-...
     			if(defaultSymbolPrev.getSymbol() != null){
     				String description = PluginServices.getText(this,"default");
     				defaultSymbolPrev.getSymbol().setDescription(description);
     				auxLegend.addSymbol(new NullIntervalValue(), defaultSymbolPrev.getSymbol());
     				auxLegend.addSymbol(null, defaultSymbolPrev.getSymbol());
+    			}
+    		}
+    	}

                 //Object resul;
                 if (chbUseDefault.isSelected()) {
                     auxLegend.getDefaultSymbol().setDescription("Default");
                     auxLegend.addSymbol(new NullUniqueValue(),
                         auxLegend.getDefaultSymbol());
                     auxLegend.addSymbol(null, auxLegend.getDefaultSymbol());
+                }
                 ColorItem[] colorScheme = cmbColorScheme.getSelectedColors();
-...
+    				}
+    			}
+    		}
     		clave = new NullUniqueValue();
     		clave = null;
     		if(chbUseDefault.isSelected()){
     			theSymbol = defaultSymbolPrev.getSymbol();
     			if(theSymbol != null){
-...
          */
         private void addDefault() {
             auxLegend.getDefaultSymbol().setDescription("Default");
             auxLegend.addSymbol(new NullUniqueValue(), auxLegend.getDefaultSymbol());
             auxLegend.addSymbol(null, auxLegend.getDefaultSymbol());
             symbolTable.addTableRecord(auxLegend.getDefaultSymbol(),
                 new NullUniqueValue(), auxLegend.getDefaultSymbol().getDescription());
                 null, auxLegend.getDefaultSymbol().getDescription());
             symbolTable.repaint();
+        }
-...
          * Elimina el resto de valores que no estan representados por ning�n otro s�mbolo..
          */
         private void delDefault() {
             auxLegend.delSymbol(new NullUniqueValue());
             symbolTable.removeRow(new NullUniqueValue());
             auxLegend.delSymbol(null);
             symbolTable.removeRow(null);
             symbolTable.repaint();
+        }

Application: gvSIG desktop

Revision 30121