svn commit: r1484245 - /webservices/axiom/trunk/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/serializer/pull/Navigator.java

[veithen]

Author: veithen
Date: Sun May 19 09:12:20 2013
New Revision: 1484245

URL: http://svn.apache.org/r1484245
Log:
Inlined two private methods that are used only once.

Modified:
    
webservices/axiom/trunk/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/serializer/pull/Navigator.java

Modified: 
webservices/axiom/trunk/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/serializer/pull/Navigator.java
URL: 
http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/serializer/pull/Navigator.java?rev=1484245&r1=1484244&r2=1484245&view=diff
==============================================================================
--- 
webservices/axiom/trunk/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/serializer/pull/Navigator.java
 (original)
+++ 
webservices/axiom/trunk/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/serializer/pull/Navigator.java
 Sun May 19 09:12:20 2013
@@ -533,30 +533,6 @@ final class Navigator extends PullSerial
     }
     
     /**
-     * @param node
-     * @return first child or null
-     */
-    private OMNode _getFirstChild(OMContainer node) {
-        if (cache) {
-            return node.getFirstOMChild();
-        } else {
-            return ((IContainer)node).getFirstOMChildIfAvailable();
-        }
-    }
-
-    /**
-     * @param node
-     * @return next sibling or null
-     */
-    private OMNode getNextSibling(OMNode node) {
-        if (cache) {
-            return node.getNextOMSibling();
-        } else {
-            return ((OMNodeEx) node).getNextOMSiblingIfAvailable();
-        }
-    }
-
-    /**
      * Advance to the next node if it is available.
      * <p>
      * The following table describes the possible return values and 
postconditions:
@@ -590,7 +566,8 @@ final class Navigator extends PullSerial
             node = rootNode;
             return true;
         } else if (!isLeaf(node) && !visited) {
-            OMNode firstChild = _getFirstChild((OMContainer) node);
+            IContainer current = (IContainer)node;
+            OMNode firstChild = cache ? current.getFirstOMChild() : 
current.getFirstOMChildIfAvailable();
             if (firstChild != null) {
                 node = firstChild;
                 visited = false;
@@ -607,8 +584,8 @@ final class Navigator extends PullSerial
             visited = true;
             return true;
         } else {
-            OMNode current = (OMNode)node;
-            OMNode nextSibling = getNextSibling(current);
+            OMNodeEx current = (OMNodeEx)node;
+            OMNode nextSibling = cache ? current.getNextOMSibling() : 
current.getNextOMSiblingIfAvailable();
             if (nextSibling != null) {
                 node = nextSibling;
                 visited = false;