Author: veithen
Date: Sat Jun 20 23:41:25 2015
New Revision: 1686676
URL: http://svn.apache.org/r1686676
Log:
Implement getLocalName in a more sensible way.
Modified:
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomNamedInformationItemSupport.aj
webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap11/SOAP11FaultCodeImpl.java
webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap11/SOAP11FaultReasonImpl.java
webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMSourcedElementImpl.java
webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap11/SOAP11FaultCodeImpl.java
webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap11/SOAP11FaultReasonImpl.java
Modified:
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomNamedInformationItemSupport.aj
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomNamedInformationItemSupport.aj?rev=1686676&r1=1686675&r2=1686676&view=diff
==============================================================================
---
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomNamedInformationItemSupport.aj
(original)
+++
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomNamedInformationItemSupport.aj
Sat Jun 20 23:41:25 2015
@@ -86,8 +86,8 @@ public aspect AxiomNamedInformationItemS
}
}
- public String AxiomNamedInformationItem.getLocalName() {
- return localName;
+ public final String AxiomNamedInformationItem.getLocalName() {
+ return coreGetLocalName();
}
public void AxiomNamedInformationItem.setLocalName(String localName) {
@@ -171,8 +171,15 @@ public aspect AxiomNamedInformationItemS
return namespace == null ? "" : namespace.getPrefix();
}
+ public void AxiomNamedInformationItem.updateLocalName() {
+ throw new IllegalStateException();
+ }
+
public final String AxiomNamedInformationItem.coreGetLocalName() {
- return getLocalName();
+ if (localName == null) {
+ updateLocalName();
+ }
+ return localName;
}
public final void AxiomNamedInformationItem.coreSetPrefix(String prefix) {
Modified:
webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap11/SOAP11FaultCodeImpl.java
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap11/SOAP11FaultCodeImpl.java?rev=1686676&r1=1686675&r2=1686676&view=diff
==============================================================================
---
webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap11/SOAP11FaultCodeImpl.java
(original)
+++
webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap11/SOAP11FaultCodeImpl.java
Sat Jun 20 23:41:25 2015
@@ -25,7 +25,6 @@ import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMNamespace;
import org.apache.axiom.om.OMXMLParserWrapper;
import org.apache.axiom.om.impl.dom.ParentNode;
-import org.apache.axiom.soap.SOAP11Constants;
import org.apache.axiom.soap.SOAPFactory;
import org.apache.axiom.soap.SOAPFault;
import org.apache.axiom.soap.SOAPFaultSubCode;
@@ -65,10 +64,6 @@ public class SOAP11FaultCodeImpl extends
}
}
- public String getLocalName() {
- return SOAP11Constants.SOAP_FAULT_CODE_LOCAL_NAME;
- }
-
public SOAPFaultValue getValue() {
return null;
}
Modified:
webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap11/SOAP11FaultReasonImpl.java
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap11/SOAP11FaultReasonImpl.java?rev=1686676&r1=1686675&r2=1686676&view=diff
==============================================================================
---
webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap11/SOAP11FaultReasonImpl.java
(original)
+++
webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap11/SOAP11FaultReasonImpl.java
Sat Jun 20 23:41:25 2015
@@ -25,7 +25,6 @@ import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMNamespace;
import org.apache.axiom.om.OMXMLParserWrapper;
import org.apache.axiom.om.impl.dom.ParentNode;
-import org.apache.axiom.soap.SOAP11Constants;
import org.apache.axiom.soap.SOAPFactory;
import org.apache.axiom.soap.SOAPFault;
import org.apache.axiom.soap.SOAPFaultText;
@@ -58,10 +57,6 @@ public class SOAP11FaultReasonImpl exten
}
}
- public String getLocalName() {
- return SOAP11Constants.SOAP_FAULT_STRING_LOCAL_NAME;
- }
-
public SOAPFaultText getFirstSOAPText() {
throw new UnsupportedOperationException("getFirstSOAPText() not
supported for SOAP 1.1!");
}
Modified:
webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMSourcedElementImpl.java
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMSourcedElementImpl.java?rev=1686676&r1=1686675&r2=1686676&view=diff
==============================================================================
---
webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMSourcedElementImpl.java
(original)
+++
webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMSourcedElementImpl.java
Sat Jun 20 23:41:25 2015
@@ -352,21 +352,14 @@ public class OMSourcedElementImpl extend
}
}
- private void ensureLocalNameSet() {
+ public final void updateLocalName() {
+ if (dataSource instanceof QNameAwareOMDataSource) {
+
internalSetLocalName(((QNameAwareOMDataSource)dataSource).getLocalName());
+ }
if (internalGetLocalName() == null) {
- if (dataSource instanceof QNameAwareOMDataSource) {
-
internalSetLocalName(((QNameAwareOMDataSource)dataSource).getLocalName());
- }
- if (internalGetLocalName() == null) {
- forceExpand();
- }
+ forceExpand();
}
}
-
- public String getLocalName() {
- ensureLocalNameSet();
- return super.getLocalName();
- }
public void setLocalName(String localName) {
// Need to expand the element so that the method actually overrides
the the local name
Modified:
webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap11/SOAP11FaultCodeImpl.java
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap11/SOAP11FaultCodeImpl.java?rev=1686676&r1=1686675&r2=1686676&view=diff
==============================================================================
---
webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap11/SOAP11FaultCodeImpl.java
(original)
+++
webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap11/SOAP11FaultCodeImpl.java
Sat Jun 20 23:41:25 2015
@@ -63,10 +63,6 @@ public class SOAP11FaultCodeImpl extends
}
}
- public String getLocalName() {
- return SOAP11Constants.SOAP_FAULT_CODE_LOCAL_NAME;
- }
-
public SOAPFaultValue getValue() {
return null;
}
Modified:
webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap11/SOAP11FaultReasonImpl.java
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap11/SOAP11FaultReasonImpl.java?rev=1686676&r1=1686675&r2=1686676&view=diff
==============================================================================
---
webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap11/SOAP11FaultReasonImpl.java
(original)
+++
webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap11/SOAP11FaultReasonImpl.java
Sat Jun 20 23:41:25 2015
@@ -21,7 +21,6 @@ package org.apache.axiom.soap.impl.llom.
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMXMLParserWrapper;
-import org.apache.axiom.soap.SOAP11Constants;
import org.apache.axiom.soap.SOAPFactory;
import org.apache.axiom.soap.SOAPFault;
import org.apache.axiom.soap.SOAPFaultText;
@@ -60,8 +59,4 @@ public class SOAP11FaultReasonImpl exten
"Expecting SOAP11FaultImpl, got " + parent.getClass());
}
}
-
- public String getLocalName() {
- return SOAP11Constants.SOAP_FAULT_STRING_LOCAL_NAME;
- }
}
