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/10 17:12:42 UTC
[5/5] isis git commit: ISIS-993: moving around and renaming the
applib schema files for layout
ISIS-993: moving around and renaming the applib schema files for layout
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/67b6e05e
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/67b6e05e
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/67b6e05e
Branch: refs/heads/ISIS-993
Commit: 67b6e05e0536dc8df60a57e2e9f705dfd244c46a
Parents: 7894322
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Wed Feb 10 16:12:21 2016 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Wed Feb 10 16:12:21 2016 +0000
----------------------------------------------------------------------
.../applib/layout/component/component.xsd | 136 +++++++++
.../layout/grid/bootstrap3/bootstrap3.xsd | 136 +++++++++
.../applib/layout/bootstrap3/bootstrap3.xsd | 136 ---------
.../schema/applib/layout/common/common.xsd | 136 ---------
.../applib/layout/fixedcols/fixedcols.xsd | 39 ---
.../isis/applib/annotation/ActionLayout.java | 4 +-
.../isis/applib/annotation/BookmarkPolicy.java | 2 +-
.../isis/applib/annotation/Contributed.java | 2 +-
.../isis/applib/annotation/LabelPosition.java | 2 +-
.../isis/applib/annotation/RenderType.java | 2 +-
.../apache/isis/applib/annotation/Where.java | 2 +-
.../applib/layout/bootstrap3/BS3ClearFix.java | 24 --
.../layout/bootstrap3/BS3ClearFixHidden.java | 39 ---
.../layout/bootstrap3/BS3ClearFixVisible.java | 59 ----
.../isis/applib/layout/bootstrap3/BS3Col.java | 257 ----------------
.../applib/layout/bootstrap3/BS3Element.java | 35 ---
.../layout/bootstrap3/BS3ElementAbstract.java | 46 ---
.../isis/applib/layout/bootstrap3/BS3Grid.java | 304 -------------------
.../isis/applib/layout/bootstrap3/BS3Row.java | 140 ---------
.../applib/layout/bootstrap3/BS3RowContent.java | 95 ------
.../layout/bootstrap3/BS3RowContentOwner.java | 25 --
.../applib/layout/bootstrap3/BS3RowOwner.java | 28 --
.../isis/applib/layout/bootstrap3/BS3Tab.java | 177 -----------
.../applib/layout/bootstrap3/BS3TabGroup.java | 123 --------
.../layout/bootstrap3/BS3TabGroupOwner.java | 28 --
.../applib/layout/bootstrap3/BS3TabOwner.java | 28 --
.../isis/applib/layout/bootstrap3/HasCssId.java | 28 --
.../applib/layout/bootstrap3/WithinGrid.java | 27 --
.../applib/layout/bootstrap3/package-info.java | 34 ---
.../applib/layout/common/ActionLayoutData.java | 253 ---------------
.../layout/common/ActionLayoutDataOwner.java | 25 --
.../layout/common/CollectionLayoutData.java | 268 ----------------
.../common/CollectionLayoutDataOwner.java | 26 --
.../layout/common/DomainObjectLayoutData.java | 208 -------------
.../common/DomainObjectLayoutDataOwner.java | 25 --
.../isis/applib/layout/common/FieldSet.java | 223 --------------
.../applib/layout/common/FieldSetOwner.java | 25 --
.../apache/isis/applib/layout/common/Grid.java | 84 -----
.../isis/applib/layout/common/GridAbstract.java | 181 -----------
.../applib/layout/common/HasBookmarking.java | 14 -
.../isis/applib/layout/common/HasCssClass.java | 12 -
.../applib/layout/common/HasCssClassFa.java | 16 -
.../applib/layout/common/HasDescribedAs.java | 12 -
.../isis/applib/layout/common/HasHidden.java | 14 -
.../isis/applib/layout/common/HasNamed.java | 17 --
.../isis/applib/layout/common/MemberRegion.java | 33 --
.../applib/layout/common/MemberRegionOwner.java | 23 --
.../apache/isis/applib/layout/common/Owned.java | 23 --
.../apache/isis/applib/layout/common/Owner.java | 24 --
.../layout/common/PropertyLayoutData.java | 252 ---------------
.../isis/applib/layout/common/package-info.java | 36 ---
.../layout/component/ActionLayoutData.java | 253 +++++++++++++++
.../layout/component/ActionLayoutDataOwner.java | 25 ++
.../layout/component/CollectionLayoutData.java | 268 ++++++++++++++++
.../component/CollectionLayoutDataOwner.java | 26 ++
.../component/DomainObjectLayoutData.java | 208 +++++++++++++
.../component/DomainObjectLayoutDataOwner.java | 25 ++
.../isis/applib/layout/component/FieldSet.java | 223 ++++++++++++++
.../applib/layout/component/FieldSetOwner.java | 25 ++
.../isis/applib/layout/component/Grid.java | 84 +++++
.../applib/layout/component/GridAbstract.java | 181 +++++++++++
.../applib/layout/component/HasBookmarking.java | 14 +
.../applib/layout/component/HasCssClass.java | 12 +
.../applib/layout/component/HasCssClassFa.java | 16 +
.../applib/layout/component/HasDescribedAs.java | 12 +
.../isis/applib/layout/component/HasHidden.java | 14 +
.../isis/applib/layout/component/HasNamed.java | 17 ++
.../applib/layout/component/MemberRegion.java | 33 ++
.../layout/component/MemberRegionOwner.java | 23 ++
.../isis/applib/layout/component/Owned.java | 23 ++
.../isis/applib/layout/component/Owner.java | 24 ++
.../layout/component/PropertyLayoutData.java | 252 +++++++++++++++
.../applib/layout/component/package-info.java | 36 +++
.../layout/grid/bootstrap3/BS3ClearFix.java | 24 ++
.../grid/bootstrap3/BS3ClearFixHidden.java | 39 +++
.../grid/bootstrap3/BS3ClearFixVisible.java | 59 ++++
.../applib/layout/grid/bootstrap3/BS3Col.java | 257 ++++++++++++++++
.../layout/grid/bootstrap3/BS3Element.java | 35 +++
.../grid/bootstrap3/BS3ElementAbstract.java | 46 +++
.../applib/layout/grid/bootstrap3/BS3Grid.java | 304 +++++++++++++++++++
.../applib/layout/grid/bootstrap3/BS3Row.java | 140 +++++++++
.../layout/grid/bootstrap3/BS3RowContent.java | 95 ++++++
.../grid/bootstrap3/BS3RowContentOwner.java | 25 ++
.../layout/grid/bootstrap3/BS3RowOwner.java | 28 ++
.../applib/layout/grid/bootstrap3/BS3Tab.java | 177 +++++++++++
.../layout/grid/bootstrap3/BS3TabGroup.java | 123 ++++++++
.../grid/bootstrap3/BS3TabGroupOwner.java | 28 ++
.../layout/grid/bootstrap3/BS3TabOwner.java | 28 ++
.../applib/layout/grid/bootstrap3/HasCssId.java | 28 ++
.../layout/grid/bootstrap3/WithinGrid.java | 27 ++
.../layout/grid/bootstrap3/package-info.java | 34 +++
.../services/layout/GridNormalizerService.java | 2 +-
.../applib/services/layout/GridService.java | 2 +-
.../layout/Object_downloadLayoutXml.java | 2 +-
.../services/layout/Object_viewLayout.java | 2 +-
.../layout/ActionPositionFacetForActionXml.java | 2 +-
.../layout/BookmarkPolicyFacetForActionXml.java | 2 +-
.../layout/CssClassFaFacetForActionXml.java | 2 +-
.../layout/CssClassFacetForActionXml.java | 2 +-
.../layout/DescribedAsFacetForActionXml.java | 2 +-
.../layout/HiddenFacetForActionLayoutXml.java | 2 +-
.../actions/layout/NamedFacetForActionXml.java | 2 +-
.../layout/CssClassFacetForCollectionXml.java | 2 +-
.../DefaultViewFacetForCollectionXml.java | 2 +-
.../DescribedAsFacetForCollectionXml.java | 2 +-
.../layout/HiddenFacetForCollectionXml.java | 2 +-
.../layout/NamedFacetForCollectionXml.java | 2 +-
.../layout/PagedFacetForCollectionXml.java | 2 +-
.../layout/SortedByFacetForCollectionXml.java | 2 +-
.../metamodel/facets/object/grid/GridFacet.java | 2 +-
.../facets/object/grid/GridFacetDefault.java | 2 +-
.../CssClassFacetForPropertyXml.java | 2 +-
.../DescribedAsFacetForPropertyXml.java | 2 +-
.../HiddenFacetForPropertyXml.java | 2 +-
.../LabelAtFacetForPropertyXml.java | 2 +-
.../MultiLineFacetForPropertyXml.java | 2 +-
.../NamedFacetForPropertyXml.java | 2 +-
.../RenderedAdjustedFacetForPropertyXml.java | 2 +-
.../TypicalLengthFacetForPropertyXml.java | 2 +-
.../grid/GridNormalizerServiceAbstract.java | 30 +-
.../services/grid/GridServiceDefault.java | 6 +-
.../bootstrap3/GridNormalizerServiceBS3.java | 26 +-
.../grid/fixedcols/GridNormalizerServiceFC.java | 10 +-
.../grid/fixedcols/applib/FCColumn.java | 12 +-
.../grid/fixedcols/applib/FCColumnOwner.java | 2 +-
.../services/grid/fixedcols/applib/FCGrid.java | 16 +-
.../services/grid/fixedcols/applib/FCTab.java | 8 +-
.../grid/fixedcols/applib/FCTabGroup.java | 2 +-
.../grid/fixedcols/applib/FCTabGroupOwner.java | 2 +-
.../services/metamodel/MetadataMenu.java | 2 +-
.../object/layoutxml/GridFacetDefaultTest.java | 2 +-
.../metamodel/services/grid/BS3GridTest.java | 20 +-
.../metamodel/services/grid/FCGridTest.java | 15 +-
.../model/models/EntityCollectionModel.java | 2 +-
.../entity/fieldset/PropertyGroup.java | 4 +-
.../links/EntityLinksSelectorPanelFactory.java | 4 +-
.../ui/components/layout/bs3/BS3GridPanel.java | 4 +-
.../wicket/ui/components/layout/bs3/Util.java | 4 +-
.../layout/bs3/clearfix/ClearFix.java | 2 +-
.../ui/components/layout/bs3/col/Col.java | 16 +-
.../ui/components/layout/bs3/row/Row.java | 8 +-
.../layout/bs3/tabs/TabGroupPanel.java | 4 +-
.../ui/components/layout/bs3/tabs/TabPanel.java | 4 +-
.../components/layout/fixedcols/PropUtil.java | 2 +-
.../collections/EntityCollectionsPanel.java | 2 +-
.../layout/fixedcols/columns/EntityColumn.java | 4 +-
.../wicket/ui/pages/entity/EntityPage.java | 2 +-
.../dom/simple/SimpleObject.layout-FC.xml | 41 ---
.../dom/simple/SimpleObject.layout.json | 71 -----
.../dom/simple/SimpleObject.layout.xml | 64 +---
150 files changed, 3713 insertions(+), 3913 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/67b6e05e/adocs/documentation/src/main/asciidoc/applib/layout/component/component.xsd
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/applib/layout/component/component.xsd b/adocs/documentation/src/main/asciidoc/applib/layout/component/component.xsd
new file mode 100644
index 0000000..33dc6aa
--- /dev/null
+++ b/adocs/documentation/src/main/asciidoc/applib/layout/component/component.xsd
@@ -0,0 +1,136 @@
+<?xml version="1.0" standalone="yes"?>
+<xs:schema elementFormDefault="qualified" version="1.0" targetNamespace="http://isis.apache.org/applib/layout/component" xmlns:tns="http://isis.apache.org/applib/layout/component" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+ <xs:element name="action" type="tns:action"/>
+
+ <xs:element name="collection" type="tns:collection"/>
+
+ <xs:element name="domainObject" type="tns:domainObject"/>
+
+ <xs:element name="fieldSet" type="tns:fieldSet"/>
+
+ <xs:element name="property" type="tns:property"/>
+
+ <xs:complexType name="domainObject">
+ <xs:sequence>
+ <xs:element name="named" type="xs:string" minOccurs="0"/>
+ <xs:element name="describedAs" type="xs:string" minOccurs="0"/>
+ <xs:element name="plural" type="xs:string" minOccurs="0"/>
+ <xs:element name="metadataError" type="xs:string" minOccurs="0"/>
+ </xs:sequence>
+ <xs:attribute name="bookmarking" type="tns:bookmarkPolicy"/>
+ <xs:attribute name="cssClass" type="xs:string"/>
+ <xs:attribute name="cssClassFa" type="xs:string"/>
+ <xs:attribute name="cssClassFaPosition" type="tns:cssClassFaPosition"/>
+ </xs:complexType>
+
+ <xs:complexType name="action">
+ <xs:sequence>
+ <xs:element name="named" type="xs:string" minOccurs="0"/>
+ <xs:element name="describedAs" type="xs:string" minOccurs="0"/>
+ <xs:element name="metadataError" type="xs:string" minOccurs="0"/>
+ </xs:sequence>
+ <xs:attribute name="bookmarking" type="tns:bookmarkPolicy"/>
+ <xs:attribute name="cssClass" type="xs:string"/>
+ <xs:attribute name="cssClassFa" type="xs:string"/>
+ <xs:attribute name="cssClassFaPosition" type="tns:cssClassFaPosition"/>
+ <xs:attribute name="hidden" type="tns:where"/>
+ <xs:attribute name="id" type="xs:string" use="required"/>
+ <xs:attribute name="namedEscaped" type="xs:boolean"/>
+ <xs:attribute name="position" type="tns:position"/>
+ </xs:complexType>
+
+ <xs:complexType name="fieldSet">
+ <xs:sequence>
+ <xs:element ref="tns:action" minOccurs="0" maxOccurs="unbounded"/>
+ <xs:element ref="tns:property" minOccurs="0" maxOccurs="unbounded"/>
+ <xs:element name="metadataError" type="xs:string" minOccurs="0"/>
+ </xs:sequence>
+ <xs:attribute name="name" type="xs:string" use="required"/>
+ <xs:attribute name="id" type="xs:string"/>
+ <xs:attribute name="unreferencedActions" type="xs:boolean"/>
+ <xs:attribute name="unreferencedProperties" type="xs:boolean"/>
+ </xs:complexType>
+
+ <xs:complexType name="property">
+ <xs:sequence>
+ <xs:element name="named" type="xs:string" minOccurs="0"/>
+ <xs:element name="describedAs" type="xs:string" minOccurs="0"/>
+ <xs:element ref="tns:action" minOccurs="0" maxOccurs="unbounded"/>
+ <xs:element name="metadataError" type="xs:string" minOccurs="0"/>
+ </xs:sequence>
+ <xs:attribute name="cssClass" type="xs:string"/>
+ <xs:attribute name="hidden" type="tns:where"/>
+ <xs:attribute name="id" type="xs:string" use="required"/>
+ <xs:attribute name="labelPosition" type="tns:labelPosition"/>
+ <xs:attribute name="multiLine" type="xs:int"/>
+ <xs:attribute name="namedEscaped" type="xs:boolean"/>
+ <xs:attribute name="renderedAsDayBefore" type="xs:boolean"/>
+ <xs:attribute name="typicalLength" type="xs:int"/>
+ </xs:complexType>
+
+ <xs:complexType name="collection">
+ <xs:sequence>
+ <xs:element name="named" type="xs:string" minOccurs="0"/>
+ <xs:element name="describedAs" type="xs:string" minOccurs="0"/>
+ <xs:element name="sortedBy" type="xs:string" minOccurs="0"/>
+ <xs:element ref="tns:action" minOccurs="0" maxOccurs="unbounded"/>
+ <xs:element name="metadataError" type="xs:string" minOccurs="0"/>
+ </xs:sequence>
+ <xs:attribute name="cssClass" type="xs:string"/>
+ <xs:attribute name="defaultView" type="xs:string"/>
+ <xs:attribute name="hidden" type="tns:where"/>
+ <xs:attribute name="id" type="xs:string" use="required"/>
+ <xs:attribute name="namedEscaped" type="xs:boolean"/>
+ <xs:attribute name="paged" type="xs:int"/>
+ </xs:complexType>
+
+ <xs:simpleType name="bookmarkPolicy">
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="AS_ROOT"/>
+ <xs:enumeration value="AS_CHILD"/>
+ <xs:enumeration value="NEVER"/>
+ </xs:restriction>
+ </xs:simpleType>
+
+ <xs:simpleType name="cssClassFaPosition">
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="LEFT"/>
+ <xs:enumeration value="RIGHT"/>
+ </xs:restriction>
+ </xs:simpleType>
+
+ <xs:simpleType name="where">
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="EVERYWHERE"/>
+ <xs:enumeration value="ANYWHERE"/>
+ <xs:enumeration value="OBJECT_FORMS"/>
+ <xs:enumeration value="REFERENCES_PARENT"/>
+ <xs:enumeration value="PARENTED_TABLES"/>
+ <xs:enumeration value="STANDALONE_TABLES"/>
+ <xs:enumeration value="ALL_TABLES"/>
+ <xs:enumeration value="ALL_EXCEPT_STANDALONE_TABLES"/>
+ <xs:enumeration value="NOWHERE"/>
+ <xs:enumeration value="NOT_SPECIFIED"/>
+ </xs:restriction>
+ </xs:simpleType>
+
+ <xs:simpleType name="position">
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="BELOW"/>
+ <xs:enumeration value="RIGHT"/>
+ <xs:enumeration value="PANEL"/>
+ <xs:enumeration value="PANEL_DROPDOWN"/>
+ </xs:restriction>
+ </xs:simpleType>
+
+ <xs:simpleType name="labelPosition">
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="DEFAULT"/>
+ <xs:enumeration value="LEFT"/>
+ <xs:enumeration value="RIGHT"/>
+ <xs:enumeration value="TOP"/>
+ <xs:enumeration value="NONE"/>
+ </xs:restriction>
+ </xs:simpleType>
+</xs:schema>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis/blob/67b6e05e/adocs/documentation/src/main/asciidoc/applib/layout/grid/bootstrap3/bootstrap3.xsd
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/applib/layout/grid/bootstrap3/bootstrap3.xsd b/adocs/documentation/src/main/asciidoc/applib/layout/grid/bootstrap3/bootstrap3.xsd
new file mode 100644
index 0000000..65d2bd6
--- /dev/null
+++ b/adocs/documentation/src/main/asciidoc/applib/layout/grid/bootstrap3/bootstrap3.xsd
@@ -0,0 +1,136 @@
+<?xml version="1.0" standalone="yes"?>
+<xs:schema elementFormDefault="qualified" version="1.0" targetNamespace="http://isis.apache.org/applib/layout/grid/bootstrap3" xmlns:tns="http://isis.apache.org/applib/layout/grid/bootstrap3" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:ns1="http://isis.apache.org/applib/layout/component">
+
+ <xs:import namespace="http://isis.apache.org/applib/layout/component" schemaLocation="../../component"/>
+
+ <xs:element name="clearFixHidden" type="tns:clearFixHidden"/>
+
+ <xs:element name="clearFixVisible" type="tns:clearFixVisible"/>
+
+ <xs:element name="col" type="tns:col"/>
+
+ <xs:element name="grid" type="tns:grid"/>
+
+ <xs:complexType name="grid">
+ <xs:sequence>
+ <xs:element name="row" type="tns:row" maxOccurs="unbounded"/>
+ <xs:element name="metadataError" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
+ </xs:sequence>
+ <xs:attribute name="cssClass" type="xs:string"/>
+ </xs:complexType>
+
+ <xs:complexType name="row">
+ <xs:complexContent>
+ <xs:extension base="tns:bs3ElementAbstract">
+ <xs:sequence>
+ <xs:choice minOccurs="0" maxOccurs="unbounded">
+ <xs:element ref="tns:col"/>
+ <xs:element ref="tns:clearFixVisible"/>
+ <xs:element ref="tns:clearFixHidden"/>
+ </xs:choice>
+ <xs:element name="metadataError" type="xs:string" minOccurs="0"/>
+ </xs:sequence>
+ <xs:attribute name="id" type="xs:string"/>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+
+ <xs:complexType name="bs3ElementAbstract" abstract="true">
+ <xs:sequence/>
+ <xs:attribute name="cssClass" type="xs:string"/>
+ </xs:complexType>
+
+ <xs:complexType name="col">
+ <xs:complexContent>
+ <xs:extension base="tns:bs3RowContent">
+ <xs:sequence>
+ <xs:element ref="ns1:domainObject" minOccurs="0"/>
+ <xs:element ref="ns1:action" minOccurs="0" maxOccurs="unbounded"/>
+ <xs:element name="row" type="tns:row" minOccurs="0" maxOccurs="unbounded"/>
+ <xs:element name="tabGroup" type="tns:tabGroup" minOccurs="0" maxOccurs="unbounded"/>
+ <xs:element ref="ns1:fieldSet" minOccurs="0" maxOccurs="unbounded"/>
+ <xs:element ref="ns1:collection" minOccurs="0" maxOccurs="unbounded"/>
+ <xs:element name="metadataError" type="xs:string" minOccurs="0"/>
+ </xs:sequence>
+ <xs:attribute name="id" type="xs:string"/>
+ <xs:attribute name="span" type="xs:int" use="required"/>
+ <xs:attribute name="unreferencedActions" type="xs:boolean"/>
+ <xs:attribute name="unreferencedCollections" type="xs:boolean"/>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+
+ <xs:complexType name="bs3RowContent" abstract="true">
+ <xs:complexContent>
+ <xs:extension base="tns:bs3ElementAbstract">
+ <xs:sequence/>
+ <xs:attribute name="size" type="tns:size"/>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+
+ <xs:complexType name="tabGroup">
+ <xs:complexContent>
+ <xs:extension base="tns:bs3ElementAbstract">
+ <xs:sequence>
+ <xs:element name="tab" type="tns:tab" minOccurs="0" maxOccurs="unbounded"/>
+ <xs:element name="metadataError" type="xs:string" minOccurs="0"/>
+ </xs:sequence>
+ <xs:attribute name="unreferencedCollections" type="xs:boolean"/>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+
+ <xs:complexType name="tab">
+ <xs:complexContent>
+ <xs:extension base="tns:bs3ElementAbstract">
+ <xs:sequence>
+ <xs:element name="row" type="tns:row" maxOccurs="unbounded"/>
+ </xs:sequence>
+ <xs:attribute name="name" type="xs:string" use="required"/>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+
+ <xs:complexType name="clearFixVisible">
+ <xs:complexContent>
+ <xs:extension base="tns:bs3ClearFix">
+ <xs:sequence/>
+ <xs:attribute name="cssDisplay" type="tns:cssDisplay" use="required"/>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+
+ <xs:complexType name="bs3ClearFix" abstract="true">
+ <xs:complexContent>
+ <xs:extension base="tns:bs3RowContent">
+ <xs:sequence/>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+
+ <xs:complexType name="clearFixHidden">
+ <xs:complexContent>
+ <xs:extension base="tns:bs3ClearFix">
+ <xs:sequence/>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+
+ <xs:simpleType name="size">
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="XS"/>
+ <xs:enumeration value="SM"/>
+ <xs:enumeration value="MD"/>
+ <xs:enumeration value="LG"/>
+ </xs:restriction>
+ </xs:simpleType>
+
+ <xs:simpleType name="cssDisplay">
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="BLOCK"/>
+ <xs:enumeration value="INLINE"/>
+ <xs:enumeration value="INLINE_BLOCK"/>
+ </xs:restriction>
+ </xs:simpleType>
+</xs:schema>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis/blob/67b6e05e/adocs/documentation/src/main/asciidoc/schema/applib/layout/bootstrap3/bootstrap3.xsd
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/schema/applib/layout/bootstrap3/bootstrap3.xsd b/adocs/documentation/src/main/asciidoc/schema/applib/layout/bootstrap3/bootstrap3.xsd
deleted file mode 100644
index 39ca5fa..0000000
--- a/adocs/documentation/src/main/asciidoc/schema/applib/layout/bootstrap3/bootstrap3.xsd
+++ /dev/null
@@ -1,136 +0,0 @@
-<?xml version="1.0" standalone="yes"?>
-<xs:schema elementFormDefault="qualified" version="1.0" targetNamespace="http://isis.apache.org/schema/applib/layout/bootstrap3" xmlns:tns="http://isis.apache.org/schema/applib/layout/bootstrap3" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:ns1="http://isis.apache.org/schema/applib/layout/common">
-
- <xs:import namespace="http://isis.apache.org/schema/applib/layout/common" schemaLocation="../common"/>
-
- <xs:element name="clearFixHidden" type="tns:clearFixHidden"/>
-
- <xs:element name="clearFixVisible" type="tns:clearFixVisible"/>
-
- <xs:element name="col" type="tns:col"/>
-
- <xs:element name="grid" type="tns:grid"/>
-
- <xs:complexType name="grid">
- <xs:sequence>
- <xs:element name="row" type="tns:row" maxOccurs="unbounded"/>
- <xs:element name="metadataError" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
- </xs:sequence>
- <xs:attribute name="cssClass" type="xs:string"/>
- </xs:complexType>
-
- <xs:complexType name="row">
- <xs:complexContent>
- <xs:extension base="tns:bs3ElementAbstract">
- <xs:sequence>
- <xs:choice minOccurs="0" maxOccurs="unbounded">
- <xs:element ref="tns:col"/>
- <xs:element ref="tns:clearFixVisible"/>
- <xs:element ref="tns:clearFixHidden"/>
- </xs:choice>
- <xs:element name="metadataError" type="xs:string" minOccurs="0"/>
- </xs:sequence>
- <xs:attribute name="id" type="xs:string"/>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
-
- <xs:complexType name="bs3ElementAbstract" abstract="true">
- <xs:sequence/>
- <xs:attribute name="cssClass" type="xs:string"/>
- </xs:complexType>
-
- <xs:complexType name="col">
- <xs:complexContent>
- <xs:extension base="tns:bs3RowContent">
- <xs:sequence>
- <xs:element ref="ns1:domainObject" minOccurs="0"/>
- <xs:element ref="ns1:action" minOccurs="0" maxOccurs="unbounded"/>
- <xs:element name="row" type="tns:row" minOccurs="0" maxOccurs="unbounded"/>
- <xs:element name="tabGroup" type="tns:tabGroup" minOccurs="0" maxOccurs="unbounded"/>
- <xs:element ref="ns1:fieldSet" minOccurs="0" maxOccurs="unbounded"/>
- <xs:element ref="ns1:collection" minOccurs="0" maxOccurs="unbounded"/>
- <xs:element name="metadataError" type="xs:string" minOccurs="0"/>
- </xs:sequence>
- <xs:attribute name="id" type="xs:string"/>
- <xs:attribute name="span" type="xs:int" use="required"/>
- <xs:attribute name="unreferencedActions" type="xs:boolean"/>
- <xs:attribute name="unreferencedCollections" type="xs:boolean"/>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
-
- <xs:complexType name="bs3RowContent" abstract="true">
- <xs:complexContent>
- <xs:extension base="tns:bs3ElementAbstract">
- <xs:sequence/>
- <xs:attribute name="size" type="tns:size"/>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
-
- <xs:complexType name="tabGroup">
- <xs:complexContent>
- <xs:extension base="tns:bs3ElementAbstract">
- <xs:sequence>
- <xs:element name="tab" type="tns:tab" minOccurs="0" maxOccurs="unbounded"/>
- <xs:element name="metadataError" type="xs:string" minOccurs="0"/>
- </xs:sequence>
- <xs:attribute name="unreferencedCollections" type="xs:boolean"/>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
-
- <xs:complexType name="tab">
- <xs:complexContent>
- <xs:extension base="tns:bs3ElementAbstract">
- <xs:sequence>
- <xs:element name="row" type="tns:row" maxOccurs="unbounded"/>
- </xs:sequence>
- <xs:attribute name="name" type="xs:string" use="required"/>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
-
- <xs:complexType name="clearFixVisible">
- <xs:complexContent>
- <xs:extension base="tns:bs3ClearFix">
- <xs:sequence/>
- <xs:attribute name="cssDisplay" type="tns:cssDisplay" use="required"/>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
-
- <xs:complexType name="bs3ClearFix" abstract="true">
- <xs:complexContent>
- <xs:extension base="tns:bs3RowContent">
- <xs:sequence/>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
-
- <xs:complexType name="clearFixHidden">
- <xs:complexContent>
- <xs:extension base="tns:bs3ClearFix">
- <xs:sequence/>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
-
- <xs:simpleType name="size">
- <xs:restriction base="xs:string">
- <xs:enumeration value="XS"/>
- <xs:enumeration value="SM"/>
- <xs:enumeration value="MD"/>
- <xs:enumeration value="LG"/>
- </xs:restriction>
- </xs:simpleType>
-
- <xs:simpleType name="cssDisplay">
- <xs:restriction base="xs:string">
- <xs:enumeration value="BLOCK"/>
- <xs:enumeration value="INLINE"/>
- <xs:enumeration value="INLINE_BLOCK"/>
- </xs:restriction>
- </xs:simpleType>
-</xs:schema>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis/blob/67b6e05e/adocs/documentation/src/main/asciidoc/schema/applib/layout/common/common.xsd
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/schema/applib/layout/common/common.xsd b/adocs/documentation/src/main/asciidoc/schema/applib/layout/common/common.xsd
deleted file mode 100644
index 5b614a9..0000000
--- a/adocs/documentation/src/main/asciidoc/schema/applib/layout/common/common.xsd
+++ /dev/null
@@ -1,136 +0,0 @@
-<?xml version="1.0" standalone="yes"?>
-<xs:schema elementFormDefault="qualified" version="1.0" targetNamespace="http://isis.apache.org/schema/applib/layout/common" xmlns:tns="http://isis.apache.org/schema/applib/layout/common" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-
- <xs:element name="action" type="tns:action"/>
-
- <xs:element name="collection" type="tns:collection"/>
-
- <xs:element name="domainObject" type="tns:domainObject"/>
-
- <xs:element name="fieldSet" type="tns:fieldSet"/>
-
- <xs:element name="property" type="tns:property"/>
-
- <xs:complexType name="domainObject">
- <xs:sequence>
- <xs:element name="named" type="xs:string" minOccurs="0"/>
- <xs:element name="describedAs" type="xs:string" minOccurs="0"/>
- <xs:element name="plural" type="xs:string" minOccurs="0"/>
- <xs:element name="metadataError" type="xs:string" minOccurs="0"/>
- </xs:sequence>
- <xs:attribute name="bookmarking" type="tns:bookmarkPolicy"/>
- <xs:attribute name="cssClass" type="xs:string"/>
- <xs:attribute name="cssClassFa" type="xs:string"/>
- <xs:attribute name="cssClassFaPosition" type="tns:cssClassFaPosition"/>
- </xs:complexType>
-
- <xs:complexType name="action">
- <xs:sequence>
- <xs:element name="named" type="xs:string" minOccurs="0"/>
- <xs:element name="describedAs" type="xs:string" minOccurs="0"/>
- <xs:element name="metadataError" type="xs:string" minOccurs="0"/>
- </xs:sequence>
- <xs:attribute name="bookmarking" type="tns:bookmarkPolicy"/>
- <xs:attribute name="cssClass" type="xs:string"/>
- <xs:attribute name="cssClassFa" type="xs:string"/>
- <xs:attribute name="cssClassFaPosition" type="tns:cssClassFaPosition"/>
- <xs:attribute name="hidden" type="tns:where"/>
- <xs:attribute name="id" type="xs:string" use="required"/>
- <xs:attribute name="namedEscaped" type="xs:boolean"/>
- <xs:attribute name="position" type="tns:position"/>
- </xs:complexType>
-
- <xs:complexType name="fieldSet">
- <xs:sequence>
- <xs:element ref="tns:action" minOccurs="0" maxOccurs="unbounded"/>
- <xs:element ref="tns:property" minOccurs="0" maxOccurs="unbounded"/>
- <xs:element name="metadataError" type="xs:string" minOccurs="0"/>
- </xs:sequence>
- <xs:attribute name="name" type="xs:string" use="required"/>
- <xs:attribute name="id" type="xs:string"/>
- <xs:attribute name="unreferencedActions" type="xs:boolean"/>
- <xs:attribute name="unreferencedProperties" type="xs:boolean"/>
- </xs:complexType>
-
- <xs:complexType name="property">
- <xs:sequence>
- <xs:element name="named" type="xs:string" minOccurs="0"/>
- <xs:element name="describedAs" type="xs:string" minOccurs="0"/>
- <xs:element ref="tns:action" minOccurs="0" maxOccurs="unbounded"/>
- <xs:element name="metadataError" type="xs:string" minOccurs="0"/>
- </xs:sequence>
- <xs:attribute name="cssClass" type="xs:string"/>
- <xs:attribute name="hidden" type="tns:where"/>
- <xs:attribute name="id" type="xs:string" use="required"/>
- <xs:attribute name="labelPosition" type="tns:labelPosition"/>
- <xs:attribute name="multiLine" type="xs:int"/>
- <xs:attribute name="namedEscaped" type="xs:boolean"/>
- <xs:attribute name="renderedAsDayBefore" type="xs:boolean"/>
- <xs:attribute name="typicalLength" type="xs:int"/>
- </xs:complexType>
-
- <xs:complexType name="collection">
- <xs:sequence>
- <xs:element name="named" type="xs:string" minOccurs="0"/>
- <xs:element name="describedAs" type="xs:string" minOccurs="0"/>
- <xs:element name="sortedBy" type="xs:string" minOccurs="0"/>
- <xs:element ref="tns:action" minOccurs="0" maxOccurs="unbounded"/>
- <xs:element name="metadataError" type="xs:string" minOccurs="0"/>
- </xs:sequence>
- <xs:attribute name="cssClass" type="xs:string"/>
- <xs:attribute name="defaultView" type="xs:string"/>
- <xs:attribute name="hidden" type="tns:where"/>
- <xs:attribute name="id" type="xs:string" use="required"/>
- <xs:attribute name="namedEscaped" type="xs:boolean"/>
- <xs:attribute name="paged" type="xs:int"/>
- </xs:complexType>
-
- <xs:simpleType name="bookmarkPolicy">
- <xs:restriction base="xs:string">
- <xs:enumeration value="AS_ROOT"/>
- <xs:enumeration value="AS_CHILD"/>
- <xs:enumeration value="NEVER"/>
- </xs:restriction>
- </xs:simpleType>
-
- <xs:simpleType name="cssClassFaPosition">
- <xs:restriction base="xs:string">
- <xs:enumeration value="LEFT"/>
- <xs:enumeration value="RIGHT"/>
- </xs:restriction>
- </xs:simpleType>
-
- <xs:simpleType name="where">
- <xs:restriction base="xs:string">
- <xs:enumeration value="EVERYWHERE"/>
- <xs:enumeration value="ANYWHERE"/>
- <xs:enumeration value="OBJECT_FORMS"/>
- <xs:enumeration value="REFERENCES_PARENT"/>
- <xs:enumeration value="PARENTED_TABLES"/>
- <xs:enumeration value="STANDALONE_TABLES"/>
- <xs:enumeration value="ALL_TABLES"/>
- <xs:enumeration value="ALL_EXCEPT_STANDALONE_TABLES"/>
- <xs:enumeration value="NOWHERE"/>
- <xs:enumeration value="NOT_SPECIFIED"/>
- </xs:restriction>
- </xs:simpleType>
-
- <xs:simpleType name="position">
- <xs:restriction base="xs:string">
- <xs:enumeration value="BELOW"/>
- <xs:enumeration value="RIGHT"/>
- <xs:enumeration value="PANEL"/>
- <xs:enumeration value="PANEL_DROPDOWN"/>
- </xs:restriction>
- </xs:simpleType>
-
- <xs:simpleType name="labelPosition">
- <xs:restriction base="xs:string">
- <xs:enumeration value="DEFAULT"/>
- <xs:enumeration value="LEFT"/>
- <xs:enumeration value="RIGHT"/>
- <xs:enumeration value="TOP"/>
- <xs:enumeration value="NONE"/>
- </xs:restriction>
- </xs:simpleType>
-</xs:schema>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis/blob/67b6e05e/adocs/documentation/src/main/asciidoc/schema/applib/layout/fixedcols/fixedcols.xsd
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/schema/applib/layout/fixedcols/fixedcols.xsd b/adocs/documentation/src/main/asciidoc/schema/applib/layout/fixedcols/fixedcols.xsd
deleted file mode 100644
index 7820a18..0000000
--- a/adocs/documentation/src/main/asciidoc/schema/applib/layout/fixedcols/fixedcols.xsd
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" standalone="yes"?>
-<xs:schema elementFormDefault="qualified" version="1.0" targetNamespace="http://isis.apache.org/schema/applib/layout/fixedcols" xmlns:tns="http://isis.apache.org/schema/applib/layout/fixedcols" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:ns1="http://isis.apache.org/schema/applib/layout/common">
-
- <xs:import namespace="http://isis.apache.org/schema/applib/layout/common" schemaLocation="../common"/>
-
- <xs:element name="grid" type="tns:grid"/>
-
- <xs:complexType name="grid">
- <xs:sequence>
- <xs:element ref="ns1:action" minOccurs="0" maxOccurs="unbounded"/>
- <xs:element name="left" type="tns:fcColumn" minOccurs="0"/>
- <xs:element name="tabGroup" type="tns:fcTabGroup" maxOccurs="unbounded"/>
- <xs:element name="right" type="tns:fcColumn" minOccurs="0"/>
- </xs:sequence>
- </xs:complexType>
-
- <xs:complexType name="fcColumn">
- <xs:sequence>
- <xs:element ref="ns1:fieldSet" minOccurs="0" maxOccurs="unbounded"/>
- <xs:element ref="ns1:collection" minOccurs="0" maxOccurs="unbounded"/>
- </xs:sequence>
- <xs:attribute name="span" type="xs:int" use="required"/>
- </xs:complexType>
-
- <xs:complexType name="fcTabGroup">
- <xs:sequence>
- <xs:element name="tab" type="tns:tab" maxOccurs="unbounded"/>
- </xs:sequence>
- </xs:complexType>
-
- <xs:complexType name="tab">
- <xs:sequence>
- <xs:element name="left" type="tns:fcColumn"/>
- <xs:element name="middle" type="tns:fcColumn" minOccurs="0"/>
- <xs:element name="right" type="tns:fcColumn" minOccurs="0"/>
- </xs:sequence>
- <xs:attribute name="name" type="xs:string" use="required"/>
- </xs:complexType>
-</xs:schema>
http://git-wip-us.apache.org/repos/asf/isis/blob/67b6e05e/core/applib/src/main/java/org/apache/isis/applib/annotation/ActionLayout.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/annotation/ActionLayout.java b/core/applib/src/main/java/org/apache/isis/applib/annotation/ActionLayout.java
index 5aaf4ce..73982e9 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/annotation/ActionLayout.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/annotation/ActionLayout.java
@@ -75,7 +75,7 @@ public @interface ActionLayout {
CssClassFaPosition cssClassFaPosition() default CssClassFaPosition.LEFT;
@XmlType(
- namespace = "http://isis.apache.org/schema/applib/layout/common"
+ namespace = "http://isis.apache.org/applib/layout/component"
)
enum CssClassFaPosition {
LEFT, RIGHT
@@ -115,7 +115,7 @@ public @interface ActionLayout {
Position position() default Position.BELOW;
@XmlType(
- namespace = "http://isis.apache.org/schema/applib/layout/common"
+ namespace = "http://isis.apache.org/applib/layout/component"
)
enum Position {
BELOW,
http://git-wip-us.apache.org/repos/asf/isis/blob/67b6e05e/core/applib/src/main/java/org/apache/isis/applib/annotation/BookmarkPolicy.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/annotation/BookmarkPolicy.java b/core/applib/src/main/java/org/apache/isis/applib/annotation/BookmarkPolicy.java
index 483e4f1..70e810e 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/annotation/BookmarkPolicy.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/annotation/BookmarkPolicy.java
@@ -22,7 +22,7 @@ package org.apache.isis.applib.annotation;
import javax.xml.bind.annotation.XmlType;
@XmlType(
- namespace = "http://isis.apache.org/schema/applib/layout/common"
+ namespace = "http://isis.apache.org/applib/layout/component"
)
public enum BookmarkPolicy {
/**
http://git-wip-us.apache.org/repos/asf/isis/blob/67b6e05e/core/applib/src/main/java/org/apache/isis/applib/annotation/Contributed.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/annotation/Contributed.java b/core/applib/src/main/java/org/apache/isis/applib/annotation/Contributed.java
index cabb920..f0f39b3 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/annotation/Contributed.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/annotation/Contributed.java
@@ -25,7 +25,7 @@ import javax.xml.bind.annotation.XmlType;
* The means by which a domain service action will be contributed to a domain object.
*/
@XmlType(
- namespace = "http://isis.apache.org/schema/applib/layout/common"
+ namespace = "http://isis.apache.org/applib/layout/component"
)
public enum Contributed {
/**
http://git-wip-us.apache.org/repos/asf/isis/blob/67b6e05e/core/applib/src/main/java/org/apache/isis/applib/annotation/LabelPosition.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/annotation/LabelPosition.java b/core/applib/src/main/java/org/apache/isis/applib/annotation/LabelPosition.java
index e43dc31..102aa36 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/annotation/LabelPosition.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/annotation/LabelPosition.java
@@ -27,7 +27,7 @@ import javax.xml.bind.annotation.XmlType;
* @see org.apache.isis.applib.annotation.ParameterLayout
*/
@XmlType(
- namespace = "http://isis.apache.org/schema/applib/layout/common"
+ namespace = "http://isis.apache.org/applib/layout/component"
)
public enum LabelPosition {
DEFAULT,
http://git-wip-us.apache.org/repos/asf/isis/blob/67b6e05e/core/applib/src/main/java/org/apache/isis/applib/annotation/RenderType.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/annotation/RenderType.java b/core/applib/src/main/java/org/apache/isis/applib/annotation/RenderType.java
index d1205fa..6dfaf9e 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/annotation/RenderType.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/annotation/RenderType.java
@@ -21,7 +21,7 @@ package org.apache.isis.applib.annotation;
import javax.xml.bind.annotation.XmlType;
@XmlType(
- namespace = "http://isis.apache.org/schema/applib/layout/common"
+ namespace = "http://isis.apache.org/applib/layout/component"
)
public enum RenderType {
EAGERLY,
http://git-wip-us.apache.org/repos/asf/isis/blob/67b6e05e/core/applib/src/main/java/org/apache/isis/applib/annotation/Where.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/annotation/Where.java b/core/applib/src/main/java/org/apache/isis/applib/annotation/Where.java
index ae072d2..3277649 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/annotation/Where.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/annotation/Where.java
@@ -41,7 +41,7 @@ import org.apache.isis.applib.util.Enums;
* the framework developer should only use those values that represent concrete locations.
*/
@XmlType(
- namespace = "http://isis.apache.org/schema/applib/layout/common"
+ namespace = "http://isis.apache.org/applib/layout/component"
)
public enum Where {
/**
http://git-wip-us.apache.org/repos/asf/isis/blob/67b6e05e/core/applib/src/main/java/org/apache/isis/applib/layout/bootstrap3/BS3ClearFix.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/layout/bootstrap3/BS3ClearFix.java b/core/applib/src/main/java/org/apache/isis/applib/layout/bootstrap3/BS3ClearFix.java
deleted file mode 100644
index 29bf036..0000000
--- a/core/applib/src/main/java/org/apache/isis/applib/layout/bootstrap3/BS3ClearFix.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * 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;
-
-public abstract class BS3ClearFix extends BS3RowContent {
-
- public abstract String toCssClass();
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/67b6e05e/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
deleted file mode 100644
index 69e8367..0000000
--- a/core/applib/src/main/java/org/apache/isis/applib/layout/bootstrap3/BS3ClearFixHidden.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * 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 javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-@XmlRootElement(
- name = "clearFixHidden"
-)
-@XmlType(
- name = "clearFixHidden"
-)
-public class BS3ClearFixHidden extends BS3ClearFix {
-
- private static final long serialVersionUID = 1L;
-
- @Override
- public String toCssClass() {
- return "clearfix hidden-" + getSize().toCssClassFragment();
- }
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/67b6e05e/core/applib/src/main/java/org/apache/isis/applib/layout/bootstrap3/BS3ClearFixVisible.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/layout/bootstrap3/BS3ClearFixVisible.java b/core/applib/src/main/java/org/apache/isis/applib/layout/bootstrap3/BS3ClearFixVisible.java
deleted file mode 100644
index 523e668..0000000
--- a/core/applib/src/main/java/org/apache/isis/applib/layout/bootstrap3/BS3ClearFixVisible.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * 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 javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-@XmlRootElement(
- name = "clearFixVisible"
-)
-@XmlType(
- name = "clearFixVisible"
-)
-public class BS3ClearFixVisible extends BS3ClearFix {
-
- private static final long serialVersionUID = 1L;
-
- public enum CssDisplay {
- BLOCK,
- INLINE,
- INLINE_BLOCK
- }
-
- private CssDisplay cssDisplay;
-
-
- @XmlAttribute(required = true)
- public CssDisplay getCssDisplay() {
- return cssDisplay;
- }
-
- public void setCssDisplay(final CssDisplay cssDisplay) {
- this.cssDisplay = cssDisplay;
- }
-
-
- @Override
- public String toCssClass() {
- return "clearfix visible-" + getSize().toCssClassFragment() + "-" + getCssClass().toLowerCase().replace('_', '-');
- }
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/67b6e05e/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
deleted file mode 100644
index d568f05..0000000
--- a/core/applib/src/main/java/org/apache/isis/applib/layout/bootstrap3/BS3Col.java
+++ /dev/null
@@ -1,257 +0,0 @@
-/*
- * 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 java.util.List;
-
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementRef;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-import com.google.common.collect.Lists;
-
-import org.apache.isis.applib.layout.common.ActionLayoutData;
-import org.apache.isis.applib.layout.common.ActionLayoutDataOwner;
-import org.apache.isis.applib.layout.common.CollectionLayoutData;
-import org.apache.isis.applib.layout.common.CollectionLayoutDataOwner;
-import org.apache.isis.applib.layout.common.DomainObjectLayoutData;
-import org.apache.isis.applib.layout.common.DomainObjectLayoutDataOwner;
-import org.apache.isis.applib.layout.common.FieldSet;
-import org.apache.isis.applib.layout.common.FieldSetOwner;
-
-/**
- * A column within a row which, depending on its {@link #getSpan()}, could be as narrow as 1/12th of the page's width, all the way up to spanning the entire page.
- *
- * <p>
- * Pretty much other content can be contained within a column, though most commonly it will be {@link FieldSet fieldset}s
- * (a group of properties) or {@link CollectionLayoutData collection}s. However, columns can also be used to
- * contain further {@link BS3Row row}s (creating a nested grid of rows/cols/rows/cols) and {@link BS3TabGroup tabgroup}s.
- * </p>
- *
- * <p>
- * It is rendered as a (eg) <div class="col-md-4 ...">
- * </p>
- */
-@XmlRootElement(
- name = "col"
-)
-@XmlType(
- name = "col"
- , propOrder = {
- "domainObject",
- "actions",
- "rows",
- "tabGroups",
- "fieldSets",
- "collections",
- "metadataError"
- }
-)
-public class BS3Col extends BS3RowContent
- implements ActionLayoutDataOwner, BS3TabGroupOwner, BS3RowOwner, FieldSetOwner, HasCssId,
- CollectionLayoutDataOwner, DomainObjectLayoutDataOwner {
-
- private static final long serialVersionUID = 1L;
-
-
-
- private String id;
-
- /**
- * As per <div id="...">...</div> : must be unique across entire page.
- */
- @XmlAttribute(required = false)
- public String getId() {
- return id;
- }
-
- public void setId(final String id) {
- this.id = id;
- }
-
-
- private int span;
-
- @XmlAttribute(required = true)
- public int getSpan() {
- return span;
- }
-
- public void setSpan(final int span) {
- this.span = span;
- }
-
-
- private Boolean unreferencedActions;
-
- /**
- * Whether this column should be used to hold any unreferenced actions (contributed or "native").
- *
- * <p>
- * Any layout must have precisely one column or {@link FieldSet} that has this attribute set.
- * </p>
- */
- @XmlAttribute(required = false)
- public Boolean isUnreferencedActions() {
- return unreferencedActions;
- }
-
- public void setUnreferencedActions(final Boolean unreferencedActions) {
- this.unreferencedActions = unreferencedActions;
- }
-
-
- private Boolean unreferencedCollections;
- /**
- * Whether this column should be used to hold any unreferenced collections (contributed or "native").
- *
- * <p>
- * Any layout must have precisely one column or {@link BS3TabGroup tabgroup} that has this attribute set.
- * </p>
- */
- @XmlAttribute(required = false)
- public Boolean isUnreferencedCollections() {
- return unreferencedCollections;
- }
-
- public void setUnreferencedCollections(final Boolean unreferencedCollections) {
- this.unreferencedCollections = unreferencedCollections;
- }
-
-
-
-
-
- private DomainObjectLayoutData domainObject;
-
- /**
- * Whether to show the object's icon and title.
- */
- @XmlElementRef(type=DomainObjectLayoutData.class, name="domainObject", required = false)
- public DomainObjectLayoutData getDomainObject() {
- return domainObject;
- }
-
- public void setDomainObject(final DomainObjectLayoutData domainObjectLayoutData) {
- this.domainObject = domainObjectLayoutData;
- }
-
-
-
- private List<ActionLayoutData> actions = Lists.newArrayList();
-
- // no wrapper
- @XmlElementRef(type = ActionLayoutData.class, name = "action", required = false)
- public List<ActionLayoutData> getActions() {
- return actions;
- }
-
- public void setActions(final List<ActionLayoutData> actions) {
- this.actions = actions;
- }
-
-
-
- private List<BS3Row> rows = Lists.newArrayList();
-
- // no wrapper
- @XmlElement(name = "row", required = false)
- public List<BS3Row> getRows() {
- return rows;
- }
-
- public void setRows(final List<BS3Row> rows) {
- this.rows = rows;
- }
-
-
-
- private List<BS3TabGroup> tabGroups = Lists.newArrayList();
-
- // no wrapper
- @XmlElement(name = "tabGroup", required = false)
- public List<BS3TabGroup> getTabGroups() {
- return tabGroups;
- }
-
- public void setTabGroups(final List<BS3TabGroup> tabGroups) {
- this.tabGroups = tabGroups;
- }
-
-
-
- private List<FieldSet> fieldSets = Lists.newArrayList();
-
- // no wrapper
- @XmlElementRef(type=FieldSet.class, name = "fieldSet", required = false)
- public List<FieldSet> getFieldSets() {
- return fieldSets;
- }
-
- public void setFieldSets(final List<FieldSet> fieldSets) {
- this.fieldSets = fieldSets;
- }
-
-
-
- private List<CollectionLayoutData> collections = Lists.newArrayList();
-
- // no wrapper
- @XmlElementRef(type=CollectionLayoutData.class, name = "collection", required = false)
- public List<CollectionLayoutData> getCollections() {
- return collections;
- }
-
- public void setCollections(final List<CollectionLayoutData> collections) {
- this.collections = collections;
- }
-
-
-
- private String metadataError;
-
- /**
- * For diagnostics; populated by the framework if and only if a metadata error.
- */
- @XmlElement(required = false)
- public String getMetadataError() {
- return metadataError;
- }
-
- public void setMetadataError(final String metadataError) {
- this.metadataError = metadataError;
- }
-
-
-
- public String toCssClass() {
- final Size size = getSize() != null? getSize(): Size.MD;
- return "col-" + size.toCssClassFragment() + "-" + getSpan();
- }
-
-
- @Override public String toString() {
- return "BS3Col{" +
- "id='" + id + '\'' +
- '}';
- }
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/67b6e05e/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
deleted file mode 100644
index e407d10..0000000
--- a/core/applib/src/main/java/org/apache/isis/applib/layout/bootstrap3/BS3Element.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * 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 java.io.Serializable;
-
-public interface BS3Element extends WithinGrid, Serializable {
-
- /**
- * Any additional CSS classes to render on the page element corresponding to this object,
- * eg as per the <a href="http://getbootstrap.com/css/#grid-less">Bootstrap mixins</a> or just for
- * custom styling.
- */
- String getCssClass();
-
- void setCssClass(final String cssClass);
-
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/67b6e05e/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
deleted file mode 100644
index 0c39abc..0000000
--- a/core/applib/src/main/java/org/apache/isis/applib/layout/bootstrap3/BS3ElementAbstract.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * 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 javax.xml.bind.annotation.XmlAttribute;
-
-/**
- * Superclass for all layout classes, factoring out the common {@link #getCssClass()} attribute.
- */
-public abstract class BS3ElementAbstract implements BS3Element {
-
- private String cssClass;
-
- /**
- * Any additional CSS classes to render on the page element corresponding to this object,
- * eg as per the <a href="http://getbootstrap.com/css/#grid-less">Bootstrap mixins</a> or just for
- * custom styling.
- */
- @XmlAttribute(required = false)
- public String getCssClass() {
- return cssClass;
- }
-
- public void setCssClass(final String cssClass) {
- this.cssClass = cssClass;
- }
-
-
-
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis/blob/67b6e05e/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
deleted file mode 100644
index 7ec9665..0000000
--- a/core/applib/src/main/java/org/apache/isis/applib/layout/bootstrap3/BS3Grid.java
+++ /dev/null
@@ -1,304 +0,0 @@
-/*
- * 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 java.util.LinkedHashMap;
-import java.util.List;
-
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlTransient;
-import javax.xml.bind.annotation.XmlType;
-
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
-
-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.FieldSet;
-import org.apache.isis.applib.layout.common.Grid;
-import org.apache.isis.applib.layout.common.GridAbstract;
-import org.apache.isis.applib.layout.common.PropertyLayoutData;
-import org.apache.isis.applib.services.dto.Dto;
-
-/**
- * This is the top-level for rendering the domain object's properties, collections and actions. It simply consists
- * of a number of rows.
- *
- * <p>
- * The element is rendered as a <div class="...">
- * </p>
- */
-@XmlRootElement(
- name = "grid"
-)
-@XmlType(
- name = "grid"
- , propOrder = {
- "rows",
- "metadataErrors"
- }
-)
-public class BS3Grid extends GridAbstract implements BS3Element, Dto, BS3RowOwner {
-
- private static final long serialVersionUID = 1L;
-
-
- private String cssClass;
-
- @XmlAttribute(required = false)
- public String getCssClass() {
- return cssClass;
- }
-
- public void setCssClass(final String cssClass) {
- this.cssClass = cssClass;
- }
-
-
-
-
-
- private List<BS3Row> rows = Lists.newArrayList();
-
- // no wrapper
- @XmlElement(name = "row", required = true)
- public List<BS3Row> getRows() {
- return rows;
- }
-
- public void setRows(final List<BS3Row> rows) {
- this.rows = rows;
- }
-
-
-
- private List<String> metadataErrors = Lists.newArrayList();
-
- /**
- * For diagnostics; populated by the framework if and only if a metadata error.
- */
- @XmlElement(name = "metadataError", required = false)
- public List<String> getMetadataErrors() {
- return metadataErrors;
- }
-
- public void setMetadataErrors(final List<String> metadataErrors) {
- this.metadataErrors = metadataErrors;
- }
-
-
-
-
- private BS3RowOwner owner;
-
-
-
- public interface Visitor extends Grid.Visitor {
- 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 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);
- final List<BS3Row> rows = rowOwner.getRows();
- for (BS3Row bs3Row : Lists.newArrayList(rows)) {
- bs3Row.setOwner(this);
- bs3Visitor.preVisit(bs3Row);
- bs3Visitor.visit(bs3Row);
- traverseCols(visitor, bs3Row);
- bs3Visitor.postVisit(bs3Row);
- }
- }
-
- private void traverseCols(final Grid.Visitor visitor, final BS3Row bs3Row) {
- final BS3Grid.Visitor bs3Visitor = asBs3Visitor(visitor);
- final List<BS3RowContent> cols = bs3Row.getCols();
- for (BS3RowContent rowContent : Lists.newArrayList(cols)) {
- rowContent.setOwner(bs3Row);
- if(rowContent instanceof BS3Col) {
- final BS3Col bs3Col = (BS3Col) rowContent;
- bs3Visitor.preVisit(bs3Col);
- bs3Visitor.visit(bs3Col);
- traverseDomainObject(bs3Col, visitor);
- traverseTabGroups(bs3Col, visitor);
- traverseActions(bs3Col, visitor);
- 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);
- } else {
- throw new IllegalStateException(
- "Unrecognized implementation of BS3RowContent, " + rowContent);
- }
- }
- }
-
- private void traverseDomainObject(final BS3Col bs3Col, final Grid.Visitor visitor) {
- final DomainObjectLayoutData domainObject = bs3Col.getDomainObject();
- if(domainObject == null) {
- return;
- }
- domainObject.setOwner(bs3Col);
- visitor.visit(domainObject);
- }
-
- private void traverseTabGroups(
- final BS3TabGroupOwner bs3TabGroupOwner,
- final Grid.Visitor visitor) {
- final BS3Grid.Visitor bs3Visitor = asBs3Visitor(visitor);
- final List<BS3TabGroup> tabGroups = bs3TabGroupOwner.getTabGroups();
- for (BS3TabGroup bs3TabGroup : Lists.newArrayList(tabGroups)) {
- bs3TabGroup.setOwner(bs3TabGroupOwner);
- bs3Visitor.preVisit(bs3TabGroup);
- bs3Visitor.visit(bs3TabGroup);
- traverseTabs(bs3TabGroup, visitor);
- bs3Visitor.postVisit(bs3TabGroup);
- }
- }
-
- private void traverseTabs(
- final BS3TabOwner bs3TabOwner,
- final Grid.Visitor visitor) {
- final BS3Grid.Visitor bs3Visitor = asBs3Visitor(visitor);
- final List<BS3Tab> tabs = bs3TabOwner.getTabs();
- for (BS3Tab tab : Lists.newArrayList(tabs)) {
- tab.setOwner(bs3TabOwner);
- bs3Visitor.preVisit(tab);
- bs3Visitor.visit(tab);
- traverseRows(tab, visitor);
- bs3Visitor.postVisit(tab);
- }
- }
-
- private static Visitor asBs3Visitor(final Grid.Visitor visitor) {
- return visitor instanceof Visitor? (Visitor) visitor : new BS3Grid.VisitorAdapter() {
- @Override public void visit(final DomainObjectLayoutData domainObjectLayoutData) {
- visitor.visit(domainObjectLayoutData);
- }
-
- @Override public void visit(final ActionLayoutData actionLayoutData) {
- visitor.visit(actionLayoutData);
- }
-
- @Override public void visit(final PropertyLayoutData propertyLayoutData) {
- visitor.visit(propertyLayoutData);
- }
-
- @Override public void visit(final CollectionLayoutData collectionLayoutData) {
- visitor.visit(collectionLayoutData);
- }
-
- @Override public void visit(final FieldSet fieldSet) {
- visitor.visit(fieldSet);
- }
- };
- }
-
-
- @Programmatic
- @XmlTransient
- public LinkedHashMap<String, BS3Tab> getAllTabsByName() {
- final LinkedHashMap<String, BS3Tab> tabsByName = Maps.newLinkedHashMap();
-
- visit(new BS3Grid.VisitorAdapter() {
- @Override
- public void visit(final BS3Tab bS3Tab) {
- tabsByName.put(bS3Tab.getName(), bS3Tab);
- }
- });
- return tabsByName;
- }
-
-
- @Programmatic
- @XmlTransient
- public LinkedHashMap<String, HasCssId> getAllCssId() {
- final LinkedHashMap<String, HasCssId> divsByCssId = Maps.newLinkedHashMap();
-
- visit(new BS3Grid.VisitorAdapter() {
- @Override
- public void visit(final BS3Row bs3Row) {
- final String id = bs3Row.getId();
- divsByCssId.put(id, bs3Row);
- }
- });
- return divsByCssId;
- }
-
- @Override
- @Programmatic
- @XmlTransient
- public BS3Grid getGrid() {
- return this;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/67b6e05e/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
deleted file mode 100644
index d34e3ec..0000000
--- a/core/applib/src/main/java/org/apache/isis/applib/layout/bootstrap3/BS3Row.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
- * 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 java.util.List;
-
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementRef;
-import javax.xml.bind.annotation.XmlElementRefs;
-import javax.xml.bind.annotation.XmlTransient;
-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}.
- *
- * <p>
- * It is rendered as a <div class="row ...">
- * </p>
- */
-@XmlType(
- name = "row"
- , propOrder = {
- "cols"
- , "metadataError"
- }
-)
-public class BS3Row extends BS3ElementAbstract implements HasCssId, BS3RowContentOwner {
-
- private static final long serialVersionUID = 1L;
-
-
- private String id;
-
- /**
- * As per <div id="...">...</div> : must be unique across entire page.
- */
- @XmlAttribute(required = false)
- public String getId() {
- return id;
- }
-
- public void setId(final String id) {
- this.id = id;
- }
-
-
-
- private List<BS3RowContent> cols = Lists.newArrayList();
-
- // no wrapper
- @XmlElementRefs({
- @XmlElementRef(type = BS3Col.class, name="col", required = true),
- @XmlElementRef(type = BS3ClearFixVisible.class, name="clearFixVisible", required = false),
- @XmlElementRef(type = BS3ClearFixHidden.class, name="clearFixHidden", required = false)
- })
- public List<BS3RowContent> getCols() {
- return cols;
- }
-
- public void setCols(final List<BS3RowContent> cols) {
- this.cols = cols;
- }
-
-
-
-
- private String metadataError;
-
- /**
- * For diagnostics; populated by the framework if and only if a metadata error.
- */
- @XmlElement(required = false)
- public String getMetadataError() {
- return metadataError;
- }
-
- public void setMetadataError(final String metadataError) {
- this.metadataError = metadataError;
- }
-
-
- private BS3RowOwner owner;
-
-
- /**
- * Owner.
- *
- * <p>
- * Set programmatically by framework after reading in from XML.
- * </p>
- */
- @XmlTransient
- public BS3RowOwner getOwner() {
- return owner;
- }
-
- public void setOwner(final BS3RowOwner owner) {
- 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/67b6e05e/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
deleted file mode 100644
index 096578b..0000000
--- a/core/applib/src/main/java/org/apache/isis/applib/layout/bootstrap3/BS3RowContent.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * 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 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.
- *
- * <p>
- * Most commonly the content of a row is {@link BS3Col col}umns, but it may be either of the
- * {@link BS3ClearFix clearfix} classes.
- * </p>
- *
- */
-public abstract class BS3RowContent extends BS3ElementAbstract {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * As per <a href="http://getbootstrap.com/css/#grid-options">grid options</a>, also used in
- * <a href="http://getbootstrap.com/css/#responsive-utilities">responsive utility</a> classes.
- */
- public enum Size {
- XS,
- SM,
- MD,
- LG;
-
- public String toCssClassFragment() {
- return name().toLowerCase();
- }
- }
-
- private Size size;
-
- /**
- * Default if not specified is {@link Size#MD}.
- */
- @XmlAttribute(required = false)
- public Size getSize() {
- return size;
- }
-
- public void setSize(final Size size) {
- this.size = size;
- }
-
-
- private BS3RowContentOwner owner;
-
- /**
- * Owner.
- *
- * <p>
- * Set programmatically by framework after reading in from XML.
- * </p>
- */
- @XmlTransient
- public BS3RowContentOwner getOwner() {
- return owner;
- }
-
- public void setOwner(final BS3RowContentOwner owner) {
- this.owner = owner;
- }
-
- @Override
- @XmlTransient
- @Programmatic
- public BS3Grid getGrid() {
- return getOwner().getGrid();
- }
-
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/67b6e05e/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
deleted file mode 100644
index ed82e9e..0000000
--- a/core/applib/src/main/java/org/apache/isis/applib/layout/bootstrap3/BS3RowContentOwner.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * 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.layout.common.Owner;
-
-public interface BS3RowContentOwner extends Owner, WithinGrid {
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/67b6e05e/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
deleted file mode 100644
index aad3d43..0000000
--- a/core/applib/src/main/java/org/apache/isis/applib/layout/bootstrap3/BS3RowOwner.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * 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 java.util.List;
-
-import org.apache.isis.applib.layout.common.Owner;
-
-public interface BS3RowOwner extends Owner, WithinGrid {
-
- List<BS3Row> getRows();
-}