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/07/18 16:27:56 UTC
svn commit: r1691732 - in /webservices/axiom/trunk:
aspects/core-aspects/src/main/java/org/apache/axiom/core/
aspects/dom-aspects/src/main/java/org/apache/axiom/dom/
aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/factory/
implementati...
Author: veithen
Date: Sat Jul 18 14:27:56 2015
New Revision: 1691732
URL: http://svn.apache.org/r1691732
Log:
Simplify the processing instruction constructors.
Modified:
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/NodeFactory.java
webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMDocumentSupport.aj
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/factory/AxiomNodeFactorySupport.aj
webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/DocumentImpl.java
webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ProcessingInstructionImpl.java
webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/factory/OMDOMFactory.java
webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMProcessingInstructionImpl.java
webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/factory/OMLinkedListImplFactory.java
webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMFactory.java
webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMProcessingInstruction.java
Modified: webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/NodeFactory.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/NodeFactory.java?rev=1691732&r1=1691731&r2=1691732&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/NodeFactory.java (original)
+++ webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/NodeFactory.java Sat Jul 18 14:27:56 2015
@@ -25,4 +25,5 @@ public interface NodeFactory {
CoreNSUnawareAttribute createAttribute(CoreDocument document, String name, String value, String type);
CoreNSAwareAttribute createAttribute(CoreDocument document, String namespaceURI, String localName, String prefix, String value, String type);
CoreNamespaceDeclaration createNamespaceDeclaration(CoreDocument document, String prefix, String namespaceURI);
+ CoreProcessingInstruction createProcessingInstruction();
}
Modified: webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMDocumentSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMDocumentSupport.aj?rev=1691732&r1=1691731&r2=1691732&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMDocumentSupport.aj (original)
+++ webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMDocumentSupport.aj Sat Jul 18 14:27:56 2015
@@ -27,6 +27,7 @@ import org.w3c.dom.DOMException;
import org.w3c.dom.Element;
import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
+import org.w3c.dom.ProcessingInstruction;
import org.w3c.dom.Text;
public aspect DOMDocumentSupport {
@@ -138,4 +139,12 @@ public aspect DOMDocumentSupport {
return (DOMAttribute)coreGetNodeFactory().createAttribute(this, namespaceURI, localName, prefix, null, null);
}
}
+
+ public final ProcessingInstruction DOMDocument.createProcessingInstruction(String target, String data) {
+ DOMProcessingInstruction pi = (DOMProcessingInstruction)coreGetNodeFactory().createProcessingInstruction();
+ pi.coreSetOwnerDocument(this);
+ pi.coreSetTarget(target);
+ pi.coreSetValue(data);
+ return pi;
+ }
}
Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/factory/AxiomNodeFactorySupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/factory/AxiomNodeFactorySupport.aj?rev=1691732&r1=1691731&r2=1691732&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/factory/AxiomNodeFactorySupport.aj (original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/factory/AxiomNodeFactorySupport.aj Sat Jul 18 14:27:56 2015
@@ -24,11 +24,13 @@ import org.apache.axiom.ext.stax.datahan
import org.apache.axiom.om.OMContainer;
import org.apache.axiom.om.OMNamespace;
import org.apache.axiom.om.OMNode;
+import org.apache.axiom.om.OMProcessingInstruction;
import org.apache.axiom.om.OMText;
import org.apache.axiom.om.impl.OMContainerEx;
import org.apache.axiom.om.impl.common.AxiomCDATASection;
import org.apache.axiom.om.impl.common.AxiomCharacterData;
import org.apache.axiom.om.impl.common.AxiomElement;
+import org.apache.axiom.om.impl.common.AxiomProcessingInstruction;
import org.apache.axiom.om.impl.common.AxiomText;
public aspect AxiomNodeFactorySupport {
@@ -144,4 +146,20 @@ public aspect AxiomNodeFactorySupport {
node.setOptimize(optimize);
return node;
}
+
+ public final OMProcessingInstruction AxiomNodeFactory.createOMProcessingInstruction(
+ OMContainer parent, String piTarget, String piData) {
+ return createOMProcessingInstruction(parent, piTarget, piData, false);
+ }
+
+ public final OMProcessingInstruction AxiomNodeFactory.createOMProcessingInstruction(
+ OMContainer parent, String piTarget, String piData, boolean fromBuilder) {
+ AxiomProcessingInstruction node = (AxiomProcessingInstruction)createProcessingInstruction();
+ node.coreSetTarget(piTarget);
+ node.coreSetValue(piData);
+ if (parent != null) {
+ ((OMContainerEx)parent).addChild(node, fromBuilder);
+ }
+ return node;
+ }
}
Modified: webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/DocumentImpl.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/DocumentImpl.java?rev=1691732&r1=1691731&r2=1691732&view=diff
==============================================================================
--- webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/DocumentImpl.java (original)
+++ webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/DocumentImpl.java Sat Jul 18 14:27:56 2015
@@ -137,13 +137,6 @@ public class DocumentImpl extends RootNo
return node;
}
- public ProcessingInstruction createProcessingInstruction(String target,
- String data) throws DOMException {
- ProcessingInstructionImpl pi = new ProcessingInstructionImpl(target, data, getOMFactory());
- pi.coreSetOwnerDocument(this);
- return pi;
- }
-
public DocumentType getDoctype() {
Iterator it = getChildren();
while (it.hasNext()) {
Modified: webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ProcessingInstructionImpl.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ProcessingInstructionImpl.java?rev=1691732&r1=1691731&r2=1691732&view=diff
==============================================================================
--- webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ProcessingInstructionImpl.java (original)
+++ webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ProcessingInstructionImpl.java Sat Jul 18 14:27:56 2015
@@ -24,13 +24,11 @@ import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.impl.common.AxiomProcessingInstruction;
public class ProcessingInstructionImpl extends LeafNode implements DOMProcessingInstruction, AxiomProcessingInstruction {
- public ProcessingInstructionImpl(String target, String value, OMFactory factory) {
+ public ProcessingInstructionImpl(OMFactory factory) {
super(factory);
- coreSetTarget(target);
- coreSetValue(value);
}
ChildNode createClone() {
- return new ProcessingInstructionImpl(coreGetTarget(), coreGetValue(), getOMFactory());
+ return (ChildNode)getOMFactory().createOMProcessingInstruction(null, coreGetTarget(), coreGetValue());
}
}
Modified: webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/factory/OMDOMFactory.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/factory/OMDOMFactory.java?rev=1691732&r1=1691731&r2=1691732&view=diff
==============================================================================
--- webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/factory/OMDOMFactory.java (original)
+++ webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/factory/OMDOMFactory.java Sat Jul 18 14:27:56 2015
@@ -25,6 +25,7 @@ import org.apache.axiom.core.CoreDocumen
import org.apache.axiom.core.CoreNSAwareAttribute;
import org.apache.axiom.core.CoreNSUnawareAttribute;
import org.apache.axiom.core.CoreNamespaceDeclaration;
+import org.apache.axiom.core.CoreProcessingInstruction;
import org.apache.axiom.om.OMAttribute;
import org.apache.axiom.om.OMComment;
import org.apache.axiom.om.OMContainer;
@@ -227,21 +228,6 @@ public class OMDOMFactory implements Axi
return docType;
}
- public OMProcessingInstruction createOMProcessingInstruction(
- OMContainer parent, String piTarget, String piData) {
- return createOMProcessingInstruction(parent, piTarget, piData, false);
- }
-
- public OMProcessingInstruction createOMProcessingInstruction(
- OMContainer parent, String piTarget, String piData, boolean fromBuilder) {
- ProcessingInstructionImpl pi =
- new ProcessingInstructionImpl(piTarget, piData, this);
- if (parent != null) {
- ((OMContainerEx)parent).addChild(pi, fromBuilder);
- }
- return pi;
- }
-
public OMComment createOMComment(OMContainer parent, String content) {
return createOMComment(parent, content, false);
}
@@ -361,4 +347,8 @@ public class OMDOMFactory implements Axi
public final AxiomNamespaceDeclaration createNamespaceDeclaration(OMNamespace namespace) {
return new NamespaceDeclaration(null, namespace, this);
}
+
+ public final CoreProcessingInstruction createProcessingInstruction() {
+ return new ProcessingInstructionImpl(this);
+ }
}
Modified: webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMProcessingInstructionImpl.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMProcessingInstructionImpl.java?rev=1691732&r1=1691731&r2=1691732&view=diff
==============================================================================
--- webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMProcessingInstructionImpl.java (original)
+++ webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMProcessingInstructionImpl.java Sat Jul 18 14:27:56 2015
@@ -26,11 +26,8 @@ import org.apache.axiom.om.OMNode;
import org.apache.axiom.om.impl.common.AxiomProcessingInstruction;
public class OMProcessingInstructionImpl extends OMLeafNode implements AxiomProcessingInstruction {
- public OMProcessingInstructionImpl(OMContainer parentNode, String target,
- String value, OMFactory factory, boolean fromBuilder) {
- super(parentNode, factory, fromBuilder);
- coreSetTarget(target);
- coreSetValue(value);
+ public OMProcessingInstructionImpl(OMFactory factory) {
+ super(factory);
}
OMNode clone(OMCloneOptions options, OMContainer targetParent) {
Modified: webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/factory/OMLinkedListImplFactory.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/factory/OMLinkedListImplFactory.java?rev=1691732&r1=1691731&r2=1691732&view=diff
==============================================================================
--- webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/factory/OMLinkedListImplFactory.java (original)
+++ webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/factory/OMLinkedListImplFactory.java Sat Jul 18 14:27:56 2015
@@ -25,6 +25,7 @@ import org.apache.axiom.core.CoreDocumen
import org.apache.axiom.core.CoreNSAwareAttribute;
import org.apache.axiom.core.CoreNSUnawareAttribute;
import org.apache.axiom.core.CoreNamespaceDeclaration;
+import org.apache.axiom.core.CoreProcessingInstruction;
import org.apache.axiom.om.OMAbstractFactory;
import org.apache.axiom.om.OMAttribute;
import org.apache.axiom.om.OMComment;
@@ -227,24 +228,6 @@ public class OMLinkedListImplFactory imp
}
/**
- * Creates a PI.
- *
- * @param parent
- * @param piTarget
- * @param piData
- * @return Returns OMProcessingInstruction.
- */
- public OMProcessingInstruction createOMProcessingInstruction(OMContainer parent,
- String piTarget, String piData) {
- return createOMProcessingInstruction(parent, piTarget, piData, false);
- }
-
- public OMProcessingInstruction createOMProcessingInstruction(OMContainer parent,
- String piTarget, String piData, boolean fromBuilder) {
- return new OMProcessingInstructionImpl(parent, piTarget, piData, this, fromBuilder);
- }
-
- /**
* Creates a comment.
*
* @param parent
@@ -374,4 +357,8 @@ public class OMLinkedListImplFactory imp
decl.setDeclaredNamespace(namespace);
return decl;
}
+
+ public CoreProcessingInstruction createProcessingInstruction() {
+ return new OMProcessingInstructionImpl(this);
+ }
}
Modified: webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMFactory.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMFactory.java?rev=1691732&r1=1691731&r2=1691732&view=diff
==============================================================================
--- webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMFactory.java (original)
+++ webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMFactory.java Sat Jul 18 14:27:56 2015
@@ -56,6 +56,7 @@ import org.apache.abdera.util.MimeTypeHe
import org.apache.abdera.util.Version;
import org.apache.axiom.core.CoreCDATASection;
import org.apache.axiom.core.CoreCharacterData;
+import org.apache.axiom.core.CoreProcessingInstruction;
import org.apache.axiom.fom.AbderaFactory;
import org.apache.axiom.om.OMAbstractFactory;
import org.apache.axiom.om.OMComment;
@@ -641,11 +642,6 @@ public class FOMFactory extends OMLinked
}
@Override
- public OMProcessingInstruction createOMProcessingInstruction(OMContainer arg0, String arg1, String arg2) {
- return new FOMProcessingInstruction(arg0, arg1, arg2, this, false);
- }
-
- @Override
public CoreCharacterData createCharacterData() {
return new FOMCharacterData(this);
}
@@ -654,4 +650,9 @@ public class FOMFactory extends OMLinked
public CoreCDATASection createCDATASection() {
return new FOMCDATASection(this);
}
+
+ @Override
+ public CoreProcessingInstruction createProcessingInstruction() {
+ return new FOMProcessingInstruction(this);
+ }
}
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=1691732&r1=1691731&r2=1691732&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 Sat Jul 18 14:27:56 2015
@@ -25,10 +25,8 @@ import org.apache.axiom.om.impl.llom.OMP
@SuppressWarnings("unchecked")
public class FOMProcessingInstruction extends OMProcessingInstructionImpl implements AbderaProcessingInstruction {
-
- public FOMProcessingInstruction(OMContainer parent, String target, String value,
- OMFactory factory, boolean fromBuilder) {
- super(parent, target, value, factory, fromBuilder);
+ FOMProcessingInstruction(OMFactory factory) {
+ super(factory);
}
public String toString() {