Author: veithen
Date: Mon Aug 31 10:51:24 2015
New Revision: 1700228
URL: http://svn.apache.org/r1700228
Log:
Some code simplifications.
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/FOMCollection.java
webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMDocument.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/FOMFeed.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/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=1700228&r1=1700227&r2=1700228&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
Mon Aug 31 10:51:24 2015
@@ -39,15 +39,13 @@ public class FOMCategories extends FOMEx
}
public Category addCategory(String term) {
- FOMFactory factory = (FOMFactory)this.getOMFactory();
- Category category = factory.newCategory(this);
+ Category category = getFactory().newCategory(this);
category.setTerm(term);
return category;
}
public Category addCategory(String scheme, String term, String label) {
- FOMFactory factory = (FOMFactory)this.getOMFactory();
- Category category = factory.newCategory(this);
+ Category category = getFactory().newCategory(this);
category.setTerm(term);
category.setScheme(scheme);
category.setLabel(label);
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=1700228&r1=1700227&r2=1700228&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
Mon Aug 31 10:51:24 2015
@@ -50,8 +50,7 @@ public class FOMCollection extends FOMEx
}
private Text setTitle(String title, Text.Type type) {
- FOMFactory fomfactory = (FOMFactory)getOMFactory();
- Text text = fomfactory.newText(PREFIXED_TITLE, type);
+ Text text = getFactory().newText(PREFIXED_TITLE, type);
text.setValue(title);
this._setChild(PREFIXED_TITLE, (OMElement)text);
return text;
@@ -194,7 +193,7 @@ public class FOMCollection extends FOMEx
}
public Categories addCategories() {
- return ((FOMFactory)getOMFactory()).newCategories(this);
+ return getFactory().newCategories(this);
}
public Collection addCategories(Categories categories) {
@@ -203,14 +202,14 @@ public class FOMCollection extends FOMEx
}
public Categories addCategories(String href) {
- Categories cats = ((FOMFactory)getOMFactory()).newCategories();
+ Categories cats = getFactory().newCategories();
cats.setHref(href);
addCategories(cats);
return cats;
}
public Categories addCategories(List<Category> categories, boolean fixed,
String scheme) {
- Categories cats = ((FOMFactory)getOMFactory()).newCategories();
+ Categories cats = getFactory().newCategories();
cats.setFixed(fixed);
if (scheme != null)
cats.setScheme(scheme);
Modified:
webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMDocument.java
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMDocument.java?rev=1700228&r1=1700227&r2=1700228&view=diff
==============================================================================
---
webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMDocument.java
(original)
+++
webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMDocument.java
Mon Aug 31 10:51:24 2015
@@ -170,7 +170,7 @@ public class FOMDocument<T extends Eleme
}
public Object clone() {
- Document<T> doc = ((FOMFactory)getOMFactory()).newDocument();
+ Document<T> doc = getFactory().newDocument();
OMDocument omdoc = (OMDocument)doc;
for (Iterator i = getChildren(); i.hasNext();) {
OMNode node = (OMNode)i.next();
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=1700228&r1=1700227&r2=1700228&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
Mon Aug 31 10:51:24 2015
@@ -36,6 +36,7 @@ import javax.activation.MimeType;
import javax.xml.namespace.QName;
import javax.xml.stream.XMLStreamException;
+import org.apache.abdera.factory.Factory;
import org.apache.abdera.i18n.iri.IRI;
import org.apache.abdera.i18n.iri.IRIHelper;
import org.apache.abdera.i18n.rfc4646.Lang;
@@ -373,8 +374,7 @@ public class FOMElement extends OMElemen
setTextElement(qname, null, false);
return null;
}
- FOMFactory fomfactory = (FOMFactory)getOMFactory();
- Text text = fomfactory.newText(qname, Text.Type.TEXT);
+ Text text = getFactory().newText(qname, Text.Type.TEXT);
text.setValue(value);
setTextElement(qname, text, false);
return text;
@@ -385,8 +385,7 @@ public class FOMElement extends OMElemen
setTextElement(qname, null, false);
return null;
}
- FOMFactory fomfactory = (FOMFactory)getOMFactory();
- Text text = fomfactory.newText(qname, Text.Type.HTML);
+ Text text = getFactory().newText(qname, Text.Type.HTML);
if (baseUri != null)
text.setBaseUri(baseUri);
text.setValue(value);
@@ -399,8 +398,7 @@ public class FOMElement extends OMElemen
setTextElement(qname, null, false);
return null;
}
- FOMFactory fomfactory = (FOMFactory)getOMFactory();
- Text text = fomfactory.newText(qname, Text.Type.XHTML);
+ Text text = getFactory().newText(qname, Text.Type.XHTML);
if (baseUri != null)
text.setBaseUri(baseUri);
text.setValue(value);
@@ -482,7 +480,7 @@ public class FOMElement extends OMElemen
protected Element _parse(String value, IRI baseUri) throws ParseException,
UnsupportedEncodingException {
if (value == null)
return null;
- FOMFactory fomfactory = (FOMFactory)getOMFactory();
+ Factory fomfactory = getFactory();
Parser parser = fomfactory.newParser();
ParserOptions options = parser.getDefaultParserOptions();
options.setFactory(fomfactory);
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=1700228&r1=1700227&r2=1700228&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
Mon Aug 31 10:51:24 2015
@@ -71,15 +71,13 @@ public class FOMEntry extends FOMExtensi
}
public Person addAuthor(String name) {
- FOMFactory fomfactory = (FOMFactory)this.getOMFactory();
- Person person = fomfactory.newAuthor(this);
+ Person person = getFactory().newAuthor(this);
person.setName(name);
return person;
}
public Person addAuthor(String name, String email, String uri) {
- FOMFactory fomfactory = (FOMFactory)this.getOMFactory();
- Person person = fomfactory.newAuthor(this);
+ Person person = getFactory().newAuthor(this);
person.setName(name);
person.setEmail(email);
person.setUri(uri);
@@ -111,15 +109,13 @@ public class FOMEntry extends FOMExtensi
}
public Category addCategory(String term) {
- FOMFactory factory = (FOMFactory)this.getOMFactory();
- Category category = factory.newCategory(this);
+ Category category = getFactory().newCategory(this);
category.setTerm(term);
return category;
}
public Category addCategory(String scheme, String term, String label) {
- FOMFactory factory = (FOMFactory)this.getOMFactory();
- Category category = factory.newCategory(this);
+ Category category = getFactory().newCategory(this);
category.setTerm(term);
category.setScheme(scheme);
category.setLabel(label);
@@ -143,8 +139,7 @@ public class FOMEntry extends FOMExtensi
* Sets the content for this entry as @type="text"
*/
public Content setContent(String value) {
- FOMFactory factory = (FOMFactory)this.getOMFactory();
- Content content = factory.newContent();
+ Content content = getFactory().newContent();
content.setValue(value);
setContentElement(content);
return content;
@@ -162,8 +157,7 @@ public class FOMEntry extends FOMExtensi
* Sets the content for this entry
*/
public Content setContent(String value, Content.Type type) {
- FOMFactory factory = (FOMFactory)this.getOMFactory();
- Content content = factory.newContent(type);
+ Content content = getFactory().newContent(type);
content.setValue(value);
setContentElement(content);
return content;
@@ -173,8 +167,7 @@ public class FOMEntry extends FOMExtensi
* Sets the content for this entry
*/
public Content setContent(Element value) {
- FOMFactory factory = (FOMFactory)this.getOMFactory();
- Content content = factory.newContent();
+ Content content = getFactory().newContent();
content.setValueElement(value);
setContentElement(content);
return content;
@@ -189,8 +182,7 @@ public class FOMEntry extends FOMExtensi
try {
if (MimeTypeHelper.isText(mediaType))
throw new IllegalArgumentException();
- FOMFactory factory = (FOMFactory)this.getOMFactory();
- Content content = factory.newContent(new MimeType(mediaType));
+ Content content = getFactory().newContent(new MimeType(mediaType));
content.setValueElement(element);
setContentElement(content);
return content;
@@ -221,8 +213,7 @@ public class FOMEntry extends FOMExtensi
throw new RuntimeException(e);
}
} else {
- FOMFactory factory = (FOMFactory)this.getOMFactory();
- Content content = factory.newContent(Content.Type.MEDIA);
+ Content content = getFactory().newContent(Content.Type.MEDIA);
content.setDataHandler(dataHandler);
if (mediatype != null)
content.setMimeType(mediatype);
@@ -276,8 +267,7 @@ public class FOMEntry extends FOMExtensi
*/
public Content setContent(String value, String mediatype) {
try {
- FOMFactory factory = (FOMFactory)this.getOMFactory();
- Content content = factory.newContent(new MimeType(mediatype));
+ Content content = getFactory().newContent(new MimeType(mediatype));
content.setValue(value);
content.setMimeType(mediatype);
setContentElement(content);
@@ -295,8 +285,7 @@ public class FOMEntry extends FOMExtensi
*/
public Content setContent(IRI uri, String mediatype) {
try {
- FOMFactory factory = (FOMFactory)this.getOMFactory();
- Content content = factory.newContent(new MimeType(mediatype));
+ Content content = getFactory().newContent(new MimeType(mediatype));
content.setSrc(uri.toString());
setContentElement(content);
return content;
@@ -315,15 +304,13 @@ public class FOMEntry extends FOMExtensi
}
public Person addContributor(String name) {
- FOMFactory fomfactory = (FOMFactory)this.getOMFactory();
- Person person = fomfactory.newContributor(this);
+ Person person = getFactory().newContributor(this);
person.setName(name);
return person;
}
public Person addContributor(String name, String email, String uri) {
- FOMFactory fomfactory = (FOMFactory)this.getOMFactory();
- Person person = fomfactory.newContributor(this);
+ Person person = getFactory().newContributor(this);
person.setName(name);
person.setEmail(email);
person.setUri(uri);
@@ -368,8 +355,7 @@ public class FOMEntry extends FOMExtensi
id.setValue(value);
return id;
} else {
- FOMFactory fomfactory = (FOMFactory)getOMFactory();
- IRIElement iri = fomfactory.newID(this);
+ IRIElement iri = getFactory().newID(this);
iri.setValue((normalize) ? IRI.normalizeString(value) : value);
return iri;
}
@@ -397,8 +383,7 @@ public class FOMEntry extends FOMExtensi
}
public Link addLink(String href, String rel) {
- FOMFactory fomfactory = (FOMFactory)getOMFactory();
- Link link = fomfactory.newLink(this);
+ Link link = getFactory().newLink(this);
link.setHref(href);
if (rel != null)
link.setRel(rel);
@@ -406,8 +391,7 @@ public class FOMEntry extends FOMExtensi
}
public Link addLink(String href, String rel, String type, String title,
String hreflang, long length) {
- FOMFactory fomfactory = (FOMFactory)getOMFactory();
- Link link = fomfactory.newLink(this);
+ Link link = getFactory().newLink(this);
link.setHref(href);
link.setRel(rel);
link.setMimeType(type);
@@ -444,8 +428,7 @@ public class FOMEntry extends FOMExtensi
dte.setValue(value);
return dte;
} else {
- FOMFactory fomfactory = (FOMFactory)getOMFactory();
- DateTime dt = fomfactory.newPublished(this);
+ DateTime dt = getFactory().newPublished(this);
dt.setValue(value);
return dt;
}
@@ -469,8 +452,7 @@ public class FOMEntry extends FOMExtensi
}
public Text setRights(String value) {
- FOMFactory factory = (FOMFactory)this.getOMFactory();
- Text text = factory.newRights();
+ Text text = getFactory().newRights();
text.setValue(value);
setRightsElement(text);
return text;
@@ -485,16 +467,14 @@ public class FOMEntry extends FOMExtensi
}
public Text setRights(String value, Text.Type type) {
- FOMFactory factory = (FOMFactory)this.getOMFactory();
- Text text = factory.newRights(type);
+ Text text = getFactory().newRights(type);
text.setValue(value);
setRightsElement(text);
return text;
}
public Text setRights(Div value) {
- FOMFactory factory = (FOMFactory)this.getOMFactory();
- Text text = factory.newRights(Text.Type.XHTML);
+ Text text = getFactory().newRights(Text.Type.XHTML);
text.setValueElement(value);
setRightsElement(text);
return text;
@@ -529,8 +509,7 @@ public class FOMEntry extends FOMExtensi
}
public Text setSummary(String value) {
- FOMFactory factory = (FOMFactory)this.getOMFactory();
- Text text = factory.newSummary();
+ Text text = getFactory().newSummary();
text.setValue(value);
setSummaryElement(text);
return text;
@@ -545,16 +524,14 @@ public class FOMEntry extends FOMExtensi
}
public Text setSummary(String value, Text.Type type) {
- FOMFactory factory = (FOMFactory)this.getOMFactory();
- Text text = factory.newSummary(type);
+ Text text = getFactory().newSummary(type);
text.setValue(value);
setSummaryElement(text);
return text;
}
public Text setSummary(Div value) {
- FOMFactory factory = (FOMFactory)this.getOMFactory();
- Text text = factory.newSummary(Text.Type.XHTML);
+ Text text = getFactory().newSummary(Text.Type.XHTML);
text.setValueElement(value);
setSummaryElement(text);
return text;
@@ -574,8 +551,7 @@ public class FOMEntry extends FOMExtensi
}
public Text setTitle(String value) {
- FOMFactory factory = (FOMFactory)this.getOMFactory();
- Text text = factory.newTitle();
+ Text text = getFactory().newTitle();
text.setValue(value);
setTitleElement(text);
return text;
@@ -590,16 +566,14 @@ public class FOMEntry extends FOMExtensi
}
public Text setTitle(String value, Text.Type type) {
- FOMFactory factory = (FOMFactory)this.getOMFactory();
- Text text = factory.newTitle(type);
+ Text text = getFactory().newTitle(type);
text.setValue(value);
setTitleElement(text);
return text;
}
public Text setTitle(Div value) {
- FOMFactory factory = (FOMFactory)this.getOMFactory();
- Text text = factory.newTitle(Text.Type.XHTML);
+ Text text = getFactory().newTitle(Text.Type.XHTML);
text.setValueElement(value);
setTitleElement(text);
return text;
@@ -636,8 +610,7 @@ public class FOMEntry extends FOMExtensi
dte.setValue(value);
return dte;
} else {
- FOMFactory fomfactory = (FOMFactory)getOMFactory();
- DateTime dt = fomfactory.newUpdated(this);
+ DateTime dt = getFactory().newUpdated(this);
dt.setValue(value);
return dt;
}
@@ -684,8 +657,7 @@ public class FOMEntry extends FOMExtensi
dte.setValue(value);
return dte;
} else {
- FOMFactory fomfactory = (FOMFactory)getOMFactory();
- DateTime dt = fomfactory.newEdited(this);
+ DateTime dt = getFactory().newEdited(this);
dt.setValue(value);
return dt;
}
@@ -844,7 +816,7 @@ public class FOMEntry extends FOMExtensi
public Entry setDraft(boolean draft) {
Control control = getControl();
if (control == null && draft) {
- control = ((FOMFactory)getOMFactory()).newControl(this);
+ control = getFactory().newControl(this);
}
if (control != null)
control.setDraft(draft);
@@ -862,7 +834,7 @@ public class FOMEntry extends FOMExtensi
public Control addControl() {
Control control = getControl();
if (control == null) {
- control = ((FOMFactory)getOMFactory()).newControl(this);
+ control = getFactory().newControl(this);
}
return control;
}
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=1700228&r1=1700227&r2=1700228&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
Mon Aug 31 10:51:24 2015
@@ -69,10 +69,9 @@ public class FOMExtensibleElement extend
}
public <T extends Element> T addExtension(QName qname) {
- FOMFactory fomfactory = (FOMFactory)getOMFactory();
String prefix = qname.getPrefix();
declareIfNecessary(qname.getNamespaceURI(), prefix);
- return (T)fomfactory.newExtensionElement(qname, this);
+ return (T)getFactory().newExtensionElement(qname, this);
}
public <T extends Element> T addExtension(String namespace, String
localpart, String prefix) {
@@ -82,8 +81,7 @@ public class FOMExtensibleElement extend
}
public Element addSimpleExtension(QName qname, String value) {
- FOMFactory fomfactory = (FOMFactory)getOMFactory();
- Element el = fomfactory.newElement(qname, this);
+ Element el = getFactory().newElement(qname, this);
el.setText(value);
String prefix = qname.getPrefix();
declareIfNecessary(qname.getNamespaceURI(), prefix);
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=1700228&r1=1700227&r2=1700228&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
Mon Aug 31 10:51:24 2015
@@ -47,8 +47,7 @@ public class FOMFeed extends FOMSource i
}
public Entry addEntry() {
- FOMFactory fomfactory = (FOMFactory)getOMFactory();
- return fomfactory.newEntry(this);
+ return getFactory().newEntry(this);
}
public Feed insertEntry(Entry entry) {
@@ -62,14 +61,13 @@ public class FOMFeed extends FOMSource i
}
public Entry insertEntry() {
- FOMFactory fomfactory = (FOMFactory)getOMFactory();
- Entry entry = fomfactory.newEntry((Feed)null);
+ Entry entry = getFactory().newEntry((Feed)null);
insertEntry(entry);
return entry;
}
public Source getAsSource() {
- FOMSource source =
(FOMSource)((FOMFactory)getOMFactory()).newSource(null);
+ FOMSource source = (FOMSource)getFactory().newSource(null);
for (Iterator<?> i = this.getChildElements(); i.hasNext();) {
FOMElement child = (FOMElement)i.next();
if (!child.getQName().equals(ENTRY)) {
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=1700228&r1=1700227&r2=1700228&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
Mon Aug 31 10:51:24 2015
@@ -44,8 +44,7 @@ public class FOMPerson extends FOMExtens
public Element setName(String name) {
if (name != null) {
- FOMFactory fomfactory = (FOMFactory)getOMFactory();
- Element el = fomfactory.newName(null);
+ Element el = getFactory().newName(null);
el.setText(name);
_setChild(NAME, (OMElement)el);
return el;
@@ -74,8 +73,7 @@ public class FOMPerson extends FOMExtens
public Element setEmail(String email) {
if (email != null) {
- FOMFactory fomfactory = (FOMFactory)getOMFactory();
- Element el = fomfactory.newEmail(null);
+ Element el = getFactory().newEmail(null);
el.setText(email);
_setChild(EMAIL, (OMElement)el);
return el;
@@ -104,8 +102,7 @@ public class FOMPerson extends FOMExtens
public IRIElement setUri(String uri) {
if (uri != null) {
- FOMFactory fomfactory = (FOMFactory)getOMFactory();
- IRIElement el = fomfactory.newUri(null);
+ IRIElement el = getFactory().newUri(null);
el.setValue(uri);
_setChild(URI, (OMElement)el);
return el;
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=1700228&r1=1700227&r2=1700228&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
Mon Aug 31 10:51:24 2015
@@ -60,8 +60,7 @@ public class FOMService extends FOMExten
}
public Workspace addWorkspace(String title) {
- FOMFactory fomfactory = (FOMFactory)getOMFactory();
- Workspace workspace = fomfactory.newWorkspace(this);
+ Workspace workspace = getFactory().newWorkspace(this);
workspace.setTitle(title);
return workspace;
}
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=1700228&r1=1700227&r2=1700228&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
Mon Aug 31 10:51:24 2015
@@ -63,15 +63,13 @@ public class FOMSource extends FOMExtens
}
public Person addAuthor(String name) {
- FOMFactory fomfactory = (FOMFactory)this.getOMFactory();
- Person person = fomfactory.newAuthor(this);
+ Person person = getFactory().newAuthor(this);
person.setName(name);
return person;
}
public Person addAuthor(String name, String email, String uri) {
- FOMFactory fomfactory = (FOMFactory)this.getOMFactory();
- Person person = fomfactory.newAuthor(this);
+ Person person = getFactory().newAuthor(this);
person.setName(name);
person.setEmail(email);
person.setUri(uri);
@@ -103,15 +101,13 @@ public class FOMSource extends FOMExtens
}
public Category addCategory(String term) {
- FOMFactory factory = (FOMFactory)this.getOMFactory();
- Category category = factory.newCategory(this);
+ Category category = getFactory().newCategory(this);
category.setTerm(term);
return category;
}
public Category addCategory(String scheme, String term, String label) {
- FOMFactory factory = (FOMFactory)this.getOMFactory();
- Category category = factory.newCategory(this);
+ Category category = getFactory().newCategory(this);
category.setTerm(term);
category.setScheme(scheme);
category.setLabel(label);
@@ -128,15 +124,13 @@ public class FOMSource extends FOMExtens
}
public Person addContributor(String name) {
- FOMFactory fomfactory = (FOMFactory)this.getOMFactory();
- Person person = fomfactory.newContributor(this);
+ Person person = getFactory().newContributor(this);
person.setName(name);
return person;
}
public Person addContributor(String name, String email, String uri) {
- FOMFactory fomfactory = (FOMFactory)this.getOMFactory();
- Person person = fomfactory.newContributor(this);
+ Person person = getFactory().newContributor(this);
person.setName(name);
person.setEmail(email);
person.setUri(uri);
@@ -181,8 +175,7 @@ public class FOMSource extends FOMExtens
id.setValue(value);
return id;
} else {
- FOMFactory fomfactory = (FOMFactory)getOMFactory();
- IRIElement iri = fomfactory.newID(this);
+ IRIElement iri = getFactory().newID(this);
iri.setValue((normalize) ? IRI.normalizeString(value) : value);
return iri;
}
@@ -210,8 +203,7 @@ public class FOMSource extends FOMExtens
}
public Link addLink(String href, String rel) {
- FOMFactory fomfactory = (FOMFactory)getOMFactory();
- Link link = fomfactory.newLink(this);
+ Link link = getFactory().newLink(this);
link.setHref(href);
if (rel != null)
link.setRel(rel);
@@ -219,8 +211,7 @@ public class FOMSource extends FOMExtens
}
public Link addLink(String href, String rel, String type, String title,
String hreflang, long length) {
- FOMFactory fomfactory = (FOMFactory)getOMFactory();
- Link link = fomfactory.newLink(this);
+ Link link = getFactory().newLink(this);
link.setHref(href);
link.setRel(rel);
link.setMimeType(type);
@@ -240,8 +231,7 @@ public class FOMSource extends FOMExtens
}
public Text setRights(String value) {
- FOMFactory factory = (FOMFactory)this.getOMFactory();
- Text text = factory.newRights();
+ Text text = getFactory().newRights();
text.setValue(value);
setRightsElement(text);
return text;
@@ -256,16 +246,14 @@ public class FOMSource extends FOMExtens
}
public Text setRights(String value, Text.Type type) {
- FOMFactory factory = (FOMFactory)this.getOMFactory();
- Text text = factory.newRights(type);
+ Text text = getFactory().newRights(type);
text.setValue(value);
setRightsElement(text);
return text;
}
public Text setRights(Div value) {
- FOMFactory factory = (FOMFactory)this.getOMFactory();
- Text text = factory.newRights(Text.Type.XHTML);
+ Text text = getFactory().newRights(Text.Type.XHTML);
text.setValueElement(value);
setRightsElement(text);
return text;
@@ -285,8 +273,7 @@ public class FOMSource extends FOMExtens
}
public Text setSubtitle(String value) {
- FOMFactory factory = (FOMFactory)this.getOMFactory();
- Text text = factory.newSubtitle();
+ Text text = getFactory().newSubtitle();
text.setValue(value);
setSubtitleElement(text);
return text;
@@ -301,16 +288,14 @@ public class FOMSource extends FOMExtens
}
public Text setSubtitle(String value, Text.Type type) {
- FOMFactory factory = (FOMFactory)this.getOMFactory();
- Text text = factory.newSubtitle(type);
+ Text text = getFactory().newSubtitle(type);
text.setValue(value);
setSubtitleElement(text);
return text;
}
public Text setSubtitle(Div value) {
- FOMFactory factory = (FOMFactory)this.getOMFactory();
- Text text = factory.newSubtitle(Text.Type.XHTML);
+ Text text = getFactory().newSubtitle(Text.Type.XHTML);
text.setValueElement(value);
setSubtitleElement(text);
return text;
@@ -330,8 +315,7 @@ public class FOMSource extends FOMExtens
}
public Text setTitle(String value) {
- FOMFactory factory = (FOMFactory)this.getOMFactory();
- Text text = factory.newTitle();
+ Text text = getFactory().newTitle();
text.setValue(value);
setTitleElement(text);
return text;
@@ -346,16 +330,14 @@ public class FOMSource extends FOMExtens
}
public Text setTitle(String value, Text.Type type) {
- FOMFactory factory = (FOMFactory)this.getOMFactory();
- Text text = factory.newTitle(type);
+ Text text = getFactory().newTitle(type);
text.setValue(value);
setTitleElement(text);
return text;
}
public Text setTitle(Div value) {
- FOMFactory factory = (FOMFactory)this.getOMFactory();
- Text text = factory.newTitle(Text.Type.XHTML);
+ Text text = getFactory().newTitle(Text.Type.XHTML);
text.setValueElement(value);
setTitleElement(text);
return text;
@@ -397,8 +379,7 @@ public class FOMSource extends FOMExtens
dte.setValue(value);
return dte;
} else {
- FOMFactory fomfactory = (FOMFactory)getOMFactory();
- DateTime dt = fomfactory.newUpdated(this);
+ DateTime dt = getFactory().newUpdated(this);
dt.setValue(value);
return dt;
}
@@ -425,8 +406,7 @@ public class FOMSource extends FOMExtens
}
public Generator setGenerator(String uri, String version, String value) {
- FOMFactory fomfactory = (FOMFactory)getOMFactory();
- Generator generator = fomfactory.newGenerator(this);
+ Generator generator = getFactory().newGenerator(this);
if (uri != null)
generator.setUri(uri);
if (version != null)
@@ -453,8 +433,7 @@ public class FOMSource extends FOMExtens
_removeChildren(ICON, false);
return null;
}
- FOMFactory fomfactory = (FOMFactory)getOMFactory();
- IRIElement iri = fomfactory.newIcon(this);
+ IRIElement iri = getFactory().newIcon(this);
iri.setValue(value);
return iri;
}
@@ -482,8 +461,7 @@ public class FOMSource extends FOMExtens
_removeChildren(LOGO, false);
return null;
}
- FOMFactory fomfactory = (FOMFactory)getOMFactory();
- IRIElement iri = fomfactory.newLogo(this);
+ IRIElement iri = getFactory().newLogo(this);
iri.setValue(value);
return iri;
}
@@ -567,7 +545,7 @@ public class FOMSource extends FOMExtens
}
public Feed getAsFeed() {
- FOMFeed feed = (FOMFeed)((FOMFactory)getOMFactory()).newFeed();
+ FOMFeed feed = (FOMFeed)getFactory().newFeed();
for (Iterator i = this.getChildElements(); i.hasNext();) {
FOMElement child = (FOMElement)i.next();
if (!child.getQName().equals(ENTRY)) {
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=1700228&r1=1700227&r2=1700228&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
Mon Aug 31 10:51:24 2015
@@ -41,8 +41,7 @@ public class FOMWorkspace extends FOMExt
}
private Text setTitle(String title, Text.Type type) {
- FOMFactory fomfactory = (FOMFactory)getOMFactory();
- Text text = fomfactory.newText(PREFIXED_TITLE, type);
+ Text text = getFactory().newText(PREFIXED_TITLE, type);
text.setValue(title);
this._setChild(PREFIXED_TITLE, (OMElement)text);
return text;
@@ -89,16 +88,14 @@ public class FOMWorkspace extends FOMExt
}
public Collection addCollection(String title, String href) {
- FOMFactory fomfactory = (FOMFactory)getOMFactory();
- Collection collection = fomfactory.newCollection(this);
+ Collection collection = getFactory().newCollection(this);
collection.setTitle(title);
collection.setHref(href);
return collection;
}
public Collection addMultipartCollection(String title, String href) {
- FOMFactory fomfactory = (FOMFactory)getOMFactory();
- Collection collection = fomfactory.newMultipartCollection(this);
+ Collection collection =
((FOMFactory)getFactory()).newMultipartCollection(this);
collection.setTitle(title);
collection.setHref(href);
return collection;
