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 2012/08/22 11:33:29 UTC

svn commit: r1375958 - /incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTable.java

Author: danhaywood
Date: Wed Aug 22 09:33:28 2012
New Revision: 1375958

URL: http://svn.apache.org/viewvc?rev=1375958&view=rev
Log:
ISIS-244 (accidentally omitted from previous commit)

Modified:
    incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTable.java

Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTable.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTable.java?rev=1375958&r1=1375957&r2=1375958&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTable.java (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTable.java Wed Aug 22 09:33:28 2012
@@ -28,6 +28,8 @@ import org.apache.wicket.extensions.mark
 import org.apache.wicket.extensions.markup.html.repeater.util.SortableDataProvider;
 import org.apache.wicket.model.Model;
 
+import org.apache.isis.applib.filter.Filter;
+import org.apache.isis.applib.filter.Filters;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
@@ -47,6 +49,9 @@ import org.apache.isis.viewer.wicket.ui.
 public class CollectionContentsAsAjaxTable extends PanelAbstract<EntityCollectionModel> {
 
     private static final long serialVersionUID = 1L;
+    
+    @SuppressWarnings("unchecked")
+    private static final Filter<ObjectAssociation> STATICALLY_VISIBLE_PROPERTIES = Filters.and(ObjectAssociationFilters.PROPERTIES, ObjectAssociationFilters.STATICALLY_VISIBLE_ASSOCIATIONS);
 
     public CollectionContentsAsAjaxTable(final String id, final EntityCollectionModel model) {
         super(id, model);
@@ -77,7 +82,7 @@ public class CollectionContentsAsAjaxTab
         if (getModel().hasSelectionHandler()) {
             return;
         }
-        final List<? extends ObjectAssociation> propertyList = typeOfSpec.getAssociations(ObjectAssociationFilters.PROPERTIES);
+        final List<? extends ObjectAssociation> propertyList = typeOfSpec.getAssociations(STATICALLY_VISIBLE_PROPERTIES);
         for (final ObjectAssociation property : propertyList) {
             final ColumnAbstract<ObjectAdapter> nopc = createObjectAdapterPropertyColumn(property);
             columns.add(nopc);