cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r714140 - in /cxf/branches/2.0.x-fixes: ./ common/common/src/main/java/org/apache/cxf/staxutils/StaxUtils.java common/common/src/main/java/org/apache/cxf/staxutils/W3CDOMStreamReader.java
Date Fri, 14 Nov 2008 21:03:38 GMT
Author: dkulp
Date: Fri Nov 14 13:03:38 2008
New Revision: 714140

URL: http://svn.apache.org/viewvc?rev=714140&view=rev
Log:
Merged revisions 712199 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/branches/2.1.x-fixes

................
  r712199 | dkulp | 2008-11-07 12:02:19 -0500 (Fri, 07 Nov 2008) | 9 lines
  
  Merged revisions 712194 via svnmerge from 
  https://svn.apache.org/repos/asf/cxf/trunk
  
  ........
    r712194 | dkulp | 2008-11-07 11:49:07 -0500 (Fri, 07 Nov 2008) | 2 lines
    
    Minor performance improvement be removing a bunch of instanceof things in chained if..else..else..else
things
  ........
................

Modified:
    cxf/branches/2.0.x-fixes/   (props changed)
    cxf/branches/2.0.x-fixes/common/common/src/main/java/org/apache/cxf/staxutils/StaxUtils.java
    cxf/branches/2.0.x-fixes/common/common/src/main/java/org/apache/cxf/staxutils/W3CDOMStreamReader.java

Propchange: cxf/branches/2.0.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov 14 13:03:38 2008
@@ -1,3 +1,3 @@
-/cxf/branches/2.1.x-fixes:673548,674485,674547,674551,674562,674601,674649,674764,674887,675644,675653,677048,677385,678004,678009,678559,678629,678808,678852,678891,678893,679248,679597,680435,681060,681165,681813,681816,682902,682951,683089,683290,683318,684099,684790-684793,684842,684862,684895-684918,685205,685253,686237,686283,686299,686333-686364,686765,686827,687097,687464-687465,689109,689112,689122,691316,691357,691491,691711,691715,691745,692162-692163,692468,692500,694466-694469,694472,694717,694748-694749,694870,695503,695509,695553,695555,695563,695875-695877,695940,695980,696436,696455,696721,697086,698129,701526,701634,702275,702443,702527,702582,702604,702610,702642-702643,702649,702760,702870,702873,702959,703193,703242,703523,704303,704587,704738,704998,705153,705280-705449,705455,709357,709641,709644,710177,710184,711736,712896
-/cxf/trunk:651669-686342,686344-686363,686764,686820,687096,687387,687463,688086,688102,688735,691271,691355,691488,691602,691706,691728,692116,692157,692466,692499,693653,693819,694179,694263,694417,694716,694744,694747,694869,695396,695484,695537,695552,695561,695619,695684,695835,695935,695977,696094,696433,696720,697085,698128,700261,700602,701783,701830,701862,702267,702580,702602,702609,702616,702656,702957,703191,703239,703501,704584,704997,705150,705274,705340,705446,708550,708554,709353-709354,709425,710150,712893
+/cxf/branches/2.1.x-fixes:673548,674485,674547,674551,674562,674601,674649,674764,674887,675644,675653,677048,677385,678004,678009,678559,678629,678808,678852,678891,678893,679248,679597,680435,681060,681165,681813,681816,682902,682951,683089,683290,683318,684099,684790-684793,684842,684862,684895-684918,685205,685253,686237,686283,686299,686333-686364,686765,686827,687097,687464-687465,689109,689112,689122,691316,691357,691491,691711,691715,691745,692162-692163,692468,692500,694466-694469,694472,694717,694748-694749,694870,695503,695509,695553,695555,695563,695875-695877,695940,695980,696436,696455,696721,697086,698129,701526,701634,702275,702443,702527,702582,702604,702610,702642-702643,702649,702760,702870,702873,702959,703193,703242,703523,704303,704587,704738,704998,705153,705280-705449,705455,709357,709641,709644,710177,710184,711736,712199,712896
+/cxf/trunk:651669-686342,686344-686363,686764,686820,687096,687387,687463,688086,688102,688735,691271,691355,691488,691602,691706,691728,692116,692157,692466,692499,693653,693819,694179,694263,694417,694716,694744,694747,694869,695396,695484,695537,695552,695561,695619,695684,695835,695935,695977,696094,696433,696720,697085,698128,700261,700602,701783,701830,701862,702267,702580,702602,702609,702616,702656,702957,703191,703239,703501,704584,704997,705150,705274,705340,705446,708550,708554,709353-709354,709425,710150,712194,712893
 /incubator/cxf/trunk:434594-651668

