svn commit: r170497 [2/2] - in /jakarta/bcel/trunk/src/java/org/apache/bcel: ./ classfile/ generic/ util/ verifier/ verifier/exc/ verifier/statics/ verifier/structurals/
[email protected] Tue, 17 May 2005 01:04:35 -0000
Newsgroups
gmane.comp.jakarta.bcel.devel
Message-ID
<[email protected] >
Modified: jakarta/bcel/trunk/src/java/org/apache/bcel/verifier/exc/Utility.java
URL: http://svn.apache.org/viewcvs/jakarta/bcel/trunk/src/java/org/apache/bcel/verifier/exc/Utility.java?rev=170497&r1=170496&r2=170497&view=diff
==============================================================================
--- jakarta/bcel/trunk/src/java/org/apache/bcel/verifier/exc/Utility.java (original)
+++ jakarta/bcel/trunk/src/java/org/apache/bcel/verifier/exc/Utility.java Mon May 16 18:04:32 2005
@@ -17,7 +17,8 @@
package org.apache.bcel.verifier.exc;
-import java.io.*;
+import java.io.PrintWriter;
+import java.io.StringWriter;
/**
* A utility class providing convenience methods concerning Throwable instances.
Modified: jakarta/bcel/trunk/src/java/org/apache/bcel/verifier/statics/LocalVariableInfo.java
URL: http://svn.apache.org/viewcvs/jakarta/bcel/trunk/src/java/org/apache/bcel/verifier/statics/LocalVariableInfo.java?rev=170497&r1=170496&r2=170497&view=diff
==============================================================================
--- jakarta/bcel/trunk/src/java/org/apache/bcel/verifier/statics/LocalVariableInfo.java (original)
+++ jakarta/bcel/trunk/src/java/org/apache/bcel/verifier/statics/LocalVariableInfo.java Mon May 16 18:04:32 2005
@@ -17,9 +17,9 @@
package org.apache.bcel.verifier.statics;
-import org.apache.bcel.generic.Type;
-import org.apache.bcel.verifier.exc.*;
import java.util.Hashtable;
+import org.apache.bcel.generic.Type;
+import org.apache.bcel.verifier.exc.LocalVariableInfoInconsistentException;
/**
* A utility class holding the information about
Modified: jakarta/bcel/trunk/src/java/org/apache/bcel/verifier/statics/LocalVariablesInfo.java
URL: http://svn.apache.org/viewcvs/jakarta/bcel/trunk/src/java/org/apache/bcel/verifier/statics/LocalVariablesInfo.java?rev=170497&r1=170496&r2=170497&view=diff
==============================================================================
--- jakarta/bcel/trunk/src/java/org/apache/bcel/verifier/statics/LocalVariablesInfo.java (original)
+++ jakarta/bcel/trunk/src/java/org/apache/bcel/verifier/statics/LocalVariablesInfo.java Mon May 16 18:04:32 2005
@@ -18,7 +18,8 @@
import org.apache.bcel.generic.Type;
-import org.apache.bcel.verifier.exc.*;
+import org.apache.bcel.verifier.exc.AssertionViolatedException;
+import org.apache.bcel.verifier.exc.LocalVariableInfoInconsistentException;
/**
* A utility class holding the information about
Modified: jakarta/bcel/trunk/src/java/org/apache/bcel/verifier/statics/Pass1Verifier.java
URL: http://svn.apache.org/viewcvs/jakarta/bcel/trunk/src/java/org/apache/bcel/verifier/statics/Pass1Verifier.java?rev=170497&r1=170496&r2=170497&view=diff
==============================================================================
--- jakarta/bcel/trunk/src/java/org/apache/bcel/verifier/statics/Pass1Verifier.java (original)
+++ jakarta/bcel/trunk/src/java/org/apache/bcel/verifier/statics/Pass1Verifier.java Mon May 16 18:04:32 2005
@@ -17,10 +17,13 @@
package org.apache.bcel.verifier.statics;
-import org.apache.bcel.classfile.*;
import org.apache.bcel.Repository;
-import org.apache.bcel.verifier.*;
-import org.apache.bcel.verifier.exc.*;
+import org.apache.bcel.classfile.ClassFormatException;
+import org.apache.bcel.classfile.JavaClass;
+import org.apache.bcel.verifier.PassVerifier;
+import org.apache.bcel.verifier.VerificationResult;
+import org.apache.bcel.verifier.Verifier;
+import org.apache.bcel.verifier.exc.LoadingException;
import org.apache.bcel.verifier.exc.Utility;
/**
Modified: jakarta/bcel/trunk/src/java/org/apache/bcel/verifier/statics/Pass2Verifier.java
URL: http://svn.apache.org/viewcvs/jakarta/bcel/trunk/src/java/org/apache/bcel/verifier/statics/Pass2Verifier.java?rev=170497&r1=170496&r2=170497&view=diff
==============================================================================
--- jakarta/bcel/trunk/src/java/org/apache/bcel/verifier/statics/Pass2Verifier.java (original)
+++ jakarta/bcel/trunk/src/java/org/apache/bcel/verifier/statics/Pass2Verifier.java Mon May 16 18:04:32 2005
@@ -21,7 +21,6 @@
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
-
import org.apache.bcel.Constants;
import org.apache.bcel.Repository;
import org.apache.bcel.classfile.Attribute;
Modified: jakarta/bcel/trunk/src/java/org/apache/bcel/verifier/statics/Pass3aVerifier.java
URL: http://svn.apache.org/viewcvs/jakarta/bcel/trunk/src/java/org/apache/bcel/verifier/statics/Pass3aVerifier.java?rev=170497&r1=170496&r2=170497&view=diff
==============================================================================
--- jakarta/bcel/trunk/src/java/org/apache/bcel/verifier/statics/Pass3aVerifier.java (original)
+++ jakarta/bcel/trunk/src/java/org/apache/bcel/verifier/statics/Pass3aVerifier.java Mon May 16 18:04:32 2005
@@ -17,11 +17,85 @@
package org.apache.bcel.verifier.statics;
-import org.apache.bcel.*;
-import org.apache.bcel.generic.*;
-import org.apache.bcel.classfile.*;
-import org.apache.bcel.verifier.*;
-import org.apache.bcel.verifier.exc.*;
+import org.apache.bcel.Constants;
+import org.apache.bcel.Repository;
+import org.apache.bcel.classfile.Attribute;
+import org.apache.bcel.classfile.Code;
+import org.apache.bcel.classfile.CodeException;
+import org.apache.bcel.classfile.Constant;
+import org.apache.bcel.classfile.ConstantClass;
+import org.apache.bcel.classfile.ConstantDouble;
+import org.apache.bcel.classfile.ConstantFieldref;
+import org.apache.bcel.classfile.ConstantFloat;
+import org.apache.bcel.classfile.ConstantInteger;
+import org.apache.bcel.classfile.ConstantInterfaceMethodref;
+import org.apache.bcel.classfile.ConstantLong;
+import org.apache.bcel.classfile.ConstantMethodref;
+import org.apache.bcel.classfile.ConstantNameAndType;
+import org.apache.bcel.classfile.ConstantString;
+import org.apache.bcel.classfile.ConstantUtf8;
+import org.apache.bcel.classfile.Field;
+import org.apache.bcel.classfile.JavaClass;
+import org.apache.bcel.classfile.LineNumber;
+import org.apache.bcel.classfile.LineNumberTable;
+import org.apache.bcel.classfile.LocalVariable;
+import org.apache.bcel.classfile.LocalVariableTable;
+import org.apache.bcel.classfile.Method;
+import org.apache.bcel.generic.ALOAD;
+import org.apache.bcel.generic.ANEWARRAY;
+import org.apache.bcel.generic.ASTORE;
+import org.apache.bcel.generic.ATHROW;
+import org.apache.bcel.generic.ArrayType;
+import org.apache.bcel.generic.BREAKPOINT;
+import org.apache.bcel.generic.CHECKCAST;
+import org.apache.bcel.generic.ConstantPoolGen;
+import org.apache.bcel.generic.DLOAD;
+import org.apache.bcel.generic.DSTORE;
+import org.apache.bcel.generic.FLOAD;
+import org.apache.bcel.generic.FSTORE;
+import org.apache.bcel.generic.FieldInstruction;
+import org.apache.bcel.generic.GETSTATIC;
+import org.apache.bcel.generic.GotoInstruction;
+import org.apache.bcel.generic.IINC;
+import org.apache.bcel.generic.ILOAD;
+import org.apache.bcel.generic.IMPDEP1;
+import org.apache.bcel.generic.IMPDEP2;
+import org.apache.bcel.generic.INSTANCEOF;
+import org.apache.bcel.generic.INVOKEINTERFACE;
+import org.apache.bcel.generic.INVOKESPECIAL;
+import org.apache.bcel.generic.INVOKESTATIC;
+import org.apache.bcel.generic.INVOKEVIRTUAL;
+import org.apache.bcel.generic.ISTORE;
+import org.apache.bcel.generic.Instruction;
+import org.apache.bcel.generic.InstructionHandle;
+import org.apache.bcel.generic.InstructionList;
+import org.apache.bcel.generic.InvokeInstruction;
+import org.apache.bcel.generic.JsrInstruction;
+import org.apache.bcel.generic.LDC;
+import org.apache.bcel.generic.LDC2_W;
+import org.apache.bcel.generic.LLOAD;
+import org.apache.bcel.generic.LOOKUPSWITCH;
+import org.apache.bcel.generic.LSTORE;
+import org.apache.bcel.generic.LoadClass;
+import org.apache.bcel.generic.MULTIANEWARRAY;
+import org.apache.bcel.generic.NEW;
+import org.apache.bcel.generic.NEWARRAY;
+import org.apache.bcel.generic.ObjectType;
+import org.apache.bcel.generic.PUTSTATIC;
+import org.apache.bcel.generic.RET;
+import org.apache.bcel.generic.ReturnInstruction;
+import org.apache.bcel.generic.TABLESWITCH;
+import org.apache.bcel.generic.Type;
+import org.apache.bcel.verifier.PassVerifier;
+import org.apache.bcel.verifier.VerificationResult;
+import org.apache.bcel.verifier.Verifier;
+import org.apache.bcel.verifier.VerifierFactory;
+import org.apache.bcel.verifier.exc.AssertionViolatedException;
+import org.apache.bcel.verifier.exc.ClassConstraintException;
+import org.apache.bcel.verifier.exc.InvalidMethodException;
+import org.apache.bcel.verifier.exc.StaticCodeConstraintException;
+import org.apache.bcel.verifier.exc.StaticCodeInstructionConstraintException;
+import org.apache.bcel.verifier.exc.StaticCodeInstructionOperandConstraintException;
/**
* This PassVerifier verifies a class file according to
Modified: jakarta/bcel/trunk/src/java/org/apache/bcel/verifier/statics/StringRepresentation.java
URL: http://svn.apache.org/viewcvs/jakarta/bcel/trunk/src/java/org/apache/bcel/verifier/statics/StringRepresentation.java?rev=170497&r1=170496&r2=170497&view=diff
==============================================================================
--- jakarta/bcel/trunk/src/java/org/apache/bcel/verifier/statics/StringRepresentation.java (original)
+++ jakarta/bcel/trunk/src/java/org/apache/bcel/verifier/statics/StringRepresentation.java Mon May 16 18:04:32 2005
@@ -17,9 +17,40 @@
package org.apache.bcel.verifier.statics;
-import org.apache.bcel.classfile.*;
-import org.apache.bcel.classfile.Deprecated; // use _this_ one!
-import org.apache.bcel.verifier.exc.*;
+import org.apache.bcel.classfile.Code;
+import org.apache.bcel.classfile.CodeException;
+import org.apache.bcel.classfile.ConstantClass;
+import org.apache.bcel.classfile.ConstantDouble;
+import org.apache.bcel.classfile.ConstantFieldref;
+import org.apache.bcel.classfile.ConstantFloat;
+import org.apache.bcel.classfile.ConstantInteger;
+import org.apache.bcel.classfile.ConstantInterfaceMethodref;
+import org.apache.bcel.classfile.ConstantLong;
+import org.apache.bcel.classfile.ConstantMethodref;
+import org.apache.bcel.classfile.ConstantNameAndType;
+import org.apache.bcel.classfile.ConstantPool;
+import org.apache.bcel.classfile.ConstantString;
+import org.apache.bcel.classfile.ConstantUtf8;
+import org.apache.bcel.classfile.ConstantValue;
+import org.apache.bcel.classfile.Deprecated;
+import org.apache.bcel.classfile.ExceptionTable;
+import org.apache.bcel.classfile.Field;
+import org.apache.bcel.classfile.InnerClass;
+import org.apache.bcel.classfile.InnerClasses;
+import org.apache.bcel.classfile.JavaClass;
+import org.apache.bcel.classfile.LineNumber;
+import org.apache.bcel.classfile.LineNumberTable;
+import org.apache.bcel.classfile.LocalVariable;
+import org.apache.bcel.classfile.LocalVariableTable;
+import org.apache.bcel.classfile.Method;
+import org.apache.bcel.classfile.Node;
+import org.apache.bcel.classfile.Signature;
+import org.apache.bcel.classfile.SourceFile;
+import org.apache.bcel.classfile.StackMap;
+import org.apache.bcel.classfile.Synthetic;
+import org.apache.bcel.classfile.Unknown;
+import org.apache.bcel.classfile.Visitor;
+import org.apache.bcel.verifier.exc.AssertionViolatedException;
/**
* BCEL's Node classes (those from the classfile API that <B>accept()</B> Visitor
Modified: jakarta/bcel/trunk/src/java/org/apache/bcel/verifier/structurals/ControlFlowGraph.java
URL: http://svn.apache.org/viewcvs/jakarta/bcel/trunk/src/java/org/apache/bcel/verifier/structurals/ControlFlowGraph.java?rev=170497&r1=170496&r2=170497&view=diff
==============================================================================
--- jakarta/bcel/trunk/src/java/org/apache/bcel/verifier/structurals/ControlFlowGraph.java (original)
+++ jakarta/bcel/trunk/src/java/org/apache/bcel/verifier/structurals/ControlFlowGraph.java Mon May 16 18:04:32 2005
@@ -20,7 +20,6 @@
import java.util.ArrayList;
import java.util.Hashtable;
import java.util.Map;
-
import org.apache.bcel.generic.ATHROW;
import org.apache.bcel.generic.BranchInstruction;
import org.apache.bcel.generic.GotoInstruction;
Modified: jakarta/bcel/trunk/src/java/org/apache/bcel/verifier/structurals/ExceptionHandler.java
URL: http://svn.apache.org/viewcvs/jakarta/bcel/trunk/src/java/org/apache/bcel/verifier/structurals/ExceptionHandler.java?rev=170497&r1=170496&r2=170497&view=diff
==============================================================================
--- jakarta/bcel/trunk/src/java/org/apache/bcel/verifier/structurals/ExceptionHandler.java (original)
+++ jakarta/bcel/trunk/src/java/org/apache/bcel/verifier/structurals/ExceptionHandler.java Mon May 16 18:04:32 2005
@@ -17,7 +17,8 @@
package org.apache.bcel.verifier.structurals;
-import org.apache.bcel.generic.*;
+import org.apache.bcel.generic.InstructionHandle;
+import org.apache.bcel.generic.ObjectType;
/**
* This class represents an exception handler; that is, an ObjectType
Modified: jakarta/bcel/trunk/src/java/org/apache/bcel/verifier/structurals/ExceptionHandlers.java
URL: http://svn.apache.org/viewcvs/jakarta/bcel/trunk/src/java/org/apache/bcel/verifier/structurals/ExceptionHandlers.java?rev=170497&r1=170496&r2=170497&view=diff
==============================================================================
--- jakarta/bcel/trunk/src/java/org/apache/bcel/verifier/structurals/ExceptionHandlers.java (original)
+++ jakarta/bcel/trunk/src/java/org/apache/bcel/verifier/structurals/ExceptionHandlers.java Mon May 16 18:04:32 2005
@@ -20,7 +20,6 @@
import java.util.HashSet;
import java.util.Hashtable;
import java.util.Set;
-
import org.apache.bcel.generic.CodeExceptionGen;
import org.apache.bcel.generic.InstructionHandle;
import org.apache.bcel.generic.MethodGen;
Modified: jakarta/bcel/trunk/src/java/org/apache/bcel/verifier/structurals/InstructionContext.java
URL: http://svn.apache.org/viewcvs/jakarta/bcel/trunk/src/java/org/apache/bcel/verifier/structurals/InstructionContext.java?rev=170497&r1=170496&r2=170497&view=diff
==============================================================================
--- jakarta/bcel/trunk/src/java/org/apache/bcel/verifier/structurals/InstructionContext.java (original)
+++ jakarta/bcel/trunk/src/java/org/apache/bcel/verifier/structurals/InstructionContext.java Mon May 16 18:04:32 2005
@@ -18,7 +18,6 @@
import java.util.ArrayList;
-
import org.apache.bcel.generic.InstructionHandle;
/**
Modified: jakarta/bcel/trunk/src/java/org/apache/bcel/verifier/structurals/LocalVariables.java
URL: http://svn.apache.org/viewcvs/jakarta/bcel/trunk/src/java/org/apache/bcel/verifier/structurals/LocalVariables.java?rev=170497&r1=170496&r2=170497&view=diff
==============================================================================
--- jakarta/bcel/trunk/src/java/org/apache/bcel/verifier/structurals/LocalVariables.java (original)
+++ jakarta/bcel/trunk/src/java/org/apache/bcel/verifier/structurals/LocalVariables.java Mon May 16 18:04:32 2005
@@ -17,9 +17,10 @@
package org.apache.bcel.verifier.structurals;
-import org.apache.bcel.generic.Type;
import org.apache.bcel.generic.ReferenceType;
-import org.apache.bcel.verifier.exc.*;
+import org.apache.bcel.generic.Type;
+import org.apache.bcel.verifier.exc.AssertionViolatedException;
+import org.apache.bcel.verifier.exc.StructuralCodeConstraintException;
/**
* This class implements an array of local variables used for symbolic JVM
Modified: jakarta/bcel/trunk/src/java/org/apache/bcel/verifier/structurals/OperandStack.java
URL: http://svn.apache.org/viewcvs/jakarta/bcel/trunk/src/java/org/apache/bcel/verifier/structurals/OperandStack.java?rev=170497&r1=170496&r2=170497&view=diff
==============================================================================
--- jakarta/bcel/trunk/src/java/org/apache/bcel/verifier/structurals/OperandStack.java (original)
+++ jakarta/bcel/trunk/src/java/org/apache/bcel/verifier/structurals/OperandStack.java Mon May 16 18:04:32 2005
@@ -17,9 +17,12 @@
package org.apache.bcel.verifier.structurals;
-import org.apache.bcel.generic.*;
-import org.apache.bcel.verifier.exc.*;
-import java.util.*;
+import java.util.ArrayList;
+import org.apache.bcel.generic.ObjectType;
+import org.apache.bcel.generic.ReferenceType;
+import org.apache.bcel.generic.Type;
+import org.apache.bcel.verifier.exc.AssertionViolatedException;
+import org.apache.bcel.verifier.exc.StructuralCodeConstraintException;
/**
* This class implements a stack used for symbolic JVM stack simulation.
Modified: jakarta/bcel/trunk/src/java/org/apache/bcel/verifier/structurals/Pass3bVerifier.java
URL: http://svn.apache.org/viewcvs/jakarta/bcel/trunk/src/java/org/apache/bcel/verifier/structurals/Pass3bVerifier.java?rev=170497&r1=170496&r2=170497&view=diff
==============================================================================
--- jakarta/bcel/trunk/src/java/org/apache/bcel/verifier/structurals/Pass3bVerifier.java (original)
+++ jakarta/bcel/trunk/src/java/org/apache/bcel/verifier/structurals/Pass3bVerifier.java Mon May 16 18:04:32 2005
@@ -22,7 +22,6 @@
import java.util.ArrayList;
import java.util.Random;
import java.util.Vector;
-
import org.apache.bcel.Constants;
import org.apache.bcel.Repository;
import org.apache.bcel.classfile.JavaClass;
Modified: jakarta/bcel/trunk/src/java/org/apache/bcel/verifier/structurals/Subroutine.java
URL: http://svn.apache.org/viewcvs/jakarta/bcel/trunk/src/java/org/apache/bcel/verifier/structurals/Subroutine.java?rev=170497&r1=170496&r2=170497&view=diff
==============================================================================
--- jakarta/bcel/trunk/src/java/org/apache/bcel/verifier/structurals/Subroutine.java (original)
+++ jakarta/bcel/trunk/src/java/org/apache/bcel/verifier/structurals/Subroutine.java Mon May 16 18:04:32 2005
@@ -17,7 +17,7 @@
package org.apache.bcel.verifier.structurals;
-import org.apache.bcel.generic.*;
+import org.apache.bcel.generic.InstructionHandle;
/**
* This interface defines properties of JVM bytecode subroutines.
Modified: jakarta/bcel/trunk/src/java/org/apache/bcel/verifier/structurals/Subroutines.java
URL: http://svn.apache.org/viewcvs/jakarta/bcel/trunk/src/java/org/apache/bcel/verifier/structurals/Subroutines.java?rev=170497&r1=170496&r2=170497&view=diff
==============================================================================
--- jakarta/bcel/trunk/src/java/org/apache/bcel/verifier/structurals/Subroutines.java (original)
+++ jakarta/bcel/trunk/src/java/org/apache/bcel/verifier/structurals/Subroutines.java Mon May 16 18:04:32 2005
@@ -24,7 +24,6 @@
import java.util.Hashtable;
import java.util.Iterator;
import java.util.Set;
-
import org.apache.bcel.generic.ASTORE;
import org.apache.bcel.generic.ATHROW;
import org.apache.bcel.generic.BranchInstruction;
Modified: jakarta/bcel/trunk/src/java/org/apache/bcel/verifier/structurals/UninitializedObjectType.java
URL: http://svn.apache.org/viewcvs/jakarta/bcel/trunk/src/java/org/apache/bcel/verifier/structurals/UninitializedObjectType.java?rev=170497&r1=170496&r2=170497&view=diff
==============================================================================
--- jakarta/bcel/trunk/src/java/org/apache/bcel/verifier/structurals/UninitializedObjectType.java (original)
+++ jakarta/bcel/trunk/src/java/org/apache/bcel/verifier/structurals/UninitializedObjectType.java Mon May 16 18:04:32 2005
@@ -17,8 +17,9 @@
package org.apache.bcel.verifier.structurals;
-import org.apache.bcel.*;
-import org.apache.bcel.generic.*;
+import org.apache.bcel.Constants;
+import org.apache.bcel.generic.ObjectType;
+import org.apache.bcel.generic.ReferenceType;
/**
* This class represents an uninitialized object type; see The Java