Author: sebb
Date: Fri Jul 29 17:31:23 2011
New Revision: 1152313
URL: http://svn.apache.org/viewvc?rev=1152313&view=rev
Log:
Add missing @Override markers
Modified:
commons/proper/bcel/trunk/src/examples/JasminVisitor.java
commons/proper/bcel/trunk/src/examples/Mini/ASTExpr.java
commons/proper/bcel/trunk/src/examples/Mini/ASTFactor.java
commons/proper/bcel/trunk/src/examples/Mini/ASTFunAppl.java
commons/proper/bcel/trunk/src/examples/Mini/ASTFunDecl.java
commons/proper/bcel/trunk/src/examples/Mini/ASTIdent.java
commons/proper/bcel/trunk/src/examples/Mini/ASTIfExpr.java
commons/proper/bcel/trunk/src/examples/Mini/ASTInteger.java
commons/proper/bcel/trunk/src/examples/Mini/ASTLetExpr.java
commons/proper/bcel/trunk/src/examples/Mini/ASTProgram.java
commons/proper/bcel/trunk/src/examples/Mini/ASTTerm.java
commons/proper/bcel/trunk/src/examples/Mini/Environment.java
commons/proper/bcel/trunk/src/examples/Mini/Function.java
commons/proper/bcel/trunk/src/examples/Mini/ParseException.java
commons/proper/bcel/trunk/src/examples/Mini/SimpleNode.java
commons/proper/bcel/trunk/src/examples/Mini/Token.java
commons/proper/bcel/trunk/src/examples/Mini/TokenMgrError.java
commons/proper/bcel/trunk/src/examples/Mini/Variable.java
commons/proper/bcel/trunk/src/examples/TransitiveHull.java
Modified: commons/proper/bcel/trunk/src/examples/JasminVisitor.java
URL:
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/examples/JasminVisitor.java?rev=1152313&r1=1152312&r2=1152313&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/examples/JasminVisitor.java (original)
+++ commons/proper/bcel/trunk/src/examples/JasminVisitor.java Fri Jul 29
17:31:23 2011
@@ -77,6 +77,7 @@ public class JasminVisitor extends org.a
out.close();
}
+ @Override
public void visitJavaClass(JavaClass clazz) {
out.println(";; Produced by JasminVisitor (BCEL)");
out.println(";; http://jakarta.apache.org/bcel/";);
@@ -97,6 +98,7 @@ public class JasminVisitor extends org.a
out.print("\n");
}
+ @Override
public void visitField(Field field) {
out.print(".field " + Utility.accessToString(field.getAccessFlags()) +
" \"" +field.getName() + "\"" + field.getSignature());
@@ -105,6 +107,7 @@ public class JasminVisitor extends org.a
}
}
+ @Override
public void visitConstantValue(ConstantValue cv) {
out.println(" = " + cv);
}
@@ -124,14 +127,17 @@ public class JasminVisitor extends org.a
}
}
+ @Override
public void visitDeprecated(Deprecated attribute) {
printEndMethod(attribute); }
+ @Override
public void visitSynthetic(Synthetic attribute) {
if(_method != null) {
printEndMethod(attribute);
}
}
+ @Override
public void visitMethod(Method method) {
this._method = method; // Remember for use in subsequent visitXXX calls
@@ -144,6 +150,7 @@ public class JasminVisitor extends org.a
}
}
+ @Override
public void visitExceptionTable(ExceptionTable e) {
String[] names = e.getExceptionNames();
for(int i=0; i < names.length; i++) {
@@ -155,6 +162,7 @@ public class JasminVisitor extends org.a
private Hashtable<InstructionHandle, String> map;
+ @Override
public void visitCode(Code code) {
int label_counter = 0;
Modified: commons/proper/bcel/trunk/src/examples/Mini/ASTExpr.java
URL:
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/examples/Mini/ASTExpr.java?rev=1152313&r1=1152312&r2=1152313&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/examples/Mini/ASTExpr.java (original)
+++ commons/proper/bcel/trunk/src/examples/Mini/ASTExpr.java Fri Jul 29
17:31:23 2011
@@ -97,6 +97,7 @@ implements MiniParserConstants, MiniPars
/**
* @return name of node, its kind and the number of children.
*/
+ @Override
public String toString() {
String op="";
int len = (children != null)? children.length : 0;
@@ -116,6 +117,7 @@ implements MiniParserConstants, MiniPars
* Called by the parser when the construction of this node is finished.
* Casts children Node[] to precise ASTExpr[] type.
*/
+ @Override
public void closeNode() {
if(children != null) {
exprs = new ASTExpr[children.length];
@@ -315,6 +317,7 @@ implements MiniParserConstants, MiniPars
this.column = column;
}
+ @Override
public void dump(String prefix) {
System.out.println(toString(prefix));
Modified: commons/proper/bcel/trunk/src/examples/Mini/ASTFactor.java
URL:
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/examples/Mini/ASTFactor.java?rev=1152313&r1=1152312&r2=1152313&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/examples/Mini/ASTFactor.java (original)
+++ commons/proper/bcel/trunk/src/examples/Mini/ASTFactor.java Fri Jul 29
17:31:23 2011
@@ -45,6 +45,7 @@ public class ASTFactor extends ASTExpr {
* Drop this node, if kind == -1, because then it has just one child node
* and may be safely replaced with it.
*/
+ @Override
public ASTExpr traverse(Environment env) {
if(kind == -1) {
return exprs[0].traverse(env);
Modified: commons/proper/bcel/trunk/src/examples/Mini/ASTFunAppl.java
URL:
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/examples/Mini/ASTFunAppl.java?rev=1152313&r1=1152312&r2=1152313&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/examples/Mini/ASTFunAppl.java (original)
+++ commons/proper/bcel/trunk/src/examples/Mini/ASTFunAppl.java Fri Jul 29
17:31:23 2011
@@ -56,6 +56,7 @@ public class ASTFunAppl extends ASTExpr
this.exprs = exprs;
}
+ @Override
public String toString() {
return jjtNodeName[id] + " " + name.getName();
}
@@ -63,6 +64,7 @@ public class ASTFunAppl extends ASTExpr
/**
* Overrides ASTExpr.closeNode()
*/
+ @Override
public void closeNode() {
name = (ASTIdent)children[0];
@@ -77,6 +79,7 @@ public class ASTFunAppl extends ASTExpr
/**
* Overrides ASTExpr.traverse()
*/
+ @Override
public ASTExpr traverse(Environment env) {
String fname = name.getName();
EnvEntry entry = env.get(fname);
@@ -120,6 +123,7 @@ public class ASTFunAppl extends ASTExpr
* @return type of expression
* @param expected type
*/
+ @Override
public int eval(int expected) {
String fname = name.getName();
Function f = function;
@@ -158,6 +162,7 @@ public class ASTFunAppl extends ASTExpr
/**
* Fourth pass, produce Java code.
*/
+ @Override
public void code(StringBuffer buf) {
String fname = name.getName();
// Function f = function;
@@ -196,6 +201,7 @@ public class ASTFunAppl extends ASTExpr
/**
* Fifth pass, produce Java byte code.
*/
+ @Override
public void byte_code(InstructionList il, MethodGen method, ConstantPoolGen
cp) {
String fname = name.getName();
// Function f = function;
Modified: commons/proper/bcel/trunk/src/examples/Mini/ASTFunDecl.java
URL:
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/examples/Mini/ASTFunDecl.java?rev=1152313&r1=1152312&r2=1152313&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/examples/Mini/ASTFunDecl.java (original)
+++ commons/proper/bcel/trunk/src/examples/Mini/ASTFunDecl.java Fri Jul 29
17:31:23 2011
@@ -85,6 +85,7 @@ implements MiniParserTreeConstants, org.
* Overrides SimpleNode.closeNode()
* Cast children to appropiate type.
*/
+ @Override
public void closeNode() {
name = (ASTIdent)children[0];
body = (ASTExpr)children[children.length - 1];
@@ -350,6 +351,7 @@ implements MiniParserTreeConstants, org.
/**
* Overrides SimpleNode.toString()
*/
+ @Override
public String toString() {
StringBuffer buf = new StringBuffer();
buf.append(jjtNodeName[id] + " " + name + "(");
@@ -384,6 +386,7 @@ implements MiniParserTreeConstants, org.
/**
* Overrides SimpleNode.dump()
*/
+ @Override
public void dump(String prefix) {
System.out.println(toString(prefix));
Modified: commons/proper/bcel/trunk/src/examples/Mini/ASTIdent.java
URL:
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/examples/Mini/ASTIdent.java?rev=1152313&r1=1152312&r2=1152313&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/examples/Mini/ASTIdent.java (original)
+++ commons/proper/bcel/trunk/src/examples/Mini/ASTIdent.java Fri Jul 29
17:31:23 2011
@@ -60,6 +60,7 @@ public class ASTIdent extends ASTExpr im
/**
* @return identifier and line/column number of appearance
*/
+ @Override
public String toString() {
return super.toString() + " = " + name;
}
@@ -67,6 +68,7 @@ public class ASTIdent extends ASTExpr im
/**
* Overrides ASTExpr.traverse()
*/
+ @Override
public ASTExpr traverse(Environment env) {
EnvEntry entry = env.get(name);
@@ -85,6 +87,7 @@ public class ASTIdent extends ASTExpr im
/**
* Overrides AstExpr.eval()
*/
+ @Override
public int eval(int expected) {
ASTIdent ident = reference.getName();
int t = ident.getType();
@@ -110,6 +113,7 @@ public class ASTIdent extends ASTExpr im
/**
* Fourth pass, produce Java code.
*/
+ @Override
public void code(StringBuffer buf) {
if(name.equals("TRUE")) {
ASTFunDecl.push(buf, "1");
@@ -123,6 +127,7 @@ public class ASTIdent extends ASTExpr im
/**
* Fifth pass, produce Java byte code.
*/
+ @Override
public void byte_code(InstructionList il, MethodGen method, ConstantPoolGen
cp) {
if(name.equals("TRUE")) {
il.append(new PUSH(cp, 1));
Modified: commons/proper/bcel/trunk/src/examples/Mini/ASTIfExpr.java
URL:
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/examples/Mini/ASTIfExpr.java?rev=1152313&r1=1152312&r2=1152313&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/examples/Mini/ASTIfExpr.java (original)
+++ commons/proper/bcel/trunk/src/examples/Mini/ASTIfExpr.java Fri Jul 29
17:31:23 2011
@@ -52,6 +52,7 @@ public class ASTIfExpr extends ASTExpr i
* Overrides ASTExpr.closeNode()
* Cast children nodes Node[] to appropiate type ASTExpr[]
*/
+ @Override
public void closeNode() {
if_expr = (ASTExpr)children[0];
then_expr = (ASTExpr)children[1];
@@ -69,6 +70,7 @@ public class ASTIfExpr extends ASTExpr i
/**
* Overrides ASTExpr.traverse()
*/
+ @Override
public ASTExpr traverse(Environment env) {
this.env = env;
@@ -88,6 +90,7 @@ public class ASTIfExpr extends ASTExpr i
* @return type of expression
* @param expected type
*/
+ @Override
public int eval(int expected) {
int then_type, else_type, if_type;
@@ -138,6 +141,7 @@ public class ASTIfExpr extends ASTExpr i
/**
* Fourth pass, produce Java code.
*/
+ @Override
public void code(StringBuffer buf) {
if_expr.code(buf);
@@ -153,6 +157,7 @@ public class ASTIfExpr extends ASTExpr i
/**
* Fifth pass, produce Java byte code.
*/
+ @Override
public void byte_code(InstructionList il, MethodGen method, ConstantPoolGen
cp) {
if_expr.byte_code(il, method, cp);
@@ -172,6 +177,7 @@ public class ASTIfExpr extends ASTExpr i
g.setTarget(il.append(InstructionConstants.NOP)); // May be optimized away
later
}
+ @Override
public void dump(String prefix) {
System.out.println(toString(prefix));
Modified: commons/proper/bcel/trunk/src/examples/Mini/ASTInteger.java
URL:
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/examples/Mini/ASTInteger.java?rev=1152313&r1=1152312&r2=1152313&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/examples/Mini/ASTInteger.java (original)
+++ commons/proper/bcel/trunk/src/examples/Mini/ASTInteger.java Fri Jul 29
17:31:23 2011
@@ -50,6 +50,7 @@ public class ASTInteger extends ASTExpr
/**
* @return identifier and line/column number of appearance
*/
+ @Override
public String toString() {
return super.toString() + " = " + value;
}
@@ -57,6 +58,7 @@ public class ASTInteger extends ASTExpr
/**
* Overrides ASTExpr.traverse()
*/
+ @Override
public ASTExpr traverse(Environment env) {
this.env = env;
return this; // Nothing to reduce/traverse here
@@ -67,6 +69,7 @@ public class ASTInteger extends ASTExpr
* Overrides AstExpr.eval()
* @return type of expression
*/
+ @Override
public int eval(int expected) {
is_simple = true; // (Very) simple expression, always true
@@ -76,6 +79,7 @@ public class ASTInteger extends ASTExpr
/**
* Fourth pass, produce Java code.
*/
+ @Override
public void code(StringBuffer buf) {
ASTFunDecl.push(buf, "" + value);
}
@@ -83,6 +87,7 @@ public class ASTInteger extends ASTExpr
/**
* Fifth pass, produce Java byte code.
*/
+ @Override
public void byte_code(InstructionList il, MethodGen method, ConstantPoolGen
cp) {
il.append(new PUSH(cp, value)); ASTFunDecl.push();
}
Modified: commons/proper/bcel/trunk/src/examples/Mini/ASTLetExpr.java
URL:
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/examples/Mini/ASTLetExpr.java?rev=1152313&r1=1152312&r2=1152313&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/examples/Mini/ASTLetExpr.java (original)
+++ commons/proper/bcel/trunk/src/examples/Mini/ASTLetExpr.java Fri Jul 29
17:31:23 2011
@@ -56,6 +56,7 @@ public class ASTLetExpr extends ASTExpr
* Overrides ASTExpr.closeNode()
* Cast children nodes to appropiate types.
*/
+ @Override
public void closeNode() {
int i, len_2 = children.length / 2; /* length must be a multiple of
* two (ident = expr) + 1 (body expr)
*/
@@ -75,6 +76,7 @@ public class ASTLetExpr extends ASTExpr
/**
* Overrides ASTExpr.traverse()
*/
+ @Override
public ASTExpr traverse(Environment env) {
this.env = env;
@@ -108,6 +110,7 @@ public class ASTLetExpr extends ASTExpr
* @return type of expression
* @param expected type
*/
+ @Override
public int eval(int expected) {
//is_simple = true;
@@ -124,6 +127,7 @@ public class ASTLetExpr extends ASTExpr
/**
* Fifth pass, produce Java code.
*/
+ @Override
public void code(StringBuffer buf) {
for(int i = 0; i < idents.length; i++) {
String ident = idents[i].getName();
@@ -144,6 +148,7 @@ public class ASTLetExpr extends ASTExpr
/**
* Fifth pass, produce Java byte code.
*/
+ @Override
public void byte_code(InstructionList il, MethodGen method, ConstantPoolGen
cp) {
int size = idents.length;
LocalVariableGen[] l = new LocalVariableGen[size];
@@ -171,6 +176,7 @@ public class ASTLetExpr extends ASTExpr
}
}
+ @Override
public void dump(String prefix) {
System.out.println(toString(prefix));
Modified: commons/proper/bcel/trunk/src/examples/Mini/ASTProgram.java
URL:
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/examples/Mini/ASTProgram.java?rev=1152313&r1=1152312&r2=1152313&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/examples/Mini/ASTProgram.java (original)
+++ commons/proper/bcel/trunk/src/examples/Mini/ASTProgram.java Fri Jul 29
17:31:23 2011
@@ -91,6 +91,7 @@ implements MiniParserConstants, MiniPars
* Overrides SimpleNode.closeNode().
* Cast children to appropiate type.
*/
+ @Override
public void closeNode() {
if(children != null) { // Non-empty program ?
fun_decls = new ASTFunDecl[children.length];
@@ -327,6 +328,7 @@ implements MiniParserConstants, MiniPars
}
}
+ @Override
public void dump(String prefix) {
System.out.println(toString(prefix));
Modified: commons/proper/bcel/trunk/src/examples/Mini/ASTTerm.java
URL:
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/examples/Mini/ASTTerm.java?rev=1152313&r1=1152312&r2=1152313&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/examples/Mini/ASTTerm.java (original)
+++ commons/proper/bcel/trunk/src/examples/Mini/ASTTerm.java Fri Jul 29
17:31:23 2011
@@ -45,6 +45,7 @@ public class ASTTerm extends ASTExpr {
* Drop this node, if kind == -1, because then it has just one child node
* and may be safely replaced with it.
*/
+ @Override
public ASTExpr traverse(Environment env) {
if(kind == -1) {
return exprs[0].traverse(env);
Modified: commons/proper/bcel/trunk/src/examples/Mini/Environment.java
URL:
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/examples/Mini/Environment.java?rev=1152313&r1=1152312&r2=1152313&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/examples/Mini/Environment.java (original)
+++ commons/proper/bcel/trunk/src/examples/Mini/Environment.java Fri Jul 29
17:31:23 2011
@@ -154,6 +154,7 @@ public class Environment implements Clon
return -1;
}
+ @Override
public Object clone() {
Vector[] copy = new Vector[size];
@@ -175,6 +176,7 @@ public class Environment implements Clon
return new Environment(copy);
}
+ @Override
public String toString() {
StringBuffer buf = new StringBuffer();
Modified: commons/proper/bcel/trunk/src/examples/Mini/Function.java
URL:
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/examples/Mini/Function.java?rev=1152313&r1=1152312&r2=1152313&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/examples/Mini/Function.java (original)
+++ commons/proper/bcel/trunk/src/examples/Mini/Function.java Fri Jul 29
17:31:23 2011
@@ -48,6 +48,7 @@ public class Function implements org.apa
setArgs(args);
}
+ @Override
public String toString() {
StringBuffer buf = new StringBuffer();
Modified: commons/proper/bcel/trunk/src/examples/Mini/ParseException.java
URL:
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/examples/Mini/ParseException.java?rev=1152313&r1=1152312&r2=1152313&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/examples/Mini/ParseException.java (original)
+++ commons/proper/bcel/trunk/src/examples/Mini/ParseException.java Fri Jul 29
17:31:23 2011
@@ -111,6 +111,7 @@ public class ParseException extends Exce
* of the final stack trace, and hence the correct error message
* gets displayed.
*/
+ @Override
public String getMessage() {
if (!specialConstructor) {
return super.getMessage();
Modified: commons/proper/bcel/trunk/src/examples/Mini/SimpleNode.java
URL:
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/examples/Mini/SimpleNode.java?rev=1152313&r1=1152312&r2=1152313&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/examples/Mini/SimpleNode.java (original)
+++ commons/proper/bcel/trunk/src/examples/Mini/SimpleNode.java Fri Jul 29
17:31:23 2011
@@ -77,6 +77,7 @@ public abstract class SimpleNode impleme
toString(String), otherwise overriding toString() is probably all
you need to do. */
+ @Override
public String toString() { return MiniParserTreeConstants.jjtNodeName[id]; }
public String toString(String prefix) { return prefix + toString(); }
Modified: commons/proper/bcel/trunk/src/examples/Mini/Token.java
URL:
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/examples/Mini/Token.java?rev=1152313&r1=1152312&r2=1152313&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/examples/Mini/Token.java (original)
+++ commons/proper/bcel/trunk/src/examples/Mini/Token.java Fri Jul 29 17:31:23
2011
@@ -70,6 +70,7 @@ public class Token {
/**
* Returns the image.
*/
+ @Override
public final String toString()
{
return image;
Modified: commons/proper/bcel/trunk/src/examples/Mini/TokenMgrError.java
URL:
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/examples/Mini/TokenMgrError.java?rev=1152313&r1=1152312&r2=1152313&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/examples/Mini/TokenMgrError.java (original)
+++ commons/proper/bcel/trunk/src/examples/Mini/TokenMgrError.java Fri Jul 29
17:31:23 2011
@@ -128,6 +128,7 @@ public class TokenMgrError extends Error
*
* from this method for such cases in the release version of your parser.
*/
+ @Override
public String getMessage() {
return super.getMessage();
}
Modified: commons/proper/bcel/trunk/src/examples/Mini/Variable.java
URL:
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/examples/Mini/Variable.java?rev=1152313&r1=1152312&r2=1152313&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/examples/Mini/Variable.java (original)
+++ commons/proper/bcel/trunk/src/examples/Mini/Variable.java Fri Jul 29
17:31:23 2011
@@ -45,6 +45,7 @@ public class Variable implements EnvEntr
column = name.getColumn();
}
+ @Override
public String toString() {
if(!reserved) {
return var_name + " declared at line " + line + ", column " + column;
Modified: commons/proper/bcel/trunk/src/examples/TransitiveHull.java
URL:
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/examples/TransitiveHull.java?rev=1152313&r1=1152312&r2=1152313&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/examples/TransitiveHull.java (original)
+++ commons/proper/bcel/trunk/src/examples/TransitiveHull.java Fri Jul 29
17:31:23 2011
@@ -106,6 +106,7 @@ public class TransitiveHull extends org.
}
}
+ @Override
public void visitConstantClass(ConstantClass cc) {
String class_name = (String) cc.getConstantValue(_cp);
add(class_name);
@@ -145,14 +146,17 @@ public class TransitiveHull extends org.
}
}
+ @Override
public void visitConstantMethodref(ConstantMethodref cmr) {
visitRef(cmr, true);
}
+ @Override
public void visitConstantInterfaceMethodref(ConstantInterfaceMethodref
cimr) {
visitRef(cimr, true);
}
+ @Override
public void visitConstantFieldref(ConstantFieldref cfr) {
visitRef(cfr, false);
}
