big refactoring

diff --git a/loadtime/src/org/aspectj/weaver/loadtime/ClassLoaderWeavingAdaptor.java b/loadtime/src/org/aspectj/weaver/loadtime/ClassLoaderWeavingAdaptor.java
index 17659c1750585c52f571571351b373461f674224..6c8e6e1d5833105f44a9f6fe9528e2fc23c6ac90 100644 (file)
--- a/loadtime/src/org/aspectj/weaver/loadtime/ClassLoaderWeavingAdaptor.java
+++ b/loadtime/src/org/aspectj/weaver/loadtime/ClassLoaderWeavingAdaptor.java
@@ -139,15 +139,8 @@ public class ClassLoaderWeavingAdaptor extends WeavingAdaptor {
         }
         
         bcelWorld = new LTWWorld(
-                       classLoader, weavingContext, // TODO when the world works in terms of the context, we can remove the loader...
-                       getMessageHandler(), null);
-//        new ICrossReferenceHandler() {
-//                    public void addCrossReference(ISourceLocation from, ISourceLocation to, IRelationship.Kind kind, boolean runtimeTest) {
-//                        ;// for tools only
-//                    }
-//                }
-//        );
-
+        // OPTIMIZE remove loader when context knows about it
+                       classLoader, weavingContext, getMessageHandler(), null);
         weaver = new BcelWeaver(bcelWorld);
 
         // register the definitions