You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by ve...@apache.org on 2015/09/26 13:58:23 UTC
svn commit: r1705420 - in
/webservices/axiom/trunk/aspects/fom-aspects/src/main/java/org/apache/axiom/fom:
AbderaCategories.java AbderaEntry.java AbderaSource.java Categorizable.java
CategorizableMixin.aj CategoryContainer.java CategoryContainerMixin.aj
Author: veithen
Date: Sat Sep 26 11:58:23 2015
New Revision: 1705420
URL: http://svn.apache.org/viewvc?rev=1705420&view=rev
Log:
Rename Categorizable to CategoryContainer.
Added:
webservices/axiom/trunk/aspects/fom-aspects/src/main/java/org/apache/axiom/fom/CategoryContainer.java
- copied, changed from r1705341, webservices/axiom/trunk/aspects/fom-aspects/src/main/java/org/apache/axiom/fom/Categorizable.java
webservices/axiom/trunk/aspects/fom-aspects/src/main/java/org/apache/axiom/fom/CategoryContainerMixin.aj
- copied, changed from r1705341, webservices/axiom/trunk/aspects/fom-aspects/src/main/java/org/apache/axiom/fom/CategorizableMixin.aj
Removed:
webservices/axiom/trunk/aspects/fom-aspects/src/main/java/org/apache/axiom/fom/Categorizable.java
webservices/axiom/trunk/aspects/fom-aspects/src/main/java/org/apache/axiom/fom/CategorizableMixin.aj
Modified:
webservices/axiom/trunk/aspects/fom-aspects/src/main/java/org/apache/axiom/fom/AbderaCategories.java
webservices/axiom/trunk/aspects/fom-aspects/src/main/java/org/apache/axiom/fom/AbderaEntry.java
webservices/axiom/trunk/aspects/fom-aspects/src/main/java/org/apache/axiom/fom/AbderaSource.java
Modified: webservices/axiom/trunk/aspects/fom-aspects/src/main/java/org/apache/axiom/fom/AbderaCategories.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/fom-aspects/src/main/java/org/apache/axiom/fom/AbderaCategories.java?rev=1705420&r1=1705419&r2=1705420&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/fom-aspects/src/main/java/org/apache/axiom/fom/AbderaCategories.java (original)
+++ webservices/axiom/trunk/aspects/fom-aspects/src/main/java/org/apache/axiom/fom/AbderaCategories.java Sat Sep 26 11:58:23 2015
@@ -20,6 +20,6 @@ package org.apache.axiom.fom;
import org.apache.abdera.model.Categories;
-public interface AbderaCategories extends Categories, AbderaExtensibleElement, HrefAttributeSupport, Categorizable {
+public interface AbderaCategories extends Categories, AbderaExtensibleElement, HrefAttributeSupport, CategoryContainer {
}
Modified: webservices/axiom/trunk/aspects/fom-aspects/src/main/java/org/apache/axiom/fom/AbderaEntry.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/fom-aspects/src/main/java/org/apache/axiom/fom/AbderaEntry.java?rev=1705420&r1=1705419&r2=1705420&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/fom-aspects/src/main/java/org/apache/axiom/fom/AbderaEntry.java (original)
+++ webservices/axiom/trunk/aspects/fom-aspects/src/main/java/org/apache/axiom/fom/AbderaEntry.java Sat Sep 26 11:58:23 2015
@@ -20,6 +20,6 @@ package org.apache.axiom.fom;
import org.apache.abdera.model.Entry;
-public interface AbderaEntry extends Entry, AbderaExtensibleElement, Categorizable {
+public interface AbderaEntry extends Entry, AbderaExtensibleElement, CategoryContainer {
}
Modified: webservices/axiom/trunk/aspects/fom-aspects/src/main/java/org/apache/axiom/fom/AbderaSource.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/fom-aspects/src/main/java/org/apache/axiom/fom/AbderaSource.java?rev=1705420&r1=1705419&r2=1705420&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/fom-aspects/src/main/java/org/apache/axiom/fom/AbderaSource.java (original)
+++ webservices/axiom/trunk/aspects/fom-aspects/src/main/java/org/apache/axiom/fom/AbderaSource.java Sat Sep 26 11:58:23 2015
@@ -20,6 +20,6 @@ package org.apache.axiom.fom;
import org.apache.abdera.model.Source;
-public interface AbderaSource extends Source, AbderaExtensibleElement, Categorizable {
+public interface AbderaSource extends Source, AbderaExtensibleElement, CategoryContainer {
}
Copied: webservices/axiom/trunk/aspects/fom-aspects/src/main/java/org/apache/axiom/fom/CategoryContainer.java (from r1705341, webservices/axiom/trunk/aspects/fom-aspects/src/main/java/org/apache/axiom/fom/Categorizable.java)
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/fom-aspects/src/main/java/org/apache/axiom/fom/CategoryContainer.java?p2=webservices/axiom/trunk/aspects/fom-aspects/src/main/java/org/apache/axiom/fom/CategoryContainer.java&p1=webservices/axiom/trunk/aspects/fom-aspects/src/main/java/org/apache/axiom/fom/Categorizable.java&r1=1705341&r2=1705420&rev=1705420&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/fom-aspects/src/main/java/org/apache/axiom/fom/Categorizable.java (original)
+++ webservices/axiom/trunk/aspects/fom-aspects/src/main/java/org/apache/axiom/fom/CategoryContainer.java Sat Sep 26 11:58:23 2015
@@ -18,6 +18,6 @@
*/
package org.apache.axiom.fom;
-public interface Categorizable extends AbderaElement {
+public interface CategoryContainer extends AbderaElement {
}
Copied: webservices/axiom/trunk/aspects/fom-aspects/src/main/java/org/apache/axiom/fom/CategoryContainerMixin.aj (from r1705341, webservices/axiom/trunk/aspects/fom-aspects/src/main/java/org/apache/axiom/fom/CategorizableMixin.aj)
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/fom-aspects/src/main/java/org/apache/axiom/fom/CategoryContainerMixin.aj?p2=webservices/axiom/trunk/aspects/fom-aspects/src/main/java/org/apache/axiom/fom/CategoryContainerMixin.aj&p1=webservices/axiom/trunk/aspects/fom-aspects/src/main/java/org/apache/axiom/fom/CategorizableMixin.aj&r1=1705341&r2=1705420&rev=1705420&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/fom-aspects/src/main/java/org/apache/axiom/fom/CategorizableMixin.aj (original)
+++ webservices/axiom/trunk/aspects/fom-aspects/src/main/java/org/apache/axiom/fom/CategoryContainerMixin.aj Sat Sep 26 11:58:23 2015
@@ -26,7 +26,7 @@ import org.apache.axiom.core.Axis;
import org.apache.axiom.core.ElementMatcher;
// TODO: also handle addCategory(Category) here
-public aspect CategorizableMixin {
+public aspect CategoryContainerMixin {
private static final ElementMatcher<AbderaCategory> CATEGORY_BY_SCHEME = new ElementMatcher<AbderaCategory>() {
public boolean matches(AbderaCategory element, String namespaceURI, String name) {
String scheme = element.getAttributeValue(Constants.SCHEME);
@@ -34,13 +34,13 @@ public aspect CategorizableMixin {
}
};
- public final Category Categorizable.addCategory(String term) {
+ public final Category CategoryContainer.addCategory(String term) {
Category category = getFactory().newCategory(this);
category.setTerm(term);
return category;
}
- public final Category Categorizable.addCategory(String scheme, String term, String label) {
+ public final Category CategoryContainer.addCategory(String scheme, String term, String label) {
Category category = getFactory().newCategory(this);
category.setTerm(term);
category.setScheme(scheme);
@@ -48,11 +48,11 @@ public aspect CategorizableMixin {
return category;
}
- public final List<Category> Categorizable.getCategories() {
+ public final List<Category> CategoryContainer.getCategories() {
return _getChildrenAsSet(Constants.CATEGORY);
}
- public final List<Category> Categorizable.getCategories(String scheme) {
+ public final List<Category> CategoryContainer.getCategories(String scheme) {
// TODO: we should probably set detachPolicy to null
return new FOMList<Category>(coreGetElements(
Axis.CHILDREN, AbderaCategory.class, CATEGORY_BY_SCHEME, null, scheme,