svn commit: r1705480 - in /webservices/axiom/trunk: aspects/fom-aspects/src/main/java/org/apache/axiom/fom/AbderaCategoryMixin.aj implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMCategory.java

[veithen]

Author: veithen
Date: Sat Sep 26 17:04:43 2015
New Revision: 1705480

URL: http://svn.apache.org/viewvc?rev=1705480&view=rev
Log:
Transform FOMCategory into mixins.

Added:
    
webservices/axiom/trunk/aspects/fom-aspects/src/main/java/org/apache/axiom/fom/AbderaCategoryMixin.aj
      - copied, changed from r1704765, 
webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMCategory.java
Modified:
    
webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMCategory.java

Copied: 
webservices/axiom/trunk/aspects/fom-aspects/src/main/java/org/apache/axiom/fom/AbderaCategoryMixin.aj
 (from r1704765, 
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/aspects/fom-aspects/src/main/java/org/apache/axiom/fom/AbderaCategoryMixin.aj?p2=webservices/axiom/trunk/aspects/fom-aspects/src/main/java/org/apache/axiom/fom/AbderaCategoryMixin.aj&p1=webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMCategory.java&r1=1704765&r2=1705480&rev=1705480&view=diff
==============================================================================
--- 
webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMCategory.java
 (original)
+++ 
webservices/axiom/trunk/aspects/fom-aspects/src/main/java/org/apache/axiom/fom/AbderaCategoryMixin.aj
 Sat Sep 26 17:04:43 2015
@@ -15,37 +15,41 @@
  * 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.LABEL;
+import static org.apache.abdera.util.Constants.SCHEME;
+import static org.apache.abdera.util.Constants.TERM;
 
 import org.apache.abdera.i18n.iri.IRI;
 import org.apache.abdera.model.Category;
 import org.apache.axiom.fom.AbderaCategory;
 import org.apache.axiom.fom.IRIUtil;
 
-public class FOMCategory extends FOMExtensibleElement implements 
AbderaCategory {
-    public String getTerm() {
+public aspect AbderaCategoryMixin {
+    public final String AbderaCategory.getTerm() {
         return getAttributeValue(TERM);
     }
 
-    public Category setTerm(String term) {
+    public final Category AbderaCategory.setTerm(String term) {
         setAttributeValue(TERM, term);
         return this;
     }
 
-    public IRI getScheme() {
+    public final IRI AbderaCategory.getScheme() {
         return IRIUtil.getUriValue(getAttributeValue(SCHEME));
     }
 
-    public Category setScheme(String scheme) {
+    public final Category AbderaCategory.setScheme(String scheme) {
         setAttributeValue(SCHEME, IRIUtil.normalize(scheme));
         return this;
     }
 
-    public String getLabel() {
+    public final String AbderaCategory.getLabel() {
         return getAttributeValue(LABEL);
     }
 
-    public Category setLabel(String label) {
+    public final Category AbderaCategory.setLabel(String label) {
         setAttributeValue(LABEL, label);
         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=1705480&r1=1705479&r2=1705480&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
 Sat Sep 26 17:04:43 2015
@@ -17,36 +17,8 @@
  */
 package org.apache.abdera.parser.stax;
 
-import org.apache.abdera.i18n.iri.IRI;
-import org.apache.abdera.model.Category;
 import org.apache.axiom.fom.AbderaCategory;
-import org.apache.axiom.fom.IRIUtil;
 
 public class FOMCategory extends FOMExtensibleElement implements 
AbderaCategory {
-    public String getTerm() {
-        return getAttributeValue(TERM);
-    }
 
-    public Category setTerm(String term) {
-        setAttributeValue(TERM, term);
-        return this;
-    }
-
-    public IRI getScheme() {
-        return IRIUtil.getUriValue(getAttributeValue(SCHEME));
-    }
-
-    public Category setScheme(String scheme) {
-        setAttributeValue(SCHEME, IRIUtil.normalize(scheme));
-        return this;
-    }
-
-    public String getLabel() {
-        return getAttributeValue(LABEL);
-    }
-
-    public Category setLabel(String label) {
-        setAttributeValue(LABEL, label);
-        return this;
-    }
 }