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 2013/12/12 22:42:58 UTC
git commit: ISIS-608: summary collection panel should also show
count...
Updated Branches:
refs/heads/master 9d6ee1fa7 -> 71018db0a
ISIS-608: summary collection panel should also show count...
... by implementing CollectionCountProvider
ditto StandaloneCollectionPanel.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/71018db0
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/71018db0
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/71018db0
Branch: refs/heads/master
Commit: 71018db0a5e9ec699c71d4b40e452d66a7bd783e
Parents: 9d6ee1f
Author: Dan Haywood <da...@apache.org>
Authored: Thu Dec 12 21:38:26 2013 +0000
Committer: Dan Haywood <da...@apache.org>
Committed: Thu Dec 12 21:38:26 2013 +0000
----------------------------------------------------------------------
.../summary/CollectionContentsAsSummary.java | 9 ++++++++-
.../standalonecollection/StandaloneCollectionPanel.java | 8 +++++++-
2 files changed, 15 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/71018db0/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/summary/CollectionContentsAsSummary.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/summary/CollectionContentsAsSummary.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/summary/CollectionContentsAsSummary.java
index f6b2f6d..c947633 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/summary/CollectionContentsAsSummary.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/summary/CollectionContentsAsSummary.java
@@ -40,6 +40,7 @@ import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.feature.Contributed;
import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
import org.apache.isis.viewer.wicket.model.models.EntityCollectionModel;
+import org.apache.isis.viewer.wicket.ui.components.collection.CollectionCountProvider;
import org.apache.isis.viewer.wicket.ui.panels.PanelAbstract;
/**
@@ -47,7 +48,7 @@ import org.apache.isis.viewer.wicket.ui.panels.PanelAbstract;
* collection of entity}s rendered using as a table of summary values with a
* chart alongside.
*/
-public class CollectionContentsAsSummary extends PanelAbstract<EntityCollectionModel> {
+public class CollectionContentsAsSummary extends PanelAbstract<EntityCollectionModel> implements CollectionCountProvider {
private static final String ID_MAX = "max";
@@ -187,4 +188,10 @@ public class CollectionContentsAsSummary extends PanelAbstract<EntityCollectionM
buildGui();
}
+ @Override
+ public Integer getCount() {
+ final EntityCollectionModel model = getModel();
+ return model.getCount();
+ }
+
}
http://git-wip-us.apache.org/repos/asf/isis/blob/71018db0/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/standalonecollection/StandaloneCollectionPanel.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/standalonecollection/StandaloneCollectionPanel.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/standalonecollection/StandaloneCollectionPanel.java
index 5c3ece0..80fd5fe 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/standalonecollection/StandaloneCollectionPanel.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/standalonecollection/StandaloneCollectionPanel.java
@@ -27,9 +27,10 @@ import org.apache.isis.viewer.wicket.model.models.ActionModel;
import org.apache.isis.viewer.wicket.model.models.EntityCollectionModel;
import org.apache.isis.viewer.wicket.ui.ComponentType;
import org.apache.isis.viewer.wicket.ui.app.registry.ComponentFactoryRegistry;
+import org.apache.isis.viewer.wicket.ui.components.collection.CollectionCountProvider;
import org.apache.isis.viewer.wicket.ui.panels.PanelAbstract;
-public class StandaloneCollectionPanel extends PanelAbstract<EntityCollectionModel> {
+public class StandaloneCollectionPanel extends PanelAbstract<EntityCollectionModel> implements CollectionCountProvider {
private static final long serialVersionUID = 1L;
@@ -50,5 +51,10 @@ public class StandaloneCollectionPanel extends PanelAbstract<EntityCollectionMod
componentFactoryRegistry.addOrReplaceComponent(this, ComponentType.COLLECTION_CONTENTS, entityCollectionModel);
}
+ @Override
+ public Integer getCount() {
+ final EntityCollectionModel model = getModel();
+ return model.getCount();
+ }
}