/ - Diff - Application: gvSIG desktop - gvSIG

             <groupId>org.gvsig</groupId>
             <artifactId>org.gvsig.desktop</artifactId>
             <version>2.0.79-SNAPSHOT</version>
         </parent>
         </parent>
         <properties>
             <gvsig.package.info.state>testing</gvsig.package.info.state>
         </properties>
         <modules>
           <module>org.gvsig.app</module>
           <module>org.gvsig.coreplugin.app</module>

                 new PolygonBehavior(poligSel)});
     		// Zoom por rect?ngulo
     		ZoomOutRightButtonListener zoil =
                 new ZoomOutRightButtonListener(m_MapControl);
     		ZoomInListener zil = new ZoomInListener(m_MapControl);
     		m_MapControl.addBehavior("zoomIn", new Behavior[] {
     				new RectangleBehavior(zil), new PointBehavior(zoil)});
     		/*
     		SelectImageListener sil = new SelectImageListener(m_MapControl);
     		m_MapControl.addBehavior("selectImage", new Behavior[] {
                 new PointBehavior(sil), new MouseMovementBehavior(sbl) });
             */
     		m_MapControl.setTool("zoomIn"); // Por defecto
     				new RectangleBehavior(zil), new PointBehavior(zol,PointBehavior.RIGHT)});
                     m_MapControl.setTool("zoomIn");
             m_MapControl.addCombinedBehavior(new MouseMovementBehavior(sbl));
             m_MapControl.addCombinedBehavior(new MouseWheelBehavior());
             m_MapControl.addCombinedBehavior(new MoveWithMiddleButtonBehavior(pl));
             m_MapControl.addCombinedBehavior(new MoveBehavior(pl,MoveBehavior.MIDDLE));
