6 files changed, 107 insertions, 41 deletions

diff --git a/src/cuchaz/enigma/analysis/JarIndex.java b/src/cuchaz/enigma/analysis/JarIndex.java
index b4096e9..f484316 100644
--- a/src/cuchaz/enigma/analysis/JarIndex.java
+++ b/src/cuchaz/enigma/analysis/JarIndex.java
@@ -127,7 +127,7 @@ public class JarIndex
                         }
                         for( CtField field : c.getDeclaredFields() )
                         {
-                                indexField( field );
+                                m_translationIndex.addField( className, field.getName() );
                         }
                         for( CtBehavior behavior : c.getDeclaredBehaviors() )
                         {
@@ -135,9 +135,19 @@ public class JarIndex
                         }
                 }
                 
+                // step 4: index field, method, constructor references
+                for( CtClass c : JarClassIterator.classes( jar ) )
+                {
+                        ClassRenamer.moveAllClassesOutOfDefaultPackage( c, Constants.NonePackage );
+                        for( CtBehavior behavior : c.getDeclaredBehaviors() )
+                        {
+                                indexBehaviorReferences( behavior );
+                        }
+                }
+                
                 if( buildInnerClasses )
                 {
-                        // step 4: index inner classes and anonymous classes
+                        // step 5: index inner classes and anonymous classes
                         for( CtClass c : JarClassIterator.classes( jar ) )
                         {
                                 ClassRenamer.moveAllClassesOutOfDefaultPackage( c, Constants.NonePackage );
@@ -163,7 +173,7 @@ public class JarIndex
                                 }
                         }
                         
-                        // step 5: update other indices with inner class info
+                        // step 6: update other indices with inner class info
                         Map<String,String> renames = Maps.newHashMap();
                         for( Map.Entry<String,String> entry : m_outerClasses.entrySet() )
                         {
@@ -183,25 +193,14 @@ public class JarIndex
                 EntryRenamer.renameMethodsInMultimap( m_bridgeMethods, m_fieldReferences );
         }
         
-        private void indexField( CtField field )
-        {
-                String className = Descriptor.toJvmName( field.getDeclaringClass().getName() );
-                m_translationIndex.addField( className, field.getName() );
-        }
-
         private void indexBehavior( CtBehavior behavior )
         {
-                // get the method entry
+                // get the behavior entry
                 String className = Descriptor.toJvmName( behavior.getDeclaringClass().getName() );
-                final BehaviorEntry thisEntry;
-                if( behavior instanceof CtMethod )
+                final BehaviorEntry behaviorEntry = getBehaviorEntry( behavior );
+                if( behaviorEntry instanceof MethodEntry )
                 {
-                        MethodEntry methodEntry = new MethodEntry(
-                                new ClassEntry( className ),
-                                behavior.getName(),
-                                behavior.getSignature()
-                        );
-                        thisEntry = methodEntry;
+                        MethodEntry methodEntry = (MethodEntry)behaviorEntry;
                         
                         // index implementation
                         m_methodImplementations.put( className, methodEntry );
@@ -218,24 +217,13 @@ public class JarIndex
                                 m_bridgeMethods.put( bridgedMethodEntry, methodEntry );
                         }
                 }
-                else if( behavior instanceof CtConstructor )
-                {
-                        boolean isStatic = behavior.getName().equals( "<clinit>" );
-                        if( isStatic )
-                        {
-                                thisEntry = new ConstructorEntry( new ClassEntry( className ) );
-                        }
-                        else
-                        {
-                                thisEntry = new ConstructorEntry( new ClassEntry( className ), behavior.getSignature() );
-                        }
-                }
-                else
-                {
-                        throw new IllegalArgumentException( "behavior must be a method or a constructor!" );
-                }
-                
+                // looks like we don't care about constructors here
+        }
+        
+        private void indexBehaviorReferences( CtBehavior behavior )
+        {
                 // index method calls
+                final BehaviorEntry behaviorEntry = getBehaviorEntry( behavior );
                 try
                 {
                         behavior.instrument( new ExprEditor( )
@@ -249,9 +237,10 @@ public class JarIndex
                                                 call.getMethodName(),
                                                 call.getSignature()
                                         );
+                                        calledMethodEntry = resolveMethodClass( calledMethodEntry );
                                         EntryReference<BehaviorEntry,BehaviorEntry> reference = new EntryReference<BehaviorEntry,BehaviorEntry>(
                                                 calledMethodEntry,
-                                                thisEntry
+                                                behaviorEntry
                                         );
                                         m_behaviorReferences.put( calledMethodEntry, reference );
                                 }
@@ -266,7 +255,7 @@ public class JarIndex
                                         );
                                         EntryReference<FieldEntry,BehaviorEntry> reference = new EntryReference<FieldEntry,BehaviorEntry>(
                                                 calledFieldEntry,
-                                                thisEntry
+                                                behaviorEntry
                                         );
                                         m_fieldReferences.put( calledFieldEntry, reference );
                                 }
