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 2016/02/09 00:39:04 UTC

[1/3] isis git commit: ISIS-993: if column contains only a single tabgroup and that tabgroup contains only a single tab, then just render the rows within that tab.

Repository: isis
Updated Branches:
  refs/heads/ISIS-993 f233f418a -> f3e8bbfc0


ISIS-993: if column contains only a single tabgroup and that tabgroup contains only a single tab, then just render the rows within that tab.


Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/2ae2df1b
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/2ae2df1b
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/2ae2df1b

Branch: refs/heads/ISIS-993
Commit: 2ae2df1ba64bedad1ce9bf228335194e3bffb258
Parents: f233f41
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Mon Feb 8 08:55:25 2016 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Mon Feb 8 08:55:25 2016 +0000

----------------------------------------------------------------------
 .../ui/components/layout/bs3/BS3GridPanel.java  |  2 -
 .../ui/components/layout/bs3/col/Col.html       |  3 +
 .../ui/components/layout/bs3/col/Col.java       | 91 +++++++++++++++-----
 .../ui/components/layout/bs3/tabs/TabPanel.html |  2 +-
 .../ui/components/layout/bs3/tabs/TabPanel.java | 11 ++-
 .../dom/simple/SimpleObject.layout.xml          | 22 ++++-
 6 files changed, 101 insertions(+), 30 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/isis/blob/2ae2df1b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/BS3GridPanel.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/BS3GridPanel.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/BS3GridPanel.java
index 1fe5b48..7137a11 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/BS3GridPanel.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/BS3GridPanel.java
@@ -22,7 +22,6 @@ package org.apache.isis.viewer.wicket.ui.components.layout.bs3;
 import org.apache.wicket.markup.html.WebMarkupContainer;
 import org.apache.wicket.markup.repeater.RepeatingView;
 
-import org.apache.isis.applib.layout.bootstrap3.BS3Element;
 import org.apache.isis.applib.layout.bootstrap3.BS3Grid;
 import org.apache.isis.applib.layout.bootstrap3.BS3Row;
 import org.apache.isis.viewer.wicket.model.models.EntityModel;
