4 files changed, 10 insertions, 71 deletions
diff --git a/src/com/jogamp/graph/geom/AABBox.java b/src/com/jogamp/graph/geom/AABBox.java
index 2e99daa83..a2566b91f 100644
--- a/src/com/jogamp/graph/geom/AABBox.java
+++ b/src/com/jogamp/graph/geom/AABBox.java
@@ -27,7 +27,7 @@
  */
 package com.jogamp.graph.geom;
 
-import jogamp.graph.math.VectorFloatUtil;
+import com.jogamp.graph.math.VectorUtil;
 
 /**
  * Axis Aligned Bounding Box.
@@ -186,7 +186,7 @@ public class AABBox {
 
 	
 	public float getSize(){
-		return VectorFloatUtil.computeLength(low, high);
+		return VectorUtil.computeLength(low, high);
 	}
 
 	public float[] getCenter() {
@@ -211,17 +211,17 @@ public class AABBox {
 		diffH[1] = high[1] - center[1];
 		diffH[2] = high[2] - center[2];
 		
-		diffH = VectorFloatUtil.scale(diffH, size);
+		diffH = VectorUtil.scale(diffH, size);
 		
 		float[] diffL = new float[3];
 		diffL[0] = low[0] - center[0];
 		diffL[1] = low[1] - center[1];
 		diffL[2] = low[2] - center[2];
 		
-		diffL = VectorFloatUtil.scale(diffL, size);
+		diffL = VectorUtil.scale(diffL, size);
 		
-		high = VectorFloatUtil.vectorAdd(center, diffH);
-		low = VectorFloatUtil.vectorAdd(center, diffL);
+		high = VectorUtil.vectorAdd(center, diffH);
+		low = VectorUtil.vectorAdd(center, diffL);
 	}
 
 	public float getX() {
diff --git a/src/com/jogamp/graph/geom/Line.java b/src/com/jogamp/graph/geom/Line.java
deleted file mode 100644
index 92d1b007f..000000000
--- a/src/com/jogamp/graph/geom/Line.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/**
- * Copyright 2010 JogAmp Community. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification, are
- * permitted provided that the following conditions are met:
- *
- *    1. Redistributions of source code must retain the above copyright notice, this list of
- *       conditions and the following disclaimer.
- *
- *    2. Redistributions in binary form must reproduce the above copyright notice, this list
- *       of conditions and the following disclaimer in the documentation and/or other materials
- *       provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY JogAmp Community ``AS IS'' AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JogAmp Community OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * The views and conclusions contained in the software and documentation are those of the
- * authors and should not be interpreted as representing official policies, either expressed
- * or implied, of JogAmp Community.
- */
-package com.jogamp.graph.geom;
-
-public class Line <T extends Vertex> {
-	private T v1;
-	private T v2;
-	
-	public Line(T v1, T v2) {
-		this.v1 = v1;
-		this.v2 = v2;
-	}
-
-	public T getV1() {
-		return v1;
-	}
-
-	public void setV1(T v1) {
-		this.v1 = v1;
-	}
-
-	public T getV2() {
-		return v2;
-	}
-
-	public void setV2(T v2) {
-		this.v2 = v2;
-	}
-	public boolean isEqual(T t1, T t2){
-		if((t1 == v1 || t1 == v2) 
-				&&(t2 == v2 || t2 == v1)){
-			return true;
-		}
-		return false;
-	}
-}
diff --git a/src/com/jogamp/graph/geom/Outline.java b/src/com/jogamp/graph/geom/Outline.java
index d9bde4177..4e588623e 100644
--- a/src/com/jogamp/graph/geom/Outline.java
+++ b/src/com/jogamp/graph/geom/Outline.java
@@ -30,8 +30,8 @@ package com.jogamp.graph.geom;
 import java.util.ArrayList;
 
 import com.jogamp.graph.geom.Vertex;
+import com.jogamp.graph.math.VectorUtil;
 
-import jogamp.graph.math.VectorFloatUtil;
 
 
 /** Define a single continuous stroke by control vertices.
@@ -124,7 +124,7 @@ public class Outline<T extends Vertex> implements Comparable<Outline<T>>{
 		if(closed){
 			T first = vertices.get(0);
 			T last = getLastVertex();
-			if(!VectorFloatUtil.checkEquality(first.getCoord(), last.getCoord())){
+			if(!VectorUtil.checkEquality(first.getCoord(), last.getCoord())){
 				@SuppressWarnings("unchecked")
 				T v = (T) first.clone();
 				vertices.add(v);
diff --git a/src/com/jogamp/graph/geom/opengl/SVertex.java b/src/com/jogamp/graph/geom/opengl/SVertex.java
index 86b95854d..076ac7456 100644
--- a/src/com/jogamp/graph/geom/opengl/SVertex.java
+++ b/src/com/jogamp/graph/geom/opengl/SVertex.java
@@ -27,9 +27,9 @@
  */
 package com.jogamp.graph.geom.opengl;
 
-import jogamp.graph.math.VectorFloatUtil;
 
 import com.jogamp.graph.geom.Vertex;
+import com.jogamp.graph.math.VectorUtil;
 
 public class SVertex implements Vertex {
 	private int id = Integer.MAX_VALUE;
@@ -151,7 +151,7 @@ public class SVertex implements Vertex {
 	}
 	
 	public int compareTo(Vertex p) {
-		if(VectorFloatUtil.checkEquality(coord, p.getCoord())) {
+		if(VectorUtil.checkEquality(coord, p.getCoord())) {
 			return 0;
 		}
 		return -1;