separated decompile packaged

git-svn-id: https://svn.code.sf.net/p/jode/code/trunk@142 379699f6-c40d-0410-875b-85095c16579e

jode/jode/bytecode/ClassInfo.java

@@ -17,7 +17,6 @@
  * $Id$
  */
 package jode.bytecode;
-import jode.SearchPath;
 import jode.MethodType;
 import java.io.*;
 import java.util.Hashtable;

jode/jode/bytecode/Opcodes.java

@@ -17,10 +17,14 @@
  * $Id$
  */
 
-package jode;
+package jode.decompiler;
+import jode.CodeAnalyzer;
+import jode.LocalInfo;
+import jode.Type;
+import jode.MethodType;
+import jode.bytecode.ConstantPool;
 import jode.flow.*;
 import java.io.*;
-import jode.bytecode.ConstantPool;
 
 /**
  * This is an abstract class which creates flow blocks for the

jode/jode/bytecode/SearchPath.java

@@ -16,7 +16,7 @@
  *
  * $Id$
  */
-package jode;
+package jode.bytecode;
 import java.io.*;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;

jode/jode/decompiler/ClassAnalyzer.java

@@ -23,6 +23,7 @@ import jode.bytecode.FieldInfo;
 import jode.bytecode.MethodInfo;
 import jode.bytecode.ConstantPool;
 import jode.bytecode.ClassFormatException;
+import jode.decompiler.Expression;
 import jode.flow.TransformConstructors;
 
 import java.lang.reflect.Modifier;

jode/jode/decompiler/CodeAnalyzer.java

@@ -22,6 +22,7 @@ import jode.bytecode.ClassInfo;
 import jode.bytecode.ConstantPool;
 import jode.bytecode.AttributeInfo;
 import jode.bytecode.CodeInfo;
+import jode.decompiler.Opcodes;
 import jode.flow.FlowBlock;
 import jode.flow.TransformExceptionHandlers;
 

jode/jode/decompiler/FieldAnalyzer.java

@@ -22,6 +22,8 @@ import java.lang.reflect.Modifier;
 import jode.bytecode.FieldInfo;
 import jode.bytecode.AttributeInfo;
 import jode.bytecode.ClassFormatException;