+    	}
     	public void windowActivated() {

     import org.gvsig.fmap.geom.GeometryLocator;
     import org.gvsig.fmap.geom.GeometryManager;
     import org.gvsig.fmap.geom.exception.CreateEnvelopeException;
     import org.gvsig.fmap.geom.primitive.Envelope;
     import org.gvsig.fmap.mapcontext.MapContext;
     import org.gvsig.fmap.mapcontext.ViewPort;
     import org.gvsig.fmap.mapcontrol.MapControl;
-...
     /**
      * <p>Listener for doing a <i>zoom out</i> operation on the extent of the <code>ViewPort</code> of the associated {@link MapControl MapControl}
      *  object, selecting a point of the <code>MapControl</code> by a single click of the third button of the mouse.</p>
+     *
      * <p>Calculates the new extent <i>r</i> with this equations:
      *  <code><br>
      *   ViewPort vp = mapControl.getMapContext().getViewPort();<br>
      *   Point2D p2 = vp.toMapPoint(event.getPoint());<br>
      *   double factor = 1/MapContext.ZOOMOUTFACTOR;<br>
      *   Rectangle2D.Double r = new Rectangle2D.Double();<br>
      *   double nuevoX = p2.getX() - ((vp.getExtent().getWidth() * factor) / 2.0);<br>
      *   double nuevoY = p2.getY() - ((vp.getExtent().getHeight() * factor) / 2.0);<br>
      *   r.x = nuevoX;<br>
      *   r.y = nuevoY;<br>
      *   r.width = vp.getExtent().getWidth() * factor;<br>
      *   r.height = vp.getExtent().getHeight() * factor;<br>
      *   vp.setExtent(r);
      *  </code>
      * </p>
+     *
      * <p>The ultimately extent will be an adaptation from that, calculated by the <code>ViewPort</code>
      *  bearing in mind the ratio of the available rectangle.</p>
+     *
      * @see MapContext#ZOOMOUTFACTOR
      * @see ViewPort#setEnvelope(Envelope)
      * @see ZoomInListenerImpl
      * @see ZoomOutListenerImpl
+     *
      * @author Vicente Caballero Navarro
      * @deprecated use ZoomOutListenerImpl setting mouseButton to right in the Behavior.
      */
     public class ZoomOutRightButtonListener implements PointListener {
     	private static final GeometryManager geomManager = GeometryLocator.getGeometryManager();
     	private static final Logger logger = LoggerFactory.getLogger(ZoomOutRightButtonListener.class);
     	/**
     	 * The image to display when the cursor is active.
     	 */
     //	private final Image izoomout = PluginServices.getIconTheme().get("cursor-zoom-out").getImage();
     	/**
     	 * Reference to the <code>MapControl</code> object that uses.
     	 */
     	private MapControl mapControl;
-...
     	 */
     	public ZoomOutRightButtonListener(MapControl mapControl) {
     		this.mapControl = mapControl;
                     logger.warn("Using deprecated class ZoomOutRightButtonListener");
+    	}
     	/*

+     	 *
     	 * @param l listener used to permit this object to work with the associated <code>MapControl</code>
     	 */
     	public PointBehavior(PointListener l, int mouseButton) {
                 super(mouseButton);
                 listener = l;
+    	}
     	public PointBehavior(PointListener l) {
     		listener = l;
                 this(l,LEFT);
+    	}
     	/*
-...
     	 * @see com.iver.cit.gvsig.fmap.tools.Behavior.Behavior#mousePressed(java.awt.event.MouseEvent)
     	 */
     	public void mousePressed(MouseEvent e) {
                     if( !isMyButton(e) ) {
                         return;
+                    }
     		if (listener.cancelDrawing()) {
     			getMapControl().cancelDrawing();
+    		}
-...
     	 * @see com.iver.cit.gvsig.fmap.tools.Behavior.Behavior#mouseReleased(java.awt.event.MouseEvent)
     	 */
     	public void mouseReleased(MouseEvent e) throws BehaviorException {
                     if( !isMyButton(e) ) {
                         return;
+                    }
     		PointEvent event = new PointEvent(e.getPoint(), e, this.getMapControl());
     		listener.point(event);
     		if (doubleClick){

      */
     package org.gvsig.fmap.mapcontrol.tools.Behavior;
     import java.awt.event.MouseEvent;
     import javax.swing.SwingUtilities;
     import org.gvsig.fmap.mapcontrol.tools.Listeners.PanListener;
     /**
-...
          *            associated <code>MapControl</code>
          */
         public MoveWithMiddleButtonBehavior(PanListener pli) {
             super(pli);
             super(pli,MIDDLE);
+        }
         protected boolean isMyButton(MouseEvent e) {
             return (SwingUtilities.isMiddleMouseButton(e));
+        }
+    }

      * For any additional information, do not hesitate to contact us
      * at info AT gvsig.com, or visit our website www.gvsig.com.
      */
     /*
      * Created on 28-oct-2004
      */
     /* 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 org.gvsig.fmap.mapcontrol.tools.Behavior;
     import java.awt.Image;
-...
     import java.awt.event.MouseWheelEvent;
     import java.awt.geom.Point2D;
     import java.awt.image.BufferedImage;
     import javax.swing.SwingUtilities;
     import org.gvsig.fmap.dal.feature.exception.CreateGeometryException;
     import org.gvsig.fmap.geom.Geometry.SUBTYPES;
-...
      * @author Luis W. Sevilla
      */
     public abstract class Behavior implements IBehavior {
             public static final int LEFT = 0;
             public static final int MIDDLE = 1;
             public static final int RIGHT = 2;
     	/**
     	 * Reference to the <code>MapControl</code> object that uses.
+    	 *
-...
     	protected GeometryManager geomManager = GeometryLocator.getGeometryManager();
             private int mouseButton = LEFT;
             public Behavior() {
+            }
             public Behavior(int mouseButton) {
                 this.mouseButton = mouseButton;
+            }
     	/*
     	 * (non-Javadoc)
     	 * @see com.iver.cit.gvsig.fmap.tools.Behavior.IBehavior#getListener()
-...
+    		}
     		return curve;
+    	}
             protected boolean isMyButton(MouseEvent e) {
                 switch(this.mouseButton) {
                     case LEFT:
                     default:
                         return (SwingUtilities.isLeftMouseButton(e));
                     case MIDDLE:
                         return (SwingUtilities.isMiddleMouseButton(e));
                     case RIGHT:
                         return (SwingUtilities.isRightMouseButton(e));
+                }
+            }
+    }

          *            listener used to permit this object to work with the
          *            associated <code>MapControl</code>
          */
         public MoveBehavior(PanListener pli) {
         public MoveBehavior(PanListener pli, int mouseButton) {
             super(mouseButton);
             listener = pli;
+        }
         public MoveBehavior(PanListener pli) {
             this(pli,LEFT);
+        }
         public void paintComponent(MapControlDrawer renderer) {
             BufferedImage image = getMapControl().getImage();
-...
+            }
+        }
         protected boolean isMyButton(MouseEvent e) {
             return (e.getButton() == MouseEvent.BUTTON1);
+        }
         /**
          * <p>
          * Sets a tool listener to work with the <code>MapControl</code> using this

     	 * @see com.iver.cit.gvsig.fmap.tools.Listeners.PointListener#point(com.iver.cit.gvsig.fmap.tools.Events.PointEvent)
     	 */
     	public void point(PointEvent event) {
     		ViewPort vp = mapControl.getMapContext().getViewPort();
     		Point2D p2 = vp.toMapPoint(event.getPoint());
                 ViewPort vp = mapControl.getMapContext().getViewPort();
                 Point2D p2 = vp.toMapPoint(event.getPoint());
     		double nuevoX;
     		double nuevoY;
     		double factor = 1/MapContext.ZOOMOUTFACTOR;
                 double nuevoX;
                 double nuevoY;
                 double factor = 1 / MapContext.ZOOMOUTFACTOR;
                 if (vp.getExtent() != null) {
                     nuevoX = p2.getX() - ((vp.getExtent().getWidth() * factor) / 2.0);
                     nuevoY = p2.getY() - ((vp.getExtent().getHeight() * factor) / 2.0);
                     double x = nuevoX;
                     double y = nuevoY;
                     double width = vp.getExtent().getWidth() * factor;
                     double height = vp.getExtent().getHeight() * factor;
     		nuevoX = p2.getX() - ((vp.getExtent().getWidth() * factor) / 2.0);
     		nuevoY = p2.getY() - ((vp.getExtent().getHeight() * factor) / 2.0);
     		double x = nuevoX;
     		double y = nuevoY;
     		double width = vp.getExtent().getWidth() * factor;
     		double height = vp.getExtent().getHeight() * factor;
                     try {
                         vp.setEnvelope(geomManager.createEnvelope(x, y, x + width, y + height, SUBTYPES.GEOM2D));
                     } catch (CreateEnvelopeException e) {
                         logger.warn("Error creating the envelope", e);
+                    }
+                }
     		Envelope r;
     		try {
     			r = geomManager.createEnvelope(x,y, x+width, y+height, SUBTYPES.GEOM2D);
     			vp.setEnvelope(r);
     		} catch (CreateEnvelopeException e) {
     			logger.error("Error creating the envelope", e);
+    		}
+    	}
     	/*

Application: gvSIG desktop

Revision 41964