Skip to Content.
Sympa Menu

notify-dpml - svn commit: r1527 - development/main/magic/core/src/main/net/dpml/magic/tasks

notify-dpml AT lists.ibiblio.org

Subject: DPML Notify

List archive

Chronological Thread  
  • From: mcconnell AT netcompartner.com
  • To: notify-dpml AT lists.ibiblio.org
  • Subject: svn commit: r1527 - development/main/magic/core/src/main/net/dpml/magic/tasks
  • Date: Wed, 19 Jan 2005 00:01:01 +0100

Author: mcconnell
Date: Wed Jan 19 00:01:01 2005
New Revision: 1527

Modified:
development/main/magic/core/src/main/net/dpml/magic/tasks/ModuleTask.java
Log:
Update the module task to test for and exclude recursive module include
references.

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 00:01:01 2005
@@ -182,7 +182,7 @@
for( int i=0; i<definitions.length; i++ )
{
Definition def = definitions[i];
- expand( def, includes, modules );
+ expand( definition, def, includes, modules );
}

writer.write( "\n <resources>" );
@@ -278,13 +278,13 @@
* @param list the expansion list
* @param modules
*/
- private void expand( Definition def, List list, List modules )
+ private void expand( Definition definition, Definition def, List list,
List modules )
{
ResourceRef[] refs = def.getResourceRefs();
for( int i=0; i<refs.length; i++ )
{
ResourceRef ref = refs[i];
- expand( ref, list, modules );
+ expand( definition, ref, list, modules );
}
}

@@ -296,21 +296,25 @@
* @param list the expansion list
* @param modules
*/
- private void expand( ResourceRef reference, List list, List modules )
+ private void expand( Definition definition, ResourceRef reference, List
list, List modules )
{
Resource resource = getPrivateIndex().getResource( reference );
String module = resource.getModule();
if(( null != module ) && !"".equals( module ) && !modules.contains(
module ) )
{
- modules.add( module );
- ResourceRef[] refs =
- resource.getResourceRefs();
- for( int i=0; i<refs.length; i++ )
+
+ if( !module.equals( definition.getInfo().getURI() ) )
{
- ResourceRef ref = refs[i];
- if( ref.getPolicy().matches( Policy.RUNTIME ) )
+ modules.add( module );
+ ResourceRef[] refs =
+ resource.getResourceRefs();
+ for( int i=0; i<refs.length; i++ )
{
- expand( ref, list, modules );
+ ResourceRef ref = refs[i];
+ if( ref.getPolicy().matches( Policy.RUNTIME ) )
+ {
+ expand( definition, ref, list, modules );
+ }
}
}
}
@@ -324,7 +328,7 @@
ResourceRef ref = refs[i];
if( ref.getPolicy().matches( Policy.RUNTIME ) )
{
- expand( ref, list, modules );
+ expand( definition, ref, list, modules );
}
}
}



  • svn commit: r1527 - development/main/magic/core/src/main/net/dpml/magic/tasks, mcconnell, 01/18/2005

Archive powered by MHonArc 2.6.24.

Top of Page