diff --git a/jode/jode/bytecode/ClassInfo.java b/jode/jode/bytecode/ClassInfo.java index 3a539df..fc3ba7b 100644 --- a/jode/jode/bytecode/ClassInfo.java +++ b/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; diff --git a/jode/jode/bytecode/Opcodes.java b/jode/jode/bytecode/Opcodes.java index aed1709..716ed7a 100644 --- a/jode/jode/bytecode/Opcodes.java +++ b/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 diff --git a/jode/jode/bytecode/SearchPath.java b/jode/jode/bytecode/SearchPath.java index 0b8f0aa..900c6fa 100644 --- a/jode/jode/bytecode/SearchPath.java +++ b/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; diff --git a/jode/jode/decompiler/ClassAnalyzer.java b/jode/jode/decompiler/ClassAnalyzer.java index 33610f0..73f26d6 100644 --- a/jode/jode/decompiler/ClassAnalyzer.java +++ b/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; diff --git a/jode/jode/decompiler/CodeAnalyzer.java b/jode/jode/decompiler/CodeAnalyzer.java index 036a7e1..ab1f123 100644 --- a/jode/jode/decompiler/CodeAnalyzer.java +++ b/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; diff --git a/jode/jode/decompiler/FieldAnalyzer.java b/jode/jode/decompiler/FieldAnalyzer.java index 69395d4..2555105 100644 --- a/jode/jode/decompiler/FieldAnalyzer.java +++ b/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; diff --git a/jode/jode/decompiler/ImportHandler.java b/jode/jode/decompiler/ImportHandler.java index 2e9c693..90589d3 100644 --- a/jode/jode/decompiler/ImportHandler.java +++ b/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; diff --git a/jode/jode/decompiler/LocalInfo.java b/jode/jode/decompiler/LocalInfo.java index ebbcec5..6e9f6fd 100644 --- a/jode/jode/decompiler/LocalInfo.java +++ b/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(); } } diff --git a/jode/jode/expr/ArrayLengthOperator.java b/jode/jode/expr/ArrayLengthOperator.java index 5414596..5af34fc 100644 --- a/jode/jode/expr/ArrayLengthOperator.java +++ b/jode/jode/expr/ArrayLengthOperator.java @@ -17,7 +17,8 @@ * $Id$ */ -package jode; +package jode.decompiler; +import jode.Type; public class ArrayLengthOperator extends Operator { diff --git a/jode/jode/expr/ArrayLoadOperator.java b/jode/jode/expr/ArrayLoadOperator.java index 602edf5..ca2a2f6 100644 --- a/jode/jode/expr/ArrayLoadOperator.java +++ b/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) { diff --git a/jode/jode/expr/ArrayStoreOperator.java b/jode/jode/expr/ArrayStoreOperator.java index d47a7b1..9f560df 100644 --- a/jode/jode/expr/ArrayStoreOperator.java +++ b/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; diff --git a/jode/jode/expr/BinaryOperator.java b/jode/jode/expr/BinaryOperator.java index 8355f96..b38a557 100644 --- a/jode/jode/expr/BinaryOperator.java +++ b/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; diff --git a/jode/jode/expr/CheckCastOperator.java b/jode/jode/expr/CheckCastOperator.java index d5e2430..22855ab 100644 --- a/jode/jode/expr/CheckCastOperator.java +++ b/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; diff --git a/jode/jode/expr/CompareBinaryOperator.java b/jode/jode/expr/CompareBinaryOperator.java index d898f12..f099edb 100644 --- a/jode/jode/expr/CompareBinaryOperator.java +++ b/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) { diff --git a/jode/jode/expr/CompareToIntOperator.java b/jode/jode/expr/CompareToIntOperator.java index 37d1f01..c8e99f8 100644 --- a/jode/jode/expr/CompareToIntOperator.java +++ b/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) { diff --git a/jode/jode/expr/CompareUnaryOperator.java b/jode/jode/expr/CompareUnaryOperator.java index 896fed1..e97d3fa 100644 --- a/jode/jode/expr/CompareUnaryOperator.java +++ b/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; diff --git a/jode/jode/expr/ComplexExpression.java b/jode/jode/expr/ComplexExpression.java index d3cfda7..1b11380 100644 --- a/jode/jode/expr/ComplexExpression.java +++ b/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,9 +28,9 @@ 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: "+ - sub.length + " != " + - op.getOperandCount()); + throw new jode.AssertError ("Operand count mismatch: "+ + sub.length + " != " + + op.getOperandCount()); operator = op; operator.parent = this; subExpressions = sub; diff --git a/jode/jode/expr/ConstOperator.java b/jode/jode/expr/ConstOperator.java index db6cc4d..d43ae51 100644 --- a/jode/jode/expr/ConstOperator.java +++ b/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; diff --git a/jode/jode/expr/ConstantArrayOperator.java b/jode/jode/expr/ConstantArrayOperator.java index b6dca4f..b8b7c4b 100644 --- a/jode/jode/expr/ConstantArrayOperator.java +++ b/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 { diff --git a/jode/jode/expr/ConstructorOperator.java b/jode/jode/expr/ConstructorOperator.java index dc1bee6..8875ebb 100644 --- a/jode/jode/expr/ConstructorOperator.java +++ b/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; diff --git a/jode/jode/expr/ConvertOperator.java b/jode/jode/expr/ConvertOperator.java index 835bf29..4ec41f3 100644 --- a/jode/jode/expr/ConvertOperator.java +++ b/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; diff --git a/jode/jode/expr/Expression.java b/jode/jode/expr/Expression.java index 07c394b..f563215 100644 --- a/jode/jode/expr/Expression.java +++ b/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; diff --git a/jode/jode/expr/GetFieldOperator.java b/jode/jode/expr/GetFieldOperator.java index a5ee5ef..ecc84a3 100644 --- a/jode/jode/expr/GetFieldOperator.java +++ b/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; diff --git a/jode/jode/expr/IIncOperator.java b/jode/jode/expr/IIncOperator.java index 17d4b86..d523c35 100644 --- a/jode/jode/expr/IIncOperator.java +++ b/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(); } diff --git a/jode/jode/expr/IfThenElseOperator.java b/jode/jode/expr/IfThenElseOperator.java index cb8074b..63b4705 100644 --- a/jode/jode/expr/IfThenElseOperator.java +++ b/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); } } diff --git a/jode/jode/expr/InstanceOfOperator.java b/jode/jode/expr/InstanceOfOperator.java index 1ba2879..a337939 100644 --- a/jode/jode/expr/InstanceOfOperator.java +++ b/jode/jode/expr/InstanceOfOperator.java @@ -17,7 +17,8 @@ * $Id$ */ -package jode; +package jode.decompiler; +import jode.Type; public class InstanceOfOperator extends SimpleOperator { diff --git a/jode/jode/expr/InvokeOperator.java b/jode/jode/expr/InvokeOperator.java index a3304e7..768b25c 100644 --- a/jode/jode/expr/InvokeOperator.java +++ b/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()); } diff --git a/jode/jode/expr/LocalLoadOperator.java b/jode/jode/expr/LocalLoadOperator.java index 4fe55fa..e34506f 100644 --- a/jode/jode/expr/LocalLoadOperator.java +++ b/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); diff --git a/jode/jode/expr/LocalPrePostFixOperator.java b/jode/jode/expr/LocalPrePostFixOperator.java index b2c31f2..dfc87c2 100644 --- a/jode/jode/expr/LocalPrePostFixOperator.java +++ b/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; diff --git a/jode/jode/expr/LocalStoreOperator.java b/jode/jode/expr/LocalStoreOperator.java index 4c8fce9..a05bd20 100644 --- a/jode/jode/expr/LocalStoreOperator.java +++ b/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 { diff --git a/jode/jode/expr/LocalVarOperator.java b/jode/jode/expr/LocalVarOperator.java index 8e1df34..8260589 100644 --- a/jode/jode/expr/LocalVarOperator.java +++ b/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(); diff --git a/jode/jode/expr/MonitorEnterOperator.java b/jode/jode/expr/MonitorEnterOperator.java index 35196ae..ca00b38 100644 --- a/jode/jode/expr/MonitorEnterOperator.java +++ b/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() { diff --git a/jode/jode/expr/MonitorExitOperator.java b/jode/jode/expr/MonitorExitOperator.java index ecdc6d8..6e3c6ed 100644 --- a/jode/jode/expr/MonitorExitOperator.java +++ b/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() { diff --git a/jode/jode/expr/NewArrayOperator.java b/jode/jode/expr/NewArrayOperator.java index e9ce4f5..f72aaf3 100644 --- a/jode/jode/expr/NewArrayOperator.java +++ b/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; diff --git a/jode/jode/expr/NewOperator.java b/jode/jode/expr/NewOperator.java index 1fd29b4..849c4e8 100644 --- a/jode/jode/expr/NewOperator.java +++ b/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) { diff --git a/jode/jode/expr/NoArgOperator.java b/jode/jode/expr/NoArgOperator.java index b72dcca..21467a1 100644 --- a/jode/jode/expr/NoArgOperator.java +++ b/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 { diff --git a/jode/jode/expr/NopOperator.java b/jode/jode/expr/NopOperator.java index 0439679..e44a1f4 100644 --- a/jode/jode/expr/NopOperator.java +++ b/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 diff --git a/jode/jode/expr/Operator.java b/jode/jode/expr/Operator.java index 637c9d0..b8255ca 100644 --- a/jode/jode/expr/Operator.java +++ b/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() { diff --git a/jode/jode/expr/PopOperator.java b/jode/jode/expr/PopOperator.java index 31bbb22..139fe79 100644 --- a/jode/jode/expr/PopOperator.java +++ b/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; diff --git a/jode/jode/expr/PrePostFixOperator.java b/jode/jode/expr/PrePostFixOperator.java index 3664256..1ed205d 100644 --- a/jode/jode/expr/PrePostFixOperator.java +++ b/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; diff --git a/jode/jode/expr/PutFieldOperator.java b/jode/jode/expr/PutFieldOperator.java index 7ed53d8..21e1424 100644 --- a/jode/jode/expr/PutFieldOperator.java +++ b/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; diff --git a/jode/jode/expr/ShiftOperator.java b/jode/jode/expr/ShiftOperator.java index 1934b6c..25512b7 100644 --- a/jode/jode/expr/ShiftOperator.java +++ b/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 diff --git a/jode/jode/expr/SimpleOperator.java b/jode/jode/expr/SimpleOperator.java index 6e8a40a..3bd5899 100644 --- a/jode/jode/expr/SimpleOperator.java +++ b/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; diff --git a/jode/jode/expr/StoreInstruction.java b/jode/jode/expr/StoreInstruction.java index 5b6ae32..7931ccb 100644 --- a/jode/jode/expr/StoreInstruction.java +++ b/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; diff --git a/jode/jode/expr/StringAddOperator.java b/jode/jode/expr/StringAddOperator.java index f8a7dc8..27df367 100644 --- a/jode/jode/expr/StringAddOperator.java +++ b/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; diff --git a/jode/jode/expr/UnaryOperator.java b/jode/jode/expr/UnaryOperator.java index 8d65a4c..724b74c 100644 --- a/jode/jode/expr/UnaryOperator.java +++ b/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) { diff --git a/jode/jode/flow/CaseBlock.java b/jode/jode/flow/CaseBlock.java index a671cc0..c2deeba 100644 --- a/jode/jode/flow/CaseBlock.java +++ b/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 diff --git a/jode/jode/flow/CombineIfGotoExpressions.java b/jode/jode/flow/CombineIfGotoExpressions.java index 2c9bdda..787a015 100644 --- a/jode/jode/flow/CombineIfGotoExpressions.java +++ b/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 { diff --git a/jode/jode/flow/CompleteSynchronized.java b/jode/jode/flow/CompleteSynchronized.java index 8869f71..163548e 100644 --- a/jode/jode/flow/CompleteSynchronized.java +++ b/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 { diff --git a/jode/jode/flow/ConditionalBlock.java b/jode/jode/flow/ConditionalBlock.java index 9bde6dc..6fe7107 100644 --- a/jode/jode/flow/ConditionalBlock.java +++ b/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 diff --git a/jode/jode/flow/CreateAssignExpression.java b/jode/jode/flow/CreateAssignExpression.java index 1445ed2..c027bdf 100644 --- a/jode/jode/flow/CreateAssignExpression.java +++ b/jode/jode/flow/CreateAssignExpression.java @@ -18,7 +18,7 @@ */ package jode.flow; -import jode.*; +import jode.decompiler.*; public class CreateAssignExpression { diff --git a/jode/jode/flow/CreateConstantArray.java b/jode/jode/flow/CreateConstantArray.java index ceee767..d88df9b 100644 --- a/jode/jode/flow/CreateConstantArray.java +++ b/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 { diff --git a/jode/jode/flow/CreateExpression.java b/jode/jode/flow/CreateExpression.java index 29909ab..3cb152a 100644 --- a/jode/jode/flow/CreateExpression.java +++ b/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 diff --git a/jode/jode/flow/CreateForInitializer.java b/jode/jode/flow/CreateForInitializer.java index af6f45b..dfcf2be 100644 --- a/jode/jode/flow/CreateForInitializer.java +++ b/jode/jode/flow/CreateForInitializer.java @@ -18,8 +18,7 @@ */ package jode.flow; -import jode.Expression; -import jode.StoreInstruction; +import jode.decompiler.*; public class CreateForInitializer { diff --git a/jode/jode/flow/CreateIfThenElseOperator.java b/jode/jode/flow/CreateIfThenElseOperator.java index 331719a..6706744 100644 --- a/jode/jode/flow/CreateIfThenElseOperator.java +++ b/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; diff --git a/jode/jode/flow/CreateNewConstructor.java b/jode/jode/flow/CreateNewConstructor.java index f883814..7357636 100644 --- a/jode/jode/flow/CreateNewConstructor.java +++ b/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 { diff --git a/jode/jode/flow/CreatePrePostIncExpression.java b/jode/jode/flow/CreatePrePostIncExpression.java index 0e2f83f..51d7401 100644 --- a/jode/jode/flow/CreatePrePostIncExpression.java +++ b/jode/jode/flow/CreatePrePostIncExpression.java @@ -18,7 +18,8 @@ */ package jode.flow; -import jode.*; +import jode.decompiler.*; +import jode.Type; public class CreatePrePostIncExpression { diff --git a/jode/jode/flow/FlowBlock.java b/jode/jode/flow/FlowBlock.java index 2eb000a..dbaf031 100644 --- a/jode/jode/flow/FlowBlock.java +++ b/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 @@ -1122,7 +1123,7 @@ public class FlowBlock { break; else if (nextFlow.addr >= start) { - /* First analyze the nextFlow block. It may + /* First analyze the nextFlow block. It may * return early after a T2 trafo so call it * until nothing more is possible. */ diff --git a/jode/jode/flow/IfThenElseBlock.java b/jode/jode/flow/IfThenElseBlock.java index 58ba7c5..611cf56 100644 --- a/jode/jode/flow/IfThenElseBlock.java +++ b/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 diff --git a/jode/jode/flow/InstructionBlock.java b/jode/jode/flow/InstructionBlock.java index 85e6d7d..17f5cd7 100644 --- a/jode/jode/flow/InstructionBlock.java +++ b/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. diff --git a/jode/jode/flow/InstructionContainer.java b/jode/jode/flow/InstructionContainer.java index 577a959..a355cd5 100644 --- a/jode/jode/flow/InstructionContainer.java +++ b/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. diff --git a/jode/jode/flow/LoopBlock.java b/jode/jode/flow/LoopBlock.java index cef3803..500e035 100644 --- a/jode/jode/flow/LoopBlock.java +++ b/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. diff --git a/jode/jode/flow/RemoveEmpty.java b/jode/jode/flow/RemoveEmpty.java index 7b69f5c..adb8f04 100644 --- a/jode/jode/flow/RemoveEmpty.java +++ b/jode/jode/flow/RemoveEmpty.java @@ -18,8 +18,7 @@ */ package jode.flow; -import jode.Expression; -import jode.NopOperator; +import jode.decompiler.*; public class RemoveEmpty { diff --git a/jode/jode/flow/ReturnBlock.java b/jode/jode/flow/ReturnBlock.java index 17313aa..edbff26 100644 --- a/jode/jode/flow/ReturnBlock.java +++ b/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. diff --git a/jode/jode/flow/SwitchBlock.java b/jode/jode/flow/SwitchBlock.java index 786e54b..03611ef 100644 --- a/jode/jode/flow/SwitchBlock.java +++ b/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]; diff --git a/jode/jode/flow/SynchronizedBlock.java b/jode/jode/flow/SynchronizedBlock.java index b3f82fd..1bc3b04 100644 --- a/jode/jode/flow/SynchronizedBlock.java +++ b/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. diff --git a/jode/jode/flow/ThrowBlock.java b/jode/jode/flow/ThrowBlock.java index 1be2f6e..03d0ffc 100644 --- a/jode/jode/flow/ThrowBlock.java +++ b/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. diff --git a/jode/jode/flow/TransformConstructors.java b/jode/jode/flow/TransformConstructors.java index 9197d26..2db2c32 100644 --- a/jode/jode/flow/TransformConstructors.java +++ b/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.*; /** * diff --git a/jode/jode/flow/TransformExceptionHandlers.java b/jode/jode/flow/TransformExceptionHandlers.java index 5ca6b3d..b29b728 100644 --- a/jode/jode/flow/TransformExceptionHandlers.java +++ b/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(); } } diff --git a/jode/jode/type/MethodType.java b/jode/jode/type/MethodType.java index 5d8d127..ee9dbd1 100644 --- a/jode/jode/type/MethodType.java +++ b/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); }