You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2015/01/05 23:06:53 UTC
[8/8] isis git commit: Merge branch 'ISIS-995'
Merge branch 'ISIS-995'
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/0fc9b11f
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/0fc9b11f
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/0fc9b11f
Branch: refs/heads/master
Commit: 0fc9b11f798daa9138bdba78edc6cbb33fcc8679
Parents: 1ca9c59 a28e9b7
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Mon Jan 5 21:59:27 2015 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Mon Jan 5 21:59:27 2015 +0000
----------------------------------------------------------------------
.../CollectionContentsAsAjaxTablePanel.java | 9 +-
.../ajaxtable/IsisAjaxHeadersToolbar.java | 6 +
.../columns/ObjectAdapterPropertyColumn.java | 17 ++-
.../columns/ObjectAdapterTitleColumn.java | 5 +-
.../collections/EntityCollectionsPanel.java | 4 +
.../components/scalars/ScalarPanelAbstract.java | 2 +
.../scalars/ScalarPanelTextFieldAbstract.java | 5 +
.../scalars/primitive/BooleanPanel.java | 18 +++
.../BooleanPanel_labelRightPosition.html | 40 ++++++
.../scalars/reference/ReferencePanel.java | 5 +
.../valuechoices/ValueChoicesSelect2Panel.java | 5 +
.../wicket/ui/pages/bootstrap-overrides.css | 9 ++
.../applib/annotation/CollectionLayout.java | 7 +-
.../isis/applib/annotation/LabelPosition.java | 6 +
.../isis/applib/annotation/ParameterLayout.java | 5 +
.../isis/applib/annotation/PropertyLayout.java | 5 +
.../i18n/internal/NamedFacetWrapI18n.java | 2 +-
.../NamedFacetForActionLayoutAnnotation.java | 5 +-
.../NamedFacetOnActionFromLayoutProperties.java | 22 ++-
.../metamodel/facets/all/named/NamedFacet.java | 13 +-
.../facets/all/named/NamedFacetAbstract.java | 24 +++-
.../facets/all/named/NamedFacetInferred.java | 3 +-
...NamedFacetForCollectionLayoutAnnotation.java | 10 +-
...edFacetOnCollectionFromLayoutProperties.java | 21 ++-
.../facets/fallback/NamedFacetNone.java | 2 +-
.../annotprop/NamedFacetOnMemberAnnotation.java | 2 +-
.../NamedFacetOnMemberFromProperties.java | 11 +-
.../staticmethod/NamedFacetStaticMethod.java | 2 +-
...edFacetForDomainServiceLayoutAnnotation.java | 2 +-
...medFacetForDomainObjectLayoutAnnotation.java | 2 +-
.../annotation/NamedFacetOnTypeAnnotation.java | 2 +-
.../staticmethod/NamedFacetStaticMethod.java | 2 +-
.../NamedFacetForParameterLayoutAnnotation.java | 10 +-
.../NamedFacetOnParameterAnnotation.java | 2 +-
.../NamedFacetForPropertyLayoutAnnotation.java | 10 +-
...amedFacetOnPropertyFromLayoutProperties.java | 24 +++-
.../layoutmetadata/ActionLayoutFacetRepr.java | 1 +
.../CollectionLayoutFacetRepr.java | 1 +
.../layoutmetadata/PropertyLayoutFacetRepr.java | 3 +-
.../json/LayoutMetadataReaderFromJson.java | 12 ++
.../NamedFacetOnStandaloneList.java | 2 +-
...orCollectionLayoutAnnotationFactoryTest.java | 83 +++++++++++
...ForParameterLayoutAnnotationFactoryTest.java | 11 +-
...ForParameterLayoutAnnotationFactoryTest.java | 79 +++++++++++
...tForPropertyLayoutAnnotationFactoryTest.java | 13 +-
...tForPropertyLayoutAnnotationFactoryTest.java | 80 +++++++++++
.../LayoutMetadataReaderFromJsonTest_read.java | 2 +-
...MetadataReaderFromJsonTest_readMetadata.java | 5 +
.../json/ExampleDomainObject.layout.json | 142 ++++++++++---------
.../json/ExampleDomainObject.layout.properties | 4 +-
.../runtime/system/ObjectActionImplTest.java | 8 +-
.../system/ObjectMemberAbstractTest.java | 14 +-
.../src/main/java/dom/todo/ToDoItem.layout.json | 11 +-
53 files changed, 655 insertions(+), 135 deletions(-)
----------------------------------------------------------------------