/ - Diff - Application: gvSIG desktop - gvSIG

Revision 38785

     			e = e1;
+    		}
     		Assert.assertTrue(e instanceof UnsupportedOperationException);
     		Point center = (Point)manager.create(TYPES.POINT, SUBTYPES.GEOM2D);
     		center.setCoordinateAt(0, 0);
     		center.setCoordinateAt(1, 0);
     		Point initPoint = (Point)manager.create(TYPES.POINT, SUBTYPES.GEOM2D);
     		initPoint.setCoordinateAt(0, 1);
     		initPoint.setCoordinateAt(1, 1);
     		Point middle = (Point)manager.create(TYPES.POINT, SUBTYPES.GEOM2D);
     		middle.setCoordinateAt(0, 0);
     		middle.setCoordinateAt(1, 0);
     		Point endPoint = (Point)manager.create(TYPES.POINT, SUBTYPES.GEOM2D);
     		endPoint.setCoordinateAt(0, 0);
     		endPoint.setCoordinateAt(1, 1);
     		arc.setPoints(center, initPoint, endPoint);
     		arc.setPoints(initPoint, middle, endPoint);
     		assertEquals(0.5, arc.getCenterPoint().getX(), 0);
     		assertEquals(0.5, arc.getCenterPoint().getX(), 0);
     		assertEquals(0.5, arc.getCenterPoint().getY(), 0);
     		assertEquals(1.0, arc.getInitPoint().getX(), 0);
     		assertEquals(1.0, arc.getInitPoint().getX(), 0);
     		assertEquals(1.0, arc.getInitPoint().getY(), 0);
     		assertEquals(0, arc.getEndPoint().getX(), 0);
     		assertEquals(0, arc.getEndPoint().getX(), 0);
     		assertEquals(1, arc.getEndPoint().getY(), 0);
+    	}
+    }

     	/**
     	 * Sets the three points to define an arc.
     	 * @param midPoint
     	 * The middle point of an arc.
     	 * These are three ordered points that belong to the arc
     	 * (none of them is the center of the ellipse/circle). Therefore
     	 * they must not be aligned.
+    	 *
     	 * @param startPoint
     	 * The start point of an arc.
          * @param midPoint
          * The middle point of an arc.
     	 * @param endPoint
     	 * The end point of an arc.
     	 * @exception IllegalArgumentException if the three points are aligned or
     	 * there is a repeated point.
+    	 *
     	 */
     	void setPoints(Point midPoint, Point startPoint, Point endPoint);
     	void setPoints(Point startPoint, Point midPoint, Point endPoint);
     	/**
     	 * Sets the values to define an arc.
-...
     	 */
     	void setPoints (Point center, double radius, double startAngle, double angleExt);
     	/**
     	 * Return the first point that has been used to create the arc.
     	 * @return
-...
     	Point getEndPoint();
     	/**
     	 * Return the center point that has been used to create the arc.
     	 * @return
     	 * The center point of the arc.
     	 * Return the center of the arc, that is, the center of the ellipse/circle
     	 * in which the arc is based.
+    	 *
     	 * @return The center of the arc.
     	 */
     	Point getCenterPoint();

     	private static final long serialVersionUID = 6416027005106924030L;
     	private Point2D init;
     	private Point2D center;
     	/**
     	 * This is the middle point (belongs to the arc), not the center
     	 * of the circle/ellipse
     	 */
     	private Point2D middle;
     	private Point2D end;
     	private static final GeometryManager geomManager = GeometryLocator.getGeometryManager();
-...
     	protected Arc2D(GeometryType geometryType, String id, IProjection projection, GeneralPathX gpx, Point2D i,Point2D c, Point2D e) {
     		super(geometryType, id, projection, gpx);
     		init=i;
     		center=c;
     		middle=c;
     		end=e;
+    	}
-...
     	 * @see com.iver.cit.gvsig.fmap.core.FShape#cloneFShape()
     	 */
     	public FShape cloneFShape() {
     		Arc2D arc = new Arc2D(getGeometryType(), id, projection, (GeneralPathX) gp.clone(),init,center,end);
     		Arc2D arc = new Arc2D(getGeometryType(), id, projection, (GeneralPathX) gp.clone(),init,middle,end);
     		return arc;
+    	}
-...
     		ArrayList handlers = new ArrayList();
     		handlers.add(new InitSelHandler(0, init.getX(), init.getY()));
     		handlers.add(new CenterSelHandler(1, center.getX(), center.getY()));
     		handlers.add(new CenterSelHandler(1, middle.getX(), middle.getY()));
     		handlers.add(new EndSelHandler(2, end.getX(), end.getY()));
     		return (Handler[]) handlers.toArray(new Handler[0]);
