svn commit: r1697827 - in /webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax: FOMBuilder.java FOMFactory.java

[veithen]

Author: veithen
Date: Wed Aug 26 06:57:26 2015
New Revision: 1697827

URL: http://svn.apache.org/r1697827
Log:
Design the createElement* methods so that they never return null.

Modified:
    
webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMBuilder.java
    
webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMFactory.java

Modified: 
webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMBuilder.java
URL: 
http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMBuilder.java?rev=1697827&r1=1697826&r2=1697827&view=diff
==============================================================================
--- 
webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMBuilder.java
 (original)
+++ 
webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMBuilder.java
 Wed Aug 26 06:57:26 2015
@@ -17,7 +17,6 @@
  */
 package org.apache.abdera.parser.stax;
 
-import javax.xml.namespace.QName;
 import javax.xml.stream.XMLStreamReader;
 
 import org.apache.abdera.model.Content;
@@ -90,12 +89,7 @@ public class FOMBuilder extends StAXOMBu
 
     @Override
     protected OMElement constructNode(OMContainer parent, String name) {
-        QName qname = parser.getName();
-        OMElement element = fomfactory.createElementFromBuilder(qname, parent, 
this);
-        if (element == null) {
-            element = new FOMElement(qname.getLocalPart(), parent, fomfactory, 
this);
-        }
-        return element;
+        return fomfactory.createElementFromBuilder(parser.getName(), parent, 
this);
     }
 
     public <T extends Element> Document<T> getFomDocument() {

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=1697827&r1=1697826&r2=1697827&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 06:57:26 2015
@@ -430,7 +430,7 @@ public class FOMFactory extends OMLinked
     }
 
     protected FOMElement createElement(QName qname, OMContainer parent) {
-        FOMElement element = null;
+        FOMElement element;
         if (FEED.equals(qname)) {
             element = new FOMFeed(qname, parent, this);
         } else if (SERVICE.equals(qname) || PRE_RFC_SERVICE.equals(qname)) {
@@ -496,7 +496,7 @@ public class FOMFactory extends OMLinked
     }
 
     protected OMElement createElementFromBuilder(QName qname, OMContainer 
parent, FOMBuilder builder) {
-        OMElement element = null;
+        OMElement element;
         if (FEED.equals(qname)) {
             element = new FOMFeed(qname.getLocalPart(), parent, this, builder);
         } else if (SERVICE.equals(qname) || PRE_RFC_SERVICE.equals(qname)) {
@@ -555,6 +555,8 @@ public class FOMFactory extends OMLinked
             element = new FOMDateTime(qname.getLocalPart(), parent, this, 
builder);
         } else if (parent instanceof ExtensibleElement || parent instanceof 
Document) {
             element = new FOMExtensibleElement(qname.getLocalPart(), parent, 
this, builder);
+        } else {
+            element = new FOMElement(qname.getLocalPart(), parent, this, 
builder);
         }
         if (element instanceof FOMContent) {
             Content.Type type = builder.getContentType();