← Back to branch summary

~ubuntu-branches/ubuntu/maverick/ant/maverick

« back to all changes in this revision

Viewing changes to src/main/org/apache/tools/ant/taskdefs/XmlProperty.java

  • Committer: Bazaar Package Importer
  • Author(s): Matthias Klose
  • Date: 2008-09-30 14:47:45 UTC
  • mfrom: (1.2.3 upstream)
  • Revision ID: james.westby@ubuntu.com-20080930144745-0x8uzivd9t15dua3
Tags: 1.7.1-0ubuntu1
* New upstream version (bug fix release).
  - mainly a bugfix release.
  - has extended support for Java6 features.
  - <script> now has support for JavaFX.
  - release notes: http://apache.linux-mirror.org/ant/README.html
* Remove debian/patches/05_ant-bug433444.patch. Obsoleted.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/main/org/apache/tools/ant/taskdefs/XmlProperty.java
185
185
    private File rootDirectory = null;
186
186
    private Hashtable addedAttributes = new Hashtable();
187
187
    private XMLCatalog xmlCatalog = new XMLCatalog();
 
188
    private String delimiter = ",";
188
189
 
189
190
    private static final String ID = "id";
190
191
    private static final String REF_ID = "refid";
497
498
            // when we read them, though (instead of keeping them
498
499
            // outside of the project and batch adding them at the end)
499
500
            // to allow other properties to reference them.
500
 
            value = (String) addedAttributes.get(name) + "," + value;
 
501
            value = (String) addedAttributes.get(name) + getDelimiter() + value;
501
502
            getProject().setProperty(name, value);
502
503
            addedAttributes.put(name, value);
503
504
        } else if (getProject().getProperty(name) == null) {
788
789
    protected boolean supportsNonFileResources() {
789
790
        return getClass().equals(XmlProperty.class);
790
791
    }
 
792
 
 
793
    public String getDelimiter() {
 
794
        return delimiter;
 
795
    }
 
796
 
 
797
    public void setDelimiter(String delimiter) {
 
798
        this.delimiter = delimiter;
 
799
    }
791
800
}