diff --git a/jode/jode/type/ArrayType.java b/jode/jode/type/ArrayType.java index 324b271..385b05b 100644 --- a/jode/jode/type/ArrayType.java +++ b/jode/jode/type/ArrayType.java @@ -17,7 +17,7 @@ * $Id$ */ -package jode; +package jode.type; import jode.bytecode.ClassInfo; import java.util.Vector; @@ -210,13 +210,6 @@ public class ArrayType extends ReferenceType { return true; } - /** - * Marks this type as used, so that the class is imported. - */ - public void useType() { - elementType.useType(); - } - public String getTypeSignature() { return "["+elementType.getTypeSignature(); } diff --git a/jode/jode/type/RangeType.java b/jode/jode/type/RangeType.java index 1ff85a9..bb121da 100644 --- a/jode/jode/type/RangeType.java +++ b/jode/jode/type/RangeType.java @@ -17,7 +17,9 @@ * $Id$ */ -package jode; +package jode.type; +import jode.AssertError; +import jode.Decompiler; import java.util.Hashtable; /** @@ -95,17 +97,6 @@ public class RangeType extends Type { // throw new AssertError("getGeneralizedType called on RangeType"); // } - /** - * Marks this type as used, so that the class is imported. - */ - public void useType() { - /* The topType will be printed */ - if (topType.isClassType() || !bottomType.isValidType()) - topType.useType(); - else - bottomType.useType(); - } - /** * Checks if we need to cast to a middle type, before we can cast from * fromType to this type. @@ -166,8 +157,8 @@ public class RangeType extends Type { return this; Type top, bottom, result; - top = topType.getGeneralizedType(type); bottom = bottomType.getSpecializedType(type); + top = topType.getGeneralizedType(type); if (top.equals(bottom)) result = top; else if (top instanceof ReferenceType