/ - Diff - Application: gvSIG desktop - gvSIG

     /* gvSIG. Sistema de Informaci?n Geogr?fica de la Generalitat Valenciana
+     *
      * Copyright (C) 2004 IVER T.I. and Generalitat Valenciana.
+     *
      * This program is free software; you can redistribute it and/or
      * modify it under the terms of the GNU General Public License
      * as published by the Free Software Foundation; either version 2
      * of the License, or (at your option) any later version.
+     *
      * This program is distributed in the hope that it will be useful,
      * but WITHOUT ANY WARRANTY; without even the implied warranty of
      * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
      * GNU General Public License for more details.
+     *
      * You should have received a copy of the GNU General Public License
      * along with this program; if not, write to the Free Software
      * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307,USA.
+     *
      * For more information, contact:
+     *
      *  Generalitat Valenciana
      *   Conselleria d'Infraestructures i Transport
      *   Av. Blasco Ib??ez, 50
      *   46010 VALENCIA
      *   SPAIN
+     *
      *      +34 963862235
      *   gvsig@gva.es
      *      www.gvsig.gva.es
+     *
      *    or
+     *
      *   IVER T.I. S.A
      *   Salamanca 50
      *   46005 Valencia
      *   Spain
+     *
      *   +34 963163400
      *   dac@iver.es
      */
     package com.iver.cit.gvsig.gui.cad;
     import java.awt.Graphics;
     import java.awt.Point;
     /**
      * DOCUMENT ME!
+     *
      * @author Vicente Caballero Navarro
      */
     public class CadGrid {
     	private boolean grid = false;
     	private int gridSize = 20;
     	private CadMapControl cadmapcontrol;
     	/**
     	 * Crea un nuevo CadGrid.
+    	 *
     	 * @param cmc DOCUMENT ME!
     	 */
     	public CadGrid() {
+    	}
     public void setCadMapControl(CadMapControl cmc){
     	cadmapcontrol=cmc;
+    }
     	/**
     	 * Ajusta un punto de la imagen que se pasa como  par?metro al handler m?s
     	 * cercano si se encuentra lo suficientemente  cerca y devuelve la
     	 * distancia del punto original al punto ajustado
+    	 *
     	 * @param point
+    	 *
     	 * @return Distancia del punto que se pasa como par?metro al punto ajustado
     	 */
     	public double adjustToGrid(Point point) {
     		if (grid) {
     			Point p = new Point(point);
     			point.x = (((int) point.getX() + (gridSize / 2)) / gridSize) * gridSize;
     			point.y = (((int) point.getY() + (gridSize / 2)) / gridSize) * gridSize;
     			return p.distance(point);
+    		}
     		return Double.MAX_VALUE;
+    	}
     	/**
     	 * Dibuja el grid sobre el graphics que se pasa como par?metro
+    	 *
     	 * @param g Graphics sobre el que dibujar el grid.
     	 */
     	public void drawGrid(Graphics g) {
     		if (!grid) {
     			return;
+    		}
     		for (int x = 0; x < cadmapcontrol.getWidth(); x += gridSize) {
     			for (int y = 0; y < cadmapcontrol.getHeight(); y += gridSize) {
     				g.drawRect(x, y, 1, 1);
+    			}
+    		}
+    	}
     	public void setUseGrid(boolean b){
     		grid=b;
+    	}
+    }

     	 */
     	public void startEdition(EditionEvent e) {
     		FLayer lyr = e.getSource();
     		cadToolAdapter.setEditableFeatureSource((EditableFeatureSourceProxy)e.getEditingAdapter(), ((Selectable)lyr).getSelection());
     		cadToolAdapter.setEditableFeatureSource(e.getEditingAdapter(), ((Selectable)lyr).getSelection());
+    	}
     	/**

      */
     package com.iver.cit.gvsig;
     import java.io.IOException;
     import com.iver.andami.PluginServices;
     import com.iver.andami.plugins.Extension;
     import com.iver.cit.gvsig.fmap.FMap;
     import com.iver.cit.gvsig.fmap.drivers.DriverIOException;
     import com.iver.cit.gvsig.fmap.layers.FLayer;
     import com.iver.cit.gvsig.fmap.layers.FLyrVect;
     import com.iver.cit.gvsig.fmap.layers.layerOperations.EditableVectorialLayer;
