Author: veithen
Date: Tue Sep 22 22:12:11 2015
New Revision: 1704743
URL: http://svn.apache.org/viewvc?rev=1704743&view=rev
Log:
Some code simplifications.
Modified:
webservices/axiom/trunk/aspects/fom-aspects/src/main/java/org/apache/axiom/fom/AbderaLinkMixin.aj
webservices/axiom/trunk/aspects/fom-aspects/src/main/java/org/apache/axiom/fom/HrefAttributeSupportMixin.aj
webservices/axiom/trunk/aspects/fom-aspects/src/main/java/org/apache/axiom/fom/IRIUtil.java
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/FOMContent.java
webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMDiv.java
webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMGenerator.java
Modified:
webservices/axiom/trunk/aspects/fom-aspects/src/main/java/org/apache/axiom/fom/AbderaLinkMixin.aj
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/fom-aspects/src/main/java/org/apache/axiom/fom/AbderaLinkMixin.aj?rev=1704743&r1=1704742&r2=1704743&view=diff
==============================================================================
---
webservices/axiom/trunk/aspects/fom-aspects/src/main/java/org/apache/axiom/fom/AbderaLinkMixin.aj
(original)
+++
webservices/axiom/trunk/aspects/fom-aspects/src/main/java/org/apache/axiom/fom/AbderaLinkMixin.aj
Tue Sep 22 22:12:11 2015
@@ -54,10 +54,7 @@ public aspect AbderaLinkMixin {
public final Link AbderaLink.setMimeType(String type) {
try {
- if (type != null)
- setAttributeValue(TYPE, (new MimeType(type)).toString());
- else
- removeAttribute(TYPE);
+ setAttributeValue(TYPE, type == null ? null : (new
MimeType(type)).toString());
} catch (javax.activation.MimeTypeParseException e) {
throw new org.apache.abdera.util.MimeTypeParseException(e);
}
@@ -69,10 +66,7 @@ public aspect AbderaLinkMixin {
}
public final Link AbderaLink.setHrefLang(String lang) {
- if (lang != null)
- setAttributeValue(HREFLANG, lang);
- else
- removeAttribute(HREFLANG);
+ setAttributeValue(HREFLANG, lang);
return this;
}
@@ -81,10 +75,7 @@ public aspect AbderaLinkMixin {
}
public final Link AbderaLink.setTitle(String title) {
- if (title != null)
- setAttributeValue(ATITLE, title);
- else
- removeAttribute(ATITLE);
+ setAttributeValue(ATITLE, title);
return this;
}
Modified:
webservices/axiom/trunk/aspects/fom-aspects/src/main/java/org/apache/axiom/fom/HrefAttributeSupportMixin.aj
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/fom-aspects/src/main/java/org/apache/axiom/fom/HrefAttributeSupportMixin.aj?rev=1704743&r1=1704742&r2=1704743&view=diff
==============================================================================
---
webservices/axiom/trunk/aspects/fom-aspects/src/main/java/org/apache/axiom/fom/HrefAttributeSupportMixin.aj
(original)
+++
webservices/axiom/trunk/aspects/fom-aspects/src/main/java/org/apache/axiom/fom/HrefAttributeSupportMixin.aj
Tue Sep 22 22:12:11 2015
@@ -32,10 +32,6 @@ public aspect HrefAttributeSupportMixin
}
public final void HrefAttributeSupport.internalSetHref(String href) {
- if (href != null) {
- setAttributeValue(HREF, (new IRI(href)).toString());
- } else {
- removeAttribute(HREF);
- }
+ setAttributeValue(HREF, IRIUtil.normalize(href));
}
}
Modified:
webservices/axiom/trunk/aspects/fom-aspects/src/main/java/org/apache/axiom/fom/IRIUtil.java
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/fom-aspects/src/main/java/org/apache/axiom/fom/IRIUtil.java?rev=1704743&r1=1704742&r2=1704743&view=diff
==============================================================================
---
webservices/axiom/trunk/aspects/fom-aspects/src/main/java/org/apache/axiom/fom/IRIUtil.java
(original)
+++
webservices/axiom/trunk/aspects/fom-aspects/src/main/java/org/apache/axiom/fom/IRIUtil.java
Tue Sep 22 22:12:11 2015
@@ -34,4 +34,8 @@ public final class IRIUtil {
public static IRI resolve(IRI base, IRI value) {
return base != null ? base.resolve(value) : value;
}
+
+ public static String normalize(String iri) {
+ return iri == null ? null : new IRI(iri).toString();
+ }
}
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=1704743&r1=1704742&r2=1704743&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 Sep 22 22:12:11 2015
@@ -25,6 +25,7 @@ import org.apache.abdera.model.Categorie
import org.apache.abdera.model.Category;
import org.apache.abdera.parser.stax.util.FOMHelper;
import org.apache.axiom.fom.AbderaCategories;
+import org.apache.axiom.fom.IRIUtil;
import org.apache.axiom.om.OMElement;
public class FOMCategories extends FOMExtensibleElement implements
AbderaCategories {
@@ -95,10 +96,7 @@ public class FOMCategories extends FOMEx
}
public Categories setScheme(String scheme) {
- if (scheme != null)
- setAttributeValue(SCHEME, new IRI(scheme).toString());
- else
- removeAttribute(SCHEME);
+ setAttributeValue(SCHEME, IRIUtil.normalize(scheme));
return this;
}
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=1704743&r1=1704742&r2=1704743&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 Sep 22 22:12:11 2015
@@ -21,6 +21,7 @@ import org.apache.abdera.i18n.iri.IRI;
import org.apache.abdera.model.Category;
import org.apache.abdera.model.Element;
import org.apache.axiom.fom.AbderaCategory;
+import org.apache.axiom.fom.IRIUtil;
public class FOMCategory extends FOMExtensibleElement implements
AbderaCategory {
public String getTerm() {
@@ -28,23 +29,16 @@ public class FOMCategory extends FOMExte
}
public Category setTerm(String term) {
- if (term != null)
- setAttributeValue(TERM, term);
- else
- removeAttribute(TERM);
+ setAttributeValue(TERM, term);
return this;
}
public IRI getScheme() {
- String value = getAttributeValue(SCHEME);
- return (value != null) ? new IRI(value) : null;
+ return IRIUtil.getUriValue(getAttributeValue(SCHEME));
}
public Category setScheme(String scheme) {
- if (scheme != null)
- setAttributeValue(SCHEME, new IRI(scheme).toString());
- else
- removeAttribute(SCHEME);
+ setAttributeValue(SCHEME, IRIUtil.normalize(scheme));
return this;
}
@@ -53,10 +47,7 @@ public class FOMCategory extends FOMExte
}
public Category setLabel(String label) {
- if (label != null)
- setAttributeValue(LABEL, label);
- else
- removeAttribute(LABEL);
+ setAttributeValue(LABEL, label);
return this;
}
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=1704743&r1=1704742&r2=1704743&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 Sep 22 22:12:11 2015
@@ -108,10 +108,7 @@ public class FOMContent extends FOMExten
public Content setMimeType(String type) {
try {
- if (type != null)
- setAttributeValue(TYPE, (new MimeType(type)).toString());
- else
- removeAttribute(TYPE);
+ setAttributeValue(TYPE, type == null ? null : (new
MimeType(type)).toString());
} catch (javax.activation.MimeTypeParseException e) {
throw new org.apache.abdera.util.MimeTypeParseException(e);
}
@@ -127,10 +124,7 @@ public class FOMContent extends FOMExten
}
public Content setSrc(String src) {
- if (src != null)
- setAttributeValue(SRC, (new IRI(src)).toString());
- else
- removeAttribute(SRC);
+ setAttributeValue(SRC, IRIUtil.normalize(src));
return this;
}
Modified:
webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMDiv.java
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMDiv.java?rev=1704743&r1=1704742&r2=1704743&view=diff
==============================================================================
---
webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMDiv.java
(original)
+++
webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMDiv.java
Tue Sep 22 22:12:11 2015
@@ -48,18 +48,12 @@ public class FOMDiv extends FOMExtensibl
}
public Div setId(String id) {
- if (id != null)
- setAttributeValue(AID, id);
- else
- removeAttribute(AID);
+ setAttributeValue(AID, id);
return this;
}
public Div setTitle(String title) {
- if (title != null)
- setAttributeValue(ATITLE, title);
- else
- removeAttribute(ATITLE);
+ setAttributeValue(ATITLE, title);
return this;
}
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=1704743&r1=1704742&r2=1704743&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 Sep 22 22:12:11 2015
@@ -32,10 +32,7 @@ public class FOMGenerator extends FOMEle
}
public Generator setUri(String uri) {
- if (uri != null)
- setAttributeValue(AURI, (new IRI(uri)).toString());
- else
- removeAttribute(AURI);
+ setAttributeValue(AURI, IRIUtil.normalize(uri));
return this;
}
@@ -44,10 +41,7 @@ public class FOMGenerator extends FOMEle
}
public Generator setVersion(String version) {
- if (version != null)
- setAttributeValue(VERSION, version);
- else
- removeAttribute(VERSION);
+ setAttributeValue(VERSION, version);
return this;
}
