aboutsummaryrefslogtreecommitdiffstats
path: root/src/jogl/classes/javax/media
diff options
context:
space:
mode:
authorHarvey Harrison <[email protected]>2013-10-17 22:51:47 -0700
committerHarvey Harrison <[email protected]>2013-10-17 23:01:22 -0700
commitf1ae8ddb87c88a57dce4593f006881ef6a7f0932 (patch)
tree0c25dff44d3781dadecc8234a9bc70e18e50cbc2 /src/jogl/classes/javax/media
parent5e9c02bce7b241a0bf95c8abca9a91cd25e51ed3 (diff)
jogl: add missing @Override annotations
Signed-off-by: Harvey Harrison <[email protected]>
Diffstat (limited to 'src/jogl/classes/javax/media')
-rw-r--r--src/jogl/classes/javax/media/opengl/GLArrayData.java1
-rw-r--r--src/jogl/classes/javax/media/opengl/GLDebugMessage.java1
-rw-r--r--src/jogl/classes/javax/media/opengl/GLDrawableFactory.java1
-rw-r--r--src/jogl/classes/javax/media/opengl/GLProfile.java5
-rw-r--r--src/jogl/classes/javax/media/opengl/GLUniformData.java1
-rw-r--r--src/jogl/classes/javax/media/opengl/awt/GLCanvas.java10
-rw-r--r--src/jogl/classes/javax/media/opengl/glu/GLUtessellatorCallbackAdapter.java12
7 files changed, 29 insertions, 2 deletions
diff --git a/src/jogl/classes/javax/media/opengl/GLArrayData.java b/src/jogl/classes/javax/media/opengl/GLArrayData.java
index 4025170cf..97f58a92a 100644
--- a/src/jogl/classes/javax/media/opengl/GLArrayData.java
+++ b/src/jogl/classes/javax/media/opengl/GLArrayData.java
@@ -201,6 +201,7 @@ public interface GLArrayData {
*/
public int getStride();
+ @Override
public String toString();
public void destroy(GL gl);
diff --git a/src/jogl/classes/javax/media/opengl/GLDebugMessage.java b/src/jogl/classes/javax/media/opengl/GLDebugMessage.java
index 1032cf929..acb33b058 100644
--- a/src/jogl/classes/javax/media/opengl/GLDebugMessage.java
+++ b/src/jogl/classes/javax/media/opengl/GLDebugMessage.java
@@ -202,6 +202,7 @@ public class GLDebugMessage {
return sb;
}
+ @Override
public String toString() {
return toString(null).toString();
}
diff --git a/src/jogl/classes/javax/media/opengl/GLDrawableFactory.java b/src/jogl/classes/javax/media/opengl/GLDrawableFactory.java
index e486e2bfd..26bafd961 100644
--- a/src/jogl/classes/javax/media/opengl/GLDrawableFactory.java
+++ b/src/jogl/classes/javax/media/opengl/GLDrawableFactory.java
@@ -134,6 +134,7 @@ public abstract class GLDrawableFactory {
private static final void initSingletonImpl() {
NativeWindowFactory.initSingleton();
NativeWindowFactory.addCustomShutdownHook(false /* head */, new Runnable() {
+ @Override
public void run() {
shutdown0();
}
diff --git a/src/jogl/classes/javax/media/opengl/GLProfile.java b/src/jogl/classes/javax/media/opengl/GLProfile.java
index 15300e397..35dcce0f7 100644
--- a/src/jogl/classes/javax/media/opengl/GLProfile.java
+++ b/src/jogl/classes/javax/media/opengl/GLProfile.java
@@ -121,11 +121,13 @@ public class GLProfile {
// run the whole static initialization privileged to speed up,
// since this skips checking further access
AccessController.doPrivileged(new PrivilegedAction<Object>() {
+ @Override
public Object run() {
Platform.initSingleton();
// Performance hack to trigger classloading of the GL classes impl, which makes up to 12%, 800ms down to 700ms
new Thread(new Runnable() {
+ @Override
public void run() {
final ClassLoader cl = GLProfile.class.getClassLoader();
try {
@@ -1020,6 +1022,7 @@ public class GLProfile {
* @return true if given Object is a GLProfile and
* if both, profile and profileImpl is equal with this.
*/
+ @Override
public final boolean equals(Object o) {
if(this==o) { return true; }
if(o instanceof GLProfile) {
@@ -1029,6 +1032,7 @@ public class GLProfile {
return false;
}
+ @Override
public int hashCode() {
int hash = 5;
hash = 97 * hash + getImplName().hashCode();
@@ -1469,6 +1473,7 @@ public class GLProfile {
return true;
}
+ @Override
public String toString() {
return "GLProfile[" + getName() + "/" + getImplName() + "."+(this.isHardwareRasterizer?"hw":"sw")+"]";
}
diff --git a/src/jogl/classes/javax/media/opengl/GLUniformData.java b/src/jogl/classes/javax/media/opengl/GLUniformData.java
index 700bba2eb..412bfb0a9 100644
--- a/src/jogl/classes/javax/media/opengl/GLUniformData.java
+++ b/src/jogl/classes/javax/media/opengl/GLUniformData.java
@@ -97,6 +97,7 @@ public class GLUniformData {
return sb;
}
+ @Override
public String toString() {
return toString(null).toString();
}
diff --git a/src/jogl/classes/javax/media/opengl/awt/GLCanvas.java b/src/jogl/classes/javax/media/opengl/awt/GLCanvas.java
index f08fbafe8..8757c7a26 100644
--- a/src/jogl/classes/javax/media/opengl/awt/GLCanvas.java
+++ b/src/jogl/classes/javax/media/opengl/awt/GLCanvas.java
@@ -449,8 +449,14 @@ public class GLCanvas extends Canvas implements AWTGLAutoDrawable, WindowClosing
_lock.unlock();
}
}
- private final Runnable realizeOnEDTAction = new Runnable() { public void run() { setRealizedImpl(true); } };
- private final Runnable unrealizeOnEDTAction = new Runnable() { public void run() { setRealizedImpl(false); } };
+ private final Runnable realizeOnEDTAction = new Runnable() {
+ @Override
+ public void run() { setRealizedImpl(true); }
+ };
+ private final Runnable unrealizeOnEDTAction = new Runnable() {
+ @Override
+ public void run() { setRealizedImpl(false); }
+ };
@Override
public final void setRealized(boolean realized) {
diff --git a/src/jogl/classes/javax/media/opengl/glu/GLUtessellatorCallbackAdapter.java b/src/jogl/classes/javax/media/opengl/glu/GLUtessellatorCallbackAdapter.java
index bd12dfb9d..15a7bb2a1 100644
--- a/src/jogl/classes/javax/media/opengl/glu/GLUtessellatorCallbackAdapter.java
+++ b/src/jogl/classes/javax/media/opengl/glu/GLUtessellatorCallbackAdapter.java
@@ -64,20 +64,32 @@ package javax.media.opengl.glu;
*/
public class GLUtessellatorCallbackAdapter implements GLUtessellatorCallback {
+ @Override
public void begin(int type) {}
+ @Override
public void edgeFlag(boolean boundaryEdge) {}
+ @Override
public void vertex(Object vertexData) {}
+ @Override
public void end() {}
// public void mesh(jogamp.opengl.tessellator.GLUmesh mesh) {}
+ @Override
public void error(int errnum) {}
+ @Override
public void combine(double[] coords, Object[] data,
float[] weight, Object[] outData) {}
+ @Override
public void beginData(int type, Object polygonData) {}
+ @Override
public void edgeFlagData(boolean boundaryEdge,
Object polygonData) {}
+ @Override
public void vertexData(Object vertexData, Object polygonData) {}
+ @Override
public void endData(Object polygonData) {}
+ @Override
public void errorData(int errnum, Object polygonData) {}
+ @Override
public void combineData(double[] coords, Object[] data,
float[] weight, Object[] outData,
Object polygonData) {}