svn commit: r1484073 - in /webservices/axiom/trunk/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/serializer/pull: AbstractWrapper.java SwitchingWrapper.java

[ve...@apache.org]

Author: veithen
Date: Sat May 18 09:07:16 2013
New Revision: 1484073

URL: http://svn.apache.org/r1484073
Log:
Eliminated remaining references to StreamSwitch (which is now called PullSerializer) in variable names.

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

Modified: webservices/axiom/trunk/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/serializer/pull/AbstractWrapper.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/AbstractWrapper.java?rev=1484073&r1=1484072&r2=1484073&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/serializer/pull/AbstractWrapper.java (original)
+++ webservices/axiom/trunk/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/serializer/pull/AbstractWrapper.java Sat May 18 09:07:16 2013
@@ -51,10 +51,10 @@ abstract class AbstractWrapper extends P
      */
     private DataHandlerReader dataHandlerReader;
 
-    AbstractWrapper(PullSerializer streamSwitch, PullSerializerState nextState,
+    AbstractWrapper(PullSerializer serializer, PullSerializerState nextState,
             XMLStreamReader reader, int startDepth) {
         this.reader = reader;
-        this.serializer = streamSwitch;
+        this.serializer = serializer;
         this.nextState = nextState;
         depth = startDepth;
     }

Modified: webservices/axiom/trunk/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/serializer/pull/SwitchingWrapper.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/SwitchingWrapper.java?rev=1484073&r1=1484072&r2=1484073&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/serializer/pull/SwitchingWrapper.java (original)
+++ webservices/axiom/trunk/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/serializer/pull/SwitchingWrapper.java Sat May 18 09:07:16 2013
@@ -71,7 +71,7 @@ class SwitchingWrapper extends PullSeria
     
     private static final Log log = LogFactory.getLog(SwitchingWrapper.class);
     
-    private final PullSerializer streamSwitch;
+    private final PullSerializer serializer;
     
     /**
      * The current node, corresponding to the current event.
@@ -153,15 +153,15 @@ class SwitchingWrapper extends PullSeria
     /**
      * Constructor.
      *
-     * @param streamSwitch
+     * @param serializer
      * @param builder
      * @param startNode
      * @param cache
      * @param preserveNamespaceContext
      */
-    public SwitchingWrapper(PullSerializer streamSwitch, OMXMLParserWrapper builder, OMContainer startNode,
+    public SwitchingWrapper(PullSerializer serializer, OMXMLParserWrapper builder, OMContainer startNode,
                             boolean cache, boolean preserveNamespaceContext) {
-        this.streamSwitch = streamSwitch;
+        this.serializer = serializer;
         this.builder = builder;
         this.rootNode = startNode;
         this.cache = cache;
@@ -662,7 +662,7 @@ class SwitchingWrapper extends PullSeria
         } finally {
             // Note that as a side effect of this instruction, the SwitchingWrapper instance
             // will become unreachable and the parser can be GC'd or reused.
-            streamSwitch.switchState(ClosedState.INSTANCE);
+            serializer.switchState(ClosedState.INSTANCE);
         }
     }
 
@@ -681,7 +681,7 @@ class SwitchingWrapper extends PullSeria
      */
     private boolean isLeaf(OMSerializable n) {
         if (n instanceof OMContainer) {
-            return streamSwitch.isDataSourceALeaf() && isOMSourcedElement(n) && !((OMSourcedElement)n).isExpanded() && n != rootNode;
+            return serializer.isDataSourceALeaf() && isOMSourcedElement(n) && !((OMSourcedElement)n).isExpanded() && n != rootNode;
         } else {
             return true;
         }
@@ -772,7 +772,7 @@ class SwitchingWrapper extends PullSeria
                             while (reader.next() != START_ELEMENT) {
                                 // Just loop
                             }
-                            streamSwitch.switchState(new IncludeWrapper(streamSwitch, this, reader));
+                            serializer.switchState(new IncludeWrapper(serializer, this, reader));
                             node = nextNode;
                             visited = true;
                             return START_ELEMENT;
@@ -803,8 +803,8 @@ class SwitchingWrapper extends PullSeria
                         container = parent;
                         depth++;
                     }
-                    PullThroughWrapper wrapper = new PullThroughWrapper(streamSwitch, this, builder, container, builder.disableCaching(), depth);
-                    streamSwitch.switchState(wrapper);
+                    PullThroughWrapper wrapper = new PullThroughWrapper(serializer, this, builder, container, builder.disableCaching(), depth);
+                    serializer.switchState(wrapper);
                     node = container;
                     visited = true;
                     currentEvent = wrapper.next();