You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by se...@apache.org on 2015/08/18 14:16:22 UTC
svn commit: r1696410 - in
/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6: generic/
util/ verifier/ verifier/exc/ verifier/statics/ verifier/structurals/
Author: sebb
Date: Tue Aug 18 12:16:21 2015
New Revision: 1696410
URL: http://svn.apache.org/r1696410
Log:
Add @since markers
Modified:
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ARRAYLENGTH.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/BasicType.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/BranchInstruction.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/Instruction.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ObjectType.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/PUSH.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/Select.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/Type.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/ClassPath.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/VerifierFactoryListModel.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/exc/AssertionViolatedException.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/exc/ClassConstraintException.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/statics/StringRepresentation.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/structurals/ExecutionVisitor.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/structurals/InstConstraintVisitor.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/structurals/Pass3bVerifier.java
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ARRAYLENGTH.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ARRAYLENGTH.java?rev=1696410&r1=1696409&r2=1696410&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ARRAYLENGTH.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ARRAYLENGTH.java Tue Aug 18 12:16:21 2015
@@ -23,7 +23,7 @@ package org.apache.commons.bcel6.generic
*
* @version $Id$
*/
-public class ARRAYLENGTH extends Instruction implements ExceptionThrower, StackProducer, StackConsumer {
+public class ARRAYLENGTH extends Instruction implements ExceptionThrower, StackProducer, StackConsumer /* since 6.0 */ {
private static final long serialVersionUID = 3038891629544391578L;
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/BasicType.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/BasicType.java?rev=1696410&r1=1696409&r2=1696410&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/BasicType.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/BasicType.java Tue Aug 18 12:16:21 2015
@@ -43,6 +43,7 @@ public final class BasicType extends Typ
}
+ // @since 6.0 no longer final
public static BasicType getType( byte type ) {
switch (type) {
case Constants.T_VOID:
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/BranchInstruction.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/BranchInstruction.java?rev=1696410&r1=1696409&r2=1696410&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/BranchInstruction.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/BranchInstruction.java Tue Aug 18 12:16:21 2015
@@ -244,6 +244,7 @@ public abstract class BranchInstruction
/**
* @return the position
+ * @since 6.0
*/
public int getPosition() {
return position;
@@ -253,8 +254,9 @@ public abstract class BranchInstruction
/**
* @param position the position to set
* @return the new position
+ * @since 6.0
*/
- public int setGetPosition(int position) {
+ protected int setGetPosition(int position) {
this.position = position;
return position;
}
@@ -262,6 +264,7 @@ public abstract class BranchInstruction
/**
* @param index the index to set
+ * @since 6.0
*/
protected void setIndex(int index) {
this.index = index;
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/Instruction.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/Instruction.java?rev=1696410&r1=1696409&r2=1696410&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/Instruction.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/Instruction.java Tue Aug 18 12:16:21 2015
@@ -144,6 +144,7 @@ public abstract class Instruction implem
* @param bytes input stream bytes
* @return instruction object being read
*/
+ // @since 6.0 no longer final
public static Instruction readInstruction( ByteSequence bytes ) throws IOException {
boolean wide = false;
short opcode = (short) bytes.readUnsignedByte();
@@ -538,6 +539,7 @@ public abstract class Instruction implem
/** calculate the hashCode of this object
* @return the hashCode
+ * @since 6.0
*/
@Override
public int hashCode() {
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ObjectType.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ObjectType.java?rev=1696410&r1=1696409&r2=1696410&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ObjectType.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ObjectType.java Tue Aug 18 12:16:21 2015
@@ -31,6 +31,9 @@ public class ObjectType extends Referenc
private static final long serialVersionUID = -2819379966444533294L;
private final String class_name; // Class name of type
+ /**
+ * @since 6.0
+ */
public static ObjectType getInstance(String class_name) {
return new ObjectType(class_name);
}
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=1696410&r1=1696409&r2=1696410&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 Tue Aug 18 12:16:21 2015
@@ -121,6 +121,7 @@ public final class PUSH implements Compo
*
* @param cp
* @param value
+ * @since 6.0
*/
public PUSH(ConstantPoolGen cp, ObjectType value) {
if (value == null) {
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/Select.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/Select.java?rev=1696410&r1=1696409&r2=1696410&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/Select.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/Select.java Tue Aug 18 12:16:21 2015
@@ -33,7 +33,7 @@ import org.apache.commons.bcel6.util.Byt
* @see InstructionList
*/
public abstract class Select extends BranchInstruction implements VariableLengthInstruction,
- StackConsumer, StackProducer {
+ StackConsumer /* @since 6.0 */, StackProducer {
private static final long serialVersionUID = 2806771744559217250L;
protected int[] match; // matches, i.e., case 1: ... TODO could be package-protected?
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/Type.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/Type.java?rev=1696410&r1=1696409&r2=1696410&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/Type.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/Type.java Tue Aug 18 12:16:21 2015
@@ -113,6 +113,7 @@ public abstract class Type implements ja
* returns the given type.
* @see OperandStack#push(Type)
* @see LocalVariables#set(int, Type)
+ * @since 6.0
*/
public Type normalizeForStackOrLocal(){
if (this == Type.BOOLEAN || this == Type.BYTE || this == Type.SHORT || this == Type.CHAR){
@@ -191,6 +192,7 @@ public abstract class Type implements ja
* @param signature signature string such as Ljava/lang/String;
* @return type object
*/
+ // @since 6.0 no longer final
public static Type getType( String signature ) throws StringIndexOutOfBoundsException {
byte type = Utility.typeOfSignature(signature);
if (type <= Constants.T_VOID) {
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=1696410&r1=1696409&r2=1696410&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 Tue Aug 18 12:16:21 2015
@@ -143,6 +143,7 @@ public class ClassPath implements Serial
*
* @return class path as used by default by BCEL
*/
+ // @since 6.0 no longer final
public static String getClassPath() {
String class_path = System.getProperty("java.class.path");
String boot_path = System.getProperty("sun.boot.class.path");
@@ -203,6 +204,7 @@ public class ClassPath implements Serial
/**
* @param name fully qualified resource name, e.g. java/lang/String.class
* @return InputStream supplying the resource, or null if no resource with that name.
+ * @since 6.0
*/
public InputStream getResourceAsStream(String name) {
for (PathEntry path : paths) {
@@ -217,6 +219,7 @@ public class ClassPath implements Serial
/**
* @param name fully qualified resource name, e.g. java/lang/String.class
* @return URL supplying the resource, or null if no resource with that name.
+ * @since 6.0
*/
public URL getResource(String name) {
for (PathEntry path : paths) {
@@ -232,6 +235,7 @@ public class ClassPath implements Serial
* @param name fully qualified resource name, e.g. java/lang/String.class
* @return An Enumeration of URLs supplying the resource, or an
* empty Enumeration if no resource with that name.
+ * @since 6.0
*/
public Enumeration<URL> getResources(String name) {
Vector<URL> results = new Vector<>();
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=1696410&r1=1696409&r2=1696410&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 Tue Aug 18 12:16:21 2015
@@ -77,6 +77,9 @@ public class VerifierFactoryListModel im
}
+ /**
+ * @since 6.0
+ */
@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/exc/AssertionViolatedException.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/exc/AssertionViolatedException.java?rev=1696410&r1=1696409&r2=1696410&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/exc/AssertionViolatedException.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/exc/AssertionViolatedException.java Tue Aug 18 12:16:21 2015
@@ -42,6 +42,7 @@ public final class AssertionViolatedExce
}
/**
* Constructs a new AssertionViolationException with the specified error message and initial cause
+ * @since 6.0
*/
public AssertionViolatedException(String message, Throwable initCause) {
super(message = "INTERNAL ERROR: "+message, initCause);
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/exc/ClassConstraintException.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/exc/ClassConstraintException.java?rev=1696410&r1=1696409&r2=1696410&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/exc/ClassConstraintException.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/exc/ClassConstraintException.java Tue Aug 18 12:16:21 2015
@@ -44,6 +44,7 @@ public class ClassConstraintException ex
/**
* Constructs a new ClassConstraintException with the specified error message and cause
+ * @since 6.0
*/
public ClassConstraintException(String message, Throwable initCause){
super(message, initCause);
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/statics/StringRepresentation.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/statics/StringRepresentation.java?rev=1696410&r1=1696409&r2=1696410&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/statics/StringRepresentation.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/statics/StringRepresentation.java Tue Aug 18 12:16:21 2015
@@ -134,6 +134,9 @@ public class StringRepresentation extend
tostring = "<CODE>"; // We don't need real code outputs.
}
+ /**
+ * @since 6.0
+ */
@Override
public void visitAnnotation(Annotations obj)
{
@@ -142,6 +145,9 @@ public class StringRepresentation extend
tostring = toString(obj);
}
+ /**
+ * @since 6.0
+ */
@Override
public void visitLocalVariableTypeTable(LocalVariableTypeTable obj)
{
@@ -290,6 +296,9 @@ public class StringRepresentation extend
tostring = toString(obj);
}
+ /**
+ * @since 6.0
+ */
@Override
public void visitStackMapTable(StackMapTable obj) {
tostring = toString(obj);
@@ -305,16 +314,25 @@ public class StringRepresentation extend
tostring = toString(obj);
}
+ /**
+ * @since 6.0
+ */
@Override
public void visitEnclosingMethod(EnclosingMethod obj) {
tostring = toString(obj);
}
+ /**
+ * @since 6.0
+ */
@Override
public void visitBootstrapMethods(BootstrapMethods obj) {
tostring = toString(obj);
}
+ /**
+ * @since 6.0
+ */
@Override
public void visitMethodParameters(MethodParameters obj) {
tostring = toString(obj);
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/structurals/ExecutionVisitor.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/structurals/ExecutionVisitor.java?rev=1696410&r1=1696409&r2=1696410&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/structurals/ExecutionVisitor.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/structurals/ExecutionVisitor.java Tue Aug 18 12:16:21 2015
@@ -785,7 +785,10 @@ public class ExecutionVisitor extends Em
stack().pop();
stack().push(Type.INT);
}
- /** Symbolically executes the corresponding Java Virtual Machine instruction. */
+ /**
+ * Symbolically executes the corresponding Java Virtual Machine instruction.
+ * @since 6.0
+ */
@Override
public void visitINVOKEDYNAMIC(INVOKEDYNAMIC o){
for (int i=0; i<o.getArgumentTypes(cpg).length; i++){
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/structurals/InstConstraintVisitor.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/structurals/InstConstraintVisitor.java?rev=1696410&r1=1696409&r2=1696410&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/structurals/InstConstraintVisitor.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/structurals/InstConstraintVisitor.java Tue Aug 18 12:16:21 2015
@@ -1751,6 +1751,7 @@ public class InstConstraintVisitor exten
/**
* Ensures the specific preconditions of the said instruction.
+ * @since 6.0
*/
@Override
public void visitINVOKEDYNAMIC(INVOKEDYNAMIC o){
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/structurals/Pass3bVerifier.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/structurals/Pass3bVerifier.java?rev=1696410&r1=1696409&r2=1696410&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/structurals/Pass3bVerifier.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/structurals/Pass3bVerifier.java Tue Aug 18 12:16:21 2015
@@ -280,6 +280,7 @@ public final class Pass3bVerifier extend
/**
* Throws an exception indicating the returned type is not compatible with the return type of the given method
* @throws StructuralCodeConstraintException always
+ * @since 6.0
*/
public void invalidReturnTypeError(Type returnedType, MethodGen m){
throw new StructuralCodeConstraintException("Returned type "+returnedType+" does not match Method's return type "+m.getReturnType());