cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r735831 - in /cxf/branches/2.0.x-fixes: ./ tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/parser/
Date Mon, 19 Jan 2009 21:26:18 GMT
Author: dkulp
Date: Mon Jan 19 13:26:18 2009
New Revision: 735831

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

................
  r733884 | dkulp | 2009-01-12 15:02:43 -0500 (Mon, 12 Jan 2009) | 9 lines
  
  Merged revisions 732411 via svnmerge from 
  https://svn.apache.org/repos/asf/cxf/trunk
  
  ........
    r732411 | seanoc | 2009-01-07 13:01:31 -0500 (Wed, 07 Jan 2009) | 1 line
    
    More NodeList refactoring
  ........
................

Modified:
    cxf/branches/2.0.x-fixes/   (props changed)
    cxf/branches/2.0.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/parser/Form.java
    cxf/branches/2.0.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/parser/Option.java
    cxf/branches/2.0.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/parser/OptionGroup.java

Propchange: cxf/branches/2.0.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan 19 13:26:18 2009
@@ -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,712199,712225,712275,712600,712896,713083,713410,713413,713594,713599,713808,713901,714169-714171,718622,718929,719211,719221-719223,7192
 96,719300-719301,719303,719308,719332,719356,719363,719369-719383,719650,719695,720124,723545,724403-724404,724421,724448,724451,724486-724487,724714,725367,725371,725763,725774,726045,726048,726106,726123,726745-726746,726749,726754,726756-726758,726995,727794,727797-727798,727800,731676,731684,731686-731688,731690,733587,733873,733876
-/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,712198,712272,712312,712670,712893,713082,713584,713597,713804,713899,714167-714168,718281,718565,718620,718640,718665,719017,719210,719215-719218,719222,719273,719327-719354,719362,719368,719382,719649,719680,720119-720217,723338,723717-723791,724334-724371,724433-724438,724449,724481,724485,724668,724782,724795,725754,725773,725799,725839,726342,726524,726631,726637,726639,726692,726724,726992,727445,727692,727754,727792,730139,731598,731604,731615,73163
 1,731635,732320,732363,733582
+/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,712225,712275,712600,712896,713083,713410,713413,713594,713599,713808,713901,714169-714171,718622,718929,719211,719221-719223,7192
 96,719300-719301,719303,719308,719332,719356,719363,719369-719383,719650,719695,720124,723545,724403-724404,724421,724448,724451,724486-724487,724714,725367,725371,725763,725774,726045,726048,726106,726123,726745-726746,726749,726754,726756-726758,726995,727794,727797-727798,727800,731676,731684,731686-731688,731690,733587,733873,733876,733884
+/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,712198,712272,712312,712670,712893,713082,713584,713597,713804,713899,714167-714168,718281,718565,718620,718640,718665,719017,719210,719215-719218,719222,719273,719327-719354,719362,719368,719382,719649,719680,720119-720217,723338,723717-723791,724334-724371,724433-724438,724449,724481,724485,724668,724782,724795,725754,725773,725799,725839,726342,726524,726631,726637,726639,726692,726724,726992,727445,727692,727754,727792,730139,731598,731604,731615,73163
 1,731635,732320,732363,732411,733582
 /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/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/parser/Form.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/parser/Form.java?rev=735831&r1=735830&r2=735831&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/parser/Form.java
(original)
+++ cxf/branches/2.0.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/parser/Form.java
Mon Jan 19 13:26:18 2009
@@ -26,9 +26,9 @@
 
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
 
 import org.apache.cxf.common.logging.LogUtils;
+import org.apache.cxf.helpers.DOMUtils;
 import org.apache.cxf.tools.common.toolspec.Tool;
 
 
