remove Boundary2D.getBoundaryCurves()

Author: dlegland

changes.txt

@@ -1,5 +1,9 @@
 Changes in javaGeom library
 
+* lots of changes in method names
+* fixed AffineTransform2D.isMotion(), and cleanup code
+
+
 javaGeom-0.10.2   (2012.03.11, rev. 315)
 =====
 

src/math/geom2d/circulinear/BoundaryPolyCirculinearCurve2D.java

@@ -189,16 +189,6 @@ public void fill(Graphics2D g2) {
 		g2.fill(this.getGeneralPath());
 	}
 
-	/* (non-Javadoc)
-	 * @see math.geom2d.domain.Boundary2D#getBoundaryCurves()
-	 */
-	public Collection<BoundaryPolyCirculinearCurve2D<T>> boundaryCurves() {
-        ArrayList<BoundaryPolyCirculinearCurve2D<T>> list = 
-            new ArrayList<BoundaryPolyCirculinearCurve2D<T>>(1);
-        list.add(this);
-        return list;
-	}
-
 	/* (non-Javadoc)
 	 * @see math.geom2d.domain.Boundary2D#getDomain()
 	 */

src/math/geom2d/circulinear/GenericCirculinearRing2D.java

@@ -71,31 +71,13 @@ public GenericCirculinearRing2D(CirculinearElement2D... curves) {
         this.closed = true;
     }
 
-    /**
-     * @deprecated, as a ring is closed by definition (0.8.1)
-     */
-    @Deprecated
-    public GenericCirculinearRing2D(CirculinearElement2D[] curves, 
-    		boolean closed) {
-        super(curves, closed);
-    }
-
     public GenericCirculinearRing2D(
     		Collection<? extends CirculinearElement2D> curves) {
         super(curves);
         this.closed = true;
     }
 
-    /**
-     * @deprecated, as a ring is closed by definition (0.8.1)
-     */
-    @Deprecated
-    public GenericCirculinearRing2D(
-    		Collection<? extends CirculinearElement2D> curves, 
-    		boolean closed) {
-        super(curves, closed);
-    }
-
+    
     // ===================================================================
     // methods specific to GenericCirculinearRing2D
 
@@ -130,13 +112,6 @@ public void fill(Graphics2D g2) {
 		g2.fill(this.getGeneralPath());
 	}
 
-	/* (non-Javadoc)
-	 * @see math.geom2d.domain.Boundary2D#getBoundaryCurves()
-	 */
-	public Collection<? extends CirculinearContour2D> boundaryCurves() {
-        return wrapCurve(this);
-	}
-
 	/* (non-Javadoc)
 	 * @see math.geom2d.domain.Boundary2D#getDomain()
 	 */

src/math/geom2d/conic/Ellipse2D.java

