Index: src/org/aspectj/asm/AsmManager.java
===================================================================
RCS file: /home/technology/org.aspectj/modules/asm/src/org/aspectj/asm/AsmManager.java,v
retrieving revision 1.23
diff -u -r1.23 AsmManager.java
--- src/org/aspectj/asm/AsmManager.java	7 Jun 2006 15:52:44 -0000	1.23
+++ src/org/aspectj/asm/AsmManager.java	12 Jun 2006 12:18:08 -0000
@@ -490,9 +490,8 @@
 	
 	//===================== 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);
 	}
 	
 	/**
Index: src/org/aspectj/asm/internal/AspectJElementHierarchy.java
===================================================================
RCS file: /home/technology/org.aspectj/modules/asm/src/org/aspectj/asm/internal/AspectJElementHierarchy.java,v
retrieving revision 1.22
diff -u -r1.22 AspectJElementHierarchy.java
--- src/org/aspectj/asm/internal/AspectJElementHierarchy.java	7 Jun 2006 15:52:45 -0000	1.22
+++ src/org/aspectj/asm/internal/AspectJElementHierarchy.java	12 Jun 2006 12:18:08 -0000
@@ -444,9 +444,8 @@
 		
 	}
 	
-    // 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);
 	}
 
 }