Return-Path: Delivered-To: apmail-ant-dev-archive@www.apache.org Received: (qmail 58607 invoked from network); 26 Jul 2006 22:15:38 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 26 Jul 2006 22:15:37 -0000 Received: (qmail 16395 invoked by uid 500); 26 Jul 2006 22:15:36 -0000 Delivered-To: apmail-ant-dev-archive@ant.apache.org Received: (qmail 16361 invoked by uid 500); 26 Jul 2006 22:15:36 -0000 Mailing-List: contact dev-help@ant.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Help: List-Post: List-Id: "Ant Developers List" Reply-To: "Ant Developers List" Delivered-To: mailing list dev@ant.apache.org Received: (qmail 16350 invoked by uid 500); 26 Jul 2006 22:15:36 -0000 Received: (qmail 16347 invoked by uid 99); 26 Jul 2006 22:15:36 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 26 Jul 2006 15:15:36 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 26 Jul 2006 15:15:35 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 1B4881A981A; Wed, 26 Jul 2006 15:15:15 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r425875 - in /ant/core/trunk/src: main/org/apache/tools/ant/types/DirSet.java testcases/org/apache/tools/ant/types/DirSetTest.java Date: Wed, 26 Jul 2006 22:15:13 -0000 To: ant-cvs@apache.org From: jglick@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20060726221515.1B4881A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: jglick Date: Wed Jul 26 15:15:12 2006 New Revision: 425875 URL: http://svn.apache.org/viewvc?rev=425875&view=rev Log: Expressing a as a string should show matching dirs, not files! Modified: ant/core/trunk/src/main/org/apache/tools/ant/types/DirSet.java ant/core/trunk/src/testcases/org/apache/tools/ant/types/DirSetTest.java Modified: ant/core/trunk/src/main/org/apache/tools/ant/types/DirSet.java URL: http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/types/DirSet.java?rev=425875&r1=425874&r2=425875&view=diff ============================================================================== --- ant/core/trunk/src/main/org/apache/tools/ant/types/DirSet.java (original) +++ ant/core/trunk/src/main/org/apache/tools/ant/types/DirSet.java Wed Jul 26 15:15:12 2006 @@ -18,7 +18,7 @@ package org.apache.tools.ant.types; import java.util.Iterator; - +import org.apache.tools.ant.DirectoryScanner; import org.apache.tools.ant.types.resources.FileResourceIterator; /** @@ -89,6 +89,25 @@ */ public boolean isFilesystemOnly() { return true; + } + + /** + * Returns included directories as a list of semicolon-separated paths. + * + * @return a String of included directories. + */ + public String toString() { + DirectoryScanner ds = getDirectoryScanner(getProject()); + String[] dirs = ds.getIncludedDirectories(); + StringBuffer sb = new StringBuffer(); + + for (int i = 0; i < dirs.length; i++) { + if (i > 0) { + sb.append(';'); + } + sb.append(dirs[i]); + } + return sb.toString(); } } Modified: ant/core/trunk/src/testcases/org/apache/tools/ant/types/DirSetTest.java URL: http://svn.apache.org/viewvc/ant/core/trunk/src/testcases/org/apache/tools/ant/types/DirSetTest.java?rev=425875&r1=425874&r2=425875&view=diff ============================================================================== --- ant/core/trunk/src/testcases/org/apache/tools/ant/types/DirSetTest.java (original) +++ ant/core/trunk/src/testcases/org/apache/tools/ant/types/DirSetTest.java Wed Jul 26 15:15:12 2006 @@ -17,6 +17,8 @@ package org.apache.tools.ant.types; +import java.io.File; +import java.io.FileOutputStream; import org.apache.tools.ant.BuildException; /** @@ -39,7 +41,7 @@ FileSet fs = new FileSet(); fs.setProject(getProject()); getProject().addReference("dummy", fs); - ds.setRefid(new Reference("dummy")); + ds.setRefid(new Reference(getProject(), "dummy")); try { ds.getDir(getProject()); fail("DirSet created from FileSet reference"); @@ -50,13 +52,31 @@ ds = (DirSet) getInstance(); ds.setProject(getProject()); getProject().addReference("dummy2", ds); - fs.setRefid(new Reference("dummy2")); + fs.setRefid(new Reference(getProject(), "dummy2")); try { fs.getDir(getProject()); fail("FileSet created from DirSet reference"); } catch (BuildException e) { assertEquals("dummy2 doesn\'t denote a FileSet", e.getMessage()); } + } + + public void testToString() throws Exception { + File tmp = File.createTempFile("DirSetTest", ""); + tmp.delete(); + File a = new File(tmp, "a"); + a.mkdirs(); + File b = new File(tmp, "b"); + File bc = new File(b, "c"); + bc.mkdirs(); + new FileOutputStream(new File(a, "x")).close(); + new FileOutputStream(new File(b, "x")).close(); + new FileOutputStream(new File(bc, "x")).close(); + DirSet ds = new DirSet(); + ds.setProject(getProject()); + ds.setDir(tmp); + ds.setIncludes("b/"); + assertEquals("b;b" + File.separator + "c", ds.toString()); } } --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org For additional commands, e-mail: dev-help@ant.apache.org