DPML Notify

[pneubauer AT netcompartner.com]

Author: pneubauer
Date: Thu Mar  3 15:40:17 2005
New Revision: 1936

Removed:
   development/laboratory/ide/eclipse/TransitPlugin/lib/ant-1.6.2.jar
Modified:
   development/laboratory/ide/eclipse/TransitPlugin/.classpath
   development/laboratory/ide/eclipse/TransitPlugin/build.properties
   
development/laboratory/ide/eclipse/TransitPlugin/src/net/dpml/ide/eclipse/plugins/magic/MagicContainer.java
Log:
more cleaning

Modified: development/laboratory/ide/eclipse/TransitPlugin/.classpath
==============================================================================
--- development/laboratory/ide/eclipse/TransitPlugin/.classpath (original)
+++ development/laboratory/ide/eclipse/TransitPlugin/.classpath Thu Mar  3 
15:40:17 2005
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-       <classpathentry kind="src" path="src"/>
+       <classpathentry kind="src" path="src/"/>
+       <classpathentry kind="src" path="lib/"/>
+       <classpathentry exported="true" kind="lib" 
path="lib/dpml-ide-common-magic-SNAPSHOT.jar"/>
+       <classpathentry exported="true" kind="lib" 
path="lib/dpml-magic-core-SNAPSHOT.jar"/>
+       <classpathentry exported="true" kind="lib" 
path="lib/dpml-transit-main.jar"/>
+       <classpathentry exported="true" kind="lib" 
path="lib/dpml-transit-tools.jar"/>
        <classpathentry kind="con" 
path="org.eclipse.pde.core.requiredPlugins"/>
        <classpathentry kind="con" 
path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-       <classpathentry kind="lib" path="lib/ant-1.6.2.jar"/>
-       <classpathentry kind="lib" 
path="lib/dpml-ide-common-magic-SNAPSHOT.jar"/>
-       <classpathentry kind="lib" path="lib/dpml-magic-core-SNAPSHOT.jar"/>
-       <classpathentry kind="lib" path="lib/dpml-transit-main.jar"/>
-       <classpathentry kind="lib" path="lib/dpml-transit-tools.jar"/>
-       <classpathentry kind="src" path="/dpml-main"/>
        <classpathentry kind="output" path="bin"/>
 </classpath>

Modified: development/laboratory/ide/eclipse/TransitPlugin/build.properties
==============================================================================
--- development/laboratory/ide/eclipse/TransitPlugin/build.properties   
(original)
+++ development/laboratory/ide/eclipse/TransitPlugin/build.properties   Thu 
Mar  3 15:40:17 2005
@@ -1,4 +1,12 @@
-source.TransitPlugin.jar = src/
+source.TransitPlugin.jar = src/
 output.TransitPlugin.jar = bin/
-bin.includes = plugin.xml,\
-               TransitPlugin.jar
+bin.includes = plugin.xml,\
+               TransitPlugin.jar,\
+               lib/dpml-ide-common-magic-SNAPSHOT.jar,\
+               lib/dpml-transit-main.jar,\
+               lib/dpml-transit-tools.jar,\
+               bin/,\
+               lib/ant-1.6.2.jar,\
+               lib/dpml-magic-core-SNAPSHOT.jar,\
+               META-INF/
+jars.compile.order = TransitPlugin.jar

Modified: 
development/laboratory/ide/eclipse/TransitPlugin/src/net/dpml/ide/eclipse/plugins/magic/MagicContainer.java
==============================================================================
--- 
development/laboratory/ide/eclipse/TransitPlugin/src/net/dpml/ide/eclipse/plugins/magic/MagicContainer.java
 (original)
+++ 
development/laboratory/ide/eclipse/TransitPlugin/src/net/dpml/ide/eclipse/plugins/magic/MagicContainer.java
 Thu Mar  3 15:40:17 2005
@@ -34,9 +34,11 @@
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.ILog;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.Path;
 import org.eclipse.core.runtime.Platform;
+import org.eclipse.core.runtime.Status;
 import org.eclipse.jdt.core.IClasspathContainer;
 import org.eclipse.jdt.core.IClasspathEntry;
 import org.eclipse.jdt.core.IJavaProject;
@@ -47,22 +49,44 @@
 {
 
     private IPath path;
-    private IdeIndex index = new IdeIndex();
+    private IdeIndex index = null;
+    private ILog log;
+    public final static String ID = "net.dpml.MAGIC";
+    private IFile indexFile;
 
     public MagicContainer( IJavaProject project, IPath containerPath )
         {
+            log = MagicPlugin.getDefault().getLog();
+            log.log(new Status(Status.INFO, "net.dpml.MagicPlugin", 0, 
"ContainerPath: " + containerPath, null));
             this.path = containerPath;
-            IProject proj = 
ResourcesPlugin.getWorkspace().getRoot().getProject("test");
-            IFile indexFile = proj.getFile(new 
Path(containerPath.segment(1)));
-            String location = indexFile.getLocation().toOSString();
-            File absoluteIndexFile = new File( location );
-            index.loadIndex( absoluteIndexFile );
-
+            if (containerPath.segmentCount() < 2)
+            {
+                return;
+            }
+            IProject proj = 
ResourcesPlugin.getWorkspace().getRoot().getProject(project.getElementName());
+            log.log(new Status(Status.INFO, "net.dpml.MagicPlugin", 0, 
"Project: " + proj, null));
+            indexFile = proj.getFile(new 
Path(containerPath.removeFirstSegments(1).toString()));
+            try
+            {
+                String location = indexFile.getLocation().toOSString();
+                File absoluteIndexFile = new File( location );
+                index = new IdeIndex();
+                index.loadIndex( absoluteIndexFile );
+            }
+            catch( NullPointerException npe )
+            {
+                log.log(new Status(Status.WARNING, "net.dpml.MagicPlugin", 
0, "Could not initialize MagicContainer ",  npe));
+            }
         }
 
+    
+
     public IClasspathEntry[] getClasspathEntries()
     {
-
+        if(index==null)
+        {
+            return null;
+        }
         try
         {
             index.flattenProjectDependencies();
@@ -132,7 +156,7 @@
 
     public String getDescription()
     {
-        return "Deps [" +path + "]";
+        return "[" +indexFile + "] Magic Dependencies";
     }
 
     public int getKind()