GraphUI Shape: Provide empty default implementation for clearImpl() and destroyImpl()

10 files changed, 4 insertions, 74 deletions

diff --git a/src/demos/com/jogamp/opengl/demos/graph/ui/testshapes/Glyph01UbuntuLight_o.java b/src/demos/com/jogamp/opengl/demos/graph/ui/testshapes/Glyph01UbuntuLight_o.java
index d9db96332..2725ab58e 100644
--- a/src/demos/com/jogamp/opengl/demos/graph/ui/testshapes/Glyph01UbuntuLight_o.java
+++ b/src/demos/com/jogamp/opengl/demos/graph/ui/testshapes/Glyph01UbuntuLight_o.java
@@ -46,14 +46,6 @@ public class Glyph01UbuntuLight_o extends Shape {
         super(factory, renderModes);
     }
 
-    @Override
-    protected void clearImpl(final GL2ES2 gl, final RegionRenderer renderer) {
-    }
-
-    @Override
-    protected void destroyImpl(final GL2ES2 gl, final RegionRenderer renderer) {
-    }
-
     @SuppressWarnings("unused")
     @Override
     protected void addShapeToRegion() {
diff --git a/src/demos/com/jogamp/opengl/demos/graph/ui/testshapes/Glyph02UbuntuLight_ae.java b/src/demos/com/jogamp/opengl/demos/graph/ui/testshapes/Glyph02UbuntuLight_ae.java
index 6113756a7..90bdcdcef 100644
--- a/src/demos/com/jogamp/opengl/demos/graph/ui/testshapes/Glyph02UbuntuLight_ae.java
+++ b/src/demos/com/jogamp/opengl/demos/graph/ui/testshapes/Glyph02UbuntuLight_ae.java
@@ -45,14 +45,6 @@ public class Glyph02UbuntuLight_ae extends Shape {
         super(factory, renderModes);
     }
 
-    @Override
-    protected void clearImpl(final GL2ES2 gl, final RegionRenderer renderer) {
-    }
-
-    @Override
-    protected void destroyImpl(final GL2ES2 gl, final RegionRenderer renderer) {
-    }
-
     @SuppressWarnings("unused")
     @Override
     protected void addShapeToRegion() {
diff --git a/src/demos/com/jogamp/opengl/demos/graph/ui/testshapes/Glyph03FreeMonoRegular_M.java b/src/demos/com/jogamp/opengl/demos/graph/ui/testshapes/Glyph03FreeMonoRegular_M.java
index a4e342ff5..7c53791a7 100644
--- a/src/demos/com/jogamp/opengl/demos/graph/ui/testshapes/Glyph03FreeMonoRegular_M.java
+++ b/src/demos/com/jogamp/opengl/demos/graph/ui/testshapes/Glyph03FreeMonoRegular_M.java
@@ -45,14 +45,6 @@ public class Glyph03FreeMonoRegular_M extends Shape {
         super(factory, renderModes);
     }
 
-    @Override
-    protected void clearImpl(final GL2ES2 gl, final RegionRenderer renderer) {
-    }
-
-    @Override
-    protected void destroyImpl(final GL2ES2 gl, final RegionRenderer renderer) {
-    }
-
     @SuppressWarnings("unused")
     @Override
     protected void addShapeToRegion() {
diff --git a/src/demos/com/jogamp/opengl/demos/graph/ui/testshapes/Glyph04FreeSans_0.java b/src/demos/com/jogamp/opengl/demos/graph/ui/testshapes/Glyph04FreeSans_0.java
index 05624e7bd..24474497c 100644
--- a/src/demos/com/jogamp/opengl/demos/graph/ui/testshapes/Glyph04FreeSans_0.java
+++ b/src/demos/com/jogamp/opengl/demos/graph/ui/testshapes/Glyph04FreeSans_0.java
@@ -46,14 +46,6 @@ public class Glyph04FreeSans_0 extends Shape {
     }
 
     @Override
-    protected void clearImpl(final GL2ES2 gl, final RegionRenderer renderer) {
-    }
-
-    @Override
-    protected void destroyImpl(final GL2ES2 gl, final RegionRenderer renderer) {
-    }
-
-    @Override
     protected void addShapeToRegion() {
         final OutlineShape shape = new OutlineShape(vertexFactory);
 
diff --git a/src/demos/com/jogamp/opengl/demos/graph/ui/testshapes/Glyph05FreeSerifBoldItalic_ae.java b/src/demos/com/jogamp/opengl/demos/graph/ui/testshapes/Glyph05FreeSerifBoldItalic_ae.java
index 8a3594d58..26c519767 100644
--- a/src/demos/com/jogamp/opengl/demos/graph/ui/testshapes/Glyph05FreeSerifBoldItalic_ae.java
+++ b/src/demos/com/jogamp/opengl/demos/graph/ui/testshapes/Glyph05FreeSerifBoldItalic_ae.java
@@ -46,14 +46,6 @@ public class Glyph05FreeSerifBoldItalic_ae extends Shape {
     }
 
     @Override
-    protected void clearImpl(final GL2ES2 gl, final RegionRenderer renderer) {
-    }
-
-    @Override
-    protected void destroyImpl(final GL2ES2 gl, final RegionRenderer renderer) {
-    }
-
-    @Override
     protected void addShapeToRegion() {
         final OutlineShape shape = new OutlineShape(vertexFactory);
 
diff --git a/src/graphui/classes/com/jogamp/graph/ui/gl/Shape.java b/src/graphui/classes/com/jogamp/graph/ui/gl/Shape.java
index 9f39564ea..7928d09f4 100644
--- a/src/graphui/classes/com/jogamp/graph/ui/gl/Shape.java
+++ b/src/graphui/classes/com/jogamp/graph/ui/gl/Shape.java
@@ -1137,8 +1137,10 @@ public abstract class Shape {
     //
     //
 
-    protected abstract void clearImpl(GL2ES2 gl, RegionRenderer renderer);
-    protected abstract void destroyImpl(GL2ES2 gl, RegionRenderer renderer);
+    protected void clearImpl(final GL2ES2 gl, final RegionRenderer renderer) { }
+
+    protected void destroyImpl(final GL2ES2 gl, final RegionRenderer renderer) { }
+
     protected abstract void addShapeToRegion();
 
     //
diff --git a/src/graphui/classes/com/jogamp/graph/ui/gl/shapes/CrossHair.java b/src/graphui/classes/com/jogamp/graph/ui/gl/shapes/CrossHair.java
index 62c76d2b2..1d2df261e 100644
--- a/src/graphui/classes/com/jogamp/graph/ui/gl/shapes/CrossHair.java
+++ b/src/graphui/classes/com/jogamp/graph/ui/gl/shapes/CrossHair.java
@@ -62,14 +62,6 @@ public class CrossHair extends Shape {
     }
 
     @Override
-    protected void clearImpl(final GL2ES2 gl, final RegionRenderer renderer) {
-    }
-
-    @Override
-    protected void destroyImpl(final GL2ES2 gl, final RegionRenderer renderer) {
-    }
-
-    @Override
     protected void addShapeToRegion() {
         final OutlineShape shape = new OutlineShape(vertexFactory);
 
diff --git a/src/graphui/classes/com/jogamp/graph/ui/gl/shapes/Label.java b/src/graphui/classes/com/jogamp/graph/ui/gl/shapes/Label.java
index 534f9b292..5e1f88df9 100644
--- a/src/graphui/classes/com/jogamp/graph/ui/gl/shapes/Label.java
+++ b/src/graphui/classes/com/jogamp/graph/ui/gl/shapes/Label.java
@@ -132,14 +132,6 @@ public class Label extends Shape {
         return GLRegion.create(glp, getRenderModes(), null, font, text);
     }
 
-    @Override
-    protected void clearImpl(final GL2ES2 gl, final RegionRenderer renderer) {
-    }
-
-    @Override
-    protected void destroyImpl(final GL2ES2 gl, final RegionRenderer renderer) {
-    }
-
     private final OutlineShape.Visitor shapeVisitor = new OutlineShape.Visitor() {
         @Override
         public void visit(final OutlineShape shape, final AffineTransform t) {
diff --git a/src/graphui/classes/com/jogamp/graph/ui/gl/shapes/Rectangle.java b/src/graphui/classes/com/jogamp/graph/ui/gl/shapes/Rectangle.java
index 2c9ec53a0..391390bea 100644
--- a/src/graphui/classes/com/jogamp/graph/ui/gl/shapes/Rectangle.java
+++ b/src/graphui/classes/com/jogamp/graph/ui/gl/shapes/Rectangle.java
@@ -62,14 +62,6 @@ public class Rectangle extends Shape {
     }
 
     @Override
-    protected void clearImpl(final GL2ES2 gl, final RegionRenderer renderer) {
-    }
-
-    @Override
-    protected void destroyImpl(final GL2ES2 gl, final RegionRenderer renderer) {
-    }
-
-    @Override
     protected void addShapeToRegion() {
         final OutlineShape shape = new OutlineShape(vertexFactory);
 
diff --git a/src/graphui/classes/com/jogamp/graph/ui/gl/shapes/RoundButton.java b/src/graphui/classes/com/jogamp/graph/ui/gl/shapes/RoundButton.java
index e8636f41e..aa8aabbdb 100644
--- a/src/graphui/classes/com/jogamp/graph/ui/gl/shapes/RoundButton.java
+++ b/src/graphui/classes/com/jogamp/graph/ui/gl/shapes/RoundButton.java
@@ -58,14 +58,6 @@ public abstract class RoundButton extends Shape {
         this.height = height;
     }
 
-    @Override
-    protected void clearImpl(final GL2ES2 gl, final RegionRenderer renderer) {
-    }
-
-    @Override
-    protected void destroyImpl(final GL2ES2 gl, final RegionRenderer renderer) {
-    }
-
     public final float getWidth() { return width; }
 
     public final float getHeight() { return height; }