@@ -49,7 +48,6 @@ public class BS3GridPanel extends PanelAbstract<EntityModel> {
 
         final RepeatingView rv = new RepeatingView(ID_ROWS);
 
-        final BS3Element element = this.bs3Page;
         for(final BS3Row bs3Row: this.bs3Page.getRows()) {
 
             final String id = rv.newChildId();

http://git-wip-us.apache.org/repos/asf/isis/blob/2ae2df1b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/col/Col.html
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/col/Col.html b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/col/Col.html
index 7c84140..fef305b 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/col/Col.html
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/col/Col.html
@@ -31,6 +31,9 @@
                 <div class="actions" wicket:id="actions">
                     [actions]
                 </div>
+                <div class="rows" wicket:id="rows">
+                    [rows]
+                </div>
                 <div class="tabGroups" wicket:id="tabGroups">
                     [tab groups]
                 </div>

http://git-wip-us.apache.org/repos/asf/isis/blob/2ae2df1b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/col/Col.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/col/Col.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/col/Col.java
index dec8da6..643a32d 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/col/Col.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/col/Col.java
@@ -23,14 +23,18 @@ import java.util.List;
 import javax.annotation.Nullable;
 
 import com.google.common.base.Function;
+import com.google.common.base.Predicate;
 import com.google.common.base.Predicates;
 import com.google.common.collect.FluentIterable;
+import com.google.common.collect.Lists;
 
 import org.apache.wicket.Component;
 import org.apache.wicket.markup.html.WebMarkupContainer;
 import org.apache.wicket.markup.repeater.RepeatingView;
 
 import org.apache.isis.applib.layout.bootstrap3.BS3Col;
+import org.apache.isis.applib.layout.bootstrap3.BS3Row;
+import org.apache.isis.applib.layout.bootstrap3.BS3Tab;
 import org.apache.isis.applib.layout.bootstrap3.BS3TabGroup;
 import org.apache.isis.applib.layout.common.ActionLayoutData;
 import org.apache.isis.applib.layout.common.CollectionLayoutData;
@@ -48,6 +52,7 @@ import org.apache.isis.viewer.wicket.ui.components.actionmenu.entityactions.Enti
 import org.apache.isis.viewer.wicket.ui.components.entity.collection.EntityCollectionPanel;
 import org.apache.isis.viewer.wicket.ui.components.entity.fieldset.PropertyGroup;
 import org.apache.isis.viewer.wicket.ui.components.layout.bs3.Util;
+import org.apache.isis.viewer.wicket.ui.components.layout.bs3.row.Row;
 import org.apache.isis.viewer.wicket.ui.components.layout.bs3.tabs.TabGroupPanel;
 import org.apache.isis.viewer.wicket.ui.panels.PanelAbstract;
 import org.apache.isis.viewer.wicket.ui.util.Components;
@@ -58,6 +63,11 @@ public class Col extends PanelAbstract<EntityModel> {
     private static final long serialVersionUID = 1L;
 
     private static final String ID_COL = "col";
+    private static final String ID_ENTITY_HEADER_PANEL = "entityHeaderPanel";
+    private static final String ID_ROWS = "rows";
+    private static final String ID_TAB_GROUPS = "tabGroups";
+    private static final String ID_FIELD_SETS = "fieldSets";
+    private static final String ID_COLLECTIONS = "collections";
 
     private final BS3Col bs3Col;
 
@@ -79,7 +89,7 @@ public class Col extends PanelAbstract<EntityModel> {
         final WebMarkupContainer div = new WebMarkupContainer(ID_COL);
 
         CssClassAppender.appendCssClassTo(div, bs3Col.toCssClass());
-        Util.appendCssClass(div, bs3Col, "col");
+        Util.appendCssClass(div, bs3Col, ID_COL);
 
         this.addOrReplace(div);
 
@@ -90,7 +100,7 @@ public class Col extends PanelAbstract<EntityModel> {
         final String actionIdToUse;
         final String actionIdToHide;
         if(domainObject != null) {
-            final WebMarkupContainer entityHeaderPanel = new WebMarkupContainer("entityHeaderPanel");
+            final WebMarkupContainer entityHeaderPanel = new WebMarkupContainer(ID_ENTITY_HEADER_PANEL);
             div.add(entityHeaderPanel);
             final ComponentFactory componentFactory =
                     getComponentFactoryRegistry().findComponentFactory(ComponentType.ENTITY_ICON_TITLE_AND_COPYLINK, getModel());
@@ -101,7 +111,7 @@ public class Col extends PanelAbstract<EntityModel> {
             actionIdToUse = "entityActions";
             actionIdToHide = "actions";
         } else {
-            Components.permanentlyHide(div, "entityHeaderPanel");
+            Components.permanentlyHide(div, ID_ENTITY_HEADER_PANEL);
             actionOwner = div;
             actionIdToUse = "actions";
             actionIdToHide = null;
@@ -133,23 +143,62 @@ public class Col extends PanelAbstract<EntityModel> {
 
 
 
-        // tab groups
+        // rows
+        final List<BS3Row> rows = Lists.newArrayList(this.bs3Col.getRows());
         final List<BS3TabGroup> tabGroups = bs3Col.getTabGroups();
-        if(!tabGroups.isEmpty()) {
-            final RepeatingView rv = new RepeatingView("tabGroups");
+        final List<BS3TabGroup> tabGroupsWithTabs =
+                FluentIterable.from(bs3Col.getTabGroups())
+                .filter(new Predicate<BS3TabGroup>() {
+                    @Override public boolean apply(@Nullable final BS3TabGroup bs3TabGroup) {
+                        return !bs3TabGroup.getTabs().isEmpty();
+                    }
+                }).toList();
+        BS3Tab singleTabIfAny = null;
+        if(tabGroupsWithTabs.size() == 1) {
+            final BS3TabGroup firstTabGroup = tabGroupsWithTabs.get(0);
+            final List<BS3Tab> firstTabGroupTabs = firstTabGroup.getTabs();
+            if(firstTabGroupTabs.size() == 1) {
+                singleTabIfAny = firstTabGroupTabs.get(0);
+            }
+        }
+        if(singleTabIfAny != null) {
+            rows.addAll(singleTabIfAny.getRows());
+        }
+
+        if(!rows.isEmpty()) {
+            final RepeatingView rowRv = new RepeatingView(ID_ROWS);
+
+            for(final BS3Row bs3Row: rows) {
+
+                final String id = rowRv.newChildId();
+                final EntityModel entityModelWithHints = getModel().cloneWithLayoutMetadata(bs3Row);
+
+                final WebMarkupContainer row = new Row(id, entityModelWithHints);
+
+                rowRv.add(row);
+            }
+            div.add(rowRv);
+        } else {
+            Components.permanentlyHide(div, ID_ROWS);
+        }
+
+
+        // tab groups
+        if(!tabGroupsWithTabs.isEmpty() && singleTabIfAny == null) {
+            final RepeatingView tabGroupRv = new RepeatingView(ID_TAB_GROUPS);
 
-            for (BS3TabGroup bs3TabGroup : tabGroups) {
+            for (BS3TabGroup bs3TabGroup : tabGroupsWithTabs) {
 
-                final String id = rv.newChildId();
+                final String id = tabGroupRv.newChildId();
                 final EntityModel entityModelWithHints = getModel().cloneWithLayoutMetadata(bs3TabGroup);
 
                 final WebMarkupContainer tabGroup = new TabGroupPanel(id, entityModelWithHints);
 
-                rv.add(tabGroup);
+                tabGroupRv.add(tabGroup);
             }
-            div.add(rv);
+            div.add(tabGroupRv);
         } else {
-            Components.permanentlyHide(div, "tabGroups");
+            Components.permanentlyHide(div, ID_TAB_GROUPS);
         }
 
 
@@ -157,19 +206,19 @@ public class Col extends PanelAbstract<EntityModel> {
         // fieldsets
         final List<FieldSet> fieldSets = bs3Col.getFieldSets();
         if(!fieldSets.isEmpty()) {
-            final RepeatingView rv = new RepeatingView("fieldSets");
+            final RepeatingView fieldSetRv = new RepeatingView(ID_FIELD_SETS);
 
             for (FieldSet fieldSet : fieldSets) {
 
-                final String id = rv.newChildId();
+                final String id = fieldSetRv.newChildId();
                 final EntityModel entityModelWithHints = getModel().cloneWithLayoutMetadata(fieldSet);
 
                 final WebMarkupContainer propertyGroup = new PropertyGroup(id, entityModelWithHints);
-                rv.add(propertyGroup);
+                fieldSetRv.add(propertyGroup);
             }
-            div.add(rv);
+            div.add(fieldSetRv);
         } else {
-            Components.permanentlyHide(div, "fieldSets");
+            Components.permanentlyHide(div, ID_FIELD_SETS);
         }
 
 
@@ -177,19 +226,19 @@ public class Col extends PanelAbstract<EntityModel> {
         // collections
         final List<CollectionLayoutData> collections = bs3Col.getCollections();
         if(!collections.isEmpty()) {
-            final RepeatingView rv = new RepeatingView("collections");
+            final RepeatingView collectionRv = new RepeatingView(ID_COLLECTIONS);
 
             for (CollectionLayoutData collection : collections) {
 
-                final String id = rv.newChildId();
+                final String id = collectionRv.newChildId();
                 final EntityModel entityModelWithHints = getModel().cloneWithLayoutMetadata(collection);
 
                 final WebMarkupContainer collectionPanel = new EntityCollectionPanel(id, entityModelWithHints);
-                rv.add(collectionPanel);
+                collectionRv.add(collectionPanel);
             }
-            div.add(rv);
+            div.add(collectionRv);
         } else {
-            Components.permanentlyHide(div, "collections");
+            Components.permanentlyHide(div, ID_COLLECTIONS);
         }
 
     }

http://git-wip-us.apache.org/repos/asf/isis/blob/2ae2df1b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/tabs/TabPanel.html
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/tabs/TabPanel.html b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/tabs/TabPanel.html
index 2a47546..8201b3a 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/tabs/TabPanel.html
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/tabs/TabPanel.html
@@ -20,7 +20,7 @@
 <html xmlns:wicket="http://wicket.apache.org">
 <body>
 <wicket:panel>
-	<div class="tabPanel">
+	<div class="tabPanel" wicket:id="tabPanel">
 		<div wicket:id="rows">
 			[rows]
 		</div>

http://git-wip-us.apache.org/repos/asf/isis/blob/2ae2df1b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/tabs/TabPanel.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/tabs/TabPanel.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/tabs/TabPanel.java
index 4d2de72..93f85ac 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/tabs/TabPanel.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/tabs/TabPanel.java
@@ -14,6 +14,10 @@ import org.apache.isis.viewer.wicket.ui.panels.PanelAbstract;
 public class TabPanel extends PanelAbstract implements HasUiHintDisambiguator {
 
     private static final long serialVersionUID = 1L;
+
+    private static final String ID_TAB_PANEL = "tabPanel";
+    private static final String ID_ROWS = "rows";
+
     private final BS3Tab bs3Tab;
 
     public TabPanel(String id, final EntityModel model, final BS3Tab bs3Tab) {
@@ -33,9 +37,11 @@ public class TabPanel extends PanelAbstract implements HasUiHintDisambiguator {
 
     protected void buildGui(final EntityModel model, final BS3Tab bs3Tab) {
 
+        final WebMarkupContainer container = new WebMarkupContainer(ID_TAB_PANEL);
+
         Util.appendCssClassIfRequired(this, bs3Tab);
 
-        final RepeatingView rv = new RepeatingView("rows");
+        final RepeatingView rv = new RepeatingView(ID_ROWS);
 
         for(final BS3Row bs3Row: bs3Tab.getRows()) {
 
@@ -46,6 +52,7 @@ public class TabPanel extends PanelAbstract implements HasUiHintDisambiguator {
 
             rv.add(row);
         }
-        add(rv);
+        container.add(rv);
+        add(container);
     }
 }

http://git-wip-us.apache.org/repos/asf/isis/blob/2ae2df1b/example/application/simpleapp/dom/src/main/java/domainapp/dom/simple/SimpleObject.layout.xml
----------------------------------------------------------------------
diff --git a/example/application/simpleapp/dom/src/main/java/domainapp/dom/simple/SimpleObject.layout.xml b/example/application/simpleapp/dom/src/main/java/domainapp/dom/simple/SimpleObject.layout.xml
index 4201dfd..65dcb4a 100644
--- a/example/application/simpleapp/dom/src/main/java/domainapp/dom/simple/SimpleObject.layout.xml
+++ b/example/application/simpleapp/dom/src/main/java/domainapp/dom/simple/SimpleObject.layout.xml
@@ -40,10 +40,21 @@
         </bs3:col>
     </bs3:row>
     <bs3:row>
-        <bs3:col span="4">
-            <c:fieldSet name="Properties" unreferencedProperties="true"/>
+        <bs3:col span="6">
+            <bs3:tabGroup>
+                <bs3:tab name="General">
+                    <bs3:row>
+                        <bs3:col span="12">
+                            <c:fieldSet name="Properties" unreferencedProperties="true"/>
+                        </bs3:col>
+                    </bs3:row>
+                </bs3:tab>
+            </bs3:tabGroup>
+            <bs3:tabGroup>
+
+            </bs3:tabGroup>
         </bs3:col>
-        <bs3:col span="8">
+        <bs3:col span="6">
             <bs3:tabGroup  unreferencedCollections="true">
                 <bs3:tab name="Others">
                     <bs3:row>
@@ -52,13 +63,16 @@
                         </bs3:col>
                     </bs3:row>
                 </bs3:tab>
+            </bs3:tabGroup>
+            <bs3:tabGroup>
                 <bs3:tab name="Similar To">
                     <bs3:row>
                         <bs3:col span="12">
-                            <c:collection id="similarTo"/>
+
                         </bs3:col>
                     </bs3:row>
                 </bs3:tab>
+
             </bs3:tabGroup>
         </bs3:col>
     </bs3:row>


[3/3] isis git commit: ISIS-993: improving the suppression algorithm, now search for any content under a tab (however deep), if none found then suppress the tab (which may in turn mean suppressing the tab group and just rendering the rows of the first ta

Posted by da...@apache.org.
ISIS-993: improving the suppression algorithm, now search for any content under a tab (however deep), if none found then suppress the tab (which may in turn mean suppressing the tab group and just rendering the rows of the first tab).


Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/f3e8bbfc
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/f3e8bbfc
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/f3e8bbfc

Branch: refs/heads/ISIS-993
Commit: f3e8bbfc052a060e80ae350999b787438b0d4168
Parents: 082916a
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Mon Feb 8 23:38:44 2016 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Mon Feb 8 23:38:44 2016 +0000

----------------------------------------------------------------------
 .../layout/bootstrap3/BS3ClearFixHidden.java    |  1 +
 .../isis/applib/layout/bootstrap3/BS3Col.java   | 13 ++--
 .../applib/layout/bootstrap3/BS3Element.java    |  5 +-
 .../layout/bootstrap3/BS3ElementAbstract.java   | 20 +----
 .../isis/applib/layout/bootstrap3/BS3Grid.java  | 75 ++++++++++++-------
 .../isis/applib/layout/bootstrap3/BS3Row.java   | 25 +++++--
 .../applib/layout/bootstrap3/BS3RowContent.java | 10 +++
 .../layout/bootstrap3/BS3RowContentOwner.java   |  2 +-
 .../applib/layout/bootstrap3/BS3RowOwner.java   |  2 +-
 .../isis/applib/layout/bootstrap3/BS3Tab.java   | 77 +++++++++++++++++++-
 .../applib/layout/bootstrap3/BS3TabGroup.java   |  9 ++-
 .../layout/bootstrap3/BS3TabGroupOwner.java     |  2 +-
 .../applib/layout/bootstrap3/BS3TabOwner.java   |  2 +-
 .../applib/layout/bootstrap3/WithinGrid.java    | 27 +++++++
 .../applib/layout/common/ActionLayoutData.java  |  6 ++
 .../layout/common/CollectionLayoutData.java     | 21 ++----
 .../isis/applib/layout/common/FieldSet.java     | 21 ++----
 .../layout/common/PropertyLayoutData.java       | 16 +---
 .../isis/applib/layout/fixedcols/FCColumn.java  | 16 ----
 .../isis/applib/layout/fixedcols/FCTab.java     | 16 ----
 .../applib/layout/fixedcols/FCTabGroup.java     | 14 ----
 .../wicket/ui/components/layout/bs3/Util.java   |  4 +-
 .../ui/components/layout/bs3/col/Col.java       | 30 ++++++--
 .../dom/simple/SimpleObject.layout.xml          |  9 ++-
 24 files changed, 254 insertions(+), 169 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/isis/blob/f3e8bbfc/core/applib/src/main/java/org/apache/isis/applib/layout/bootstrap3/BS3ClearFixHidden.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/layout/bootstrap3/BS3ClearFixHidden.java b/core/applib/src/main/java/org/apache/isis/applib/layout/bootstrap3/BS3ClearFixHidden.java
index 0cf84ba..69e8367 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/layout/bootstrap3/BS3ClearFixHidden.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/layout/bootstrap3/BS3ClearFixHidden.java
@@ -35,4 +35,5 @@ public class BS3ClearFixHidden extends BS3ClearFix {
     public String toCssClass() {
         return "clearfix hidden-" + getSize().toCssClassFragment();
     }
+
 }

http://git-wip-us.apache.org/repos/asf/isis/blob/f3e8bbfc/core/applib/src/main/java/org/apache/isis/applib/layout/bootstrap3/BS3Col.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/layout/bootstrap3/BS3Col.java b/core/applib/src/main/java/org/apache/isis/applib/layout/bootstrap3/BS3Col.java
index 0f00364..1a5bec7 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/layout/bootstrap3/BS3Col.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/layout/bootstrap3/BS3Col.java
@@ -224,12 +224,6 @@ public class BS3Col extends BS3RowContent
     }
 
 
-    @Override
-    public String getPath() {
-        return getId() != null? getId(): super.getPath();
-    }
-
-
 
     private String metadataError;
 
@@ -252,4 +246,11 @@ public class BS3Col extends BS3RowContent
         return "col-" + size.toCssClassFragment() + "-" + getSpan();
     }
 
+
+    @Override public String toString() {
+        return "BS3Col{" +
+                "id='" + id + '\'' +
+                '}';
+    }
+
 }

http://git-wip-us.apache.org/repos/asf/isis/blob/f3e8bbfc/core/applib/src/main/java/org/apache/isis/applib/layout/bootstrap3/BS3Element.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/layout/bootstrap3/BS3Element.java b/core/applib/src/main/java/org/apache/isis/applib/layout/bootstrap3/BS3Element.java
index 669fcbb..e407d10 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/layout/bootstrap3/BS3Element.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/layout/bootstrap3/BS3Element.java
@@ -20,7 +20,7 @@ package org.apache.isis.applib.layout.bootstrap3;
 
 import java.io.Serializable;
 
-public interface BS3Element extends Serializable {
+public interface BS3Element extends WithinGrid, Serializable {
 
     /**
      * Any additional CSS classes to render on the page element corresponding to this object,
@@ -32,7 +32,4 @@ public interface BS3Element extends Serializable {
     void setCssClass(final String cssClass);
 
 
-    String getPath();
-    void setPath(final String path);
-
 }

http://git-wip-us.apache.org/repos/asf/isis/blob/f3e8bbfc/core/applib/src/main/java/org/apache/isis/applib/layout/bootstrap3/BS3ElementAbstract.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/layout/bootstrap3/BS3ElementAbstract.java b/core/applib/src/main/java/org/apache/isis/applib/layout/bootstrap3/BS3ElementAbstract.java
index 95aa611..0c39abc 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/layout/bootstrap3/BS3ElementAbstract.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/layout/bootstrap3/BS3ElementAbstract.java
@@ -19,9 +19,6 @@
 package org.apache.isis.applib.layout.bootstrap3;
 
 import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlTransient;
-
-import org.apache.isis.applib.annotation.Programmatic;
 
 /**
  * Superclass for all layout classes, factoring out the common {@link #getCssClass()} attribute.
@@ -46,19 +43,4 @@ public abstract class BS3ElementAbstract implements BS3Element {
 
 
 
-
-    private String path;
-
-    @Programmatic
-    @XmlTransient
-    public String getPath() {
-        return path;
-    }
-
-    @Programmatic
-    public void setPath(final String path) {
-        this.path = path;
-    }
-
-
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/isis/blob/f3e8bbfc/core/applib/src/main/java/org/apache/isis/applib/layout/bootstrap3/BS3Grid.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/layout/bootstrap3/BS3Grid.java b/core/applib/src/main/java/org/apache/isis/applib/layout/bootstrap3/BS3Grid.java
index f5e9d5d..a893cfb 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/layout/bootstrap3/BS3Grid.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/layout/bootstrap3/BS3Grid.java
@@ -76,19 +76,6 @@ public class BS3Grid extends GridAbstract implements BS3Element, Dto, BS3RowOwne
 
 
 
-    private String path;
-
-    @Programmatic
-    @XmlTransient
-    public String getPath() {
-        return path;
-    }
-
-    @Programmatic
-    public void setPath(final String path) {
-        this.path = path;
-    }
-
 
 
     private List<BS3Row> rows = Lists.newArrayList();
@@ -127,41 +114,64 @@ public class BS3Grid extends GridAbstract implements BS3Element, Dto, BS3RowOwne
 
 
     interface Visitor extends Grid.Visitor {
-        void visit(final BS3Grid bs3Page);
+        void preVisit(final BS3Grid bs3Grid);
+        void visit(final BS3Grid bs3Grid);
+        void postVisit(final BS3Grid bs3Grid);
+        void preVisit(final BS3Row bs3Row);
         void visit(final BS3Row bs3Row);
+        void postVisit(final BS3Row bs3Row);
+        void preVisit(final BS3Col bs3Col);
         void visit(final BS3Col bs3Col);
+        void postVisit(final BS3Col bs3Col);
         void visit(final BS3ClearFix bs3ClearFix);
+        void preVisit(final BS3TabGroup bs3TabGroup);
         void visit(final BS3TabGroup bs3TabGroup);
+        void postVisit(final BS3TabGroup bs3TabGroup);
+        void preVisit(final BS3Tab bs3Tab);
         void visit(final BS3Tab bs3Tab);
+        void postVisit(final BS3Tab bs3Tab);
     }
 
     public static class VisitorAdapter extends Grid.VisitorAdapter implements Visitor {
-        @Override
-        public void visit(final BS3Grid bs3Grid) { }
-        @Override
-        public void visit(final BS3Row bs3Row) { }
-        @Override
-        public void visit(final BS3Col bs3Col) { }
-        @Override
-        public void visit(final BS3ClearFix bs3ClearFix) { }
-        @Override
-        public void visit(final BS3TabGroup bs3TabGroup) { }
-        @Override
-        public void visit(final BS3Tab bs3Tab) { }
+        @Override public void preVisit(final BS3Grid bs3Grid) { }
+        @Override public void visit(final BS3Grid bs3Grid) { }
+        @Override public void postVisit(final BS3Grid bs3Grid) { }
+
+        @Override public void preVisit(final BS3Row bs3Row) { }
+        @Override public void visit(final BS3Row bs3Row) { }
+        @Override public void postVisit(final BS3Row bs3Row) { }
+
+        @Override public void preVisit(final BS3Col bs3Col) { }
+        @Override public void visit(final BS3Col bs3Col) { }
+        @Override public void postVisit(final BS3Col bs3Col) { }
+
+        @Override public void visit(final BS3ClearFix bs3ClearFix) { }
+
+        @Override public void preVisit(final BS3TabGroup bs3TabGroup) { }
+        @Override public void visit(final BS3TabGroup bs3TabGroup) { }
+        @Override public void postVisit(final BS3TabGroup bs3TabGroup) { }
+
+        @Override public void preVisit(final BS3Tab bs3Tab) { }
+        @Override public void visit(final BS3Tab bs3Tab) { }
+        @Override public void postVisit(final BS3Tab bs3Tab) { }
     }
 
     public void visit(final Grid.Visitor visitor) {
         final BS3Grid.Visitor bs3Visitor = asBs3Visitor(visitor);
+        bs3Visitor.preVisit(this);
         bs3Visitor.visit(this);
         traverseRows(this, visitor);
+        bs3Visitor.postVisit(this);
     }
 
     protected void traverseRows(final BS3RowOwner rowOwner, final Grid.Visitor visitor) {
         final BS3Grid.Visitor bs3Visitor = asBs3Visitor(visitor);
         for (BS3Row bs3Row : rowOwner.getRows()) {
             bs3Row.setOwner(this);
+            bs3Visitor.preVisit(bs3Row);
             bs3Visitor.visit(bs3Row);
             traverseCols(visitor, bs3Row);
+            bs3Visitor.postVisit(bs3Row);
         }
     }
 
@@ -172,6 +182,7 @@ public class BS3Grid extends GridAbstract implements BS3Element, Dto, BS3RowOwne
             rowContent.setOwner(bs3Row);
             if(rowContent instanceof BS3Col) {
                 final BS3Col bs3Col = (BS3Col) rowContent;
+                bs3Visitor.preVisit(bs3Col);
                 bs3Visitor.visit(bs3Col);
                 traverseDomainObject(bs3Col, visitor);
                 traverseTabGroups(bs3Col, visitor);
@@ -179,6 +190,7 @@ public class BS3Grid extends GridAbstract implements BS3Element, Dto, BS3RowOwne
                 traverseFieldSets(bs3Col, visitor);
                 traverseCollections(bs3Col, visitor);
                 traverseRows(bs3Col, visitor);
+                bs3Visitor.postVisit(bs3Col);
             } else if (rowContent instanceof BS3ClearFix) {
                 final BS3ClearFix bs3ClearFix = (BS3ClearFix) rowContent;
                 bs3Visitor.visit(bs3ClearFix);
@@ -205,8 +217,10 @@ public class BS3Grid extends GridAbstract implements BS3Element, Dto, BS3RowOwne
         final List<BS3TabGroup> tabGroups = bs3TabGroupOwner.getTabGroups();
         for (BS3TabGroup bs3TabGroup : tabGroups) {
             bs3TabGroup.setOwner(bs3TabGroupOwner);
+            bs3Visitor.preVisit(bs3TabGroup);
             bs3Visitor.visit(bs3TabGroup);
             traverseTabs(bs3TabGroup, visitor);
+            bs3Visitor.postVisit(bs3TabGroup);
         }
     }
 
@@ -217,8 +231,10 @@ public class BS3Grid extends GridAbstract implements BS3Element, Dto, BS3RowOwne
         final List<BS3Tab> tabs = bs3TabOwner.getTabs();
         for (BS3Tab tab : tabs) {
             tab.setOwner(bs3TabOwner);
+            bs3Visitor.preVisit(tab);
             bs3Visitor.visit(tab);
             traverseRows(tab, visitor);
+            bs3Visitor.postVisit(tab);
         }
     }
 
@@ -277,4 +293,11 @@ public class BS3Grid extends GridAbstract implements BS3Element, Dto, BS3RowOwne
         return divsByCssId;
     }
 
+    @Override
+    @Programmatic
+    @XmlTransient
+    public BS3Grid getGrid() {
+        return this;
+    }
+
 }

http://git-wip-us.apache.org/repos/asf/isis/blob/f3e8bbfc/core/applib/src/main/java/org/apache/isis/applib/layout/bootstrap3/BS3Row.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/layout/bootstrap3/BS3Row.java b/core/applib/src/main/java/org/apache/isis/applib/layout/bootstrap3/BS3Row.java
index 097c883..d34e3ec 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/layout/bootstrap3/BS3Row.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/layout/bootstrap3/BS3Row.java
@@ -29,6 +29,8 @@ import javax.xml.bind.annotation.XmlType;
 
 import com.google.common.collect.Lists;
 
+import org.apache.isis.applib.annotation.Programmatic;
+
 /**
  * Contains a row of content, either on the top-level {@link BS3Grid page} or at any other lower-level element that can
  * contain rows, eg {@link BS3Tab tabs}.
@@ -83,12 +85,6 @@ public class BS3Row extends BS3ElementAbstract implements HasCssId, BS3RowConten
 
 
 
-    @Override
-    public String getPath() {
-        return getId() != null? getId(): super.getPath();
-    }
-
-
 
     private String metadataError;
 
@@ -124,4 +120,21 @@ public class BS3Row extends BS3ElementAbstract implements HasCssId, BS3RowConten
         this.owner = owner;
     }
 
+
+
+    @Override
+    @XmlTransient
+    @Programmatic
+    public BS3Grid getGrid() {
+        return getOwner().getGrid();
+    }
+
+
+    @Override public String toString() {
+        return "BS3Row{" +
+                "id='" + id + '\'' +
+                '}';
+    }
+
+
 }

http://git-wip-us.apache.org/repos/asf/isis/blob/f3e8bbfc/core/applib/src/main/java/org/apache/isis/applib/layout/bootstrap3/BS3RowContent.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/layout/bootstrap3/BS3RowContent.java b/core/applib/src/main/java/org/apache/isis/applib/layout/bootstrap3/BS3RowContent.java
index b537ed9..096578b 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/layout/bootstrap3/BS3RowContent.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/layout/bootstrap3/BS3RowContent.java
@@ -21,6 +21,8 @@ package org.apache.isis.applib.layout.bootstrap3;
 import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlTransient;
 
+import org.apache.isis.applib.annotation.Programmatic;
+
 /**
  * Common superclass for any content of a row.
  *
@@ -82,4 +84,12 @@ public abstract class BS3RowContent extends BS3ElementAbstract {
         this.owner = owner;
     }
 
+    @Override
+    @XmlTransient
+    @Programmatic
+    public BS3Grid getGrid() {
+        return getOwner().getGrid();
+    }
+
+
 }

http://git-wip-us.apache.org/repos/asf/isis/blob/f3e8bbfc/core/applib/src/main/java/org/apache/isis/applib/layout/bootstrap3/BS3RowContentOwner.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/layout/bootstrap3/BS3RowContentOwner.java b/core/applib/src/main/java/org/apache/isis/applib/layout/bootstrap3/BS3RowContentOwner.java
index 70c1bf2..ed82e9e 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/layout/bootstrap3/BS3RowContentOwner.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/layout/bootstrap3/BS3RowContentOwner.java
@@ -20,6 +20,6 @@ package org.apache.isis.applib.layout.bootstrap3;
 
 import org.apache.isis.applib.layout.common.Owner;
 
-public interface BS3RowContentOwner extends Owner {
+public interface BS3RowContentOwner extends Owner, WithinGrid {
 
 }

http://git-wip-us.apache.org/repos/asf/isis/blob/f3e8bbfc/core/applib/src/main/java/org/apache/isis/applib/layout/bootstrap3/BS3RowOwner.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/layout/bootstrap3/BS3RowOwner.java b/core/applib/src/main/java/org/apache/isis/applib/layout/bootstrap3/BS3RowOwner.java
index 222f4f6..aad3d43 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/layout/bootstrap3/BS3RowOwner.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/layout/bootstrap3/BS3RowOwner.java
@@ -22,7 +22,7 @@ import java.util.List;
 
 import org.apache.isis.applib.layout.common.Owner;
 
-public interface BS3RowOwner extends Owner {
+public interface BS3RowOwner extends Owner, WithinGrid {
 
     List<BS3Row> getRows();
 }

http://git-wip-us.apache.org/repos/asf/isis/blob/f3e8bbfc/core/applib/src/main/java/org/apache/isis/applib/layout/bootstrap3/BS3Tab.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/layout/bootstrap3/BS3Tab.java b/core/applib/src/main/java/org/apache/isis/applib/layout/bootstrap3/BS3Tab.java
index f1d4256..100b8a3 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/layout/bootstrap3/BS3Tab.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/layout/bootstrap3/BS3Tab.java
@@ -19,6 +19,7 @@
 package org.apache.isis.applib.layout.bootstrap3;
 
 import java.util.List;
+import java.util.concurrent.atomic.AtomicBoolean;
 
 import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlElement;
@@ -28,6 +29,12 @@ import javax.xml.bind.annotation.XmlType;
 import com.google.common.base.Predicate;
 import com.google.common.collect.Lists;
 
+import org.apache.isis.applib.annotation.Programmatic;
+import org.apache.isis.applib.layout.common.ActionLayoutData;
+import org.apache.isis.applib.layout.common.CollectionLayoutData;
+import org.apache.isis.applib.layout.common.DomainObjectLayoutData;
+import org.apache.isis.applib.layout.common.PropertyLayoutData;
+
 /**
  * Represents a tab within a {@link BS3TabGroup tab group}.
  *
@@ -92,13 +99,79 @@ public class BS3Tab extends BS3ElementAbstract implements BS3RowOwner {
 
     public static class Predicates {
         public static Predicate<BS3Tab> notEmpty() {
+            final AtomicBoolean visitingTheNode = new AtomicBoolean(false);
+            final AtomicBoolean foundContent = new AtomicBoolean(false);
+
             return new Predicate<BS3Tab>() {
                 @Override
-                public boolean apply(final BS3Tab bs3Tab) {
-                    return !bs3Tab.getRows().isEmpty();
+                public boolean apply(final BS3Tab thisBs3Tab) {
+                    final BS3Grid owningGrid = thisBs3Tab.getGrid();
+                    owningGrid.visit(new BS3Grid.VisitorAdapter() {
+
+                        /**
+                         * if found the tab, then reset 'foundContent' to false, and then use 'visitingTheNode' as
+                         * a marker to indicate that the visitor is now being passed to the nodes underneath the tab.
+                         * In those children, if visited (with the 'visitingTheNode' flag enabled), then simply set the
+                         * 'foundContent' flag.
+                         */
+                        @Override
+                        public void preVisit(final BS3Tab bs3Tab) {
+                            if(bs3Tab == thisBs3Tab) {
+                                foundContent.set(false);
+                                visitingTheNode.set(true);
+                            }
+                        }
+
+                        @Override public void postVisit(final BS3Tab bs3Tab) {
+                            if(bs3Tab == thisBs3Tab) {
+                                visitingTheNode.set(false);
+                            }
+                        }
+
+                        @Override
+                        public void visit(final DomainObjectLayoutData domainObjectLayoutData) {
+                            if(visitingTheNode.get()) {
+                                foundContent.set(true);
+                            }
+                        }
+
+                        @Override
+                        public void visit(final ActionLayoutData actionLayoutData) {
+                            if(visitingTheNode.get()) {
+                                foundContent.set(true);
+                            }
+                        }
+
+                        @Override
+                        public void visit(final PropertyLayoutData propertyLayoutData) {
+                            if(visitingTheNode.get()) {
+                                foundContent.set(true);
+                            }
+                        }
+
+                        @Override
+                        public void visit(final CollectionLayoutData collectionLayoutData) {
+                            if(visitingTheNode.get()) {
+                                foundContent.set(true);
+                            }
+                        }
+                    });
+                    return foundContent.get();
                 }
             };
         }
     }
 
+    @Override
+    @XmlTransient
+    @Programmatic
+    public BS3Grid getGrid() {
+        return getOwner().getGrid();
+    }
+
+    @Override public String toString() {
+        return "BS3Tab{" +
+                "name='" + name + '\'' +
+                '}';
+    }
 }

http://git-wip-us.apache.org/repos/asf/isis/blob/f3e8bbfc/core/applib/src/main/java/org/apache/isis/applib/layout/bootstrap3/BS3TabGroup.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/layout/bootstrap3/BS3TabGroup.java b/core/applib/src/main/java/org/apache/isis/applib/layout/bootstrap3/BS3TabGroup.java
index 434c2ae..e10fa63 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/layout/bootstrap3/BS3TabGroup.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/layout/bootstrap3/BS3TabGroup.java
@@ -27,6 +27,8 @@ import javax.xml.bind.annotation.XmlType;
 
 import com.google.common.collect.Lists;
 
+import org.apache.isis.applib.annotation.Programmatic;
+
 /**
  * Represents a tab group containing one or more {@link BS3Tab tab}s.
  */
@@ -110,7 +112,12 @@ public class BS3TabGroup extends BS3ElementAbstract implements BS3TabOwner {
         this.metadataError = metadataError;
     }
 
-
+    @Override
+    @XmlTransient
+    @Programmatic
+    public BS3Grid getGrid() {
+        return getOwner().getGrid();
+    }
 
 }
 

http://git-wip-us.apache.org/repos/asf/isis/blob/f3e8bbfc/core/applib/src/main/java/org/apache/isis/applib/layout/bootstrap3/BS3TabGroupOwner.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/layout/bootstrap3/BS3TabGroupOwner.java b/core/applib/src/main/java/org/apache/isis/applib/layout/bootstrap3/BS3TabGroupOwner.java
index 1e4ba07..24b6b0e 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/layout/bootstrap3/BS3TabGroupOwner.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/layout/bootstrap3/BS3TabGroupOwner.java
@@ -22,7 +22,7 @@ import java.util.List;
 
 import org.apache.isis.applib.layout.common.Owner;
 
-public interface BS3TabGroupOwner extends Owner {
+public interface BS3TabGroupOwner extends Owner, WithinGrid {
 
     List<BS3TabGroup> getTabGroups();
 }

http://git-wip-us.apache.org/repos/asf/isis/blob/f3e8bbfc/core/applib/src/main/java/org/apache/isis/applib/layout/bootstrap3/BS3TabOwner.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/layout/bootstrap3/BS3TabOwner.java b/core/applib/src/main/java/org/apache/isis/applib/layout/bootstrap3/BS3TabOwner.java
index c6de978..ebcb4ae 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/layout/bootstrap3/BS3TabOwner.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/layout/bootstrap3/BS3TabOwner.java
@@ -22,7 +22,7 @@ import java.util.List;
 
 import org.apache.isis.applib.layout.common.Owner;
 
-public interface BS3TabOwner extends Owner {
+public interface BS3TabOwner extends Owner, WithinGrid {
 
     List<BS3Tab> getTabs();
 }

http://git-wip-us.apache.org/repos/asf/isis/blob/f3e8bbfc/core/applib/src/main/java/org/apache/isis/applib/layout/bootstrap3/WithinGrid.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/layout/bootstrap3/WithinGrid.java b/core/applib/src/main/java/org/apache/isis/applib/layout/bootstrap3/WithinGrid.java
new file mode 100644
index 0000000..ac3faa5
--- /dev/null
+++ b/core/applib/src/main/java/org/apache/isis/applib/layout/bootstrap3/WithinGrid.java
@@ -0,0 +1,27 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+package org.apache.isis.applib.layout.bootstrap3;
+
+import org.apache.isis.applib.annotation.Programmatic;
+
+public interface WithinGrid {
+
+    @Programmatic
+    BS3Grid getGrid();
+}

http://git-wip-us.apache.org/repos/asf/isis/blob/f3e8bbfc/core/applib/src/main/java/org/apache/isis/applib/layout/common/ActionLayoutData.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/layout/common/ActionLayoutData.java b/core/applib/src/main/java/org/apache/isis/applib/layout/common/ActionLayoutData.java
index 8b6cdac..f1aa540 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/layout/common/ActionLayoutData.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/layout/common/ActionLayoutData.java
@@ -226,5 +226,11 @@ public class ActionLayoutData implements Serializable, Owned<ActionLayoutDataOwn
 
 
 
+    @Override public String toString() {
+        return "ActionLayoutData{" +
+                "id='" + id + '\'' +
+                '}';
+    }
+
 
 }

http://git-wip-us.apache.org/repos/asf/isis/blob/f3e8bbfc/core/applib/src/main/java/org/apache/isis/applib/layout/common/CollectionLayoutData.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/layout/common/CollectionLayoutData.java b/core/applib/src/main/java/org/apache/isis/applib/layout/common/CollectionLayoutData.java
index 7ba3d5d..19758d6 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/layout/common/CollectionLayoutData.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/layout/common/CollectionLayoutData.java
@@ -29,7 +29,6 @@ import javax.xml.bind.annotation.XmlType;
 
 import com.google.common.base.Function;
 
-import org.apache.isis.applib.annotation.Programmatic;
 import org.apache.isis.applib.annotation.Where;
 
 /**
@@ -233,20 +232,6 @@ public class CollectionLayoutData implements MemberRegion, ActionLayoutDataOwner
 
 
 
-    private String path;
-
-    @Programmatic
-    @XmlTransient
-    public String getPath() {
-        return path;
-    }
-
-    @Programmatic
-    public void setPath(final String path) {
-        this.path = path;
-    }
-
-
 
     public static class Functions {
         private Functions(){}
@@ -260,4 +245,10 @@ public class CollectionLayoutData implements MemberRegion, ActionLayoutDataOwner
             };
         }
     }
+
+    @Override public String toString() {
+        return "CollectionLayoutData{" +
+                "id='" + id + '\'' +
+                '}';
+    }
 }

http://git-wip-us.apache.org/repos/asf/isis/blob/f3e8bbfc/core/applib/src/main/java/org/apache/isis/applib/layout/common/FieldSet.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/layout/common/FieldSet.java b/core/applib/src/main/java/org/apache/isis/applib/layout/common/FieldSet.java
index fe8bf65..262796b 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/layout/common/FieldSet.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/layout/common/FieldSet.java
@@ -32,7 +32,6 @@ import com.google.common.base.Function;
 import com.google.common.collect.Lists;
 
 import org.apache.isis.applib.annotation.MemberOrder;
-import org.apache.isis.applib.annotation.Programmatic;
 import org.apache.isis.applib.layout.bootstrap3.BS3Col;
 
 /**
@@ -183,20 +182,6 @@ public class FieldSet implements MemberRegion, ActionLayoutDataOwner, Serializab
 
 
 
-    private String path;
-
-    @Programmatic
-    @XmlTransient
-    public String getPath() {
-        return path;
-    }
-
-    @Programmatic
-    public void setPath(final String path) {
-        this.path = path;
-    }
-
-
 
     private String metadataError;
 
@@ -226,4 +211,10 @@ public class FieldSet implements MemberRegion, ActionLayoutDataOwner, Serializab
         }
     }
 
+    @Override public String toString() {
+        return "FieldSet{" +
+                "id='" + id + '\'' +
+                '}';
+    }
+
 }

http://git-wip-us.apache.org/repos/asf/isis/blob/f3e8bbfc/core/applib/src/main/java/org/apache/isis/applib/layout/common/PropertyLayoutData.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/layout/common/PropertyLayoutData.java b/core/applib/src/main/java/org/apache/isis/applib/layout/common/PropertyLayoutData.java
index c9274b6..91e7ee0 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/layout/common/PropertyLayoutData.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/layout/common/PropertyLayoutData.java
@@ -28,7 +28,6 @@ import javax.xml.bind.annotation.XmlTransient;
 import javax.xml.bind.annotation.XmlType;
 
 import org.apache.isis.applib.annotation.LabelPosition;
-import org.apache.isis.applib.annotation.Programmatic;
 import org.apache.isis.applib.annotation.Where;
 
 /**
@@ -231,17 +230,10 @@ public class PropertyLayoutData implements ActionLayoutDataOwner, Serializable,
 
 
 
-    private String path;
-
-    @Programmatic
-    @XmlTransient
-    public String getPath() {
-        return path;
-    }
-
-    @Programmatic
-    public void setPath(final String path) {
-        this.path = path;
+    @Override public String toString() {
+        return "PropertyLayoutData{" +
+                "id='" + id + '\'' +
+                '}';
     }
 
 

http://git-wip-us.apache.org/repos/asf/isis/blob/f3e8bbfc/core/applib/src/main/java/org/apache/isis/applib/layout/fixedcols/FCColumn.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/layout/fixedcols/FCColumn.java b/core/applib/src/main/java/org/apache/isis/applib/layout/fixedcols/FCColumn.java
index 4c29f26..79d94b4 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/layout/fixedcols/FCColumn.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/layout/fixedcols/FCColumn.java
@@ -29,7 +29,6 @@ import javax.xml.bind.annotation.XmlType;
 import com.google.common.collect.Lists;
 
 import org.apache.isis.applib.annotation.MemberGroupLayout;
-import org.apache.isis.applib.annotation.Programmatic;
 import org.apache.isis.applib.layout.common.CollectionLayoutData;
 import org.apache.isis.applib.layout.common.CollectionLayoutDataOwner;
 import org.apache.isis.applib.layout.common.FieldSet;
@@ -122,21 +121,6 @@ public class FCColumn implements Serializable, FieldSetOwner, CollectionLayoutDa
 
 
 
-    private String path;
-
-    @Programmatic
-    @XmlTransient
-    public String getPath() {
-        return path;
-    }
-
-    @Programmatic
-    public void setPath(final String path) {
-        this.path = path;
-    }
-
-
-
 
     private Hint hint;
 

http://git-wip-us.apache.org/repos/asf/isis/blob/f3e8bbfc/core/applib/src/main/java/org/apache/isis/applib/layout/fixedcols/FCTab.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/layout/fixedcols/FCTab.java b/core/applib/src/main/java/org/apache/isis/applib/layout/fixedcols/FCTab.java
index 026f09f..f7b7100 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/layout/fixedcols/FCTab.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/layout/fixedcols/FCTab.java
@@ -132,22 +132,6 @@ public class FCTab implements FCColumnOwner, Serializable, Owned<FCTabGroup> {
 
 
 
-
-    private String path;
-
-    @Programmatic
-    @XmlTransient
-    public String getPath() {
-        return path;
-    }
-
-    @Programmatic
-    public void setPath(final String path) {
-        this.path = path;
-    }
-
-
-
     private static void appendContent(final List<MemberRegion> contents, final FCColumn FCColumn) {
         if(FCColumn == null) {
             return;

http://git-wip-us.apache.org/repos/asf/isis/blob/f3e8bbfc/core/applib/src/main/java/org/apache/isis/applib/layout/fixedcols/FCTabGroup.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/layout/fixedcols/FCTabGroup.java b/core/applib/src/main/java/org/apache/isis/applib/layout/fixedcols/FCTabGroup.java
index d4ad9dc..93c88970 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/layout/fixedcols/FCTabGroup.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/layout/fixedcols/FCTabGroup.java
@@ -29,7 +29,6 @@ import com.google.common.base.Predicate;
 import com.google.common.collect.FluentIterable;
 import com.google.common.collect.Lists;
 
-import org.apache.isis.applib.annotation.Programmatic;
 import org.apache.isis.applib.layout.common.Owned;
 
 @XmlType(
@@ -77,19 +76,6 @@ public class FCTabGroup implements FCColumnOwner, Serializable, Owned<FCTabGroup
 
 
 
-    private String path;
-
-    @Programmatic
-    @XmlTransient
-    public String getPath() {
-        return path;
-    }
-
-    @Programmatic
-    public void setPath(final String path) {
-        this.path = path;
-    }
-
 
 
     public static class Predicates {

http://git-wip-us.apache.org/repos/asf/isis/blob/f3e8bbfc/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/Util.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/Util.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/Util.java
index 06d8877..90a84f0 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/Util.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/Util.java
@@ -19,6 +19,8 @@
 
 package org.apache.isis.viewer.wicket.ui.components.layout.bs3;
 
+import com.google.common.base.Strings;
+
 import org.apache.wicket.MarkupContainer;
 
 import org.apache.isis.applib.layout.bootstrap3.BS3Element;
@@ -36,7 +38,7 @@ public class Util {
         }
     }
     public static void appendCssClass(final MarkupContainer markupContainer, final BS3ElementAbstract element, final String existingCssClass) {
-        final String cssClass = existingCssClass + " " + element.getCssClass();
+        final String cssClass = existingCssClass + (!Strings.isNullOrEmpty(element.getCssClass())? (" " + element.getCssClass()): "");
         CssClassAppender.appendCssClassTo(markupContainer, cssClass);
     }
 }

http://git-wip-us.apache.org/repos/asf/isis/blob/f3e8bbfc/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/col/Col.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/col/Col.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/col/Col.java
index a2b8fbb..3332e1c 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/col/Col.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/col/Col.java
@@ -154,20 +154,29 @@ public class Col extends PanelAbstract<EntityModel> {
 
 
         // tab groups
-        final List<BS3TabGroup> tabGroupsWithTabs =
+        final List<BS3TabGroup> tabGroupsWithNonEmptyTabs =
                 FluentIterable.from(bs3Col.getTabGroups())
                         .filter(new Predicate<BS3TabGroup>() {
                             @Override public boolean apply(@Nullable final BS3TabGroup bs3TabGroup) {
-                                return !bs3TabGroup.getTabs().isEmpty();
+                                final List<BS3Tab> bs3TabsWithRows =
+                                        FluentIterable
+                                                .from(bs3TabGroup.getTabs())
+                                                .filter(BS3Tab.Predicates.notEmpty())
+                                                .toList();
+                                return !bs3TabsWithRows.isEmpty();
                             }
                         }).toList();
-        if(!tabGroupsWithTabs.isEmpty()) {
+        if(!tabGroupsWithNonEmptyTabs.isEmpty()) {
             final RepeatingView tabGroupRv = new RepeatingView(ID_TAB_GROUPS);
 
-            for (BS3TabGroup bs3TabGroup : tabGroupsWithTabs) {
+            for (BS3TabGroup bs3TabGroup : tabGroupsWithNonEmptyTabs) {
 
                 final String id = tabGroupRv.newChildId();
-                final List<BS3Tab> tabs = bs3TabGroup.getTabs();
+                final List<BS3Tab> tabs =
+                        FluentIterable
+                                .from(bs3TabGroup.getTabs())
+                                .filter(BS3Tab.Predicates.notEmpty())
+                                .toList();
                 switch (tabs.size()) {
                 case 0:
                     // shouldn't occur; previously have filtered these out
@@ -197,11 +206,16 @@ public class Col extends PanelAbstract<EntityModel> {
 
 
         // fieldsets
-        final List<FieldSet> fieldSets = bs3Col.getFieldSets();
-        if(!fieldSets.isEmpty()) {
+        final List<FieldSet> fieldSetsWithProperties = FluentIterable.from(bs3Col.getFieldSets())
+                .filter(new Predicate<FieldSet>() {
+                    @Override public boolean apply(@Nullable final FieldSet fieldSet) {
+                        return !fieldSet.getProperties().isEmpty();
+                    }
+                }).toList();
+        if(!fieldSetsWithProperties.isEmpty()) {
             final RepeatingView fieldSetRv = new RepeatingView(ID_FIELD_SETS);
 
-            for (FieldSet fieldSet : fieldSets) {
+            for (FieldSet fieldSet : fieldSetsWithProperties) {
 
                 final String id = fieldSetRv.newChildId();
                 final EntityModel entityModelWithHints = getModel().cloneWithLayoutMetadata(fieldSet);

http://git-wip-us.apache.org/repos/asf/isis/blob/f3e8bbfc/example/application/simpleapp/dom/src/main/java/domainapp/dom/simple/SimpleObject.layout.xml
----------------------------------------------------------------------
diff --git a/example/application/simpleapp/dom/src/main/java/domainapp/dom/simple/SimpleObject.layout.xml b/example/application/simpleapp/dom/src/main/java/domainapp/dom/simple/SimpleObject.layout.xml
index 9e8718d..b076822 100644
--- a/example/application/simpleapp/dom/src/main/java/domainapp/dom/simple/SimpleObject.layout.xml
+++ b/example/application/simpleapp/dom/src/main/java/domainapp/dom/simple/SimpleObject.layout.xml
@@ -35,18 +35,19 @@
     </bs3:row>
 -->
     <bs3:row>
-        <bs3:col span="12" unreferencedActions="true">
+        <bs3:col span="12" unreferencedActions="false">
             <c:domainObject/>
         </bs3:col>
     </bs3:row>
     <bs3:row>
         <bs3:col span="6">
             <bs3:tabGroup>
-                <bs3:tab name="General">
-                    <bs3:row>
+                <bs3:tab name="General" cssClass="bar">
+                    <bs3:row cssClass="foo">
                         <bs3:col span="12">
-                            <c:fieldSet name="Properties">
+                            <c:fieldSet name="Properties" unreferencedActions="true">
                                 <c:property id="name"/>
+                                <c:property id="versionSequence"/>
                             </c:fieldSet>
                         </bs3:col>
                     </bs3:row>


[2/3] isis git commit: ISIS-993: changed the suppression algorithm: now, will render any tab group with only a single tab as that tab's rows. This allows tab groups to alternate with field sets etc.

Posted by da...@apache.org.
ISIS-993: changed the suppression algorithm: now, will render any tab group with only a single tab as that tab's rows.  This allows tab groups to alternate with field sets etc.


Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/082916ae
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/082916ae
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/082916ae

Branch: refs/heads/ISIS-993
Commit: 082916aeb4dcf34949789b0fa01caf47b27437b9
Parents: 2ae2df1
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Mon Feb 8 09:34:04 2016 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Mon Feb 8 09:34:04 2016 +0000

----------------------------------------------------------------------
 .../ui/components/layout/bs3/col/Col.java       | 80 +++++++++++---------
 .../dom/simple/SimpleObject.layout.xml          | 12 ++-
 2 files changed, 53 insertions(+), 39 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/isis/blob/082916ae/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/col/Col.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/col/Col.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/col/Col.java
index 643a32d..a2b8fbb 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/col/Col.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/col/Col.java
@@ -145,56 +145,49 @@ public class Col extends PanelAbstract<EntityModel> {
 
         // rows
         final List<BS3Row> rows = Lists.newArrayList(this.bs3Col.getRows());
-        final List<BS3TabGroup> tabGroups = bs3Col.getTabGroups();
-        final List<BS3TabGroup> tabGroupsWithTabs =
-                FluentIterable.from(bs3Col.getTabGroups())
-                .filter(new Predicate<BS3TabGroup>() {
-                    @Override public boolean apply(@Nullable final BS3TabGroup bs3TabGroup) {
-                        return !bs3TabGroup.getTabs().isEmpty();
-                    }
-                }).toList();
-        BS3Tab singleTabIfAny = null;
-        if(tabGroupsWithTabs.size() == 1) {
-            final BS3TabGroup firstTabGroup = tabGroupsWithTabs.get(0);
-            final List<BS3Tab> firstTabGroupTabs = firstTabGroup.getTabs();
-            if(firstTabGroupTabs.size() == 1) {
-                singleTabIfAny = firstTabGroupTabs.get(0);
-            }
-        }
-        if(singleTabIfAny != null) {
-            rows.addAll(singleTabIfAny.getRows());
-        }
-
         if(!rows.isEmpty()) {
-            final RepeatingView rowRv = new RepeatingView(ID_ROWS);
-
-            for(final BS3Row bs3Row: rows) {
-
-                final String id = rowRv.newChildId();
-                final EntityModel entityModelWithHints = getModel().cloneWithLayoutMetadata(bs3Row);
-
-                final WebMarkupContainer row = new Row(id, entityModelWithHints);
-
-                rowRv.add(row);
-            }
-            div.add(rowRv);
+            final RepeatingView rowsRv = buildRows(ID_ROWS, rows);
+            div.add(rowsRv);
         } else {
             Components.permanentlyHide(div, ID_ROWS);
         }
 
 
         // tab groups
-        if(!tabGroupsWithTabs.isEmpty() && singleTabIfAny == null) {
+        final List<BS3TabGroup> tabGroupsWithTabs =
+                FluentIterable.from(bs3Col.getTabGroups())
+                        .filter(new Predicate<BS3TabGroup>() {
+                            @Override public boolean apply(@Nullable final BS3TabGroup bs3TabGroup) {
+                                return !bs3TabGroup.getTabs().isEmpty();
+                            }
+                        }).toList();
+        if(!tabGroupsWithTabs.isEmpty()) {
             final RepeatingView tabGroupRv = new RepeatingView(ID_TAB_GROUPS);
 
             for (BS3TabGroup bs3TabGroup : tabGroupsWithTabs) {
 
                 final String id = tabGroupRv.newChildId();
-                final EntityModel entityModelWithHints = getModel().cloneWithLayoutMetadata(bs3TabGroup);
-
-                final WebMarkupContainer tabGroup = new TabGroupPanel(id, entityModelWithHints);
+                final List<BS3Tab> tabs = bs3TabGroup.getTabs();
+                switch (tabs.size()) {
+                case 0:
+                    // shouldn't occur; previously have filtered these out
+                    throw new IllegalStateException("Cannot render tabGroup with no tabs");
+                case 1:
+                    final BS3Tab bs3Tab = tabs.get(0);
+                    // render the rows of the one-and-only tab of this tab group.
+                    final List<BS3Row> tabRows = bs3Tab.getRows();
+                    final RepeatingView rowsRv = buildRows(id, tabRows);
+                    tabGroupRv.add(rowsRv);
+                    break;
+                default:
+                    final EntityModel entityModelWithHints = getModel().cloneWithLayoutMetadata(bs3TabGroup);
+
+                    final WebMarkupContainer tabGroup = new TabGroupPanel(id, entityModelWithHints);
+
+                    tabGroupRv.add(tabGroup);
+                    break;
+                }
 
-                tabGroupRv.add(tabGroup);
             }
             div.add(tabGroupRv);
         } else {
@@ -243,7 +236,20 @@ public class Col extends PanelAbstract<EntityModel> {
 
     }
 
+    private RepeatingView buildRows(final String owningId, final List<BS3Row> rows) {
+        final RepeatingView rowRv = new RepeatingView(owningId);
 
+        for(final BS3Row bs3Row: rows) {
+
+            final String id = rowRv.newChildId();
+            final EntityModel entityModelWithHints = getModel().cloneWithLayoutMetadata(bs3Row);
+
+            final WebMarkupContainer row = new Row(id, entityModelWithHints);
+
+            rowRv.add(row);
+        }
+        return rowRv;
+    }
 
     ///////////////////////////////////////////////////////
     // Dependencies (from context)

http://git-wip-us.apache.org/repos/asf/isis/blob/082916ae/example/application/simpleapp/dom/src/main/java/domainapp/dom/simple/SimpleObject.layout.xml
----------------------------------------------------------------------
diff --git a/example/application/simpleapp/dom/src/main/java/domainapp/dom/simple/SimpleObject.layout.xml b/example/application/simpleapp/dom/src/main/java/domainapp/dom/simple/SimpleObject.layout.xml
index 65dcb4a..9e8718d 100644
--- a/example/application/simpleapp/dom/src/main/java/domainapp/dom/simple/SimpleObject.layout.xml
+++ b/example/application/simpleapp/dom/src/main/java/domainapp/dom/simple/SimpleObject.layout.xml
@@ -45,13 +45,21 @@
                 <bs3:tab name="General">
                     <bs3:row>
                         <bs3:col span="12">
-                            <c:fieldSet name="Properties" unreferencedProperties="true"/>
+                            <c:fieldSet name="Properties">
+                                <c:property id="name"/>
+                            </c:fieldSet>
+                        </bs3:col>
+                    </bs3:row>
+                </bs3:tab>
+                <bs3:tab name="Other">
+                    <bs3:row>
+                        <bs3:col span="12">
+                            <c:fieldSet name="Other" unreferencedProperties="true"/>
                         </bs3:col>
                     </bs3:row>
                 </bs3:tab>
             </bs3:tabGroup>
             <bs3:tabGroup>
-
             </bs3:tabGroup>
         </bs3:col>
         <bs3:col span="6">