@@ -43,15 +43,24 @@
 
     public Form(Element el) {
         this.element = el;
-        NodeList list = element.getElementsByTagNameNS(Tool.TOOL_SPEC_PUBLIC_ID, "optionGroup");
-
-        for (int i = 0; i < list.getLength(); i++) {
-            optionGroups.add(new OptionGroup((Element)list.item(i)));
-        }
-        list = element.getElementsByTagNameNS(Tool.TOOL_SPEC_PUBLIC_ID, "argument");
-        for (int i = 0; i < list.getLength(); i++) {
-            arguments.add(new Argument((Element)list.item(i)));
+        
+        List<Element> elemList = 
+            DOMUtils.findAllElementsByTagNameNS(element, 
+                                                Tool.TOOL_SPEC_PUBLIC_ID, 
+                                                "optionGroup");
+        
+        for (Element elem : elemList) {
+            optionGroups.add(new OptionGroup(elem));
         }
+        
+        elemList = 
+            DOMUtils.findAllElementsByTagNameNS(element, 
+                                                Tool.TOOL_SPEC_PUBLIC_ID, 
+                                                "argument");
+        for (Element elem : elemList) {
+            arguments.add(new Argument(elem));
+        }     
+        
         getOptions(element);
     }
 

Modified: cxf/branches/2.0.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/parser/Option.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/parser/Option.java?rev=735831&r1=735830&r2=735831&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/parser/Option.java
(original)
+++ cxf/branches/2.0.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/parser/Option.java
Mon Jan 19 13:26:18 2009
@@ -19,14 +19,15 @@
 
 package org.apache.cxf.tools.common.toolspec.parser;
 
+import java.util.List;
 import java.util.StringTokenizer;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import org.w3c.dom.Element;
-import org.w3c.dom.NodeList;
 
 import org.apache.cxf.common.logging.LogUtils;
+import org.apache.cxf.helpers.DOMUtils;
 import org.apache.cxf.tools.common.toolspec.Tool;
 
 public class Option implements TokenConsumer {
@@ -42,22 +43,27 @@
 
     public Option(Element el) {
         this.element = el;
-
-        NodeList list = element.getElementsByTagNameNS(Tool.TOOL_SPEC_PUBLIC_ID, "associatedArgument");
-
-        if (list != null && list.getLength() > 0) {
-            argument = (Element)list.item(0);
-        }
-
-        list = element.getElementsByTagNameNS(Tool.TOOL_SPEC_PUBLIC_ID, "annotation");
-        if (list != null && list.getLength() > 0) {
-            annotation = (Element)list.item(0);
+        
+        
+        List<Element> elemList = DOMUtils.findAllElementsByTagNameNS(element, 
+                                                                     Tool.TOOL_SPEC_PUBLIC_ID,

+                                                                     "associatedArgument");
+        if (elemList != null && elemList.size() > 0) {            
+            argument = (Element)elemList.get(0);
+        }
+        
+        elemList = DOMUtils.findAllElementsByTagNameNS(element, 
+                                                       Tool.TOOL_SPEC_PUBLIC_ID, 
+                                                       "annotation");
+        if (elemList != null && elemList.size() > 0) {            
+            annotation = (Element)elemList.get(0);
         }
 
         if (annotation == null && argument != null) {
-            list = argument.getElementsByTagNameNS(Tool.TOOL_SPEC_PUBLIC_ID, "annotation");
-            if (list != null && list.getLength() > 0) {
-                annotation = (Element)list.item(0);
+            elemList =  DOMUtils.findAllElementsByTagNameNS(argument, Tool.TOOL_SPEC_PUBLIC_ID,
"annotation");
+
+            if (elemList != null && elemList.size() > 0) {
+                annotation = (Element)elemList.get(0);
             }
         }
     }
@@ -85,13 +91,14 @@
         }
 
         // go through each switch to see if we can match one to the arg.
-        NodeList switches = element.getElementsByTagNameNS(Tool.TOOL_SPEC_PUBLIC_ID, "switch");
+        List<Element> switches = 
+            DOMUtils.findAllElementsByTagNameNS(element, Tool.TOOL_SPEC_PUBLIC_ID, "switch");
 
         boolean accepted = false;
 
-        for (int i = 0; i < switches.getLength(); i++) {
+        for (Element switchElem : switches) {
 
-            String switchArg = "-" + switches.item(i).getFirstChild().getNodeValue();
+            String switchArg = "-" + switchElem.getFirstChild().getNodeValue();
             if (LOG.isLoggable(Level.FINE)) {
                 LOG.fine("switchArg is " + switchArg);
             }
@@ -152,11 +159,14 @@
     }
 
     private boolean hasInvalidCharacter(String argValue) {
-        NodeList list = argument.getElementsByTagNameNS(Tool.TOOL_SPEC_PUBLIC_ID, "valuetype");
+        
+        List<Element> list = 
+            DOMUtils.findAllElementsByTagNameNS(argument, Tool.TOOL_SPEC_PUBLIC_ID, "valuetype");
+        //NodeList list = argument.getElementsByTagNameNS(Tool.TOOL_SPEC_PUBLIC_ID, "valuetype");
         String valuetypeStr = null;
 
-        if (list != null && list.getLength() > 0) {
-            valueType = (Element)list.item(0);
+        if (list != null && list.size() > 0) {
+            valueType = (Element)list.get(0);
             valuetypeStr = valueType.getFirstChild().getNodeValue();
 
             if ("IdentifyString".equals(valuetypeStr)) {
@@ -176,10 +186,14 @@
     
     private boolean isInEnumArgumentValue(String argValue) {
         boolean result = true;
-        NodeList list = argument.getElementsByTagNameNS(Tool.TOOL_SPEC_PUBLIC_ID, "valueenum");
-        if (list != null && list.getLength() == 1) {
+        List<Element> list = 
+            DOMUtils.findAllElementsByTagNameNS(argument, Tool.TOOL_SPEC_PUBLIC_ID, "valueenum");
+        
+        
+        //NodeList list = argument.getElementsByTagNameNS(Tool.TOOL_SPEC_PUBLIC_ID, "valueenum");
+        if (list != null && list.size() == 1) {
             result = false;
-            String enumValue = list.item(0).getTextContent();
+            String enumValue = list.get(0).getTextContent();
             StringTokenizer stk = new StringTokenizer(enumValue, VALUE_ENUM_SEPARATOR);
             if (stk.countTokens() <= 0) {
                 return result;
@@ -274,11 +288,14 @@
     }
 
     public String getPrimarySwitch() {
-        NodeList switches = element.getElementsByTagNameNS(Tool.TOOL_SPEC_PUBLIC_ID, "switch");
+        //NodeList switches = element.getElementsByTagNameNS(Tool.TOOL_SPEC_PUBLIC_ID, "switch");
+        
+        List<Element> switches = 
+            DOMUtils.findAllElementsByTagNameNS(element, Tool.TOOL_SPEC_PUBLIC_ID, "switch");
 
         // options must have atleast one switch, as enforced by schema, so no
         // need for defensive coding.
-        return switches.item(0).getFirstChild().getNodeValue();
+        return switches.get(0).getFirstChild().getNodeValue();
     }
 
     public String toString() {

Modified: cxf/branches/2.0.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/parser/OptionGroup.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/parser/OptionGroup.java?rev=735831&r1=735830&r2=735831&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/parser/OptionGroup.java
(original)
+++ cxf/branches/2.0.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/parser/OptionGroup.java
Mon Jan 19 13:26:18 2009
@@ -26,9 +26,9 @@
 import java.util.logging.Logger;
 
 import org.w3c.dom.Element;
-import org.w3c.dom.NodeList;
 
 import org.apache.cxf.common.logging.LogUtils;
+import org.apache.cxf.helpers.DOMUtils;
 import org.apache.cxf.tools.common.toolspec.Tool;
 
 public class OptionGroup implements TokenConsumer {
@@ -40,10 +40,13 @@
 
     public OptionGroup(Element el) {
         this.element = el;
-        NodeList optionEls = element.getElementsByTagNameNS(Tool.TOOL_SPEC_PUBLIC_ID, "option");
-
-        for (int i = 0; i < optionEls.getLength(); i++) {
-            options.add(new Option((Element)optionEls.item(i)));
+        
+        List<Element> optionEls = 
+            DOMUtils.findAllElementsByTagNameNS(element, 
+                                                Tool.TOOL_SPEC_PUBLIC_ID, 
+                                                "option");        
+        for (Element elem : optionEls) {
+            options.add(new Option(elem));
         }
     }
 



Mime
View raw message