aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndy Brown <[email protected]>2011-02-15 07:02:49 +0800
committerSven Gothel <[email protected]>2011-02-25 12:15:05 +0800
commitc0dc6dd0571684e74b08ab28b5558df47e40ff7d (patch)
tree51229a5df0709aa4007d0fc4f5122ccc936a3c79
parent6ed203e605cd08af14f4649bd91c3e2a35e68634 (diff)
Fix bug 473: Override on implementations with 1.5
Using @Override on implementations of interface methods wasn't introduced until Java 1.6. After changing the compliance level to 1.5 in Eclipse, it reports 23 errors. This fix comments out the annotations rather than deleting them altogether thinking it may be easier if JOGL ever targets 1.6 in the future.
-rw-r--r--src/test/com/jogamp/opengl/test/junit/jogl/awt/TestBug461OffscreenSupersamplingSwingAWT.java8
-rw-r--r--src/test/com/jogamp/opengl/test/junit/jogl/glsl/TestShaderCompilationBug459AWT.java8
-rw-r--r--src/test/com/jogamp/opengl/test/junit/jogl/glu/TestBug463ScaleImageMemoryAWT.java8
-rw-r--r--src/test/com/jogamp/opengl/test/junit/jogl/swt/TestSWTAWT01GLn.java8
-rw-r--r--src/test/com/jogamp/opengl/test/junit/util/AWTFocusAdapter.java4
5 files changed, 18 insertions, 18 deletions
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/awt/TestBug461OffscreenSupersamplingSwingAWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/awt/TestBug461OffscreenSupersamplingSwingAWT.java
index 797816690..55c9c6812 100644
--- a/src/test/com/jogamp/opengl/test/junit/jogl/awt/TestBug461OffscreenSupersamplingSwingAWT.java
+++ b/src/test/com/jogamp/opengl/test/junit/jogl/awt/TestBug461OffscreenSupersamplingSwingAWT.java
@@ -103,15 +103,15 @@ public class TestBug461OffscreenSupersamplingSwingAWT extends UITestCase impleme
gl.glEnd();
}
- @Override
+ /* @Override */
public void init(GLAutoDrawable drawable) {
}
- @Override
+ /* @Override */
public void reshape(GLAutoDrawable drawable, int x, int y, int width, int height) {
}
- @Override
+ /* @Override */
public void display(GLAutoDrawable drawable) {
render(offScreenBuffer);
BufferedImage outputImage = com.jogamp.opengl.util.awt.Screenshot.readToBufferedImage(200, 200, false);
@@ -121,7 +121,7 @@ public class TestBug461OffscreenSupersamplingSwingAWT extends UITestCase impleme
jframe.getContentPane().add(imageLabel);
}
- @Override
+ /* @Override */
public void dispose(GLAutoDrawable drawable) {
jframe.setVisible(false);
jframe.dispose();
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/glsl/TestShaderCompilationBug459AWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/glsl/TestShaderCompilationBug459AWT.java
index e740577d3..e7f376e3e 100644
--- a/src/test/com/jogamp/opengl/test/junit/jogl/glsl/TestShaderCompilationBug459AWT.java
+++ b/src/test/com/jogamp/opengl/test/junit/jogl/glsl/TestShaderCompilationBug459AWT.java
@@ -87,7 +87,7 @@ public class TestShaderCompilationBug459AWT extends UITestCase {
frame.setSize(512, 512);
glCanvas.addGLEventListener(new GLEventListener() {
- @Override
+ /* @Override */
public void init(GLAutoDrawable drawable) {
String code = "void main(void){gl_Position = vec4(0,0,0,1);}";
@@ -120,15 +120,15 @@ public class TestShaderCompilationBug459AWT extends UITestCase {
}
}
- @Override
+ /* @Override */
public void dispose(GLAutoDrawable drawable) {
}
- @Override
+ /* @Override */
public void display(GLAutoDrawable drawable) {
}
- @Override
+ /* @Override */
public void reshape(GLAutoDrawable drawable, int x, int y, int width, int height) {
}
});
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/glu/TestBug463ScaleImageMemoryAWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/glu/TestBug463ScaleImageMemoryAWT.java
index d9dadf93a..1f525a643 100644
--- a/src/test/com/jogamp/opengl/test/junit/jogl/glu/TestBug463ScaleImageMemoryAWT.java
+++ b/src/test/com/jogamp/opengl/test/junit/jogl/glu/TestBug463ScaleImageMemoryAWT.java
@@ -53,11 +53,11 @@ import org.junit.Test;
*/
public class TestBug463ScaleImageMemoryAWT implements GLEventListener {
- @Override
+ /* @Override */
public void init(GLAutoDrawable drawable) {
}
- @Override
+ /* @Override */
public void display(GLAutoDrawable drawable) {
int widthin = 559;
int heightin = 425;
@@ -80,12 +80,12 @@ public class TestBug463ScaleImageMemoryAWT implements GLEventListener {
widthout, heightout, GL.GL_UNSIGNED_BYTE, bufferOut );
}
- @Override
+ /* @Override */
public void reshape(GLAutoDrawable drawable, int x, int y, int width, int height) {
}
- @Override
+ /* @Override */
public void dispose(GLAutoDrawable drawable) {
}
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/swt/TestSWTAWT01GLn.java b/src/test/com/jogamp/opengl/test/junit/jogl/swt/TestSWTAWT01GLn.java
index 2ab3c96ad..25653ab21 100644
--- a/src/test/com/jogamp/opengl/test/junit/jogl/swt/TestSWTAWT01GLn.java
+++ b/src/test/com/jogamp/opengl/test/junit/jogl/swt/TestSWTAWT01GLn.java
@@ -121,22 +121,22 @@ public class TestSWTAWT01GLn extends UITestCase {
frame.add( glcanvas );
glcanvas.addGLEventListener( new GLEventListener() {
- @Override
+ /* @Override */
public void init( GLAutoDrawable glautodrawable ) {
}
- @Override
+ /* @Override */
public void dispose( GLAutoDrawable glautodrawable ) {
}
- @Override
+ /* @Override */
public void display( GLAutoDrawable glautodrawable ) {
Rectangle rectangle = new Rectangle( 0, 0, glautodrawable.getWidth(), glautodrawable.getHeight() );
GL2 gl = glautodrawable.getGL().getGL2();
OneTriangle.render( gl, rectangle );
}
- @Override
+ /* @Override */
public void reshape( GLAutoDrawable glautodrawable, int x, int y, int width, int height ) {
Rectangle rectangle = new Rectangle( 0, 0, glautodrawable.getWidth(), glautodrawable.getHeight() );
GL2 gl = glautodrawable.getGL().getGL2();
diff --git a/src/test/com/jogamp/opengl/test/junit/util/AWTFocusAdapter.java b/src/test/com/jogamp/opengl/test/junit/util/AWTFocusAdapter.java
index a24127772..9e5a01ebb 100644
--- a/src/test/com/jogamp/opengl/test/junit/util/AWTFocusAdapter.java
+++ b/src/test/com/jogamp/opengl/test/junit/util/AWTFocusAdapter.java
@@ -57,14 +57,14 @@ public class AWTFocusAdapter implements EventCountAdapter, FocusListener {
return wasTemporary;
}
- @Override
+ /* @Override */
public void focusGained(FocusEvent e) {
++focusGained;
wasTemporary = e.isTemporary();
System.err.println("FOCUS AWT GAINED "+(wasTemporary?"TEMP":"PERM")+" ["+focusGained+"]: "+prefix+", "+e);
}
- @Override
+ /* @Override */
public void focusLost(FocusEvent e) {
--focusGained;
wasTemporary = e.isTemporary();