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 2017/06/17 10:08:03 UTC
isis git commit: ISIS-1613: fixes for prompt style when .layout.json
is used
Repository: isis
Updated Branches:
refs/heads/master 6e58e2e8f -> a39a987ee
ISIS-1613: fixes for prompt style when .layout.json is used
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/a39a987e
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/a39a987e
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/a39a987e
Branch: refs/heads/master
Commit: a39a987ee0d1d2cd986e3391e45e6b63022aca37
Parents: 6e58e2e
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Sat Jun 17 11:07:40 2017 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Sat Jun 17 11:07:49 2017 +0100
----------------------------------------------------------------------
.../layout/PromptStyleFacetOnActionFromLayoutProperties.java | 3 +++
.../PromptStyleFacetOnPropertyFromLayoutProperties.java | 3 +++
2 files changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/a39a987e/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/PromptStyleFacetOnActionFromLayoutProperties.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/PromptStyleFacetOnActionFromLayoutProperties.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/PromptStyleFacetOnActionFromLayoutProperties.java
index 2b5b5ba..8f70d99 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/PromptStyleFacetOnActionFromLayoutProperties.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/PromptStyleFacetOnActionFromLayoutProperties.java
@@ -47,6 +47,9 @@ public class PromptStyleFacetOnActionFromLayoutProperties extends PromptStyleFac
return null;
}
String propertyPromptStyle = Strings.emptyToNull(properties.getProperty("promptStyle"));
+ if(propertyPromptStyle == null) {
+ return null;
+ }
return PromptStyle.valueOf(propertyPromptStyle);
}
http://git-wip-us.apache.org/repos/asf/isis/blob/a39a987e/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/PromptStyleFacetOnPropertyFromLayoutProperties.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/PromptStyleFacetOnPropertyFromLayoutProperties.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/PromptStyleFacetOnPropertyFromLayoutProperties.java
index 3620f5a..014cde2 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/PromptStyleFacetOnPropertyFromLayoutProperties.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/PromptStyleFacetOnPropertyFromLayoutProperties.java
@@ -47,6 +47,9 @@ public class PromptStyleFacetOnPropertyFromLayoutProperties extends PromptStyleF
return null;
}
String propertyPromptStyle = Strings.emptyToNull(properties.getProperty("promptStyle"));
+ if (propertyPromptStyle == null) {
+ return null;
+ }
return PromptStyle.valueOf(propertyPromptStyle);
}