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 2016/01/25 15:40:51 UTC
[27/50] [abbrv] isis git commit: ISIS-993: add the
ObjectLayoutMetadata#actions collection if null
ISIS-993: add the ObjectLayoutMetadata#actions collection if null
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/a1ed8903
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/a1ed8903
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/a1ed8903
Branch: refs/heads/ISIS-993
Commit: a1ed89036b46d00f7ed17a9ea19840e0704e8700
Parents: ea02966
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Sat Jan 9 07:46:49 2016 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Mon Jan 25 14:38:24 2016 +0000
----------------------------------------------------------------------
.../services/layout/ObjectLayoutMetadataServiceDefault.java | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/a1ed8903/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/layout/ObjectLayoutMetadataServiceDefault.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/layout/ObjectLayoutMetadataServiceDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/layout/ObjectLayoutMetadataServiceDefault.java
index e2a2e1d..3080769 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/layout/ObjectLayoutMetadataServiceDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/layout/ObjectLayoutMetadataServiceDefault.java
@@ -272,7 +272,12 @@ public class ObjectLayoutMetadataServiceDefault
if(!missingActionIds.isEmpty()) {
for (String actionId : missingActionIds) {
- metadata.getActions().add(new ActionLayoutMetadata(actionId));
+ List<ActionLayoutMetadata> actions = metadata.getActions();
+ if(actions == null) {
+ actions = Lists.newArrayList();
+ metadata.setActions(actions);
+ }
+ actions.add(new ActionLayoutMetadata(actionId));
}
}
}