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 16:07:59 UTC
[38/50] [abbrv] isis git commit: ISIS-993: always normalize
ISIS-993: always normalize
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/b83dbf36
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/b83dbf36
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/b83dbf36
Branch: refs/heads/ISIS-993
Commit: b83dbf369393d3a816380f0b6ee23703da7c117c
Parents: b709b9a
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Thu Jan 14 07:19:15 2016 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Mon Jan 25 15:06:07 2016 +0000
----------------------------------------------------------------------
.../ObjectLayoutMetadataFacetDefault.java | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/b83dbf36/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/layoutmetadata/ObjectLayoutMetadataFacetDefault.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/layoutmetadata/ObjectLayoutMetadataFacetDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/layoutmetadata/ObjectLayoutMetadataFacetDefault.java
index 6137a53..ca26797 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/layoutmetadata/ObjectLayoutMetadataFacetDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/layoutmetadata/ObjectLayoutMetadataFacetDefault.java
@@ -141,11 +141,14 @@ public class ObjectLayoutMetadataFacetDefault
if(metadata == null) {
return null;
}
- // if have .layout.json and then add a .layout.xml without restarting, then the normalizing is required
- // in order to trample over the .layout.json's original facets.
- // if(metadata.isNormalized()) {
- // return metadata;
- // }
+
+ // if have .layout.json and then add a .layout.xml without restarting, then note that
+ // the changes won't be picked up. Normalizing would be required
+ // in order to trample over the .layout.json's original facets
+ if(metadata.isNormalized()) {
+ return metadata;
+ }
+
doNormalize(metadata, getSpecification());
metadata.setNormalized(true);
return metadata;