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/11/11 09:24:51 UTC
[28/44] isis git commit: ISIS-537: mostly refactored,
however hints not honoured for LinkSelectorPanel.
ISIS-537: mostly refactored, however hints not honoured for LinkSelectorPanel.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/f00d01fa
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/f00d01fa
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/f00d01fa
Branch: refs/heads/master
Commit: f00d01fa28a35a4cf7ea8ac69950e5e9cb5c9d3c
Parents: 7087fc2
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Sun Nov 9 16:05:49 2014 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Mon Nov 10 10:21:45 2014 +0000
----------------------------------------------------------------------
...CollectionContentsSelectorDropdownPanel.html | 4 +-
.../CollectionContentsSelectorHelper.java | 69 ++++++++++----------
.../CollectionContentsLinksSelectorPanel.html | 19 ------
.../CollectionContentsLinksSelectorPanel.java | 2 +-
4 files changed, 36 insertions(+), 58 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/f00d01fa/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/selector/dropdown/CollectionContentsSelectorDropdownPanel.html
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/selector/dropdown/CollectionContentsSelectorDropdownPanel.html b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/selector/dropdown/CollectionContentsSelectorDropdownPanel.html
index ea2a4d8..8bec51a 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/selector/dropdown/CollectionContentsSelectorDropdownPanel.html
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/selector/dropdown/CollectionContentsSelectorDropdownPanel.html
@@ -23,11 +23,11 @@
<wicket:panel>
<div class="linksSelectorPanel">
<div class="btn-group viewLinks" wicket:id="views">
- <button type="button" class="btn btn-xs btn-info">
+ <button type="button" class="btn btn-sm btn-info">
<span wicket:id="viewButtonIcon" class="ViewLinkItem"></span>
<span wicket:id="viewButtonTitle" class="ViewLinkItemTitle"></span>
</button>
- <button type="button" class="btn btn-xs btn-info dropdown-toggle" data-toggle="dropdown">
+ <button type="button" class="btn btn-sm btn-info dropdown-toggle" data-toggle="dropdown">
<span class="caret"></span>
</button>
<ul wicket:id="viewList" class="dropdown-menu dropdown-menu-right" role="menu">
http://git-wip-us.apache.org/repos/asf/isis/blob/f00d01fa/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/selector/dropdown/CollectionContentsSelectorHelper.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/selector/dropdown/CollectionContentsSelectorHelper.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/selector/dropdown/CollectionContentsSelectorHelper.java
index 1e3706c..06eed95 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/selector/dropdown/CollectionContentsSelectorHelper.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/selector/dropdown/CollectionContentsSelectorHelper.java
@@ -67,9 +67,6 @@ public class CollectionContentsSelectorHelper {
return componentFactoryRegistry.findComponentFactoryElseFailFast(componentType, model);
}
-
-
-
public List<ComponentFactory> findOtherComponentFactories() {
final List<ComponentFactory> componentFactories = componentFactoryRegistry.findComponentFactories(componentType, model);
ArrayList<ComponentFactory> otherFactories = Lists.newArrayList(Collections2.filter(componentFactories, new Predicate<ComponentFactory>() {
@@ -81,35 +78,6 @@ public class CollectionContentsSelectorHelper {
return ordered(otherFactories);
}
- protected List<ComponentFactory> ordered(List<ComponentFactory> componentFactories) {
- return orderAjaxTableToEnd(componentFactories);
- }
-
- static List<ComponentFactory> orderAjaxTableToEnd(List<ComponentFactory> componentFactories) {
- int ajaxTableIdx = findAjaxTable(componentFactories);
- if(ajaxTableIdx>=0) {
- List<ComponentFactory> orderedFactories = Lists.newArrayList(componentFactories);
- ComponentFactory ajaxTableFactory = orderedFactories.remove(ajaxTableIdx);
- orderedFactories.add(ajaxTableFactory);
- return orderedFactories;
- } else {
- return componentFactories;
- }
- }
-
- static int findAjaxTable(List<ComponentFactory> componentFactories) {
- for(int i=0; i<componentFactories.size(); i++) {
- if(componentFactories.get(i) instanceof CollectionContentsAsAjaxTablePanelFactory) {
- return i;
- }
- }
- return -1;
- }
-
-
-
-
-
public int honourViewHintElseDefault(final Component component) {
// honour hints ...
final UiHintContainer hintContainer = getUiHintContainer(component);
@@ -128,7 +96,7 @@ public class CollectionContentsSelectorHelper {
}
// ... else default
- int initialFactory = determineInitialFactory(componentFactories, model);
+ int initialFactory = determineInitialFactory();
if(hintContainer != null) {
hintContainer.setHint(component, UIHINT_VIEW, ""+initialFactory);
// don't broadcast (no AjaxRequestTarget, still configuring initial setup)
@@ -136,17 +104,41 @@ public class CollectionContentsSelectorHelper {
return initialFactory;
}
- public static UiHintContainer getUiHintContainer(final Component component) {
- return UiHintContainer.Util.hintContainerOf(component);
+ private static List<ComponentFactory> ordered(List<ComponentFactory> componentFactories) {
+ return orderAjaxTableToEnd(componentFactories);
}
+ static List<ComponentFactory> orderAjaxTableToEnd(List<ComponentFactory> componentFactories) {
+ int ajaxTableIdx = findAjaxTable(componentFactories);
+ if(ajaxTableIdx>=0) {
+ List<ComponentFactory> orderedFactories = Lists.newArrayList(componentFactories);
+ ComponentFactory ajaxTableFactory = orderedFactories.remove(ajaxTableIdx);
+ orderedFactories.add(ajaxTableFactory);
+ return orderedFactories;
+ } else {
+ return componentFactories;
+ }
+ }
+
+ private static int findAjaxTable(List<ComponentFactory> componentFactories) {
+ for(int i=0; i<componentFactories.size(); i++) {
+ if(componentFactories.get(i) instanceof CollectionContentsAsAjaxTablePanelFactory) {
+ return i;
+ }
+ }
+ return -1;
+ }
+
+
+
+
/**
* return the index of {@link org.apache.isis.viewer.wicket.ui.components.collectioncontents.unresolved.CollectionContentsAsUnresolvedPanelFactory unresolved panel} if present and not eager loading;
* else the index of {@link org.apache.isis.viewer.wicket.ui.components.collectioncontents.ajaxtable.CollectionContentsAsAjaxTablePanelFactory ajax table} if present,
* otherwise first factory.
*/
- protected int determineInitialFactory(final List<ComponentFactory> componentFactories, final IModel<?> model) {
+ protected int determineInitialFactory() {
if(!hasRenderEagerlyFacet(model)) {
for(int i=0; i<componentFactories.size(); i++) {
if(componentFactories.get(i) instanceof CollectionContentsAsUnresolvedPanelFactory) {
@@ -161,6 +153,11 @@ public class CollectionContentsSelectorHelper {
return 0;
}
+ private static UiHintContainer getUiHintContainer(final Component component) {
+ return UiHintContainer.Util.hintContainerOf(component);
+ }
+
+
private static boolean hasRenderEagerlyFacet(IModel<?> model) {
if(!(model instanceof EntityCollectionModel)) {
return false;
http://git-wip-us.apache.org/repos/asf/isis/blob/f00d01fa/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/selector/links/CollectionContentsLinksSelectorPanel.html
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/selector/links/CollectionContentsLinksSelectorPanel.html b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/selector/links/CollectionContentsLinksSelectorPanel.html
index 2903711..853a400 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/selector/links/CollectionContentsLinksSelectorPanel.html
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/selector/links/CollectionContentsLinksSelectorPanel.html
@@ -24,25 +24,6 @@
<div class="linksSelectorPanel">
<span wicket:id="selectorDropdown"/>
- <!--
- <div class="btn-group viewLinks" xxwicket:id="views">
- <button type="button" class="btn btn-xs btn-info">
- <span xxwicket:id="viewButtonIcon" class="ViewLinkItem"></span>
- <span xxwicket:id="viewButtonTitle" class="ViewLinkItemTitle"></span>
- </button>
- <button type="button" class="btn btn-xs btn-info dropdown-toggle" data-toggle="dropdown">
- <span class="caret"></span>
- </button>
- <ul xxwicket:id="viewList" class="dropdown-menu dropdown-menu-right" role="menu">
- <li xxwicket:id="viewItem" class="viewItem">
- <a href="#" xxwicket:id="viewLink">
- <span xxwicket:id="viewItemIcon" class="ViewLinkItem"></span> <span xxwicket:id="viewItemTitle" class="ViewLinkItemTitle">[link title]</span>
- </a>
- </li>
- </ul>
- </div>
- -->
-
<div class="views">
<div wicket:id="collectionContents-0" class="collectionContentsLinksSelectorPanel collectionContentsComponentType"></div>
<div wicket:id="collectionContents-1" class="collectionContentsLinksSelectorPanel collectionContentsComponentType"></div>
http://git-wip-us.apache.org/repos/asf/isis/blob/f00d01fa/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/selector/links/CollectionContentsLinksSelectorPanel.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/selector/links/CollectionContentsLinksSelectorPanel.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/selector/links/CollectionContentsLinksSelectorPanel.java
index fd0a3da..627adb5 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/selector/links/CollectionContentsLinksSelectorPanel.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/selector/links/CollectionContentsLinksSelectorPanel.java
@@ -96,7 +96,7 @@ public class CollectionContentsLinksSelectorPanel
private void addUnderlyingViews() {
final EntityCollectionModel model = getModel();
- final int selected = selectorHelper.honourViewHintElseDefault(this);
+ final int selected = selectorHelper.honourViewHintElseDefault(selectorDropdownPanel);
// create all, hide the one not selected
underlyingViews = new Component[MAX_NUM_UNDERLYING_VIEWS];