ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From peterrei...@apache.org
Subject cvs commit: ant/src/main/org/apache/tools/ant/types PropertySet.java
Date Tue, 04 Jan 2005 14:47:04 GMT
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


Mime
View raw message