svn commit: r1705443 - in /webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax: FOMDateTime.java FOMIRI.java

[veithen]

Author: veithen
Date: Sat Sep 26 12:43:12 2015
New Revision: 1705443

URL: http://svn.apache.org/viewvc?rev=1705443&view=rev
Log:
Some code simplifications.

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

Modified: 
webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMDateTime.java
URL: 
http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMDateTime.java?rev=1705443&r1=1705442&r2=1705443&view=diff
==============================================================================
--- 
webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMDateTime.java
 (original)
+++ 
webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMDateTime.java
 Sat Sep 26 12:43:12 2015
@@ -36,28 +36,19 @@ public class FOMDateTime extends FOMElem
 
     public DateTime setValue(AtomDate dateTime) {
         value = null;
-        if (dateTime != null)
-            setText(dateTime.getValue());
-        else
-            _removeAllChildren();
+        setText(dateTime == null ? null : dateTime.getValue());
         return this;
     }
 
     public DateTime setDate(Date date) {
         value = null;
-        if (date != null)
-            setText(AtomDate.valueOf(date).getValue());
-        else
-            _removeAllChildren();
+        setText(date == null ? null : AtomDate.valueOf(date).getValue());
         return this;
     }
 
     public DateTime setCalendar(Calendar date) {
         value = null;
-        if (date != null)
-            setText(AtomDate.valueOf(date).getValue());
-        else
-            _removeAllChildren();
+        setText(date == null ? null : AtomDate.valueOf(date).getValue());
         return this;
     }
 
@@ -69,10 +60,7 @@ public class FOMDateTime extends FOMElem
 
     public DateTime setString(String date) {
         value = null;
-        if (date != null)
-            setText(AtomDate.valueOf(date).getValue());
-        else
-            _removeAllChildren();
+        setText(date == null ? null : AtomDate.valueOf(date).getValue());
         return this;
     }
 

Modified: 
webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMIRI.java
URL: 
http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMIRI.java?rev=1705443&r1=1705442&r2=1705443&view=diff
==============================================================================
--- 
webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMIRI.java
 (original)
+++ 
webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMIRI.java
 Sat Sep 26 12:43:12 2015
@@ -28,10 +28,7 @@ public class FOMIRI extends FOMElement i
     }
 
     public IRIElement setValue(String iri) {
-        if (iri != null)
-            setText((new IRI(iri)).toString());
-        else
-            _removeAllChildren();
+        setText(IRIUtil.normalize(iri));
         return this;
     }