Author: veithen
Date: Tue Aug 25 21:34:50 2015
New Revision: 1697773
URL: http://svn.apache.org/r1697773
Log:
Standardize the constructors for FOMElement subclasses.
Modified:
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/FOMEntry.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/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/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/FOMWorkspace.java
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=1697773&r1=1697772&r2=1697773&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
Tue Aug 25 21:34:50 2015
@@ -50,11 +50,6 @@ public class FOMCategories extends FOMEx
super(localName, parent, factory, builder);
}
- protected FOMCategories(OMContainer parent, OMFactory factory) throws
OMException {
- super(CATEGORIES, parent, factory);
- init();
- }
-
private void init() {
this.declareNamespace(ATOM_NS, "atom");
}
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=1697773&r1=1697772&r2=1697773&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
Tue Aug 25 21:34:50 2015
@@ -42,10 +42,6 @@ public class FOMCategory extends FOMExte
super(localName, parent, factory, builder);
}
- protected FOMCategory(OMContainer parent, OMFactory factory) {
- super(CATEGORY, parent, factory);
- }
-
public String getTerm() {
return getAttributeValue(TERM);
}
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=1697773&r1=1697772&r2=1697773&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
Tue Aug 25 21:34:50 2015
@@ -58,10 +58,6 @@ public class FOMCollection extends FOMEx
super(localName, parent, factory, builder);
}
- protected FOMCollection(OMContainer parent, OMFactory factory) {
- super(COLLECTION, parent, factory);
- }
-
public String getTitle() {
Text title = this.getFirstChild(TITLE);
return (title != null) ? title.getValue() : null;
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=1697773&r1=1697772&r2=1697773&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
Tue Aug 25 21:34:50 2015
@@ -60,11 +60,6 @@ public class FOMContent extends FOMExten
init(type);
}
- protected FOMContent(Type type, OMContainer parent, OMFactory factory)
throws OMException {
- super(CONTENT, parent, factory);
- init(type);
- }
-
private void init(Type type) {
this.type = type;
if (Type.TEXT.equals(type))
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=1697773&r1=1697772&r2=1697773&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
Tue Aug 25 21:34:50 2015
@@ -41,10 +41,6 @@ public class FOMControl extends FOMExten
super(localName, parent, factory, builder);
}
- protected FOMControl(OMContainer parent, OMFactory factory) throws
OMException {
- super(CONTROL, parent, factory);
- }
-
public boolean isDraft() {
String value = _getElementValue(DRAFT);
if (value == null)
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=1697773&r1=1697772&r2=1697773&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
Tue Aug 25 21:34:50 2015
@@ -70,10 +70,6 @@ public class FOMEntry extends FOMExtensi
super(localName, parent, factory, builder);
}
- protected FOMEntry(OMContainer parent, OMFactory factory) throws
OMException {
- super(ENTRY, parent, factory);
- }
-
public Person getAuthor() {
return (Person)getFirstChildWithName(AUTHOR);
}
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=1697773&r1=1697772&r2=1697773&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:34:50 2015
@@ -103,7 +103,7 @@ public class FOMFactory extends OMLinked
}
public Service newService(Base parent) {
- return new FOMService((OMContainer)parent, this);
+ return new FOMService(SERVICE, (OMContainer)parent, this);
}
public Workspace newWorkspace() {
@@ -111,7 +111,7 @@ public class FOMFactory extends OMLinked
}
public Workspace newWorkspace(Element parent) {
- return new FOMWorkspace((OMContainer)parent, this);
+ return new FOMWorkspace(WORKSPACE, (OMContainer)parent, this);
}
public Collection newCollection() {
@@ -119,11 +119,11 @@ public class FOMFactory extends OMLinked
}
public Collection newCollection(Element parent) {
- return new FOMCollection((OMContainer)parent, this);
+ return new FOMCollection(COLLECTION, (OMContainer)parent, this);
}
public Collection newMultipartCollection(Element parent) {
- return new FOMMultipartCollection((OMContainer)parent, this);
+ return new FOMMultipartCollection(COLLECTION, (OMContainer)parent,
this);
}
public Feed newFeed() {
@@ -142,11 +142,11 @@ public class FOMFactory extends OMLinked
}
public Feed newFeed(Base parent) {
- return new FOMFeed((OMContainer)parent, this);
+ return new FOMFeed(FEED, (OMContainer)parent, this);
}
public Entry newEntry(Base parent) {
- return new FOMEntry((OMContainer)parent, this);
+ return new FOMEntry(ENTRY, (OMContainer)parent, this);
}
public Category newCategory() {
@@ -154,7 +154,7 @@ public class FOMFactory extends OMLinked
}
public Category newCategory(Element parent) {
- return new FOMCategory((OMContainer)parent, this);
+ return new FOMCategory(CATEGORY, (OMContainer)parent, this);
}
public Content newContent() {
@@ -170,7 +170,7 @@ public class FOMFactory extends OMLinked
public Content newContent(Type type, Element parent) {
if (type == null)
type = Content.Type.TEXT;
- Content content = new FOMContent(type, (OMContainer)parent, this);
+ Content content = new FOMContent(CONTENT, type, (OMContainer)parent,
this);
if (type.equals(Content.Type.XML))
content.setMimeType(XML_MEDIA_TYPE);
return content;
@@ -208,7 +208,7 @@ public class FOMFactory extends OMLinked
}
public Generator newGenerator(Element parent) {
- return new FOMGenerator((OMContainer)parent, this);
+ return new FOMGenerator(GENERATOR, (OMContainer)parent, this);
}
public IRIElement newID() {
@@ -216,7 +216,7 @@ public class FOMFactory extends OMLinked
}
public IRIElement newID(Element parent) {
- return new FOMIRI(Constants.ID, (OMContainer)parent, this);
+ return newIRIElement(ID, parent);
}
public IRIElement newIRIElement(QName qname, Element parent) {
@@ -228,7 +228,7 @@ public class FOMFactory extends OMLinked
}
public Link newLink(Element parent) {
- return new FOMLink((OMContainer)parent, this);
+ return new FOMLink(LINK, (OMContainer)parent, this);
}
public Person newPerson(QName qname, Element parent) {
@@ -240,7 +240,7 @@ public class FOMFactory extends OMLinked
}
public Source newSource(Element parent) {
- return new FOMSource((OMContainer)parent, this);
+ return new FOMSource(SOURCE, (OMContainer)parent, this);
}
public Text newText(QName qname, Text.Type type) {
@@ -276,7 +276,7 @@ public class FOMFactory extends OMLinked
}
public Control newControl(Element parent) {
- return new FOMControl((OMContainer)parent, this);
+ return new FOMControl(CONTROL, (OMContainer)parent, this);
}
public DateTime newPublished() {
@@ -593,7 +593,7 @@ public class FOMFactory extends OMLinked
}
public Categories newCategories(Base parent) {
- return new FOMCategories((OMContainer)parent, this);
+ return new FOMCategories(CATEGORIES, (OMContainer)parent, this);
}
public String newUuidUri() {
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=1697773&r1=1697772&r2=1697773&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
Tue Aug 25 21:34:50 2015
@@ -51,10 +51,6 @@ public class FOMFeed extends FOMSource i
super(localName, parent, factory, builder);
}
- protected FOMFeed(OMContainer parent, OMFactory factory) throws
OMException {
- super(FEED, parent, factory);
- }
-
public List<Entry> getEntries() {
return _getChildrenAsSet(ENTRY);
}
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=1697773&r1=1697772&r2=1697773&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
Tue Aug 25 21:34:50 2015
@@ -42,10 +42,6 @@ public class FOMGenerator extends FOMEle
super(localName, parent, factory, builder);
}
- protected FOMGenerator(OMContainer parent, OMFactory factory) throws
OMException {
- super(GENERATOR, parent, factory);
- }
-
public IRI getUri() {
String value = getAttributeValue(AURI);
return (value != null) ? new IRI(value) : null;
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=1697773&r1=1697772&r2=1697773&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
Tue Aug 25 21:34:50 2015
@@ -38,10 +38,6 @@ public class FOMLink extends FOMExtensib
super(name, namespace, parent, factory);
}
- protected FOMLink(OMContainer parent, OMFactory factory) throws
OMException {
- super(LINK, parent, factory);
- }
-
protected FOMLink(QName qname, OMContainer parent, OMFactory factory)
throws OMException {
super(qname, parent, factory);
}
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=1697773&r1=1697772&r2=1697773&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
Tue Aug 25 21:34:50 2015
@@ -43,10 +43,6 @@ public class FOMMultipartCollection exte
super(localName, parent, factory, builder);
}
- protected FOMMultipartCollection(OMContainer parent, OMFactory factory) {
- super(COLLECTION, parent, factory);
- }
-
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/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=1697773&r1=1697772&r2=1697773&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
Tue Aug 25 21:34:50 2015
@@ -50,11 +50,6 @@ public class FOMService extends FOMExten
super(localName, parent, factory, builder);
}
- protected FOMService(OMContainer parent, OMFactory factory) throws
OMException {
- super(SERVICE, parent, factory);
- declareAtomNs();
- }
-
private void declareAtomNs() {
declareDefaultNamespace(APP_NS);
declareNamespace(ATOM_NS, "atom");
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=1697773&r1=1697772&r2=1697773&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
Tue Aug 25 21:34:50 2015
@@ -55,10 +55,6 @@ public class FOMSource extends FOMExtens
super(name, namespace, parent, factory);
}
- protected FOMSource(OMContainer parent, OMFactory factory) throws
OMException {
- super(SOURCE, parent, factory);
- }
-
protected FOMSource(QName qname, OMContainer parent, OMFactory factory)
throws OMException {
super(qname, parent, factory);
}
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=1697773&r1=1697772&r2=1697773&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
Tue Aug 25 21:34:50 2015
@@ -50,10 +50,6 @@ public class FOMWorkspace extends FOMExt
super(localName, parent, factory, builder);
}
- protected FOMWorkspace(OMContainer parent, OMFactory factory) throws
OMException {
- super(WORKSPACE, parent, factory);
- }
-
public String getTitle() {
Text title = this.getFirstChild(TITLE);
return (title != null) ? title.getValue() : null;
