You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commons-dev@ws.apache.org by ch...@apache.org on 2006/12/10 18:20:38 UTC

svn commit: r485223 - in /webservices/commons/trunk/modules/axiom/modules: axiom-api/src/main/java/org/apache/axiom/om/ axiom-api/src/main/java/org/apache/axiom/om/impl/builder/ axiom-api/src/main/java/org/apache/axiom/soap/impl/builder/ axiom-impl/src...

Author: chinthaka
Date: Sun Dec 10 09:20:36 2006
New Revision: 485223

URL: http://svn.apache.org/viewvc?view=rev&rev=485223
Log:
- fixing the setFirstChild problem filed in http://issues.apache.org/jira/browse/WSCOMMONS-136.
- applying the patch in http://issues.apache.org/jira/browse/WSCOMMONS-135.Thanks Toshiro Takase.

Modified:
    webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/OMElement.java
    webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/impl/builder/SAXOMBuilder.java
    webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/impl/builder/StAXBuilder.java
    webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/impl/builder/StAXOMBuilder.java
    webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/impl/builder/XOPAwareStAXOMBuilder.java
    webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/soap/impl/builder/MTOMStAXSOAPModelBuilder.java
    webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/soap/impl/builder/StAXSOAPModelBuilder.java
    webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMNodeImpl.java

Modified: webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/OMElement.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/OMElement.java?view=diff&rev=485223&r1=485222&r2=485223
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/OMElement.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/OMElement.java Sun Dec 10 09:20:36 2006
@@ -199,6 +199,10 @@
     /**
      * Sets the first child.
      *
+     * @deprecated This method should not be called, un-intentionally. When some one randomly set the
+     * first child, all the links handling will not happen inside this method. So we have moved this
+     * method to the less visible interface, OMContainerEx.
+     *
      * @param node
      */
     public void setFirstChild(OMNode node);

Modified: webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/impl/builder/SAXOMBuilder.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/impl/builder/SAXOMBuilder.java?view=diff&rev=485223&r1=485222&r2=485223
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/impl/builder/SAXOMBuilder.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/impl/builder/SAXOMBuilder.java Sun Dec 10 09:20:36 2006
@@ -23,6 +23,7 @@
 import org.apache.axiom.om.OMFactory;
 import org.apache.axiom.om.OMNode;
 import org.apache.axiom.om.impl.OMNodeEx;
+import org.apache.axiom.om.impl.OMContainerEx;
 import org.xml.sax.Attributes;
 import org.xml.sax.Locator;
 import org.xml.sax.SAXException;
@@ -62,7 +63,7 @@
             ((OMNodeEx)lastNode).setNextOMSibling(e);
             ((OMNodeEx)e).setPreviousOMSibling(lastNode);
         } else {
-            OMElement parent = (OMElement) lastNode;
+            OMContainerEx parent = (OMContainerEx) lastNode;
             e = factory.createOMElement(localName, null, (OMElement) lastNode,
                     null);
             parent.setFirstChild(e);
@@ -147,7 +148,7 @@
             ((OMNodeEx)lastNode).setNextOMSibling(node);
             ((OMNodeEx)node).setPreviousOMSibling(lastNode);
         } else {
-            OMElement e = (OMElement) lastNode;
+            OMContainerEx e = (OMContainerEx) lastNode;
             node = factory.createOMText(e, new String(ch, start, length));
             e.setFirstChild(node);
         }

Modified: webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/impl/builder/StAXBuilder.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/impl/builder/StAXBuilder.java?view=diff&rev=485223&r1=485222&r2=485223
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/impl/builder/StAXBuilder.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/impl/builder/StAXBuilder.java Sun Dec 10 09:20:36 2006
@@ -18,6 +18,7 @@
 
 import org.apache.axiom.om.*;
 import org.apache.axiom.om.impl.OMNodeEx;
+import org.apache.axiom.om.impl.OMContainerEx;
 import org.apache.axiom.om.impl.util.OMSerializerUtil;
 
 import javax.xml.stream.XMLStreamConstants;
@@ -238,7 +239,7 @@
                 if (parent == null) {
                     throw new OMException();
                 }
-                parent.setFirstChild(null);
+                ((OMContainerEx) parent).setFirstChild(null);
                 lastNode = parent;
             }
             cache = true;