@@ -284,7 +273,7 @@ public class JarIndex
                                         );
                                         EntryReference<BehaviorEntry,BehaviorEntry> reference = new EntryReference<BehaviorEntry,BehaviorEntry>(
                                                 calledConstructorEntry,
-                                                thisEntry
+                                                behaviorEntry
                                         );
                                         m_behaviorReferences.put( calledConstructorEntry, reference );
                                 }
@@ -299,7 +288,7 @@ public class JarIndex
                                         );
                                         EntryReference<BehaviorEntry,BehaviorEntry> reference = new EntryReference<BehaviorEntry,BehaviorEntry>(
                                                 calledConstructorEntry,
-                                                thisEntry
+                                                behaviorEntry
                                         );
                                         m_behaviorReferences.put( calledConstructorEntry, reference );
                                 }
@@ -311,6 +300,59 @@ public class JarIndex
                 }
         }
         
+        private BehaviorEntry getBehaviorEntry( CtBehavior behavior )
+        {
+                String className = Descriptor.toJvmName( behavior.getDeclaringClass().getName() );
+                if( behavior instanceof CtMethod )
+                {
+                        return new MethodEntry(
+                                new ClassEntry( className ),
+                                behavior.getName(),
+                                behavior.getSignature()
+                        );
+                }
+                else if( behavior instanceof CtConstructor )
+                {
+                        boolean isStatic = behavior.getName().equals( "<clinit>" );
+                        if( isStatic )
+                        {
+                                return new ConstructorEntry( new ClassEntry( className ) );
+                        }
+                        else
+                        {
+                                return new ConstructorEntry( new ClassEntry( className ), behavior.getSignature() );
+                        }
+                }
+                else
+                {
+                        throw new IllegalArgumentException( "behavior must be a method or a constructor!" );
+                }
+        }
+
+        private MethodEntry resolveMethodClass( MethodEntry methodEntry )
+        {
+                // this entry could refer to a method on a class where the method is not actually implemented
+                // travel up the inheritance tree to find the closest implementation
+                while( !isMethodImplemented( methodEntry ) )
+                {
+                        // is there a parent class?
+                        String superclassName = m_translationIndex.getSuperclassName( methodEntry.getClassName() );
+                        if( superclassName == null )
+                        {
+                                // this is probably a method from a class in a library
+                                // we can't trace the implementation up any higher unless we index the library
+                                return methodEntry;
+                        }
+                        
+                        // move up to the parent class
+                        methodEntry = new MethodEntry(
+                                new ClassEntry( superclassName ),
+                                methodEntry.getName(),
+                                methodEntry.getSignature()
+                        );
+                }
+                return methodEntry;
+        }
 
         private CtMethod getBridgedMethod( CtMethod method )
         {
diff --git a/test/cuchaz/enigma/TestJarIndexInheritanceTree.java b/test/cuchaz/enigma/TestJarIndexInheritanceTree.java
index 5ded5df..3d488ee 100644
--- a/test/cuchaz/enigma/TestJarIndexInheritanceTree.java
+++ b/test/cuchaz/enigma/TestJarIndexInheritanceTree.java
@@ -220,7 +220,8 @@ public class TestJarIndexInheritanceTree
                 source = new MethodEntry( m_baseClass, "a", "()Ljava/lang/String;" );
                 references = m_index.getBehaviorReferences( source );
                 assertThat( references, containsInAnyOrder(
-                        newBehaviorReferenceByMethod( source, m_subClassAA.getName(), "a", "()Ljava/lang/String;" )
+                        newBehaviorReferenceByMethod( source, m_subClassAA.getName(), "a", "()Ljava/lang/String;" ),
+                        newBehaviorReferenceByMethod( source, m_subClassB.getName(), "a", "()V" )
                 ) );
                 
                 // subclassAA.getName()
diff --git a/test/cuchaz/enigma/inputs/inheritanceTree/BaseClass.java b/test/cuchaz/enigma/inputs/inheritanceTree/BaseClass.java
index a6b3845..8402dde 100644
--- a/test/cuchaz/enigma/inputs/inheritanceTree/BaseClass.java
+++ b/test/cuchaz/enigma/inputs/inheritanceTree/BaseClass.java
@@ -1,18 +1,23 @@
 package cuchaz.enigma.inputs.inheritanceTree;
 
+// none/a
 public abstract class BaseClass
 {
+        // a
         private String m_name;
         
+        // <init>(Ljava/lang/String;)V
         protected BaseClass( String name )
         {
                 m_name = name;
         }
         
+        // a()Ljava/lang/String;
         public String getName( )
         {
                 return m_name;
         }
         
+        // a()V
         public abstract void doBaseThings( );
 }
diff --git a/test/cuchaz/enigma/inputs/inheritanceTree/SubclassA.java b/test/cuchaz/enigma/inputs/inheritanceTree/SubclassA.java
index f4780a2..ed50709 100644
--- a/test/cuchaz/enigma/inputs/inheritanceTree/SubclassA.java
+++ b/test/cuchaz/enigma/inputs/inheritanceTree/SubclassA.java
@@ -1,9 +1,12 @@
 package cuchaz.enigma.inputs.inheritanceTree;
 
+// none/b extends none/a
 public abstract class SubclassA extends BaseClass
 {
+        // <init>(Ljava/lang/String;)V
         protected SubclassA( String name )
         {
+                // call to none/a.<init>(Ljava/lang/String)V
                 super( name );
         }
 }
diff --git a/test/cuchaz/enigma/inputs/inheritanceTree/SubclassB.java b/test/cuchaz/enigma/inputs/inheritanceTree/SubclassB.java
index 4001e7a..fc4c8ee 100644
--- a/test/cuchaz/enigma/inputs/inheritanceTree/SubclassB.java
+++ b/test/cuchaz/enigma/inputs/inheritanceTree/SubclassB.java
@@ -1,24 +1,33 @@
 package cuchaz.enigma.inputs.inheritanceTree;
 
+// none/c extends none/a
 public class SubclassB extends BaseClass
 {
+        // a
         private int m_numThings;
         
+        // <init>()V
         protected SubclassB( )
         {
+                // none/a.<init>(Ljava/lang/String;)V
                 super( "B" );
                 
+                // access to a
                 m_numThings = 4;
         }
         
         @Override
+        // a()V
         public void doBaseThings( )
         {
-                System.out.println( "Base things by B!" );
+                // call to none/a.a()Ljava/lang/String;
+                System.out.println( "Base things by B! " + getName() );
         }
         
+        // b()V
         public void doBThings( )
         {
+                // access to a
                 System.out.println( "" + m_numThings + " B things!" );
         }
 }
diff --git a/test/cuchaz/enigma/inputs/inheritanceTree/SubsubclassAA.java b/test/cuchaz/enigma/inputs/inheritanceTree/SubsubclassAA.java
index 11196d1..b3b8342 100644
--- a/test/cuchaz/enigma/inputs/inheritanceTree/SubsubclassAA.java
+++ b/test/cuchaz/enigma/inputs/inheritanceTree/SubsubclassAA.java
@@ -1,21 +1,27 @@
 package cuchaz.enigma.inputs.inheritanceTree;
 
+// none/d extends none/b
 public class SubsubclassAA extends SubclassA
 {
         protected SubsubclassAA( )
         {
+                // call to none/b.<init>(Ljava/lang/String;)V
                 super( "AA" );
         }
         
         @Override
+        // a()Ljava/lang/String;
         public String getName( )
         {
+                // call to none/b.a()Ljava/lang/String;
                 return "subsub" + super.getName();
         }
         
         @Override
+        // a()V
         public void doBaseThings( )
         {
+                // call to none/d.a()Ljava/lang/String;
                 System.out.println( "Base things by " + getName() );
         }
 }