Author: veithen
Date: Mon Jun 22 18:13:34 2015
New Revision: 1686909
URL: http://svn.apache.org/r1686909
Log:
Unify the SOAPFaultRole code, eliminating some unnecessary code in DOOM.
Added:
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/AxiomSOAPFaultRoleSupport.aj
(with props)
Modified:
webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/SOAPFaultRoleImpl.java
webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPFaultRoleImpl.java
Added:
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/AxiomSOAPFaultRoleSupport.aj
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/AxiomSOAPFaultRoleSupport.aj?rev=1686909&view=auto
==============================================================================
---
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/AxiomSOAPFaultRoleSupport.aj
(added)
+++
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/AxiomSOAPFaultRoleSupport.aj
Mon Jun 22 18:13:34 2015
@@ -0,0 +1,29 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.axiom.soap.impl.common;
+
+public aspect AxiomSOAPFaultRoleSupport {
+ public final void AxiomSOAPFaultRole.setRoleValue(String uri) {
+ setText(uri);
+ }
+
+ public final String AxiomSOAPFaultRole.getRoleValue() {
+ return getText();
+ }
+}
Propchange:
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/AxiomSOAPFaultRoleSupport.aj
------------------------------------------------------------------------------
svn:eol-style = native
Modified:
webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/SOAPFaultRoleImpl.java
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/SOAPFaultRoleImpl.java?rev=1686909&r1=1686908&r2=1686909&view=diff
==============================================================================
---
webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/SOAPFaultRoleImpl.java
(original)
+++
webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/SOAPFaultRoleImpl.java
Mon Jun 22 18:13:34 2015
@@ -25,11 +25,11 @@ import org.apache.axiom.om.OMXMLParserWr
import org.apache.axiom.om.impl.dom.ParentNode;
import org.apache.axiom.soap.SOAPFactory;
import org.apache.axiom.soap.SOAPFault;
-import org.apache.axiom.soap.SOAPFaultRole;
import org.apache.axiom.soap.SOAPProcessingException;
+import org.apache.axiom.soap.impl.common.AxiomSOAPFaultRole;
public abstract class SOAPFaultRoleImpl extends SOAPElement implements
- SOAPFaultRole {
+ AxiomSOAPFaultRole {
public SOAPFaultRoleImpl(SOAPFault parent,
String localName,
@@ -42,15 +42,4 @@ public abstract class SOAPFaultRoleImpl
OMXMLParserWrapper builder, OMFactory factory, boolean
generateNSDecl) {
super(parentNode,
((SOAPFactory)factory).getSOAPVersion().getFaultRoleQName().getLocalPart(), ns,
builder, factory, generateNSDecl);
}
-
- public void setRoleValue(String uri) {
- if (getFirstOMChildIfAvailable() != null) {
- getFirstOMChildIfAvailable().detach();
- }
- this.setText(uri);
- }
-
- public String getRoleValue() {
- return this.getText();
- }
}
Modified:
webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPFaultRoleImpl.java
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPFaultRoleImpl.java?rev=1686909&r1=1686908&r2=1686909&view=diff
==============================================================================
---
webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPFaultRoleImpl.java
(original)
+++
webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPFaultRoleImpl.java
Mon Jun 22 18:13:34 2015
@@ -27,9 +27,10 @@ import org.apache.axiom.om.OMXMLParserWr
import org.apache.axiom.soap.SOAPFactory;
import org.apache.axiom.soap.SOAPFault;
import org.apache.axiom.soap.SOAPProcessingException;
+import org.apache.axiom.soap.impl.common.AxiomSOAPFaultRole;
public abstract class SOAPFaultRoleImpl extends SOAPElement
- implements org.apache.axiom.soap.SOAPFaultRole {
+ implements AxiomSOAPFaultRole {
protected SOAPFaultRoleImpl(OMNamespace ns, SOAPFactory factory) {
super(factory.getSOAPVersion().getFaultRoleQName().getLocalPart(), ns,
factory);
@@ -52,14 +53,6 @@ public abstract class SOAPFaultRoleImpl
factory);
}
- public void setRoleValue(String uri) {
- this.setText(uri);
- }
-
- public String getRoleValue() {
- return this.getText();
- }
-
protected OMElement createClone(OMCloneOptions options, OMContainer
targetParent) {
return
((SOAPFactory)getOMFactory()).createSOAPFaultRole((SOAPFault)targetParent);
}
