Make com.jogamp.graph.geom.plane non public: jogamp.graph.geom.plane, this incl. creating the non public FontInt interface for Path2D access

7 files changed, 4 insertions, 1121 deletions

diff --git a/src/com/jogamp/graph/curve/text/HwTextRenderer.java b/src/com/jogamp/graph/curve/text/HwTextRenderer.java
index 5813225e4..61d8309c7 100644
--- a/src/com/jogamp/graph/curve/text/HwTextRenderer.java
+++ b/src/com/jogamp/graph/curve/text/HwTextRenderer.java
@@ -39,14 +39,15 @@ import javax.media.opengl.GLUniformData;
 import javax.media.opengl.fixedfunc.GLMatrixFunc;
 
 import jogamp.graph.curve.text.GlyphString;
+import jogamp.graph.font.FontInt;
 import jogamp.graph.font.typecast.TypecastFontFactory;
+import jogamp.graph.geom.plane.AffineTransform;
+import jogamp.graph.geom.plane.Path2D;
 
 import com.jogamp.common.util.ReflectionUtil;
 import com.jogamp.graph.curve.Region;
 import com.jogamp.graph.font.Font;
 import com.jogamp.graph.font.FontFactory;
-import com.jogamp.graph.geom.plane.AffineTransform;
-import com.jogamp.graph.geom.plane.Path2D;
 import com.jogamp.graph.geom.Point;
 import com.jogamp.graph.geom.PointTex;
 import com.jogamp.graph.geom.opengl.Vertex;
