Graph: more clone() cleanup.

- throw InternalError() for CloneNotSupportedException case, which never happens
- AffineTransform clone() uses covariant return type as well, ie AffineTransform

3 files changed, 4 insertions, 4 deletions

diff --git a/src/jogl/classes/com/jogamp/graph/curve/OutlineShape.java b/src/jogl/classes/com/jogamp/graph/curve/OutlineShape.java
index fa8494d4e..9a5d86fc2 100755
--- a/src/jogl/classes/com/jogamp/graph/curve/OutlineShape.java
+++ b/src/jogl/classes/com/jogamp/graph/curve/OutlineShape.java
@@ -459,7 +459,7 @@ public class OutlineShape implements Comparable<OutlineShape> {
         OutlineShape o;

         try {

             o = (OutlineShape) super.clone();

-        } catch (CloneNotSupportedException e) { return null; /* never, ever */ }

+        } catch (CloneNotSupportedException e) { throw new InternalError(); }

         o.bbox = bbox.clone();

         o.outlines = new ArrayList<Outline>(outlines.size());

         for(int i=0; i<outlines.size(); i++) {

diff --git a/src/jogl/classes/com/jogamp/graph/geom/Outline.java b/src/jogl/classes/com/jogamp/graph/geom/Outline.java
index e0c29cb84..b0ad86fda 100644
--- a/src/jogl/classes/com/jogamp/graph/geom/Outline.java
+++ b/src/jogl/classes/com/jogamp/graph/geom/Outline.java
@@ -228,7 +228,7 @@ public class Outline implements Cloneable, Comparable<Outline> {
         Outline o;
         try {
             o = (Outline) super.clone();
-        } catch (CloneNotSupportedException e) { return null; /* never, ever */ }
+        } catch (CloneNotSupportedException e) { throw new InternalError(); }
         o.bbox = bbox.clone();
         o.vertices = new ArrayList<Vertex>(vertices.size());
         for(int i=0; i<vertices.size(); i++) {
diff --git a/src/jogl/classes/jogamp/graph/geom/plane/AffineTransform.java b/src/jogl/classes/jogamp/graph/geom/plane/AffineTransform.java
index b7c7c19e2..fc086ebe4 100644
--- a/src/jogl/classes/jogamp/graph/geom/plane/AffineTransform.java
+++ b/src/jogl/classes/jogamp/graph/geom/plane/AffineTransform.java
@@ -519,9 +519,9 @@ public class AffineTransform implements Cloneable, Serializable {
     }
 
     @Override
-    public Object clone() {
+    public AffineTransform clone() {
         try {
-            return super.clone();
+            return (AffineTransform) super.clone();
         } catch (CloneNotSupportedException e) {
             throw new InternalError();
         }