You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by ve...@apache.org on 2015/06/28 22:30:26 UTC
svn commit: r1688064 - in /webservices/axiom/trunk:
aspects/fom-aspects/src/main/java/org/apache/axiom/fom/
implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/
Author: veithen
Date: Sun Jun 28 20:30:25 2015
New Revision: 1688064
URL: http://svn.apache.org/r1688064
Log:
More duplicate code reduction in FOM implementation.
Modified:
webservices/axiom/trunk/aspects/fom-aspects/src/main/java/org/apache/axiom/fom/AbderaNode.java
webservices/axiom/trunk/aspects/fom-aspects/src/main/java/org/apache/axiom/fom/AbderaNodeSupport.aj
webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMCDATASection.java
webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMCharacterData.java
webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMComment.java
webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMElement.java
webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMProcessingInstruction.java
Modified: webservices/axiom/trunk/aspects/fom-aspects/src/main/java/org/apache/axiom/fom/AbderaNode.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/fom-aspects/src/main/java/org/apache/axiom/fom/AbderaNode.java?rev=1688064&r1=1688063&r2=1688064&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/fom-aspects/src/main/java/org/apache/axiom/fom/AbderaNode.java (original)
+++ webservices/axiom/trunk/aspects/fom-aspects/src/main/java/org/apache/axiom/fom/AbderaNode.java Sun Jun 28 20:30:25 2015
@@ -18,8 +18,8 @@
*/
package org.apache.axiom.fom;
-import org.apache.abdera.factory.Factory;
+import org.apache.axiom.core.CoreNode;
+
+public interface AbderaNode extends CoreNode {
-public interface AbderaNode {
- Factory getFactory();
}
Modified: webservices/axiom/trunk/aspects/fom-aspects/src/main/java/org/apache/axiom/fom/AbderaNodeSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/fom-aspects/src/main/java/org/apache/axiom/fom/AbderaNodeSupport.aj?rev=1688064&r1=1688063&r2=1688064&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/fom-aspects/src/main/java/org/apache/axiom/fom/AbderaNodeSupport.aj (original)
+++ webservices/axiom/trunk/aspects/fom-aspects/src/main/java/org/apache/axiom/fom/AbderaNodeSupport.aj Sun Jun 28 20:30:25 2015
@@ -18,14 +18,19 @@
*/
package org.apache.axiom.fom;
+import org.apache.abdera.factory.Factory;
import org.apache.abdera.model.Element;
public aspect AbderaNodeSupport {
+ public final Factory AbderaNode.getFactory() {
+ return (Factory)coreGetNodeFactory();
+ }
+
public final Element AbderaNode.getWrapped(Element internal) {
if (internal == null) {
return null;
} else {
- AbderaFactory factory = (AbderaFactory)getFactory();
+ AbderaFactory factory = (AbderaFactory)coreGetNodeFactory();
return factory.getElementWrapper(internal);
}
}
Modified: webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMCDATASection.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMCDATASection.java?rev=1688064&r1=1688063&r2=1688064&view=diff
==============================================================================
--- webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMCDATASection.java (original)
+++ webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMCDATASection.java Sun Jun 28 20:30:25 2015
@@ -54,10 +54,6 @@ public class FOMCDATASection extends CDA
return (T)((parent instanceof Element) ? getWrapped((Element)parent) : parent);
}
- public Factory getFactory() {
- return (Factory)this.getOMFactory();
- }
-
@Override
public String toString() {
return getText();
Modified: webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMCharacterData.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMCharacterData.java?rev=1688064&r1=1688063&r2=1688064&view=diff
==============================================================================
--- webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMCharacterData.java (original)
+++ webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMCharacterData.java Sun Jun 28 20:30:25 2015
@@ -54,10 +54,6 @@ public class FOMCharacterData extends Ch
return (T)((parent instanceof Element) ? getWrapped((Element)parent) : parent);
}
- public Factory getFactory() {
- return (Factory)this.getOMFactory();
- }
-
@Override
public String toString() {
return getText();
Modified: webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMComment.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMComment.java?rev=1688064&r1=1688063&r2=1688064&view=diff
==============================================================================
--- webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMComment.java (original)
+++ webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMComment.java Sun Jun 28 20:30:25 2015
@@ -48,10 +48,6 @@ public class FOMComment extends OMCommen
return (T)((parent instanceof Element) ? getWrapped((Element)parent) : parent);
}
- public Factory getFactory() {
- return (Factory)this.getOMFactory();
- }
-
public String toString() {
java.io.CharArrayWriter w = new java.io.CharArrayWriter();
try {
Modified: webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMElement.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMElement.java?rev=1688064&r1=1688063&r2=1688064&view=diff
==============================================================================
--- webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMElement.java (original)
+++ webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMElement.java Sun Jun 28 20:30:25 2015
@@ -621,10 +621,6 @@ public class FOMElement extends OMElemen
return el;
}
- public Factory getFactory() {
- return (Factory)this.getOMFactory();
- }
-
// This appears to no longer be necessary with Axiom 1.2
//
// @Override
Modified: webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMProcessingInstruction.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMProcessingInstruction.java?rev=1688064&r1=1688063&r2=1688064&view=diff
==============================================================================
--- webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMProcessingInstruction.java (original)
+++ webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMProcessingInstruction.java Sun Jun 28 20:30:25 2015
@@ -39,10 +39,6 @@ public class FOMProcessingInstruction ex
return (T)((parent instanceof Element) ? getWrapped((Element)parent) : parent);
}
- public Factory getFactory() {
- return (Factory)this.getOMFactory();
- }
-
public String getText() {
return getValue();
}