@@ -299,7 +300,7 @@ public class HwTextRenderer {
 		AffineTransform affineTransform = new AffineTransform(pointFactory);
 		
 		Path2D[] paths = new Path2D[str.length()];
-		font.getOutline(str, affineTransform, paths);
+		((FontInt)font).getOutline(str, affineTransform, paths);
 		
 		GlyphString glyphString = new GlyphString(pointFactory, font.getName(), str);
 		glyphString.createfromFontPath(paths, affineTransform);
diff --git a/src/com/jogamp/graph/font/Font.java b/src/com/jogamp/graph/font/Font.java
index 5c26e8626..0abaad5b5 100644
--- a/src/com/jogamp/graph/font/Font.java
+++ b/src/com/jogamp/graph/font/Font.java
@@ -28,8 +28,6 @@
 package com.jogamp.graph.font;
 
 import com.jogamp.graph.geom.AABBox;
-import com.jogamp.graph.geom.plane.AffineTransform;
-import com.jogamp.graph.geom.plane.Path2D;
 
 public interface Font {
 
@@ -60,8 +58,6 @@ public interface Font {
         public AABBox getBBox();
         public float getAdvance();
         public float getAdvanceForPixelSize(float pixelSize, boolean useFrationalMetrics);
-        public Path2D getPath();
-        public Path2D getPathForPixelSize(float pixelSize); 
     }
 
 
@@ -74,9 +70,5 @@ public interface Font {
     public float getStringHeight(String string);
     public AABBox getStringBounds(CharSequence string);
 
-    public void getOutline(String string,
-            AffineTransform transform,
-            Path2D[] result);
-    
     public int getNumGlyphs();
 }
\ No newline at end of file
diff --git a/src/com/jogamp/graph/geom/plane/AffineTransform.java b/src/com/jogamp/graph/geom/plane/AffineTransform.java
deleted file mode 100644
index 321551edc..000000000
--- a/src/com/jogamp/graph/geom/plane/AffineTransform.java
+++ /dev/null
@@ -1,573 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one or more
- *  contributor license agreements.  See the NOTICE file distributed with
- *  this work for additional information regarding copyright ownership.
- *  The ASF licenses this file to You under the Apache License, Version 2.0
- *  (the "License"); you may not use this file except in compliance with
- *  the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-/**
- * @author Denis M. Kishenko
- */
-package com.jogamp.graph.geom.plane;
-
-import java.io.IOException;
-import java.io.Serializable;
-
-import jogamp.graph.math.MathFloat;
-import org.apache.harmony.misc.HashCode;
-
-import com.jogamp.graph.geom.Point;
-import com.jogamp.graph.geom.Point.Factory;
-
-public class AffineTransform implements Cloneable, Serializable {
-
-    private static final long serialVersionUID = 1330973210523860834L;
-
-    static final String determinantIsZero = "Determinant is zero";
-    
-    public static final int TYPE_IDENTITY = 0;
-    public static final int TYPE_TRANSLATION = 1;
-    public static final int TYPE_UNIFORM_SCALE = 2;
-    public static final int TYPE_GENERAL_SCALE = 4;
-    public static final int TYPE_QUADRANT_ROTATION = 8;
-    public static final int TYPE_GENERAL_ROTATION = 16;
-    public static final int TYPE_GENERAL_TRANSFORM = 32;
-    public static final int TYPE_FLIP = 64;
-    public static final int TYPE_MASK_SCALE = TYPE_UNIFORM_SCALE | TYPE_GENERAL_SCALE;
-    public static final int TYPE_MASK_ROTATION = TYPE_QUADRANT_ROTATION | TYPE_GENERAL_ROTATION;
-
-    /**
-     * The <code>TYPE_UNKNOWN</code> is an initial type value
-     */
-    static final int TYPE_UNKNOWN = -1;
-    
-    /**
-     * The min value equivalent to zero. If absolute value less then ZERO it considered as zero.  
-     */
-    static final float ZERO = (float) 1E-10;
-   
-    private final Point.Factory<? extends Point> pointFactory;
-    
-    /**
-     * The values of transformation matrix
-     */
-    float m00;
-    float m10;
-    float m01;
-    float m11;
-    float m02;
-    float m12;
-
-    /**
-     * The transformation <code>type</code> 
-     */
-    transient int type;
-
-    public AffineTransform(Factory<? extends Point> factory) {
-    	pointFactory = factory;
-        type = TYPE_IDENTITY;
-        m00 = m11 = 1.0f;
-        m10 = m01 = m02 = m12 = 0.0f;
-    }
-
-    public AffineTransform(AffineTransform t) {
-    	this.pointFactory = t.pointFactory;
-        this.type = t.type;
-        this.m00 = t.m00;
-        this.m10 = t.m10;
-        this.m01 = t.m01;
-        this.m11 = t.m11;
-        this.m02 = t.m02;
-        this.m12 = t.m12;
-    }
-
-    public AffineTransform(Point.Factory<? extends Point> factory, float m00, float m10, float m01, float m11, float m02, float m12) {
-    	pointFactory = factory;
-        this.type = TYPE_UNKNOWN;
-        this.m00 = m00;
-        this.m10 = m10;
-        this.m01 = m01;
-        this.m11 = m11;
-        this.m02 = m02;
-        this.m12 = m12;
-    }
-
-    public AffineTransform(Point.Factory<? extends Point> factory, float[] matrix) {
-    	pointFactory = factory;
-        this.type = TYPE_UNKNOWN;
-        m00 = matrix[0];
-        m10 = matrix[1];
-        m01 = matrix[2];
-        m11 = matrix[3];
-        if (matrix.length > 4) {
-            m02 = matrix[4];
-            m12 = matrix[5];
-        }
-    }
-
-    /*
-     * Method returns type of affine transformation.
-     * 
-     * Transform matrix is
-     *   m00 m01 m02
-     *   m10 m11 m12
-     * 
-     * According analytic geometry new basis vectors are (m00, m01) and (m10, m11), 
-     * translation vector is (m02, m12). Original basis vectors are (1, 0) and (0, 1). 
-     * Type transformations classification:  
-     *   TYPE_IDENTITY - new basis equals original one and zero translation
-     *   TYPE_TRANSLATION - translation vector isn't zero  
-     *   TYPE_UNIFORM_SCALE - vectors length of new basis equals
-     *   TYPE_GENERAL_SCALE - vectors length of new basis doesn't equal 
-     *   TYPE_FLIP - new basis vector orientation differ from original one
-     *   TYPE_QUADRANT_ROTATION - new basis is rotated by 90, 180, 270, or 360 degrees     
-     *   TYPE_GENERAL_ROTATION - new basis is rotated by arbitrary angle
-     *   TYPE_GENERAL_TRANSFORM - transformation can't be inversed
-     */
-    public int getType() {
-        if (type != TYPE_UNKNOWN) {
-            return type;
-        }
-
-        int type = 0;
-
-        if (m00 * m01 + m10 * m11 != 0.0) {
-            type |= TYPE_GENERAL_TRANSFORM;
-            return type;
-        }
-
-        if (m02 != 0.0 || m12 != 0.0) {
-            type |= TYPE_TRANSLATION;
-        } else
-            if (m00 == 1.0 && m11 == 1.0 && m01 == 0.0 && m10 == 0.0) {
-                type = TYPE_IDENTITY;
-                return type;
-            }
-
-        if (m00 * m11 - m01 * m10 < 0.0) {
-            type |= TYPE_FLIP;
-        }
-
-        float dx = m00 * m00 + m10 * m10;
-        float dy = m01 * m01 + m11 * m11;
-        if (dx != dy) {
-            type |= TYPE_GENERAL_SCALE;
-        } else
-            if (dx != 1.0) {
-                type |= TYPE_UNIFORM_SCALE;
-            }
-
-        if ((m00 == 0.0 && m11 == 0.0) ||
-            (m10 == 0.0 && m01 == 0.0 && (m00 < 0.0 || m11 < 0.0)))
-        {
-            type |= TYPE_QUADRANT_ROTATION;
-        } else
-            if (m01 != 0.0 || m10 != 0.0) {
-                type |= TYPE_GENERAL_ROTATION;
-            }
-
-        return type;
-    }
-
-    public float getScaleX() {
-        return m00;
-    }
-
-    public float getScaleY() {
-        return m11;
-    }
-
-    public float getShearX() {
-        return m01;
-    }
-
-    public float getShearY() {
-        return m10;
-    }
-
-    public float getTranslateX() {
-        return m02;
-    }
-
-    public float getTranslateY() {
-        return m12;
-    }
-
-    public boolean isIdentity() {
-        return getType() == TYPE_IDENTITY;
-    }
-
-    public void getMatrix(float[] matrix) {
-        matrix[0] = m00;
-        matrix[1] = m10;
-        matrix[2] = m01;
-        matrix[3] = m11;
-        if (matrix.length > 4) {
-            matrix[4] = m02;
-            matrix[5] = m12;
-        }
-    }
-
-    public float getDeterminant() {
-        return m00 * m11 - m01 * m10;
-    }
-
-    public void setTransform(float m00, float m10, float m01, float m11, float m02, float m12) {
-        this.type = TYPE_UNKNOWN;
-        this.m00 = m00;
-        this.m10 = m10;
-        this.m01 = m01;
-        this.m11 = m11;
-        this.m02 = m02;
-        this.m12 = m12;
-    }
-
-    public void setTransform(AffineTransform t) {
-        type = t.type;
-        setTransform(t.m00, t.m10, t.m01, t.m11, t.m02, t.m12);
-    }
-
-    public void setToIdentity() {
-        type = TYPE_IDENTITY;
-        m00 = m11 = 1.0f;
-        m10 = m01 = m02 = m12 = 0.0f;
-    }
-
-    public void setToTranslation(float mx, float my) {
-        m00 = m11 = 1.0f;
-        m01 = m10 = 0.0f;
-        m02 = mx;
-        m12 = my;
-        if (mx == 0.0f && my == 0.0f) {
-            type = TYPE_IDENTITY;
-        } else {
-            type = TYPE_TRANSLATION;
-        }
-    }
-
-    public void setToScale(float scx, float scy) {
-        m00 = scx;
-        m11 = scy;
-        m10 = m01 = m02 = m12 = 0.0f;
-        if (scx != 1.0f || scy != 1.0f) {
-            type = TYPE_UNKNOWN;
-        } else {
-            type = TYPE_IDENTITY;
-        }
-    }
-
-    public void setToShear(float shx, float shy) {
-        m00 = m11 = 1.0f;
-        m02 = m12 = 0.0f;
-        m01 = shx;
-        m10 = shy;
-        if (shx != 0.0f || shy != 0.0f) {
-            type = TYPE_UNKNOWN;
-        } else {
-            type = TYPE_IDENTITY;
-        }
-    }
-
-    public void setToRotation(float angle) {
-        float sin = MathFloat.sin(angle);
-        float cos = MathFloat.cos(angle);
-        if (MathFloat.abs(cos) < ZERO) {
-            cos = 0.0f;
-            sin = sin > 0.0f ? 1.0f : -1.0f;
-        } else
-            if (MathFloat.abs(sin) < ZERO) {
-                sin = 0.0f;
-                cos = cos > 0.0f ? 1.0f : -1.0f;
-            }
-        m00 = m11 = cos;
-        m01 = -sin;
-        m10 = sin;
-        m02 = m12 = 0.0f;
-        type = TYPE_UNKNOWN;
-    }
-
-    public void setToRotation(float angle, float px, float py) {
-        setToRotation(angle);
-        m02 = px * (1.0f - m00) + py * m10;
-        m12 = py * (1.0f - m00) - px * m10;
-        type = TYPE_UNKNOWN;
-    }
-
-    public static <T extends Point> AffineTransform getTranslateInstance(Point.Factory<? extends Point> factory, float mx, float my) {
-        AffineTransform t = new AffineTransform(factory);
-        t.setToTranslation(mx, my);
-        return t;
-    }
-
-    public static <T extends Point> AffineTransform getScaleInstance(Point.Factory<? extends Point> factory, float scx, float scY) {
-    	AffineTransform t = new AffineTransform(factory);
-        t.setToScale(scx, scY);
-        return t;
-    }
-
-    public static <T extends Point> AffineTransform getShearInstance(Point.Factory<? extends Point> factory, float shx, float shy) {
-    	AffineTransform t = new AffineTransform(factory);        
-        t.setToShear(shx, shy);
-        return t;
-    }
-
-    public static <T extends Point> AffineTransform getRotateInstance(Point.Factory<? extends Point> factory, float angle) {
-    	AffineTransform t = new AffineTransform(factory);
-        t.setToRotation(angle);
-        return t;
-    }
-
-    public static <T extends Point> AffineTransform getRotateInstance(Point.Factory<? extends Point> factory, float angle, float x, float y) {
-    	AffineTransform t = new AffineTransform(factory);
-        t.setToRotation(angle, x, y);
-        return t;
-    }
-
-    public void translate(float mx, float my) {
-        concatenate(AffineTransform.getTranslateInstance(pointFactory, mx, my));
-    }
-
-    public void scale(float scx, float scy) {
-        concatenate(AffineTransform.getScaleInstance(pointFactory, scx, scy));
-    }
-
-    public void shear(float shx, float shy) {
-        concatenate(AffineTransform.getShearInstance(pointFactory, shx, shy));
-    }
-
-    public void rotate(float angle) {
-        concatenate(AffineTransform.getRotateInstance(pointFactory, angle));
-    }
-
-    public void rotate(float angle, float px, float py) {
-        concatenate(AffineTransform.getRotateInstance(pointFactory, angle, px, py));
-    }
-
-    /** 
-     * Multiply matrix of two AffineTransform objects.
-     * The first argument's {@link Point.Factory} is being used.
-     * 
-     * @param t1 - the AffineTransform object is a multiplicand
-     * @param t2 - the AffineTransform object is a multiplier
-     * @return an AffineTransform object that is a result of t1 multiplied by matrix t2. 
-     */
-    AffineTransform multiply(AffineTransform t1, AffineTransform t2) {
-        return new AffineTransform(t1.pointFactory,
-                t1.m00 * t2.m00 + t1.m10 * t2.m01,          // m00
-                t1.m00 * t2.m10 + t1.m10 * t2.m11,          // m01
-                t1.m01 * t2.m00 + t1.m11 * t2.m01,          // m10
-                t1.m01 * t2.m10 + t1.m11 * t2.m11,          // m11
-                t1.m02 * t2.m00 + t1.m12 * t2.m01 + t2.m02, // m02
-                t1.m02 * t2.m10 + t1.m12 * t2.m11 + t2.m12);// m12
-    }
-
-    public void concatenate(AffineTransform t) {
-        setTransform(multiply(t, this));
-    }
-
-    public void preConcatenate(AffineTransform t) {
-        setTransform(multiply(this, t));
-    }
-
-    public AffineTransform createInverse() throws NoninvertibleTransformException {
-        float det = getDeterminant();
-        if (MathFloat.abs(det) < ZERO) {
-            throw new NoninvertibleTransformException(determinantIsZero);
-        }
-        return new AffineTransform(
-        		this.pointFactory,
-                 m11 / det, // m00
-                -m10 / det, // m10
-                -m01 / det, // m01
-                 m00 / det, // m11
-                (m01 * m12 - m11 * m02) / det, // m02
-                (m10 * m02 - m00 * m12) / det  // m12
-        );
-    }
-
-	public Point transform(Point src, Point dst) {
-        if (dst == null) {
-        	dst = pointFactory.create();
-        }
-
-        float x = src.getX();
-        float y = src.getY();
-
-        dst.setCoord(x * m00 + y * m01 + m02, x * m10 + y * m11 + m12);
-        return dst;
-    }
-
-    public void transform(Point[] src, int srcOff, Point[] dst, int dstOff, int length) {
-        while (--length >= 0) {
-        	Point srcPoint = src[srcOff++]; 
-            float x = srcPoint.getX();
-            float y = srcPoint.getY();
-            Point dstPoint = dst[dstOff];
-            if (dstPoint == null) {
-            	throw new IllegalArgumentException("dst["+dstOff+"] is null");
-            }
-            dstPoint.setCoord(x * m00 + y * m01 + m02, x * m10 + y * m11 + m12);
-            dst[dstOff++] = dstPoint;
-        }
-    }
-    
-    public void transform(float[] src, int srcOff, float[] dst, int dstOff, int length) {
-        int step = 2;
-        if (src == dst && srcOff < dstOff && dstOff < srcOff + length * 2) {
-            srcOff = srcOff + length * 2 - 2;
-            dstOff = dstOff + length * 2 - 2;
-            step = -2;
-        }
-        while (--length >= 0) {
-            float x = src[srcOff + 0];
-            float y = src[srcOff + 1];
-            dst[dstOff + 0] = x * m00 + y * m01 + m02;
-            dst[dstOff + 1] = x * m10 + y * m11 + m12;
-            srcOff += step;
-            dstOff += step;
-        }
-    }
-    
-	public Point deltaTransform(Point src, Point dst) {
-        if (dst == null) {
-        	dst = pointFactory.create();
-        }
-
-        float x = src.getX();
-        float y = src.getY();
-
-        dst.setCoord(x * m00 + y * m01, x * m10 + y * m11);
-        return dst;
-    }
-
-    public void deltaTransform(float[] src, int srcOff, float[] dst, int dstOff, int length) {
-        while (--length >= 0) {
-            float x = src[srcOff++];
-            float y = src[srcOff++];
-            dst[dstOff++] = x * m00 + y * m01;
-            dst[dstOff++] = x * m10 + y * m11;
-        }
-    }
-
-	public Point inverseTransform(Point src, Point dst) throws NoninvertibleTransformException {
-        float det = getDeterminant();
-        if (MathFloat.abs(det) < ZERO) {
-        	throw new NoninvertibleTransformException(determinantIsZero);
-        }
-        if (dst == null) {
-        	dst = pointFactory.create();
-        }
-
-        float x = src.getX() - m02;
-        float y = src.getY() - m12;
-
-        dst.setCoord((x * m11 - y * m01) / det, (y * m00 - x * m10) / det);
-        return dst;
-    }
-
-    public void inverseTransform(float[] src, int srcOff, float[] dst, int dstOff, int length)
-        throws NoninvertibleTransformException
-    {
-        float det = getDeterminant();
-        if (MathFloat.abs(det) < ZERO) {
-        	throw new NoninvertibleTransformException(determinantIsZero);        	
-        }
-
-        while (--length >= 0) {
-            float x = src[srcOff++] - m02;
-            float y = src[srcOff++] - m12;
-            dst[dstOff++] = (x * m11 - y * m01) / det;
-            dst[dstOff++] = (y * m00 - x * m10) / det;
-        }
-    }
-
-    public Path2D createTransformedShape(Path2D src) {
-        if (src == null) {
-            return null;
-        }
-        if (src instanceof Path2D) {
-            return ((Path2D)src).createTransformedShape(this);
-        }
-        PathIterator path = src.iterator(this);
-        Path2D dst = new Path2D(path.getWindingRule());
-        dst.append(path, false);
-        return dst;
-    }
-
-    @Override
-    public String toString() {
-        return
-            getClass().getName() +
-            "[[" + m00 + ", " + m01 + ", " + m02 + "], [" //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-                + m10 + ", " + m11 + ", " + m12 + "]]"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-    }
-
-    @Override
-    public Object clone() {
-        try {
-            return super.clone();
-        } catch (CloneNotSupportedException e) {
-            throw new InternalError();
-        }
-    }
-
-    @Override
-    public int hashCode() {
-        HashCode hash = new HashCode();
-        hash.append(m00);
-        hash.append(m01);
-        hash.append(m02);
-        hash.append(m10);
-        hash.append(m11);
-        hash.append(m12);
-        return hash.hashCode();
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (obj == this) {
-            return true;
-        }
-        if (obj instanceof AffineTransform) {
-            AffineTransform t = (AffineTransform)obj;
-            return
-                m00 == t.m00 && m01 == t.m01 &&
-                m02 == t.m02 && m10 == t.m10 &&
-                m11 == t.m11 && m12 == t.m12;
-        }
-        return false;
-    }
-
-    
-    /**
-     * Write AffineTrasform object to the output steam.
-     * @param stream - the output stream
-     * @throws IOException - if there are I/O errors while writing to the output strem
-     */
-    private void writeObject(java.io.ObjectOutputStream stream) throws IOException {
-        stream.defaultWriteObject();
-    }
-
-    
-    /**
-     * Read AffineTransform object from the input stream
-     * @param stream - the input steam
-     * @throws IOException - if there are I/O errors while reading from the input strem
-     * @throws ClassNotFoundException - if class could not be found 
-     */
-    private void readObject(java.io.ObjectInputStream stream) throws IOException, ClassNotFoundException {
-        stream.defaultReadObject();
-        type = TYPE_UNKNOWN;
-    }
-
-}
-
diff --git a/src/com/jogamp/graph/geom/plane/IllegalPathStateException.java b/src/com/jogamp/graph/geom/plane/IllegalPathStateException.java
deleted file mode 100644
index 15f629b88..000000000
--- a/src/com/jogamp/graph/geom/plane/IllegalPathStateException.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one or more
- *  contributor license agreements.  See the NOTICE file distributed with
- *  this work for additional information regarding copyright ownership.
- *  The ASF licenses this file to You under the Apache License, Version 2.0
- *  (the "License"); you may not use this file except in compliance with
- *  the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-/**
- * @author Denis M. Kishenko
- */
-package com.jogamp.graph.geom.plane;
-
-public class IllegalPathStateException extends RuntimeException {
-
-    private static final long serialVersionUID = -5158084205220481094L;
-
-    public IllegalPathStateException() {
-    }
-
-    public IllegalPathStateException(String s) {
-        super(s);
-    }
-
-}
-
diff --git a/src/com/jogamp/graph/geom/plane/NoninvertibleTransformException.java b/src/com/jogamp/graph/geom/plane/NoninvertibleTransformException.java
deleted file mode 100644
index cd1ec8d16..000000000
--- a/src/com/jogamp/graph/geom/plane/NoninvertibleTransformException.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one or more
- *  contributor license agreements.  See the NOTICE file distributed with
- *  this work for additional information regarding copyright ownership.
- *  The ASF licenses this file to You under the Apache License, Version 2.0
- *  (the "License"); you may not use this file except in compliance with
- *  the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-/**
- * @author Denis M. Kishenko
- */
-package com.jogamp.graph.geom.plane;
-
-public class NoninvertibleTransformException extends java.lang.Exception {
-
-    private static final long serialVersionUID = 6137225240503990466L;
-
-    public NoninvertibleTransformException(String s) {
-        super(s);
-    }
-
-}
-
diff --git a/src/com/jogamp/graph/geom/plane/Path2D.java b/src/com/jogamp/graph/geom/plane/Path2D.java
deleted file mode 100644
index 031450c8e..000000000
--- a/src/com/jogamp/graph/geom/plane/Path2D.java
+++ /dev/null
@@ -1,430 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one or more
- *  contributor license agreements.  See the NOTICE file distributed with
- *  this work for additional information regarding copyright ownership.
- *  The ASF licenses this file to You under the Apache License, Version 2.0
- *  (the "License"); you may not use this file except in compliance with
- *  the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-/**
- * @author Denis M. Kishenko
- */
-package com.jogamp.graph.geom.plane;
-
-import java.util.NoSuchElementException;
-
-import com.jogamp.graph.geom.AABBox;
-import com.jogamp.graph.geom.Point;
-import com.jogamp.graph.geom.opengl.Vertex;
-
-import jogamp.graph.math.plane.Crossing;
-
-public final class Path2D implements Cloneable {
-
-    public static final int WIND_EVEN_ODD = PathIterator.WIND_EVEN_ODD;
-    public static final int WIND_NON_ZERO = PathIterator.WIND_NON_ZERO;
-
-    static final String invalidWindingRuleValue = "Invalid winding rule value";
-    static final String iteratorOutOfBounds = "Iterator out of bounds";
-    
-    /**
-     * The buffers size
-     */
-    private static final int BUFFER_SIZE = 10;
-    
-    /**
-     * The buffers capacity
-     */
-    private static final int BUFFER_CAPACITY = 10;
-
-    /**
-     * The point's types buffer
-     */
-    byte[] types;
-    
-    /**
-     * The points buffer
-     */
-    float[] points;
-    
-    /**
-     * The point's type buffer size
-     */
-    int typeSize;
-    
-    /**
-     * The points buffer size
-     */
-    int pointSize;
-    
-    /**
-     * The path rule 
-     */
-    int rule;
-
-    /**
-     * The space amount in points buffer for different segmenet's types
-     */
-    static int pointShift[] = {
-            2,  // MOVETO
-            2,  // LINETO
-            4,  // QUADTO
-            6,  // CUBICTO
-            0}; // CLOSE
-
-    /*
-     * GeneralPath path iterator 
-     */
-    class Iterator implements PathIterator {
-
-        /**
-         * The current cursor position in types buffer
-         */
-        int typeIndex;
-        
-        /**
-         * The current cursor position in points buffer
-         */
-        int pointIndex;
-        
-        /**
-         * The source GeneralPath object
-         */
-        Path2D p;
-        
-        /**
-         * The path iterator transformation
-         */
-        AffineTransform t;
-
-        /**
-         * Constructs a new GeneralPath.Iterator for given general path
-         * @param path - the source GeneralPath object
-         */
-        Iterator(Path2D path) {
-            this(path, null);
-        }
-
-        /**
-         * Constructs a new GeneralPath.Iterator for given general path and transformation
-         * @param path - the source GeneralPath object
-         * @param at - the AffineTransform object to apply rectangle path
-         */
-        Iterator(Path2D path, AffineTransform at) {
-            this.p = path;
-            this.t = at;
-        }
-
-        public int getWindingRule() {
-            return p.getWindingRule();
-        }
-
-        public boolean isDone() {
-            return typeIndex >= p.typeSize;
-        }
-
-        public void next() {
-            typeIndex++;
-        }
-
-        public int currentSegment(float[] coords) {
-            if (isDone()) {
-                throw new NoSuchElementException(iteratorOutOfBounds);
-            }
-            int type = p.types[typeIndex];
-            int count = Path2D.pointShift[type];
-            System.arraycopy(p.points, pointIndex, coords, 0, count);
-            if (t != null) {
-                t.transform(coords, 0, coords, 0, count / 2);
-            }
-            pointIndex += count;
-            return type;
-        }
-
-    }
-
-    public Path2D() {
-        this(WIND_NON_ZERO, BUFFER_SIZE);
-    }
-
-    public Path2D(int rule) {
-        this(rule, BUFFER_SIZE);
-    }
-
-    public Path2D(int rule, int initialCapacity) {
-        setWindingRule(rule);
-        types = new byte[initialCapacity];
-        points = new float[initialCapacity * 2];
-    }
-
-    public Path2D(Path2D path) {
-        this(WIND_NON_ZERO, BUFFER_SIZE);
-        PathIterator p = path.iterator(null);
-        setWindingRule(p.getWindingRule());
-        append(p, false);
-    }
-
-    public void setWindingRule(int rule) {
-        if (rule != WIND_EVEN_ODD && rule != WIND_NON_ZERO) {
-            throw new NoSuchElementException(invalidWindingRuleValue);
-        }
-        this.rule = rule;
-    }
-
-    public int getWindingRule() {
-        return rule;
-    }
-
-    /**
-     * Checks points and types buffer size to add pointCount points. If necessary realloc buffers to enlarge size.   
-     * @param pointCount - the point count to be added in buffer
-     */
-    void checkBuf(int pointCount, boolean checkMove) {
-        if (checkMove && typeSize == 0) {
-            throw new IllegalPathStateException("First segment should be SEG_MOVETO type");
-        }
-        if (typeSize == types.length) {
-            byte tmp[] = new byte[typeSize + BUFFER_CAPACITY];
-            System.arraycopy(types, 0, tmp, 0, typeSize);
-            types = tmp;
-        }
-        if (pointSize + pointCount > points.length) {
-            float tmp[] = new float[pointSize + Math.max(BUFFER_CAPACITY * 2, pointCount)];
-            System.arraycopy(points, 0, tmp, 0, pointSize);
-            points = tmp;
-        }
-    }
-
-    public void moveTo(float x, float y) {
-        if (typeSize > 0 && types[typeSize - 1] == PathIterator.SEG_MOVETO) {
-            points[pointSize - 2] = x;
-            points[pointSize - 1] = y;
-        } else {
-            checkBuf(2, false);
-            types[typeSize++] = PathIterator.SEG_MOVETO;
-            points[pointSize++] = x;
-            points[pointSize++] = y;
-        }
-    }
-
-    public void lineTo(float x, float y) {
-        checkBuf(2, true);
-        types[typeSize++] = PathIterator.SEG_LINETO;
-        points[pointSize++] = x;
-        points[pointSize++] = y;
-    }
-
-    public void quadTo(float x1, float y1, float x2, float y2) {
-        checkBuf(4, true);
-        types[typeSize++] = PathIterator.SEG_QUADTO;
-        points[pointSize++] = x1;
-        points[pointSize++] = y1;
-        points[pointSize++] = x2;
-        points[pointSize++] = y2;
-    }
-
-    public void curveTo(float x1, float y1, float x2, float y2, float x3, float y3) {
-        checkBuf(6, true);
-        types[typeSize++] = PathIterator.SEG_CUBICTO;
-        points[pointSize++] = x1;
-        points[pointSize++] = y1;
-        points[pointSize++] = x2;
-        points[pointSize++] = y2;
-        points[pointSize++] = x3;
-        points[pointSize++] = y3;
-    }
-
-    final public int size() {
-    	return typeSize;
-    }
-    
-    final public boolean isClosed() {
-    	return typeSize > 0 && types[typeSize - 1] == PathIterator.SEG_CLOSE ;
-    }
-    
-    public void closePath() {
-        if (!isClosed()) {
-            checkBuf(0, true);
-            types[typeSize++] = PathIterator.SEG_CLOSE;
-        }
-    }
-    
-    public String toString() {
-    	return "[size "+size()+", closed "+isClosed()+"]";
-    }
-
-    public void append(Path2D path, boolean connect) {
-        PathIterator p = path.iterator(null);
-        append(p, connect);
-    }
-
-    public void append(PathIterator path, boolean connect) {
-        while (!path.isDone()) {
-            float coords[] = new float[6];
-            switch (path.currentSegment(coords)) {
-            case PathIterator.SEG_MOVETO:
-                if (!connect || typeSize == 0) {
-                    moveTo(coords[0], coords[1]);
-                    break;
-                }
-                if (types[typeSize - 1] != PathIterator.SEG_CLOSE &&
-                    points[pointSize - 2] == coords[0] &&
-                    points[pointSize - 1] == coords[1])
-                {
-                    break;
-                }
-            // NO BREAK;
-            case PathIterator.SEG_LINETO:
-                lineTo(coords[0], coords[1]);
-                break;
-            case PathIterator.SEG_QUADTO:
-                quadTo(coords[0], coords[1], coords[2], coords[3]);
-                break;
-            case PathIterator.SEG_CUBICTO:
-                curveTo(coords[0], coords[1], coords[2], coords[3], coords[4], coords[5]);
-                break;
-            case PathIterator.SEG_CLOSE:
-                closePath();
-                break;
-            }
-            path.next();
-            connect = false;
-        }
-    }
-
-    public Vertex getCurrentPoint() {
-        if (typeSize == 0) {
-            return null;
-        }
-        int j = pointSize - 2;
-        if (types[typeSize - 1] == PathIterator.SEG_CLOSE) {
-
-            for (int i = typeSize - 2; i > 0; i--) {
-                int type = types[i];
-                if (type == PathIterator.SEG_MOVETO) {
-                    break;
-                }
-                j -= pointShift[type];
-            }
-        }
-        return new Vertex(points[j], points[j + 1]);
-    }
-
-    public void reset() {
-        typeSize = 0;
-        pointSize = 0;
-    }
-
-    public void transform(AffineTransform t) {
-        t.transform(points, 0, points, 0, pointSize / 2);
-    }
-
-    public Path2D createTransformedShape(AffineTransform t) {
-        Path2D p = (Path2D)clone();
-        if (t != null) {
-            p.transform(t);
-        }
-        return p;
-    }
-
-    public final synchronized AABBox getBounds2D() {
-        float rx1, ry1, rx2, ry2;
-        if (pointSize == 0) {
-            rx1 = ry1 = rx2 = ry2 = 0.0f;
-        } else {
-            int i = pointSize - 1;
-            ry1 = ry2 = points[i--];
-            rx1 = rx2 = points[i--];
-            while (i > 0) {
-                float y = points[i--];
-                float x = points[i--];
-                if (x < rx1) {
-                    rx1 = x;
-                } else
-                    if (x > rx2) {
-                        rx2 = x;
-                    }
-                if (y < ry1) {
-                    ry1 = y;
-                } else
-                    if (y > ry2) {
-                        ry2 = y;
-                    }
-            }
-        }
-        // FIXME: Rami's code had this in, but AABBox uses upper left - lower right - right ? 
-        // return new AABBox(rx1, ry1, 0f, rx2 - rx1, ry2 - ry1, 0f);
-        return new AABBox(rx1, ry1, 0f, rx2, ry2, 0f);
-    }
-
-    /**
-     * Checks cross count according to path rule to define is it point inside shape or not. 
-     * @param cross - the point cross count
-     * @return true if point is inside path, or false otherwise 
-     */
-    boolean isInside(int cross) {
-        if (rule == WIND_NON_ZERO) {
-            return Crossing.isInsideNonZero(cross);
-        }
-        return Crossing.isInsideEvenOdd(cross);
-    }
-
-    public boolean contains(float px, float py) {
-        return isInside(Crossing.crossShape(this, px, py));
-    }
-
-    public boolean contains(float rx, float ry, float rw, float rh) {
-        int cross = Crossing.intersectShape(this, rx, ry, rw, rh);
-        return cross != Crossing.CROSSING && isInside(cross);
-    }
-
-    public boolean intersects(float rx, float ry, float rw, float rh) {
-        int cross = Crossing.intersectShape(this, rx, ry, rw, rh);
-        return cross == Crossing.CROSSING || isInside(cross);
-    }
-
-    public boolean contains(Point p) {
-        return contains(p.getX(), p.getY());
-    }
-
-    public boolean contains(AABBox r) {
-        return contains(r.getX(), r.getY(), r.getWidth(), r.getHeight());
-    }
-
-    public boolean intersects(AABBox r) {
-        return intersects(r.getX(), r.getY(), r.getWidth(), r.getHeight());
-    }
-
-    public PathIterator iterator() {
-        return new Iterator(this);        
-    }
-       
-    public PathIterator iterator(AffineTransform t) {
-        return new Iterator(this, t);
-    }
-
-    /* public PathIterator getPathIterator(AffineTransform t, float flatness) {
-        return new FlatteningPathIterator(getPathIterator(t), flatness);
-    } */
-
-    @Override
-    public Object clone() {
-        try {
-            Path2D p = (Path2D) super.clone();
-            p.types = types.clone();
-            p.points = points.clone();
-            return p;
-        } catch (CloneNotSupportedException e) {
-            throw new InternalError();
-        }
-    }
-}
-
diff --git a/src/com/jogamp/graph/geom/plane/PathIterator.java b/src/com/jogamp/graph/geom/plane/PathIterator.java
deleted file mode 100644
index b4681df0a..000000000
--- a/src/com/jogamp/graph/geom/plane/PathIterator.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one or more
- *  contributor license agreements.  See the NOTICE file distributed with
- *  this work for additional information regarding copyright ownership.
- *  The ASF licenses this file to You under the Apache License, Version 2.0
- *  (the "License"); you may not use this file except in compliance with
- *  the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-/**
- * @author Denis M. Kishenko
- */
-package com.jogamp.graph.geom.plane;
-
-public interface PathIterator {
-
-    public static final int WIND_EVEN_ODD = 0;
-    public static final int WIND_NON_ZERO = 1;
-
-    public static final int SEG_MOVETO  = 0;
-    public static final int SEG_LINETO  = 1;
-    public static final int SEG_QUADTO  = 2;
-    public static final int SEG_CUBICTO = 3;
-    public static final int SEG_CLOSE   = 4;
-
-    public int getWindingRule();
-
-    public boolean isDone();
-
-    public void next();
-
-    public int currentSegment(float[] coords);
-
-}
-