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/04/23 15:36:28 UTC
[18/20] isis git commit: Merge branch 'ISIS-1085-CssClassFa' of
https://github.com/joerg-rade/isis into issue-29
Merge branch 'ISIS-1085-CssClassFa' of https://github.com/joerg-rade/isis into issue-29
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/d2ce0c6d
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/d2ce0c6d
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/d2ce0c6d
Branch: refs/heads/master
Commit: d2ce0c6dadca85ec37dd49e39460a17c2133dc4f
Parents: 0f7022b 9dfcf1b
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Thu Apr 23 13:12:21 2015 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Thu Apr 23 13:12:21 2015 +0100
----------------------------------------------------------------------
.../isis/applib/annotation/ActionLayout.java | 38 ++--
.../isis/applib/annotation/CssClassFa.java | 35 ++--
.../applib/annotation/CssClassFaPosition.java | 40 ++++
.../applib/annotation/DomainObjectLayout.java | 59 +++---
.../isis/applib/annotation/ViewModelLayout.java | 72 ++++----
.../isis/applib/events/ActionArgumentEvent.java | 2 +-
...ssClassFaFacetForActionLayoutAnnotation.java | 45 ++---
...lassFaFacetOnActionFromLayoutProperties.java | 57 +++---
.../members/cssclassfa/CssClassFaFacet.java | 47 ++---
.../cssclassfa/CssClassFaFacetAbstract.java | 52 +++---
.../CssClassFaFacetOnMemberAnnotation.java | 35 ----
.../CssClassFaFacetOnMemberFactory.java | 78 ++++----
...ClassFaFacetOnMemberFromConfiguredRegex.java | 4 +-
.../CssClassFaFacetOnMemberFromProperties.java | 41 ++---
...lassFaFacetForDomainObjectLayoutFactory.java | 44 +++++
...ssClassFaFacetForViewModelLayoutFactory.java | 46 +++++
.../CssClassFaFacetOnTypeAnnotation.java | 35 ----
.../CssClassFaFacetOnTypeAnnotationFactory.java | 68 -------
...sFaFacetForDomainObjectLayoutAnnotation.java | 43 +++++
...lassFaFacetForViewModelLayoutAnnotation.java | 42 +++++
...assFacetForDomainObjectLayoutAnnotation.java | 46 ++---
...sClassFacetForViewModelLayoutAnnotation.java | 46 ++---
.../DomainObjectLayoutFacetFactory.java | 43 ++---
.../metamodel/spec/feature/ObjectAction.java | 151 +++++++--------
.../dflt/ProgrammingModelFacetsJava5.java | 57 +++---
.../ActionLayoutAnnotationFacetFactoryTest.java | 128 +++++++------
.../CollectionAnnotationFacetFactoryTest.java | 182 ++++++++++++-------
...assFaAnnotationOnMemberFacetFactoryTest.java | 93 ----------
...ClassFaFacetOnTypeAnnotationFactoryTest.java | 135 ++++++--------
.../DomainObjectLayoutFactoryTest.java | 136 +++++++++++---
.../viewer/wicket/model/links/LinkAndLabel.java | 15 +-
.../actionmenu/CssClassFaBehavior.java | 10 +-
.../entityactions/AdditionalLinksPanel.java | 16 +-
.../actionmenu/serviceactions/CssMenuItem.java | 109 ++++++-----
.../collection/bulk/BulkActionsLinkFactory.java | 47 ++---
.../linkandlabel/ActionLinkFactoryAbstract.java | 103 ++++++-----
.../webapp/ide/eclipse/launch/.gitignore | 8 +
.../webapp/ide/eclipse/launch/.gitignore | 5 +
38 files changed, 1172 insertions(+), 1041 deletions(-)
----------------------------------------------------------------------