+import jode.decompiler.Expression;
+import jode.decompiler.ConstOperator;
 
 public class FieldAnalyzer implements Analyzer {
     ClassAnalyzer clazz;

jode/jode/decompiler/ImportHandler.java

@@ -20,6 +20,7 @@
 package jode;
 import java.util.*;
 import jode.bytecode.ClassInfo;
+import jode.bytecode.SearchPath;
 
 public class JodeEnvironment {
     Hashtable imports;

jode/jode/decompiler/LocalInfo.java

@@ -20,6 +20,7 @@
 package jode;
 import java.util.Enumeration;
 import java.util.Vector;
+import jode.decompiler.LocalVarOperator;
 
 /**
  * The LocalInfo represents a local variable of a method.
@@ -87,8 +88,7 @@ public class LocalInfo {
                         (LocalVarOperator) enum.nextElement();
                     if (needTypeUpdate) {
                         if (Decompiler.isTypeDebugging)
-                            System.err.println("updating " + lvo + " in "
-                                               + ((Expression)lvo).parent);
+                            System.err.println("updating " + lvo);
                         lvo.updateType();
                     }
                     shadow.operators.addElement(lvo);
@@ -191,8 +191,7 @@ public class LocalInfo {
             while (enum.hasMoreElements()) {
                 LocalVarOperator lvo = (LocalVarOperator) enum.nextElement();
                 if (Decompiler.isTypeDebugging)
-                    System.err.println("updating "+lvo+" in "
-                                       + ((Expression)lvo).parent);
+                    System.err.println("updating "+lvo);
                 lvo.updateType();
             }
         }

jode/jode/expr/ArrayLengthOperator.java

@@ -17,7 +17,8 @@
  * $Id$
  */
 
-package jode;
+package jode.decompiler;
+import jode.Type;
 
 public class ArrayLengthOperator extends Operator {
 

jode/jode/expr/ArrayLoadOperator.java

@@ -17,7 +17,9 @@
  * $Id$
  */
 
-package jode;
+package jode.decompiler;
+import jode.Type;
+import jode.ArrayType;
 
 public class ArrayLoadOperator extends SimpleOperator {
     String value;
@@ -54,7 +56,7 @@ public class ArrayLoadOperator extends SimpleOperator {
             type = type.intersection
                 (((ArrayType)operandTypes[0]).getElementType());
         else
-            throw new AssertError("No Array type: "+operandTypes[0]);
+            throw new jode.AssertError("No Array type: "+operandTypes[0]);
     }
 
     public String toString(String[] operands) {

jode/jode/expr/ArrayStoreOperator.java

@@ -17,7 +17,9 @@
  * $Id$
  */
 
-package jode;
+package jode.decompiler;
+import jode.Type;
+import jode.ArrayType;
 
 public class ArrayStoreOperator extends StoreInstruction {
     Type indexType;

jode/jode/expr/BinaryOperator.java

@@ -17,7 +17,8 @@
  * $Id$
  */
 
-package jode;
+package jode.decompiler;
+import jode.Type;
 
 public class BinaryOperator extends Operator {
     protected Type operandType;

jode/jode/expr/CheckCastOperator.java

@@ -17,7 +17,8 @@
  * $Id$
  */
 
-package jode;
+package jode.decompiler;
+import jode.Type;
 
 public class CheckCastOperator extends SimpleOperator {
     Type castType;

jode/jode/expr/CompareBinaryOperator.java

@@ -17,7 +17,8 @@
  * $Id$
  */
 
-package jode;
+package jode.decompiler;
+import jode.Type;
 
 public class CompareBinaryOperator extends SimpleOperator {
     public CompareBinaryOperator(Type type, int op) {

jode/jode/expr/CompareToIntOperator.java

@@ -17,7 +17,8 @@
  * $Id$
  */
 
-package jode;
+package jode.decompiler;
+import jode.Type;
 
 public class CompareToIntOperator extends SimpleOperator {
     public CompareToIntOperator(Type type, int lessGreater) {

jode/jode/expr/CompareUnaryOperator.java

@@ -17,7 +17,8 @@
  * $Id$
  */
 
-package jode;
+package jode.decompiler;
+import jode.Type;
 
 public class CompareUnaryOperator extends SimpleOperator {
     boolean objectType;

jode/jode/expr/ComplexExpression.java

@@ -17,7 +17,9 @@
  * $Id$
  */
 
-package jode;
+package jode.decompiler;
+import jode.Decompiler;
+import jode.Type;
 
 public class ComplexExpression extends Expression {
     Operator     operator;
@@ -26,7 +28,7 @@ public class ComplexExpression extends Expression {
     public ComplexExpression(Operator op, Expression[] sub) {
         super(Type.tUnknown);
         if (sub.length != op.getOperandCount())
-            throw new AssertError ("Operand count mismatch: "+
+            throw new jode.AssertError ("Operand count mismatch: "+
                                         sub.length + " != " + 
                                         op.getOperandCount());
         operator = op;

jode/jode/expr/ConstOperator.java

@@ -17,7 +17,8 @@
  * $Id$
  */
 
-package jode;
+package jode.decompiler;
+import jode.Type;
 
 public class ConstOperator extends NoArgOperator {
     String value;

jode/jode/expr/ConstantArrayOperator.java

@@ -17,7 +17,9 @@
  * $Id$
  */
 
-package jode;
+package jode.decompiler;
+import jode.Type;
+import jode.ArrayType;
 
 public class ConstantArrayOperator extends NoArgOperator {
 

jode/jode/expr/ConstructorOperator.java

@@ -17,7 +17,9 @@
  * $Id$
  */
 
-package jode;
+package jode.decompiler;
+import jode.Type;
+import jode.MethodType;
 
 public class ConstructorOperator extends Operator {
     MethodType methodType;

jode/jode/expr/ConvertOperator.java

@@ -17,7 +17,8 @@
  * $Id$
  */
 
-package jode;
+package jode.decompiler;
+import jode.Type;
 
 public class ConvertOperator extends Operator {
     Type from;

jode/jode/expr/Expression.java

@@ -17,7 +17,8 @@
  * $Id$
  */
 
-package jode;
+package jode.decompiler;
+import jode.Type;
 
 public abstract class Expression {
     protected Type type;

jode/jode/expr/GetFieldOperator.java

@@ -17,7 +17,9 @@
  * $Id$
  */
 
-package jode;
+package jode.decompiler;
+import jode.Type;
+import jode.CodeAnalyzer;
 
 public class GetFieldOperator extends Operator {
     boolean staticFlag;

jode/jode/expr/IIncOperator.java

@@ -17,7 +17,9 @@
  * $Id$
  */
 
-package jode;
+package jode.decompiler;
+import jode.Type;
+import jode.LocalInfo;
 
 public class IIncOperator extends NoArgOperator 
 implements LocalVarOperator {
@@ -62,7 +64,7 @@ implements LocalVarOperator {
      */
     public void makeNonVoid() {
         if (type != Type.tVoid)
-            throw new AssertError("already non void");
+            throw new jode.AssertError("already non void");
         type = local.getType();
     }
 

jode/jode/expr/IfThenElseOperator.java

@@ -17,7 +17,8 @@
  * $Id$
  */
 
-package jode;
+package jode.decompiler;
+import jode.Type;
 
 public class IfThenElseOperator extends SimpleOperator {
     public IfThenElseOperator(Type type) {
@@ -42,7 +43,7 @@ public class IfThenElseOperator extends SimpleOperator {
         case 2:
             return 200;
         default:
-            throw new AssertError("ifthenelse with operand "+i);
+            throw new jode.AssertError("ifthenelse with operand "+i);
         }
     }
 

jode/jode/expr/InstanceOfOperator.java

@@ -17,7 +17,8 @@
  * $Id$
  */
 
-package jode;
+package jode.decompiler;
+import jode.Type;
 
 public class InstanceOfOperator extends SimpleOperator {
 

jode/jode/expr/InvokeOperator.java

@@ -17,7 +17,10 @@
  * $Id$
  */
 
-package jode;
+package jode.decompiler;
+import jode.CodeAnalyzer;
+import jode.MethodType;
+import jode.Type;
 import jode.bytecode.ClassInfo;
 
 public final class InvokeOperator extends Operator {
@@ -103,7 +106,7 @@ public final class InvokeOperator extends Operator {
      * @XXX check, if its the first super class that implements the method.
      */
     public boolean isSuperOrThis() {
-        return ((ClassInterfacesType)classType).getClazz().superClassOf
+        return ((jode.ClassInterfacesType)classType).getClazz().superClassOf
             (codeAnalyzer.getClazz());
     }
 

jode/jode/expr/LocalLoadOperator.java

@@ -17,7 +17,9 @@
  * $Id$
  */
 
-package jode;
+package jode.decompiler;
+import jode.Type;
+import jode.LocalInfo;
 
 public class LocalLoadOperator extends ConstOperator 
 implements LocalVarOperator {
@@ -42,17 +44,12 @@ implements LocalVarOperator {
         return false;
     }
 
-//     public void setLocalInfo(LocalInfo local) {
-//         local.setType(type);
-// 	this.local = local;
-//     }
-
     public LocalInfo getLocalInfo() {
 	return local.getLocalInfo();
     }
 
     public void updateType() {
-        if (Decompiler.isTypeDebugging)
+        if (jode.Decompiler.isTypeDebugging)
             System.err.println("local "+local.getName()+" changed: "
                                +type+" to "+local.getType()
                                +" in "+parent);

jode/jode/expr/LocalPrePostFixOperator.java

@@ -17,7 +17,8 @@
  * $Id$
  */
 
-package jode;
+package jode.decompiler;
+import jode.Type;
 
 public class LocalPrePostFixOperator extends NoArgOperator {
     IIncOperator iinc;

jode/jode/expr/LocalStoreOperator.java

@@ -17,7 +17,9 @@
  * $Id$
  */
 
-package jode;
+package jode.decompiler;
+import jode.Type;
+import jode.LocalInfo;
 
 public class LocalStoreOperator extends StoreInstruction 
 implements LocalVarOperator {

jode/jode/expr/LocalVarOperator.java

@@ -17,7 +17,9 @@
  * $Id$
  */
 
-package jode;
+package jode.decompiler;
+import jode.Type;
+import jode.LocalInfo;
 
 public interface LocalVarOperator {
     public boolean isRead();

jode/jode/expr/MonitorEnterOperator.java

@@ -17,7 +17,8 @@
  * $Id$
  */
 
-package jode;
+package jode.decompiler;
+import jode.Type;
 
 public class MonitorEnterOperator extends SimpleOperator {
     public MonitorEnterOperator() {

jode/jode/expr/MonitorExitOperator.java

@@ -17,7 +17,8 @@
  * $Id$
  */
 
-package jode;
+package jode.decompiler;
+import jode.Type;
 
 public class MonitorExitOperator extends SimpleOperator {
     public MonitorExitOperator() {

jode/jode/expr/NewArrayOperator.java

@@ -17,7 +17,9 @@
  * $Id$
  */
 
-package jode;
+package jode.decompiler;
+import jode.Type;
+import jode.ArrayType;
 
 public class NewArrayOperator extends SimpleOperator {
     String baseTypeString;

jode/jode/expr/NewOperator.java

@@ -17,7 +17,8 @@
  * $Id$
  */
 
-package jode;
+package jode.decompiler;
+import jode.Type;
 
 public class NewOperator extends NoArgOperator {
     public NewOperator(Type type) {

jode/jode/expr/NoArgOperator.java

@@ -17,7 +17,9 @@
  * $Id$
  */
 
-package jode;
+package jode.decompiler;
+import jode.Type;
+import jode.AssertError;
 
 public abstract class NoArgOperator extends Operator {
 

jode/jode/expr/NopOperator.java

@@ -17,7 +17,8 @@
  * $Id$
  */
 
-package jode;
+package jode.decompiler;
+import jode.Type;
 
 /**
  * A NopOperator takes one or zero arguments and returns it again.  It

jode/jode/expr/Operator.java

@@ -17,7 +17,8 @@
  * $Id$
  */
 
-package jode;
+package jode.decompiler;
+import jode.Type;
 
 public abstract class Operator extends Expression {
     public final static int ADD_OP     =  1;
@@ -50,7 +51,7 @@ public abstract class Operator extends Expression {
         super(type);
         this.operator = op;
         if (type == null)
-            throw new AssertError("type == null");
+            throw new jode.AssertError("type == null");
     }
 
     public Operator getOperator() {

jode/jode/expr/PopOperator.java

@@ -17,7 +17,8 @@
  * $Id$
  */
 
-package jode;
+package jode.decompiler;
+import jode.Type;
 
 public class PopOperator extends SimpleOperator {
     int count;

jode/jode/expr/PrePostFixOperator.java

@@ -17,7 +17,8 @@
  * $Id$
  */
 
-package jode;
+package jode.decompiler;
+import jode.Type;
 
 public class PrePostFixOperator extends Operator {
     StoreInstruction store;

jode/jode/expr/PutFieldOperator.java

@@ -17,7 +17,9 @@
  * $Id$
  */
 
-package jode;
+package jode.decompiler;
+import jode.Type;
+import jode.CodeAnalyzer;
 
 public class PutFieldOperator extends StoreInstruction {
     CodeAnalyzer codeAnalyzer;

jode/jode/expr/ShiftOperator.java

@@ -17,7 +17,8 @@
  * $Id$
  */
 
-package jode;
+package jode.decompiler;
+import jode.Type;
 
 /**
  * ShiftOpcodes are special, because their second operand is an UIndex

jode/jode/expr/SimpleOperator.java

@@ -17,7 +17,8 @@
  * $Id$
  */
 
-package jode;
+package jode.decompiler;
+import jode.Type;
 
 public abstract class SimpleOperator extends Operator {
     protected Type[] operandTypes;

jode/jode/expr/StoreInstruction.java

@@ -17,7 +17,8 @@
  * $Id$
  */
 
-package jode;
+package jode.decompiler;
+import jode.Type;
 
 public abstract class StoreInstruction extends Operator {
 
@@ -43,7 +44,7 @@ public abstract class StoreInstruction extends Operator {
      */
     public void makeNonVoid() {
         if (type != Type.tVoid)
-            throw new AssertError("already non void");
+            throw new jode.AssertError("already non void");
         type = lvalueType;
         if (parent != null && parent.getOperator() == this)
             parent.type = lvalueType;

jode/jode/expr/StringAddOperator.java

@@ -17,7 +17,8 @@
  * $Id$
  */
 
-package jode;
+package jode.decompiler;
+import jode.Type;
 
 public class StringAddOperator extends SimpleOperator {
     protected Type operandType;

jode/jode/expr/UnaryOperator.java

@@ -17,7 +17,8 @@
  * $Id$
  */
 
-package jode;
+package jode.decompiler;
+import jode.Type;
 
 public class UnaryOperator extends SimpleOperator {
     public UnaryOperator(Type type, int op) {

jode/jode/flow/CaseBlock.java

@@ -17,7 +17,7 @@
  * $Id$
  */
 package jode.flow;
-import jode.ConstOperator;
+import jode.decompiler.ConstOperator;
 
 /** 
  * This block represents a case instruction.  A case instruction is a

jode/jode/flow/CombineIfGotoExpressions.java

@@ -19,10 +19,8 @@
 
 package jode.flow;
 import java.util.Vector;
-import jode.Expression;
-import jode.ComplexExpression;
+import jode.decompiler.*;
 import jode.Type;
-import jode.BinaryOperator;
 
 public class CombineIfGotoExpressions {
 

jode/jode/flow/CompleteSynchronized.java

@@ -18,11 +18,7 @@
  */
 
 package jode.flow;
-import jode.MonitorEnterOperator;
-import jode.ComplexExpression;
-import jode.LocalLoadOperator;
-import jode.LocalStoreOperator;
-import jode.Expression;
+import jode.decompiler.*;
 
 public class CompleteSynchronized {
 

jode/jode/flow/ConditionalBlock.java

@@ -16,9 +16,9 @@
  * $Id$
  */
 package jode.flow;
-import jode.Expression;
-import jode.LocalVarOperator;
 import jode.TabbedPrintWriter;
+import jode.decompiler.Expression;
+import jode.decompiler.LocalVarOperator;
 
 /**
  * An ConditionalBlock is the structured block representing an if

jode/jode/flow/CreateAssignExpression.java

@@ -18,7 +18,7 @@
  */
 
 package jode.flow;
-import jode.*;
+import jode.decompiler.*;
 
 public class CreateAssignExpression {
 

jode/jode/flow/CreateConstantArray.java

@@ -18,12 +18,7 @@
  */
 
 package jode.flow;
-import jode.Expression;
-import jode.ComplexExpression;
-import jode.ArrayStoreOperator;
-import jode.NewArrayOperator;
-import jode.ConstantArrayOperator;
-import jode.ConstOperator;
+import jode.decompiler.*;
 import jode.Type;
 
 public class CreateConstantArray {

jode/jode/flow/CreateExpression.java

@@ -18,10 +18,7 @@
  */
 
 package jode.flow;
-import jode.Operator;
-import jode.NopOperator;
-import jode.Expression;
-import jode.ComplexExpression;
+import jode.decompiler.*;
 
 /**
  * This transformation creates expressions.  It transforms

jode/jode/flow/CreateForInitializer.java

@@ -18,8 +18,7 @@
  */
 
 package jode.flow;
-import jode.Expression;
-import jode.StoreInstruction;
+import jode.decompiler.*;
 
 public class CreateForInitializer {
 

jode/jode/flow/CreateIfThenElseOperator.java

@@ -19,11 +19,8 @@
 
 package jode.flow;
 import jode.Type;
-import jode.Expression;
-import jode.ConstOperator;
-import jode.ComplexExpression;
-import jode.IfThenElseOperator;
-import jode.CompareUnaryOperator;
+import jode.decompiler.*;
+
 import java.util.Enumeration;
 import java.util.Vector;
 

jode/jode/flow/CreateNewConstructor.java

@@ -18,11 +18,7 @@
  */
 
 package jode.flow;
-import jode.InvokeOperator;
-import jode.Expression;
-import jode.ComplexExpression;
-import jode.ConstructorOperator;
-import jode.NewOperator;
+import jode.decompiler.*;
 
 public class CreateNewConstructor {
 

jode/jode/flow/CreatePrePostIncExpression.java

@@ -18,7 +18,8 @@
  */
 
 package jode.flow;
-import jode.*;
+import jode.decompiler.*;
+import jode.Type;
 
 public class CreatePrePostIncExpression {
 

jode/jode/flow/FlowBlock.java

@@ -20,6 +20,7 @@
 package jode.flow;
 import java.util.*;
 import jode.*;
+import jode.decompiler.Expression;
 
 /**
  * A flow block is the structure of which the flow graph consists.  A

jode/jode/flow/IfThenElseBlock.java

@@ -16,8 +16,8 @@
  * $Id$
  */
 package jode.flow;
-import jode.Expression;
 import jode.TabbedPrintWriter;
+import jode.decompiler.Expression;
 
 /**
  * An IfThenElseBlock is the structured block representing an if

jode/jode/flow/InstructionBlock.java

@@ -16,11 +16,11 @@
  * $Id$
  */
 package jode.flow;
-import jode.Expression;
 import jode.TabbedPrintWriter;
 import jode.LocalInfo;
-import jode.LocalStoreOperator;
-import jode.ComplexExpression;
+import jode.decompiler.ComplexExpression;
+import jode.decompiler.Expression;
+import jode.decompiler.LocalStoreOperator;
 
 /**
  * This is the structured block for atomic instructions.

jode/jode/flow/InstructionContainer.java

@@ -16,8 +16,8 @@
  * $Id$
  */
 package jode.flow;
-import jode.Expression;
-import jode.LocalVarOperator;
+import jode.decompiler.Expression;
+import jode.decompiler.LocalVarOperator;
 
 /**
  * This is a method for block containing a single instruction.

jode/jode/flow/LoopBlock.java

@@ -19,11 +19,11 @@
 
 package jode.flow;
 import jode.TabbedPrintWriter;
-import jode.Expression;
-import jode.ConstOperator;
 import jode.Type;
 import jode.LocalInfo;
-import jode.LocalStoreOperator;
+import jode.decompiler.Expression;
+import jode.decompiler.ConstOperator;
+import jode.decompiler.LocalStoreOperator;
 
 /**
  * This is the structured block for an Loop block.

jode/jode/flow/RemoveEmpty.java

@@ -18,8 +18,7 @@
  */
 
 package jode.flow;
-import jode.Expression;
-import jode.NopOperator;
+import jode.decompiler.*;
 
 public class RemoveEmpty {
     

jode/jode/flow/ReturnBlock.java

@@ -19,7 +19,7 @@
 
 package jode.flow;
 import jode.TabbedPrintWriter;
-import jode.Expression;
+import jode.decompiler.Expression;
 
 /**
  * This is the structured block for an Return block.

jode/jode/flow/SwitchBlock.java

@@ -19,6 +19,7 @@
 
 package jode.flow;
 import jode.TabbedPrintWriter;
+import jode.decompiler.Expression;
 
 /**
  * This is the structured block for an empty block.
@@ -27,7 +28,7 @@ public class SwitchBlock extends InstructionContainer
 implements BreakableBlock {
     CaseBlock[] caseBlocks;
 
-    public SwitchBlock(jode.Expression instr,
+    public SwitchBlock(Expression instr,
 		       int[] cases, int[] dests) {
 	super(instr);
         this.caseBlocks = new CaseBlock[dests.length];

jode/jode/flow/SynchronizedBlock.java

@@ -17,9 +17,9 @@
  * $Id$
  */
 package jode.flow;
-import jode.Expression;
 import jode.LocalInfo;
 import jode.TabbedPrintWriter;
+import jode.decompiler.Expression;
 
 /**
  * This class represents a synchronized structured block.

jode/jode/flow/ThrowBlock.java

@@ -19,7 +19,7 @@
 
 package jode.flow;
 import jode.TabbedPrintWriter;
-import jode.Expression;
+import jode.decompiler.Expression;
 
 /**
  * This is the structured block for an Throw block.

jode/jode/flow/TransformConstructors.java

@@ -18,10 +18,7 @@
  */
 package jode.flow;
 import jode.ClassAnalyzer;
-import jode.Expression;
-import jode.ComplexExpression;
-import jode.InvokeOperator;
-import jode.PutFieldOperator;
+import jode.decompiler.*;
 
 /**
  * 

jode/jode/flow/TransformExceptionHandlers.java

@@ -20,13 +20,8 @@ package jode.flow;
 import jode.AssertError;
 import jode.Type;
 import jode.LocalInfo;
-import jode.ComplexExpression;
-import jode.LocalStoreOperator;
-import jode.NopOperator;
-import jode.MonitorExitOperator;
-import jode.LocalLoadOperator;
-import jode.Expression;
-import jode.PopOperator;
+import jode.decompiler.*;
+
 import java.util.Enumeration;
 
 /**
@@ -180,10 +175,9 @@ public class TransformExceptionHandlers {
                 local.setName("exception");
                 firstInstr.removeBlock();
 
-            } else if (instr instanceof jode.LocalStoreOperator) {
+            } else if (instr instanceof LocalStoreOperator) {
                 /* The exception is stored in a local variable */
-                local = 
-                    ((jode.LocalStoreOperator) instr).getLocalInfo();
+                local = ((LocalStoreOperator) instr).getLocalInfo();
                 firstInstr.removeBlock();
             }
         }

jode/jode/type/MethodType.java

@@ -76,7 +76,7 @@ public class MethodType {
 
     public boolean equals(Object o) {
         MethodType mt;
-        return ((o instanceof InvokeOperator)
+        return (o instanceof MethodType
                 && signature.equals((mt = (MethodType)o).signature)
                 && staticFlag == mt.staticFlag);
     }