Return-Path: Delivered-To: apmail-ant-dev-archive@www.apache.org Received: (qmail 30597 invoked from network); 4 Jan 2005 14:51:18 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur-2.apache.org with SMTP; 4 Jan 2005 14:51:18 -0000 Received: (qmail 84394 invoked by uid 500); 4 Jan 2005 14:47:14 -0000 Delivered-To: apmail-ant-dev-archive@ant.apache.org Received: (qmail 84324 invoked by uid 500); 4 Jan 2005 14:47:14 -0000 Mailing-List: contact dev-help@ant.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Subscribe: List-Help: List-Post: List-Id: "Ant Developers List" Reply-To: "Ant Developers List" Delivered-To: mailing list dev@ant.apache.org Received: (qmail 84298 invoked by uid 500); 4 Jan 2005 14:47:14 -0000 Received: (qmail 84284 invoked by uid 99); 4 Jan 2005 14:47:13 -0000 X-ASF-Spam-Status: No, hits=-9.8 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from minotaur.apache.org (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.28) with SMTP; Tue, 04 Jan 2005 06:47:12 -0800 Received: (qmail 28428 invoked by uid 1539); 4 Jan 2005 14:47:04 -0000 Date: 4 Jan 2005 14:47:04 -0000 Message-ID: <20050104144704.28427.qmail@minotaur.apache.org> From: peterreilly@apache.org To: ant-cvs@apache.org Subject: cvs commit: ant/src/main/org/apache/tools/ant/types PropertySet.java X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N peterreilly 2005/01/04 06:47:04 Modified: src/main/org/apache/tools/ant/types Tag: ANT_16_BRANCH PropertySet.java Log: sync Revision Changes Path No revision No revision 1.8.2.7 +14 -2 ant/src/main/org/apache/tools/ant/types/PropertySet.java Index: PropertySet.java =================================================================== RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/types/PropertySet.java,v retrieving revision 1.8.2.6 retrieving revision 1.8.2.7 diff -u -r1.8.2.6 -r1.8.2.7 --- PropertySet.java 28 Oct 2004 09:17:49 -0000 1.8.2.6 +++ PropertySet.java 4 Jan 2005 14:47:04 -0000 1.8.2.7 @@ -145,6 +145,15 @@ return _mapper; } + /** + * A nested filenamemapper + * @param fileNameMapper the mapper to add + * @since Ant 1.6.3 + */ + public void add(FileNameMapper fileNameMapper) { + createMapper().add(fileNameMapper); + } + public void setDynamic(boolean dynamic) { assertNotReference(); this.dynamic = dynamic; @@ -172,8 +181,11 @@ Hashtable ret = new Hashtable(); for (Enumeration e = System.getProperties().propertyNames(); e.hasMoreElements();) { - String name = (String) e.nextElement(); - ret.put(name, System.getProperties().getProperty(name)); + Object o = e.nextElement(); + if (o instanceof String) { + String name = (String) o; + ret.put(name, System.getProperties().getProperty(name)); + } } return ret; } --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org For additional commands, e-mail: dev-help@ant.apache.org