Modified: webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/impl/builder/StAXOMBuilder.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/impl/builder/StAXOMBuilder.java?view=diff&rev=485223&r1=485222&r2=485223
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/impl/builder/StAXOMBuilder.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/impl/builder/StAXOMBuilder.java Sun Dec 10 09:20:36 2006
@@ -232,7 +232,7 @@
             ((OMNodeEx) lastNode).setNextOMSibling(node);
             ((OMNodeEx) node).setPreviousOMSibling(lastNode);
         } else {
-            OMElement e = (OMElement) lastNode;
+            OMContainerEx e = (OMContainerEx) lastNode;
             node = omfactory.createOMElement(elementName, null,
                     (OMElement) lastNode, this);
             e.setFirstChild(node);

Modified: webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/impl/builder/XOPAwareStAXOMBuilder.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/impl/builder/XOPAwareStAXOMBuilder.java?view=diff&rev=485223&r1=485222&r2=485223
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/impl/builder/XOPAwareStAXOMBuilder.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/impl/builder/XOPAwareStAXOMBuilder.java Sun Dec 10 09:20:36 2006
@@ -31,6 +31,7 @@
 import org.apache.axiom.om.OMText;
 import org.apache.axiom.om.impl.MTOMConstants;
 import org.apache.axiom.om.impl.OMNodeEx;
+import org.apache.axiom.om.impl.OMContainerEx;
 import org.apache.axiom.om.util.ElementHelper;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -130,9 +131,9 @@
 				((OMNodeEx) lastNode).setNextOMSibling(node);
 				((OMNodeEx) node).setPreviousOMSibling(lastNode);
 			} else {
-				OMElement e = (OMElement) lastNode;
+				OMContainerEx e = (OMContainerEx) lastNode;
 				node = omfactory.createOMText(contentID, (OMElement) lastNode,this);
-				e.setFirstChild(node);
+                e.setFirstChild(node);
 			}
 			return node;
 		} else {

Modified: webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/soap/impl/builder/MTOMStAXSOAPModelBuilder.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/soap/impl/builder/MTOMStAXSOAPModelBuilder.java?view=diff&rev=485223&r1=485222&r2=485223
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/soap/impl/builder/MTOMStAXSOAPModelBuilder.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/soap/impl/builder/MTOMStAXSOAPModelBuilder.java Sun Dec 10 09:20:36 2006
@@ -24,6 +24,7 @@
 import org.apache.axiom.om.util.ElementHelper;
 import org.apache.axiom.om.impl.MTOMConstants;
 import org.apache.axiom.om.impl.OMNodeEx;
+import org.apache.axiom.om.impl.OMContainerEx;
 import org.apache.axiom.om.impl.builder.XOPBuilder;
 import org.apache.axiom.soap.SOAPFactory;
 import org.apache.commons.logging.Log;
@@ -85,10 +86,10 @@
 				((OMNodeEx) lastNode).setNextOMSibling(node);
 				((OMNodeEx) node).setPreviousOMSibling(lastNode);
 			} else {
-				OMElement e = (OMElement) lastNode;
+				OMContainerEx e = (OMContainerEx) lastNode;
 				node = omfactory.createOMText(contentID, (OMElement) lastNode,
 						this);
-				e.setFirstChild(node);
+                 e.setFirstChild(node);
 			}
 			return node;
 

Modified: webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/soap/impl/builder/StAXSOAPModelBuilder.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/soap/impl/builder/StAXSOAPModelBuilder.java?view=diff&rev=485223&r1=485222&r2=485223
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/soap/impl/builder/StAXSOAPModelBuilder.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/soap/impl/builder/StAXSOAPModelBuilder.java Sun Dec 10 09:20:36 2006
@@ -23,6 +23,7 @@
 import org.apache.axiom.om.OMNamespace;
 import org.apache.axiom.om.OMNode;
 import org.apache.axiom.om.impl.OMNodeEx;
+import org.apache.axiom.om.impl.OMContainerEx;
 import org.apache.axiom.om.impl.builder.StAXOMBuilder;
 import org.apache.axiom.soap.SOAP11Constants;
 import org.apache.axiom.soap.SOAP12Constants;
@@ -180,7 +181,7 @@
             ((OMNodeEx) lastNode).setNextOMSibling(node);
             ((OMNodeEx) node).setPreviousOMSibling(lastNode);
         } else {
-            OMElement e = (OMElement) lastNode;
+            OMContainerEx e = (OMContainerEx) lastNode;
             node = constructNode((OMElement) lastNode, elementName, false);
             e.setFirstChild(node);
         }

Modified: webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMNodeImpl.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMNodeImpl.java?view=diff&rev=485223&r1=485222&r2=485223
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMNodeImpl.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMNodeImpl.java Sun Dec 10 09:20:36 2006
@@ -203,6 +203,8 @@
             ((OMElementImpl) parent).lastChild = getPreviousOMSibling();
         }
 
+        this.previousSibling = null;
+        this.nextSibling = null;
         this.parent = null;
         return this;
     }



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