Author: veithen
Date: Tue Aug 25 21:42:28 2015
New Revision: 1697774
URL: http://svn.apache.org/r1697774
Log:
Remove unnecessary argument.
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/FOMElement.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=1697774&r1=1697773&r2=1697774&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
Tue Aug 25 21:42:28 2015
@@ -91,7 +91,7 @@ public class FOMBuilder extends StAXOMBu
@Override
protected OMElement constructNode(OMContainer parent, String name) {
QName qname = parser.getName();
- OMElement element = fomfactory.createElement(qname, parent, this);
+ OMElement element = fomfactory.createElementFromBuilder(qname, parent,
this);
if (element == null) {
element = new FOMElement(qname.getLocalPart(), parent, fomfactory,
this);
}
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=1697774&r1=1697773&r2=1697774&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
Tue Aug 25 21:42:28 2015
@@ -594,7 +594,7 @@ public class FOMElement extends OMElemen
obj = ((Content)src).getContentType();
if (src instanceof Text)
obj = ((Text)src).getTextType();
- el = fomfactory.createElement(src.getQName(),
(OMContainer)fomfactory.newDocument(), fomfactory, obj);
+ el = fomfactory.createElement(src.getQName(),
(OMContainer)fomfactory.newDocument(), obj);
return el;
}
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=1697774&r1=1697773&r2=1697774&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
Tue Aug 25 21:42:28 2015
@@ -267,7 +267,7 @@ public class FOMFactory extends OMLinked
public <T extends Element> T newExtensionElement(QName qname, Base parent)
{
String ns = qname.getNamespaceURI();
- Element el = (Element)createElement(qname, (OMContainer)parent, this,
null);
+ Element el = (Element)createElement(qname, (OMContainer)parent, null);
return (T)((ATOM_NS.equals(ns) || APP_NS.equals(ns)) ? el :
factoriesMap.getElementWrapper(el));
}
@@ -431,70 +431,70 @@ public class FOMFactory extends OMLinked
return new FOMDiv(DIV, (OMContainer)parent, this);
}
- protected OMElement createElement(QName qname, OMContainer parent,
OMFactory factory, Object objecttype) {
+ protected OMElement createElement(QName qname, OMContainer parent, Object
objecttype) {
OMElement element = null;
OMNamespace namespace =
this.createOMNamespace(qname.getNamespaceURI(), qname.getPrefix());
if (FEED.equals(qname)) {
- element = new FOMFeed(qname.getLocalPart(), namespace, parent,
factory);
+ element = new FOMFeed(qname.getLocalPart(), namespace, parent,
this);
} else if (SERVICE.equals(qname) || PRE_RFC_SERVICE.equals(qname)) {
- element = new FOMService(qname.getLocalPart(), namespace, parent,
factory);
+ element = new FOMService(qname.getLocalPart(), namespace, parent,
this);
} else if (ENTRY.equals(qname)) {
- element = new FOMEntry(qname.getLocalPart(), namespace, parent,
factory);
+ element = new FOMEntry(qname.getLocalPart(), namespace, parent,
this);
} else if (AUTHOR.equals(qname)) {
- element = new FOMPerson(qname.getLocalPart(), namespace, parent,
factory);
+ element = new FOMPerson(qname.getLocalPart(), namespace, parent,
this);
} else if (CATEGORY.equals(qname)) {
- element = new FOMCategory(qname.getLocalPart(), namespace, parent,
factory);
+ element = new FOMCategory(qname.getLocalPart(), namespace, parent,
this);
} else if (CONTENT.equals(qname)) {
Content.Type type = (Content.Type)objecttype;
- element = new FOMContent(qname.getLocalPart(), namespace, type,
parent, factory);
+ element = new FOMContent(qname.getLocalPart(), namespace, type,
parent, this);
} else if (CONTRIBUTOR.equals(qname)) {
- element = new FOMPerson(qname.getLocalPart(), namespace, parent,
factory);
+ element = new FOMPerson(qname.getLocalPart(), namespace, parent,
this);
} else if (GENERATOR.equals(qname)) {
- element = new FOMGenerator(qname.getLocalPart(), namespace,
parent, factory);
+ element = new FOMGenerator(qname.getLocalPart(), namespace,
parent, this);
} else if (ICON.equals(qname)) {
- element = new FOMIRI(qname.getLocalPart(), namespace, parent,
factory);
+ element = new FOMIRI(qname.getLocalPart(), namespace, parent,
this);
} else if (ID.equals(qname)) {
- element = new FOMIRI(qname.getLocalPart(), namespace, parent,
factory);
+ element = new FOMIRI(qname.getLocalPart(), namespace, parent,
this);
} else if (LOGO.equals(qname)) {
- element = new FOMIRI(qname.getLocalPart(), namespace, parent,
factory);
+ element = new FOMIRI(qname.getLocalPart(), namespace, parent,
this);
} else if (LINK.equals(qname)) {
- element = new FOMLink(qname.getLocalPart(), namespace, parent,
factory);
+ element = new FOMLink(qname.getLocalPart(), namespace, parent,
this);
} else if (PUBLISHED.equals(qname)) {
- element = new FOMDateTime(qname.getLocalPart(), namespace, parent,
factory);
+ element = new FOMDateTime(qname.getLocalPart(), namespace, parent,
this);
} else if (RIGHTS.equals(qname)) {
Text.Type type = (Text.Type)objecttype;
- element = new FOMText(type, qname.getLocalPart(), namespace,
parent, factory);
+ element = new FOMText(type, qname.getLocalPart(), namespace,
parent, this);
} else if (SOURCE.equals(qname)) {
- element = new FOMSource(qname.getLocalPart(), namespace, parent,
factory);
+ element = new FOMSource(qname.getLocalPart(), namespace, parent,
this);
} else if (SUBTITLE.equals(qname)) {
Text.Type type = (Text.Type)objecttype;
- element = new FOMText(type, qname.getLocalPart(), namespace,
parent, factory);
+ element = new FOMText(type, qname.getLocalPart(), namespace,
parent, this);
} else if (SUMMARY.equals(qname)) {
Text.Type type = (Text.Type)objecttype;
- element = new FOMText(type, qname.getLocalPart(), namespace,
parent, factory);
+ element = new FOMText(type, qname.getLocalPart(), namespace,
parent, this);
} else if (TITLE.equals(qname)) {
Text.Type type = (Text.Type)objecttype;
- element = new FOMText(type, qname.getLocalPart(), namespace,
parent, factory);
+ element = new FOMText(type, qname.getLocalPart(), namespace,
parent, this);
} else if (UPDATED.equals(qname)) {
- element = new FOMDateTime(qname.getLocalPart(), namespace, parent,
factory);
+ element = new FOMDateTime(qname.getLocalPart(), namespace, parent,
this);
} else if (WORKSPACE.equals(qname) || PRE_RFC_WORKSPACE.equals(qname))
{
- element = new FOMWorkspace(qname.getLocalPart(), namespace,
parent, factory);
+ element = new FOMWorkspace(qname.getLocalPart(), namespace,
parent, this);
} else if (COLLECTION.equals(qname) ||
PRE_RFC_COLLECTION.equals(qname)) {
- element = new FOMCollection(qname.getLocalPart(), namespace,
parent, factory);
+ element = new FOMCollection(qname.getLocalPart(), namespace,
parent, this);
} else if (NAME.equals(qname)) {
- element = new FOMElement(qname.getLocalPart(), namespace, parent,
factory);
+ element = new FOMElement(qname.getLocalPart(), namespace, parent,
this);
} else if (EMAIL.equals(qname)) {
- element = new FOMElement(qname.getLocalPart(), namespace, parent,
factory);
+ element = new FOMElement(qname.getLocalPart(), namespace, parent,
this);
} else if (URI.equals(qname)) {
- element = new FOMIRI(qname.getLocalPart(), namespace, parent,
factory);
+ element = new FOMIRI(qname.getLocalPart(), namespace, parent,
this);
} else if (CONTROL.equals(qname) || PRE_RFC_CONTROL.equals(qname)) {
- element = new FOMControl(qname.getLocalPart(), namespace, parent,
factory);
+ element = new FOMControl(qname.getLocalPart(), namespace, parent,
this);
} else if (DIV.equals(qname)) {
- element = new FOMDiv(qname.getLocalPart(), namespace, parent,
factory);
+ element = new FOMDiv(qname.getLocalPart(), namespace, parent,
this);
} else if (CATEGORIES.equals(qname) ||
PRE_RFC_CATEGORIES.equals(qname)) {
- element = new FOMCategories(qname.getLocalPart(), namespace,
parent, factory);
+ element = new FOMCategories(qname.getLocalPart(), namespace,
parent, this);
} else if (EDITED.equals(qname) || PRE_RFC_EDITED.equals(qname)) {
- element = new FOMDateTime(qname.getLocalPart(), namespace, parent,
factory);
+ element = new FOMDateTime(qname.getLocalPart(), namespace, parent,
this);
} else if (parent instanceof ExtensibleElement || parent instanceof
Document) {
element = (OMElement)new FOMExtensibleElement(qname, parent, this);
} else {
@@ -503,7 +503,7 @@ public class FOMFactory extends OMLinked
return element;
}
- protected OMElement createElement(QName qname, OMContainer parent,
FOMBuilder builder) {
+ protected OMElement createElementFromBuilder(QName qname, OMContainer
parent, FOMBuilder builder) {
OMElement element = null;
if (FEED.equals(qname)) {
element = new FOMFeed(qname.getLocalPart(), parent, this, builder);
