ws-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From veit...@apache.org
Subject svn commit: r1697834 - in /webservices/axiom/trunk/implementations: axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/factory/ fom-impl/src/main/java/org/apache/abdera/parser/stax/
Date Wed, 26 Aug 2015 07:31:57 GMT
Author: veithen
Date: Wed Aug 26 07:31:56 2015
New Revision: 1697834

URL: http://svn.apache.org/r1697834
Log:
Simplify the FOMElement constructors.

Modified:
    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/FOMCategories.java
    webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMCategory.java
    webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMCollection.java
    webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMContent.java
    webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMControl.java
    webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMDateTime.java
    webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMDiv.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/FOMEntry.java
    webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMExtensibleElement.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/FOMFeed.java
    webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMGenerator.java
    webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMIRI.java
    webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMLink.java
    webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMMultipartCollection.java
    webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMPerson.java
    webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMService.java
    webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMSource.java
    webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMText.java
    webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMWorkspace.java

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=1697834&r1=1697833&r2=1697834&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
Wed Aug 26 07:31:56 2015
@@ -295,7 +295,7 @@ public class OMLinkedListImplFactory imp
         return new CDATASectionImpl(this);
     }
 
-    public final <T extends CoreNSAwareElement> T createNSAwareElement(Class<T>
type) {
+    public <T extends CoreNSAwareElement> T createNSAwareElement(Class<T> type)
{
         CoreNSAwareElement element;
         if (type == AxiomElement.class) {
             element = new OMElementImpl(this);

Modified: webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMCategories.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMCategories.java?rev=1697834&r1=1697833&r2=1697834&view=diff
==============================================================================
--- webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMCategories.java
(original)
+++ webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMCategories.java
Wed Aug 26 07:31:56 2015
@@ -30,7 +30,6 @@ import org.apache.axiom.fom.AbderaCatego
 import org.apache.axiom.om.OMContainer;
 import org.apache.axiom.om.OMElement;
 import org.apache.axiom.om.OMFactory;
-import org.apache.axiom.om.OMXMLParserWrapper;
 
 public class FOMCategories extends FOMExtensibleElement implements AbderaCategories {
     protected FOMCategories(QName qname, OMContainer parent, OMFactory factory) {
@@ -38,8 +37,8 @@ public class FOMCategories extends FOMEx
         init();
     }
 
-    protected FOMCategories(String localName, OMContainer parent, OMFactory factory, OMXMLParserWrapper
builder) {
-        super(localName, parent, factory, builder);
+    protected FOMCategories(OMFactory factory) {
+        super(factory);
     }
 
     private void init() {

Modified: webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMCategory.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMCategory.java?rev=1697834&r1=1697833&r2=1697834&view=diff
==============================================================================
--- webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMCategory.java
(original)
+++ webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMCategory.java
Wed Aug 26 07:31:56 2015
@@ -25,15 +25,14 @@ import org.apache.abdera.model.Element;
 import org.apache.axiom.fom.AbderaCategory;
 import org.apache.axiom.om.OMContainer;
 import org.apache.axiom.om.OMFactory;
-import org.apache.axiom.om.OMXMLParserWrapper;
 
 public class FOMCategory extends FOMExtensibleElement implements AbderaCategory {
     protected FOMCategory(QName qname, OMContainer parent, OMFactory factory) {
         super(qname, parent, factory);
     }
 
-    protected FOMCategory(String localName, OMContainer parent, OMFactory factory, OMXMLParserWrapper
builder) {
-        super(localName, parent, factory, builder);
+    protected FOMCategory(OMFactory factory) {
+        super(factory);
     }
 
     public String getTerm() {

Modified: webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMCollection.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMCollection.java?rev=1697834&r1=1697833&r2=1697834&view=diff
==============================================================================
--- webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMCollection.java
(original)
+++ webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMCollection.java
Wed Aug 26 07:31:56 2015
@@ -35,7 +35,6 @@ import org.apache.axiom.fom.AbderaCollec
 import org.apache.axiom.om.OMContainer;
 import org.apache.axiom.om.OMElement;
 import org.apache.axiom.om.OMFactory;
-import org.apache.axiom.om.OMXMLParserWrapper;
 
 @SuppressWarnings("deprecation")
 public class FOMCollection extends FOMExtensibleElement implements AbderaCollection {
@@ -47,8 +46,8 @@ public class FOMCollection extends FOMEx
         super(qname, parent, factory);
     }
 
-    protected FOMCollection(String localName, OMContainer parent, OMFactory factory, OMXMLParserWrapper
builder) {
-        super(localName, parent, factory, builder);
+    protected FOMCollection(OMFactory factory) {
+        super(factory);
     }
 
     public String getTitle() {

Modified: webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMContent.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMContent.java?rev=1697834&r1=1697833&r2=1697834&view=diff
==============================================================================
--- webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMContent.java
(original)
+++ webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMContent.java
Wed Aug 26 07:31:56 2015
@@ -36,7 +36,6 @@ import org.apache.axiom.om.OMElement;
 import org.apache.axiom.om.OMException;
 import org.apache.axiom.om.OMFactory;
 import org.apache.axiom.om.OMNode;
-import org.apache.axiom.om.OMXMLParserWrapper;
 import org.apache.axiom.util.base64.Base64Utils;
 
 @SuppressWarnings("unchecked")
@@ -53,8 +52,8 @@ public class FOMContent extends FOMExten
         setContentType(type);
     }
 
-    protected FOMContent(String localName, OMContainer parent, OMFactory factory, OMXMLParserWrapper
builder) {
-        super(localName, parent, factory, builder);
+    protected FOMContent(OMFactory factory) {
+        super(factory);
     }
 
     public final Type getContentType() {

Modified: webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMControl.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMControl.java?rev=1697834&r1=1697833&r2=1697834&view=diff
==============================================================================
--- webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMControl.java
(original)
+++ webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMControl.java
Wed Aug 26 07:31:56 2015
@@ -23,7 +23,6 @@ import org.apache.abdera.model.Control;
 import org.apache.axiom.fom.AbderaControl;
 import org.apache.axiom.om.OMContainer;
 import org.apache.axiom.om.OMFactory;
-import org.apache.axiom.om.OMXMLParserWrapper;
 
 @SuppressWarnings("deprecation")
 public class FOMControl extends FOMExtensibleElement implements AbderaControl {
@@ -31,8 +30,8 @@ public class FOMControl extends FOMExten
         super(qname, parent, factory);
     }
 
-    protected FOMControl(String localName, OMContainer parent, OMFactory factory, OMXMLParserWrapper
builder) {
-        super(localName, parent, factory, builder);
+    protected FOMControl(OMFactory factory) {
+        super(factory);
     }
 
     public boolean isDraft() {

Modified: webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMDateTime.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMDateTime.java?rev=1697834&r1=1697833&r2=1697834&view=diff
==============================================================================
--- webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMDateTime.java
(original)
+++ webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMDateTime.java
Wed Aug 26 07:31:56 2015
@@ -29,7 +29,6 @@ import org.apache.axiom.fom.AbderaDateTi
 import org.apache.axiom.om.OMContainer;
 import org.apache.axiom.om.OMException;
 import org.apache.axiom.om.OMFactory;
-import org.apache.axiom.om.OMXMLParserWrapper;
 
 public class FOMDateTime extends FOMElement implements AbderaDateTime {
     private AtomDate value;
@@ -38,9 +37,8 @@ public class FOMDateTime extends FOMElem
         super(qname, parent, factory);
     }
 
-    protected FOMDateTime(String localName, OMContainer parent, OMFactory factory, OMXMLParserWrapper
builder)
-        throws OMException {
-        super(localName, parent, factory, builder);
+    protected FOMDateTime(OMFactory factory) {
+        super(factory);
     }
 
     public AtomDate getValue() {

Modified: webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMDiv.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMDiv.java?rev=1697834&r1=1697833&r2=1697834&view=diff
==============================================================================
--- webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMDiv.java
(original)
+++ webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMDiv.java
Wed Aug 26 07:31:56 2015
@@ -32,15 +32,14 @@ import org.apache.axiom.om.OMElement;
 import org.apache.axiom.om.OMException;
 import org.apache.axiom.om.OMFactory;
 import org.apache.axiom.om.OMNode;
-import org.apache.axiom.om.OMXMLParserWrapper;
 
 public class FOMDiv extends FOMExtensibleElement implements AbderaDiv {
     protected FOMDiv(QName qname, OMContainer parent, OMFactory factory) throws OMException
{
         super(qname, parent, factory);
     }
 
-    protected FOMDiv(String localName, OMContainer parent, OMFactory factory, OMXMLParserWrapper
builder) throws OMException {
-        super(localName, parent, factory, builder);
+    protected FOMDiv(OMFactory factory) {
+        super(factory);
     }
 
     public String[] getXhtmlClass() {

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=1697834&r1=1697833&r2=1697834&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
Wed Aug 26 07:31:56 2015
@@ -68,7 +68,6 @@ import org.apache.axiom.om.OMNode;
 import org.apache.axiom.om.OMOutputFormat;
 import org.apache.axiom.om.OMProcessingInstruction;
 import org.apache.axiom.om.OMText;
-import org.apache.axiom.om.OMXMLParserWrapper;
 import org.apache.axiom.om.impl.llom.OMElementImpl;
 
 @SuppressWarnings("unchecked")
@@ -77,8 +76,8 @@ public class FOMElement extends OMElemen
         super(parent, qname.getLocalPart(), getOrCreateNamespace(qname, parent, factory),
null, factory, true);
     }
 
-    protected FOMElement(String localName, OMContainer parent, OMFactory factory, OMXMLParserWrapper
builder) {
-        super(parent, localName, null, builder, factory, false);
+    protected FOMElement(OMFactory factory) {
+        super(factory);
     }
 
     private static OMNamespace getOrCreateNamespace(QName qname, OMContainer parent, OMFactory
factory) {

Modified: webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMEntry.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMEntry.java?rev=1697834&r1=1697833&r2=1697834&view=diff
==============================================================================
--- webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMEntry.java
(original)
+++ webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMEntry.java
Wed Aug 26 07:31:56 2015
@@ -52,7 +52,6 @@ import org.apache.axiom.fom.AbderaEntry;
 import org.apache.axiom.om.OMContainer;
 import org.apache.axiom.om.OMElement;
 import org.apache.axiom.om.OMFactory;
-import org.apache.axiom.om.OMXMLParserWrapper;
 
 @SuppressWarnings( {"unchecked", "deprecation"})
 public class FOMEntry extends FOMExtensibleElement implements AbderaEntry {
@@ -60,8 +59,8 @@ public class FOMEntry extends FOMExtensi
         super(qname, parent, factory);
     }
 
-    protected FOMEntry(String localName, OMContainer parent, OMFactory factory, OMXMLParserWrapper
builder) {
-        super(localName, parent, factory, builder);
+    protected FOMEntry(OMFactory factory) {
+        super(factory);
     }
 
     public Person getAuthor() {

Modified: webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMExtensibleElement.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMExtensibleElement.java?rev=1697834&r1=1697833&r2=1697834&view=diff
==============================================================================
--- webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMExtensibleElement.java
(original)
+++ webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMExtensibleElement.java
Wed Aug 26 07:31:56 2015
@@ -32,7 +32,6 @@ import org.apache.axiom.om.OMContainer;
 import org.apache.axiom.om.OMElement;
 import org.apache.axiom.om.OMException;
 import org.apache.axiom.om.OMFactory;
-import org.apache.axiom.om.OMXMLParserWrapper;
 
 @SuppressWarnings("unchecked")
 public class FOMExtensibleElement extends FOMElement implements AbderaExtensibleElement {
@@ -40,9 +39,8 @@ public class FOMExtensibleElement extend
         super(qname, parent, factory);
     }
 
-    protected FOMExtensibleElement(String localName, OMContainer parent, OMFactory factory,
OMXMLParserWrapper builder)
-        throws OMException {
-        super(localName, parent, factory, builder);
+    protected FOMExtensibleElement(OMFactory factory) {
+        super(factory);
     }
 
     public List<Element> getExtensions() {

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=1697834&r1=1697833&r2=1697834&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
Wed Aug 26 07:31:56 2015
@@ -57,12 +57,14 @@ import org.apache.abdera.util.Version;
 import org.apache.axiom.core.CoreCDATASection;
 import org.apache.axiom.core.CoreCharacterDataNode;
 import org.apache.axiom.core.CoreDocument;
+import org.apache.axiom.core.CoreNSAwareElement;
 import org.apache.axiom.core.CoreProcessingInstruction;
 import org.apache.axiom.fom.AbderaFactory;
 import org.apache.axiom.om.OMAbstractFactory;
 import org.apache.axiom.om.OMComment;
 import org.apache.axiom.om.OMContainer;
 import org.apache.axiom.om.OMElement;
+import org.apache.axiom.om.impl.common.AxiomElement;
 import org.apache.axiom.om.impl.llom.factory.OMLinkedListImplFactory;
 
 @SuppressWarnings( {"unchecked", "deprecation"})
@@ -429,6 +431,53 @@ public class FOMFactory extends OMLinked
         return new FOMDiv(DIV, (OMContainer)parent, this);
     }
 
+    @Override
+    public <T extends CoreNSAwareElement> T createNSAwareElement(Class<T> type)
{
+        CoreNSAwareElement element;
+        if (type == AxiomElement.class || type == FOMElement.class) {
+            element = new FOMElement(this);
+        } else if (type == FOMCategories.class) {
+            element = new FOMCategories(this);
+        } else if (type == FOMCategory.class) {
+            element = new FOMCategory(this);
+        } else if (type == FOMCollection.class) {
+            element = new FOMCollection(this);
+        } else if (type == FOMContent.class) {
+            element = new FOMContent(this);
+        } else if (type == FOMControl.class) {
+            element = new FOMControl(this);
+        } else if (type == FOMDateTime.class) {
+            element = new FOMDateTime(this);
+        } else if (type == FOMDiv.class) {
+            element = new FOMDiv(this);
+        } else if (type == FOMEntry.class) {
+            element = new FOMEntry(this);
+        } else if (type == FOMExtensibleElement.class) {
+            element = new FOMExtensibleElement(this);
+        } else if (type == FOMFeed.class) {
+            element = new FOMFeed(this);
+        } else if (type == FOMGenerator.class) {
+            element = new FOMGenerator(this);
+        } else if (type == FOMIRI.class) {
+            element = new FOMIRI(this);
+        } else if (type == FOMLink.class) {
+            element = new FOMLink(this);
+        } else if (type == FOMPerson.class) {
+            element = new FOMPerson(this);
+        } else if (type == FOMService.class) {
+            element = new FOMService(this);
+        } else if (type == FOMSource.class) {
+            element = new FOMSource(this);
+        } else if (type == FOMText.class) {
+            element = new FOMText(this);
+        } else if (type == FOMWorkspace.class) {
+            element = new FOMWorkspace(this);
+        } else {
+            throw new IllegalArgumentException(type.getName() + " not supported");
+        }
+        return type.cast(element);
+    }
+
     protected FOMElement createElement(QName qname, OMContainer parent) {
         FOMElement element;
         if (FEED.equals(qname)) {
@@ -498,65 +547,65 @@ public class FOMFactory extends OMLinked
     protected OMElement createElementFromBuilder(QName qname, OMContainer parent, FOMBuilder
builder) {
         OMElement element;
         if (FEED.equals(qname)) {
-            element = new FOMFeed(qname.getLocalPart(), parent, this, builder);
+            element = createAxiomElement(FOMFeed.class, parent, qname.getLocalPart(), null,
builder, false);
         } else if (SERVICE.equals(qname) || PRE_RFC_SERVICE.equals(qname)) {
-            element = new FOMService(qname.getLocalPart(), parent, this, builder);
+            element = createAxiomElement(FOMService.class, parent, qname.getLocalPart(),
null, builder, false);
         } else if (ENTRY.equals(qname)) {
-            element = new FOMEntry(qname.getLocalPart(), parent, this, builder);
+            element = createAxiomElement(FOMEntry.class, parent, qname.getLocalPart(), null,
builder, false);
         } else if (AUTHOR.equals(qname)) {
-            element = new FOMPerson(qname.getLocalPart(), parent, this, builder);
+            element = createAxiomElement(FOMPerson.class, parent, qname.getLocalPart(), null,
builder, false);
         } else if (CATEGORY.equals(qname)) {
-            element = new FOMCategory(qname.getLocalPart(), parent, this, builder);
+            element = createAxiomElement(FOMCategory.class, parent, qname.getLocalPart(),
null, builder, false);
         } else if (CONTENT.equals(qname)) {
-            element = new FOMContent(qname.getLocalPart(), parent, this, builder);
+            element = createAxiomElement(FOMContent.class, parent, qname.getLocalPart(),
null, builder, false);
         } else if (CONTRIBUTOR.equals(qname)) {
-            element = new FOMPerson(qname.getLocalPart(), parent, this, builder);
+            element = createAxiomElement(FOMPerson.class, parent, qname.getLocalPart(), null,
builder, false);
         } else if (GENERATOR.equals(qname)) {
-            element = new FOMGenerator(qname.getLocalPart(), parent, this, builder);
+            element = createAxiomElement(FOMGenerator.class, parent, qname.getLocalPart(),
null, builder, false);
         } else if (ICON.equals(qname)) {
-            element = new FOMIRI(qname.getLocalPart(), parent, this, builder);
+            element = createAxiomElement(FOMIRI.class, parent, qname.getLocalPart(), null,
builder, false);
         } else if (ID.equals(qname)) {
-            element = new FOMIRI(qname.getLocalPart(), parent, this, builder);
+            element = createAxiomElement(FOMIRI.class, parent, qname.getLocalPart(), null,
builder, false);
         } else if (LOGO.equals(qname)) {
-            element = new FOMIRI(qname.getLocalPart(), parent, this, builder);
+            element = createAxiomElement(FOMIRI.class, parent, qname.getLocalPart(), null,
builder, false);
         } else if (LINK.equals(qname)) {
-            element = new FOMLink(qname.getLocalPart(), parent, this, builder);
+            element = createAxiomElement(FOMLink.class, parent, qname.getLocalPart(), null,
builder, false);
         } else if (PUBLISHED.equals(qname)) {
-            element = new FOMDateTime(qname.getLocalPart(), parent, this, builder);
+            element = createAxiomElement(FOMDateTime.class, parent, qname.getLocalPart(),
null, builder, false);
         } else if (RIGHTS.equals(qname)) {
-            element = new FOMText(qname.getLocalPart(), parent, this, builder);
+            element = createAxiomElement(FOMText.class, parent, qname.getLocalPart(), null,
builder, false);
         } else if (SOURCE.equals(qname)) {
-            element = new FOMSource(qname.getLocalPart(), parent, this, builder);
+            element = createAxiomElement(FOMSource.class, parent, qname.getLocalPart(), null,
builder, false);
         } else if (SUBTITLE.equals(qname)) {
-            element = new FOMText(qname.getLocalPart(), parent, this, builder);
+            element = createAxiomElement(FOMText.class, parent, qname.getLocalPart(), null,
builder, false);
         } else if (SUMMARY.equals(qname)) {
-            element = new FOMText(qname.getLocalPart(), parent, this, builder);
+            element = createAxiomElement(FOMText.class, parent, qname.getLocalPart(), null,
builder, false);
         } else if (TITLE.equals(qname)) {
-            element = new FOMText(qname.getLocalPart(), parent, this, builder);
+            element = createAxiomElement(FOMText.class, parent, qname.getLocalPart(), null,
builder, false);
         } else if (UPDATED.equals(qname)) {
-            element = new FOMDateTime(qname.getLocalPart(), parent, this, builder);
+            element = createAxiomElement(FOMDateTime.class, parent, qname.getLocalPart(),
null, builder, false);
         } else if (WORKSPACE.equals(qname) || PRE_RFC_WORKSPACE.equals(qname)) {
-            element = new FOMWorkspace(qname.getLocalPart(), parent, this, builder);
+            element = createAxiomElement(FOMWorkspace.class, parent, qname.getLocalPart(),
null, builder, false);
         } else if (COLLECTION.equals(qname) || PRE_RFC_COLLECTION.equals(qname)) {
-            element = new FOMCollection(qname.getLocalPart(), parent, this, builder);
+            element = createAxiomElement(FOMCollection.class, parent, qname.getLocalPart(),
null, builder, false);
         } else if (NAME.equals(qname)) {
-            element = new FOMElement(qname.getLocalPart(), parent, this, builder);
+            element = createAxiomElement(FOMElement.class, parent, qname.getLocalPart(),
null, builder, false);
         } else if (EMAIL.equals(qname)) {
-            element = new FOMElement(qname.getLocalPart(), parent, this, builder);
+            element = createAxiomElement(FOMElement.class, parent, qname.getLocalPart(),
null, builder, false);
         } else if (URI.equals(qname)) {
-            element = new FOMIRI(qname.getLocalPart(), parent, this, builder);
+            element = createAxiomElement(FOMIRI.class, parent, qname.getLocalPart(), null,
builder, false);
         } else if (CONTROL.equals(qname) || PRE_RFC_CONTROL.equals(qname)) {
-            element = new FOMControl(qname.getLocalPart(), parent, this, builder);
+            element = createAxiomElement(FOMControl.class, parent, qname.getLocalPart(),
null, builder, false);
         } else if (DIV.equals(qname)) {
-            element = new FOMDiv(qname.getLocalPart(), parent, this, builder);
+            element = createAxiomElement(FOMDiv.class, parent, qname.getLocalPart(), null,
builder, false);
         } else if (CATEGORIES.equals(qname) || PRE_RFC_CATEGORIES.equals(qname)) {
-            element = new FOMCategories(qname.getLocalPart(), parent, this, builder);
+            element = createAxiomElement(FOMCategories.class, parent, qname.getLocalPart(),
null, builder, false);
         } else if (EDITED.equals(qname) || PRE_RFC_EDITED.equals(qname)) {
-            element = new FOMDateTime(qname.getLocalPart(), parent, this, builder);
+            element = createAxiomElement(FOMDateTime.class, parent, qname.getLocalPart(),
null, builder, false);
         } else if (parent instanceof ExtensibleElement || parent instanceof Document) {
-            element = new FOMExtensibleElement(qname.getLocalPart(), parent, this, builder);
+            element = createAxiomElement(FOMExtensibleElement.class, parent, qname.getLocalPart(),
null, builder, false);
         } else {
-            element = new FOMElement(qname.getLocalPart(), parent, this, builder);
+            element = createAxiomElement(FOMElement.class, parent, qname.getLocalPart(),
null, builder, false);
         }
         if (element instanceof FOMContent) {
             Content.Type type = builder.getContentType();

Modified: webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMFeed.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMFeed.java?rev=1697834&r1=1697833&r2=1697834&view=diff
==============================================================================
--- webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMFeed.java
(original)
+++ webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMFeed.java
Wed Aug 26 07:31:56 2015
@@ -34,15 +34,14 @@ import org.apache.axiom.om.OMContainer;
 import org.apache.axiom.om.OMElement;
 import org.apache.axiom.om.OMFactory;
 import org.apache.axiom.om.OMNode;
-import org.apache.axiom.om.OMXMLParserWrapper;
 
 public class FOMFeed extends FOMSource implements AbderaFeed {
     protected FOMFeed(QName qname, OMContainer parent, OMFactory factory) {
         super(qname, parent, factory);
     }
 
-    protected FOMFeed(String localName, OMContainer parent, OMFactory factory, OMXMLParserWrapper
builder) {
-        super(localName, parent, factory, builder);
+    protected FOMFeed(OMFactory factory) {
+        super(factory);
     }
 
     public List<Entry> getEntries() {

Modified: webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMGenerator.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMGenerator.java?rev=1697834&r1=1697833&r2=1697834&view=diff
==============================================================================
--- webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMGenerator.java
(original)
+++ webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMGenerator.java
Wed Aug 26 07:31:56 2015
@@ -24,15 +24,14 @@ import org.apache.abdera.model.Generator
 import org.apache.axiom.fom.AbderaGenerator;
 import org.apache.axiom.om.OMContainer;
 import org.apache.axiom.om.OMFactory;
-import org.apache.axiom.om.OMXMLParserWrapper;
 
 public class FOMGenerator extends FOMElement implements AbderaGenerator {
     protected FOMGenerator(QName qname, OMContainer parent, OMFactory factory) {
         super(qname, parent, factory);
     }
 
-    protected FOMGenerator(String localName, OMContainer parent, OMFactory factory, OMXMLParserWrapper
builder) {
-        super(localName, parent, factory, builder);
+    protected FOMGenerator(OMFactory factory) {
+        super(factory);
     }
 
     public IRI getUri() {

Modified: webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMIRI.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMIRI.java?rev=1697834&r1=1697833&r2=1697834&view=diff
==============================================================================
--- webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMIRI.java
(original)
+++ webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMIRI.java
Wed Aug 26 07:31:56 2015
@@ -26,15 +26,14 @@ import org.apache.axiom.fom.AbderaIRIEle
 import org.apache.axiom.om.OMContainer;
 import org.apache.axiom.om.OMException;
 import org.apache.axiom.om.OMFactory;
-import org.apache.axiom.om.OMXMLParserWrapper;
 
 public class FOMIRI extends FOMElement implements AbderaIRIElement {
     protected FOMIRI(QName qname, OMContainer parent, OMFactory factory) throws OMException
{
         super(qname, parent, factory);
     }
 
-    protected FOMIRI(String localName, OMContainer parent, OMFactory factory, OMXMLParserWrapper
builder) throws OMException {
-        super(localName, parent, factory, builder);
+    protected FOMIRI(OMFactory factory) {
+        super(factory);
     }
 
     public IRI getValue() {

Modified: webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMLink.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMLink.java?rev=1697834&r1=1697833&r2=1697834&view=diff
==============================================================================
--- webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMLink.java
(original)
+++ webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMLink.java
Wed Aug 26 07:31:56 2015
@@ -30,16 +30,14 @@ import org.apache.axiom.fom.AbderaLink;
 import org.apache.axiom.om.OMContainer;
 import org.apache.axiom.om.OMException;
 import org.apache.axiom.om.OMFactory;
-import org.apache.axiom.om.OMXMLParserWrapper;
 
 public class FOMLink extends FOMExtensibleElement implements AbderaLink {
     protected FOMLink(QName qname, OMContainer parent, OMFactory factory) throws OMException
{
         super(qname, parent, factory);
     }
 
-    protected FOMLink(String localName, OMContainer parent, OMFactory factory, OMXMLParserWrapper
builder)
-        throws OMException {
-        super(localName, parent, factory, builder);
+    protected FOMLink(OMFactory factory) {
+        super(factory);
     }
 
     public IRI getHref() {

Modified: webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMMultipartCollection.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMMultipartCollection.java?rev=1697834&r1=1697833&r2=1697834&view=diff
==============================================================================
--- webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMMultipartCollection.java
(original)
+++ webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMMultipartCollection.java
Wed Aug 26 07:31:56 2015
@@ -13,7 +13,6 @@ import org.apache.abdera.model.Element;
 import org.apache.abdera.util.MimeTypeHelper;
 import org.apache.axiom.om.OMContainer;
 import org.apache.axiom.om.OMFactory;
-import org.apache.axiom.om.OMXMLParserWrapper;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -39,10 +38,6 @@ public class FOMMultipartCollection exte
         super(qname, parent, factory);
     }
 
-    protected FOMMultipartCollection(String localName, OMContainer parent, OMFactory factory,
OMXMLParserWrapper builder) {
-        super(localName, parent, factory, builder);
-    }
-
     public boolean acceptsMultipart(String mediaType) {
         Map<String, String> accept = getAcceptMultiparted();
         if (accept.size() == 0)

Modified: webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMPerson.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMPerson.java?rev=1697834&r1=1697833&r2=1697834&view=diff
==============================================================================
--- webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMPerson.java
(original)
+++ webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMPerson.java
Wed Aug 26 07:31:56 2015
@@ -28,16 +28,14 @@ import org.apache.axiom.om.OMContainer;
 import org.apache.axiom.om.OMElement;
 import org.apache.axiom.om.OMException;
 import org.apache.axiom.om.OMFactory;
-import org.apache.axiom.om.OMXMLParserWrapper;
 
 public class FOMPerson extends FOMExtensibleElement implements AbderaPerson {
     protected FOMPerson(QName qname, OMContainer parent, OMFactory factory) throws OMException
{
         super(qname, parent, factory);
     }
 
-    protected FOMPerson(String localName, OMContainer parent, OMFactory factory, OMXMLParserWrapper
builder)
-        throws OMException {
-        super(localName, parent, factory, builder);
+    protected FOMPerson(OMFactory factory) {
+        super(factory);
     }
 
     public Element getNameElement() {

Modified: webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMService.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMService.java?rev=1697834&r1=1697833&r2=1697834&view=diff
==============================================================================
--- webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMService.java
(original)
+++ webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMService.java
Wed Aug 26 07:31:56 2015
@@ -30,7 +30,6 @@ import org.apache.axiom.fom.AbderaServic
 import org.apache.axiom.om.OMContainer;
 import org.apache.axiom.om.OMElement;
 import org.apache.axiom.om.OMFactory;
-import org.apache.axiom.om.OMXMLParserWrapper;
 
 @SuppressWarnings("deprecation")
 public class FOMService extends FOMExtensibleElement implements AbderaService {
@@ -39,8 +38,8 @@ public class FOMService extends FOMExten
         declareAtomNs();
     }
 
-    protected FOMService(String localName, OMContainer parent, OMFactory factory, OMXMLParserWrapper
builder) {
-        super(localName, parent, factory, builder);
+    protected FOMService(OMFactory factory) {
+        super(factory);
     }
 
     private void declareAtomNs() {

Modified: webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMSource.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMSource.java?rev=1697834&r1=1697833&r2=1697834&view=diff
==============================================================================
--- webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMSource.java
(original)
+++ webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMSource.java
Wed Aug 26 07:31:56 2015
@@ -46,7 +46,6 @@ import org.apache.axiom.om.OMElement;
 import org.apache.axiom.om.OMException;
 import org.apache.axiom.om.OMFactory;
 import org.apache.axiom.om.OMNode;
-import org.apache.axiom.om.OMXMLParserWrapper;
 
 @SuppressWarnings( {"unchecked", "deprecation"})
 public class FOMSource extends FOMExtensibleElement implements AbderaSource {
@@ -54,9 +53,8 @@ public class FOMSource extends FOMExtens
         super(qname, parent, factory);
     }
 
-    protected FOMSource(String localName, OMContainer parent, OMFactory factory, OMXMLParserWrapper
builder)
-        throws OMException {
-        super(localName, parent, factory, builder);
+    protected FOMSource(OMFactory factory) {
+        super(factory);
     }
 
     public Person getAuthor() {

Modified: webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMText.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMText.java?rev=1697834&r1=1697833&r2=1697834&view=diff
==============================================================================
--- webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMText.java
(original)
+++ webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMText.java
Wed Aug 26 07:31:56 2015
@@ -30,7 +30,6 @@ import org.apache.axiom.om.OMElement;
 import org.apache.axiom.om.OMException;
 import org.apache.axiom.om.OMFactory;
 import org.apache.axiom.om.OMNode;
-import org.apache.axiom.om.OMXMLParserWrapper;
 
 @SuppressWarnings("unchecked")
 public class FOMText extends FOMElement implements AbderaText {
@@ -46,9 +45,8 @@ public class FOMText extends FOMElement
         setTextType(type);
     }
 
-    protected FOMText(String localName, OMContainer parent, OMFactory factory, OMXMLParserWrapper
builder)
-        throws OMException {
-        super(localName, parent, factory, builder);
+    protected FOMText(OMFactory factory) {
+        super(factory);
     }
 
     public final Type getTextType() {

Modified: webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMWorkspace.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMWorkspace.java?rev=1697834&r1=1697833&r2=1697834&view=diff
==============================================================================
--- webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMWorkspace.java
(original)
+++ webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMWorkspace.java
Wed Aug 26 07:31:56 2015
@@ -31,7 +31,6 @@ import org.apache.axiom.om.OMContainer;
 import org.apache.axiom.om.OMElement;
 import org.apache.axiom.om.OMException;
 import org.apache.axiom.om.OMFactory;
-import org.apache.axiom.om.OMXMLParserWrapper;
 
 @SuppressWarnings("deprecation")
 public class FOMWorkspace extends FOMExtensibleElement implements AbderaWorkspace {
@@ -39,9 +38,8 @@ public class FOMWorkspace extends FOMExt
         super(qname, parent, factory);
     }
 
-    protected FOMWorkspace(String localName, OMContainer parent, OMFactory factory, OMXMLParserWrapper
builder)
-        throws OMException {
-        super(localName, parent, factory, builder);
+    protected FOMWorkspace(OMFactory factory) {
+        super(factory);
     }
 
     public String getTitle() {



Mime
View raw message