diff --git a/jode/jode/decompiler/CodeAnalyzer.java b/jode/jode/decompiler/CodeAnalyzer.java index 082ea02..e701b23 100644 --- a/jode/jode/decompiler/CodeAnalyzer.java +++ b/jode/jode/decompiler/CodeAnalyzer.java @@ -22,7 +22,7 @@ import jode.bytecode.ClassInfo; import jode.bytecode.ConstantPool; import jode.bytecode.AttributeInfo; import jode.bytecode.CodeInfo; -import jode.decompiler.Opcodes; +import jode.expr.Opcodes; import jode.flow.FlowBlock; import jode.flow.TransformExceptionHandlers; diff --git a/jode/jode/decompiler/FieldAnalyzer.java b/jode/jode/decompiler/FieldAnalyzer.java index 2555105..b8dbfdb 100644 --- a/jode/jode/decompiler/FieldAnalyzer.java +++ b/jode/jode/decompiler/FieldAnalyzer.java @@ -22,8 +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; +import jode.expr.Expression; +import jode.expr.ConstOperator; public class FieldAnalyzer implements Analyzer { ClassAnalyzer clazz; diff --git a/jode/jode/decompiler/LocalInfo.java b/jode/jode/decompiler/LocalInfo.java index 33ca21a..530a47e 100644 --- a/jode/jode/decompiler/LocalInfo.java +++ b/jode/jode/decompiler/LocalInfo.java @@ -20,7 +20,7 @@ package jode; import java.util.Enumeration; import java.util.Vector; -import jode.decompiler.LocalVarOperator; +import jode.expr.LocalVarOperator; /** * The LocalInfo represents a local variable of a method. diff --git a/jode/jode/decompiler/Opcodes.java b/jode/jode/decompiler/Opcodes.java index 0eae6a7..a0cd057 100644 --- a/jode/jode/decompiler/Opcodes.java +++ b/jode/jode/decompiler/Opcodes.java @@ -17,7 +17,7 @@ * $Id$ */ -package jode.decompiler; +package jode.expr; import jode.CodeAnalyzer; import jode.LocalInfo; import jode.Type; diff --git a/jode/jode/expr/ArrayLengthOperator.java b/jode/jode/expr/ArrayLengthOperator.java index 5af34fc..645206b 100644 --- a/jode/jode/expr/ArrayLengthOperator.java +++ b/jode/jode/expr/ArrayLengthOperator.java @@ -17,7 +17,7 @@ * $Id$ */ -package jode.decompiler; +package jode.expr; import jode.Type; public class ArrayLengthOperator extends Operator { diff --git a/jode/jode/expr/ArrayLoadOperator.java b/jode/jode/expr/ArrayLoadOperator.java index ca2a2f6..9654e04 100644 --- a/jode/jode/expr/ArrayLoadOperator.java +++ b/jode/jode/expr/ArrayLoadOperator.java @@ -17,7 +17,7 @@ * $Id$ */ -package jode.decompiler; +package jode.expr; import jode.Type; import jode.ArrayType; diff --git a/jode/jode/expr/ArrayStoreOperator.java b/jode/jode/expr/ArrayStoreOperator.java index 9f560df..f716858 100644 --- a/jode/jode/expr/ArrayStoreOperator.java +++ b/jode/jode/expr/ArrayStoreOperator.java @@ -17,7 +17,7 @@ * $Id$ */ -package jode.decompiler; +package jode.expr; import jode.Type; import jode.ArrayType; diff --git a/jode/jode/expr/BinaryOperator.java b/jode/jode/expr/BinaryOperator.java index b38a557..915f7af 100644 --- a/jode/jode/expr/BinaryOperator.java +++ b/jode/jode/expr/BinaryOperator.java @@ -17,7 +17,7 @@ * $Id$ */ -package jode.decompiler; +package jode.expr; import jode.Type; public class BinaryOperator extends Operator { diff --git a/jode/jode/expr/CheckCastOperator.java b/jode/jode/expr/CheckCastOperator.java index 22855ab..410baa2 100644 --- a/jode/jode/expr/CheckCastOperator.java +++ b/jode/jode/expr/CheckCastOperator.java @@ -17,7 +17,7 @@ * $Id$ */ -package jode.decompiler; +package jode.expr; import jode.Type; public class CheckCastOperator extends SimpleOperator { diff --git a/jode/jode/expr/CheckNullOperator.java b/jode/jode/expr/CheckNullOperator.java index 72045b7..6ec5e6a 100644 --- a/jode/jode/expr/CheckNullOperator.java +++ b/jode/jode/expr/CheckNullOperator.java @@ -17,7 +17,7 @@ * $Id$ */ -package jode.decompiler; +package jode.expr; import jode.Type; import jode.LocalInfo; diff --git a/jode/jode/expr/ClassFieldOperator.java b/jode/jode/expr/ClassFieldOperator.java index 5b99635..2bf391d 100644 --- a/jode/jode/expr/ClassFieldOperator.java +++ b/jode/jode/expr/ClassFieldOperator.java @@ -17,7 +17,7 @@ * $Id$ */ -package jode.decompiler; +package jode.expr; import jode.Type; import jode.CodeAnalyzer; diff --git a/jode/jode/expr/CombineableOperator.java b/jode/jode/expr/CombineableOperator.java index bebba06..f35b269 100644 --- a/jode/jode/expr/CombineableOperator.java +++ b/jode/jode/expr/CombineableOperator.java @@ -16,7 +16,7 @@ * * $Id$ */ -package jode.decompiler; +package jode.expr; public interface CombineableOperator extends MatchableOperator { /** diff --git a/jode/jode/expr/CompareBinaryOperator.java b/jode/jode/expr/CompareBinaryOperator.java index f099edb..370e0fb 100644 --- a/jode/jode/expr/CompareBinaryOperator.java +++ b/jode/jode/expr/CompareBinaryOperator.java @@ -17,7 +17,7 @@ * $Id$ */ -package jode.decompiler; +package jode.expr; import jode.Type; public class CompareBinaryOperator extends SimpleOperator { diff --git a/jode/jode/expr/CompareToIntOperator.java b/jode/jode/expr/CompareToIntOperator.java index c8e99f8..5330292 100644 --- a/jode/jode/expr/CompareToIntOperator.java +++ b/jode/jode/expr/CompareToIntOperator.java @@ -17,7 +17,7 @@ * $Id$ */ -package jode.decompiler; +package jode.expr; import jode.Type; public class CompareToIntOperator extends SimpleOperator { diff --git a/jode/jode/expr/CompareUnaryOperator.java b/jode/jode/expr/CompareUnaryOperator.java index 602d685..aac1256 100644 --- a/jode/jode/expr/CompareUnaryOperator.java +++ b/jode/jode/expr/CompareUnaryOperator.java @@ -17,7 +17,7 @@ * $Id$ */ -package jode.decompiler; +package jode.expr; import jode.Type; public class CompareUnaryOperator extends SimpleOperator { diff --git a/jode/jode/expr/ComplexExpression.java b/jode/jode/expr/ComplexExpression.java index 88da187..b2f7f1d 100644 --- a/jode/jode/expr/ComplexExpression.java +++ b/jode/jode/expr/ComplexExpression.java @@ -17,7 +17,7 @@ * $Id$ */ -package jode.decompiler; +package jode.expr; import jode.Decompiler; import jode.Type; diff --git a/jode/jode/expr/ConstOperator.java b/jode/jode/expr/ConstOperator.java index d43ae51..ccc14d1 100644 --- a/jode/jode/expr/ConstOperator.java +++ b/jode/jode/expr/ConstOperator.java @@ -17,7 +17,7 @@ * $Id$ */ -package jode.decompiler; +package jode.expr; import jode.Type; public class ConstOperator extends NoArgOperator { diff --git a/jode/jode/expr/ConstructorOperator.java b/jode/jode/expr/ConstructorOperator.java index d68cd55..c113062 100644 --- a/jode/jode/expr/ConstructorOperator.java +++ b/jode/jode/expr/ConstructorOperator.java @@ -17,7 +17,7 @@ * $Id$ */ -package jode.decompiler; +package jode.expr; import jode.Type; import jode.MethodType; diff --git a/jode/jode/expr/ConvertOperator.java b/jode/jode/expr/ConvertOperator.java index 4ec41f3..7a6e2f8 100644 --- a/jode/jode/expr/ConvertOperator.java +++ b/jode/jode/expr/ConvertOperator.java @@ -17,7 +17,7 @@ * $Id$ */ -package jode.decompiler; +package jode.expr; import jode.Type; public class ConvertOperator extends Operator { diff --git a/jode/jode/expr/Expression.java b/jode/jode/expr/Expression.java index 4ef1854..4138418 100644 --- a/jode/jode/expr/Expression.java +++ b/jode/jode/expr/Expression.java @@ -17,7 +17,7 @@ * $Id$ */ -package jode.decompiler; +package jode.expr; import jode.Type; public abstract class Expression { diff --git a/jode/jode/expr/GetFieldOperator.java b/jode/jode/expr/GetFieldOperator.java index ecc84a3..3869103 100644 --- a/jode/jode/expr/GetFieldOperator.java +++ b/jode/jode/expr/GetFieldOperator.java @@ -17,7 +17,7 @@ * $Id$ */ -package jode.decompiler; +package jode.expr; import jode.Type; import jode.CodeAnalyzer; diff --git a/jode/jode/expr/IIncOperator.java b/jode/jode/expr/IIncOperator.java index 7b7c16d..018a922 100644 --- a/jode/jode/expr/IIncOperator.java +++ b/jode/jode/expr/IIncOperator.java @@ -17,7 +17,7 @@ * $Id$ */ -package jode.decompiler; +package jode.expr; import jode.Type; import jode.LocalInfo; diff --git a/jode/jode/expr/IfThenElseOperator.java b/jode/jode/expr/IfThenElseOperator.java index 63b4705..1fe0b9f 100644 --- a/jode/jode/expr/IfThenElseOperator.java +++ b/jode/jode/expr/IfThenElseOperator.java @@ -17,7 +17,7 @@ * $Id$ */ -package jode.decompiler; +package jode.expr; import jode.Type; public class IfThenElseOperator extends SimpleOperator { diff --git a/jode/jode/expr/InstanceOfOperator.java b/jode/jode/expr/InstanceOfOperator.java index a337939..93ea6d5 100644 --- a/jode/jode/expr/InstanceOfOperator.java +++ b/jode/jode/expr/InstanceOfOperator.java @@ -17,7 +17,7 @@ * $Id$ */ -package jode.decompiler; +package jode.expr; import jode.Type; public class InstanceOfOperator extends SimpleOperator { diff --git a/jode/jode/expr/InvokeOperator.java b/jode/jode/expr/InvokeOperator.java index 8889b09..b25687c 100644 --- a/jode/jode/expr/InvokeOperator.java +++ b/jode/jode/expr/InvokeOperator.java @@ -17,7 +17,7 @@ * $Id$ */ -package jode.decompiler; +package jode.expr; import jode.CodeAnalyzer; import jode.MethodType; import jode.Type; diff --git a/jode/jode/expr/LocalLoadOperator.java b/jode/jode/expr/LocalLoadOperator.java index 393a62a..c71cb8e 100644 --- a/jode/jode/expr/LocalLoadOperator.java +++ b/jode/jode/expr/LocalLoadOperator.java @@ -17,7 +17,7 @@ * $Id$ */ -package jode.decompiler; +package jode.expr; import jode.Decompiler; import jode.Type; import jode.LocalInfo; diff --git a/jode/jode/expr/LocalPrePostFixOperator.java b/jode/jode/expr/LocalPrePostFixOperator.java index dfc87c2..4e1950d 100644 --- a/jode/jode/expr/LocalPrePostFixOperator.java +++ b/jode/jode/expr/LocalPrePostFixOperator.java @@ -17,7 +17,7 @@ * $Id$ */ -package jode.decompiler; +package jode.expr; import jode.Type; public class LocalPrePostFixOperator extends NoArgOperator { diff --git a/jode/jode/expr/LocalStoreOperator.java b/jode/jode/expr/LocalStoreOperator.java index a05bd20..2e8a5ba 100644 --- a/jode/jode/expr/LocalStoreOperator.java +++ b/jode/jode/expr/LocalStoreOperator.java @@ -17,7 +17,7 @@ * $Id$ */ -package jode.decompiler; +package jode.expr; import jode.Type; import jode.LocalInfo; diff --git a/jode/jode/expr/LocalVarOperator.java b/jode/jode/expr/LocalVarOperator.java index 8260589..db9d7bd 100644 --- a/jode/jode/expr/LocalVarOperator.java +++ b/jode/jode/expr/LocalVarOperator.java @@ -17,7 +17,7 @@ * $Id$ */ -package jode.decompiler; +package jode.expr; import jode.Type; import jode.LocalInfo; diff --git a/jode/jode/expr/MatchableOperator.java b/jode/jode/expr/MatchableOperator.java index f8fea96..b523a81 100644 --- a/jode/jode/expr/MatchableOperator.java +++ b/jode/jode/expr/MatchableOperator.java @@ -16,7 +16,7 @@ * * $Id$ */ -package jode.decompiler; +package jode.expr; public interface MatchableOperator { /** diff --git a/jode/jode/expr/MonitorEnterOperator.java b/jode/jode/expr/MonitorEnterOperator.java index ca00b38..89160ba 100644 --- a/jode/jode/expr/MonitorEnterOperator.java +++ b/jode/jode/expr/MonitorEnterOperator.java @@ -17,7 +17,7 @@ * $Id$ */ -package jode.decompiler; +package jode.expr; import jode.Type; public class MonitorEnterOperator extends SimpleOperator { diff --git a/jode/jode/expr/MonitorExitOperator.java b/jode/jode/expr/MonitorExitOperator.java index 6e3c6ed..1a77c9c 100644 --- a/jode/jode/expr/MonitorExitOperator.java +++ b/jode/jode/expr/MonitorExitOperator.java @@ -17,7 +17,7 @@ * $Id$ */ -package jode.decompiler; +package jode.expr; import jode.Type; public class MonitorExitOperator extends SimpleOperator { diff --git a/jode/jode/expr/NewArrayOperator.java b/jode/jode/expr/NewArrayOperator.java index f72aaf3..fc61b89 100644 --- a/jode/jode/expr/NewArrayOperator.java +++ b/jode/jode/expr/NewArrayOperator.java @@ -17,7 +17,7 @@ * $Id$ */ -package jode.decompiler; +package jode.expr; import jode.Type; import jode.ArrayType; diff --git a/jode/jode/expr/NewOperator.java b/jode/jode/expr/NewOperator.java index 849c4e8..488bd43 100644 --- a/jode/jode/expr/NewOperator.java +++ b/jode/jode/expr/NewOperator.java @@ -17,7 +17,7 @@ * $Id$ */ -package jode.decompiler; +package jode.expr; import jode.Type; public class NewOperator extends NoArgOperator { diff --git a/jode/jode/expr/NoArgOperator.java b/jode/jode/expr/NoArgOperator.java index 21467a1..edc18ee 100644 --- a/jode/jode/expr/NoArgOperator.java +++ b/jode/jode/expr/NoArgOperator.java @@ -17,7 +17,7 @@ * $Id$ */ -package jode.decompiler; +package jode.expr; import jode.Type; import jode.AssertError; diff --git a/jode/jode/expr/NopOperator.java b/jode/jode/expr/NopOperator.java index e44a1f4..7ac6888 100644 --- a/jode/jode/expr/NopOperator.java +++ b/jode/jode/expr/NopOperator.java @@ -17,7 +17,7 @@ * $Id$ */ -package jode.decompiler; +package jode.expr; import jode.Type; /** diff --git a/jode/jode/expr/Operator.java b/jode/jode/expr/Operator.java index b8255ca..1bb56a8 100644 --- a/jode/jode/expr/Operator.java +++ b/jode/jode/expr/Operator.java @@ -17,7 +17,7 @@ * $Id$ */ -package jode.decompiler; +package jode.expr; import jode.Type; public abstract class Operator extends Expression { diff --git a/jode/jode/expr/PopOperator.java b/jode/jode/expr/PopOperator.java index 041fbac..8dbe955 100644 --- a/jode/jode/expr/PopOperator.java +++ b/jode/jode/expr/PopOperator.java @@ -17,7 +17,7 @@ * $Id$ */ -package jode.decompiler; +package jode.expr; import jode.Type; public class PopOperator extends SimpleOperator { diff --git a/jode/jode/expr/PrePostFixOperator.java b/jode/jode/expr/PrePostFixOperator.java index 1ed205d..e26084d 100644 --- a/jode/jode/expr/PrePostFixOperator.java +++ b/jode/jode/expr/PrePostFixOperator.java @@ -17,7 +17,7 @@ * $Id$ */ -package jode.decompiler; +package jode.expr; import jode.Type; public class PrePostFixOperator extends Operator { diff --git a/jode/jode/expr/PutFieldOperator.java b/jode/jode/expr/PutFieldOperator.java index 21e1424..fa4870f 100644 --- a/jode/jode/expr/PutFieldOperator.java +++ b/jode/jode/expr/PutFieldOperator.java @@ -17,7 +17,7 @@ * $Id$ */ -package jode.decompiler; +package jode.expr; import jode.Type; import jode.CodeAnalyzer; diff --git a/jode/jode/expr/ShiftOperator.java b/jode/jode/expr/ShiftOperator.java index 25512b7..76a915d 100644 --- a/jode/jode/expr/ShiftOperator.java +++ b/jode/jode/expr/ShiftOperator.java @@ -17,7 +17,7 @@ * $Id$ */ -package jode.decompiler; +package jode.expr; import jode.Type; /** diff --git a/jode/jode/expr/SimpleOperator.java b/jode/jode/expr/SimpleOperator.java index 3bd5899..a2569cd 100644 --- a/jode/jode/expr/SimpleOperator.java +++ b/jode/jode/expr/SimpleOperator.java @@ -17,7 +17,7 @@ * $Id$ */ -package jode.decompiler; +package jode.expr; import jode.Type; public abstract class SimpleOperator extends Operator { diff --git a/jode/jode/expr/StoreInstruction.java b/jode/jode/expr/StoreInstruction.java index ffaf0a9..312fdd9 100644 --- a/jode/jode/expr/StoreInstruction.java +++ b/jode/jode/expr/StoreInstruction.java @@ -17,7 +17,7 @@ * $Id$ */ -package jode.decompiler; +package jode.expr; import jode.Type; public abstract class StoreInstruction extends Operator diff --git a/jode/jode/expr/StringAddOperator.java b/jode/jode/expr/StringAddOperator.java index 34a461c..bc52723 100644 --- a/jode/jode/expr/StringAddOperator.java +++ b/jode/jode/expr/StringAddOperator.java @@ -17,7 +17,7 @@ * $Id$ */ -package jode.decompiler; +package jode.expr; import jode.Type; public class StringAddOperator extends SimpleOperator { diff --git a/jode/jode/expr/UnaryOperator.java b/jode/jode/expr/UnaryOperator.java index 724b74c..6a15542 100644 --- a/jode/jode/expr/UnaryOperator.java +++ b/jode/jode/expr/UnaryOperator.java @@ -17,7 +17,7 @@ * $Id$ */ -package jode.decompiler; +package jode.expr; import jode.Type; public class UnaryOperator extends SimpleOperator { diff --git a/jode/jode/flow/CaseBlock.java b/jode/jode/flow/CaseBlock.java index 06c9470..4713a6d 100644 --- a/jode/jode/flow/CaseBlock.java +++ b/jode/jode/flow/CaseBlock.java @@ -17,7 +17,7 @@ * $Id$ */ package jode.flow; -import jode.decompiler.ConstOperator; +import jode.expr.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 42fcb40..32ea943 100644 --- a/jode/jode/flow/CombineIfGotoExpressions.java +++ b/jode/jode/flow/CombineIfGotoExpressions.java @@ -19,7 +19,7 @@ package jode.flow; import java.util.Vector; -import jode.decompiler.*; +import jode.expr.*; import jode.Type; public class CombineIfGotoExpressions { diff --git a/jode/jode/flow/CompleteSynchronized.java b/jode/jode/flow/CompleteSynchronized.java index e4e4ba9..99dcbc8 100644 --- a/jode/jode/flow/CompleteSynchronized.java +++ b/jode/jode/flow/CompleteSynchronized.java @@ -19,7 +19,7 @@ package jode.flow; import jode.Decompiler; -import jode.decompiler.*; +import jode.expr.*; public class CompleteSynchronized { diff --git a/jode/jode/flow/ConditionalBlock.java b/jode/jode/flow/ConditionalBlock.java index f6a28f0..efdae25 100644 --- a/jode/jode/flow/ConditionalBlock.java +++ b/jode/jode/flow/ConditionalBlock.java @@ -17,8 +17,8 @@ */ package jode.flow; import jode.TabbedPrintWriter; -import jode.decompiler.Expression; -import jode.decompiler.LocalVarOperator; +import jode.expr.Expression; +import jode.expr.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 7392407..0ea7275 100644 --- a/jode/jode/flow/CreateAssignExpression.java +++ b/jode/jode/flow/CreateAssignExpression.java @@ -18,7 +18,7 @@ */ package jode.flow; -import jode.decompiler.*; +import jode.expr.*; public class CreateAssignExpression { diff --git a/jode/jode/flow/CreateCheckNull.java b/jode/jode/flow/CreateCheckNull.java index d4ff77d..a6c08e7 100644 --- a/jode/jode/flow/CreateCheckNull.java +++ b/jode/jode/flow/CreateCheckNull.java @@ -18,7 +18,7 @@ */ package jode.flow; -import jode.decompiler.*; +import jode.expr.*; import jode.Type; import jode.LocalInfo; diff --git a/jode/jode/flow/CreateConstantArray.java b/jode/jode/flow/CreateConstantArray.java index 3512662..945df28 100644 --- a/jode/jode/flow/CreateConstantArray.java +++ b/jode/jode/flow/CreateConstantArray.java @@ -19,7 +19,7 @@ package jode.flow; import jode.Decompiler; -import jode.decompiler.*; +import jode.expr.*; import jode.Type; public class CreateConstantArray { diff --git a/jode/jode/flow/CreateExpression.java b/jode/jode/flow/CreateExpression.java index 33b3ee5..d266aed 100644 --- a/jode/jode/flow/CreateExpression.java +++ b/jode/jode/flow/CreateExpression.java @@ -19,7 +19,7 @@ package jode.flow; import jode.Decompiler; -import jode.decompiler.*; +import jode.expr.*; /** * This transformation creates expressions. It transforms diff --git a/jode/jode/flow/CreateForInitializer.java b/jode/jode/flow/CreateForInitializer.java index 3be28e1..6967421 100644 --- a/jode/jode/flow/CreateForInitializer.java +++ b/jode/jode/flow/CreateForInitializer.java @@ -19,7 +19,7 @@ package jode.flow; import jode.Decompiler; -import jode.decompiler.*; +import jode.expr.*; public class CreateForInitializer { diff --git a/jode/jode/flow/CreateIfThenElseOperator.java b/jode/jode/flow/CreateIfThenElseOperator.java index b0c7a53..ab534b1 100644 --- a/jode/jode/flow/CreateIfThenElseOperator.java +++ b/jode/jode/flow/CreateIfThenElseOperator.java @@ -20,7 +20,7 @@ package jode.flow; import jode.Decompiler; import jode.Type; -import jode.decompiler.*; +import jode.expr.*; import java.util.Enumeration; import java.util.Vector; diff --git a/jode/jode/flow/CreateNewConstructor.java b/jode/jode/flow/CreateNewConstructor.java index 7357636..2ad0af4 100644 --- a/jode/jode/flow/CreateNewConstructor.java +++ b/jode/jode/flow/CreateNewConstructor.java @@ -18,7 +18,7 @@ */ package jode.flow; -import jode.decompiler.*; +import jode.expr.*; public class CreateNewConstructor { diff --git a/jode/jode/flow/CreatePrePostIncExpression.java b/jode/jode/flow/CreatePrePostIncExpression.java index 51d7401..36da3f1 100644 --- a/jode/jode/flow/CreatePrePostIncExpression.java +++ b/jode/jode/flow/CreatePrePostIncExpression.java @@ -18,7 +18,7 @@ */ package jode.flow; -import jode.decompiler.*; +import jode.expr.*; import jode.Type; public class CreatePrePostIncExpression { diff --git a/jode/jode/flow/FlowBlock.java b/jode/jode/flow/FlowBlock.java index 8f543e3..89ddab5 100644 --- a/jode/jode/flow/FlowBlock.java +++ b/jode/jode/flow/FlowBlock.java @@ -20,8 +20,8 @@ package jode.flow; import java.util.*; import jode.*; -import jode.decompiler.Expression; -import jode.decompiler.CombineableOperator; +import jode.expr.Expression; +import jode.expr.CombineableOperator; /** * A flow block is the structure of which the flow graph consists. A diff --git a/jode/jode/flow/IfThenElseBlock.java b/jode/jode/flow/IfThenElseBlock.java index 8e5e693..5074923 100644 --- a/jode/jode/flow/IfThenElseBlock.java +++ b/jode/jode/flow/IfThenElseBlock.java @@ -17,7 +17,7 @@ */ package jode.flow; import jode.TabbedPrintWriter; -import jode.decompiler.Expression; +import jode.expr.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 17f5cd7..41efca5 100644 --- a/jode/jode/flow/InstructionBlock.java +++ b/jode/jode/flow/InstructionBlock.java @@ -18,9 +18,9 @@ package jode.flow; import jode.TabbedPrintWriter; import jode.LocalInfo; -import jode.decompiler.ComplexExpression; -import jode.decompiler.Expression; -import jode.decompiler.LocalStoreOperator; +import jode.expr.ComplexExpression; +import jode.expr.Expression; +import jode.expr.LocalStoreOperator; /** * This is the structured block for atomic instructions. diff --git a/jode/jode/flow/InstructionContainer.java b/jode/jode/flow/InstructionContainer.java index 911ac02..3ca4626 100644 --- a/jode/jode/flow/InstructionContainer.java +++ b/jode/jode/flow/InstructionContainer.java @@ -16,8 +16,8 @@ * $Id$ */ package jode.flow; -import jode.decompiler.Expression; -import jode.decompiler.LocalVarOperator; +import jode.expr.Expression; +import jode.expr.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 a3c8f9c..760a067 100644 --- a/jode/jode/flow/LoopBlock.java +++ b/jode/jode/flow/LoopBlock.java @@ -21,10 +21,10 @@ package jode.flow; import jode.TabbedPrintWriter; import jode.Type; import jode.LocalInfo; -import jode.decompiler.Expression; -import jode.decompiler.ConstOperator; -import jode.decompiler.LocalStoreOperator; -import jode.decompiler.CombineableOperator; +import jode.expr.Expression; +import jode.expr.ConstOperator; +import jode.expr.LocalStoreOperator; +import jode.expr.CombineableOperator; /** * This is the structured block for an Loop block. diff --git a/jode/jode/flow/MarkInlineExpression.java b/jode/jode/flow/MarkInlineExpression.java index 8397295..c2e76cf 100644 --- a/jode/jode/flow/MarkInlineExpression.java +++ b/jode/jode/flow/MarkInlineExpression.java @@ -19,7 +19,7 @@ package jode.flow; import jode.Decompiler; -import jode.decompiler.*; +import jode.expr.*; /** * This handles inline methods. When you compile with -O flag javac will diff --git a/jode/jode/flow/RemoveEmpty.java b/jode/jode/flow/RemoveEmpty.java index 9e3eb58..b8c2c0f 100644 --- a/jode/jode/flow/RemoveEmpty.java +++ b/jode/jode/flow/RemoveEmpty.java @@ -19,7 +19,7 @@ package jode.flow; import jode.Decompiler; -import jode.decompiler.*; +import jode.expr.*; public class RemoveEmpty { diff --git a/jode/jode/flow/ReturnBlock.java b/jode/jode/flow/ReturnBlock.java index d4c3d90..4aafb98 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.decompiler.Expression; +import jode.expr.Expression; /** * This is the structured block for an Return block. diff --git a/jode/jode/flow/SpecialBlock.java b/jode/jode/flow/SpecialBlock.java index b64b466..ebe9f95 100644 --- a/jode/jode/flow/SpecialBlock.java +++ b/jode/jode/flow/SpecialBlock.java @@ -18,7 +18,7 @@ package jode.flow; import jode.TabbedPrintWriter; import jode.Decompiler; -import jode.decompiler.*; +import jode.expr.*; /** * This is the structured block for atomic instructions. diff --git a/jode/jode/flow/SwitchBlock.java b/jode/jode/flow/SwitchBlock.java index eb8b90d..a5bea8a 100644 --- a/jode/jode/flow/SwitchBlock.java +++ b/jode/jode/flow/SwitchBlock.java @@ -19,7 +19,7 @@ package jode.flow; import jode.TabbedPrintWriter; -import jode.decompiler.Expression; +import jode.expr.Expression; /** * This is the structured block for an empty block. diff --git a/jode/jode/flow/SynchronizedBlock.java b/jode/jode/flow/SynchronizedBlock.java index 7a16951..a1ef57c 100644 --- a/jode/jode/flow/SynchronizedBlock.java +++ b/jode/jode/flow/SynchronizedBlock.java @@ -19,7 +19,7 @@ package jode.flow; import jode.LocalInfo; import jode.TabbedPrintWriter; -import jode.decompiler.Expression; +import jode.expr.Expression; /** * This class represents a synchronized structured block. diff --git a/jode/jode/flow/ThrowBlock.java b/jode/jode/flow/ThrowBlock.java index 5b438a4..0844c1e 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.decompiler.Expression; +import jode.expr.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 7546587..b237110 100644 --- a/jode/jode/flow/TransformConstructors.java +++ b/jode/jode/flow/TransformConstructors.java @@ -18,7 +18,7 @@ */ package jode.flow; import jode.ClassAnalyzer; -import jode.decompiler.*; +import jode.expr.*; /** * diff --git a/jode/jode/flow/TransformExceptionHandlers.java b/jode/jode/flow/TransformExceptionHandlers.java index 4a70bb4..526b84d 100644 --- a/jode/jode/flow/TransformExceptionHandlers.java +++ b/jode/jode/flow/TransformExceptionHandlers.java @@ -21,7 +21,7 @@ import jode.AssertError; import jode.Decompiler; import jode.Type; import jode.LocalInfo; -import jode.decompiler.*; +import jode.expr.*; import java.util.Enumeration; diff --git a/jode/test/ClassOpTest.java b/jode/test/ClassOpTest.java index cb85f2e..5ae2471 100644 --- a/jode/test/ClassOpTest.java +++ b/jode/test/ClassOpTest.java @@ -5,6 +5,7 @@ public class ClassOpTest { Class c1 = ClassOpTest.class; Class c2 = Object.class; Class c3 = ClassOpTest.class; + c1.getClass(); } void test2() {