@@ -660,10 +660,6 @@ public double eccentricity() {
     // ===================================================================
     // methods implementing the Boundary2D interface
 
-    public Collection<? extends Ellipse2D> boundaryCurves() {
-    	return wrapCurve(this);
-    }
-
     public Domain2D domain() {
         return new GenericDomain2D(this);
     }

src/math/geom2d/conic/HyperbolaBranch2D.java

@@ -8,7 +8,6 @@
 
 import math.geom2d.*;
 import math.geom2d.curve.*;
-import math.geom2d.domain.Contour2D;
 import math.geom2d.domain.Domain2D;
 import math.geom2d.domain.GenericDomain2D;
 import math.geom2d.domain.SmoothContour2D;
@@ -116,16 +115,6 @@ public Vector2D tangent(double t) {
     // ===================================================================
     // methods inherited from Boundary2D interface
 
-    /**
-     * Returns an instance of ArrayList<Contour2D> containing only
-     * <code>this</code>.
-     */
-    public Collection<Contour2D> boundaryCurves() {
-        ArrayList<Contour2D> list = new ArrayList<Contour2D>();
-        list.add(this);
-        return list;
-    }
-
     public Domain2D domain() {
         return new GenericDomain2D(this);
     }

src/math/geom2d/conic/Parabola2D.java

@@ -237,12 +237,6 @@ public double eccentricity() {
     // ==========================================================
     // methods implementing the Boundary2D interface
 
-    public Collection<Contour2D> boundaryCurves() {
-		ArrayList<Contour2D> list = new ArrayList<Contour2D>(1);
-        list.add(this);
-        return list;
-    }
-
     public Domain2D domain() {
         return new GenericDomain2D(this);
     }

src/math/geom2d/domain/Boundary2D.java

@@ -50,13 +50,6 @@ public interface Boundary2D extends OrientedCurve2D {
      */
     public boolean isInside(Point2D pt);
 
-    /**
-     * Returns the different continuous curves composing the boundary
-     * @deprecated replaced by getContinuousCurves (0.9.1)
-     */
-    @Deprecated
-    public Collection<? extends Contour2D> boundaryCurves();
-
     /**
      * Overloads the declaration of continuousCurves to return a collection
      * of contours (instances of Contour2D).

src/math/geom2d/domain/BoundaryPolyCurve2D.java

@@ -105,16 +105,6 @@ public boolean isClosed() {
     // ===================================================================
     // Methods implementing Boundary2D interface
 
-    /**
-     * Returns a ArrayList<ContinuousBoundary2D> containing only
-     * <code>this</code>.
-     * @deprecated use getContinuousCurves instead (0.9.1)
-     */
-    @Deprecated
-    public Collection<? extends Contour2D> boundaryCurves() {
-    	return wrapCurve(this);
-    }
-
     public Collection<BoundaryPolyCurve2D<T>> continuousCurves() {
     	return wrapCurve(this);
     }

src/math/geom2d/domain/ContourArray2D.java

@@ -96,14 +96,6 @@ public ContourArray2D(T curve) {
     // ===================================================================
     // Methods implementing Boundary2D interface
 
-    /**
-     * @deprecated replaced by getContinuousCurves
-     */
-    @Deprecated
-    public Collection<? extends Contour2D> boundaryCurves() {
-    	return this.continuousCurves();
-    }
-
     public Collection<? extends T> continuousCurves() {
     	return Collections.unmodifiableCollection(this.curves);
     }

src/math/geom2d/domain/OrientedCurve2D.java

@@ -35,8 +35,7 @@
 /**
  * An OrientedCurve2D defines an 'inside' and an 'outside'. It is typically a
  * part of the boundary of a domain. Several OrientedCurve2D form a
- * ContinuousBoundary2D, and one or several ContinousBoundary2D form a
- * Boundary2D.
+ * Contour2D, and one or several Contour2D form a Boundary2D.
  * 
  * @author dlegland
  */

src/math/geom2d/line/StraightLine2D.java

@@ -43,7 +43,6 @@
 import math.geom2d.circulinear.CircleLine2D;
 import math.geom2d.circulinear.GenericCirculinearDomain2D;
 import math.geom2d.conic.Circle2D;
-import math.geom2d.domain.Contour2D;
 import math.geom2d.domain.Domain2D;
 import math.geom2d.domain.SmoothContour2D;
 import math.geom2d.polygon.Polyline2D;
@@ -334,12 +333,6 @@ public CircleLine2D transform(CircleInversion2D inv) {
     // ===================================================================
     // methods specific to Boundary2D interface
 
-    public Collection<Contour2D> boundaryCurves() {
-        ArrayList<Contour2D> list = new ArrayList<Contour2D>(1);
-        list.add(this);
-        return list;
-    }
-
     public Domain2D domain() {
         return new GenericCirculinearDomain2D(this);
     }

src/math/geom2d/polygon/LinearRing2D.java

@@ -37,7 +37,6 @@
 import math.geom2d.circulinear.CirculinearRing2D;
 import math.geom2d.circulinear.GenericCirculinearRing2D;
 import math.geom2d.circulinear.buffer.BufferCalculator;
-import math.geom2d.domain.Contour2D;
 import math.geom2d.domain.Domain2D;
 import math.geom2d.domain.GenericDomain2D;
 import math.geom2d.line.LineSegment2D;
@@ -208,13 +207,6 @@ public CirculinearRing2D transform(CircleInversion2D inv) {
 	// ===================================================================
     // Methods inherited from Boundary2D
 
-    public Collection<Contour2D> boundaryCurves() {
-        ArrayList<Contour2D> list = 
-            new ArrayList<Contour2D>(1);
-        list.add(this);
-        return list;
-    }
-
     public Domain2D domain() {
         return new GenericDomain2D(this);
     }

tests/src/math/geom2d/line/StraightLine2DTest.java

@@ -110,7 +110,7 @@ public void testGetBoundaryCurves() {
 		Vector2D v0 = new Vector2D(10, 20);
 		StraightLine2D line = new StraightLine2D(p0, v0);
 
-		assertEquals(1, line.boundaryCurves().size());
+		assertEquals(1, line.continuousCurves().size());
 	}
 
 	public void testIsBounded() {