Propchange: cxf/branches/2.0.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: cxf/branches/2.0.x-fixes/common/common/src/main/java/org/apache/cxf/staxutils/StaxUtils.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/common/common/src/main/java/org/apache/cxf/staxutils/StaxUtils.java?rev=714140&r1=714139&r2=714140&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/common/common/src/main/java/org/apache/cxf/staxutils/StaxUtils.java
(original)
+++ cxf/branches/2.0.x-fixes/common/common/src/main/java/org/apache/cxf/staxutils/StaxUtils.java
Fri Nov 14 13:03:38 2008
@@ -576,22 +576,31 @@
 
     public static void writeNode(Node n, XMLStreamWriter writer, boolean repairing) 
         throws XMLStreamException {
-        if (n instanceof Element) {
+        
+        switch (n.getNodeType()) {
+        case Node.ELEMENT_NODE:
             writeElement((Element)n, writer, repairing);
-        } else if (n instanceof CDATASection) {
-            writer.writeCData(((CDATASection)n).getData());
-        } else if (n instanceof Text) {
+            break;
+        case Node.TEXT_NODE:
             writer.writeCharacters(((Text)n).getNodeValue());
-        } else if (n instanceof Comment) {
+            break;
+        case Node.COMMENT_NODE:
             writer.writeComment(((Comment)n).getData());
-        } else if (n instanceof EntityReference) {
+            break;
+        case Node.CDATA_SECTION_NODE:
+            writer.writeCData(((CDATASection)n).getData());
+            break;
+        case Node.ENTITY_REFERENCE_NODE:
             writer.writeEntityRef(((EntityReference)n).getNodeValue());
-        } else if (n instanceof ProcessingInstruction) {
+            break;
+        case Node.PROCESSING_INSTRUCTION_NODE:
             ProcessingInstruction pi = (ProcessingInstruction)n;
             writer.writeProcessingInstruction(pi.getTarget(), pi.getData());
-        } else if (n instanceof Document) {
+            break;
+        case Node.DOCUMENT_NODE:
             writeDocument((Document)n, writer, repairing);
-        } 
+            break;
+        }        
     }
 
     public static Document read(XMLStreamReader reader) throws XMLStreamException {

Modified: cxf/branches/2.0.x-fixes/common/common/src/main/java/org/apache/cxf/staxutils/W3CDOMStreamReader.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/common/common/src/main/java/org/apache/cxf/staxutils/W3CDOMStreamReader.java?rev=714140&r1=714139&r2=714140&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/common/common/src/main/java/org/apache/cxf/staxutils/W3CDOMStreamReader.java
(original)
+++ cxf/branches/2.0.x-fixes/common/common/src/main/java/org/apache/cxf/staxutils/W3CDOMStreamReader.java
Fri Nov 14 13:03:38 2008
@@ -137,17 +137,21 @@
 
     @Override
     protected int moveToChild(int currentChild) {
-        this.content = getCurrentElement().getChildNodes().item(currentChild);
-
-        if (content instanceof Text) {
-            return CHARACTERS;
-        } else if (content instanceof Element) {
+        content = getCurrentNode().getFirstChild();
+        while (currentChild > 0 && content != null) {
+            content = content.getNextSibling();
+            --currentChild;
+        }
+        switch (content.getNodeType()) {
+        case Node.ELEMENT_NODE:
             return START_ELEMENT;
-        } else if (content instanceof CDATASection) {
-            return CDATA;
-        } else if (content instanceof Comment) {
+        case Node.TEXT_NODE:
             return CHARACTERS;
-        } else if (content instanceof EntityReference) {
+        case Node.COMMENT_NODE:
+            return COMMENT;
+        case Node.CDATA_SECTION_NODE:
+            return CDATA;
+        case Node.ENTITY_REFERENCE_NODE:
             return ENTITY_REFERENCE;
         }
 



Mime
View raw message