Author: chinthaka
Date: Fri Dec 1 08:18:49 2006
New Revision: 481274
URL: http://svn.apache.org/viewvc?view=rev&rev=481274
Log:
Removing un-necessary repeated method calls in api module
Removed:
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/OMFactoryException.java
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/OMOutputFormat.java
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/impl/traverse/OMChildrenQNameIterator.java
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/xpath/DocumentNavigator.java
webservices/commons/trunk/modules/axiom/project.properties
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/OMOutputFormat.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/OMOutputFormat.java?view=diff&rev=481274&r1=481273&r2=481274
==============================================================================
---
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/OMOutputFormat.java
(original)
+++
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/OMOutputFormat.java
Fri Dec 1 08:18:49 2006
@@ -57,21 +57,21 @@
}
public String getContentType() {
- String SOAPContentType;
+ String soapContentType;
if (isSoap11) {
- SOAPContentType = SOAP11Constants.SOAP_11_CONTENT_TYPE;
+ soapContentType = SOAP11Constants.SOAP_11_CONTENT_TYPE;
} else {
- SOAPContentType = SOAP12Constants.SOAP_12_CONTENT_TYPE;
+ soapContentType = SOAP12Constants.SOAP_12_CONTENT_TYPE;
}
// MTOM is given priority
if (isOptimized()) {
- return this.getContentTypeForMTOM(SOAPContentType);
+ return this.getContentTypeForMTOM(soapContentType);
} else if (isDoingSWA())
{
- return this.getContentTypeForSwA(SOAPContentType);
+ return this.getContentTypeForSwA(soapContentType);
}
else {
- return SOAPContentType;
+ return soapContentType;
}
}
@@ -162,9 +162,9 @@
sb.append("; ");
sb.append("type=\""+MTOMConstants.MTOM_TYPE+"\"");
sb.append("; ");
- sb.append("start=\"<" + getRootContentId() + ">\"");
+ sb.append("start=\"<").append(getRootContentId()).append(">\"");
sb.append("; ");
- sb.append("start-info=\""+SOAPContentType+"\"");
+ sb.append("start-info=\"").append(SOAPContentType).append("\"");
return sb.toString();
}
@@ -174,10 +174,10 @@
sb.append("; ");
sb.append("boundary=");
sb.append(getMimeBoundary());
- sb.append("; ");
- sb.append("type=\""+SOAPContentType+"\"");
sb.append("; ");
- sb.append("start=\"<" + getRootContentId() + ">\"");
+ sb.append("type=\"").append(SOAPContentType).append("\"");
+ sb.append("; ");
+ sb.append("start=\"<").append(getRootContentId()).append(">\"");
return sb.toString();
}
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/impl/traverse/OMChildrenQNameIterator.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/impl/traverse/OMChildrenQNameIterator.java?view=diff&rev=481274&r1=481273&r2=481274
==============================================================================
---
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/impl/traverse/OMChildrenQNameIterator.java
(original)
+++
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/impl/traverse/OMChildrenQNameIterator.java
Fri Dec 1 08:18:49 2006
@@ -120,22 +120,24 @@
}
// if the given localname is null, whatever value this.qname has, its
a match. But can one give a QName without a localName ??
+ String localPart = qNameToBeMatched.getLocalPart();
boolean localNameMatch =
- (qNameToBeMatched.getLocalPart() == null)
- || (qNameToBeMatched.getLocalPart() == "")
+ (localPart == null)
+ || (localPart.equals(""))
||
((elementQName != null)
&&
elementQName.getLocalPart().equalsIgnoreCase(
- qNameToBeMatched.getLocalPart()));
+ localPart));
+ String namespaceURI = qNameToBeMatched.getNamespaceURI();
boolean namespaceURIMatch =
- (qNameToBeMatched.getNamespaceURI() == null)
- || (qNameToBeMatched.getNamespaceURI() == "")
+ (namespaceURI == null)
+ || (namespaceURI.equals(""))
||
((elementQName != null)
&&
elementQName.getNamespaceURI().equalsIgnoreCase(
- qNameToBeMatched.getNamespaceURI()));
+ namespaceURI));
return localNameMatch && namespaceURIMatch;
}
}
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/xpath/DocumentNavigator.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/xpath/DocumentNavigator.java?view=diff&rev=481274&r1=481273&r2=481274
==============================================================================
---
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/xpath/DocumentNavigator.java
(original)
+++
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/xpath/DocumentNavigator.java
Fri Dec 1 08:18:49 2006
@@ -67,13 +67,14 @@
public String getElementQName(Object object) {
OMElement attr = (OMElement) object;
String prefix = null;
- if (attr.getNamespace() != null) {
- prefix = attr.getNamespace().getPrefix();
+ OMNamespace namespace = attr.getNamespace();
+ if (namespace != null) {
+ prefix = namespace.getPrefix();
}
if (prefix == null || "".equals(prefix)) {
return attr.getQName().getLocalPart();
}
- return prefix + ":" + attr.getNamespace().getNamespaceURI();
+ return prefix + ":" + namespace.getNamespaceURI();
}
/**
Modified: webservices/commons/trunk/modules/axiom/project.properties
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/project.properties?view=diff&rev=481274&r1=481273&r2=481274
==============================================================================
--- webservices/commons/trunk/modules/axiom/project.properties (original)
+++ webservices/commons/trunk/modules/axiom/project.properties Fri Dec 1
08:18:49 2006
@@ -19,7 +19,7 @@
# -------------------------------------------------------------------
# Project Information
# -------------------------------------------------------------------
-axiom.version=1.2.1-SNAPSHOT
+axiom.version=1.2-SNAPSHOT
# -------------------------------------------------------------------
# Dependency Repositories
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
