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 2015/11/06 08:16:31 UTC
[03/11] isis git commit: ISIS-1151: Updated JSON reader with default
view data
ISIS-1151: Updated JSON reader with default view data
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/9aaeed05
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/9aaeed05
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/9aaeed05
Branch: refs/heads/master
Commit: 9aaeed05ac4de714fad97bf6864b3766bbb7bc73
Parents: 7c8ff73
Author: Sander Ginn <sa...@Sanders-MacBook-Pro.local>
Authored: Wed Oct 28 16:01:22 2015 +0100
Committer: Sander Ginn <sa...@Sanders-MacBook-Pro.local>
Committed: Wed Nov 4 10:18:29 2015 +0100
----------------------------------------------------------------------
.../CollectionLayoutFacetRepr.java | 1 +
.../layoutmetadata/DefaultViewFacetRepr.java | 24 ++++++++++++++++++++
.../json/LayoutMetadataReaderFromJson.java | 10 ++++++++
3 files changed, 35 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/9aaeed05/core/metamodel/src/main/java/org/apache/isis/core/metamodel/layoutmetadata/CollectionLayoutFacetRepr.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/layoutmetadata/CollectionLayoutFacetRepr.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/layoutmetadata/CollectionLayoutFacetRepr.java
index a350351..645662c 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/layoutmetadata/CollectionLayoutFacetRepr.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/layoutmetadata/CollectionLayoutFacetRepr.java
@@ -24,6 +24,7 @@ public class CollectionLayoutFacetRepr {
public String cssClass;
public String describedAs;
+ public String defaultView;
public Where hidden;
public String named;
public boolean namedEscaped = true;
http://git-wip-us.apache.org/repos/asf/isis/blob/9aaeed05/core/metamodel/src/main/java/org/apache/isis/core/metamodel/layoutmetadata/DefaultViewFacetRepr.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/layoutmetadata/DefaultViewFacetRepr.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/layoutmetadata/DefaultViewFacetRepr.java
new file mode 100644
index 0000000..af2b51e
--- /dev/null
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/layoutmetadata/DefaultViewFacetRepr.java
@@ -0,0 +1,24 @@
+/*
+ *
+ * Copyright 2012-2015 Eurocommercial Properties NV
+ *
+ *
+ * Licensed under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.isis.core.metamodel.layoutmetadata;
+
+public class DefaultViewFacetRepr {
+ public String value;
+}
http://git-wip-us.apache.org/repos/asf/isis/blob/9aaeed05/core/metamodel/src/main/java/org/apache/isis/core/metamodel/layoutmetadata/json/LayoutMetadataReaderFromJson.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/layoutmetadata/json/LayoutMetadataReaderFromJson.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/layoutmetadata/json/LayoutMetadataReaderFromJson.java
index 4f8f2fa..e2946b7 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/layoutmetadata/json/LayoutMetadataReaderFromJson.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/layoutmetadata/json/LayoutMetadataReaderFromJson.java
@@ -47,6 +47,7 @@ import org.apache.isis.core.commons.lang.ClassExtensions;
import org.apache.isis.core.metamodel.facets.all.describedas.DescribedAsFacet;
import org.apache.isis.core.metamodel.facets.all.hide.HiddenFacet;
import org.apache.isis.core.metamodel.facets.all.named.NamedFacet;
+import org.apache.isis.core.metamodel.facets.collections.collection.defaultview.DefaultViewFacet;
import org.apache.isis.core.metamodel.facets.members.cssclass.CssClassFacet;
import org.apache.isis.core.metamodel.facets.members.disabled.DisabledFacet;
import org.apache.isis.core.metamodel.facets.members.disabled.DisabledFacetAbstractImpl;
@@ -63,6 +64,7 @@ import org.apache.isis.core.metamodel.layoutmetadata.CollectionLayoutFacetRepr;
import org.apache.isis.core.metamodel.layoutmetadata.ColumnRepr;
import org.apache.isis.core.metamodel.layoutmetadata.CssClassFaFacetRepr;
import org.apache.isis.core.metamodel.layoutmetadata.CssClassFacetRepr;
+import org.apache.isis.core.metamodel.layoutmetadata.DefaultViewFacetRepr;
import org.apache.isis.core.metamodel.layoutmetadata.DescribedAsFacetRepr;
import org.apache.isis.core.metamodel.layoutmetadata.DisabledFacetRepr;
import org.apache.isis.core.metamodel.layoutmetadata.HiddenFacetRepr;
@@ -228,6 +230,9 @@ public class LayoutMetadataReaderFromJson implements LayoutMetadataReader2 {
if(collectionLayout.describedAs != null) {
props.setProperty("member." + memberName + ".collectionLayout.describedAs", collectionLayout.describedAs);
}
+ if(collectionLayout.defaultView != null) {
+ props.setProperty("member." + memberName + ".collectionLayout.defaultView", collectionLayout.defaultView);
+ }
if(collectionLayout.hidden != null) {
props.setProperty("member." + memberName + ".collectionLayout.hidden", ""+collectionLayout.hidden);
}
@@ -550,6 +555,11 @@ public class LayoutMetadataReaderFromJson implements LayoutMetadataReader2 {
describedAsFacetRepr.value = describedAsFacet.value();
memberRepr.describedAs = describedAsFacetRepr;
}
+ final DefaultViewFacet defaultViewFacet = assoc.getFacet(DefaultViewFacet.class);
+ if(defaultViewFacet != null && !defaultViewFacet.isNoop() && !Strings.isNullOrEmpty(defaultViewFacet.value())) {
+ final DefaultViewFacetRepr defaultViewFacetRepr = new DefaultViewFacetRepr();
+ defaultViewFacetRepr.value = describedAsFacet.value();
+ }
final NamedFacet namedFacet = assoc.getFacet(NamedFacet.class);
if(namedFacet != null && !namedFacet.isNoop()) {
final NamedFacetRepr namedFacetRepr = new NamedFacetRepr();