fix for 146546

diff --git a/asm/src/org/aspectj/asm/AsmManager.java b/asm/src/org/aspectj/asm/AsmManager.java
index e9b8c4bc163de23615f34bb707c72b5ac8ed4815..e28cedf487bb01222d53b10cdff6baf58b1dd53d 100644 (file)
--- a/asm/src/org/aspectj/asm/AsmManager.java
+++ b/asm/src/org/aspectj/asm/AsmManager.java
@@ -490,9 +490,8 @@ public class AsmManager {
        
        //===================== DELTA PROCESSING CODE ============== start ==========//
        
-       // XXX shouldn't be aware of the delimiter
        private String getFilename(String hid) {
-               return hid.substring(0,hid.indexOf("|"));
+               return getHandleProvider().getFileForHandle(hid);
        }
        
        /**

diff --git a/asm/src/org/aspectj/asm/internal/AspectJElementHierarchy.java b/asm/src/org/aspectj/asm/internal/AspectJElementHierarchy.java
index 8224c6d9f83487680648db5c489c01aa82f84b5a..8260c4805aeaf88b2436e5f891c17ed92d2ecb71 100644 (file)
--- a/asm/src/org/aspectj/asm/internal/AspectJElementHierarchy.java
+++ b/asm/src/org/aspectj/asm/internal/AspectJElementHierarchy.java
@@ -444,9 +444,8 @@ public class AspectJElementHierarchy implements IHierarchy {
                
        }
        
-    // XXX shouldn't be aware of the delimiter
        private String getFilename(String hid) {
-               return hid.substring(0,hid.indexOf("|"));
+               return AsmManager.getDefault().getHandleProvider().getFileForHandle(hid);
        }
 
 }