You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by di...@apache.org on 2005/07/11 21:01:56 UTC
svn commit: r210182 - in
/webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om:
impl/llom/builder/StAXOMBuilder.java xpath/DocumentNavigator.java
Author: dims
Date: Mon Jul 11 12:01:54 2005
New Revision: 210182
URL: http://svn.apache.org/viewcvs?rev=210182&view=rev
Log:
Cleanup comment and PI processing
Modified:
webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/builder/StAXOMBuilder.java
webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/xpath/DocumentNavigator.java
Modified: webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/builder/StAXOMBuilder.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/builder/StAXOMBuilder.java?rev=210182&r1=210181&r2=210182&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/builder/StAXOMBuilder.java (original)
+++ webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/builder/StAXOMBuilder.java Mon Jul 11 12:01:54 2005
@@ -103,18 +103,15 @@
protected OMNode createComment() throws OMException {
OMNode node;
if (lastNode == null) {
- node = omfactory.createText(parser.getText());
+ node = omfactory.createText("<!--" + parser.getText() + "-->");
document.addChild(node);
} else if (lastNode.isComplete()) {
node =
omfactory.createText((OMElement) lastNode.getParent(),
- parser.getText());
- lastNode.setNextSibling(node);
- node.setPreviousSibling(lastNode);
+ "<!--" + parser.getText() + "-->");
} else {
OMElement e = (OMElement) lastNode;
- node = omfactory.createText(e, parser.getText());
- e.setFirstChild(node);
+ node = omfactory.createText(e, "<!--" + parser.getText() + "-->");
}
node.setType(OMNode.COMMENT_NODE);
return node;
@@ -148,8 +145,6 @@
omfactory.createText((OMElement) lastNode.getParent(),
"<?" + target + " " + data + "?>");
node.setType(OMNode.PI_NODE);
- lastNode.setNextSibling(node);
- node.setPreviousSibling(lastNode);
} else if (lastNode instanceof OMText) {
node = omfactory.createText("<?" + target + " " + data + "?>");
node.setType(OMNode.PI_NODE);
@@ -158,7 +153,6 @@
OMElement e = (OMElement) lastNode;
node = omfactory.createText(e, "<?" + target + " " + data + "?>");
node.setType(OMNode.PI_NODE);
- e.setFirstChild(node);
}
return node;
}
Modified: webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/xpath/DocumentNavigator.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/xpath/DocumentNavigator.java?rev=210182&r1=210181&r2=210182&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/xpath/DocumentNavigator.java (original)
+++ webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/xpath/DocumentNavigator.java Mon Jul 11 12:01:54 2005
@@ -611,8 +611,9 @@
* @return the target of the processing-instruction node
*/
public String getProcessingInstructionTarget(Object object) {
- //TODO: Fix this better?
- return super.getProcessingInstructionTarget(object);
+ String data = ((OMText)object).getText().trim();
+ int end = data.indexOf(' ');
+ return data.substring(2,end);
}
/**
@@ -622,8 +623,10 @@
* @return the data of the processing-instruction node
*/
public String getProcessingInstructionData(Object object) {
- //TODO: Fix this better?
- return super.getProcessingInstructionData(object);
+ String data = ((OMText)object).getText().trim();
+ int begin = data.indexOf(' ') + 1;
+ int end = data.length()-2;
+ return data.substring(begin,end);
}
/**