Imports organized.

26 files changed, 153 insertions, 111 deletions

diff --git a/bcel-builder/src/org/aspectj/apache/bcel/classfile/EmptyVisitor.java b/bcel-builder/src/org/aspectj/apache/bcel/classfile/EmptyVisitor.java
index a32c07d75..c269e9953 100644
--- a/bcel-builder/src/org/aspectj/apache/bcel/classfile/EmptyVisitor.java
+++ b/bcel-builder/src/org/aspectj/apache/bcel/classfile/EmptyVisitor.java
@@ -54,8 +54,6 @@ package org.aspectj.apache.bcel.classfile;
  * <http://www.apache.org/>.
  */
 
-import org.aspectj.apache.bcel.classfile.*;
-import org.aspectj.apache.bcel.*;
 
 /**
  * Visitor with empty method bodies, can be extended and used in conjunction with the
@@ -64,7 +62,7 @@ import org.aspectj.apache.bcel.*;
  * By courtesy of David Spencer.
  *
  * @see DescendingVisitor
- * @version $Id: EmptyVisitor.java,v 1.1 2004/11/18 14:48:11 aclement Exp $
+ * @version $Id: EmptyVisitor.java,v 1.2 2004/11/18 15:07:05 aclement Exp $
  * 
  */
 public class EmptyVisitor implements Visitor {
diff --git a/bcel-builder/src/org/aspectj/apache/bcel/classfile/LineNumber.java b/bcel-builder/src/org/aspectj/apache/bcel/classfile/LineNumber.java
index 4cfbdb78a..3510d5a01 100644
--- a/bcel-builder/src/org/aspectj/apache/bcel/classfile/LineNumber.java
+++ b/bcel-builder/src/org/aspectj/apache/bcel/classfile/LineNumber.java
@@ -54,15 +54,17 @@ package org.aspectj.apache.bcel.classfile;
  * <http://www.apache.org/>.
  */
 
-import  org.aspectj.apache.bcel.Constants;
-import  java.io.*;
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.IOException;
+import java.io.Serializable;
 
 /**
  * This class represents a (PC offset, line number) pair, i.e., a line number in
  * the source that corresponds to a relative address in the byte code. This
  * is used for debugging purposes.
  *
- * @version $Id: LineNumber.java,v 1.1 2004/11/18 14:48:11 aclement Exp $
+ * @version $Id: LineNumber.java,v 1.2 2004/11/18 15:07:05 aclement Exp $
  * @author  <A HREF="mailto:markus.dahm@berlin.de">M. Dahm</A>
  * @see     LineNumberTable
  */
diff --git a/bcel-builder/src/org/aspectj/apache/bcel/classfile/StackMapEntry.java b/bcel-builder/src/org/aspectj/apache/bcel/classfile/StackMapEntry.java
index 15449cb0b..903094571 100644
--- a/bcel-builder/src/org/aspectj/apache/bcel/classfile/StackMapEntry.java
+++ b/bcel-builder/src/org/aspectj/apache/bcel/classfile/StackMapEntry.java
@@ -54,15 +54,16 @@ package org.aspectj.apache.bcel.classfile;
  * <http://www.apache.org/>.
  */
 
-import  org.aspectj.apache.bcel.Constants;
-import  java.io.*;
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.IOException;
 
 /**
  * This class represents a stack map entry recording the types of
  * local variables and the the of stack items at a given byte code offset.
  * See CLDC specification §5.3.1.2
  *
- * @version $Id: StackMapEntry.java,v 1.1 2004/11/18 14:48:11 aclement Exp $
+ * @version $Id: StackMapEntry.java,v 1.2 2004/11/18 15:07:05 aclement Exp $
  * @author  <A HREF="mailto:markus.dahm@berlin.de">M. Dahm</A>
  * @see     StackMap
  * @see     StackMapType
diff --git a/bcel-builder/src/org/aspectj/apache/bcel/generic/CPInstruction.java b/bcel-builder/src/org/aspectj/apache/bcel/generic/CPInstruction.java
index b68af7fcd..3a43d37e9 100644
--- a/bcel-builder/src/org/aspectj/apache/bcel/generic/CPInstruction.java
+++ b/bcel-builder/src/org/aspectj/apache/bcel/generic/CPInstruction.java
@@ -54,10 +54,13 @@ package org.aspectj.apache.bcel.generic;
  * <http://www.apache.org/>.
  */
 
-import java.io.*;
+import java.io.DataOutputStream;
+import java.io.IOException;
+
+import org.aspectj.apache.bcel.classfile.Constant;
+import org.aspectj.apache.bcel.classfile.ConstantClass;
+import org.aspectj.apache.bcel.classfile.ConstantPool;
 import org.aspectj.apache.bcel.util.ByteSequence;
-import org.aspectj.apache.bcel.Constants;
-import org.aspectj.apache.bcel.classfile.*;
 
 /** 
  * Abstract super class for instructions that use an index into the 
@@ -67,7 +70,7 @@ import org.aspectj.apache.bcel.classfile.*;
  * @see LDC
  * @see INVOKEVIRTUAL
  *
- * @version $Id: CPInstruction.java,v 1.1 2004/11/18 14:48:11 aclement Exp $
+ * @version $Id: CPInstruction.java,v 1.2 2004/11/18 15:07:05 aclement Exp $
  * @author  <A HREF="mailto:markus.dahm@berlin.de">M. Dahm</A>
  */
 public abstract class CPInstruction extends Instruction
diff --git a/bcel-builder/src/org/aspectj/apache/bcel/generic/CodeExceptionGen.java b/bcel-builder/src/org/aspectj/apache/bcel/generic/CodeExceptionGen.java
index a84179d67..137d496b8 100644
--- a/bcel-builder/src/org/aspectj/apache/bcel/generic/CodeExceptionGen.java
+++ b/bcel-builder/src/org/aspectj/apache/bcel/generic/CodeExceptionGen.java
@@ -54,8 +54,7 @@ package org.aspectj.apache.bcel.generic;
  * <http://www.apache.org/>.
  */
 
-import org.aspectj.apache.bcel.Constants;
-import org.aspectj.apache.bcel.classfile.*;
+import org.aspectj.apache.bcel.classfile.CodeException;
 
 /** 
  * This class represents an exception handler, i.e., specifies the  region where
@@ -66,7 +65,7 @@ import org.aspectj.apache.bcel.classfile.*;
  * The end of the region is automatically mapped to be exclusive when calling
  * getCodeException(), i.e., there is no difference semantically.
  *
- * @version $Id: CodeExceptionGen.java,v 1.1 2004/11/18 14:48:12 aclement Exp $
+ * @version $Id: CodeExceptionGen.java,v 1.2 2004/11/18 15:07:05 aclement Exp $
  * @author  <A HREF="mailto:markus.dahm@berlin.de">M. Dahm</A>
  * @see     MethodGen
  * @see     CodeException
diff --git a/bcel-builder/src/org/aspectj/apache/bcel/generic/FieldInstruction.java b/bcel-builder/src/org/aspectj/apache/bcel/generic/FieldInstruction.java
index 729b07bb9..59dcb48fb 100644
--- a/bcel-builder/src/org/aspectj/apache/bcel/generic/FieldInstruction.java
+++ b/bcel-builder/src/org/aspectj/apache/bcel/generic/FieldInstruction.java
@@ -55,15 +55,11 @@ package org.aspectj.apache.bcel.generic;
  */
 
 import org.aspectj.apache.bcel.classfile.ConstantPool;
-import org.aspectj.apache.bcel.classfile.ConstantUtf8;
-import org.aspectj.apache.bcel.classfile.ConstantNameAndType;
-import org.aspectj.apache.bcel.classfile.ConstantCP;
-import org.aspectj.apache.bcel.classfile.*;
 
 /**
  * Super class for the GET/PUTxxx family of instructions.
  *
- * @version $Id: FieldInstruction.java,v 1.1 2004/11/18 14:48:12 aclement Exp $
+ * @version $Id: FieldInstruction.java,v 1.2 2004/11/18 15:07:05 aclement Exp $
  * @author  <A HREF="mailto:markus.dahm@berlin.de">M. Dahm</A>
  */
 public abstract class FieldInstruction extends FieldOrMethod
diff --git a/bcel-builder/src/org/aspectj/apache/bcel/generic/Instruction.java b/bcel-builder/src/org/aspectj/apache/bcel/generic/Instruction.java
index 0578e90c1..c377298fa 100644
--- a/bcel-builder/src/org/aspectj/apache/bcel/generic/Instruction.java
+++ b/bcel-builder/src/org/aspectj/apache/bcel/generic/Instruction.java
@@ -54,16 +54,18 @@ package org.aspectj.apache.bcel.generic;
  * <http://www.apache.org/>.
  */
 
+import java.io.DataOutputStream;
+import java.io.IOException;
+import java.io.Serializable;
+
 import org.aspectj.apache.bcel.Constants;
-import org.aspectj.apache.bcel.classfile.Utility;
 import org.aspectj.apache.bcel.classfile.ConstantPool;
-import java.io.*;
 import org.aspectj.apache.bcel.util.ByteSequence;
 
 /** 
  * Abstract super class for all Java byte codes.
  *
- * @version $Id: Instruction.java,v 1.1 2004/11/18 14:48:12 aclement Exp $
+ * @version $Id: Instruction.java,v 1.2 2004/11/18 15:07:05 aclement Exp $
  * @author  <A HREF="mailto:markus.dahm@berlin.de">M. Dahm</A>
  */
 public abstract class Instruction implements Cloneable, Serializable {
diff --git a/bcel-builder/src/org/aspectj/apache/bcel/generic/LineNumberGen.java b/bcel-builder/src/org/aspectj/apache/bcel/generic/LineNumberGen.java
index f654ed41d..ca8d8fb7c 100644
--- a/bcel-builder/src/org/aspectj/apache/bcel/generic/LineNumberGen.java
+++ b/bcel-builder/src/org/aspectj/apache/bcel/generic/LineNumberGen.java
@@ -54,14 +54,13 @@ package org.aspectj.apache.bcel.generic;
  * <http://www.apache.org/>.
  */
 
-import org.aspectj.apache.bcel.Constants;
-import org.aspectj.apache.bcel.classfile.*;
+import org.aspectj.apache.bcel.classfile.LineNumber;
 
 /** 
  * This class represents a line number within a method, i.e., give an instruction
  * a line number corresponding to the source code line.
  *
- * @version $Id: LineNumberGen.java,v 1.1 2004/11/18 14:48:11 aclement Exp $
+ * @version $Id: LineNumberGen.java,v 1.2 2004/11/18 15:07:05 aclement Exp $
  * @author  <A HREF="mailto:markus.dahm@berlin.de">M. Dahm</A>
  * @see     LineNumber
  * @see     MethodGen
diff --git a/bcel-builder/src/org/aspectj/apache/bcel/generic/LocalVariableInstruction.java b/bcel-builder/src/org/aspectj/apache/bcel/generic/LocalVariableInstruction.java
index c5aa51ead..dd12e56c5 100644
--- a/bcel-builder/src/org/aspectj/apache/bcel/generic/LocalVariableInstruction.java
+++ b/bcel-builder/src/org/aspectj/apache/bcel/generic/LocalVariableInstruction.java
@@ -53,15 +53,16 @@ package org.aspectj.apache.bcel.generic;
  * information on the Apache Software Foundation, please see
  * <http://www.apache.org/>.
  */
-import java.io.*;
-import org.aspectj.apache.bcel.util.ByteSequence;
-import org.aspectj.apache.bcel.classfile.Utility;
+import java.io.DataOutputStream;
+import java.io.IOException;
+
 import org.aspectj.apache.bcel.Constants;
+import org.aspectj.apache.bcel.util.ByteSequence;
 
 /**
  * Abstract super class for instructions dealing with local variables.
  *
- * @version $Id: LocalVariableInstruction.java,v 1.1 2004/11/18 14:48:11 aclement Exp $
+ * @version $Id: LocalVariableInstruction.java,v 1.2 2004/11/18 15:07:05 aclement Exp $
  * @author  <A HREF="mailto:markus.dahm@berlin.de">M. Dahm</A>
  */
 public abstract class LocalVariableInstruction extends Instruction
diff --git a/bcel-builder/src/org/aspectj/apache/bcel/generic/NEW.java b/bcel-builder/src/org/aspectj/apache/bcel/generic/NEW.java
index 277a6c930..316fa914a 100644
--- a/bcel-builder/src/org/aspectj/apache/bcel/generic/NEW.java
+++ b/bcel-builder/src/org/aspectj/apache/bcel/generic/NEW.java
@@ -53,14 +53,13 @@ package org.aspectj.apache.bcel.generic;
  * information on the Apache Software Foundation, please see
  * <http://www.apache.org/>.
  */
-import java.io.*;
 import org.aspectj.apache.bcel.ExceptionConstants;
 
 /** 
  * NEW - Create new object
  * <PRE>Stack: ... -&gt; ..., objectref</PRE>
  *
- * @version $Id: NEW.java,v 1.1 2004/11/18 14:48:12 aclement Exp $
+ * @version $Id: NEW.java,v 1.2 2004/11/18 15:07:05 aclement Exp $
  * @author  <A HREF="mailto:markus.dahm@berlin.de">M. Dahm</A>
  */
 public class NEW extends CPInstruction
diff --git a/bcel-builder/src/org/aspectj/apache/bcel/generic/PUSH.java b/bcel-builder/src/org/aspectj/apache/bcel/generic/PUSH.java
index df63b1a8f..f593f61e0 100644
--- a/bcel-builder/src/org/aspectj/apache/bcel/generic/PUSH.java
+++ b/bcel-builder/src/org/aspectj/apache/bcel/generic/PUSH.java
@@ -54,13 +54,12 @@ package org.aspectj.apache.bcel.generic;
  * <http://www.apache.org/>.
  */
 import org.aspectj.apache.bcel.Constants;
-import java.io.*;
 
 /** 
  * Wrapper class for push operations, which are implemented either as BIPUSH,
  * LDC or xCONST_n instructions.
  *
- * @version $Id: PUSH.java,v 1.1 2004/11/18 14:48:12 aclement Exp $
+ * @version $Id: PUSH.java,v 1.2 2004/11/18 15:07:05 aclement Exp $
  * @author  <A HREF="mailto:markus.dahm@berlin.de">M. Dahm</A>
  */
 public final class PUSH
diff --git a/bcel-builder/src/org/aspectj/apache/bcel/util/Class2HTML.java b/bcel-builder/src/org/aspectj/apache/bcel/util/Class2HTML.java
index a1f79f432..33330f816 100644
--- a/bcel-builder/src/org/aspectj/apache/bcel/util/Class2HTML.java
+++ b/bcel-builder/src/org/aspectj/apache/bcel/util/Class2HTML.java
@@ -54,10 +54,18 @@ package org.aspectj.apache.bcel.util;
  * <http://www.apache.org/>.
  */
 
-import java.io.*;
-import java.util.BitSet;
-import org.aspectj.apache.bcel.classfile.*;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.PrintWriter;
+
 import org.aspectj.apache.bcel.Constants;
+import org.aspectj.apache.bcel.classfile.Attribute;
+import org.aspectj.apache.bcel.classfile.ClassParser;
+import org.aspectj.apache.bcel.classfile.ConstantPool;
+import org.aspectj.apache.bcel.classfile.JavaClass;
+import org.aspectj.apache.bcel.classfile.Method;
+import org.aspectj.apache.bcel.classfile.Utility;
 
 /**
  * Read class file(s) and convert them into HTML files.
@@ -78,7 +86,7 @@ import org.aspectj.apache.bcel.Constants;
  * method in the Method's frame will jump to the appropiate method in
  * the Code frame.
  *
- * @version $Id: Class2HTML.java,v 1.1 2004/11/18 14:48:12 aclement Exp $
+ * @version $Id: Class2HTML.java,v 1.2 2004/11/18 15:07:05 aclement Exp $
  * @author <A HREF="mailto:markus.dahm@berlin.de">M. Dahm</A> 
 */
 public class Class2HTML implements Constants
diff --git a/bcel-builder/src/org/aspectj/apache/bcel/util/ClassLoaderRepository.java b/bcel-builder/src/org/aspectj/apache/bcel/util/ClassLoaderRepository.java
index 04db889d1..11ea8064e 100644
--- a/bcel-builder/src/org/aspectj/apache/bcel/util/ClassLoaderRepository.java
+++ b/bcel-builder/src/org/aspectj/apache/bcel/util/ClassLoaderRepository.java
@@ -54,12 +54,12 @@ package org.aspectj.apache.bcel.util;
  * <http://www.apache.org/>.
  */
 
-import java.io.*;
-
-import java.util.Map;
+import java.io.IOException;
+import java.io.InputStream;
 import java.util.HashMap;
 
-import org.aspectj.apache.bcel.classfile.*;
+import org.aspectj.apache.bcel.classfile.ClassParser;
+import org.aspectj.apache.bcel.classfile.JavaClass;
 
 /**
  * The repository maintains information about which classes have
@@ -70,7 +70,7 @@ import org.aspectj.apache.bcel.classfile.*;
  *
  * @see org.aspectj.apache.bcel.Repository
  *
- * @version $Id: ClassLoaderRepository.java,v 1.1 2004/11/18 14:48:12 aclement Exp $
+ * @version $Id: ClassLoaderRepository.java,v 1.2 2004/11/18 15:07:05 aclement Exp $
  * @author <A HREF="mailto:markus.dahm@berlin.de">M. Dahm</A>
  * @author David Dixon-Peugh
  */
diff --git a/bcel-builder/src/org/aspectj/apache/bcel/util/SyntheticRepository.java b/bcel-builder/src/org/aspectj/apache/bcel/util/SyntheticRepository.java
index 612f6cd1b..e2e0c90b8 100644
--- a/bcel-builder/src/org/aspectj/apache/bcel/util/SyntheticRepository.java
+++ b/bcel-builder/src/org/aspectj/apache/bcel/util/SyntheticRepository.java
@@ -54,12 +54,12 @@ package org.aspectj.apache.bcel.util;
  * <http://www.apache.org/>.
  */
 
-import java.io.*;
-
-import java.util.Map;
+import java.io.IOException;
+import java.io.InputStream;
 import java.util.HashMap;
 
-import org.aspectj.apache.bcel.classfile.*;
+import org.aspectj.apache.bcel.classfile.ClassParser;
+import org.aspectj.apache.bcel.classfile.JavaClass;
 
 /**
  * This repository is used in situations where a Class is created
@@ -78,7 +78,7 @@ import org.aspectj.apache.bcel.classfile.*;
  *
  * @see org.aspectj.apache.bcel.Repository
  *
- * @version $Id: SyntheticRepository.java,v 1.1 2004/11/18 14:48:12 aclement Exp $
+ * @version $Id: SyntheticRepository.java,v 1.2 2004/11/18 15:07:05 aclement Exp $
  * @author <A HREF="mailto:markus.dahm@berlin.de">M. Dahm</A>
  * @author David Dixon-Peugh
  */
diff --git a/bcel-builder/src/org/aspectj/apache/bcel/verifier/GraphicalVerifier.java b/bcel-builder/src/org/aspectj/apache/bcel/verifier/GraphicalVerifier.java
index 123555851..4bb635ec0 100644
--- a/bcel-builder/src/org/aspectj/apache/bcel/verifier/GraphicalVerifier.java
+++ b/bcel-builder/src/org/aspectj/apache/bcel/verifier/GraphicalVerifier.java
@@ -54,16 +54,18 @@ package org.aspectj.apache.bcel.verifier;
  * <http://www.apache.org/>.
  */
 
+import java.awt.Dimension;
+import java.awt.Toolkit;
+
 import javax.swing.UIManager;
-import java.awt.*;
-import org.aspectj.apache.bcel.verifier.*;
-import org.aspectj.apache.bcel.generic.*;
+
+import org.aspectj.apache.bcel.generic.Type;
 
 
 /**
  * A graphical user interface application demonstrating JustIce.
  *
- * @version $Id: GraphicalVerifier.java,v 1.1 2004/11/18 14:48:12 aclement Exp $
+ * @version $Id: GraphicalVerifier.java,v 1.2 2004/11/18 15:07:06 aclement Exp $
  * @author Enver Haase
  */
 public class GraphicalVerifier {
diff --git a/bcel-builder/src/org/aspectj/apache/bcel/verifier/TransitiveHull.java b/bcel-builder/src/org/aspectj/apache/bcel/verifier/TransitiveHull.java
index e6bd14773..ff0904360 100644
--- a/bcel-builder/src/org/aspectj/apache/bcel/verifier/TransitiveHull.java
+++ b/bcel-builder/src/org/aspectj/apache/bcel/verifier/TransitiveHull.java
@@ -54,9 +54,8 @@ package org.aspectj.apache.bcel.verifier;
  * <http://www.apache.org/>.
  */
 
-import org.aspectj.apache.bcel.verifier.*;
-import org.aspectj.apache.bcel.classfile.*;
-import org.aspectj.apache.bcel.*;
+import org.aspectj.apache.bcel.Repository;
+import org.aspectj.apache.bcel.classfile.JavaClass;
 
 /**
  * This class has a main method implementing a demonstration program
@@ -64,7 +63,7 @@ import org.aspectj.apache.bcel.*;
  * all class files encountered; this may take up a lot of time and,
  * more notably, memory.
  *
- * @version $Id: TransitiveHull.java,v 1.1 2004/11/18 14:48:12 aclement Exp $
+ * @version $Id: TransitiveHull.java,v 1.2 2004/11/18 15:07:05 aclement Exp $
  * @author <A HREF="http://www.inf.fu-berlin.de/~ehaase"/>Enver Haase</A>
  */
 public class TransitiveHull implements VerifierFactoryObserver{
diff --git a/bcel-builder/src/org/aspectj/apache/bcel/verifier/Verifier.java b/bcel-builder/src/org/aspectj/apache/bcel/verifier/Verifier.java
index 57b801eb9..5632b9032 100644
--- a/bcel-builder/src/org/aspectj/apache/bcel/verifier/Verifier.java
+++ b/bcel-builder/src/org/aspectj/apache/bcel/verifier/Verifier.java
@@ -54,14 +54,16 @@ package org.aspectj.apache.bcel.verifier;
  * <http://www.apache.org/>.
  */
 
-import org.aspectj.apache.bcel.*;
-import org.aspectj.apache.bcel.classfile.*;
-import org.aspectj.apache.bcel.verifier.statics.*;
-import org.aspectj.apache.bcel.verifier.structurals.*;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
 
+import org.aspectj.apache.bcel.classfile.JavaClass;
+import org.aspectj.apache.bcel.verifier.statics.Pass1Verifier;
+import org.aspectj.apache.bcel.verifier.statics.Pass2Verifier;
+import org.aspectj.apache.bcel.verifier.statics.Pass3aVerifier;
+import org.aspectj.apache.bcel.verifier.structurals.Pass3bVerifier;
+
 /**
  * A Verifier instance is there to verify a class file according to The Java Virtual
  * Machine Specification, 2nd Edition.
@@ -73,7 +75,7 @@ import java.util.Iterator;
  * A Verifier creates PassVerifier instances to perform the actual verification.
  * Verifier instances are usually generated by the VerifierFactory.
  *
- * @version $Id: Verifier.java,v 1.1 2004/11/18 14:48:12 aclement Exp $
+ * @version $Id: Verifier.java,v 1.2 2004/11/18 15:07:05 aclement Exp $
  * @author <A HREF="http://www.inf.fu-berlin.de/~ehaase"/>Enver Haase</A>
  * @see org.aspectj.apache.bcel.verifier.VerifierFactory
  * @see org.aspectj.apache.bcel.verifier.PassVerifier
diff --git a/bcel-builder/src/org/aspectj/apache/bcel/verifier/VerifierAppFrame.java b/bcel-builder/src/org/aspectj/apache/bcel/verifier/VerifierAppFrame.java
index ef5417c96..13aaebbcf 100644
--- a/bcel-builder/src/org/aspectj/apache/bcel/verifier/VerifierAppFrame.java
+++ b/bcel-builder/src/org/aspectj/apache/bcel/verifier/VerifierAppFrame.java
@@ -54,19 +54,36 @@ package org.aspectj.apache.bcel.verifier;
  * <http://www.apache.org/>.
  */
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import javax.swing.event.*;
-import org.aspectj.apache.bcel.*;
-import org.aspectj.apache.bcel.classfile.*;
-import org.aspectj.apache.bcel.verifier.*;
+import java.awt.AWTEvent;
+import java.awt.CardLayout;
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.GridLayout;
+import java.awt.event.ActionEvent;
+import java.awt.event.WindowEvent;
+
+import javax.swing.BorderFactory;
+import javax.swing.JFrame;
+import javax.swing.JList;
+import javax.swing.JMenu;
+import javax.swing.JMenuBar;
+import javax.swing.JMenuItem;
+import javax.swing.JOptionPane;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.JSplitPane;
+import javax.swing.JTextPane;
+import javax.swing.ListSelectionModel;
+import javax.swing.event.ListSelectionEvent;
+
+import org.aspectj.apache.bcel.Repository;
+import org.aspectj.apache.bcel.classfile.JavaClass;
 
 /**
  * This class implements a machine-generated frame for use with
  * the GraphicalVerfifier.
  *
- * @version $Id: VerifierAppFrame.java,v 1.1 2004/11/18 14:48:12 aclement Exp $
+ * @version $Id: VerifierAppFrame.java,v 1.2 2004/11/18 15:07:06 aclement Exp $
  * @author Enver Haase
  * @see GraphicalVerifier
  */
diff --git a/bcel-builder/src/org/aspectj/apache/bcel/verifier/VerifierFactoryListModel.java b/bcel-builder/src/org/aspectj/apache/bcel/verifier/VerifierFactoryListModel.java
index 9e51eb543..9746c71c9 100644
--- a/bcel-builder/src/org/aspectj/apache/bcel/verifier/VerifierFactoryListModel.java
+++ b/bcel-builder/src/org/aspectj/apache/bcel/verifier/VerifierFactoryListModel.java
@@ -53,13 +53,12 @@ package org.aspectj.apache.bcel.verifier;
  * information on the Apache Software Foundation, please see
  * <http://www.apache.org/>.
  */
-import org.aspectj.apache.bcel.verifier.*;
-import javax.swing.event.*;
+import javax.swing.event.ListDataEvent;
 /**
  * This class implements an adapter; it implements both a Swing ListModel and
  * a VerifierFactoryObserver.
  *
- * @version $Id: VerifierFactoryListModel.java,v 1.1 2004/11/18 14:48:12 aclement Exp $
+ * @version $Id: VerifierFactoryListModel.java,v 1.2 2004/11/18 15:07:05 aclement Exp $
  * @author Enver Haase
  */
 public class VerifierFactoryListModel implements org.aspectj.apache.bcel.verifier.VerifierFactoryObserver, javax.swing.ListModel{
diff --git a/bcel-builder/src/org/aspectj/apache/bcel/verifier/VerifyDialog.java b/bcel-builder/src/org/aspectj/apache/bcel/verifier/VerifyDialog.java
index 482146770..80ec01a23 100644
--- a/bcel-builder/src/org/aspectj/apache/bcel/verifier/VerifyDialog.java
+++ b/bcel-builder/src/org/aspectj/apache/bcel/verifier/VerifyDialog.java
@@ -54,11 +54,11 @@ package org.aspectj.apache.bcel.verifier;
  * <http://www.apache.org/>.
  */
 
-import org.aspectj.apache.bcel.*;
-import org.aspectj.apache.bcel.classfile.*;
-import org.aspectj.apache.bcel.verifier.*;
 import java.awt.Color;
 
+import org.aspectj.apache.bcel.Repository;
+import org.aspectj.apache.bcel.classfile.JavaClass;
+
 /**
  * A class for simple graphical class file verification.
  * Use the main(String []) method with fully qualified
@@ -68,7 +68,7 @@ import java.awt.Color;
  * class in your application.
  * [This class was created using VisualAge for Java,
  * but it does not work under VAJ itself (Version 3.02 JDK 1.2)]
- * @version $Id: VerifyDialog.java,v 1.1 2004/11/18 14:48:12 aclement Exp $
+ * @version $Id: VerifyDialog.java,v 1.2 2004/11/18 15:07:05 aclement Exp $
  * @author <A HREF="http://www.inf.fu-berlin.de/~ehaase"/>Enver Haase</A>
  * @see #main(String[])
  * @see #VerifyDialog(String)
diff --git a/bcel-builder/src/org/aspectj/apache/bcel/verifier/structurals/ControlFlowGraph.java b/bcel-builder/src/org/aspectj/apache/bcel/verifier/structurals/ControlFlowGraph.java
index 47d826bb9..02f8c2523 100644
--- a/bcel-builder/src/org/aspectj/apache/bcel/verifier/structurals/ControlFlowGraph.java
+++ b/bcel-builder/src/org/aspectj/apache/bcel/verifier/structurals/ControlFlowGraph.java
@@ -54,15 +54,27 @@ package org.aspectj.apache.bcel.verifier.structurals;
  * <http://www.apache.org/>.
  */
 
-import org.aspectj.apache.bcel.generic.*;
-import org.aspectj.apache.bcel.verifier.VerifierFactory;
-import org.aspectj.apache.bcel.verifier.exc.*;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Hashtable;
+
+import org.aspectj.apache.bcel.generic.ATHROW;
+import org.aspectj.apache.bcel.generic.BranchInstruction;
+import org.aspectj.apache.bcel.generic.GotoInstruction;
+import org.aspectj.apache.bcel.generic.Instruction;
+import org.aspectj.apache.bcel.generic.InstructionHandle;
+import org.aspectj.apache.bcel.generic.JsrInstruction;
+import org.aspectj.apache.bcel.generic.MethodGen;
+import org.aspectj.apache.bcel.generic.RET;
+import org.aspectj.apache.bcel.generic.ReturnInstruction;
+import org.aspectj.apache.bcel.generic.Select;
+import org.aspectj.apache.bcel.verifier.exc.AssertionViolatedException;
+import org.aspectj.apache.bcel.verifier.exc.StructuralCodeConstraintException;
 
 /**
  * This class represents a control flow graph of a method.
  *
- * @version $Id: ControlFlowGraph.java,v 1.1 2004/11/18 14:48:12 aclement Exp $
+ * @version $Id: ControlFlowGraph.java,v 1.2 2004/11/18 15:07:05 aclement Exp $
  * @author <A HREF="http://www.inf.fu-berlin.de/~ehaase"/>Enver Haase</A>
  */
 public class ControlFlowGraph{
diff --git a/bcel-builder/src/org/aspectj/apache/bcel/verifier/structurals/ExecutionVisitor.java b/bcel-builder/src/org/aspectj/apache/bcel/verifier/structurals/ExecutionVisitor.java
index 29f5a3d7b..343f633e1 100644
--- a/bcel-builder/src/org/aspectj/apache/bcel/verifier/structurals/ExecutionVisitor.java
+++ b/bcel-builder/src/org/aspectj/apache/bcel/verifier/structurals/ExecutionVisitor.java
@@ -55,19 +55,13 @@ package org.aspectj.apache.bcel.verifier.structurals;
  */
 
 import org.aspectj.apache.bcel.Constants;
-import org.aspectj.apache.bcel.Repository;
-import org.aspectj.apache.bcel.generic.*;
-import org.aspectj.apache.bcel.classfile.JavaClass;
 import org.aspectj.apache.bcel.classfile.Constant;
 import org.aspectj.apache.bcel.classfile.ConstantDouble;
 import org.aspectj.apache.bcel.classfile.ConstantFloat;
 import org.aspectj.apache.bcel.classfile.ConstantInteger;
 import org.aspectj.apache.bcel.classfile.ConstantLong;
 import org.aspectj.apache.bcel.classfile.ConstantString;
-import org.aspectj.apache.bcel.verifier.Verifier;
-import org.aspectj.apache.bcel.verifier.exc.*;
-import java.util.ArrayList;
-import java.util.Hashtable;
+import org.aspectj.apache.bcel.generic.*;
 
 /**
  * This Visitor class may be used for a type-based Java Virtual Machine
@@ -92,7 +86,7 @@ import java.util.Hashtable;
  * If a two-slot type is stored into a local variable, the next variable
  * is given the type Type.UNKNOWN.
  *
- * @version $Id: ExecutionVisitor.java,v 1.1 2004/11/18 14:48:12 aclement Exp $
+ * @version $Id: ExecutionVisitor.java,v 1.2 2004/11/18 15:07:05 aclement Exp $
  * @author <A HREF="http://www.inf.fu-berlin.de/~ehaase"/>Enver Haase</A>
  * @see #visitDSTORE(DSTORE o)
  * @see InstConstraintVisitor
@@ -754,8 +748,8 @@ public class ExecutionVisitor extends EmptyVisitor implements Visitor{
 	public void visitINVOKESPECIAL(INVOKESPECIAL o){
 		if (o.getMethodName(cpg).equals(Constants.CONSTRUCTOR_NAME)){
 			UninitializedObjectType t = (UninitializedObjectType) stack().peek(o.getArgumentTypes(cpg).length);
-			if (t == frame._this){	
-				frame._this = null;
+			if (t == Frame._this){	
+				Frame._this = null;
 			}
 			stack().initializeObject(t);
 			locals().initializeObject(t);
diff --git a/bcel-builder/src/org/aspectj/apache/bcel/verifier/structurals/Frame.java b/bcel-builder/src/org/aspectj/apache/bcel/verifier/structurals/Frame.java
index f1c615e45..04a93af13 100644
--- a/bcel-builder/src/org/aspectj/apache/bcel/verifier/structurals/Frame.java
+++ b/bcel-builder/src/org/aspectj/apache/bcel/verifier/structurals/Frame.java
@@ -54,15 +54,12 @@ package org.aspectj.apache.bcel.verifier.structurals;
  * <http://www.apache.org/>.
  */
 
-import org.aspectj.apache.bcel.generic.*;
-import org.aspectj.apache.bcel.verifier.exc.*;
-import java.util.ArrayList;
 
 /**
  * This class represents a JVM execution frame; that means,
  * a local variable array and an operand stack.
  *
- * @version $Id: Frame.java,v 1.1 2004/11/18 14:48:12 aclement Exp $
+ * @version $Id: Frame.java,v 1.2 2004/11/18 15:07:05 aclement Exp $
  * @author <A HREF="http://www.inf.fu-berlin.de/~ehaase"/>Enver Haase</A>
  */
  
diff --git a/bcel-builder/src/org/aspectj/apache/bcel/verifier/structurals/InstConstraintVisitor.java b/bcel-builder/src/org/aspectj/apache/bcel/verifier/structurals/InstConstraintVisitor.java
index abf69f14d..fec1baabd 100644
--- a/bcel-builder/src/org/aspectj/apache/bcel/verifier/structurals/InstConstraintVisitor.java
+++ b/bcel-builder/src/org/aspectj/apache/bcel/verifier/structurals/InstConstraintVisitor.java
@@ -79,7 +79,7 @@ import org.aspectj.apache.bcel.verifier.exc.*;
  * TODO: Currently, the JVM's behaviour concerning monitors (MONITORENTER,
  * MONITOREXIT) is not modeled in JustIce.
  *
- * @version $Id: InstConstraintVisitor.java,v 1.1 2004/11/18 14:48:12 aclement Exp $
+ * @version $Id: InstConstraintVisitor.java,v 1.2 2004/11/18 15:07:05 aclement Exp $
  * @author <A HREF="http://www.inf.fu-berlin.de/~ehaase"/>Enver Haase</A>
  * @see org.aspectj.apache.bcel.verifier.exc.StructuralCodeConstraintException
  * @see org.aspectj.apache.bcel.verifier.exc.LinkingConstraintException
@@ -2576,7 +2576,7 @@ public class InstConstraintVisitor extends EmptyVisitor implements org.aspectj.a
 	 */
 	public void visitRETURN(RETURN o){
 		if (mg.getName().equals(Constants.CONSTRUCTOR_NAME)){// If we leave an <init> method
-			if ((frame._this != null) && (!(mg.getClassName().equals(Type.OBJECT.getClassName()))) ) {
+			if ((Frame._this != null) && (!(mg.getClassName().equals(Type.OBJECT.getClassName()))) ) {
 				constraintViolated(o, "Leaving a constructor that itself did not call a constructor.");
 			}
 		}
diff --git a/bcel-builder/src/org/aspectj/apache/bcel/verifier/structurals/InstructionContext.java b/bcel-builder/src/org/aspectj/apache/bcel/verifier/structurals/InstructionContext.java
index 9b3f357d7..810c0b3e4 100644
--- a/bcel-builder/src/org/aspectj/apache/bcel/verifier/structurals/InstructionContext.java
+++ b/bcel-builder/src/org/aspectj/apache/bcel/verifier/structurals/InstructionContext.java
@@ -54,16 +54,16 @@ package org.aspectj.apache.bcel.verifier.structurals;
  * <http://www.apache.org/>.
  */
 
-import org.aspectj.apache.bcel.generic.InstructionHandle;
 import java.util.ArrayList;
-import java.util.Iterator;
+
+import org.aspectj.apache.bcel.generic.InstructionHandle;
 
 /**
  * An InstructionContext offers convenient access
  * to information like control flow successors and
  * such.
  *
- * @version $Id: InstructionContext.java,v 1.1 2004/11/18 14:48:12 aclement Exp $
+ * @version $Id: InstructionContext.java,v 1.2 2004/11/18 15:07:05 aclement Exp $
  * @author <A HREF="http://www.inf.fu-berlin.de/~ehaase"/>Enver Haase</A>
  */
 public interface InstructionContext{
diff --git a/bcel-builder/src/org/aspectj/apache/bcel/verifier/structurals/Pass3bVerifier.java b/bcel-builder/src/org/aspectj/apache/bcel/verifier/structurals/Pass3bVerifier.java
index 78db0b07b..584a33eb0 100644
--- a/bcel-builder/src/org/aspectj/apache/bcel/verifier/structurals/Pass3bVerifier.java
+++ b/bcel-builder/src/org/aspectj/apache/bcel/verifier/structurals/Pass3bVerifier.java
@@ -54,17 +54,30 @@ package org.aspectj.apache.bcel.verifier.structurals;
  * <http://www.apache.org/>.
  */
 
-import java.io.*;
+import java.io.PrintWriter;
+import java.io.StringWriter;
 import java.util.ArrayList;
 import java.util.Random;
 import java.util.Vector;
+
 import org.aspectj.apache.bcel.Constants;
 import org.aspectj.apache.bcel.Repository;
-import org.aspectj.apache.bcel.classfile.*;
-import org.aspectj.apache.bcel.generic.*;
-import org.aspectj.apache.bcel.verifier.*;
-import org.aspectj.apache.bcel.verifier.statics.*;
-import org.aspectj.apache.bcel.verifier.exc.*;
+import org.aspectj.apache.bcel.classfile.JavaClass;
+import org.aspectj.apache.bcel.classfile.Method;
+import org.aspectj.apache.bcel.generic.ConstantPoolGen;
+import org.aspectj.apache.bcel.generic.InstructionHandle;
+import org.aspectj.apache.bcel.generic.JsrInstruction;
+import org.aspectj.apache.bcel.generic.MethodGen;
+import org.aspectj.apache.bcel.generic.ObjectType;
+import org.aspectj.apache.bcel.generic.RET;
+import org.aspectj.apache.bcel.generic.ReturnInstruction;
+import org.aspectj.apache.bcel.generic.ReturnaddressType;
+import org.aspectj.apache.bcel.generic.Type;
+import org.aspectj.apache.bcel.verifier.PassVerifier;
+import org.aspectj.apache.bcel.verifier.VerificationResult;
+import org.aspectj.apache.bcel.verifier.Verifier;
+import org.aspectj.apache.bcel.verifier.exc.AssertionViolatedException;
+import org.aspectj.apache.bcel.verifier.exc.VerifierConstraintViolatedException;
 
 /**
  * This PassVerifier verifies a method of class file according to pass 3,
@@ -73,7 +86,7 @@ import org.aspectj.apache.bcel.verifier.exc.*;
  * More detailed information is to be found at the do_verify() method's
  * documentation. 
  *
- * @version $Id: Pass3bVerifier.java,v 1.1 2004/11/18 14:48:12 aclement Exp $
+ * @version $Id: Pass3bVerifier.java,v 1.2 2004/11/18 15:07:05 aclement Exp $
  * @author <A HREF="http://www.inf.fu-berlin.de/~ehaase"/>Enver Haase</A>
  * @see #do_verify()
  */
@@ -319,11 +332,11 @@ public final class Pass3bVerifier extends PassVerifier{
 				Frame f = new Frame(mg.getMaxLocals(),mg.getMaxStack());
 				if ( !mg.isStatic() ){
 					if (mg.getName().equals(Constants.CONSTRUCTOR_NAME)){
-						f._this = new UninitializedObjectType(new ObjectType(jc.getClassName()));
-						f.getLocals().set(0, f._this);
+						Frame._this = new UninitializedObjectType(new ObjectType(jc.getClassName()));
+						f.getLocals().set(0, Frame._this);
 					}
 					else{
-						f._this = null;
+						Frame._this = null;
 						f.getLocals().set(0, new ObjectType(jc.getClassName()));
 					}
 				}