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/09 10:10:48 UTC
[2/5] 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/9597245f
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/9597245f
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/9597245f
Branch: refs/heads/ISIS-993
Commit: 9597245f8d27db5320031ca7db465fa5da92f1b0
Parents: 3bfcae8
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: Sat Jan 9 07:47:09 2016 +0000
----------------------------------------------------------------------
.../services/layout/ObjectLayoutMetadataServiceDefault.java | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/9597245f/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));
}
}
}