DPML Notify

[mcconnell AT netcompartner.com]

Author: mcconnell
Date: Wed Jan 19 07:54:44 2005
New Revision: 1532

Modified:
   development/main/magic/core/src/main/net/dpml/magic/model/Resource.java
   development/main/magic/core/src/main/net/dpml/magic/tasks/ModuleTask.java
Log:
Update to ModuleTask (removal of debug traces) and addition of some javadoc 
to the Resource class.

Modified: 
development/main/magic/core/src/main/net/dpml/magic/model/Resource.java
==============================================================================
--- development/main/magic/core/src/main/net/dpml/magic/model/Resource.java   
  (original)
+++ development/main/magic/core/src/main/net/dpml/magic/model/Resource.java   
  Wed Jan 19 07:54:44 2005
@@ -233,6 +233,9 @@
    /**
     * Returns a path of artifact filenames relative to the supplied scope.
     * The mode may be one of ANY, BUILD, TEST or RUNTIME.
+    * @param project the current project
+    * @param moode one of ANY, BUILD, TEST or RUNTIME
+    * @param filter a value of "*" for any or a type identifier such as "jar"
     * @exception NullArgumentException if the supplied project argument is 
null.
     */
     public Path getPath( final Project project, final int mode, String 
filter )

Modified: 
development/main/magic/core/src/main/net/dpml/magic/tasks/ModuleTask.java
==============================================================================
--- development/main/magic/core/src/main/net/dpml/magic/tasks/ModuleTask.java 
  (original)
+++ development/main/magic/core/src/main/net/dpml/magic/tasks/ModuleTask.java 
  Wed Jan 19 07:54:44 2005
@@ -175,8 +175,6 @@
     protected void writeModule( final Writer writer, Definition definition )
         throws IOException
     {
-System.out.println( "#MODULE: " + definition );
-
         Definition[] definitions = 
getPrivateIndex().getSubsidiaryDefinitions( definition );
 
         List includes = new ArrayList();
@@ -184,9 +182,6 @@
         for( int i=0; i<definitions.length; i++ )
         {
             Definition def = definitions[i];
-
-System.out.println( "#SUB-DEF: " + def );
-
             expand( definition, def, includes, modules );
         }
 
@@ -198,8 +193,6 @@
             writer.write( "\n\n    <!-- imports -->\n" );
             for( int i=0; i<uris.length; i++ )
             {
-System.out.println( "#EXPANDED: " + uris[i] );
-
                writer.write( "\n    <import uri=\"" + uris[i] + "\"/>" );
             }
         }
@@ -238,44 +231,6 @@
         }
         writer.write( "\n\n  </resources>" );
     }
-/* TODO: Remove, not used.
-    private Definition[] getCandidateDefinitions()
-    {
-        ArrayList list = new ArrayList();
-        Definition[] definitions = getPrivateIndex().getDefinitions();
-        for( int i=0; i<definitions.length; i++ )
-        {
-            Definition def = definitions[i];
-            if( isaCandidate( def ) )
-            {
-                list.add( def );
-            }
-        }
-        return (Definition[]) list.toArray( new Definition[0] );
-    }
-
-    private boolean isaCandidate( Definition def )
-    {
-        if( "module".equals( def.getInfo().getType() ) )
-        {
-            return false;
-        }
-
-        String g = def.getInfo().getGroup();
-        if( g.equals( getGroup() ) )
-        {
-            return true;
-        }
-        else if( g.startsWith( getGroup() + "/" ) )
-        {
-            return true;
-        }
-        else
-        {
-            return false;
-        }
-    }
-*/
 
    /**
     * Add the resource referenced by the ref to the list and for all of the