Remove deprecated methods.

- Quaternion.isEmpty()
- Texture.dispose(GL)
- GLContext.getGLVersionMajor() / ..Minor()
- GLContextImpl.bindPbufferToTexture() / releasePbufferFromTexture()
- MouseEvent.getWheelRotation()
-

8 files changed, 15 insertions, 74 deletions

diff --git a/src/jogl/classes/com/jogamp/opengl/math/Quaternion.java b/src/jogl/classes/com/jogamp/opengl/math/Quaternion.java
index f1a3f8be2..c6bf44f6d 100644
--- a/src/jogl/classes/com/jogamp/opengl/math/Quaternion.java
+++ b/src/jogl/classes/com/jogamp/opengl/math/Quaternion.java
@@ -330,20 +330,8 @@ public class Quaternion {
     }
 
     /**
-     * Check if this quaternion is empty, ie (0,0,0,1)
-     * 
-     * @return true if empty, false otherwise
-     * @deprecated use {@link #isIdentity()} instead
-     */
-    @Deprecated
-    public boolean isEmpty() {
-        if (w == 1 && x == 0 && y == 0 && z == 0)
-            return true;
-        return false;
-    }
-
-    /**
-     * Check if this quaternion represents an identity matrix, for rotation.
+     * Check if this quaternion represents an identity matrix for rotation,
+     * , ie (0,0,0,1).
      * 
      * @return true if it is an identity rep., false otherwise
      */
diff --git a/src/jogl/classes/com/jogamp/opengl/util/texture/Texture.java b/src/jogl/classes/com/jogamp/opengl/util/texture/Texture.java
index d6a8090fb..c52999224 100644
--- a/src/jogl/classes/com/jogamp/opengl/util/texture/Texture.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/texture/Texture.java
@@ -290,12 +290,6 @@ public class Texture {
     }
     
     /**
-     * @deprecated use {@link #destroy(GL)}
-     */
-    public final void dispose(GL gl) throws GLException {
-        destroy(gl);
-    }
-    /**
      * Destroys the native resources used by this texture object.
      *
      * @throws GLException if any OpenGL-related errors occurred
diff --git a/src/jogl/classes/javax/media/opengl/GLContext.java b/src/jogl/classes/javax/media/opengl/GLContext.java
index 84d371ac6..684d0de65 100644
--- a/src/jogl/classes/javax/media/opengl/GLContext.java
+++ b/src/jogl/classes/javax/media/opengl/GLContext.java
@@ -671,10 +671,6 @@ public abstract class GLContext {
     return ctxVersionString;
   }
 
-  /** @deprecated Use {@link #getGLVersionNumber()} */
-  public final int getGLVersionMajor() { return ctxVersion.getMajor(); }
-  /** @deprecated Use {@link #getGLVersionNumber()} */
-  public final int getGLVersionMinor() { return ctxVersion.getMinor(); }
   /**
    * Returns this context OpenGL version. 
    * @see #getGLSLVersionNumber() 
diff --git a/src/jogl/classes/jogamp/opengl/GLContextImpl.java b/src/jogl/classes/jogamp/opengl/GLContextImpl.java
index 8671b045d..f896c95ee 100644
--- a/src/jogl/classes/jogamp/opengl/GLContextImpl.java
+++ b/src/jogl/classes/jogamp/opengl/GLContextImpl.java
@@ -1098,22 +1098,6 @@ public abstract class GLContextImpl extends GLContext {
    */
   public abstract ProcAddressTable getPlatformExtProcAddressTable();
 
