Revision: 57
http://svn.sourceforge.net/ant-contrib/?rev=57&view=rev
Author: deanhiller
Date: 2006-10-16 11:59:13 -0700 (Mon, 16 Oct 2006)
Log Message:
-----------
fix the default package stuff for verifydesign.
Modified Paths:
--------------
trunk/ant-contrib/src/java/net/sf/antcontrib/design/Design.java
Modified: trunk/ant-contrib/src/java/net/sf/antcontrib/design/Design.java
===================================================================
--- trunk/ant-contrib/src/java/net/sf/antcontrib/design/Design.java 2006-10-16 17:39:18 UTC (rev 56)
+++ trunk/ant-contrib/src/java/net/sf/antcontrib/design/Design.java 2006-10-16 18:59:13 UTC (rev 57)
@@ -24,6 +24,8 @@
import java.util.Set;
import java.util.Vector;
+import net.sf.antcontrib.logic.ProjectDelegate;
+
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Location;
import org.apache.tools.ant.Project;
@@ -59,6 +61,7 @@
Package p = new Package();
p.setIncludeSubpackages(true);
p.setName("java");
+ p.setUsed(true);
p.setNeedDeclarations(false);
p.setPackage("java");
addConfiguredPackage(p);
@@ -89,10 +92,10 @@
if(thePackage == null)
throw new IllegalArgumentException("Cannot retrieve null packages");
- Package result = null;
String currentPackage = thePackage;
+ Package result = (Package)packageNameToPackage.get(currentPackage);
while(!Package.DEFAULT.equals(currentPackage)) {
- result = (Package)packageNameToPackage.get(currentPackage);
+ log.log("p="+currentPackage+"result="+result, Project.MSG_DEBUG);
if(result != null) {
if(currentPackage.equals(thePackage))
return result;
@@ -101,12 +104,14 @@
return null;
}
currentPackage = VerifyDesignDelegate.getPackageName(currentPackage);
+ result = (Package)packageNameToPackage.get(currentPackage);
}
//result must now be default package
if(result != null && result.isIncludeSubpackages())
return result;
+ log.log("returning null", Project.MSG_DEBUG);
return null;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|