You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2015/08/13 23:58:02 UTC
svn commit: r1695786 [2/2] - in /commons/proper/bcel/trunk/src:
main/java/org/apache/commons/bcel6/classfile/
main/java/org/apache/commons/bcel6/generic/
main/java/org/apache/commons/bcel6/util/
main/java/org/apache/commons/bcel6/verifier/ main/java/or...
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LCONST.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LCONST.java?rev=1695786&r1=1695785&r2=1695786&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LCONST.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LCONST.java Thu Aug 13 21:58:00 2015
@@ -51,6 +51,7 @@ public class LCONST extends Instruction
}
+ @Override
public Number getValue() {
return Long.valueOf(value);
}
@@ -58,6 +59,7 @@ public class LCONST extends Instruction
/** @return Type.LONG
*/
+ @Override
public Type getType( ConstantPoolGen cp ) {
return Type.LONG;
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LDC.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LDC.java?rev=1695786&r1=1695785&r2=1695786&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LDC.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LDC.java Thu Aug 13 21:58:00 2015
@@ -134,6 +134,7 @@ public class LDC extends CPInstruction i
}
+ @Override
public Class<?>[] getExceptions() {
return ExceptionConstants.createExceptions(ExceptionConstants.EXCS.EXCS_STRING_RESOLUTION);
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LDIV.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LDIV.java?rev=1695786&r1=1695785&r2=1695786&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LDIV.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LDIV.java Thu Aug 13 21:58:00 2015
@@ -34,6 +34,7 @@ public class LDIV extends ArithmeticInst
}
+ @Override
public Class<?>[] getExceptions() {
return new Class[] {
org.apache.commons.bcel6.ExceptionConstants.ARITHMETIC_EXCEPTION
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LREM.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LREM.java?rev=1695786&r1=1695785&r2=1695786&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LREM.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LREM.java Thu Aug 13 21:58:00 2015
@@ -33,6 +33,7 @@ public class LREM extends ArithmeticInst
}
+ @Override
public Class<?>[] getExceptions() {
return new Class[] {
org.apache.commons.bcel6.ExceptionConstants.ARITHMETIC_EXCEPTION
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LineNumberGen.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LineNumberGen.java?rev=1695786&r1=1695785&r2=1695786&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LineNumberGen.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LineNumberGen.java Thu Aug 13 21:58:00 2015
@@ -48,6 +48,7 @@ public class LineNumberGen implements In
/**
* @return true, if ih is target of this line number
*/
+ @Override
public boolean containsTarget( InstructionHandle ih ) {
return this.ih == ih;
}
@@ -57,6 +58,7 @@ public class LineNumberGen implements In
* @param old_ih old target
* @param new_ih new target
*/
+ @Override
public void updateTarget( InstructionHandle old_ih, InstructionHandle new_ih ) {
if (old_ih != ih) {
throw new ClassGenException("Not targeting " + old_ih + ", but " + ih + "}");
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LocalVariableGen.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LocalVariableGen.java?rev=1695786&r1=1695785&r2=1695786&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LocalVariableGen.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LocalVariableGen.java Thu Aug 13 21:58:00 2015
@@ -104,21 +104,25 @@ public class LocalVariableGen implements
}
+ @Override
public void setName( String name ) { // TODO unused
this.name = name;
}
+ @Override
public String getName() {
return name;
}
+ @Override
public void setType( Type type ) { // TODO unused
this.type = type;
}
+ @Override
public Type getType() {
return type;
}
@@ -150,6 +154,7 @@ public class LocalVariableGen implements
* @param old_ih old target, either start or end
* @param new_ih new target
*/
+ @Override
public void updateTarget( InstructionHandle old_ih, InstructionHandle new_ih ) {
boolean targeted = false;
if (start == old_ih) {
@@ -177,6 +182,7 @@ public class LocalVariableGen implements
/**
* @return true, if ih is target of this variable
*/
+ @Override
public boolean containsTarget( InstructionHandle ih ) {
return (start == ih) || (end == ih);
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LocalVariableInstruction.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LocalVariableInstruction.java?rev=1695786&r1=1695785&r2=1695786&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LocalVariableInstruction.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LocalVariableInstruction.java Thu Aug 13 21:58:00 2015
@@ -143,6 +143,7 @@ public abstract class LocalVariableInstr
/**
* @return local variable index referred by this instruction.
*/
+ @Override
public final int getIndex() {
return n;
}
@@ -151,6 +152,7 @@ public abstract class LocalVariableInstr
/**
* Set the local variable index
*/
+ @Override
public void setIndex( int n ) { // TODO could be package-protected?
if ((n < 0) || (n > Constants.MAX_SHORT)) {
throw new ClassGenException("Illegal value: " + n);
@@ -185,6 +187,7 @@ public abstract class LocalVariableInstr
* ASTORE may even work on a ReturnaddressType .
* @return type associated with the instruction
*/
+ @Override
public Type getType( ConstantPoolGen cp ) {
switch (canon_tag) {
case Constants.ILOAD:
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/MONITORENTER.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/MONITORENTER.java?rev=1695786&r1=1695785&r2=1695786&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/MONITORENTER.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/MONITORENTER.java Thu Aug 13 21:58:00 2015
@@ -33,6 +33,7 @@ public class MONITORENTER extends Instru
}
+ @Override
public Class<?>[] getExceptions() {
return new Class[] {
org.apache.commons.bcel6.ExceptionConstants.NULL_POINTER_EXCEPTION
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/MONITOREXIT.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/MONITOREXIT.java?rev=1695786&r1=1695785&r2=1695786&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/MONITOREXIT.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/MONITOREXIT.java Thu Aug 13 21:58:00 2015
@@ -33,6 +33,7 @@ public class MONITOREXIT extends Instruc
}
+ @Override
public Class<?>[] getExceptions() {
return new Class[] {
org.apache.commons.bcel6.ExceptionConstants.NULL_POINTER_EXCEPTION
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/MULTIANEWARRAY.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/MULTIANEWARRAY.java?rev=1695786&r1=1695785&r2=1695786&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/MULTIANEWARRAY.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/MULTIANEWARRAY.java Thu Aug 13 21:58:00 2015
@@ -115,6 +115,7 @@ public class MULTIANEWARRAY extends CPIn
}
+ @Override
public Class<?>[] getExceptions() {
return ExceptionConstants.createExceptions(ExceptionConstants.EXCS.EXCS_CLASS_AND_INTERFACE_RESOLUTION,
ExceptionConstants.ILLEGAL_ACCESS_ERROR,
@@ -122,6 +123,7 @@ public class MULTIANEWARRAY extends CPIn
}
+ @Override
public ObjectType getLoadClassType( ConstantPoolGen cpg ) {
Type t = getType(cpg);
if (t instanceof ArrayType) {
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/MethodGen.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/MethodGen.java?rev=1695786&r1=1695785&r2=1695786&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/MethodGen.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/MethodGen.java Thu Aug 13 21:58:00 2015
@@ -79,6 +79,7 @@ public class MethodGen extends FieldGenO
private static BCELComparator _cmp = new BCELComparator() {
+ @Override
public boolean equals( Object o1, Object o2 ) {
MethodGen THIS = (MethodGen) o1;
MethodGen THAT = (MethodGen) o2;
@@ -87,6 +88,7 @@ public class MethodGen extends FieldGenO
}
+ @Override
public int hashCode( Object o ) {
MethodGen THIS = (MethodGen) o;
return THIS.getSignature().hashCode() ^ THIS.getName().hashCode();
@@ -369,6 +371,7 @@ public class MethodGen extends FieldGenO
}
if (size > 1) {
Arrays.sort(lg, new Comparator<LocalVariableGen>() {
+ @Override
public int compare(LocalVariableGen o1, LocalVariableGen o2) {
return o1.getIndex() - o2.getIndex();
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/NEW.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/NEW.java?rev=1695786&r1=1695785&r2=1695786&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/NEW.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/NEW.java Thu Aug 13 21:58:00 2015
@@ -44,6 +44,7 @@ public class NEW extends CPInstruction i
}
+ @Override
public Class<?>[] getExceptions() {
return ExceptionConstants.createExceptions(ExceptionConstants.EXCS.EXCS_CLASS_AND_INTERFACE_RESOLUTION,
ExceptionConstants.ILLEGAL_ACCESS_ERROR,
@@ -51,6 +52,7 @@ public class NEW extends CPInstruction i
}
+ @Override
public ObjectType getLoadClassType( ConstantPoolGen cpg ) {
return (ObjectType) getType(cpg);
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/NEWARRAY.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/NEWARRAY.java?rev=1695786&r1=1695785&r2=1695786&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/NEWARRAY.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/NEWARRAY.java Thu Aug 13 21:58:00 2015
@@ -101,6 +101,7 @@ public class NEWARRAY extends Instructio
}
+ @Override
public Class<?>[] getExceptions() {
return new Class[] {
org.apache.commons.bcel6.ExceptionConstants.NEGATIVE_ARRAY_SIZE_EXCEPTION
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/PUSH.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/PUSH.java?rev=1695786&r1=1695785&r2=1695786&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/PUSH.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/PUSH.java Thu Aug 13 21:58:00 2015
@@ -170,6 +170,7 @@ public final class PUSH implements Compo
}
+ @Override
public final InstructionList getInstructionList() {
return new InstructionList(instruction);
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/PUTFIELD.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/PUTFIELD.java?rev=1695786&r1=1695785&r2=1695786&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/PUTFIELD.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/PUTFIELD.java Thu Aug 13 21:58:00 2015
@@ -52,6 +52,7 @@ public class PUTFIELD extends FieldInstr
}
+ @Override
public Class<?>[] getExceptions() {
return ExceptionConstants.createExceptions(ExceptionConstants.EXCS.EXCS_FIELD_AND_METHOD_RESOLUTION,
ExceptionConstants.NULL_POINTER_EXCEPTION,
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/PUTSTATIC.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/PUTSTATIC.java?rev=1695786&r1=1695785&r2=1695786&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/PUTSTATIC.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/PUTSTATIC.java Thu Aug 13 21:58:00 2015
@@ -52,6 +52,7 @@ public class PUTSTATIC extends FieldInst
}
+ @Override
public Class<?>[] getExceptions() {
return ExceptionConstants.createExceptions(ExceptionConstants.EXCS.EXCS_FIELD_AND_METHOD_RESOLUTION,
ExceptionConstants.INCOMPATIBLE_CLASS_CHANGE_ERROR);
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/RET.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/RET.java?rev=1695786&r1=1695785&r2=1695786&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/RET.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/RET.java Thu Aug 13 21:58:00 2015
@@ -97,6 +97,7 @@ public class RET extends Instruction imp
/**
* @return index of local variable containg the return address
*/
+ @Override
public final int getIndex() {
return index;
}
@@ -105,6 +106,7 @@ public class RET extends Instruction imp
/**
* Set index of local variable containg the return address
*/
+ @Override
public final void setIndex( int n ) {
if (n < 0) {
throw new ClassGenException("Negative index value: " + n);
@@ -125,6 +127,7 @@ public class RET extends Instruction imp
/** @return return address type
*/
+ @Override
public Type getType( ConstantPoolGen cp ) {
return ReturnaddressType.NO_TARGET;
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ReturnInstruction.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ReturnInstruction.java?rev=1695786&r1=1695785&r2=1695786&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ReturnInstruction.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ReturnInstruction.java Thu Aug 13 21:58:00 2015
@@ -67,6 +67,7 @@ public abstract class ReturnInstruction
}
+ @Override
public Class<?>[] getExceptions() {
return new Class[] {
ExceptionConstants.ILLEGAL_MONITOR_STATE
@@ -76,6 +77,7 @@ public abstract class ReturnInstruction
/** @return type associated with the instruction
*/
+ @Override
public Type getType( ConstantPoolGen cp ) {
return getType();
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/SIPUSH.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/SIPUSH.java?rev=1695786&r1=1695785&r2=1695786&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/SIPUSH.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/SIPUSH.java Thu Aug 13 21:58:00 2015
@@ -78,6 +78,7 @@ public class SIPUSH extends Instruction
}
+ @Override
public Number getValue() {
return Integer.valueOf(b);
}
@@ -85,6 +86,7 @@ public class SIPUSH extends Instruction
/** @return Type.SHORT
*/
+ @Override
public Type getType( ConstantPoolGen cp ) {
return Type.SHORT;
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/SWITCH.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/SWITCH.java?rev=1695786&r1=1695785&r2=1695786&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/SWITCH.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/SWITCH.java Thu Aug 13 21:58:00 2015
@@ -142,6 +142,7 @@ public final class SWITCH implements Com
}
+ @Override
public final InstructionList getInstructionList() {
return new InstructionList(instruction);
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/ClassLoaderRepository.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/ClassLoaderRepository.java?rev=1695786&r1=1695785&r2=1695786&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/ClassLoaderRepository.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/ClassLoaderRepository.java Thu Aug 13 21:58:00 2015
@@ -51,6 +51,7 @@ public class ClassLoaderRepository imple
/**
* Store a new JavaClass into this Repository.
*/
+ @Override
public void storeClass( JavaClass clazz ) {
loadedClasses.put(clazz.getClassName(), clazz);
clazz.setRepository(this);
@@ -60,6 +61,7 @@ public class ClassLoaderRepository imple
/**
* Remove class from repository
*/
+ @Override
public void removeClass( JavaClass clazz ) {
loadedClasses.remove(clazz.getClassName());
}
@@ -68,6 +70,7 @@ public class ClassLoaderRepository imple
/**
* Find an already defined JavaClass.
*/
+ @Override
public JavaClass findClass( String className ) {
return loadedClasses.containsKey(className) ? loadedClasses.get(className) : null;
}
@@ -76,6 +79,7 @@ public class ClassLoaderRepository imple
/**
* Lookup a JavaClass object from the Class Name provided.
*/
+ @Override
public JavaClass loadClass( String className ) throws ClassNotFoundException {
String classFile = className.replace('.', '/');
JavaClass RC = findClass(className);
@@ -101,6 +105,7 @@ public class ClassLoaderRepository imple
}
+ @Override
public JavaClass loadClass( Class<?> clazz ) throws ClassNotFoundException {
return loadClass(clazz.getName());
}
@@ -108,6 +113,7 @@ public class ClassLoaderRepository imple
/** Clear all entries from cache.
*/
+ @Override
public void clear() {
loadedClasses.clear();
}
@@ -116,6 +122,7 @@ public class ClassLoaderRepository imple
/*
* @return null
*/
+ @Override
public ClassPath getClassPath() {
return null;
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/ClassPath.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/ClassPath.java?rev=1695786&r1=1695785&r2=1695786&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/ClassPath.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/ClassPath.java Thu Aug 13 21:58:00 2015
@@ -48,6 +48,7 @@ public class ClassPath implements Serial
private static final FilenameFilter ARCHIVE_FILTER = new FilenameFilter() {
+ @Override
public boolean accept( File dir, String name ) {
name = name.toLowerCase(Locale.ENGLISH);
return name.endsWith(".zip") || name.endsWith(".jar");
@@ -421,11 +422,13 @@ public class ClassPath implements Serial
+ name.replace('.', File.separatorChar) + suffix);
return file.exists() ? new ClassFile() {
+ @Override
public InputStream getInputStream() throws IOException {
return new FileInputStream(file);
}
+ @Override
public String getPath() {
try {
return file.getCanonicalPath();
@@ -435,16 +438,19 @@ public class ClassPath implements Serial
}
+ @Override
public long getTime() {
return file.lastModified();
}
+ @Override
public long getSize() {
return file.length();
}
+ @Override
public String getBase() {
return dir;
}
@@ -498,26 +504,31 @@ public class ClassPath implements Serial
return new ClassFile() {
+ @Override
public InputStream getInputStream() throws IOException {
return zip.getInputStream(entry);
}
+ @Override
public String getPath() {
return entry.toString();
}
+ @Override
public long getTime() {
return entry.getTime();
}
+ @Override
public long getSize() {
return entry.getSize();
}
+ @Override
public String getBase() {
return zip.getName();
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/SyntheticRepository.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/SyntheticRepository.java?rev=1695786&r1=1695785&r2=1695786&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/SyntheticRepository.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/SyntheticRepository.java Thu Aug 13 21:58:00 2015
@@ -72,6 +72,7 @@ public class SyntheticRepository impleme
/**
* Store a new JavaClass instance into this Repository.
*/
+ @Override
public void storeClass( JavaClass clazz ) {
_loadedClasses.put(clazz.getClassName(), new SoftReference<JavaClass>(clazz));
clazz.setRepository(this);
@@ -81,6 +82,7 @@ public class SyntheticRepository impleme
/**
* Remove class from repository
*/
+ @Override
public void removeClass( JavaClass clazz ) {
_loadedClasses.remove(clazz.getClassName());
}
@@ -89,6 +91,7 @@ public class SyntheticRepository impleme
/**
* Find an already defined (cached) JavaClass object by name.
*/
+ @Override
public JavaClass findClass( String className ) {
SoftReference<JavaClass> ref = _loadedClasses.get(className);
if (ref == null) {
@@ -109,6 +112,7 @@ public class SyntheticRepository impleme
* @throws ClassNotFoundException if the class is not in the
* Repository, and could not be found on the classpath
*/
+ @Override
public JavaClass loadClass( String className ) throws ClassNotFoundException {
if (className == null || className.equals("")) {
throw new IllegalArgumentException("Invalid class name " + className);
@@ -140,6 +144,7 @@ public class SyntheticRepository impleme
* @throws ClassNotFoundException if the class is not in the
* Repository, and its representation could not be found
*/
+ @Override
public JavaClass loadClass( Class<?> clazz ) throws ClassNotFoundException {
InputStream clsStream = null;
try{
@@ -192,6 +197,7 @@ public class SyntheticRepository impleme
/** ClassPath associated with the Repository.
*/
+ @Override
public ClassPath getClassPath() {
return _path;
}
@@ -199,6 +205,7 @@ public class SyntheticRepository impleme
/** Clear all entries from cache.
*/
+ @Override
public void clear() {
_loadedClasses.clear();
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/TransitiveHull.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/TransitiveHull.java?rev=1695786&r1=1695785&r2=1695786&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/TransitiveHull.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/TransitiveHull.java Thu Aug 13 21:58:00 2015
@@ -40,6 +40,7 @@ public class TransitiveHull implements V
/* Implementing VerifierFactoryObserver. */
+ @Override
public void update( String classname ) {
System.gc(); // avoid swapping if possible.
for (int i = 0; i < indent; i++) {
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/VerifierAppFrame.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/VerifierAppFrame.java?rev=1695786&r1=1695785&r2=1695786&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/VerifierAppFrame.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/VerifierAppFrame.java Thu Aug 13 21:58:00 2015
@@ -128,6 +128,7 @@ public class VerifierAppFrame extends JF
messagesScrollPane.setPreferredSize(new Dimension(10, 10));
classNamesJList.addListSelectionListener(new javax.swing.event.ListSelectionListener() {
+ @Override
public void valueChanged( ListSelectionEvent e ) {
classNamesJList_valueChanged(e);
}
@@ -152,6 +153,7 @@ public class VerifierAppFrame extends JF
InputEvent.CTRL_MASK, true));
newFileMenuItem.addActionListener(new java.awt.event.ActionListener() {
+ @Override
public void actionPerformed( ActionEvent e ) {
newFileMenuItem_actionPerformed(e);
}
@@ -160,12 +162,14 @@ public class VerifierAppFrame extends JF
pass3bTextPane.setEditable(false);
pass3aJList.addListSelectionListener(new javax.swing.event.ListSelectionListener() {
+ @Override
public void valueChanged( ListSelectionEvent e ) {
pass3aJList_valueChanged(e);
}
});
pass3bJList.addListSelectionListener(new javax.swing.event.ListSelectionListener() {
+ @Override
public void valueChanged( ListSelectionEvent e ) {
pass3bJList_valueChanged(e);
}
@@ -174,6 +178,7 @@ public class VerifierAppFrame extends JF
whatisMenuItem.setText("What is...");
whatisMenuItem.addActionListener(new java.awt.event.ActionListener() {
+ @Override
public void actionPerformed( ActionEvent e ) {
whatisMenuItem_actionPerformed(e);
}
@@ -181,6 +186,7 @@ public class VerifierAppFrame extends JF
aboutMenuItem.setText("About");
aboutMenuItem.addActionListener(new java.awt.event.ActionListener() {
+ @Override
public void actionPerformed( ActionEvent e ) {
aboutMenuItem_actionPerformed(e);
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/VerifierFactoryListModel.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/VerifierFactoryListModel.java?rev=1695786&r1=1695785&r2=1695786&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/VerifierFactoryListModel.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/VerifierFactoryListModel.java Thu Aug 13 21:58:00 2015
@@ -44,6 +44,7 @@ public class VerifierFactoryListModel im
}
+ @Override
public synchronized void update( String s ) {
Verifier[] verifiers = VerifierFactory.getVerifiers();
int num_of_verifiers = verifiers.length;
@@ -58,21 +59,25 @@ public class VerifierFactoryListModel im
}
+ @Override
public synchronized void addListDataListener( ListDataListener l ) {
listeners.add(l);
}
+ @Override
public synchronized void removeListDataListener( javax.swing.event.ListDataListener l ) {
listeners.remove(l);
}
+ @Override
public synchronized int getSize() {
return cache.size();
}
+ @Override
public synchronized String getElementAt( int index ) {
return (cache.toArray(new String[cache.size()]))[index];
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/VerifyDialog.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/VerifyDialog.java?rev=1695786&r1=1695785&r2=1695786&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/VerifyDialog.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/VerifyDialog.java Thu Aug 13 21:58:00 2015
@@ -70,6 +70,7 @@ public class VerifyDialog extends javax.
/** Machine-generated. */
class IvjEventHandler implements java.awt.event.ActionListener {
+ @Override
public void actionPerformed( java.awt.event.ActionEvent e ) {
if (e.getSource() == VerifyDialog.this.getPass1Button()) {
connEtoC1(e);
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/structurals/ControlFlowGraph.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/structurals/ControlFlowGraph.java?rev=1695786&r1=1695785&r2=1695786&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/structurals/ControlFlowGraph.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/structurals/ControlFlowGraph.java Thu Aug 13 21:58:00 2015
@@ -94,11 +94,13 @@ public class ControlFlowGraph{
}
/* Satisfies InstructionContext.getTag(). */
+ @Override
public int getTag(){
return TAG;
}
/* Satisfies InstructionContext.setTag(int). */
+ @Override
public void setTag(int tag){ // part of InstructionContext interface
TAG = tag;
}
@@ -106,6 +108,7 @@ public class ControlFlowGraph{
/**
* Returns the exception handlers of this instruction.
*/
+ @Override
public ExceptionHandler[] getExceptionHandlers(){
return exceptionhandlers.getExceptionHandlers(getInstruction());
}
@@ -113,6 +116,7 @@ public class ControlFlowGraph{
/**
* Returns a clone of the "outgoing" frame situation with respect to the given ExecutionChain.
*/
+ @Override
public Frame getOutFrame(ArrayList<InstructionContext> execChain){
executionPredecessors = execChain;
@@ -128,6 +132,7 @@ public class ControlFlowGraph{
return org.getClone();
}
+ @Override
public Frame getInFrame() {
Frame org;
@@ -156,6 +161,7 @@ public class ControlFlowGraph{
* @return true - if and only if the "outgoing" frame situation
* changed from the one before execute()ing.
*/
+ @Override
public boolean execute(Frame inFrame, ArrayList<InstructionContext> execPreds, InstConstraintVisitor icv, ExecutionVisitor ev){
@SuppressWarnings("unchecked") // OK because execPreds is compatible type
@@ -273,6 +279,7 @@ public class ControlFlowGraph{
/*
* Fulfils the contract of InstructionContext.getInstruction().
*/
+ @Override
public InstructionHandle getInstruction(){
return instruction;
}
@@ -306,6 +313,7 @@ public class ControlFlowGraph{
}
/* Satisfies InstructionContext.getSuccessors(). */
+ @Override
public InstructionContext[] getSuccessors(){
return contextsOf(_getSuccessors());
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/structurals/Subroutines.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/structurals/Subroutines.java?rev=1695786&r1=1695785&r2=1695786&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/structurals/Subroutines.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/structurals/Subroutines.java Thu Aug 13 21:58:00 2015
@@ -90,6 +90,7 @@ public class Subroutines{
/*
* Refer to the Subroutine interface for documentation.
*/
+ @Override
public boolean contains(InstructionHandle inst){
return instructions.contains(inst);
}
@@ -162,6 +163,7 @@ public class Subroutines{
/*
* Refer to the Subroutine interface for documentation.
*/
+ @Override
public InstructionHandle[] getEnteringJsrInstructions(){
if (this == TOPLEVEL) {
throw new AssertionViolatedException("getLeavingRET() called on top level pseudo-subroutine.");
@@ -192,6 +194,7 @@ public class Subroutines{
/*
* Refer to the Subroutine interface for documentation.
*/
+ @Override
public InstructionHandle getLeavingRET(){
if (this == TOPLEVEL) {
throw new AssertionViolatedException("getLeavingRET() called on top level pseudo-subroutine.");
@@ -202,6 +205,7 @@ public class Subroutines{
/*
* Refer to the Subroutine interface for documentation.
*/
+ @Override
public InstructionHandle[] getInstructions(){
InstructionHandle[] ret = new InstructionHandle[instructions.size()];
return instructions.toArray(ret);
@@ -220,6 +224,7 @@ public class Subroutines{
}
/* Satisfies Subroutine.getRecursivelyAccessedLocalsIndices(). */
+ @Override
public int[] getRecursivelyAccessedLocalsIndices(){
Set<Integer> s = new HashSet<Integer>();
int[] lvs = getAccessedLocalsIndices();
@@ -255,6 +260,7 @@ public class Subroutines{
/*
* Satisfies Subroutine.getAccessedLocalIndices().
*/
+ @Override
public int[] getAccessedLocalsIndices(){
//TODO: Implement caching.
Set<Integer> acc = new HashSet<Integer>();
@@ -299,6 +305,7 @@ public class Subroutines{
/*
* Satisfies Subroutine.subSubs().
*/
+ @Override
public Subroutine[] subSubs(){
Set<Subroutine> h = new HashSet<Subroutine>();
Modified: commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/BCELBenchmark.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/BCELBenchmark.java?rev=1695786&r1=1695785&r2=1695786&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/BCELBenchmark.java (original)
+++ commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/BCELBenchmark.java Thu Aug 13 21:58:00 2015
@@ -59,6 +59,7 @@ public class BCELBenchmark {
private Iterable<JarEntry> getClasses(JarFile jar) {
return new IteratorIterable<JarEntry>(new FilterIterator<JarEntry>(new EnumerationIterator<JarEntry>(jar.entries()), new Predicate<JarEntry>() {
+ @Override
public boolean evaluate(JarEntry entry) {
return entry.getName().endsWith(".class");
}
Modified: commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/PerformanceTest.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/PerformanceTest.java?rev=1695786&r1=1695785&r2=1695786&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/PerformanceTest.java (original)
+++ commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/PerformanceTest.java Thu Aug 13 21:58:00 2015
@@ -131,6 +131,7 @@ public final class PerformanceTest exten
File javaLib = new File(System.getProperty("java.home") + "/lib");
javaLib.listFiles(new FileFilter() {
+ @Override
public boolean accept(File file) {
if(file.getName().endsWith(".jar")) {
try {
Modified: commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/data/AnonymousClassTest.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/data/AnonymousClassTest.java?rev=1695786&r1=1695785&r2=1695786&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/data/AnonymousClassTest.java (original)
+++ commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/data/AnonymousClassTest.java Thu Aug 13 21:58:00 2015
@@ -24,6 +24,7 @@ public class AnonymousClassTest
{
new Runnable()
{
+ @Override
public void run()
{
}
Modified: commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/data/AttributeTestClassEM02.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/data/AttributeTestClassEM02.java?rev=1695786&r1=1695785&r2=1695786&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/data/AttributeTestClassEM02.java (original)
+++ commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/data/AttributeTestClassEM02.java Thu Aug 13 21:58:00 2015
@@ -22,6 +22,7 @@ public class AttributeTestClassEM02
{
Runnable r = new Runnable()
{
+ @Override
public void run()
{
System.err.println("hello");
Modified: commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/visitors/CounterVisitor.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/visitors/CounterVisitor.java?rev=1695786&r1=1695785&r2=1695786&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/visitors/CounterVisitor.java (original)
+++ commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/visitors/CounterVisitor.java Thu Aug 13 21:58:00 2015
@@ -150,216 +150,259 @@ public class CounterVisitor implements V
public int methodParametersCount = 0;
+ @Override
public void visitAnnotation(Annotations obj)
{
annotationCount++;
}
+ @Override
public void visitAnnotationDefault(AnnotationDefault obj)
{
annotationDefaultCount++;
}
+ @Override
public void visitAnnotationEntry(AnnotationEntry obj)
{
annotationEntryCount++;
}
+ @Override
public void visitCode(Code obj)
{
codeCount++;
}
+ @Override
public void visitCodeException(CodeException obj)
{
codeExceptionCount++;
}
+ @Override
public void visitConstantClass(ConstantClass obj)
{
constantClassCount++;
}
+ @Override
public void visitConstantDouble(ConstantDouble obj)
{
constantDoubleCount++;
}
+ @Override
public void visitConstantFieldref(ConstantFieldref obj)
{
constantFieldrefCount++;
}
+ @Override
public void visitConstantFloat(ConstantFloat obj)
{
constantFloatCount++;
}
+ @Override
public void visitConstantInteger(ConstantInteger obj)
{
constantIntegerCount++;
}
+ @Override
public void visitConstantInterfaceMethodref(ConstantInterfaceMethodref obj)
{
constantInterfaceMethodrefCount++;
}
+ @Override
public void visitConstantLong(ConstantLong obj)
{
constantLongCount++;
}
+ @Override
public void visitConstantMethodref(ConstantMethodref obj)
{
constantMethodrefCount++;
}
+ @Override
public void visitConstantNameAndType(ConstantNameAndType obj)
{
constantNameAndTypeCount++;
}
+ @Override
public void visitConstantPool(ConstantPool obj)
{
constantPoolCount++;
}
+ @Override
public void visitConstantString(ConstantString obj)
{
constantStringCount++;
}
+ @Override
public void visitConstantUtf8(ConstantUtf8 obj)
{
constantUtf8Count++;
}
+ @Override
public void visitConstantValue(ConstantValue obj)
{
constantValueCount++;
}
+ @Override
public void visitDeprecated(Deprecated obj)
{
deprecatedCount++;
}
+ @Override
public void visitEnclosingMethod(EnclosingMethod obj)
{
enclosingMethodCount++;
}
+ @Override
public void visitExceptionTable(ExceptionTable obj)
{
exceptionTableCount++;
}
+ @Override
public void visitField(Field obj)
{
fieldCount++;
}
+ @Override
public void visitInnerClass(InnerClass obj)
{
innerClassCount++;
}
+ @Override
public void visitInnerClasses(InnerClasses obj)
{
innerClassesCount++;
}
+ @Override
public void visitJavaClass(JavaClass obj)
{
javaClassCount++;
}
+ @Override
public void visitLineNumber(LineNumber obj)
{
lineNumberCount++;
}
+ @Override
public void visitLineNumberTable(LineNumberTable obj)
{
lineNumberTableCount++;
}
+ @Override
public void visitLocalVariable(LocalVariable obj)
{
localVariableCount++;
}
+ @Override
public void visitLocalVariableTable(LocalVariableTable obj)
{
localVariableTableCount++;
}
+ @Override
public void visitLocalVariableTypeTable(LocalVariableTypeTable obj)
{
localVariableTypeTableCount++;
}
+ @Override
public void visitMethod(Method obj)
{
methodCount++;
}
+ @Override
public void visitParameterAnnotation(ParameterAnnotations obj)
{
parameterAnnotationCount++;
}
+ @Override
public void visitSignature(Signature obj)
{
signatureAnnotationCount++;
}
+ @Override
public void visitSourceFile(SourceFile obj)
{
sourceFileCount++;
}
+ @Override
public void visitStackMap(StackMap obj)
{
stackMapCount++;
}
+ @Override
public void visitStackMapEntry(StackMapEntry obj)
{
stackMapEntryCount++;
}
+ @Override
public void visitSynthetic(Synthetic obj)
{
syntheticCount++;
}
+ @Override
public void visitUnknown(Unknown obj)
{
unknownCount++;
}
+ @Override
public void visitStackMapTable(StackMapTable obj)
{
stackMapTableCount++;
}
+ @Override
public void visitStackMapTableEntry(StackMapTableEntry obj)
{
stackMapTableEntryCount++;
}
+ @Override
public void visitBootstrapMethods(BootstrapMethods obj)
{
bootstrapMethodsCount++;
}
+ @Override
public void visitMethodParameters(MethodParameters obj)
{
methodParametersCount++;
}
+ @Override
public void visitConstantInvokeDynamic(ConstantInvokeDynamic obj)
{
}