-...
     		 * @param y DOCUMENT ME!
     		 */
     		public CenterSelHandler(int i, double x, double y) {
     			center = new Point2D.Double(x, y);
     		    middle = new Point2D.Double(x, y);
     			index = i;
+    		}
-...
     		public void move(double x, double y) {
+    		}
     		public void setPoint(Point2D p){
     			center=p;
     		    middle=p;
+    		}
     		public Point2D getPoint(){
     			return center;
     			return middle;
+    		}
     		/**
     		 * @see org.gvsig.fmap.geom.handler.Handler#set(double, double)
     		 */
     		public void set(double x, double y) {
     			center=new Point2D.Double(x,y);
     			java.awt.geom.Arc2D arco = UtilFunctions.createArc(init, center, end);
     		    middle=new Point2D.Double(x,y);
     			java.awt.geom.Arc2D arco = UtilFunctions.createArc(init, middle, end);
     			gp = new GeneralPathX(arco.getPathIterator(null));
+    		}
+    	}
-...
     		 */
     		public void move(double x, double y) {
     			Point2D mediop=new Point2D.Double((init.getX()+end.getX())/2,(init.getY()+end.getY())/2);
     			double dist=mediop.distance(center);
     			double dist=mediop.distance(middle);
     			init=new Point2D.Double(init.getX()+x,init.getY()+y);
     			mediop=new Point2D.Double((init.getX()+end.getX())/2,(init.getY()+end.getY())/2);
-...
     			if (UtilFunctions.getAngle(end,init)<=Math.PI){
     				dist=-dist;
+    			}
     			center=UtilFunctions.getPoint(mediop,perp[1],dist);
     			middle=UtilFunctions.getPoint(mediop,perp[1],dist);
     			java.awt.geom.Arc2D arco = UtilFunctions.createArc(init,center, end);
     			java.awt.geom.Arc2D arco = UtilFunctions.createArc(init,middle, end);
     			gp=new GeneralPathX(arco.getPathIterator(null));
+    		}
     		public void setPoint(Point2D p){
-...
     		 */
     		public void move(double x, double y) {
     			Point2D mediop=new Point2D.Double((init.getX()+end.getX())/2,(init.getY()+end.getY())/2);
     			double dist=mediop.distance(center);
     			double dist=mediop.distance(middle);
     			end=new Point2D.Double(end.getX()+x,end.getY()+y);
     			mediop=new Point2D.Double((init.getX()+end.getX())/2,(init.getY()+end.getY())/2);
-...
     			if (UtilFunctions.getAngle(end,init)<=Math.PI){
     				dist=-dist;
+    			}
     			center=UtilFunctions.getPoint(mediop,perp[1],dist);
     			middle=UtilFunctions.getPoint(mediop,perp[1],dist);
     			java.awt.geom.Arc2D arco = UtilFunctions.createArc(init,center, end);
     			java.awt.geom.Arc2D arco = UtilFunctions.createArc(init,middle, end);
     			gp=new GeneralPathX(arco.getPathIterator(null));
+    		}
     		public void setPoint(Point2D p){
-...
     		 */
     		public void move(double x, double y) {
     			Point2D mediop=new Point2D.Double((init.getX()+end.getX())/2,(init.getY()+end.getY())/2);
     			double dist=mediop.distance(center);
     			double dist=mediop.distance(middle);
     			init=new Point2D.Double(init.getX()+x,init.getY()+y);
     			mediop=new Point2D.Double((init.getX()+end.getX())/2,(init.getY()+end.getY())/2);
-...
     			if (UtilFunctions.getAngle(end,init)<=Math.PI){
     				dist=-dist;
+    			}
     			center=UtilFunctions.getPoint(mediop,perp[1],dist);
     			middle=UtilFunctions.getPoint(mediop,perp[1],dist);
     			java.awt.geom.Arc2D arco = UtilFunctions.createArc(init,center, end);
     			java.awt.geom.Arc2D arco = UtilFunctions.createArc(init,middle, end);
     			gp=new GeneralPathX(arco.getPathIterator(null));
+    		}
     		public void setPoint(Point2D p){
-...
     		 */
     		public void set(double x, double y) {
     			Point2D mediop=new Point2D.Double((init.getX()+end.getX())/2,(init.getY()+end.getY())/2);
     			double dist=mediop.distance(center);
     			double dist=mediop.distance(middle);
     			init=new Point2D.Double(x,y);
     			mediop=new Point2D.Double((init.getX()+end.getX())/2,(init.getY()+end.getY())/2);
-...
     				dist=-dist;
+    			}
     			///center=TrigonometricalFunctions.getPoint(mediop,perp[1],dist);
     			java.awt.geom.Arc2D arco = UtilFunctions.createArc(init,center, end);
     			java.awt.geom.Arc2D arco = UtilFunctions.createArc(init,middle, end);
     			gp=new GeneralPathX(arco.getPathIterator(null));
+    		}
+    	}
-...
     		 */
     		public void move(double x, double y) {
     			Point2D mediop=new Point2D.Double((init.getX()+end.getX())/2,(init.getY()+end.getY())/2);
     			double dist=mediop.distance(center);
     			double dist=mediop.distance(middle);
     			end=new Point2D.Double(end.getX()+x,end.getY()+y);
     			mediop=new Point2D.Double((init.getX()+end.getX())/2,(init.getY()+end.getY())/2);
-...
     			if (UtilFunctions.getAngle(end,init)<=Math.PI){
     				dist=-dist;
+    			}
     			center=UtilFunctions.getPoint(mediop,perp[1],dist);
     			middle=UtilFunctions.getPoint(mediop,perp[1],dist);
     			java.awt.geom.Arc2D arco = UtilFunctions.createArc(init,center, end);
     			java.awt.geom.Arc2D arco = UtilFunctions.createArc(init,middle, end);
     			gp=new GeneralPathX(arco.getPathIterator(null));
+    		}
     		public void setPoint(Point2D p){
-...
     		 */
     		public void set(double x, double y) {
     			Point2D mediop=new Point2D.Double((init.getX()+end.getX())/2,(init.getY()+end.getY())/2);
     			double dist=mediop.distance(center);
     			double dist=mediop.distance(middle);
     			end=new Point2D.Double(x,y);
     			mediop=new Point2D.Double((init.getX()+end.getX())/2,(init.getY()+end.getY())/2);
-...
     				dist=-dist;
+    			}
     			///center=TrigonometricalFunctions.getPoint(mediop,perp[1],dist);
     			java.awt.geom.Arc2D arco = UtilFunctions.createArc(init,center, end);
     			java.awt.geom.Arc2D arco = UtilFunctions.createArc(init,middle, end);
     			gp=new GeneralPathX(arco.getPathIterator(null));
+    		}
+    	}
-...
     			throw new IllegalArgumentException();
+    		}
     		this.gp = new GeneralPathX(arco.getPathIterator(null));
     		this.center = p1;
     		this.init = p2;
     		this.init = p1;
             this.middle = p2;
     		this.end = p3;
+    	}
-...
     		setPoints(p1, p2, p3);
+    	}
     	/* (non-Javadoc)
     	 * @see org.gvsig.fmap.geom.primitive.Curve2D#setPoints(org.gvsig.fmap.geom.primitive.Point, org.gvsig.fmap.geom.primitive.Point)
     	 */
-...
     	 * @see org.gvsig.fmap.geom.primitive.Arc#getCenterPoint()
     	 */
     	public Point getCenterPoint() {
     		Point2D p = UtilFunctions.getCenter(init, center,end);
     		Point2D p = UtilFunctions.getCenter(init, middle,end);
     		try {
     			return new org.gvsig.fmap.geom.primitive.impl.Point2D(p.getX(), p.getY());
     		} catch (Exception e) {
     			return  null;
+    		}
+    	}
+    	}
+    }

Also available in: Unified diff