ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mben...@apache.org
Subject svn commit: r589756 - in /ant/core/tags/ANT_170: docs/manual/CoreTasks/xmlproperty.html src/main/org/apache/tools/ant/taskdefs/XmlProperty.java
Date Mon, 29 Oct 2007 17:30:40 GMT
Author: mbenson
Date: Mon Oct 29 10:30:35 2007
New Revision: 589756

URL: http://svn.apache.org/viewvc?rev=589756&view=rev
Log:
revert mistaken commit to release tag

Modified:
    ant/core/tags/ANT_170/docs/manual/CoreTasks/xmlproperty.html
    ant/core/tags/ANT_170/src/main/org/apache/tools/ant/taskdefs/XmlProperty.java

Modified: ant/core/tags/ANT_170/docs/manual/CoreTasks/xmlproperty.html
URL: http://svn.apache.org/viewvc/ant/core/tags/ANT_170/docs/manual/CoreTasks/xmlproperty.html?rev=589756&r1=589755&r2=589756&view=diff
==============================================================================
--- ant/core/tags/ANT_170/docs/manual/CoreTasks/xmlproperty.html (original)
+++ ant/core/tags/ANT_170/docs/manual/CoreTasks/xmlproperty.html Mon Oct 29 10:30:35 2007
@@ -146,11 +146,6 @@
                      if <i>semanticAttributes</i> is not set to <i>true</i>.</td>
     <td valign="top" align="center">No, default is <i>${basedir}</i>.</td>
   </tr>
-  <tr>
-    <td valign="top">delimiter</td>
-    <td valign="top">Delimiter for splitting multiple values.<br><i>since
Ant 1.7.1</i></td>
-    <td valign="top" align="center">No, defaults to comma</td>
-  </tr>
 </table>
 
 <h3><a name="nested">Nested Elements</a></h3>

Modified: ant/core/tags/ANT_170/src/main/org/apache/tools/ant/taskdefs/XmlProperty.java
URL: http://svn.apache.org/viewvc/ant/core/tags/ANT_170/src/main/org/apache/tools/ant/taskdefs/XmlProperty.java?rev=589756&r1=589755&r2=589756&view=diff
==============================================================================
--- ant/core/tags/ANT_170/src/main/org/apache/tools/ant/taskdefs/XmlProperty.java (original)
+++ ant/core/tags/ANT_170/src/main/org/apache/tools/ant/taskdefs/XmlProperty.java Mon Oct
29 10:30:35 2007
@@ -185,7 +185,6 @@
     private File rootDirectory = null;
     private Hashtable addedAttributes = new Hashtable();
     private XMLCatalog xmlCatalog = new XMLCatalog();
-    private String delimiter = ",";
 
     private static final String ID = "id";
     private static final String REF_ID = "refid";
@@ -498,7 +497,7 @@
             // when we read them, though (instead of keeping them
             // outside of the project and batch adding them at the end)
             // to allow other properties to reference them.
-            value = (String) addedAttributes.get(name) + getDelimiter() + value;
+            value = (String) addedAttributes.get(name) + "," + value;
             getProject().setProperty(name, value);
             addedAttributes.put(name, value);
         } else if (getProject().getProperty(name) == null) {
@@ -788,22 +787,5 @@
      */
     protected boolean supportsNonFileResources() {
         return getClass().equals(XmlProperty.class);
-    }
-
-    /**
-     * Get the current delimiter.
-     * @return delimiter
-     */
-    public String getDelimiter() {
-        return delimiter;
-    }
-
-    /**
-     * Sets a new delimiter.
-     * @param delimiter new value
-     * @since Ant 1.7.1
-     */
-    public void setDelimiter(String delimiter) {
-        this.delimiter = delimiter;
     }
 }



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org
For additional commands, e-mail: dev-help@ant.apache.org


Mime
View raw message