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/03/20 13:03:44 UTC
git commit: ISIS-752: remove the "(+)" suffix in collection labels.
Repository: isis
Updated Branches:
refs/heads/master aaec51e51 -> 56e75302c
ISIS-752: remove the "(+)" suffix in collection labels.
There was a bug here, but as Jeroen notes, the info is there already anyway in the UI. So just remove.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/56e75302
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/56e75302
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/56e75302
Branch: refs/heads/master
Commit: 56e75302c1c814a6b2c058f3ebf3da04e8cd6074
Parents: aaec51e
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Thu Mar 20 12:03:32 2014 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Thu Mar 20 12:03:32 2014 +0000
----------------------------------------------------------------------
.../wicket/ui/components/collection/CollectionPanel.java | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/56e75302/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/CollectionPanel.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/CollectionPanel.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/CollectionPanel.java
index 459c17c..eede549 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/CollectionPanel.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/CollectionPanel.java
@@ -94,7 +94,7 @@ public class CollectionPanel extends PanelAbstract<EntityCollectionModel> implem
public Label createLabel(final String id, final String collectionName) {
this.collectionName = collectionName;
- this.label = new Label(id, labelTextFor(getCount()));
+ this.label = new Label(id, collectionName);
label.setOutputMarkupId(true);
return this.label;
}
@@ -112,7 +112,7 @@ public class CollectionPanel extends PanelAbstract<EntityCollectionModel> implem
return false;
}
final Integer count = getCount();
- label.setDefaultModelObject(labelTextFor(count));
+ label.setDefaultModelObject(collectionName);
return count != null;
}
@@ -125,10 +125,6 @@ public class CollectionPanel extends PanelAbstract<EntityCollectionModel> implem
}
}
- private String labelTextFor(final Integer count) {
- final String labelText = collectionName + (count != null? " (" + count + ")": " (+)");
- return labelText;
- }
// ///////////////////////////////////////////////////////////////////
// ActionPromptModalWindowProvider