-...
     		} else if (s.compareTo("POLYGON") == 0) {
     			vista.getMapControl().setCadTool("polygon");
     		} else if (s.compareTo("UNDO") == 0) {
     			cadmap.getCadToolAdapter().undo();
     			try {
     				cadmap.getCadToolAdapter().getEditableFeatureSource().undo();
     			} catch (DriverIOException e) {
     				e.printStackTrace();
     			} catch (IOException e) {
     				e.printStackTrace();
+    			}
     			vista.getMapControl().getMapControl().drawMap(false);
     		} else if (s.compareTo("REDO") == 0) {
     			cadmap.getCadToolAdapter().redo();
     			try {
     				cadmap.getCadToolAdapter().getEditableFeatureSource().redo();
     			} catch (DriverIOException e) {
     				e.printStackTrace();
     			} catch (IOException e) {
     				e.printStackTrace();
+    			}
     			vista.getMapControl().getMapControl().drawMap(false);
+    		}
+    	}

branches/pilotoDWG/libraries/libFMap/src/com/iver/cit/gvsig/fmap/edition/EditableFeatureSource.java
185	185	void undoAddGeometry(int index) throws DriverIOException, IOException;
186	186	void undoModifyGeometry(int index,int previndex);
187	187	void undoRemoveGeometry(int index);
188		SelectionSupport getSelectionSuport();
189	188	}

     import com.iver.cit.gvsig.fmap.core.IGeometry;
     import com.iver.cit.gvsig.fmap.drivers.DriverIOException;
     import com.iver.cit.gvsig.fmap.layers.FBitSet;
     import com.iver.cit.gvsig.fmap.layers.SelectionSupport;
     import com.vividsolutions.jts.geom.Envelope;
-...
     	private Quadtree index;
     	private Image selectionImage;
     	private CommandRecord cr;
     	private SelectionSupport selectionSupport = new SelectionSupport();
     	private FBitSet fbitset;
     	/**
     	 * Crea un nuevo AbstractEditableFeatureSource.
+    	 *
-...
     	 * @param ofa DOCUMENT ME!
     	 */
     	public DefaultEditableFeatureSource(ExpansionFile ef,
     		OriginalFeatureAdapter ofa) {
     		OriginalFeatureAdapter ofa,FBitSet bitset) {
     		expansionFile = ef;
     		this.ofa = ofa;
     		this.cr= new MemoryCommandRecord();
     		fbitset=bitset;
+    	}
     	/**
-...
     	 * @see com.iver.cit.gvsig.fmap.edition.EditableFeatureSource#undo()
     	 */
     	public void undo() throws DriverIOException, IOException{
     		selectionSupport.clearSelection();
     		fbitset.clear();
     		if (moreUndoCommands())
     		cr.popCommand();
+    	}
-...
     	 * @see com.iver.cit.gvsig.fmap.edition.EditableFeatureSource#redo()
     	 */
     	public void redo(){
     		selectionSupport.clearSelection();
     		fbitset.clear();
     		if (moreRedoCommands())
     		cr.pushCommand();
+    	}
-...
     	public boolean moreRedoCommands() {
     		return cr.moreRedoCommands();
+    	}
     	/**
     	 * @see com.iver.cit.gvsig.fmap.edition.EditableFeatureSource#getSelectionSuport()
     	 */
     	public SelectionSupport getSelectionSuport() {
     		return selectionSupport;
+    	}
+    }

     	public EditableFeatureSource startEdition() throws EditionException {
     		FileEditableFeatureSource fefs = new FileEditableFeatureSource((VectorialFileAdapter) source);
     		MemoryExpansionFile mef = new MemoryExpansionFile();
     		efs = new EditableFeatureSourceProxy(new DefaultEditableFeatureSource(mef,
     				fefs));
     		efs = new DefaultEditableFeatureSource(mef,
     				fefs,selectionSupport.getSelection());
     		efs.startEdition();
-...
     	 * @param listener SelectionListener.
     	 */
     	public void addSelectionListener(SelectionListener listener) {
     		if (efs!=null)
     		selectionSupport.addSelectionListener(listener);
+    	}

Application: gvSIG desktop

Revision 1573