-  /**
-   * Pbuffer support; given that this is a GLContext associated with a
-   * pbuffer, binds this pbuffer to its texture target.
-   * @throws GLException if not implemented (default)
-   * @deprecated use FBO/GLOffscreenAutoDrawable instead of pbuffer
-   */
-  public void bindPbufferToTexture() { throw new GLException("not implemented"); }
-
-  /**
-   * Pbuffer support; given that this is a GLContext associated with a
-   * pbuffer, releases this pbuffer from its texture target.
-   * @throws GLException if not implemented (default)
-   * @deprecated use FBO/GLOffscreenAutoDrawable instead of pbuffer
-   */
-  public void releasePbufferFromTexture() { throw new GLException("not implemented"); }
-
   public abstract ByteBuffer glAllocateMemoryNV(int arg0, float arg1, float arg2, float arg3);
 
   /** Maps the given "platform-independent" function name to a real function
@@ -1515,8 +1499,8 @@ public abstract class GLContextImpl extends GLContext {
     int i = 0;
     
     final String MesaSP = "Mesa ";
-    final String MesaRendererAMDsp = " AMD "; 
-    final String MesaRendererIntelsp = "Intel(R)"; 
+    // final String MesaRendererAMDsp = " AMD "; 
+    // final String MesaRendererIntelsp = "Intel(R)"; 
     final boolean hwAccel = 0 == ( ctp & GLContext.CTX_IMPL_ACCEL_SOFT );
     final boolean compatCtx = 0 != ( ctp & GLContext.CTX_PROFILE_COMPAT );
     final boolean isDriverMesa = glRenderer.contains(MesaSP) || glRenderer.contains("Gallium ");
diff --git a/src/newt/classes/com/jogamp/newt/event/MouseEvent.java b/src/newt/classes/com/jogamp/newt/event/MouseEvent.java
index 18c8285f7..93bbcc0b9 100644
--- a/src/newt/classes/com/jogamp/newt/event/MouseEvent.java
+++ b/src/newt/classes/com/jogamp/newt/event/MouseEvent.java
@@ -252,33 +252,6 @@ public class MouseEvent extends InputEvent
     }
     
     /**
-     * <i>Usually</i> a wheel rotation of <b>&gt; 0.0f is up</b>,
-     * and <b>&lt; 0.0f is down</b>.
-     * <p>
-     * Usually a wheel rotations is considered a vertical scroll.<br/>
-     * If {@link #isShiftDown()}, a wheel rotations is
-     * considered a horizontal scroll, where <b>shift-up = left = &gt; 0.0f</b>,
-     * and <b>shift-down = right = &lt; 0.0f</b>.   
-     * </p>
-     * <p>
-     * <i>However</i>, on some OS this might be flipped due to the OS <i>default</i> behavior.
-     * The latter is true for OS X 10.7 (Lion) for example.
-     * </p>
-     * <p>
-     * The events will be send usually in steps of one, ie. <i>-1.0f</i> and <i>1.0f</i>.
-     * Higher values may result due to fast scrolling.
-     * Fractional values may result due to slow scrolling with high resolution devices.  
-     * </p>
-     * <p>
-     * The button number refers to the wheel number.
-     * </p>
-     * @deprecated Use {@link #getRotation()}
-     */
-    public float getWheelRotation() {
-        return isShiftDown() ? rotationXYZ[0] : rotationXYZ[1] ;
-    }
-
-    /**
      * Returns a 3-component float array filled with the values of the rotational axis
      * in the following order: horizontal-, vertical- and z-axis.
      * <p> 
diff --git a/src/test/com/jogamp/opengl/test/junit/graph/demos/GPUUISceneGLListener0A.java b/src/test/com/jogamp/opengl/test/junit/graph/demos/GPUUISceneGLListener0A.java
index f43a933e4..2e8ad02d8 100644
--- a/src/test/com/jogamp/opengl/test/junit/graph/demos/GPUUISceneGLListener0A.java
+++ b/src/test/com/jogamp/opengl/test/junit/graph/demos/GPUUISceneGLListener0A.java
@@ -428,7 +428,9 @@ public class GPUUISceneGLListener0A implements GLEventListener {
         
         @Override
         public void mouseWheelMoved(MouseEvent e) {
-            zoom += 2f*e.getWheelRotation();
+            if( !e.isShiftDown() ) {
+                zoom += 2f*e.getRotation()[0];
+            }
         }
     }
 }      
\ No newline at end of file
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/TextureSequenceCubeES2.java b/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/TextureSequenceCubeES2.java
index 25f8740d4..d8e3df5c0 100644
--- a/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/TextureSequenceCubeES2.java
+++ b/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/TextureSequenceCubeES2.java
@@ -133,8 +133,10 @@ public class TextureSequenceCubeES2 implements GLEventListener {
             }
         }        
         public void mouseWheelMoved(MouseEvent e) {
-            zoom += e.getWheelRotation()/10f;
-            System.err.println("zoom: "+zoom);
+            if( !e.isShiftDown() ) {
+                zoom += e.getRotation()[0]/10f;
+                System.err.println("zoom: "+zoom);
+            }
         }
     };
     
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/av/MovieSimple.java b/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/av/MovieSimple.java
index e17c9e88b..6b618bd5b 100644
--- a/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/av/MovieSimple.java
+++ b/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/av/MovieSimple.java
@@ -140,8 +140,10 @@ public class MovieSimple implements GLEventListener, GLMediaEventListener {
             // prevMouseY = y;
         }
         public void mouseWheelMoved(MouseEvent e) {
-            zoom += e.getWheelRotation()/10f;
-            System.err.println("zoom: "+zoom);
+            if( !e.isShiftDown() ) {
+                zoom += e.getRotation()[0]/10f;
+                System.err.println("zoom: "+zoom);
+            }
         }
     };