/ - Diff - Application: gvSIG desktop - gvSIG

Revision 3836

     	 * @see com.iver.cit.gvsig.fmap.edition.Command#undo()
     	 */
     	public void undo() throws IOException, DriverIOException {
     		// efs.undoModifyGeometry(indexAnt,previousIndex);
     		efs.undo();
     		efs.undoModifyRow(indexAnt,previousIndex);
     		//efs.undo();
+    	}
     	/**
     	 * @throws DriverIOException
-...
     	 * @see com.iver.cit.gvsig.fmap.edition.Command#redo()
     	 */
     	public void redo() throws IOException, DriverIOException {
     			// efs.doModifyGeometry(indexAnt,geomNext);
     		efs.redo();
     		efs.doModifyFeature(indexAnt,rowNext);
     		//efs.redo();
+    		}
+    }

     	 * @see com.iver.cit.gvsig.fmap.edition.Command#undo()
     	 */
     	public void undo() throws DriverIOException, IOException {
     		efs.undo();
     		//efs.undo();
     		efs.undoAddRow(index);
+    	}
     	/**
     	 * @throws IOException
     	 * @throws DriverIOException
     	 * @throws IOException
     	 * @throws DriverIOException
     	 * @see com.iver.cit.gvsig.fmap.edition.Command#redo()
     	 */
     	public void redo() throws DriverIOException, IOException {
     		efs.redo();
     		//efs.redo();
     		index=efs.doAddFeature(row);
+    	}
+    }

     		index=i;
     		geometry=efs.getRow(i);
+    	}
     	/**
     	 * @throws DriverIOException
     	 * @throws IOException
     	 * @see com.iver.cit.gvsig.fmap.edition.Command#undo()
     	 */
     	public void undo() throws IOException, DriverIOException {
     		efs.undo();
     		//efs.undo();
     		efs.undoRemoveRow(index);
+    	}
     	/**
     	 * @throws IOException
-...
     	 * @see com.iver.cit.gvsig.fmap.edition.Command#redo()
     	 */
     	public void redo() throws DriverIOException, IOException {
     		efs.redo();
     		//efs.redo();
     		efs.doRemoveFeature(index);
+    	}
+    }

     import java.awt.geom.Rectangle2D;
     import java.io.IOException;
     import com.iver.cit.gvsig.fmap.DriverException;
     import com.iver.cit.gvsig.fmap.core.IRow;
     import com.iver.cit.gvsig.fmap.drivers.DriverIOException;
-...
          * @throws DriverIOException DOCUMENT ME!
          */
         void endComplexRow() throws IOException, DriverIOException;
         public void undoModifyRow(int geometryIndex,int previousExpansionFileIndex) throws IOException, DriverIOException;
         public void doRemoveFeature(int index)throws DriverIOException, IOException;
         public int doModifyFeature(int index, IRow feat)throws IOException, DriverIOException;
         public int doAddFeature(IRow feat) throws DriverIOException, IOException;
         public void undoRemoveRow(int index)throws IOException, DriverIOException;
         public void undoAddRow(int index)throws DriverIOException, IOException;
+    }

+     *
      * $Id$
      * $Log$
      * Revision 1.9  2006-01-23 17:30:28  caballero
      * Revision 1.10  2006-01-30 08:18:14  caballero
      * m?todos para deshacer y rehacer
+     *
      * Revision 1.9  2006/01/23 17:30:28  caballero
      * coger los datos del ova
+     *
      * Revision 1.8  2006/01/23 16:16:16  caballero
-...
     import java.io.IOException;
     import java.util.HashMap;
     import java.util.List;
     import java.util.Vector;
     import com.hardcode.driverManager.DriverLoadException;
     import com.hardcode.gdbms.engine.data.DataSource;
