diff --git a/jode/configure.in b/jode/configure.in index d8d1cb6..1074013 100644 --- a/jode/configure.in +++ b/jode/configure.in @@ -78,7 +78,7 @@ AM_CONDITIONAL(HAVE_JIKES, test x"$JIKES" != x) AC_ARG_WITH(javac, [ --with-javac specify location of javac ], [ - if test x$USER_SPECIFIED_JIKES == xtrue; then + if test x$USER_SPECIFIED_JIKES = xtrue; then AC_MSG_ERROR(You must only give one option --with-javac or --with-jikes) fi if test ${withval} != "" || test ${withval} != "yes" || test ${withval} != "no"; then diff --git a/jode/jode/decompiler/TabbedPrintWriter.java b/jode/jode/decompiler/TabbedPrintWriter.java index 8e342b7..81457e6 100644 --- a/jode/jode/decompiler/TabbedPrintWriter.java +++ b/jode/jode/decompiler/TabbedPrintWriter.java @@ -659,6 +659,11 @@ public class TabbedPrintWriter { } public String getClassString(ClassInfo clazz, int scopeType) { + try { + clazz.load(ClassInfo.OUTERCLASS); + } catch (IOException ex) { + clazz.guess(ClassInfo.OUTERCLASS); + } if ((Options.options & Options.OPTION_INNER) != 0 && clazz.getOuterClass() != null) { diff --git a/jode/jode/expr/GetFieldOperator.java b/jode/jode/expr/GetFieldOperator.java index 1e8ff45..04555b5 100644 --- a/jode/jode/expr/GetFieldOperator.java +++ b/jode/jode/expr/GetFieldOperator.java @@ -18,18 +18,9 @@ */ package jode.expr; -import jode.type.Type; -import jode.type.NullType; -import jode.type.ClassInterfacesType; -import jode.bytecode.FieldInfo; -import jode.bytecode.ClassInfo; import jode.bytecode.Reference; import jode.decompiler.MethodAnalyzer; -import jode.decompiler.ClassAnalyzer; -import jode.decompiler.MethodAnalyzer; import jode.decompiler.FieldAnalyzer; -import jode.decompiler.TabbedPrintWriter; -import jode.decompiler.Scope; public class GetFieldOperator extends FieldOperator { public GetFieldOperator(MethodAnalyzer methodAnalyzer, boolean staticFlag, diff --git a/jode/jode/expr/PutFieldOperator.java b/jode/jode/expr/PutFieldOperator.java index f141d09..5b0e0d8 100644 --- a/jode/jode/expr/PutFieldOperator.java +++ b/jode/jode/expr/PutFieldOperator.java @@ -18,17 +18,9 @@ */ package jode.expr; -import jode.type.Type; -import jode.type.NullType; -import jode.type.ClassInterfacesType; import jode.bytecode.Reference; -import jode.bytecode.ClassInfo; -import jode.bytecode.FieldInfo; import jode.decompiler.MethodAnalyzer; -import jode.decompiler.ClassAnalyzer; import jode.decompiler.FieldAnalyzer; -import jode.decompiler.TabbedPrintWriter; -import jode.decompiler.Scope; public class PutFieldOperator extends FieldOperator implements LValueExpression {