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/06 21:51:14 UTC
[4/4] isis git commit: Merge branch 'ISIS-1000-CssClassFacetMethod'
Merge branch 'ISIS-1000-CssClassFacetMethod'
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/a5dae200
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/a5dae200
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/a5dae200
Branch: refs/heads/master
Commit: a5dae2005173c3b62f050bf3cc5ad95e49212b50
Parents: 38b3d27 718b8f0
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Tue Jan 6 20:17:08 2015 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Tue Jan 6 20:17:08 2015 +0000
----------------------------------------------------------------------
.../wicket/model/models/ModelAbstract.java | 4 +-
.../entityactions/AdditionalLinksPanel.java | 5 +-
.../entityactions/EntityActionLinkFactory.java | 14 ++--
.../actionmenu/serviceactions/CssMenuItem.java | 18 +----
.../ServiceActionLinkFactory.java | 2 +-
.../collection/bulk/BulkActionsLinkFactory.java | 2 +-
.../ajaxtable/IsisAjaxFallbackDataTable.java | 23 +++++-
.../collections/EntityCollectionsPanel.java | 4 +-
.../entity/combined/EntityCombinedPanel.java | 7 +-
.../components/scalars/ScalarPanelAbstract.java | 5 +-
.../linkandlabel/ActionLinkFactoryAbstract.java | 8 +-
.../viewer/wicket/ui/util/CssClassAppender.java | 18 ++++-
.../facets/members/cssclass/CssClassFacet.java | 12 +--
.../members/cssclass/CssClassFacetAbstract.java | 19 +++--
.../cssclass/method/CssClassFacetMethod.java | 55 +++++++++++++
.../method/CssClassFacetMethodFactory.java | 52 ++++++++++++
.../json/LayoutMetadataReaderFromJson.java | 4 +-
.../metamodel/spec/ObjectSpecification.java | 18 ++---
.../metamodel/spec/feature/ObjectAction.java | 14 ++--
.../specimpl/ObjectSpecificationAbstract.java | 13 +--
.../dflt/ProgrammingModelFacetsJava5.java | 2 +
...ClassAnnotationOnMemberFacetFactoryTest.java | 2 +-
...ssClassFacetOnTypeAnnotationFactoryTest.java | 2 +-
.../CssClassFacetMethodFactoryTest.java | 70 ++++++++++++++++
.../ident/cssclass/CssClassFacetMethodTest.java | 84 ++++++++++++++++++++
.../CssClassFacetMethodWithProblemTest.java | 82 +++++++++++++++++++
.../ident/icon/IconFacetMethodFactoryTest.java | 9 ++-
.../object/ident/icon/IconFacetMethodTest.java | 3 -
.../testspec/ObjectSpecificationStub.java | 12 +--
.../dom/src/main/java/dom/todo/ToDoItem.java | 3 +
.../webapp/src/main/webapp/css/application.css | 7 ++
31 files changed, 480 insertions(+), 93 deletions(-)
----------------------------------------------------------------------