From f1ae8ddb87c88a57dce4593f006881ef6a7f0932 Mon Sep 17 00:00:00 2001
From: Harvey Harrison <harvey.harrison@gmail.com>
Date: Thu, 17 Oct 2013 22:51:47 -0700
Subject: jogl: add missing @Override annotations
Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
---
.../gluegen/opengl/BuildComposablePipeline.java | 31 ++++++++++++++++++++++
.../com/jogamp/gluegen/opengl/GLEmitter.java | 3 +++
.../jogamp/gluegen/opengl/ant/StaticGLGenTask.java | 1 +
.../NativeSignatureJavaMethodBindingEmitter.java | 6 +++++
4 files changed, 41 insertions(+)
(limited to 'src/jogl/classes/com/jogamp/gluegen/opengl')
diff --git a/src/jogl/classes/com/jogamp/gluegen/opengl/BuildComposablePipeline.java b/src/jogl/classes/com/jogamp/gluegen/opengl/BuildComposablePipeline.java
index 8429fbcfd..5f358a6d3 100644
--- a/src/jogl/classes/com/jogamp/gluegen/opengl/BuildComposablePipeline.java
+++ b/src/jogl/classes/com/jogamp/gluegen/opengl/BuildComposablePipeline.java
@@ -402,6 +402,7 @@ public class BuildComposablePipeline {
ifNames,
null,
new CodeGenUtils.EmissionCallback() {
+ @Override
public void emit(PrintWriter w) {
emitClassDocComment(w);
}
@@ -752,18 +753,22 @@ public class BuildComposablePipeline {
this.mode = mode;
}
+ @Override
protected String getOutputName() {
return className;
}
+ @Override
protected int getMode() {
return mode;
}
+ @Override
protected boolean emptyMethodAllowed() {
return true;
}
+ @Override
protected boolean emptyDownstreamAllowed() {
return true;
}
@@ -773,6 +778,7 @@ public class BuildComposablePipeline {
super.preMethodEmissionHook(output);
}
+ @Override
protected void constructorHook(PrintWriter output) {
output.print(" public " + getOutputName() + "(");
output.print(downstreamName + " " + getDownstreamObjectName());
@@ -803,6 +809,7 @@ public class BuildComposablePipeline {
}
}
+ @Override
protected void emitClassDocComment(PrintWriter output) {
output.println("/**");
output.println(" * Composable pipeline {@link " + outputPackage + "." + outputName + "}, implementing the interface");
@@ -837,10 +844,12 @@ public class BuildComposablePipeline {
output.println("*/");
}
+ @Override
protected boolean hasPreDownstreamCallHook(Method m) {
return null != getMethod(prologClassOpt, m);
}
+ @Override
protected void preDownstreamCallHook(PrintWriter output, Method m) {
if (null != prologNameOpt) {
output.print(getPrologObjectNameOpt());
@@ -852,10 +861,12 @@ public class BuildComposablePipeline {
}
}
+ @Override
protected boolean hasPostDownstreamCallHook(Method m) {
return false;
}
+ @Override
protected void postDownstreamCallHook(PrintWriter output, Method m) {
}
} // end class CustomPipeline
@@ -869,18 +880,22 @@ public class BuildComposablePipeline {
className = "Debug" + getBaseInterfaceName();
}
+ @Override
protected String getOutputName() {
return className;
}
+ @Override
protected int getMode() {
return 0;
}
+ @Override
protected boolean emptyMethodAllowed() {
return false;
}
+ @Override
protected boolean emptyDownstreamAllowed() {
return false;
}
@@ -890,6 +905,7 @@ public class BuildComposablePipeline {
super.preMethodEmissionHook(output);
}
+ @Override
protected void constructorHook(PrintWriter output) {
output.print(" public " + getOutputName() + "(");
output.println(downstreamName + " " + getDownstreamObjectName() + ")");
@@ -971,6 +987,7 @@ public class BuildComposablePipeline {
output.println(" private GLContext _context;");
}
+ @Override
protected void emitClassDocComment(PrintWriter output) {
output.println("/**");
output.println(" * <p>");
@@ -988,18 +1005,22 @@ public class BuildComposablePipeline {
output.println(" */");
}
+ @Override
protected boolean hasPreDownstreamCallHook(Method m) {
return true;
}
+ @Override
protected void preDownstreamCallHook(PrintWriter output, Method m) {
output.println(" checkContext();");
}
+ @Override
protected boolean hasPostDownstreamCallHook(Method m) {
return true;
}
+ @Override
protected void postDownstreamCallHook(PrintWriter output, Method m) {
if (m.getName().equals("glBegin")) {
output.println(" insideBeginEndPair = true;");
@@ -1041,18 +1062,22 @@ public class BuildComposablePipeline {
className = "Trace" + getBaseInterfaceName();
}
+ @Override
protected String getOutputName() {
return className;
}
+ @Override
protected int getMode() {
return 0;
}
+ @Override
protected boolean emptyMethodAllowed() {
return false;
}
+ @Override
protected boolean emptyDownstreamAllowed() {
return false;
}
@@ -1062,6 +1087,7 @@ public class BuildComposablePipeline {
super.preMethodEmissionHook(output);
}
+ @Override
protected void constructorHook(PrintWriter output) {
output.print(" public " + getOutputName() + "(");
output.println(downstreamName + " " + getDownstreamObjectName() + ", PrintStream " + getOutputStreamName() + ")");
@@ -1112,6 +1138,7 @@ public class BuildComposablePipeline {
output.println("}");
}
+ @Override
protected void emitClassDocComment(PrintWriter output) {
output.println("/**");
output.println(" * <p>");
@@ -1129,10 +1156,12 @@ public class BuildComposablePipeline {
output.println(" */");
}
+ @Override
protected boolean hasPreDownstreamCallHook(Method m) {
return true;
}
+ @Override
protected void preDownstreamCallHook(PrintWriter output, Method m) {
if (m.getName().equals("glEnd") || m.getName().equals("glEndList")) {
output.println("indent-=2;");
@@ -1146,10 +1175,12 @@ public class BuildComposablePipeline {
output.println(");");
}
+ @Override
protected boolean hasPostDownstreamCallHook(Method m) {
return true;
}
+ @Override
protected void postDownstreamCallHook(PrintWriter output, Method m) {
Class<?> ret = m.getReturnType();
if (ret != Void.TYPE) {
diff --git a/src/jogl/classes/com/jogamp/gluegen/opengl/GLEmitter.java b/src/jogl/classes/com/jogamp/gluegen/opengl/GLEmitter.java
index 1af632682..547382ed1 100644
--- a/src/jogl/classes/com/jogamp/gluegen/opengl/GLEmitter.java
+++ b/src/jogl/classes/com/jogamp/gluegen/opengl/GLEmitter.java
@@ -134,6 +134,7 @@ public class GLEmitter extends ProcAddressEmitter {
private List<ConstantDefinition> constants;
private List<FunctionSymbol> functions;
+ @Override
public void filterSymbols(List<ConstantDefinition> constants,
List<FunctionSymbol> functions) {
this.constants = constants;
@@ -141,10 +142,12 @@ public class GLEmitter extends ProcAddressEmitter {
doWork();
}
+ @Override
public List<ConstantDefinition> getConstants() {
return constants;
}
+ @Override
public List<FunctionSymbol> getFunctions() {
return functions;
}
diff --git a/src/jogl/classes/com/jogamp/gluegen/opengl/ant/StaticGLGenTask.java b/src/jogl/classes/com/jogamp/gluegen/opengl/ant/StaticGLGenTask.java
index b98f17117..21946ea89 100644
--- a/src/jogl/classes/com/jogamp/gluegen/opengl/ant/StaticGLGenTask.java
+++ b/src/jogl/classes/com/jogamp/gluegen/opengl/ant/StaticGLGenTask.java
@@ -186,6 +186,7 @@ public class StaticGLGenTask extends Task
*
* @see org.apache.tools.ant.Task#execute()
*/
+ @Override
public void execute()
throws BuildException
{
diff --git a/src/jogl/classes/com/jogamp/gluegen/opengl/nativesig/NativeSignatureJavaMethodBindingEmitter.java b/src/jogl/classes/com/jogamp/gluegen/opengl/nativesig/NativeSignatureJavaMethodBindingEmitter.java
index a17657382..6d9d6f2bb 100644
--- a/src/jogl/classes/com/jogamp/gluegen/opengl/nativesig/NativeSignatureJavaMethodBindingEmitter.java
+++ b/src/jogl/classes/com/jogamp/gluegen/opengl/nativesig/NativeSignatureJavaMethodBindingEmitter.java
@@ -131,6 +131,7 @@ public class NativeSignatureJavaMethodBindingEmitter extends GLJavaMethodBinding
}
}
+ @Override
protected String getReturnTypeString(boolean skipArray) {
if (isForImplementingMethodCall()) {
JavaType returnType = getBinding().getJavaReturnType();
@@ -142,6 +143,7 @@ public class NativeSignatureJavaMethodBindingEmitter extends GLJavaMethodBinding
return super.getReturnTypeString(skipArray);
}
+ @Override
protected void emitPreCallSetup(MethodBinding binding, PrintWriter writer) {
super.emitPreCallSetup(binding, writer);
for (int i = 0; i < binding.getNumArguments(); i++) {
@@ -162,6 +164,7 @@ public class NativeSignatureJavaMethodBindingEmitter extends GLJavaMethodBinding
return "__buffer_array_" + argNumber;
}
+ @Override
protected int emitArguments(PrintWriter writer)
{
boolean needComma = false;
@@ -242,6 +245,7 @@ public class NativeSignatureJavaMethodBindingEmitter extends GLJavaMethodBinding
return numEmitted;
}
+ @Override
protected void emitReturnVariableSetupAndCall(MethodBinding binding, PrintWriter writer) {
writer.print(" ");
JavaType returnType = binding.getJavaReturnType();
@@ -455,6 +459,7 @@ public class NativeSignatureJavaMethodBindingEmitter extends GLJavaMethodBinding
return numArgsEmitted;
}
+ @Override
protected void emitCallResultReturn(MethodBinding binding, PrintWriter writer) {
for (int i = 0; i < binding.getNumArguments(); i++) {
JavaType type = binding.getJavaArgumentType(i);
@@ -468,6 +473,7 @@ public class NativeSignatureJavaMethodBindingEmitter extends GLJavaMethodBinding
super.emitCallResultReturn(binding, writer);
}
+ @Override
public String getName() {
String res = super.getName();
if (forImplementingMethodCall && bufferObjectVariant) {
--
cgit v1.2.3