|
|
@ -21,6 +21,7 @@ package jode.decompiler; |
|
|
|
import java.io.*; |
|
|
|
import java.io.*; |
|
|
|
import java.util.Stack; |
|
|
|
import java.util.Stack; |
|
|
|
import jode.Decompiler; |
|
|
|
import jode.Decompiler; |
|
|
|
|
|
|
|
import jode.GlobalOptions; |
|
|
|
import jode.bytecode.ClassInfo; |
|
|
|
import jode.bytecode.ClassInfo; |
|
|
|
import jode.bytecode.InnerClassInfo; |
|
|
|
import jode.bytecode.InnerClassInfo; |
|
|
|
import jode.type.*; |
|
|
|
import jode.type.*; |
|
|
@ -162,8 +163,9 @@ public class TabbedPrintWriter { |
|
|
|
Scope scope = (Scope) scopes.elementAt(ptr); |
|
|
|
Scope scope = (Scope) scopes.elementAt(ptr); |
|
|
|
if (scope == inScope) |
|
|
|
if (scope == inScope) |
|
|
|
return false; |
|
|
|
return false; |
|
|
|
if (scope.conflicts(name, context)) |
|
|
|
if (scope.conflicts(name, context)) { |
|
|
|
return true; |
|
|
|
return true; |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
return false; |
|
|
|
return false; |
|
|
|
} |
|
|
|
} |
|
|
@ -211,11 +213,7 @@ public class TabbedPrintWriter { |
|
|
|
for (int i=0; i< outers.length; i++) { |
|
|
|
for (int i=0; i< outers.length; i++) { |
|
|
|
if (outers[i].name == null) |
|
|
|
if (outers[i].name == null) |
|
|
|
return "ANONYMOUS CLASS"; |
|
|
|
return "ANONYMOUS CLASS"; |
|
|
|
Scope scope = getScope |
|
|
|
Scope scope = getScope(info, Scope.METHODSCOPE); |
|
|
|
(ClassInfo.forName(outers[i].outer == null |
|
|
|
|
|
|
|
? outers[i].inner : outers[i].outer), |
|
|
|
|
|
|
|
outers[i].outer == null |
|
|
|
|
|
|
|
? Scope.METHODSCOPE : Scope.CLASSSCOPE); |
|
|
|
|
|
|
|
if (scope != null && |
|
|
|
if (scope != null && |
|
|
|
!conflicts(outers[i].name, scope, scopeType)) { |
|
|
|
!conflicts(outers[i].name, scope, scopeType)) { |
|
|
|
StringBuffer sb = new StringBuffer(outers[i].name); |
|
|
|
StringBuffer sb = new StringBuffer(outers[i].name); |
|
|
|