You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@ant.apache.org by bo...@apache.org on 2003/05/12 14:16:07 UTC

cvs commit: ant/src/main/org/apache/tools/ant/types PropertySet.java

bodewig     2003/05/12 05:16:07

  Modified:    src/main/org/apache/tools/ant/types PropertySet.java
  Log:
  Nested mappers didn't work for references
  
  Revision  Changes    Path
  1.2       +7 -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.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- PropertySet.java	9 May 2003 13:01:00 -0000	1.1
  +++ PropertySet.java	12 May 2003 12:16:07 -0000	1.2
  @@ -177,6 +177,10 @@
           return getRef().dynamic;
       }
   
  +    public Mapper getMapper() {
  +        return getRef()._mapper;
  +    }
  +
       public Properties getProperties() {
           Vector names = null;
           Project prj = getProject();
  @@ -193,8 +197,9 @@
           }
   
           FileNameMapper mapper = null;
  -        if (_mapper != null) {
  -            mapper = _mapper.getImplementation();
  +        Mapper myMapper = getMapper();
  +        if (myMapper != null) {
  +            mapper = myMapper.getImplementation();
           }
           Properties properties = new Properties();
           for (Enumeration e = names.elements(); e.hasMoreElements();) {