-...
+    					}
     				} else {
     					int num = ((Integer) relations.get(integer)).intValue();
     					IFeature feat = (IFeature) expansionFile.getRow(num);
     					IFeature feat = (IFeature) expansionFile.getRow(num).getLinkedRow();
     					return feat.getAttribute(fieldId);
+    				}
     			} catch (DriverException e) {
-...
     		expansionFile=new MemoryExpansionFile();
     		cr=new MemoryCommandRecord();
     		this.ova = ova;
     		this.seleccion=new FBitSet();
+    	}
     	/*
     	 * (non-Javadoc)
-...
     	 * @throws DriverIOException
     	 * @throws IOException
     	 */
     	public int doAddRow(IRow feat) throws DriverIOException, IOException {
     	public int doAddFeature(IRow feat) throws DriverIOException, IOException {
     		// A?ade la geometr?a
     		int virtualIndex = ova.getShapeCount() + numAdd;
     		int pos = expansionFile.addRow(feat);
-...
+    	}
     	public void addRow(IRow row) throws DriverIOException, IOException {
     		int virtualIndex = doAddRow(row);
     		int virtualIndex = doAddFeature(row);
     		if (complex) {
     			commands.add(new AddRowCommand(this, row, virtualIndex));
-...
     	 * @throws DriverIOException
     	 * @throws com.iver.cit.gvsig.fmap.DriverException
     	 */
     	public int doModifyFeature(int index, IFeature feat)
     	public int doModifyFeature(int index, IRow feat)
     		throws IOException, DriverIOException {
     		int pos = -1;
     		Integer integer = new Integer(index);
-...
     				featAnt = ova.getFeature(index);
     				Rectangle2D rAnt = featAnt.getGeometry().getBounds2D();
     				Rectangle2D r = feat.getGeometry().getBounds2D();
     				Rectangle2D r = ((IFeature)feat).getGeometry().getBounds2D();
     				this.index.remove(new Envelope(rAnt.getX(),
     						rAnt.getX() + rAnt.getWidth(), rAnt.getY(),
     						rAnt.getY() + rAnt.getHeight()), new Integer(index));
-...
     			int num = ((Integer) relations.get(integer)).intValue();
     			pos = num;
     			//Obtenemos la geometr?a para actualiza el ?ndice espacialposteriormente
     			featAnt = (IFeature) expansionFile.getRow(num);
     			featAnt = (IFeature) expansionFile.getRow(num).getLinkedRow();
     			/*
     			 * Se modifica la geometr?a y nos guardamos el ?ndice dentro del fichero
     			 * de expansi?n en el que se encuentra la geometr?a modificada
-...
     			//Se modifica el ?ndice espacial
     			Rectangle2D rAnt = featAnt.getGeometry().getBounds2D();
     			Rectangle2D r = feat.getGeometry().getBounds2D();
     			Rectangle2D r = ((IFeature)feat).getGeometry().getBounds2D();
     			this.index.remove(new Envelope(rAnt.getX(),
     					rAnt.getX() + rAnt.getWidth(), rAnt.getY(),
     					rAnt.getY() + rAnt.getHeight()), new Integer(index));
-...
     		return indexes;
+    	}
     	/**
     	 * @return
     	 */
     	public FBitSet getSelection() {
     		return seleccion;
+    	}
     	/**
     	 * Actualiza en el mapa de ?ndices, la posici?n en la que estaba la
     	 * geometr?a antes de ser modificada. Se marca como v?lida, en caso de que
     	 * fuera una modificaci?n de una geometr?a que estuviese en el fichero de
     	 * expansi?n antes de ser modificada y se pone el puntero de escritura del
     	 * expansion file a justo despues de la penultima geometr?a
+    	 *
     	 * @param geometryIndex ?ndice de la geometr?a que se quiere deshacer su
     	 * 		  modificaci?n
     	 * @param previousExpansionFileIndex ?ndice que ten?a antes la geometr?a en
     	 * 		  el expansionFile. Si vale -1 quiere decir que es una
     	 * 		  modificaci?n de una geometr?a original y por tanto no hay que
     	 * 		  actualizar el mapa de indices sino eliminar su entrada.
+    	 *
     	 * @throws IOException
     	 * @throws DriverIOException
     	 */
     	public void undoModifyRow(int geometryIndex,
     		int previousExpansionFileIndex) throws IOException, DriverIOException {
     		/*
     		 * Si la acci?n de modificar se realiz? sobre una geometr?a original
     		 */
     		if (previousExpansionFileIndex == -1) {
     			//Se obtiene la geometr?a para actualizar el ?ndice
     			IGeometry g = getShape(geometryIndex);
     			Rectangle2D r = g.getBounds2D();
     			//Se elimina de las relaciones y del fichero de expansi?n
     			relations.remove(new Integer(geometryIndex));
     			expansionFile.deleteLastRow();
     			//Se actualizan los ?ndices
     			IGeometry gAnt = getShape(geometryIndex);
     			Rectangle2D rAnt = gAnt.getBounds2D();
     			this.index.remove(new Envelope(r.getX(), r.getX() + r.getWidth(),
     					r.getY(), r.getY() + r.getHeight()),
     				new Integer(geometryIndex));
     			this.index.insert(new Envelope(rAnt.getX(),
     					rAnt.getX() + rAnt.getWidth(), rAnt.getY(),
     					rAnt.getY() + rAnt.getHeight()), new Integer(geometryIndex));
     		} else {
     			//Se obtiene la geometr?a para actualizar el ?ndice
     			IGeometry g = null;
     			g = getShape(geometryIndex);
     			Rectangle2D r = g.getBounds2D();
     			this.index.remove(new Envelope(r.getX(), r.getX() + r.getWidth(),
     					r.getY(), r.getY() + r.getHeight()),
     				new Integer(geometryIndex));
     			//Se actualiza la relaci?n de ?ndices
     			Integer integer = new Integer(geometryIndex);
     			relations.put(new Integer(geometryIndex),
     				new Integer(previousExpansionFileIndex));
     			//Se recupera la geometr?a
     			expansionFile.validateRow(previousExpansionFileIndex);
     			//Se actualizan los ?ndices
     			g = getShape(geometryIndex);
     			r = g.getBounds2D();
     			this.index.insert(new Envelope(r.getX(), r.getX() + r.getWidth(),
     					r.getY(), r.getY() + r.getHeight()),
     				new Integer(geometryIndex));
+    		}
+    	}
     	/**
     	 * Se desmarca como invalidada en el fichero de expansion o como eliminada
     	 * en el fichero original
+    	 *
     	 * @param index DOCUMENT ME!
+    	 *
     	 * @throws IOException
     	 * @throws DriverIOException
     	 */
     	public void undoRemoveRow(int index)
     		throws IOException, DriverIOException {
     		// Si la relaci?n
     		if (relations.containsKey(new Integer(index))) {
     			expansionFile.validateRow(((Integer) relations.get(
     					new Integer(index))).intValue());
     		} else {
     			delgeometries.set(index, false);
+    		}
     		IGeometry g = null;
     		g = ((IFeature)getRow(index).getLinkedRow()).getGeometry();
     		Rectangle2D r = g.getBounds2D();
     		this.index.insert(new Envelope(r.getX(), r.getX() + r.getWidth(),
     				r.getY(), r.getY() + r.getHeight()), new Integer(index));
+    	}
     	/**
     	 * Se elimina del final del fichero de expansi?n poniendo el puntero de
     	 * escritura apuntando al final de la pen?ltima geometr?a. Deber? quitar
     	 * la relaci?n del mapa de relaciones
+    	 *
     	 * @param index ?ndice de la geometr?a que se a?adi?
+    	 *
     	 * @throws DriverIOException
     	 * @throws IOException
     	 */
     	public void undoAddRow(int index)
     		throws DriverIOException, IOException {
     		//doRemoveGeometry(index);
     		IGeometry g = ((IFeature)getRow(index).getLinkedRow()).getGeometry();
     		Rectangle2D r = g.getBounds2D();
     		this.index.remove(new Envelope(r.getX(), r.getX() + r.getWidth(),
     				r.getY(), r.getY() + r.getHeight()), new Integer(index));
     		expansionFile.deleteLastRow();
     		relations.remove(new Integer(index));
     		numAdd--;
+    	}
+    }

Also available in: Unified diff