From e39ae1e71d497bcedccc1e88ccf01f274d377b76 Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Wed, 25 Jun 2014 13:37:41 +0200 Subject: [PATCH] repeatable nameless class names --- .../main/rels/NestedClassProcessor.java | 24 +++++++++++-------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/src/de/fernflower/main/rels/NestedClassProcessor.java b/src/de/fernflower/main/rels/NestedClassProcessor.java index 58af225..7fdd4f8 100644 --- a/src/de/fernflower/main/rels/NestedClassProcessor.java +++ b/src/de/fernflower/main/rels/NestedClassProcessor.java @@ -75,16 +75,20 @@ public class NestedClassProcessor { // for each local or anonymous class ensure not empty enclosing method checkNotFoundClasses(root, node); } - - for(ClassNode child : node.nested) { - // ensure not-empty class name - if((child.type == ClassNode.CLASS_LOCAL || child.type == ClassNode.CLASS_MEMBER) && child.simpleName == null) { - DecompilerContext.getLogger().writeMessage("Nameless local or member class "+child.classStruct.qualifiedName+"!", IFernflowerLogger.WARNING); - child.simpleName = "NamelessClass"+child.hashCode(); - } - } - - + + int nameless = 0, synthetics = 0; + for(ClassNode child : node.nested) { + // ensure not-empty class name + if((child.type == ClassNode.CLASS_LOCAL || child.type == ClassNode.CLASS_MEMBER) && child.simpleName == null) { + if((child.classStruct.access_flags & CodeConstants.ACC_SYNTHETIC) == 0) { + DecompilerContext.getLogger().writeMessage("Nameless local or member class " + child.classStruct.qualifiedName + "!", IFernflowerLogger.WARNING); + child.simpleName = "NamelessClass_" + (++nameless); + } else { + child.simpleName = "SyntheticClass_" + (++synthetics); + } + } + } + for(ClassNode child : node.nested) { if(child.type == ClassNode.CLASS_LAMBDA) { setLambdaVars(node, child);