Author: veithen
Date: Tue Sep 22 07:25:13 2015
New Revision: 1704464
URL: http://svn.apache.org/viewvc?rev=1704464&view=rev
Log:
Convert FOMLink into mixins.
Added:
webservices/axiom/trunk/aspects/fom-aspects/src/main/java/org/apache/axiom/fom/AbderaLinkMixin.aj
- copied, changed from r1704437,
webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMLink.java
Modified:
webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMLink.java
Copied:
webservices/axiom/trunk/aspects/fom-aspects/src/main/java/org/apache/axiom/fom/AbderaLinkMixin.aj
(from r1704437,
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/aspects/fom-aspects/src/main/java/org/apache/axiom/fom/AbderaLinkMixin.aj?p2=webservices/axiom/trunk/aspects/fom-aspects/src/main/java/org/apache/axiom/fom/AbderaLinkMixin.aj&p1=webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMLink.java&r1=1704437&r2=1704464&rev=1704464&view=diff
==============================================================================
---
webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMLink.java
(original)
+++
webservices/axiom/trunk/aspects/fom-aspects/src/main/java/org/apache/axiom/fom/AbderaLinkMixin.aj
Tue Sep 22 07:25:13 2015
@@ -15,29 +15,35 @@
* copyright in this work, please see the NOTICE file in the top level
* directory of this distribution.
*/
-package org.apache.abdera.parser.stax;
+package org.apache.axiom.fom;
+
+import static org.apache.abdera.util.Constants.ATITLE;
+import static org.apache.abdera.util.Constants.HREFLANG;
+import static org.apache.abdera.util.Constants.LENGTH;
+import static org.apache.abdera.util.Constants.REL;
+import static org.apache.abdera.util.Constants.TYPE;
import javax.activation.MimeType;
import org.apache.abdera.model.Link;
import org.apache.axiom.fom.AbderaLink;
-public class FOMLink extends FOMExtensibleElement implements AbderaLink {
- public Link setHref(String href) {
+public aspect AbderaLinkMixin {
+ public final Link AbderaLink.setHref(String href) {
internalSetHref(href);
return this;
}
- public String getRel() {
+ public final String AbderaLink.getRel() {
return getAttributeValue(REL);
}
- public Link setRel(String rel) {
+ public final Link AbderaLink.setRel(String rel) {
setAttributeValue(REL, rel);
return this;
}
- public MimeType getMimeType() {
+ public final MimeType AbderaLink.getMimeType() {
try {
String type = getAttributeValue(TYPE);
return (type != null) ? new MimeType(type) : null;
@@ -46,7 +52,7 @@ public class FOMLink extends FOMExtensib
}
}
- public Link setMimeType(String type) {
+ public final Link AbderaLink.setMimeType(String type) {
try {
if (type != null)
setAttributeValue(TYPE, (new MimeType(type)).toString());
@@ -58,11 +64,11 @@ public class FOMLink extends FOMExtensib
return this;
}
- public String getHrefLang() {
+ public final String AbderaLink.getHrefLang() {
return getAttributeValue(HREFLANG);
}
- public Link setHrefLang(String lang) {
+ public final Link AbderaLink.setHrefLang(String lang) {
if (lang != null)
setAttributeValue(HREFLANG, lang);
else
@@ -70,11 +76,11 @@ public class FOMLink extends FOMExtensib
return this;
}
- public String getTitle() {
+ public final String AbderaLink.getTitle() {
return getAttributeValue(ATITLE);
}
- public Link setTitle(String title) {
+ public final Link AbderaLink.setTitle(String title) {
if (title != null)
setAttributeValue(ATITLE, title);
else
@@ -82,12 +88,12 @@ public class FOMLink extends FOMExtensib
return this;
}
- public long getLength() {
+ public final long AbderaLink.getLength() {
String l = getAttributeValue(LENGTH);
return (l != null) ? Long.valueOf(l) : -1;
}
- public Link setLength(long length) {
+ public final Link AbderaLink.setLength(long length) {
if (length > -1)
setAttributeValue(LENGTH, (length >= 0) ? String.valueOf(length) :
"0");
else
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=1704464&r1=1704463&r2=1704464&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 Sep 22 07:25:13 2015
@@ -17,81 +17,8 @@
*/
package org.apache.abdera.parser.stax;
-import javax.activation.MimeType;
-
-import org.apache.abdera.model.Link;
import org.apache.axiom.fom.AbderaLink;
public class FOMLink extends FOMExtensibleElement implements AbderaLink {
- public Link setHref(String href) {
- internalSetHref(href);
- return this;
- }
-
- public String getRel() {
- return getAttributeValue(REL);
- }
-
- public Link setRel(String rel) {
- setAttributeValue(REL, rel);
- return this;
- }
-
- public MimeType getMimeType() {
- try {
- String type = getAttributeValue(TYPE);
- return (type != null) ? new MimeType(type) : null;
- } catch (javax.activation.MimeTypeParseException e) {
- throw new org.apache.abdera.util.MimeTypeParseException(e);
- }
- }
-
- public Link setMimeType(String type) {
- try {
- if (type != null)
- setAttributeValue(TYPE, (new MimeType(type)).toString());
- else
- removeAttribute(TYPE);
- } catch (javax.activation.MimeTypeParseException e) {
- throw new org.apache.abdera.util.MimeTypeParseException(e);
- }
- return this;
- }
-
- public String getHrefLang() {
- return getAttributeValue(HREFLANG);
- }
-
- public Link setHrefLang(String lang) {
- if (lang != null)
- setAttributeValue(HREFLANG, lang);
- else
- removeAttribute(HREFLANG);
- return this;
- }
-
- public String getTitle() {
- return getAttributeValue(ATITLE);
- }
-
- public Link setTitle(String title) {
- if (title != null)
- setAttributeValue(ATITLE, title);
- else
- removeAttribute(ATITLE);
- return this;
- }
-
- public long getLength() {
- String l = getAttributeValue(LENGTH);
- return (l != null) ? Long.valueOf(l) : -1;
- }
- public Link setLength(long length) {
- if (length > -1)
- setAttributeValue(LENGTH, (length >= 0) ? String.valueOf(length) :
"0");
- else
- removeAttribute(LENGTH);
- return this;
- }
}
