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 2014/02/19 14:33:32 UTC
[4/5] git commit: ISIS-695: minor extension to Wicket viewer helper
class...
ISIS-695: minor extension to Wicket viewer helper class...
... in order to support wickedchart extension (multiple series on same summarychart)
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/fc588124
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/fc588124
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/fc588124
Branch: refs/heads/master
Commit: fc58812499d18be0181196ac917b6d0393e4defc
Parents: 2f76f2e
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Wed Feb 19 13:10:24 2014 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Wed Feb 19 13:33:07 2014 +0000
----------------------------------------------------------------------
.../summary/CollectionContentsAsSummary.java | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/fc588124/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 c947633..4aee270 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
@@ -97,7 +97,7 @@ public class CollectionContentsAsSummary extends PanelAbstract<EntityCollectionM
List<ObjectAdapter> adapters = model.getObject();
- Summary summary = new Summary(adapters, numberAssociation);
+ Summary summary = new Summary(propertyName, adapters, numberAssociation);
addItem(item, ID_SUM, summary.getTotal());
addItem(item, ID_AVG, summary.getAverage());
addItem(item, ID_MIN, summary.getMin());
@@ -113,8 +113,14 @@ public class CollectionContentsAsSummary extends PanelAbstract<EntityCollectionM
private final List<String> titles = Lists.newArrayList();
private final List<BigDecimal> values = Lists.newArrayList();
private BigDecimal average;
+ private String propertyName;
public Summary(List<ObjectAdapter> adapters, ObjectAssociation numberAssociation) {
+ this(null, adapters, numberAssociation);
+ }
+
+ public Summary(String propertyName, List<ObjectAdapter> adapters, ObjectAssociation numberAssociation) {
+ this.propertyName = propertyName;
int nonNullCount = 0;
for (ObjectAdapter objectAdapter : adapters) {
titles.add(objectAdapter.titleString(null));
@@ -139,6 +145,9 @@ public class CollectionContentsAsSummary extends PanelAbstract<EntityCollectionM
average = nonNullCount != 0 ? sum.divide(BigDecimal.valueOf(nonNullCount), 2, RoundingMode.HALF_UP) : null;
}
+ public String getPropertyName() {
+ return propertyName;
+ }
public BigDecimal getTotal() {
return sum;
}
@@ -147,13 +156,13 @@ public class CollectionContentsAsSummary extends PanelAbstract<EntityCollectionM
}
public BigDecimal getMax() {
return max;
- }public BigDecimal getMin() {
+ }
+ public BigDecimal getMin() {
return min;
}
public List<String> getTitles() {
return Collections.unmodifiableList(titles);
}
-
public List<BigDecimal> getValues() {
return Collections.unmodifiableList(values);
}