ISIS-903: fixing bug introduced on minor improvement to CssClassFa facet
Project: http://git-wip-us.apache.org/repos/asf/isis/repo Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/61204968 Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/61204968 Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/61204968 Branch: refs/heads/master Commit: 612049689437c7045f45317001f06537bacf546d Parents: bc5f87b Author: Dan Haywood <[email protected]> Authored: Sat Feb 14 09:01:20 2015 +0000 Committer: Dan Haywood <[email protected]> Committed: Wed Feb 18 14:07:33 2015 +0000 ---------------------------------------------------------------------- .../java/org/apache/isis/applib/services/i18n/TrStringTest.java | 4 ---- .../facets/members/cssclassfa/CssClassFaFacetAbstract.java | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/isis/blob/61204968/core/applib/src/test/java/org/apache/isis/applib/services/i18n/TrStringTest.java ---------------------------------------------------------------------- diff --git a/core/applib/src/test/java/org/apache/isis/applib/services/i18n/TrStringTest.java b/core/applib/src/test/java/org/apache/isis/applib/services/i18n/TrStringTest.java index 7399a2d..3b801ad 100644 --- a/core/applib/src/test/java/org/apache/isis/applib/services/i18n/TrStringTest.java +++ b/core/applib/src/test/java/org/apache/isis/applib/services/i18n/TrStringTest.java @@ -108,10 +108,6 @@ public class TrStringTest { assertThat(ts.translate(echoTranslationService, null, null), is("My name is James Bond.")); assertThat(originalTextToTranslate, is("My name is {firstName} {lastName}.")); } - } - - - } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/isis/blob/61204968/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/cssclassfa/CssClassFaFacetAbstract.java ---------------------------------------------------------------------- diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/cssclassfa/CssClassFaFacetAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/cssclassfa/CssClassFaFacetAbstract.java index 963b860..e381e65 100644 --- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/cssclassfa/CssClassFaFacetAbstract.java +++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/cssclassfa/CssClassFaFacetAbstract.java @@ -63,7 +63,7 @@ public class CssClassFaFacetAbstract extends SingleStringValueFacetAbstract impl } private static String faPrefix(final String cssClass) { - return cssClass.startsWith("fa-") + return cssClass.startsWith("fa-") || "fa".equals(cssClass) ? cssClass : "fa-" + cssClass; }
