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 2014/12/09 00:47:34 UTC
[3/9] isis git commit: ISIS-964: fix for CssClassFa layout for
actions (copy/paste error).
ISIS-964: fix for CssClassFa layout for actions (copy/paste error).
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/86c9c88d
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/86c9c88d
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/86c9c88d
Branch: refs/heads/master
Commit: 86c9c88d99d6aee602c703a84e056778f0a0468b
Parents: 643bae7
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Mon Dec 8 23:00:44 2014 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Mon Dec 8 23:21:02 2014 +0000
----------------------------------------------------------------------
.../actions/layout/CssClassFaFacetForActionLayoutAnnotation.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/86c9c88d/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/CssClassFaFacetForActionLayoutAnnotation.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/CssClassFaFacetForActionLayoutAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/CssClassFaFacetForActionLayoutAnnotation.java
index a192992..c4d2772 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/CssClassFaFacetForActionLayoutAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/CssClassFaFacetForActionLayoutAnnotation.java
@@ -31,8 +31,8 @@ public class CssClassFaFacetForActionLayoutAnnotation extends CssClassFaFacetAbs
if(actionLayout == null) {
return null;
}
- final String cssClass = Strings.emptyToNull(actionLayout.cssClass());
- return cssClass != null ? new CssClassFaFacetForActionLayoutAnnotation(cssClass, holder) : null;
+ final String cssClassFa = Strings.emptyToNull(actionLayout.cssClassFa());
+ return cssClassFa != null ? new CssClassFaFacetForActionLayoutAnnotation(cssClassFa, holder) : null;
}
private CssClassFaFacetForActionLayoutAnnotation(String value, FacetHolder holder) {