svn commit: r352058 - in /incubator/woden/java/src/org/apache/woden/internal: DOMWSDLReader.java util/dom/QNameUtils.java

[jkaputin]

Author: jkaputin
Date: Sat Dec  3 17:09:23 2005
New Revision: 352058

URL: http://svn.apache.org/viewcvs?rev=352058&view=rev
Log:
Removed 2 redundant methods from QNameUtils that simply
duplicate the behaviour of the QName ctors and changed
references in DOMWSDLReader to use the QName ctors
instead.

Modified:
    incubator/woden/java/src/org/apache/woden/internal/DOMWSDLReader.java
    incubator/woden/java/src/org/apache/woden/internal/util/dom/QNameUtils.java

Modified: incubator/woden/java/src/org/apache/woden/internal/DOMWSDLReader.java
URL: 
http://svn.apache.org/viewcvs/incubator/woden/java/src/org/apache/woden/internal/DOMWSDLReader.java?rev=352058&r1=352057&r2=352058&view=diff
==============================================================================
--- incubator/woden/java/src/org/apache/woden/internal/DOMWSDLReader.java 
(original)
+++ incubator/woden/java/src/org/apache/woden/internal/DOMWSDLReader.java Sat 
Dec  3 17:09:23 2005
@@ -487,8 +487,7 @@
         
         if(name != null)
         {
-            QName qname = 
QNameUtils.newQName(desc.getTargetNamespace().toString(), 
-                                              name);
+            QName qname = new QName(desc.getTargetNamespace().toString(), 
name);
             intface.setName(qname);
         }
         else
@@ -577,7 +576,7 @@
         
         if(name != null)
         {
-            QName qname = 
QNameUtils.newQName(desc.getTargetNamespace().toString(), name);
+            QName qname = new QName(desc.getTargetNamespace().toString(), 
name);
             fault.setName(qname);
         }
         else
@@ -644,7 +643,7 @@
         String name = DOMUtils.getAttribute(operEl, Constants.ATTR_NAME);
         if(name != null)
         {
-            QName qname = 
QNameUtils.newQName(desc.getTargetNamespace().toString(), name);
+            QName qname = new QName(desc.getTargetNamespace().toString(), 
name);
             oper.setName(qname);
         }
         else
@@ -898,8 +897,7 @@
         String name = DOMUtils.getAttribute(bindEl, Constants.ATTR_NAME);
         if(name != null)
         {
-            QName qname = 
QNameUtils.newQName(desc.getTargetNamespace().toString(), 
-                                              name);
+            QName qname = new QName(desc.getTargetNamespace().toString(), 
name);
             binding.setName(qname);
         }
         

Modified: 
incubator/woden/java/src/org/apache/woden/internal/util/dom/QNameUtils.java
URL: 
http://svn.apache.org/viewcvs/incubator/woden/java/src/org/apache/woden/internal/util/dom/QNameUtils.java?rev=352058&r1=352057&r2=352058&view=diff
==============================================================================
--- incubator/woden/java/src/org/apache/woden/internal/util/dom/QNameUtils.java 
(original)
+++ incubator/woden/java/src/org/apache/woden/internal/util/dom/QNameUtils.java 
Sat Dec  3 17:09:23 2005
@@ -71,24 +71,4 @@
       return qname;
   }
   
-  /*
-   * Return a new QName created with the specified namespace and localPart and
-   * a prefix of "".
-   */
-  public static QName newQName(String namespace, String localPart)
-  {
-      return newQName(namespace != null ? namespace : emptyString, localPart, 
emptyString);
-  }
-  
-  /*
-   * Return a new QName created with the specified namespace, localPart and 
prefix, but
-   * with null namespace or prefix defaulting to the empty string. Let the 
QName
-   * constructor handle a null localPart.
-   */
-  public static QName newQName(String namespace, String localPart, String 
prefix)
-  {
-      return new QName(namespace != null ? namespace : emptyString, 
-                       localPart,
-                       prefix != null ? prefix : emptyString); 
-  }
 }



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]