fixed issue with inner class detection

1 files changed, 10 insertions, 5 deletions

diff --git a/src/cuchaz/enigma/analysis/JarIndex.java b/src/cuchaz/enigma/analysis/JarIndex.java
index f484316..6c955bc 100644
--- a/src/cuchaz/enigma/analysis/JarIndex.java
+++ b/src/cuchaz/enigma/analysis/JarIndex.java
@@ -417,12 +417,11 @@ public class JarIndex
                                 continue;
                         }
                         
+                        ClassEntry classEntry = new ClassEntry( Descriptor.toJvmName( c.getName() ) );
+                        ConstructorEntry constructorEntry = new ConstructorEntry( classEntry, constructor.getMethodInfo().getDescriptor() );
+                        
                         // who calls this constructor?
                         Set<ClassEntry> callerClasses = Sets.newHashSet();
-                        ConstructorEntry constructorEntry = new ConstructorEntry(
-                                new ClassEntry( Descriptor.toJvmName( c.getName() ) ),
-                                constructor.getMethodInfo().getDescriptor()
-                        );
                         for( EntryReference<BehaviorEntry,BehaviorEntry> reference : getBehaviorReferences( constructorEntry ) )
                         {
                                 callerClasses.add( reference.context.getClassEntry() );
@@ -431,7 +430,13 @@ public class JarIndex
                         // is this called by exactly one class?
                         if( callerClasses.size() == 1 )
                         {
-                                return callerClasses.iterator().next().getName();
+                                ClassEntry callerClassEntry = callerClasses.iterator().next();
+                                
+                                // does this class make sense as an outer class?
+                                if( !callerClassEntry.equals( classEntry ) )
+                                {
+                                        return callerClassEntry.getName();
+                                }
                         }
                         else if( callerClasses.size() > 1 )
                         {