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:36 UTC
[isis] 12/38: ISIS-1742: inlines methods in
applib.filter.Predicates to corresponding call to guava's Predicates method
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 f93e5226fd395a8afaa4a0a84f26a4a2646202b8
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Thu Oct 12 21:53:47 2017 +0100
ISIS-1742: inlines methods in applib.filter.Predicates to corresponding call to guava's Predicates method
---
.../org/apache/isis/applib/filter/Predicates.java | 23 +--------------
.../isis/core/metamodel/facetapi/FacetUtil.java | 4 +--
.../annotprop/MemberGroupLayoutFacetFactory.java | 8 ++++--
.../metamodel/services/swagger/internal/Util.java | 8 ++----
.../core/metamodel/spec/feature/ObjectAction.java | 20 ++++++-------
.../specimpl/ObjectSpecificationAbstract.java | 20 +++++++------
.../specimpl/dflt/ObjectSpecificationDefault.java | 15 ++++++----
.../metamodel/facetapi/FacetPredicatesTest.java | 33 +++++++++++++---------
.../serviceactions/ServiceActionUtil.java | 3 +-
.../collection/bulk/BulkActionsHelper.java | 7 +++--
.../CollectionContentsAsAjaxTablePanel.java | 13 ++++-----
11 files changed, 69 insertions(+), 85 deletions(-)
diff --git a/core/applib/src/main/java/org/apache/isis/applib/filter/Predicates.java b/core/applib/src/main/java/org/apache/isis/applib/filter/Predicates.java
index 450c2e7..bc124e0 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/filter/Predicates.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/filter/Predicates.java
@@ -30,29 +30,8 @@ public final class Predicates {
private Predicates() {
}
- public static <T> Predicate<T> and(final Predicate<T>... predicates) {
- return com.google.common.base.Predicates.and(predicates);
- }
-
- public static <T> Predicate<T> or(final Predicate<T>... predicates) {
- return com.google.common.base.Predicates.or(predicates);
- }
-
- public static <T> Predicate<T> not(final Predicate<T> f1) {
- return com.google.common.base.Predicates.not(f1);
- }
-
- public static <T> Predicate<T> any() {
- return com.google.common.base.Predicates.alwaysTrue();
- }
-
public final static <T> Predicate<T> anyOfType(final Class<T> clazz) {
- return any();
- }
-
- public static <T> Predicate<T> none() {
- return com.google.common.base.Predicates.alwaysFalse();
+ return com.google.common.base.Predicates.alwaysTrue();
}
-
}
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 51a6d4f..c8a1845 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
@@ -28,8 +28,6 @@ import com.google.common.collect.Lists;
import com.google.common.base.Predicate;
-import org.apache.isis.applib.filter.Predicates;
-
public final class FacetUtil {
private FacetUtil() {
@@ -172,7 +170,7 @@ public final class FacetUtil {
final Facet facet = source.getFacet(facetType);
}
- List<Facet> facets = source.getFacets(Predicates.<Facet>any());
+ List<Facet> facets = source.getFacets(com.google.common.base.Predicates.<Facet>alwaysTrue());
for (Facet facet : facets) {
target.addFacet(facet);
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/membergroups/annotprop/MemberGroupLayoutFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/membergroups/annotprop/MemberGroupLayoutFacetFactory.java
index 3566092..169de10 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/membergroups/annotprop/MemberGroupLayoutFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/membergroups/annotprop/MemberGroupLayoutFacetFactory.java
@@ -21,10 +21,11 @@ package org.apache.isis.core.metamodel.facets.object.membergroups.annotprop;
import java.util.List;
+import com.google.common.base.Predicate;
+
import org.apache.isis.applib.annotation.MemberGroupLayout;
import org.apache.isis.applib.annotation.MemberGroupLayout.ColumnSpans;
import org.apache.isis.applib.annotation.Where;
-import org.apache.isis.applib.filter.Predicates;
import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetUtil;
@@ -112,8 +113,9 @@ public class MemberGroupLayoutFacetFactory extends FacetFactoryAbstract implemen
@SuppressWarnings("unchecked")
private int numCollectionsOf(ObjectSpecification objectSpec) {
List<ObjectAssociation> objectCollections = objectSpec.getAssociations(
- Contributed.EXCLUDED, Predicates
- .and(ObjectAssociation.Filters.staticallyVisible(Where.OBJECT_FORMS), ObjectAssociation.Filters.COLLECTIONS));
+ Contributed.EXCLUDED, com.google.common.base.Predicates.and(new Predicate<ObjectAssociation>[] {
+ ObjectAssociation.Filters.staticallyVisible(Where.OBJECT_FORMS),
+ ObjectAssociation.Filters.COLLECTIONS }));
return objectCollections.size();
}
};
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 0addfeb..b0729b4 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
@@ -23,7 +23,7 @@ import java.util.Collection;
import java.util.List;
import com.google.common.base.Predicate;
-import org.apache.isis.applib.filter.Predicates;
+
import org.apache.isis.applib.services.swagger.SwaggerService;
import org.apache.isis.core.metamodel.facets.actcoll.typeof.TypeOfFacet;
import org.apache.isis.core.metamodel.spec.ActionType;
@@ -120,10 +120,8 @@ public final class Util {
final List<ObjectAssociation> list =
objectSpecification.getAssociations(
Contributed.INCLUDED,
- Predicates.and(
- associationPredicate,
- associationsWith(visibility)
- ));
+ com.google.common.base.Predicates.and(new Predicate<ObjectAssociation>[] { associationPredicate,
+ associationsWith(visibility) }));
return cast(list);
}
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 e1066dc5..e3c604c 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
@@ -303,11 +303,10 @@ public interface ObjectAction extends ObjectMember {
final ObjectSpecification adapterSpec = adapter.getSpecification();
@SuppressWarnings({ "unchecked", "deprecation" })
- Predicate<ObjectAction> predicate = org.apache.isis.applib.filter.Predicates.and(
- Filters.memberOrderNotAssociationOf(adapterSpec),
- Filters.dynamicallyVisible(adapter, InteractionInitiatedBy.USER, Where.ANYWHERE),
- Filters.notBulkOnly(),
- Filters.excludeWizardActions(adapterSpec));
+ Predicate<ObjectAction> predicate = com.google.common.base.Predicates
+ .and(Filters.memberOrderNotAssociationOf(adapterSpec),
+ Filters.dynamicallyVisible(adapter, InteractionInitiatedBy.USER, Where.ANYWHERE),
+ Filters.notBulkOnly(), Filters.excludeWizardActions(adapterSpec));
final List<ObjectAction> userActions = adapterSpec.getObjectActions(actionType, Contributed.INCLUDED,
predicate);
@@ -344,12 +343,9 @@ public interface ObjectAction extends ObjectMember {
final ObjectSpecification objectSpecification = adapter.getSpecification();
@SuppressWarnings({ "unchecked", "deprecation" })
- Predicate<ObjectAction> predicate = org.apache.isis.applib.filter.Predicates.and(
- Filters.memberOrderOf(association),
- // visibility needs to be determined at point of rendering, by ActionLink itself
- // Filters.dynamicallyVisible(adapter, InteractionInitiatedBy.USER, Where.ANYWHERE),
- Filters.notBulkOnly(),
- Filters.excludeWizardActions(objectSpecification));
+ Predicate<ObjectAction> predicate = com.google.common.base.Predicates
+ .and(Filters.memberOrderOf(association), Filters.notBulkOnly(),
+ Filters.excludeWizardActions(objectSpecification));
final List<ObjectAction> userActions = objectSpecification.getObjectActions(type, Contributed.INCLUDED,
predicate);
@@ -526,7 +522,7 @@ public interface ObjectAction extends ObjectMember {
}
public static Predicate<ObjectAction> excludeWizardActions(final ObjectSpecification objectSpecification) {
- return org.apache.isis.applib.filter.Predicates.not(wizardActions(objectSpecification));
+ return com.google.common.base.Predicates.not(wizardActions(objectSpecification));
// return wizardActions(objectSpecification);
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java
index 6e384db..0ed5e4f 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java
@@ -39,7 +39,7 @@ import org.apache.isis.applib.AppManifest;
import org.apache.isis.applib.Identifier;
import org.apache.isis.applib.annotation.Where;
import com.google.common.base.Predicate;
-import org.apache.isis.applib.filter.Predicates;
+
import org.apache.isis.core.commons.authentication.AuthenticationSession;
import org.apache.isis.core.commons.exceptions.UnknownTypeException;
import org.apache.isis.core.commons.lang.ClassExtensions;
@@ -776,7 +776,8 @@ public abstract class ObjectSpecificationAbstract extends FacetHolderImpl implem
@Override
public List<ObjectAction> getObjectActions(
final Contributed contributed) {
- return getObjectActions(ActionType.ALL, contributed, Predicates.<ObjectAction>any());
+ return getObjectActions(ActionType.ALL, contributed,
+ com.google.common.base.Predicates.<ObjectAction>alwaysTrue());
}
@Override
@@ -882,8 +883,8 @@ public abstract class ObjectSpecificationAbstract extends FacetHolderImpl implem
private List<ObjectAssociation> createContributeeAssociations(final Object servicePojo) {
final Class<?> serviceClass = servicePojo.getClass();
final ObjectSpecification specification = specificationLoader.loadSpecification(serviceClass);
- final List<ObjectAction> serviceActions = specification.getObjectActions(ActionType.USER, Contributed.INCLUDED, Predicates
- .<ObjectAction>any());
+ final List<ObjectAction> serviceActions = specification.getObjectActions(ActionType.USER, Contributed.INCLUDED,
+ com.google.common.base.Predicates.<ObjectAction>alwaysTrue());
final List<ObjectActionDefault> contributedActions = Lists.newArrayList();
for (final ObjectAction serviceAction : serviceActions) {
@@ -1006,7 +1007,8 @@ public abstract class ObjectSpecificationAbstract extends FacetHolderImpl implem
}
private List objectActionsOf(final ObjectSpecification specification) {
- return specification.getObjectActions(ActionType.ALL, Contributed.INCLUDED, Predicates.<ObjectAction>any());
+ return specification.getObjectActions(ActionType.ALL, Contributed.INCLUDED,
+ com.google.common.base.Predicates.<ObjectAction>alwaysTrue());
}
private Function<ObjectActionDefault, ObjectAssociation> createMixedInAssociationFunctor(
@@ -1066,8 +1068,8 @@ public abstract class ObjectSpecificationAbstract extends FacetHolderImpl implem
return;
}
final List<ObjectAction> contributeeActions = Lists.newArrayList();
- final List<ObjectAction> serviceActions = specification.getObjectActions(ActionType.ALL, Contributed.INCLUDED, Predicates
- .<ObjectAction>any());
+ final List<ObjectAction> serviceActions = specification.getObjectActions(ActionType.ALL, Contributed.INCLUDED,
+ com.google.common.base.Predicates.<ObjectAction>alwaysTrue());
for (final ObjectAction serviceAction : serviceActions) {
if (isAlwaysHidden(serviceAction)) {
continue;
@@ -1158,8 +1160,8 @@ public abstract class ObjectSpecificationAbstract extends FacetHolderImpl implem
}
final List<ObjectAction> actions = Lists.newArrayList();
- final List<ObjectAction> mixinActions = mixinSpec.getObjectActions(ActionType.ALL, Contributed.INCLUDED, Predicates
- .<ObjectAction>any());
+ final List<ObjectAction> mixinActions = mixinSpec.getObjectActions(ActionType.ALL, Contributed.INCLUDED,
+ com.google.common.base.Predicates.<ObjectAction>alwaysTrue());
for (final ObjectAction mixinTypeAction : mixinActions) {
if (isAlwaysHidden(mixinTypeAction)) {
continue;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/dflt/ObjectSpecificationDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/dflt/ObjectSpecificationDefault.java
index 1fb2d76..1644e00 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/dflt/ObjectSpecificationDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/dflt/ObjectSpecificationDefault.java
@@ -289,22 +289,25 @@ public class ObjectSpecificationDefault extends ObjectSpecificationAbstract impl
@Override
public ObjectAction getObjectAction(final ActionType type, final String id, final List<ObjectSpecification> parameters) {
- final List<ObjectAction> actions =
- getObjectActions(type, Contributed.INCLUDED, Predicates.<ObjectAction>any());
+ final List<ObjectAction> actions =
+ getObjectActions(type, Contributed.INCLUDED,
+ com.google.common.base.Predicates.<ObjectAction>alwaysTrue());
return firstAction(actions, id, parameters);
}
@Override
public ObjectAction getObjectAction(final ActionType type, final String id) {
- final List<ObjectAction> actions =
- getObjectActions(type, Contributed.INCLUDED, Predicates.<ObjectAction>any());
+ final List<ObjectAction> actions =
+ getObjectActions(type, Contributed.INCLUDED,
+ com.google.common.base.Predicates.<ObjectAction>alwaysTrue());
return firstAction(actions, id);
}
@Override
public ObjectAction getObjectAction(final String id) {
- final List<ObjectAction> actions =
- getObjectActions(ActionType.ALL, Contributed.INCLUDED, Predicates.<ObjectAction>any());
+ final List<ObjectAction> actions =
+ getObjectActions(ActionType.ALL, Contributed.INCLUDED,
+ com.google.common.base.Predicates.<ObjectAction>alwaysTrue());
return firstAction(actions, id);
}
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facetapi/FacetPredicatesTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facetapi/FacetPredicatesTest.java
index 0cc24aa..fc0c230 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facetapi/FacetPredicatesTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facetapi/FacetPredicatesTest.java
@@ -22,7 +22,6 @@ package org.apache.isis.core.metamodel.facetapi;
import junit.framework.TestCase;
import com.google.common.base.Predicate;
-import org.apache.isis.applib.filter.Predicates;
public class FacetPredicatesTest extends TestCase {
@@ -97,62 +96,70 @@ public class FacetPredicatesTest extends TestCase {
}
public void testAndTrueTrue() {
- final Predicate<Facet> and = Predicates.and(FacetFilters.ANY, FacetFilters.ANY);
+ final Predicate<Facet> and = com.google.common.base.Predicates
+ .and(new Predicate<Facet>[] { FacetFilters.ANY, FacetFilters.ANY });
assertTrue(and.apply(fooFacet));
}
public void testAndTrueFalse() {
- final Predicate<Facet> and = Predicates.and(FacetFilters.ANY, FacetFilters.NONE);
+ final Predicate<Facet> and = com.google.common.base.Predicates
+ .and(new Predicate<Facet>[] { FacetFilters.ANY, FacetFilters.NONE });
assertFalse(and.apply(fooFacet));
}
public void testAndFalseTrue() {
- final Predicate<Facet> and = Predicates.and(FacetFilters.NONE, FacetFilters.ANY);
+ final Predicate<Facet> and = com.google.common.base.Predicates
+ .and(new Predicate<Facet>[] { FacetFilters.NONE, FacetFilters.ANY });
assertFalse(and.apply(fooFacet));
}
public void testAndFalseFalse() {
- final Predicate<Facet> and = Predicates.and(FacetFilters.NONE, FacetFilters.NONE);
+ final Predicate<Facet> and = com.google.common.base.Predicates
+ .and(new Predicate<Facet>[] { FacetFilters.NONE, FacetFilters.NONE });
assertFalse(and.apply(fooFacet));
}
public void testOrTrueTrue() {
- final Predicate<Facet> or = Predicates.or(FacetFilters.ANY, FacetFilters.ANY);
+ final Predicate<Facet> or = com.google.common.base.Predicates
+ .or(new Predicate<Facet>[] { FacetFilters.ANY, FacetFilters.ANY });
assertTrue(or.apply(fooFacet));
}
public void testOrTrueFalse() {
- final Predicate<Facet> or = Predicates.or(FacetFilters.ANY, FacetFilters.NONE);
+ final Predicate<Facet> or = com.google.common.base.Predicates
+ .or(new Predicate<Facet>[] { FacetFilters.ANY, FacetFilters.NONE });
assertTrue(or.apply(fooFacet));
}
public void testorFalseTrue() {
- final Predicate<Facet> or = Predicates.or(FacetFilters.NONE, FacetFilters.ANY);
+ final Predicate<Facet> or = com.google.common.base.Predicates
+ .or(new Predicate<Facet>[] { FacetFilters.NONE, FacetFilters.ANY });
assertTrue(or.apply(fooFacet));
}
public void testOrFalseFalse() {
- final Predicate<Facet> or = Predicates.and(FacetFilters.NONE, FacetFilters.NONE);
+ final Predicate<Facet> or = com.google.common.base.Predicates
+ .and(new Predicate<Facet>[] { FacetFilters.NONE, FacetFilters.NONE });
assertFalse(or.apply(fooFacet));
}
public void testNotTrue() {
- final Predicate<Facet> not = Predicates.not(FacetFilters.ANY);
+ final Predicate<Facet> not = com.google.common.base.Predicates.not(FacetFilters.ANY);
assertFalse(not.apply(fooFacet));
}
public void testNotFalse() {
- final Predicate<Facet> not = Predicates.not(FacetFilters.NONE);
+ final Predicate<Facet> not = com.google.common.base.Predicates.not(FacetFilters.NONE);
assertTrue(not.apply(fooFacet));
}
public void testAny() {
- final Predicate<Facet> any = Predicates.any();
+ final Predicate<Facet> any = com.google.common.base.Predicates.alwaysTrue();
assertTrue(any.apply(fooFacet));
}
public void testNone() {
- final Predicate<Facet> none = Predicates.none();
+ final Predicate<Facet> none = com.google.common.base.Predicates.alwaysFalse();
assertFalse(none.apply(fooFacet));
}
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionUtil.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionUtil.java
index 0789d49..70fc205 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionUtil.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionUtil.java
@@ -24,7 +24,6 @@ import java.util.Map;
import java.util.Set;
import org.apache.isis.applib.annotation.NatureOfService;
-import org.apache.isis.applib.filter.Predicates;
import org.apache.isis.applib.services.i18n.TranslationService;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager;
@@ -264,7 +263,7 @@ public final class ServiceActionUtil {
}
for (final ObjectAction objectAction : serviceSpec.getObjectActions(
- actionType, Contributed.INCLUDED, Predicates.<ObjectAction>any())) {
+ actionType, Contributed.INCLUDED, com.google.common.base.Predicates.<ObjectAction>alwaysTrue())) {
// skip if annotated to not be included in repository menu using legacy mechanism
if (objectAction.getFacet(NotInServiceMenuFacet.class) != null) {
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/bulk/BulkActionsHelper.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/bulk/BulkActionsHelper.java
index 74f7fad..20ac8b1 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/bulk/BulkActionsHelper.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/bulk/BulkActionsHelper.java
@@ -26,7 +26,6 @@ import com.google.common.base.Predicate;
import com.google.common.collect.Iterables;
import com.google.common.collect.Lists;
-import org.apache.isis.applib.filter.Predicates;
import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
import org.apache.isis.core.metamodel.spec.ActionType;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
@@ -58,11 +57,13 @@ public class BulkActionsHelper implements Serializable {
final ObjectSpecification typeSpec = model.getTypeOfSpecification();
- List<ObjectAction> objectActions = typeSpec.getObjectActions(ActionType.USER, Contributed.INCLUDED, Predicates.<ObjectAction>any());
+ List<ObjectAction> objectActions = typeSpec.getObjectActions(ActionType.USER, Contributed.INCLUDED,
+ com.google.common.base.Predicates.<ObjectAction>alwaysTrue());
final DeploymentCategory deploymentCategory = isisSessionFactory.getDeploymentCategory();
if ( !deploymentCategory.isProduction()) {
- List<ObjectAction> prototypeActions = typeSpec.getObjectActions(ActionType.PROTOTYPE, Contributed.INCLUDED, Predicates.<ObjectAction>any());
+ List<ObjectAction> prototypeActions = typeSpec.getObjectActions(ActionType.PROTOTYPE, Contributed.INCLUDED,
+ com.google.common.base.Predicates.<ObjectAction>alwaysTrue());
objectActions.addAll(prototypeActions);
}
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 10030ba..c521748 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
@@ -33,7 +33,7 @@ import org.apache.wicket.model.Model;
import org.apache.isis.applib.annotation.Where;
import com.google.common.base.Predicate;
-import org.apache.isis.applib.filter.Predicates;
+
import org.apache.isis.applib.layout.component.Grid;
import org.apache.isis.applib.services.tablecol.TableColumnOrderService;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
@@ -177,12 +177,11 @@ public class CollectionContentsAsAjaxTablePanel
? getModel().getParentObjectAdapterMemento().getObjectAdapter(ConcurrencyChecking.NO_CHECK,
getPersistenceSession(), getSpecificationLoader()).getSpecification()
: null;
-
+
@SuppressWarnings("unchecked")
- final Predicate<ObjectAssociation> predicate = Predicates.and(
- ObjectAssociation.Filters.PROPERTIES,
- ObjectAssociation.Filters.staticallyVisible(whereContext),
- associationDoesNotReferenceParent(parentSpecIfAny));
+ final Predicate<ObjectAssociation> predicate = com.google.common.base.Predicates
+ .and(ObjectAssociation.Filters.PROPERTIES, ObjectAssociation.Filters.staticallyVisible(whereContext),
+ associationDoesNotReferenceParent(parentSpecIfAny));
final List<? extends ObjectAssociation> propertyList = typeOfSpec.getAssociations(Contributed.INCLUDED,
predicate);
@@ -234,7 +233,7 @@ public class CollectionContentsAsAjaxTablePanel
static Predicate<ObjectAssociation> associationDoesNotReferenceParent(final ObjectSpecification parentSpec) {
if(parentSpec == null) {
- return Predicates.any();
+ return com.google.common.base.Predicates.alwaysTrue();
}
return new Predicate<ObjectAssociation>() {
@Override
--
To stop receiving notification emails like this one, please contact
"commits@isis.apache.org" <co...@isis.apache.org>.