DPML Notify

[peter AT neubauer.se]

Author: peter AT neubauer.se
Date: Sun Jun  5 16:00:00 2005
New Revision: 2721

Modified:
   development/laboratory/ide/common/index.xml
   
development/laboratory/ide/common/magic/src/main/net/dpml/ide/common/magic/IdeIndex.java
Log:
locking against main 2720


Modified: development/laboratory/ide/common/index.xml
==============================================================================
--- development/laboratory/ide/common/index.xml (original)
+++ development/laboratory/ide/common/index.xml Sun Jun  5 16:00:00 2005
@@ -18,8 +18,8 @@
 
 <index key="dpml-ide-common">
 
-    <import uri="artifact:module:dpml/transit/dpml-transit#2579"/>
-    <import uri="artifact:module:dpml/magic/dpml-magic#2579"/>
+    <import uri="artifact:module:dpml/transit/dpml-transit#2720"/>
+    <import uri="artifact:module:dpml/magic/dpml-magic#2720"/>
 
     <project file="module.xml">
         <info>

Modified: 
development/laboratory/ide/common/magic/src/main/net/dpml/ide/common/magic/IdeIndex.java
==============================================================================
--- 
development/laboratory/ide/common/magic/src/main/net/dpml/ide/common/magic/IdeIndex.java
    (original)
+++ 
development/laboratory/ide/common/magic/src/main/net/dpml/ide/common/magic/IdeIndex.java
    Sun Jun  5 16:00:00 2005
@@ -16,23 +16,23 @@
 package net.dpml.ide.common.magic;
 
 import java.io.File;
+import java.util.Arrays;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Map;
 import java.util.Set;
-import java.util.HashSet;
-import java.util.Arrays;
-
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.Project;
 
 import net.dpml.magic.Index;
-import net.dpml.magic.builder.IndexBuilder;
+import net.dpml.magic.builder.AntFileIndexBuilder;
 import net.dpml.magic.model.Definition;
-import net.dpml.magic.model.ResourceRef;
 import net.dpml.magic.model.Resource;
+import net.dpml.magic.model.ResourceRef;
 import net.dpml.transit.tools.MainTask;
 
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.Project;
+
 /**
  * A simplified model of projects, resources and their dependencies. 
Multiple index.xml files
  * can be loaded into this model.
@@ -102,7 +102,7 @@
             Map.Entry entry = (Map.Entry)props.next();
             antProject.setProperty((String)entry.getKey(), 
(String)entry.getValue());
         }
-        IndexBuilder indexBuilder = new IndexBuilder(antProject, file);
+        AntFileIndexBuilder indexBuilder = new 
AntFileIndexBuilder(antProject, file);
         Index index = indexBuilder.getIndex();
         Definition[] defs = index.getDefinitions();
         for ( int i = 0; i < defs.length; i++ ) {