You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@santuario.apache.org by mu...@apache.org on 2007/10/04 15:49:35 UTC
svn commit: r581902 - in
/xml/security/trunk/src/org/apache/xml/security/transforms/params:
XPath2FilterContainer.java XPath2FilterContainer04.java
XPathFilterCHGPContainer.java
Author: mullan
Date: Thu Oct 4 06:49:34 2007
New Revision: 581902
URL: http://svn.apache.org/viewvc?rev=581902&view=rev
Log:
Fixed Bug 42061 : Method to disable XMLUtils.addReturnToElement
Modified:
xml/security/trunk/src/org/apache/xml/security/transforms/params/XPath2FilterContainer.java
xml/security/trunk/src/org/apache/xml/security/transforms/params/XPath2FilterContainer04.java
xml/security/trunk/src/org/apache/xml/security/transforms/params/XPathFilterCHGPContainer.java
Modified: xml/security/trunk/src/org/apache/xml/security/transforms/params/XPath2FilterContainer.java
URL: http://svn.apache.org/viewvc/xml/security/trunk/src/org/apache/xml/security/transforms/params/XPath2FilterContainer.java?rev=581902&r1=581901&r2=581902&view=diff
==============================================================================
--- xml/security/trunk/src/org/apache/xml/security/transforms/params/XPath2FilterContainer.java (original)
+++ xml/security/trunk/src/org/apache/xml/security/transforms/params/XPath2FilterContainer.java Thu Oct 4 06:49:34 2007
@@ -22,6 +22,7 @@
import org.apache.xml.security.transforms.TransformParam;
import org.apache.xml.security.utils.ElementProxy;
import org.apache.xml.security.utils.HelperNodeList;
+import org.apache.xml.security.utils.XMLUtils;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
@@ -184,7 +185,7 @@
HelperNodeList nl = new HelperNodeList();
- nl.appendChild(doc.createTextNode("\n"));
+ XMLUtils.addReturnToElement(doc, nl);
for (int i = 0; i < params.length; i++) {
String type = params[i][0];
@@ -203,7 +204,7 @@
XPath2FilterContainer c = new XPath2FilterContainer(doc, xpath, type);
nl.appendChild(c.getElement());
- nl.appendChild(doc.createTextNode("\n"));
+ XMLUtils.addReturnToElement(doc, nl);
}
return nl;
Modified: xml/security/trunk/src/org/apache/xml/security/transforms/params/XPath2FilterContainer04.java
URL: http://svn.apache.org/viewvc/xml/security/trunk/src/org/apache/xml/security/transforms/params/XPath2FilterContainer04.java?rev=581902&r1=581901&r2=581902&view=diff
==============================================================================
--- xml/security/trunk/src/org/apache/xml/security/transforms/params/XPath2FilterContainer04.java (original)
+++ xml/security/trunk/src/org/apache/xml/security/transforms/params/XPath2FilterContainer04.java Thu Oct 4 06:49:34 2007
@@ -21,6 +21,7 @@
import org.apache.xml.security.exceptions.XMLSecurityException;
import org.apache.xml.security.transforms.TransformParam;
import org.apache.xml.security.utils.ElementProxy;
+import org.apache.xml.security.utils.XMLUtils;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
@@ -83,8 +84,9 @@
if ((xpath2filter.length() > 2)
&& (!Character.isWhitespace(xpath2filter.charAt(0)))) {
- this._constructionElement.appendChild(doc.createTextNode("\n"
- + xpath2filter + "\n"));
+ XMLUtils.addReturnToElement(this._constructionElement);
+ this._constructionElement.appendChild(doc.createTextNode(xpath2filter));
+ XMLUtils.addReturnToElement(this._constructionElement);
} else {
this._constructionElement
.appendChild(doc.createTextNode(xpath2filter));
Modified: xml/security/trunk/src/org/apache/xml/security/transforms/params/XPathFilterCHGPContainer.java
URL: http://svn.apache.org/viewvc/xml/security/trunk/src/org/apache/xml/security/transforms/params/XPathFilterCHGPContainer.java?rev=581902&r1=581901&r2=581902&view=diff
==============================================================================
--- xml/security/trunk/src/org/apache/xml/security/transforms/params/XPathFilterCHGPContainer.java (original)
+++ xml/security/trunk/src/org/apache/xml/security/transforms/params/XPathFilterCHGPContainer.java Thu Oct 4 06:49:34 2007
@@ -100,7 +100,7 @@
includeButSearchElem
.appendChild(this._doc
.createTextNode(indentXPathText(includeButSearch)));
- this._constructionElement.appendChild(doc.createTextNode("\n"));
+ XMLUtils.addReturnToElement(this._constructionElement);
this._constructionElement.appendChild(includeButSearchElem);
}
@@ -114,7 +114,7 @@
excludeButSearchElem
.appendChild(this._doc
.createTextNode(indentXPathText(excludeButSearch)));
- this._constructionElement.appendChild(doc.createTextNode("\n"));
+ XMLUtils.addReturnToElement(this._constructionElement);
this._constructionElement.appendChild(excludeButSearchElem);
}
@@ -125,11 +125,11 @@
excludeElem
.appendChild(this._doc.createTextNode(indentXPathText(exclude)));
- this._constructionElement.appendChild(doc.createTextNode("\n"));
+ XMLUtils.addReturnToElement(this._constructionElement);
this._constructionElement.appendChild(excludeElem);
}
- this._constructionElement.appendChild(doc.createTextNode("\n"));
+ XMLUtils.addReturnToElement(this._constructionElement);
}
/**