Author: veithen
Date: Sun Sep 27 10:37:19 2015
New Revision: 1705525
URL: http://svn.apache.org/viewvc?rev=1705525&view=rev
Log:
Some code simplifications.
Modified:
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/FOMPerson.java
webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMSource.java
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=1705525&r1=1705524&r2=1705525&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
Sun Sep 27 10:37:19 2015
@@ -336,10 +336,7 @@ public class FOMElement extends FOMChild
}
protected <T extends Text> void setTextElement(QName qname, T text,
boolean many) {
- if (text != null) {
- _setChild(qname, (OMElement)text);
- } else
- _removeChildren(qname, false);
+ _setChild(qname, (OMElement)text);
}
public void setText(String text) {
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=1705525&r1=1705524&r2=1705525&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
Sun Sep 27 10:37:19 2015
@@ -106,11 +106,7 @@ public class FOMEntry extends FOMExtensi
}
public Entry setContentElement(Content content) {
- if (content != null) {
- _setChild(CONTENT, (OMElement)content);
- } else {
- _removeChildren(CONTENT, false);
- }
+ _setChild(CONTENT, (OMElement)content);
return this;
}
@@ -301,10 +297,7 @@ public class FOMEntry extends FOMExtensi
}
public Entry setIdElement(IRIElement id) {
- if (id != null)
- _setChild(ID, (OMElement)id);
- else
- _removeChildren(ID, false);
+ _setChild(ID, (OMElement)id);
return this;
}
@@ -385,10 +378,7 @@ public class FOMEntry extends FOMExtensi
}
public Entry setPublishedElement(DateTime dateTime) {
- if (dateTime != null)
- _setChild(PUBLISHED, (OMElement)dateTime);
- else
- _removeChildren(PUBLISHED, false);
+ _setChild(PUBLISHED, (OMElement)dateTime);
return this;
}
@@ -468,13 +458,9 @@ public class FOMEntry extends FOMExtensi
}
public Entry setSource(Source source) {
- if (source != null) {
- if (source instanceof Feed)
- source = ((Feed)source).getAsSource();
- _setChild(SOURCE, (OMElement)source);
- } else {
- _removeChildren(SOURCE, false);
- }
+ if (source instanceof Feed)
+ source = ((Feed)source).getAsSource();
+ _setChild(SOURCE, (OMElement)source);
return this;
}
@@ -567,10 +553,7 @@ public class FOMEntry extends FOMExtensi
}
public Entry setUpdatedElement(DateTime updated) {
- if (updated != null)
- _setChild(UPDATED, (OMElement)updated);
- else
- _removeChildren(UPDATED, false);
+ _setChild(UPDATED, (OMElement)updated);
return this;
}
@@ -613,10 +596,7 @@ public class FOMEntry extends FOMExtensi
public void setEditedElement(DateTime updated) {
declareNamespace(APP_NS, "app");
_removeChildren(PRE_RFC_EDITED, false);
- if (updated != null)
- _setChild(EDITED, (OMElement)updated);
- else
- _removeChildren(EDITED, false);
+ _setChild(EDITED, (OMElement)updated);
}
public Date getEdited() {
@@ -668,10 +648,7 @@ public class FOMEntry extends FOMExtensi
public Entry setControl(Control control) {
_removeChildren(PRE_RFC_CONTROL, true);
- if (control != null)
- _setChild(CONTROL, (OMElement)control);
- else
- _removeChildren(CONTROL, false);
+ _setChild(CONTROL, (OMElement)control);
return this;
}
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=1705525&r1=1705524&r2=1705525&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
Sun Sep 27 10:37:19 2015
@@ -34,23 +34,20 @@ public class FOMPerson extends FOMExtens
}
public Person setNameElement(Element element) {
- if (element != null)
- _setChild(NAME, (OMElement)element);
- else
- _removeChildren(NAME, false);
+ _setChild(NAME, (OMElement)element);
return this;
}
public Element setName(String name) {
+ Element el;
if (name != null) {
- Element el = getFactory().newName(null);
+ el = getFactory().newName();
el.setText(name);
- _setChild(NAME, (OMElement)el);
- return el;
} else {
- _removeChildren(NAME, false);
- return null;
+ el = null;
}
+ _setChild(NAME, (OMElement)el);
+ return el;
}
public String getName() {
@@ -63,23 +60,20 @@ public class FOMPerson extends FOMExtens
}
public Person setEmailElement(Element element) {
- if (element != null)
- _setChild(EMAIL, (OMElement)element);
- else
- _removeChildren(EMAIL, false);
+ _setChild(EMAIL, (OMElement)element);
return this;
}
public Element setEmail(String email) {
+ Element el;
if (email != null) {
- Element el = getFactory().newEmail(null);
+ el = getFactory().newEmail();
el.setText(email);
- _setChild(EMAIL, (OMElement)el);
- return el;
} else {
- _removeChildren(EMAIL, false);
- return null;
+ el = null;
}
+ _setChild(EMAIL, (OMElement)el);
+ return el;
}
public String getEmail() {
@@ -92,23 +86,20 @@ public class FOMPerson extends FOMExtens
}
public Person setUriElement(IRIElement uri) {
- if (uri != null)
- _setChild(URI, (OMElement)uri);
- else
- _removeChildren(URI, false);
+ _setChild(URI, (OMElement)uri);
return this;
}
public IRIElement setUri(String uri) {
+ IRIElement el;
if (uri != null) {
- IRIElement el = getFactory().newUri(null);
+ el = getFactory().newUri();
el.setValue(uri);
- _setChild(URI, (OMElement)el);
- return el;
} else {
- _removeChildren(URI, false);
- return null;
+ el = null;
}
+ _setChild(URI, (OMElement)el);
+ return el;
}
public IRI getUri() {
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=1705525&r1=1705524&r2=1705525&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
Sun Sep 27 10:37:19 2015
@@ -117,10 +117,7 @@ public class FOMSource extends FOMExtens
}
public <T extends Source> T setIdElement(IRIElement id) {
- if (id != null)
- _setChild(ID, (OMElement)id);
- else
- _removeChildren(ID, false);
+ _setChild(ID, (OMElement)id);
return (T)this;
}
@@ -327,10 +324,7 @@ public class FOMSource extends FOMExtens
}
public <T extends Source> T setUpdatedElement(DateTime updated) {
- if (updated != null)
- _setChild(UPDATED, (OMElement)updated);
- else
- _removeChildren(UPDATED, false);
+ _setChild(UPDATED, (OMElement)updated);
return (T)this;
}
@@ -373,10 +367,7 @@ public class FOMSource extends FOMExtens
}
public <T extends Source> T setGenerator(Generator generator) {
- if (generator != null)
- _setChild(GENERATOR, (OMElement)generator);
- else
- _removeChildren(GENERATOR, false);
+ _setChild(GENERATOR, (OMElement)generator);
return (T)this;
}
@@ -396,10 +387,7 @@ public class FOMSource extends FOMExtens
}
public <T extends Source> T setIconElement(IRIElement iri) {
- if (iri != null)
- _setChild(ICON, (OMElement)iri);
- else
- _removeChildren(ICON, false);
+ _setChild(ICON, (OMElement)iri);
return (T)this;
}
@@ -424,10 +412,7 @@ public class FOMSource extends FOMExtens
}
public <T extends Source> T setLogoElement(IRIElement iri) {
- if (iri != null)
- _setChild(LOGO, (OMElement)iri);
- else
- _removeChildren(LOGO, false);
+ _setChild(LOGO, (OMElement)iri);
return (T)this;
}
@@ -501,12 +486,8 @@ public class FOMSource extends FOMExtens
}
public <T extends Source> T setCollection(Collection collection) {
- if (collection != null) {
- _removeChildren(PRE_RFC_COLLECTION, true);
- _setChild(COLLECTION, (OMElement)collection);
- } else {
- _removeChildren(COLLECTION, false);
- }
+ _removeChildren(PRE_RFC_COLLECTION, true);
+ _setChild(COLLECTION, (OMElement)collection);
return (T)this;
}
