You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2017/10/16 10:44:30 UTC
[isis] 06/38: ISIS-1742: renames Filter#accept to Filter#apply,
aligning with guava's Predicate.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch dev/2.0.0/ISIS-1742-remove-deprecations
in repository https://gitbox.apache.org/repos/asf/isis.git
commit dbb09d5e94c3c64ec63b4e730a120c1103b27b5a
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Thu Oct 12 21:32:40 2017 +0100
ISIS-1742: renames Filter#accept to Filter#apply, aligning with guava's Predicate.
---
.../java/org/apache/isis/applib/filter/Filter.java | 2 +-
.../org/apache/isis/applib/filter/Filters.java | 18 ++++++------
.../isis/core/metamodel/facetapi/FacetFilters.java | 6 ++--
.../isis/core/metamodel/facetapi/FacetUtil.java | 4 +--
.../core/metamodel/facets/ImperativeFacet.java | 2 +-
.../metamodel/services/swagger/internal/Util.java | 4 +--
.../core/metamodel/spec/feature/ObjectAction.java | 18 ++++++------
.../spec/feature/ObjectActionParameter.java | 2 +-
.../metamodel/spec/feature/ObjectAssociation.java | 22 +++++++--------
.../specloader/specimpl/ObjectActionDefault.java | 2 +-
.../specimpl/ObjectActionParameterAbstract.java | 4 +--
.../util/JdoPrimaryKeyPropertyFilter.java | 2 +-
.../core/metamodel/facetapi/FacetFiltersTest.java | 32 +++++++++++-----------
.../ObjectAssociationFiltersTest_visibleWhere.java | 2 +-
.../testspec/ObjectSpecificationStub.java | 2 +-
.../CollectionContentsAsAjaxTablePanel.java | 2 +-
.../CollectionContentsAsSummaryFactory.java | 2 +-
17 files changed, 63 insertions(+), 63 deletions(-)
diff --git a/core/applib/src/main/java/org/apache/isis/applib/filter/Filter.java b/core/applib/src/main/java/org/apache/isis/applib/filter/Filter.java
index cc1edb8..164e885 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/filter/Filter.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/filter/Filter.java
@@ -46,6 +46,6 @@ public interface Filter<T> {
* @return <tt>true</tt> if this pojo is acceptable, <tt>false</tt>
* otherwise.
*/
- public boolean accept(T t);
+ public boolean apply(T t);
}
diff --git a/core/applib/src/main/java/org/apache/isis/applib/filter/Filters.java b/core/applib/src/main/java/org/apache/isis/applib/filter/Filters.java
index ae240a9..e96f15e 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/filter/Filters.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/filter/Filters.java
@@ -34,9 +34,9 @@ public final class Filters {
public static <T> Filter<T> and(final Filter<T>... filters) {
return new Filter<T>() {
@Override
- public boolean accept(final T f) {
+ public boolean apply(final T f) {
for(final Filter<T> filter: filters) {
- if(!filter.accept(f)) {
+ if(!filter.apply(f)) {
return false;
}
}
@@ -48,9 +48,9 @@ public final class Filters {
public static <T> Filter<T> or(final Filter<T>... filters) {
return new Filter<T>() {
@Override
- public boolean accept(final T f) {
+ public boolean apply(final T f) {
for(final Filter<T> filter: filters) {
- if(filter.accept(f)) {
+ if(filter.apply(f)) {
return true;
}
}
@@ -62,8 +62,8 @@ public final class Filters {
public static <T> Filter<T> not(final Filter<T> f1) {
return new Filter<T>() {
@Override
- public boolean accept(final T f) {
- return !f1.accept(f);
+ public boolean apply(final T f) {
+ return !f1.apply(f);
}
};
}
@@ -71,7 +71,7 @@ public final class Filters {
public static <T> Filter<T> any() {
return new Filter<T>() {
@Override
- public boolean accept(final T t) {
+ public boolean apply(final T t) {
return true;
}
};
@@ -84,7 +84,7 @@ public final class Filters {
public static <T> Filter<T> none() {
return new Filter<T>() {
@Override
- public boolean accept(final T f) {
+ public boolean apply(final T f) {
return false;
}
};
@@ -98,7 +98,7 @@ public final class Filters {
return new Predicate<T>() {
@Override
public boolean apply(T candidate) {
- return filter.accept(candidate);
+ return filter.apply(candidate);
}
};
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/FacetFilters.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/FacetFilters.java
index 6042775..88b8258 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/FacetFilters.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/FacetFilters.java
@@ -36,7 +36,7 @@ public final class FacetFilters {
*/
public static final Filter<Facet> NONE = new Filter<Facet>() {
@Override
- public boolean accept(final Facet facet) {
+ public boolean apply(final Facet facet) {
return false;
}
};
@@ -44,10 +44,10 @@ public final class FacetFilters {
public static Filter<Facet> isA(final Class<?> superClass) {
return new Filter<Facet>() {
@Override
- public boolean accept(final Facet facet) {
+ public boolean apply(final Facet facet) {
if (facet instanceof DecoratingFacet) {
final DecoratingFacet<?> decoratingFacet = (DecoratingFacet<?>) facet;
- return accept(decoratingFacet.getDecoratedFacet());
+ return apply(decoratingFacet.getDecoratedFacet());
}
return superClass.isAssignableFrom(facet.getClass());
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/FacetUtil.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/FacetUtil.java
index 0c8b6d3..2773a25 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/FacetUtil.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/FacetUtil.java
@@ -40,7 +40,7 @@ public final class FacetUtil {
final FacetHolder facetHolder = facet.getFacetHolder();
final List<Facet> facets = facetHolder.getFacets(new Filter<Facet>() {
@Override
- public boolean accept(final Facet each) {
+ public boolean apply(final Facet each) {
return facet.facetType() == each.facetType() && facet.getClass() == each.getClass();
}
});
@@ -122,7 +122,7 @@ public final class FacetUtil {
final List<Facet> allFacets = new ArrayList<>(facetsByClass.values());
for (final Facet facet : allFacets) {
// facets that implement MultiTypedFacet will be held more than once. The 'contains' check ensures they are only returned once, however.
- if (filter.accept(facet) && !filteredFacets.contains(facet)) {
+ if (filter.apply(facet) && !filteredFacets.contains(facet)) {
filteredFacets.add(facet);
}
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/ImperativeFacet.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/ImperativeFacet.java
index 606631f..67af641 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/ImperativeFacet.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/ImperativeFacet.java
@@ -101,7 +101,7 @@ public interface ImperativeFacet extends Facet {
public static Filter<Facet> FILTER = new Filter<Facet>() {
@Override
- public boolean accept(final Facet facet) {
+ public boolean apply(final Facet facet) {
return ImperativeFacet.Util.isImperativeFacet(facet);
}
};
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/swagger/internal/Util.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/swagger/internal/Util.java
index 7bf2f2a..88d5bc5 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/swagger/internal/Util.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/swagger/internal/Util.java
@@ -95,7 +95,7 @@ public final class Util {
static Filter<ObjectAssociation> associationsWith(final SwaggerService.Visibility visibility) {
return new Filter<ObjectAssociation>() {
@Override
- public boolean accept(final ObjectAssociation objectAssociation) {
+ public boolean apply(final ObjectAssociation objectAssociation) {
return !visibility.isPublic() || isVisibleForPublic(objectAssociation);
}
};
@@ -141,7 +141,7 @@ public final class Util {
return objectSpec.getObjectActions(actionTypes, Contributed.INCLUDED, new Filter<ObjectAction>() {
@Override
- public boolean accept(final ObjectAction objectAction) {
+ public boolean apply(final ObjectAction objectAction) {
return !classExcluder.exclude(objectAction) &&
!visibility.isPublic() || isVisibleForPublic(objectAction);
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectAction.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectAction.java
index 2580489..0659edb 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectAction.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectAction.java
@@ -433,7 +433,7 @@ public interface ObjectAction extends ObjectMember {
final Where where) {
return new Filter<ObjectAction>() {
@Override
- public boolean accept(final ObjectAction objectAction) {
+ public boolean apply(final ObjectAction objectAction) {
final Consent visible = objectAction.isVisible(target, interactionInitiatedBy, where);
return visible.isAllowed();
}
@@ -447,7 +447,7 @@ public interface ObjectAction extends ObjectMember {
public static Filter<ObjectAction> withId(final String actionId) {
return new Filter<ObjectAction>() {
@Override
- public boolean accept(ObjectAction objectAction) {
+ public boolean apply(ObjectAction objectAction) {
return objectAction.getId().equals(actionId);
}
};
@@ -460,7 +460,7 @@ public interface ObjectAction extends ObjectMember {
public static Filter<ObjectAction> withNoValidationRules() {
return new Filter<ObjectAction>() {
@Override
- public boolean accept(final ObjectAction objectAction) {
+ public boolean apply(final ObjectAction objectAction) {
final List<Facet> validatingFacets = objectAction.getFacets(FacetFilters
.isA(ValidatingInteractionAdvisor.class));
return validatingFacets.isEmpty();
@@ -475,7 +475,7 @@ public interface ObjectAction extends ObjectMember {
public static Filter<ObjectAction> ofType(final ActionType type) {
return new Filter<ObjectAction>() {
@Override
- public boolean accept(ObjectAction oa) {
+ public boolean apply(ObjectAction oa) {
return oa.getType() == type;
}
};
@@ -489,7 +489,7 @@ public interface ObjectAction extends ObjectMember {
return new Filter<ObjectAction>() {
@Override
- public boolean accept(ObjectAction oa) {
+ public boolean apply(ObjectAction oa) {
final BulkFacet bulkFacet = oa.getFacet(BulkFacet.class);
if(bulkFacet == null || bulkFacet.isNoop() || bulkFacet.value() == InvokeOn.OBJECT_ONLY) {
@@ -518,7 +518,7 @@ public interface ObjectAction extends ObjectMember {
return new Filter<ObjectAction>() {
@Override
- public boolean accept(ObjectAction t) {
+ public boolean apply(ObjectAction t) {
BulkFacet facet = t.getFacet(BulkFacet.class);
return facet == null || facet.value() != InvokeOn.COLLECTION_ONLY;
}
@@ -533,7 +533,7 @@ public interface ObjectAction extends ObjectMember {
private static Filter<ObjectAction> wizardActions(final ObjectSpecification objectSpecification) {
return new Filter<ObjectAction>() {
@Override
- public boolean accept(ObjectAction input) {
+ public boolean apply(ObjectAction input) {
if (objectSpecification == null) {
return false;
}
@@ -550,7 +550,7 @@ public interface ObjectAction extends ObjectMember {
return new Filter<ObjectAction>() {
@Override
- public boolean accept(ObjectAction t) {
+ public boolean apply(ObjectAction t) {
final MemberOrderFacet memberOrderFacet = t.getFacet(MemberOrderFacet.class);
if (memberOrderFacet == null || Strings.isNullOrEmpty(memberOrderFacet.name())) {
return false;
@@ -575,7 +575,7 @@ public interface ObjectAction extends ObjectMember {
return new Filter<ObjectAction>() {
@Override
- public boolean accept(ObjectAction t) {
+ public boolean apply(ObjectAction t) {
final MemberOrderFacet memberOrderFacet = t.getFacet(MemberOrderFacet.class);
if (memberOrderFacet == null || Strings.isNullOrEmpty(memberOrderFacet.name())) {
return true;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectActionParameter.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectActionParameter.java
index 0ddbec1..ced35c8 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectActionParameter.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectActionParameter.java
@@ -135,7 +135,7 @@ public interface ObjectActionParameter extends ObjectFeature, CurrentHolder {
*/
public static final Filter<ObjectActionParameter> PARAMETER_ASSOCIATIONS = new Filter<ObjectActionParameter>() {
@Override
- public boolean accept(final ObjectActionParameter parameter) {
+ public boolean apply(final ObjectActionParameter parameter) {
return parameter.getSpecification().isNotCollection();
}
};
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectAssociation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectAssociation.java
index a9cd981..5b8a519 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectAssociation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectAssociation.java
@@ -253,7 +253,7 @@ public interface ObjectAssociation extends ObjectMember, CurrentHolder {
@Deprecated
public final static Filter<ObjectAssociation> PROPERTIES = new Filter<ObjectAssociation>() {
@Override
- public boolean accept(final ObjectAssociation association) {
+ public boolean apply(final ObjectAssociation association) {
return association.isOneToOneAssociation();
}
};
@@ -266,7 +266,7 @@ public interface ObjectAssociation extends ObjectMember, CurrentHolder {
@Deprecated
public final static Filter<ObjectAssociation> REFERENCE_PROPERTIES = new Filter<ObjectAssociation>() {
@Override
- public boolean accept(final ObjectAssociation association) {
+ public boolean apply(final ObjectAssociation association) {
return association.isOneToOneAssociation() &&
!association.getSpecification().containsDoOpFacet(ValueFacet.class);
}
@@ -280,7 +280,7 @@ public interface ObjectAssociation extends ObjectMember, CurrentHolder {
@Deprecated
public final static Filter<ObjectAssociation> WHERE_VISIBLE_IN_COLLECTION_TABLE = new Filter<ObjectAssociation>() {
@Override
- public boolean accept(final ObjectAssociation association) {
+ public boolean apply(final ObjectAssociation association) {
final HiddenFacet hiddenFacet = association.getFacet(HiddenFacet.class);
return hiddenFacet == null || !hiddenFacet.where().inParentedTable();
}
@@ -294,7 +294,7 @@ public interface ObjectAssociation extends ObjectMember, CurrentHolder {
@Deprecated
public final static Filter<ObjectAssociation> WHERE_VISIBLE_IN_STANDALONE_TABLE = new Filter<ObjectAssociation>() {
@Override
- public boolean accept(final ObjectAssociation association) {
+ public boolean apply(final ObjectAssociation association) {
final HiddenFacet hiddenFacet = association.getFacet(HiddenFacet.class);
return hiddenFacet == null || !hiddenFacet.where().inStandaloneTable();
}
@@ -308,7 +308,7 @@ public interface ObjectAssociation extends ObjectMember, CurrentHolder {
@Deprecated
public final static Filter<ObjectAssociation> ALL = new Filter<ObjectAssociation>() {
@Override
- public boolean accept(final ObjectAssociation property) {
+ public boolean apply(final ObjectAssociation property) {
return true;
}
};
@@ -321,7 +321,7 @@ public interface ObjectAssociation extends ObjectMember, CurrentHolder {
@Deprecated
public final static Filter<ObjectAssociation> COLLECTIONS = new Filter<ObjectAssociation>() {
@Override
- public boolean accept(final ObjectAssociation property) {
+ public boolean apply(final ObjectAssociation property) {
return property.isOneToManyAssociation();
}
};
@@ -335,7 +335,7 @@ public interface ObjectAssociation extends ObjectMember, CurrentHolder {
@Deprecated
public static final Filter<ObjectAssociation> VISIBLE_AT_LEAST_SOMETIMES = new Filter<ObjectAssociation>() {
@Override
- public boolean accept(final ObjectAssociation property) {
+ public boolean apply(final ObjectAssociation property) {
final HiddenFacet hiddenFacet = property.getFacet(HiddenFacet.class);
return hiddenFacet == null || hiddenFacet.where() != Where.ANYWHERE;
}
@@ -348,9 +348,9 @@ public interface ObjectAssociation extends ObjectMember, CurrentHolder {
public static final Filter<ObjectAssociation> staticallyVisible(final Where context) {
return new Filter<ObjectAssociation>() {
@Override
- public boolean accept(final ObjectAssociation association) {
+ public boolean apply(final ObjectAssociation association) {
final List<Facet> facets = association.getFacets(new Filter<Facet>() {
- @Override public boolean accept(final Facet facet) {
+ @Override public boolean apply(final Facet facet) {
return facet instanceof WhereValueFacet && facet instanceof HiddenFacet;
}
});
@@ -375,7 +375,7 @@ public interface ObjectAssociation extends ObjectMember, CurrentHolder {
final Where where) {
return new Filter<ObjectAssociation>() {
@Override
- public boolean accept(final ObjectAssociation objectAssociation) {
+ public boolean apply(final ObjectAssociation objectAssociation) {
final Consent visible = objectAssociation.isVisible(target, interactionInitiatedBy, where);
return visible.isAllowed();
}
@@ -392,7 +392,7 @@ public interface ObjectAssociation extends ObjectMember, CurrentHolder {
final Where where) {
return new Filter<ObjectAssociation>() {
@Override
- public boolean accept(final ObjectAssociation objectAssociation) {
+ public boolean apply(final ObjectAssociation objectAssociation) {
final Consent usable = objectAssociation.isUsable(adapter, interactionInitiatedBy, where);
return usable.isAllowed();
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionDefault.java
index 0e7da61..54ee815 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionDefault.java
@@ -248,7 +248,7 @@ public class ObjectActionDefault extends ObjectMemberAbstract implements ObjectA
final List<ObjectActionParameter> allParameters = getParameters();
final List<ObjectActionParameter> selectedParameters = Lists.newArrayList();
for (int i = 0; i < allParameters.size(); i++) {
- if (filter.accept(allParameters.get(i))) {
+ if (filter.apply(allParameters.get(i))) {
selectedParameters.add(allParameters.get(i));
}
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterAbstract.java
index f6cc3b1..4ed4305 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterAbstract.java
@@ -145,7 +145,7 @@ public abstract class ObjectActionParameterAbstract implements ObjectActionParam
final List<ObjectActionParameter> parameters = this.getAction().getParameters(new Filter<ObjectActionParameter>() {
@Override
- public boolean accept(final ObjectActionParameter t) {
+ public boolean apply(final ObjectActionParameter t) {
return equalsShortIdentifier(t.getSpecification(), getSpecification());
}
@@ -170,7 +170,7 @@ public abstract class ObjectActionParameterAbstract implements ObjectActionParam
final List<ObjectActionParameter> parameters = getAction().getParameters(new Filter<ObjectActionParameter>() {
@Override
- public boolean accept(final ObjectActionParameter t) {
+ public boolean apply(final ObjectActionParameter t) {
return equalsShortIdentifier(t.getSpecification(), getSpecification());
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/objectstore/jdo/metamodel/util/JdoPrimaryKeyPropertyFilter.java b/core/metamodel/src/main/java/org/apache/isis/objectstore/jdo/metamodel/util/JdoPrimaryKeyPropertyFilter.java
index 4e0f036..aa55f8b 100644
--- a/core/metamodel/src/main/java/org/apache/isis/objectstore/jdo/metamodel/util/JdoPrimaryKeyPropertyFilter.java
+++ b/core/metamodel/src/main/java/org/apache/isis/objectstore/jdo/metamodel/util/JdoPrimaryKeyPropertyFilter.java
@@ -39,7 +39,7 @@ import org.apache.isis.objectstore.jdo.metamodel.facets.prop.primarykey.JdoPrima
*/
public final class JdoPrimaryKeyPropertyFilter implements Filter<ObjectAssociation> {
@Override
- public boolean accept(final ObjectAssociation noa) {
+ public boolean apply(final ObjectAssociation noa) {
return noa.isOneToOneAssociation() &&
noa.containsFacet(JdoPrimaryKeyFacet.class) &&
noa.containsFacet(PropertyOrCollectionAccessorFacet.class);
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facetapi/FacetFiltersTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facetapi/FacetFiltersTest.java
index e63ad9d..72e07d8 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facetapi/FacetFiltersTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facetapi/FacetFiltersTest.java
@@ -78,82 +78,82 @@ public class FacetFiltersTest extends TestCase {
public void testIsAWhenIs() {
final Filter<Facet> filter = FacetFilters.isA(FooFacet.class);
- assertTrue(filter.accept(fooFacet));
+ assertTrue(filter.apply(fooFacet));
}
public void testIsAWhenIsNot() {
final Filter<Facet> filter = FacetFilters.isA(FooFacet.class);
- assertFalse(filter.accept(barFacet));
+ assertFalse(filter.apply(barFacet));
}
public void testIsAWhenIsSubclass() {
final Filter<Facet> filter = FacetFilters.isA(FooFacet.class);
- assertTrue(filter.accept(fooSubFacet));
+ assertTrue(filter.apply(fooSubFacet));
}
public void testIsAWhenIsNotBecauseASuperclass() {
final Filter<Facet> filter = FacetFilters.isA(FooFacet.class);
- assertFalse(filter.accept(fooSuperFacet));
+ assertFalse(filter.apply(fooSuperFacet));
}
public void testAndTrueTrue() {
final Filter<Facet> and = Filters.and(FacetFilters.ANY, FacetFilters.ANY);
- assertTrue(and.accept(fooFacet));
+ assertTrue(and.apply(fooFacet));
}
public void testAndTrueFalse() {
final Filter<Facet> and = Filters.and(FacetFilters.ANY, FacetFilters.NONE);
- assertFalse(and.accept(fooFacet));
+ assertFalse(and.apply(fooFacet));
}
public void testAndFalseTrue() {
final Filter<Facet> and = Filters.and(FacetFilters.NONE, FacetFilters.ANY);
- assertFalse(and.accept(fooFacet));
+ assertFalse(and.apply(fooFacet));
}
public void testAndFalseFalse() {
final Filter<Facet> and = Filters.and(FacetFilters.NONE, FacetFilters.NONE);
- assertFalse(and.accept(fooFacet));
+ assertFalse(and.apply(fooFacet));
}
public void testOrTrueTrue() {
final Filter<Facet> or = Filters.or(FacetFilters.ANY, FacetFilters.ANY);
- assertTrue(or.accept(fooFacet));
+ assertTrue(or.apply(fooFacet));
}
public void testOrTrueFalse() {
final Filter<Facet> or = Filters.or(FacetFilters.ANY, FacetFilters.NONE);
- assertTrue(or.accept(fooFacet));
+ assertTrue(or.apply(fooFacet));
}
public void testorFalseTrue() {
final Filter<Facet> or = Filters.or(FacetFilters.NONE, FacetFilters.ANY);
- assertTrue(or.accept(fooFacet));
+ assertTrue(or.apply(fooFacet));
}
public void testOrFalseFalse() {
final Filter<Facet> or = Filters.and(FacetFilters.NONE, FacetFilters.NONE);
- assertFalse(or.accept(fooFacet));
+ assertFalse(or.apply(fooFacet));
}
public void testNotTrue() {
final Filter<Facet> not = Filters.not(FacetFilters.ANY);
- assertFalse(not.accept(fooFacet));
+ assertFalse(not.apply(fooFacet));
}
public void testNotFalse() {
final Filter<Facet> not = Filters.not(FacetFilters.NONE);
- assertTrue(not.accept(fooFacet));
+ assertTrue(not.apply(fooFacet));
}
public void testAny() {
final Filter<Facet> any = Filters.any();
- assertTrue(any.accept(fooFacet));
+ assertTrue(any.apply(fooFacet));
}
public void testNone() {
final Filter<Facet> none = Filters.none();
- assertFalse(none.accept(fooFacet));
+ assertFalse(none.apply(fooFacet));
}
}
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/feature/ObjectAssociationFiltersTest_visibleWhere.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/feature/ObjectAssociationFiltersTest_visibleWhere.java
index 6398389..fdd0159 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/feature/ObjectAssociationFiltersTest_visibleWhere.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/feature/ObjectAssociationFiltersTest_visibleWhere.java
@@ -127,7 +127,7 @@ public class ObjectAssociationFiltersTest_visibleWhere {
@Test
public void test() {
final Filter<ObjectAssociation> filter = ObjectAssociation.Filters.staticallyVisible(whereContext);
- assertThat(filter.accept(mockObjectAssociation), is(expectedVisibility));
+ assertThat(filter.apply(mockObjectAssociation), is(expectedVisibility));
}
}
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/testspec/ObjectSpecificationStub.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/testspec/ObjectSpecificationStub.java
index 36f1f0d..a812ae8 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/testspec/ObjectSpecificationStub.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/testspec/ObjectSpecificationStub.java
@@ -149,7 +149,7 @@ public class ObjectSpecificationStub extends FacetHolderImpl implements ObjectSp
final List<ObjectAssociation> selectedFields = Lists.newArrayList();
for (int i = 0; i < allFields.size(); i++) {
- if (filter.accept(allFields.get(i))) {
+ if (filter.apply(allFields.get(i))) {
selectedFields.add(allFields.get(i));
}
}
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.java
index 94ca53d..4c1bac8 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.java
@@ -237,7 +237,7 @@ public class CollectionContentsAsAjaxTablePanel
}
return new Filter<ObjectAssociation>() {
@Override
- public boolean accept(ObjectAssociation association) {
+ public boolean apply(ObjectAssociation association) {
final HiddenFacet facet = association.getFacet(HiddenFacet.class);
if(facet == null) {
return true;
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/summary/CollectionContentsAsSummaryFactory.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/summary/CollectionContentsAsSummaryFactory.java
index e0d25cf..705761b 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/summary/CollectionContentsAsSummaryFactory.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/summary/CollectionContentsAsSummaryFactory.java
@@ -48,7 +48,7 @@ public class CollectionContentsAsSummaryFactory extends ComponentFactoryAbstract
private static final String NAME = "summary";
final static Filter<ObjectAssociation> OF_TYPE_BIGDECIMAL = new Filter<ObjectAssociation>(){
- public boolean accept(final ObjectAssociation objectAssoc) {
+ public boolean apply(final ObjectAssociation objectAssoc) {
ObjectSpecification objectSpec = objectAssoc.getSpecification();
return objectSpec.containsDoOpFacet(BigDecimalValueFacet.class);
}};
--
To stop receiving notification emails like this one, please contact
"commits@isis.apache.org" <co...@isis.apache.org>.