You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by mg...@apache.org on 2015/11/12 21:01:56 UTC

[14/50] [abbrv] isis git commit: Merge branch 'ISIS-1151_pr-35'

Merge branch 'ISIS-1151_pr-35'


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

Branch: refs/heads/ISIS-1224-select2-v4
Commit: a18450ea0db5a96691b56b2bfef78eecde872a7f
Parents: bbc580d 14b861c
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Fri Nov 6 07:14:51 2015 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Fri Nov 6 07:14:51 2015 +0000

----------------------------------------------------------------------
 ...rg_annotations_manpage-CollectionLayout.adoc |  9 +++
 ...ns_manpage-CollectionLayout_defaultView.adoc | 43 +++++++++++
 ...ns_manpage-CollectionLayout_describedAs.adoc |  5 +-
 ...tations_manpage-CollectionLayout_render.adoc |  2 +
 .../applib/annotation/CollectionLayout.java     | 14 ++++
 .../defaultview/DefaultViewFacet.java           | 26 +++++++
 .../defaultview/DefaultViewFacetAbstract.java   | 35 +++++++++
 ...tViewFacetForCollectionLayoutAnnotation.java | 41 +++++++++++
 ...ewFacetOnCollectionFromLayoutProperties.java | 46 ++++++++++++
 .../layout/CollectionLayoutFacetFactory.java    | 11 +++
 .../CollectionLayoutFacetRepr.java              |  1 +
 .../layoutmetadata/DefaultViewFacetRepr.java    | 24 +++++++
 .../json/LayoutMetadataReaderFromJson.java      | 10 +++
 .../selector/CollectionSelectorHelper.java      | 75 ++++++++++++++------
 14 files changed, 320 insertions(+), 22 deletions(-)
----------------------------------------------------------------------