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 2015/11/06 08:16:38 UTC
[10/11] isis git commit: ISIS-1151: Adding some Javadoc. Also ignore
case when searching for component to match specified default view.
ISIS-1151: Adding some Javadoc. Also ignore case when searching for component to match specified default view.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/14b861c9
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/14b861c9
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/14b861c9
Branch: refs/heads/master
Commit: 14b861c9cf4bac609fcb22572d4a700e67669870
Parents: 2bbf6a7
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Fri Nov 6 06:56:18 2015 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Fri Nov 6 06:56:18 2015 +0000
----------------------------------------------------------------------
.../apache/isis/applib/annotation/CollectionLayout.java | 12 ++++++++++--
.../collection/selector/CollectionSelectorHelper.java | 4 +++-
2 files changed, 13 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/14b861c9/core/applib/src/main/java/org/apache/isis/applib/annotation/CollectionLayout.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/annotation/CollectionLayout.java b/core/applib/src/main/java/org/apache/isis/applib/annotation/CollectionLayout.java
index 76119dc..8216c66 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/annotation/CollectionLayout.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/annotation/CollectionLayout.java
@@ -51,9 +51,17 @@ public @interface CollectionLayout {
// //////////////////////////////////////
/**
- * Indicates which view is used
+ * Indicates which view is used by default to render the collection.
+ *
+ * <p>
+ * The only view available within the core framework is "table". However, other views can be added
+ * as extensions. Examples are those provided by the (non-ASF) <a href="isisaddons.org">Isis addons</a>, eg
+ * "<a href="https://github.com/isisaddons/isis-wicket-excel">excel</a>",
+ * "<a href="https://github.com/isisaddons/isis-wicket-fullcalendar2">calendar</a>" and
+ * "<a href="https://github.com/isisaddons/isis-wicket-gmap3">map</a>".
+ * </p>
*/
- String defaultView() default "table";
+ String defaultView() default "";
// //////////////////////////////////////
http://git-wip-us.apache.org/repos/asf/isis/blob/14b861c9/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/selector/CollectionSelectorHelper.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/selector/CollectionSelectorHelper.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/selector/CollectionSelectorHelper.java
index b35663e..9267389 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/selector/CollectionSelectorHelper.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/selector/CollectionSelectorHelper.java
@@ -111,7 +111,9 @@ public class CollectionSelectorHelper implements Serializable {
if (hasDefaultViewFacet(model)) {
DefaultViewFacet defaultViewFacet = model.getCollectionMemento().getCollection().getFacet(DefaultViewFacet.class);
for (int i = 0; i < componentFactories.size(); i++) {
- if (componentFactories.get(i).getName().equals(defaultViewFacet.value())) {
+ final String componentName = componentFactories.get(i).getName();
+ final String viewName = defaultViewFacet.value();
+ if (componentName.equalsIgnoreCase(viewName)) {
return i;
}
}