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/31 11:57:26 UTC
[10/18] isis git commit: ISIS-993: still sketching out the layout
classes for BS3 and FC (fixed col)
http://git-wip-us.apache.org/repos/asf/isis/blob/10d80f3a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/DescribedAsFacetForActionXml.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/DescribedAsFacetForActionXml.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/DescribedAsFacetForActionXml.java
index ee81891..9dd795b 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/DescribedAsFacetForActionXml.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/DescribedAsFacetForActionXml.java
@@ -21,14 +21,14 @@ package org.apache.isis.core.metamodel.facets.actions.layout;
import com.google.common.base.Strings;
-import org.apache.isis.applib.layout.v1_0.ActionLayoutMetadata;
+import org.apache.isis.applib.layout.members.v1.ActionLayoutData;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.all.describedas.DescribedAsFacet;
import org.apache.isis.core.metamodel.facets.all.describedas.DescribedAsFacetAbstract;
public class DescribedAsFacetForActionXml extends DescribedAsFacetAbstract {
- public static DescribedAsFacet create(ActionLayoutMetadata actionLayout, FacetHolder holder) {
+ public static DescribedAsFacet create(ActionLayoutData actionLayout, FacetHolder holder) {
if(actionLayout == null) {
return null;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/10d80f3a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/HiddenFacetForActionLayoutXml.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/HiddenFacetForActionLayoutXml.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/HiddenFacetForActionLayoutXml.java
index 05ffb10..c5f9c88 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/HiddenFacetForActionLayoutXml.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/HiddenFacetForActionLayoutXml.java
@@ -21,7 +21,7 @@ package org.apache.isis.core.metamodel.facets.actions.layout;
import org.apache.isis.applib.annotation.When;
import org.apache.isis.applib.annotation.Where;
-import org.apache.isis.applib.layout.v1_0.ActionLayoutMetadata;
+import org.apache.isis.applib.layout.members.v1.ActionLayoutData;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.all.hide.HiddenFacet;
@@ -29,7 +29,7 @@ import org.apache.isis.core.metamodel.facets.members.hidden.HiddenFacetAbstract;
public class HiddenFacetForActionLayoutXml extends HiddenFacetAbstract {
- public static HiddenFacet create(final ActionLayoutMetadata actionLayout, final FacetHolder holder) {
+ public static HiddenFacet create(final ActionLayoutData actionLayout, final FacetHolder holder) {
if (actionLayout == null) {
return null;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/10d80f3a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/NamedFacetForActionXml.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/NamedFacetForActionXml.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/NamedFacetForActionXml.java
index efa4191..af7a819 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/NamedFacetForActionXml.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/NamedFacetForActionXml.java
@@ -21,14 +21,14 @@ package org.apache.isis.core.metamodel.facets.actions.layout;
import com.google.common.base.Strings;
-import org.apache.isis.applib.layout.v1_0.ActionLayoutMetadata;
+import org.apache.isis.applib.layout.members.v1.ActionLayoutData;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.all.named.NamedFacet;
import org.apache.isis.core.metamodel.facets.all.named.NamedFacetAbstract;
public class NamedFacetForActionXml extends NamedFacetAbstract {
- public static NamedFacet create(final ActionLayoutMetadata actionLayout, final FacetHolder holder) {
+ public static NamedFacet create(final ActionLayoutData actionLayout, final FacetHolder holder) {
if(actionLayout == null) {
return null;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/10d80f3a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/layout/CssClassFacetForCollectionXml.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/layout/CssClassFacetForCollectionXml.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/layout/CssClassFacetForCollectionXml.java
index c2ffd02..2e4e871 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/layout/CssClassFacetForCollectionXml.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/layout/CssClassFacetForCollectionXml.java
@@ -21,14 +21,14 @@ package org.apache.isis.core.metamodel.facets.collections.layout;
import com.google.common.base.Strings;
-import org.apache.isis.applib.layout.v1_0.CollectionLayoutMetadata;
+import org.apache.isis.applib.layout.members.v1.CollectionLayoutData;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.members.cssclass.CssClassFacet;
import org.apache.isis.core.metamodel.facets.members.cssclass.CssClassFacetAbstract;
public class CssClassFacetForCollectionXml extends CssClassFacetAbstract {
- public static CssClassFacet create(CollectionLayoutMetadata collectionLayout, FacetHolder holder) {
+ public static CssClassFacet create(CollectionLayoutData collectionLayout, FacetHolder holder) {
if(collectionLayout == null) {
return null;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/10d80f3a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/layout/DefaultViewFacetForCollectionXml.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/layout/DefaultViewFacetForCollectionXml.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/layout/DefaultViewFacetForCollectionXml.java
index 5802d5d..dfab483 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/layout/DefaultViewFacetForCollectionXml.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/layout/DefaultViewFacetForCollectionXml.java
@@ -21,7 +21,7 @@ package org.apache.isis.core.metamodel.facets.collections.layout;
import com.google.common.base.Strings;
-import org.apache.isis.applib.layout.v1_0.CollectionLayoutMetadata;
+import org.apache.isis.applib.layout.members.v1.CollectionLayoutData;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.collections.collection.defaultview.DefaultViewFacet;
import org.apache.isis.core.metamodel.facets.collections.collection.defaultview.DefaultViewFacetAbstract;
@@ -32,7 +32,7 @@ public class DefaultViewFacetForCollectionXml extends DefaultViewFacetAbstract {
super(value, holder);
}
- public static DefaultViewFacet create(CollectionLayoutMetadata collectionLayout, FacetHolder holder) {
+ public static DefaultViewFacet create(CollectionLayoutData collectionLayout, FacetHolder holder) {
if (collectionLayout == null) {
return null;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/10d80f3a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/layout/DescribedAsFacetForCollectionXml.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/layout/DescribedAsFacetForCollectionXml.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/layout/DescribedAsFacetForCollectionXml.java
index b9561f4..ff2e2a4 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/layout/DescribedAsFacetForCollectionXml.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/layout/DescribedAsFacetForCollectionXml.java
@@ -21,14 +21,14 @@ package org.apache.isis.core.metamodel.facets.collections.layout;
import com.google.common.base.Strings;
-import org.apache.isis.applib.layout.v1_0.CollectionLayoutMetadata;
+import org.apache.isis.applib.layout.members.v1.CollectionLayoutData;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.all.describedas.DescribedAsFacet;
import org.apache.isis.core.metamodel.facets.all.describedas.DescribedAsFacetAbstract;
public class DescribedAsFacetForCollectionXml extends DescribedAsFacetAbstract {
- public static DescribedAsFacet create(CollectionLayoutMetadata collectionLayout, FacetHolder holder) {
+ public static DescribedAsFacet create(CollectionLayoutData collectionLayout, FacetHolder holder) {
if(collectionLayout == null) {
return null;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/10d80f3a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/layout/HiddenFacetForCollectionXml.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/layout/HiddenFacetForCollectionXml.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/layout/HiddenFacetForCollectionXml.java
index a76ab13..c24a7fb 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/layout/HiddenFacetForCollectionXml.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/layout/HiddenFacetForCollectionXml.java
@@ -21,7 +21,7 @@ package org.apache.isis.core.metamodel.facets.collections.layout;
import org.apache.isis.applib.annotation.When;
import org.apache.isis.applib.annotation.Where;
-import org.apache.isis.applib.layout.v1_0.CollectionLayoutMetadata;
+import org.apache.isis.applib.layout.members.v1.CollectionLayoutData;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.all.hide.HiddenFacet;
@@ -29,7 +29,7 @@ import org.apache.isis.core.metamodel.facets.members.hidden.HiddenFacetAbstract;
public class HiddenFacetForCollectionXml extends HiddenFacetAbstract {
- public static HiddenFacet create(final CollectionLayoutMetadata collectionLayout, final FacetHolder holder) {
+ public static HiddenFacet create(final CollectionLayoutData collectionLayout, final FacetHolder holder) {
if (collectionLayout == null) {
return null;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/10d80f3a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/layout/NamedFacetForCollectionXml.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/layout/NamedFacetForCollectionXml.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/layout/NamedFacetForCollectionXml.java
index 9509253..6422bf3 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/layout/NamedFacetForCollectionXml.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/layout/NamedFacetForCollectionXml.java
@@ -21,14 +21,14 @@ package org.apache.isis.core.metamodel.facets.collections.layout;
import com.google.common.base.Strings;
-import org.apache.isis.applib.layout.v1_0.CollectionLayoutMetadata;
+import org.apache.isis.applib.layout.members.v1.CollectionLayoutData;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.all.named.NamedFacet;
import org.apache.isis.core.metamodel.facets.all.named.NamedFacetAbstract;
public class NamedFacetForCollectionXml extends NamedFacetAbstract {
- public static NamedFacet create(CollectionLayoutMetadata collectionLayout, FacetHolder holder) {
+ public static NamedFacet create(CollectionLayoutData collectionLayout, FacetHolder holder) {
if(collectionLayout == null) {
return null;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/10d80f3a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/layout/PagedFacetForCollectionXml.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/layout/PagedFacetForCollectionXml.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/layout/PagedFacetForCollectionXml.java
index 6b577c0..334b7d6 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/layout/PagedFacetForCollectionXml.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/layout/PagedFacetForCollectionXml.java
@@ -19,14 +19,14 @@
package org.apache.isis.core.metamodel.facets.collections.layout;
-import org.apache.isis.applib.layout.v1_0.CollectionLayoutMetadata;
+import org.apache.isis.applib.layout.members.v1.CollectionLayoutData;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.object.paged.PagedFacet;
import org.apache.isis.core.metamodel.facets.object.paged.PagedFacetAbstract;
public class PagedFacetForCollectionXml extends PagedFacetAbstract {
- public static PagedFacet create(CollectionLayoutMetadata collectionLayout, FacetHolder holder) {
+ public static PagedFacet create(CollectionLayoutData collectionLayout, FacetHolder holder) {
if(collectionLayout == null) {
return null;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/10d80f3a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/layout/SortedByFacetForCollectionXml.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/layout/SortedByFacetForCollectionXml.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/layout/SortedByFacetForCollectionXml.java
index 72410ce..2710640 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/layout/SortedByFacetForCollectionXml.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/layout/SortedByFacetForCollectionXml.java
@@ -21,7 +21,7 @@ package org.apache.isis.core.metamodel.facets.collections.layout;
import java.util.Comparator;
-import org.apache.isis.applib.layout.v1_0.CollectionLayoutMetadata;
+import org.apache.isis.applib.layout.members.v1.CollectionLayoutData;
import org.apache.isis.core.commons.lang.ClassUtil;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.collections.sortedby.SortedByFacet;
@@ -29,7 +29,7 @@ import org.apache.isis.core.metamodel.facets.collections.sortedby.SortedByFacetA
public class SortedByFacetForCollectionXml extends SortedByFacetAbstract {
- public static SortedByFacet create(CollectionLayoutMetadata collectionLayout, FacetHolder holder) {
+ public static SortedByFacet create(CollectionLayoutData collectionLayout, FacetHolder holder) {
if(collectionLayout == null) {
return null;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/10d80f3a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/layoutmetadata/ObjectLayoutMetadataFacet.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/layoutmetadata/ObjectLayoutMetadataFacet.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/layoutmetadata/ObjectLayoutMetadataFacet.java
index c3b8830..72b937e 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/layoutmetadata/ObjectLayoutMetadataFacet.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/layoutmetadata/ObjectLayoutMetadataFacet.java
@@ -19,7 +19,7 @@
package org.apache.isis.core.metamodel.facets.object.layoutmetadata;
-import org.apache.isis.applib.layout.fixedcols.ObjectLayoutMetadata;
+import org.apache.isis.applib.layout.fixedcols.FCPage;
import org.apache.isis.core.metamodel.facetapi.Facet;
/**
@@ -27,7 +27,7 @@ import org.apache.isis.core.metamodel.facetapi.Facet;
*/
public interface ObjectLayoutMetadataFacet extends Facet {
- ObjectLayoutMetadata getMetadata();
+ FCPage getMetadata();
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis/blob/10d80f3a/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 e188f85..2123bac 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
@@ -31,17 +31,17 @@ import com.google.common.collect.Maps;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.isis.applib.layout.v1_0.ActionLayoutMetadata;
-import org.apache.isis.applib.layout.v1_0.ActionOwner;
-import org.apache.isis.applib.layout.v1_0.CollectionLayoutMetadata;
-import org.apache.isis.applib.layout.fixedcols.ColumnMetadata;
-import org.apache.isis.applib.layout.v1_0.ColumnOwner;
-import org.apache.isis.applib.layout.fixedcols.ObjectLayoutMetadata;
-import org.apache.isis.applib.layout.v1_0.MemberLayoutMetadataOwner;
-import org.apache.isis.applib.layout.v1_0.PropertyGroupMetadata;
-import org.apache.isis.applib.layout.v1_0.PropertyLayoutMetadata;
-import org.apache.isis.applib.layout.fixedcols.TabMetadata;
-import org.apache.isis.applib.layout.fixedcols.TabGroupMetadata;
+import org.apache.isis.applib.layout.members.v1.ActionLayoutData;
+import org.apache.isis.applib.layout.members.v1.ActionOwner;
+import org.apache.isis.applib.layout.members.v1.CollectionLayoutData;
+import org.apache.isis.applib.layout.fixedcols.FCColumn;
+import org.apache.isis.applib.layout.fixedcols.FCColumnOwner;
+import org.apache.isis.applib.layout.fixedcols.FCPage;
+import org.apache.isis.applib.layout.members.MemberRegionOwner;
+import org.apache.isis.applib.layout.members.v1.FieldSet;
+import org.apache.isis.applib.layout.members.v1.PropertyLayoutData;
+import org.apache.isis.applib.layout.fixedcols.FCTab;
+import org.apache.isis.applib.layout.fixedcols.FCTabGroup;
import org.apache.isis.applib.services.i18n.TranslationService;
import org.apache.isis.applib.services.layout.ObjectLayoutMetadataService;
import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
@@ -105,7 +105,7 @@ public class ObjectLayoutMetadataFacetDefault
private final DeploymentCategory deploymentCategory;
private final ObjectLayoutMetadataService objectLayoutMetadataService;
- private ObjectLayoutMetadata metadata;
+ private FCPage metadata;
private boolean blacklisted;
private ObjectLayoutMetadataFacetDefault(
@@ -123,12 +123,12 @@ public class ObjectLayoutMetadataFacetDefault
* Blacklisting only occurs if running in production mode.
*/
@Override
- public ObjectLayoutMetadata getMetadata() {
+ public FCPage getMetadata() {
if (deploymentCategory.isProduction() || blacklisted) {
return metadata;
}
final Class<?> domainClass = getSpecification().getCorrespondingClass();
- final ObjectLayoutMetadata metadata = objectLayoutMetadataService.fromXml(domainClass);
+ final FCPage metadata = objectLayoutMetadataService.fromXml(domainClass);
if(deploymentCategory.isProduction() && metadata == null) {
blacklisted = true;
}
@@ -136,7 +136,7 @@ public class ObjectLayoutMetadataFacetDefault
return this.metadata;
}
- private ObjectLayoutMetadata normalize(final ObjectLayoutMetadata metadata) {
+ private FCPage normalize(final FCPage metadata) {
if(metadata == null) {
return null;
}
@@ -153,7 +153,7 @@ public class ObjectLayoutMetadataFacetDefault
return metadata;
}
- private void doNormalize(final ObjectLayoutMetadata metadata, final ObjectSpecification objectSpec) {
+ private void doNormalize(final FCPage metadata, final ObjectSpecification objectSpec) {
final Map<String, OneToOneAssociation> oneToOneAssociationById =
ObjectMember.Util.mapById(getOneToOneAssociations(objectSpec));
@@ -174,34 +174,34 @@ public class ObjectLayoutMetadataFacetDefault
* </p>
*/
private static void derive(
- final ObjectLayoutMetadata metadata,
+ final FCPage metadata,
final Map<String, OneToOneAssociation> oneToOneAssociationById,
final Map<String, OneToManyAssociation> oneToManyAssociationById,
final Map<String, ObjectAction> objectActionById) {
- final LinkedHashMap<String, PropertyLayoutMetadata> propertyIds = metadata.getAllPropertiesById();
- final LinkedHashMap<String, CollectionLayoutMetadata> collectionIds = metadata.getAllCollectionsById();
- final LinkedHashMap<String, ActionLayoutMetadata> actionIds = metadata.getAllActionsById();
+ final LinkedHashMap<String, PropertyLayoutData> propertyIds = metadata.getAllPropertiesById();
+ final LinkedHashMap<String, CollectionLayoutData> collectionIds = metadata.getAllCollectionsById();
+ final LinkedHashMap<String, ActionLayoutData> actionIds = metadata.getAllActionsById();
- final AtomicReference<PropertyGroupMetadata> defaultPropertyGroupRef = new AtomicReference<>();
- final AtomicReference<ColumnMetadata> firstColumnRef = new AtomicReference<>();
- final AtomicReference<TabGroupMetadata> lastTabGroupRef = new AtomicReference<>();
+ final AtomicReference<FieldSet> defaultPropertyGroupRef = new AtomicReference<>();
+ final AtomicReference<FCColumn> firstColumnRef = new AtomicReference<>();
+ final AtomicReference<FCTabGroup> lastTabGroupRef = new AtomicReference<>();
// capture the first column, and also
// capture the first property group (if any) with the default name ('General')
- metadata.visit(new ObjectLayoutMetadata.VisitorAdapter() {
+ metadata.visit(new FCPage.VisitorAdapter() {
@Override
- public void visit(final ColumnMetadata columnMetadata) {
- firstColumnRef.compareAndSet(null, columnMetadata);
+ public void visit(final FCColumn FCColumn) {
+ firstColumnRef.compareAndSet(null, FCColumn);
}
@Override
- public void visit(final PropertyGroupMetadata propertyGroupMetadata) {
- if(MemberGroupLayoutFacet.DEFAULT_GROUP.equals(propertyGroupMetadata.getName())) {
- defaultPropertyGroupRef.compareAndSet(null, propertyGroupMetadata);
+ public void visit(final FieldSet fieldSet) {
+ if(MemberGroupLayoutFacet.DEFAULT_GROUP.equals(fieldSet.getName())) {
+ defaultPropertyGroupRef.compareAndSet(null, fieldSet);
}
}
@Override
- public void visit(final TabGroupMetadata tabGroup) {
+ public void visit(final FCTabGroup tabGroup) {
lastTabGroupRef.set(tabGroup);
}
});
@@ -219,13 +219,13 @@ public class ObjectLayoutMetadataFacetDefault
if(!missingPropertyIds.isEmpty()) {
// ensure that there is a property group to use
- boolean wasSet = defaultPropertyGroupRef.compareAndSet(null, new PropertyGroupMetadata(MemberGroupLayoutFacet.DEFAULT_GROUP));
- final PropertyGroupMetadata defaultPropertyGroupMetadata = defaultPropertyGroupRef.get();
+ boolean wasSet = defaultPropertyGroupRef.compareAndSet(null, new FieldSet(MemberGroupLayoutFacet.DEFAULT_GROUP));
+ final FieldSet defaultFieldSet = defaultPropertyGroupRef.get();
if(wasSet) {
- firstColumnRef.get().getPropertyGroups().add(defaultPropertyGroupMetadata);
+ firstColumnRef.get().getFieldSets().add(defaultFieldSet);
}
for (final String propertyId : missingPropertyIds) {
- defaultPropertyGroupMetadata.getProperties().add(new PropertyLayoutMetadata(propertyId));
+ defaultFieldSet.getProperties().add(new PropertyLayoutData(propertyId));
}
}
@@ -242,17 +242,17 @@ public class ObjectLayoutMetadataFacetDefault
if(!missingCollectionIds.isEmpty()) {
while(metadata.getTabGroups().size() < 2) {
- final TabGroupMetadata tabGroup = new TabGroupMetadata();
+ final FCTabGroup tabGroup = new FCTabGroup();
metadata.getTabGroups().add(tabGroup);
lastTabGroupRef.set(tabGroup);
}
- final TabGroupMetadata lastTabGroup = lastTabGroupRef.get();
+ final FCTabGroup lastTabGroup = lastTabGroupRef.get();
for (final String collectionId : missingCollectionIds) {
- final TabMetadata tabMetadata = new TabMetadata();
- lastTabGroup.getTabs().add(tabMetadata);
- ColumnMetadata left = new ColumnMetadata(12);
- tabMetadata.setLeft(left);
- final CollectionLayoutMetadata layoutMetadata = new CollectionLayoutMetadata(collectionId);
+ final FCTab FCTab = new FCTab();
+ lastTabGroup.getTabs().add(FCTab);
+ FCColumn left = new FCColumn(12);
+ FCTab.setLeft(left);
+ final CollectionLayoutData layoutMetadata = new CollectionLayoutData(collectionId);
layoutMetadata.setDefaultView("table");
left.getCollections().add(layoutMetadata);
}
@@ -269,12 +269,12 @@ public class ObjectLayoutMetadataFacetDefault
if(!missingActionIds.isEmpty()) {
for (String actionId : missingActionIds) {
- List<ActionLayoutMetadata> actions = metadata.getActions();
+ List<ActionLayoutData> actions = metadata.getActions();
if(actions == null) {
actions = Lists.newArrayList();
metadata.setActions(actions);
}
- actions.add(new ActionLayoutMetadata(actionId));
+ actions.add(new ActionLayoutData(actionId));
}
}
}
@@ -302,14 +302,14 @@ public class ObjectLayoutMetadataFacetDefault
}
private void overwrite(
- final ObjectLayoutMetadata metadata,
+ final FCPage metadata,
final Map<String, OneToOneAssociation> oneToOneAssociationById,
final Map<String, OneToManyAssociation> oneToManyAssociationById,
final Map<String, ObjectAction> objectActionById) {
final Map<String, int[]> propertySequenceByGroup = Maps.newHashMap();
- metadata.visit(new ObjectLayoutMetadata.VisitorAdapter() {
+ metadata.visit(new FCPage.VisitorAdapter() {
private int collectionSequence = 1;
private int actionDomainObjectSequence = 1;
private int actionPropertyGroupSequence = 1;
@@ -317,28 +317,28 @@ public class ObjectLayoutMetadataFacetDefault
private int actionCollectionSequence = 1;
@Override
- public void visit(final ActionLayoutMetadata actionLayoutMetadata) {
- final ActionOwner actionOwner = actionLayoutMetadata.getOwner();
- final ObjectAction objectAction = objectActionById.get(actionLayoutMetadata.getId());
+ public void visit(final ActionLayoutData actionLayoutData) {
+ final ActionOwner actionOwner = actionLayoutData.getOwner();
+ final ObjectAction objectAction = objectActionById.get(actionLayoutData.getId());
if(objectAction == null) {
return;
}
final String memberOrderName;
final int memberOrderSequence;
- if(actionOwner instanceof PropertyGroupMetadata) {
- final PropertyGroupMetadata propertyGroupMetadata = (PropertyGroupMetadata) actionOwner;
- final List<PropertyLayoutMetadata> properties = propertyGroupMetadata.getProperties();
- final PropertyLayoutMetadata propertyLayoutMetadata = properties.get(0); // any will do
- memberOrderName = propertyLayoutMetadata.getId();
+ if(actionOwner instanceof FieldSet) {
+ final FieldSet fieldSet = (FieldSet) actionOwner;
+ final List<PropertyLayoutData> properties = fieldSet.getProperties();
+ final PropertyLayoutData propertyLayoutData = properties.get(0); // any will do
+ memberOrderName = propertyLayoutData.getId();
memberOrderSequence = actionPropertyGroupSequence++;
- } else if(actionOwner instanceof PropertyLayoutMetadata) {
- final PropertyLayoutMetadata propertyLayoutMetadata = (PropertyLayoutMetadata) actionOwner;
- memberOrderName = propertyLayoutMetadata.getId();
+ } else if(actionOwner instanceof PropertyLayoutData) {
+ final PropertyLayoutData propertyLayoutData = (PropertyLayoutData) actionOwner;
+ memberOrderName = propertyLayoutData.getId();
memberOrderSequence = actionPropertySequence++;
- } else if(actionOwner instanceof CollectionLayoutMetadata) {
- final CollectionLayoutMetadata collectionLayoutMetadata = (CollectionLayoutMetadata) actionOwner;
- memberOrderName = collectionLayoutMetadata.getId();
+ } else if(actionOwner instanceof CollectionLayoutData) {
+ final CollectionLayoutData collectionLayoutData = (CollectionLayoutData) actionOwner;
+ memberOrderName = collectionLayoutData.getId();
memberOrderSequence = actionCollectionSequence++;
} else {
// DomainObject
@@ -349,90 +349,90 @@ public class ObjectLayoutMetadataFacetDefault
new MemberOrderFacetXml(memberOrderName, ""+memberOrderSequence, translationService, objectAction));
- if(actionOwner instanceof PropertyGroupMetadata) {
- if(actionLayoutMetadata.getPosition() == null ||
- actionLayoutMetadata.getPosition() == org.apache.isis.applib.annotation.ActionLayout.Position.BELOW ||
- actionLayoutMetadata.getPosition() == org.apache.isis.applib.annotation.ActionLayout.Position.RIGHT) {
- actionLayoutMetadata.setPosition(org.apache.isis.applib.annotation.ActionLayout.Position.PANEL);
+ if(actionOwner instanceof FieldSet) {
+ if(actionLayoutData.getPosition() == null ||
+ actionLayoutData.getPosition() == org.apache.isis.applib.annotation.ActionLayout.Position.BELOW ||
+ actionLayoutData.getPosition() == org.apache.isis.applib.annotation.ActionLayout.Position.RIGHT) {
+ actionLayoutData.setPosition(org.apache.isis.applib.annotation.ActionLayout.Position.PANEL);
}
- } else if(actionOwner instanceof PropertyLayoutMetadata) {
- if(actionLayoutMetadata.getPosition() == null ||
- actionLayoutMetadata.getPosition() == org.apache.isis.applib.annotation.ActionLayout.Position.PANEL_DROPDOWN ||
- actionLayoutMetadata.getPosition() == org.apache.isis.applib.annotation.ActionLayout.Position.PANEL) {
- actionLayoutMetadata.setPosition(org.apache.isis.applib.annotation.ActionLayout.Position.BELOW);
+ } else if(actionOwner instanceof PropertyLayoutData) {
+ if(actionLayoutData.getPosition() == null ||
+ actionLayoutData.getPosition() == org.apache.isis.applib.annotation.ActionLayout.Position.PANEL_DROPDOWN ||
+ actionLayoutData.getPosition() == org.apache.isis.applib.annotation.ActionLayout.Position.PANEL) {
+ actionLayoutData.setPosition(org.apache.isis.applib.annotation.ActionLayout.Position.BELOW);
}
} else {
// doesn't do anything for DomainObject or Collection
- actionLayoutMetadata.setPosition(null);
+ actionLayoutData.setPosition(null);
}
- FacetUtil.addFacet(ActionPositionFacetForActionXml.create(actionLayoutMetadata, objectAction));
- FacetUtil.addFacet(BookmarkPolicyFacetForActionXml.create(actionLayoutMetadata, objectAction));
- FacetUtil.addFacet(CssClassFacetForActionXml.create(actionLayoutMetadata, objectAction));
- FacetUtil.addFacet(CssClassFaFacetForActionXml.create(actionLayoutMetadata, objectAction));
- FacetUtil.addFacet(DescribedAsFacetForActionXml.create(actionLayoutMetadata, objectAction));
- FacetUtil.addFacet(HiddenFacetForActionLayoutXml.create(actionLayoutMetadata, objectAction));
- FacetUtil.addFacet(NamedFacetForActionXml.create(actionLayoutMetadata, objectAction));
+ FacetUtil.addFacet(ActionPositionFacetForActionXml.create(actionLayoutData, objectAction));
+ FacetUtil.addFacet(BookmarkPolicyFacetForActionXml.create(actionLayoutData, objectAction));
+ FacetUtil.addFacet(CssClassFacetForActionXml.create(actionLayoutData, objectAction));
+ FacetUtil.addFacet(CssClassFaFacetForActionXml.create(actionLayoutData, objectAction));
+ FacetUtil.addFacet(DescribedAsFacetForActionXml.create(actionLayoutData, objectAction));
+ FacetUtil.addFacet(HiddenFacetForActionLayoutXml.create(actionLayoutData, objectAction));
+ FacetUtil.addFacet(NamedFacetForActionXml.create(actionLayoutData, objectAction));
}
@Override
- public void visit(final PropertyLayoutMetadata propertyLayoutMetadata) {
- final OneToOneAssociation oneToOneAssociation = oneToOneAssociationById.get(propertyLayoutMetadata.getId());
+ public void visit(final PropertyLayoutData propertyLayoutData) {
+ final OneToOneAssociation oneToOneAssociation = oneToOneAssociationById.get(propertyLayoutData.getId());
if(oneToOneAssociation == null) {
return;
}
- FacetUtil.addFacet(CssClassFacetForPropertyXml.create(propertyLayoutMetadata, oneToOneAssociation));
- FacetUtil.addFacet(DescribedAsFacetForPropertyXml.create(propertyLayoutMetadata, oneToOneAssociation));
- FacetUtil.addFacet(HiddenFacetForPropertyXml.create(propertyLayoutMetadata, oneToOneAssociation));
- FacetUtil.addFacet(LabelAtFacetForPropertyXml.create(propertyLayoutMetadata, oneToOneAssociation));
- FacetUtil.addFacet(MultiLineFacetForPropertyXml.create(propertyLayoutMetadata, oneToOneAssociation));
- FacetUtil.addFacet(NamedFacetForPropertyXml.create(propertyLayoutMetadata, oneToOneAssociation));
+ FacetUtil.addFacet(CssClassFacetForPropertyXml.create(propertyLayoutData, oneToOneAssociation));
+ FacetUtil.addFacet(DescribedAsFacetForPropertyXml.create(propertyLayoutData, oneToOneAssociation));
+ FacetUtil.addFacet(HiddenFacetForPropertyXml.create(propertyLayoutData, oneToOneAssociation));
+ FacetUtil.addFacet(LabelAtFacetForPropertyXml.create(propertyLayoutData, oneToOneAssociation));
+ FacetUtil.addFacet(MultiLineFacetForPropertyXml.create(propertyLayoutData, oneToOneAssociation));
+ FacetUtil.addFacet(NamedFacetForPropertyXml.create(propertyLayoutData, oneToOneAssociation));
FacetUtil.addFacet(
- RenderedAdjustedFacetForPropertyXml.create(propertyLayoutMetadata, oneToOneAssociation));
- FacetUtil.addFacet(TypicalLengthFacetForPropertyXml.create(propertyLayoutMetadata, oneToOneAssociation));
+ RenderedAdjustedFacetForPropertyXml.create(propertyLayoutData, oneToOneAssociation));
+ FacetUtil.addFacet(TypicalLengthFacetForPropertyXml.create(propertyLayoutData, oneToOneAssociation));
// @MemberOrder#name based on owning property group, @MemberOrder#sequence monotonically increasing
- final PropertyGroupMetadata propertyGroupMetadata = propertyLayoutMetadata.getOwner();
- final String groupName = propertyGroupMetadata.getName();
+ final FieldSet fieldSet = propertyLayoutData.getOwner();
+ final String groupName = fieldSet.getName();
final String sequence = nextInSequenceFor(groupName, propertySequenceByGroup);
FacetUtil.addFacet(
new MemberOrderFacetXml(groupName, sequence, translationService, oneToOneAssociation));
}
@Override
- public void visit(final CollectionLayoutMetadata collectionLayoutMetadata) {
- final OneToManyAssociation oneToManyAssociation = oneToManyAssociationById.get(collectionLayoutMetadata.getId());
+ public void visit(final CollectionLayoutData collectionLayoutData) {
+ final OneToManyAssociation oneToManyAssociation = oneToManyAssociationById.get(collectionLayoutData.getId());
if(oneToManyAssociation == null) {
return;
}
- FacetUtil.addFacet(CssClassFacetForCollectionXml.create(collectionLayoutMetadata, oneToManyAssociation));
+ FacetUtil.addFacet(CssClassFacetForCollectionXml.create(collectionLayoutData, oneToManyAssociation));
FacetUtil.addFacet(
- DefaultViewFacetForCollectionXml.create(collectionLayoutMetadata, oneToManyAssociation));
+ DefaultViewFacetForCollectionXml.create(collectionLayoutData, oneToManyAssociation));
FacetUtil.addFacet(
- DescribedAsFacetForCollectionXml.create(collectionLayoutMetadata, oneToManyAssociation));
- FacetUtil.addFacet(HiddenFacetForCollectionXml.create(collectionLayoutMetadata, oneToManyAssociation));
- FacetUtil.addFacet(NamedFacetForCollectionXml.create(collectionLayoutMetadata, oneToManyAssociation));
- FacetUtil.addFacet(PagedFacetForCollectionXml.create(collectionLayoutMetadata, oneToManyAssociation));
- FacetUtil.addFacet(SortedByFacetForCollectionXml.create(collectionLayoutMetadata, oneToManyAssociation));
+ DescribedAsFacetForCollectionXml.create(collectionLayoutData, oneToManyAssociation));
+ FacetUtil.addFacet(HiddenFacetForCollectionXml.create(collectionLayoutData, oneToManyAssociation));
+ FacetUtil.addFacet(NamedFacetForCollectionXml.create(collectionLayoutData, oneToManyAssociation));
+ FacetUtil.addFacet(PagedFacetForCollectionXml.create(collectionLayoutData, oneToManyAssociation));
+ FacetUtil.addFacet(SortedByFacetForCollectionXml.create(collectionLayoutData, oneToManyAssociation));
// @MemberOrder#name based on the collection's id (so that each has a single "member group")
- final String groupName = collectionLayoutMetadata.getId();
+ final String groupName = collectionLayoutData.getId();
final String sequence = "" + collectionSequence++;
FacetUtil.addFacet(
new MemberOrderFacetXml(groupName, sequence, translationService, oneToManyAssociation));
// if there is only a single column and no other contents, then copy the collection Id onto the tab'
- final MemberLayoutMetadataOwner memberLayoutMetadataOwner = collectionLayoutMetadata.getOwner();
- if(memberLayoutMetadataOwner instanceof ColumnMetadata) {
- final ColumnMetadata columnMetadata = (ColumnMetadata) memberLayoutMetadataOwner;
- final ColumnOwner holder = columnMetadata.getOwner();
- if(holder instanceof TabMetadata) {
- final TabMetadata tabMetadata = (TabMetadata) holder;
- if(tabMetadata.getContents().size() == 1 && Strings.isNullOrEmpty(tabMetadata.getName()) ) {
+ final MemberRegionOwner memberRegionOwner = collectionLayoutData.getOwner();
+ if(memberRegionOwner instanceof FCColumn) {
+ final FCColumn FCColumn = (FCColumn) memberRegionOwner;
+ final FCColumnOwner holder = FCColumn.getOwner();
+ if(holder instanceof FCTab) {
+ final FCTab FCTab = (FCTab) holder;
+ if(FCTab.getContents().size() == 1 && Strings.isNullOrEmpty(FCTab.getName()) ) {
final String collectionName = oneToManyAssociation.getName();
- tabMetadata.setName(collectionName);
+ FCTab.setName(collectionName);
}
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/10d80f3a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/CssClassFacetForPropertyXml.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/CssClassFacetForPropertyXml.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/CssClassFacetForPropertyXml.java
index e16cad5..53a9021 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/CssClassFacetForPropertyXml.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/CssClassFacetForPropertyXml.java
@@ -21,14 +21,14 @@ package org.apache.isis.core.metamodel.facets.properties.propertylayout;
import com.google.common.base.Strings;
-import org.apache.isis.applib.layout.v1_0.PropertyLayoutMetadata;
+import org.apache.isis.applib.layout.members.v1.PropertyLayoutData;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.members.cssclass.CssClassFacet;
import org.apache.isis.core.metamodel.facets.members.cssclass.CssClassFacetAbstract;
public class CssClassFacetForPropertyXml extends CssClassFacetAbstract {
- public static CssClassFacet create(PropertyLayoutMetadata propertyLayout, FacetHolder holder) {
+ public static CssClassFacet create(PropertyLayoutData propertyLayout, FacetHolder holder) {
if(propertyLayout == null) {
return null;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/10d80f3a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/DescribedAsFacetForPropertyXml.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/DescribedAsFacetForPropertyXml.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/DescribedAsFacetForPropertyXml.java
index e2c6bb6..d9268f7 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/DescribedAsFacetForPropertyXml.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/DescribedAsFacetForPropertyXml.java
@@ -21,14 +21,14 @@ package org.apache.isis.core.metamodel.facets.properties.propertylayout;
import com.google.common.base.Strings;
-import org.apache.isis.applib.layout.v1_0.PropertyLayoutMetadata;
+import org.apache.isis.applib.layout.members.v1.PropertyLayoutData;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.all.describedas.DescribedAsFacet;
import org.apache.isis.core.metamodel.facets.all.describedas.DescribedAsFacetAbstract;
public class DescribedAsFacetForPropertyXml extends DescribedAsFacetAbstract {
- public static DescribedAsFacet create(PropertyLayoutMetadata propertyLayout, FacetHolder holder) {
+ public static DescribedAsFacet create(PropertyLayoutData propertyLayout, FacetHolder holder) {
if(propertyLayout == null) {
return null;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/10d80f3a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/HiddenFacetForPropertyXml.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/HiddenFacetForPropertyXml.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/HiddenFacetForPropertyXml.java
index 83d15ab..bc75795 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/HiddenFacetForPropertyXml.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/HiddenFacetForPropertyXml.java
@@ -21,7 +21,7 @@ package org.apache.isis.core.metamodel.facets.properties.propertylayout;
import org.apache.isis.applib.annotation.When;
import org.apache.isis.applib.annotation.Where;
-import org.apache.isis.applib.layout.v1_0.PropertyLayoutMetadata;
+import org.apache.isis.applib.layout.members.v1.PropertyLayoutData;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.all.hide.HiddenFacet;
@@ -29,7 +29,7 @@ import org.apache.isis.core.metamodel.facets.members.hidden.HiddenFacetAbstract;
public class HiddenFacetForPropertyXml extends HiddenFacetAbstract {
- public static HiddenFacet create(final PropertyLayoutMetadata propertyLayout, final FacetHolder holder) {
+ public static HiddenFacet create(final PropertyLayoutData propertyLayout, final FacetHolder holder) {
if (propertyLayout == null) {
return null;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/10d80f3a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/LabelAtFacetForPropertyXml.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/LabelAtFacetForPropertyXml.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/LabelAtFacetForPropertyXml.java
index fc55c5d..b26c1a5 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/LabelAtFacetForPropertyXml.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/LabelAtFacetForPropertyXml.java
@@ -20,14 +20,14 @@
package org.apache.isis.core.metamodel.facets.properties.propertylayout;
import org.apache.isis.applib.annotation.LabelPosition;
-import org.apache.isis.applib.layout.v1_0.PropertyLayoutMetadata;
+import org.apache.isis.applib.layout.members.v1.PropertyLayoutData;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.objectvalue.labelat.LabelAtFacet;
import org.apache.isis.core.metamodel.facets.objectvalue.labelat.LabelAtFacetAbstract;
public class LabelAtFacetForPropertyXml extends LabelAtFacetAbstract {
- public static LabelAtFacet create(final PropertyLayoutMetadata propertyLayout, FacetHolder holder) {
+ public static LabelAtFacet create(final PropertyLayoutData propertyLayout, FacetHolder holder) {
if (propertyLayout == null) {
return null;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/10d80f3a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/MultiLineFacetForPropertyXml.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/MultiLineFacetForPropertyXml.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/MultiLineFacetForPropertyXml.java
index 599ceba..71db6ea 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/MultiLineFacetForPropertyXml.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/MultiLineFacetForPropertyXml.java
@@ -19,14 +19,14 @@
package org.apache.isis.core.metamodel.facets.properties.propertylayout;
-import org.apache.isis.applib.layout.v1_0.PropertyLayoutMetadata;
+import org.apache.isis.applib.layout.members.v1.PropertyLayoutData;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.objectvalue.multiline.MultiLineFacet;
import org.apache.isis.core.metamodel.facets.objectvalue.multiline.MultiLineFacetAbstract;
public class MultiLineFacetForPropertyXml extends MultiLineFacetAbstract {
- public static MultiLineFacet create(PropertyLayoutMetadata propertyLayout, FacetHolder holder) {
+ public static MultiLineFacet create(PropertyLayoutData propertyLayout, FacetHolder holder) {
if(propertyLayout == null) {
return null;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/10d80f3a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/NamedFacetForPropertyXml.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/NamedFacetForPropertyXml.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/NamedFacetForPropertyXml.java
index 8f2ea3a..447e5fd 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/NamedFacetForPropertyXml.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/NamedFacetForPropertyXml.java
@@ -21,14 +21,14 @@ package org.apache.isis.core.metamodel.facets.properties.propertylayout;
import com.google.common.base.Strings;
-import org.apache.isis.applib.layout.v1_0.PropertyLayoutMetadata;
+import org.apache.isis.applib.layout.members.v1.PropertyLayoutData;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.all.named.NamedFacet;
import org.apache.isis.core.metamodel.facets.all.named.NamedFacetAbstract;
public class NamedFacetForPropertyXml extends NamedFacetAbstract {
- public static NamedFacet create(PropertyLayoutMetadata propertyLayout, FacetHolder holder) {
+ public static NamedFacet create(PropertyLayoutData propertyLayout, FacetHolder holder) {
if(propertyLayout == null) {
return null;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/10d80f3a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/RenderedAdjustedFacetForPropertyXml.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/RenderedAdjustedFacetForPropertyXml.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/RenderedAdjustedFacetForPropertyXml.java
index 1947070..7c5055b 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/RenderedAdjustedFacetForPropertyXml.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/RenderedAdjustedFacetForPropertyXml.java
@@ -19,14 +19,14 @@
package org.apache.isis.core.metamodel.facets.properties.propertylayout;
-import org.apache.isis.applib.layout.v1_0.PropertyLayoutMetadata;
+import org.apache.isis.applib.layout.members.v1.PropertyLayoutData;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.objectvalue.renderedadjusted.RenderedAdjustedFacet;
import org.apache.isis.core.metamodel.facets.objectvalue.renderedadjusted.RenderedAdjustedFacetAbstract;
public class RenderedAdjustedFacetForPropertyXml extends RenderedAdjustedFacetAbstract {
- public static RenderedAdjustedFacet create(final PropertyLayoutMetadata propertyLayout, FacetHolder holder) {
+ public static RenderedAdjustedFacet create(final PropertyLayoutData propertyLayout, FacetHolder holder) {
if(propertyLayout == null) {
return null;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/10d80f3a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/TypicalLengthFacetForPropertyXml.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/TypicalLengthFacetForPropertyXml.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/TypicalLengthFacetForPropertyXml.java
index dfbfb79..a43255d 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/TypicalLengthFacetForPropertyXml.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/TypicalLengthFacetForPropertyXml.java
@@ -19,14 +19,14 @@
package org.apache.isis.core.metamodel.facets.properties.propertylayout;
-import org.apache.isis.applib.layout.v1_0.PropertyLayoutMetadata;
+import org.apache.isis.applib.layout.members.v1.PropertyLayoutData;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.objectvalue.typicallen.TypicalLengthFacet;
import org.apache.isis.core.metamodel.facets.objectvalue.typicallen.TypicalLengthFacetAbstract;
public class TypicalLengthFacetForPropertyXml extends TypicalLengthFacetAbstract {
- public static TypicalLengthFacet create(PropertyLayoutMetadata propertyLayout, FacetHolder holder) {
+ public static TypicalLengthFacet create(PropertyLayoutData propertyLayout, FacetHolder holder) {
if(propertyLayout == null) {
return null;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/10d80f3a/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 9f761c6..e460e07 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
@@ -84,7 +84,7 @@ import org.apache.isis.core.metamodel.runtimecontext.ServicesInjectorAware;
import org.apache.isis.core.metamodel.spec.ActionType;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.ObjectSpecifications;
-import org.apache.isis.applib.layout.fixedcols.ColumnMetadata.Hint;
+import org.apache.isis.applib.layout.fixedcols.FCColumn.Hint;
import org.apache.isis.core.metamodel.spec.feature.Contributed;
import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
http://git-wip-us.apache.org/repos/asf/isis/blob/10d80f3a/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 446abae..d37b145 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
@@ -33,7 +33,7 @@ import org.slf4j.LoggerFactory;
import org.apache.isis.applib.annotation.DomainService;
import org.apache.isis.applib.annotation.NatureOfService;
import org.apache.isis.applib.annotation.Programmatic;
-import org.apache.isis.applib.layout.fixedcols.ObjectLayoutMetadata;
+import org.apache.isis.applib.layout.fixedcols.FCPage;
import org.apache.isis.applib.services.jaxb.JaxbService;
import org.apache.isis.applib.services.layout.ObjectLayoutMetadataService;
import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
@@ -53,7 +53,7 @@ public class ObjectLayoutMetadataServiceDefault
private final Map<Class<?>, String> badXmlByClass = Maps.newHashMap();
// cache (used only in prototyping mode)
- private final Map<String, ObjectLayoutMetadata> metadataByXml = Maps.newHashMap();
+ private final Map<String, FCPage> metadataByXml = Maps.newHashMap();
@Override
@Programmatic
@@ -64,7 +64,7 @@ public class ObjectLayoutMetadataServiceDefault
@Override
@Programmatic
- public ObjectLayoutMetadata fromXml(Class<?> domainClass) {
+ public FCPage fromXml(Class<?> domainClass) {
final String resourceName = resourceNameFor(domainClass);
final String xml;
@@ -82,9 +82,9 @@ public class ObjectLayoutMetadataServiceDefault
if(!deploymentCategory.isProduction()) {
- final ObjectLayoutMetadata objectLayoutMetadata = metadataByXml.get(xml);
- if(objectLayoutMetadata != null) {
- return objectLayoutMetadata;
+ final FCPage FCPage = metadataByXml.get(xml);
+ if(FCPage != null) {
+ return FCPage;
}
final String badXml = badXmlByClass.get(domainClass);
@@ -101,7 +101,7 @@ public class ObjectLayoutMetadataServiceDefault
}
try {
- final ObjectLayoutMetadata metadata = jaxbService.fromXml(ObjectLayoutMetadata.class, xml);
+ final FCPage metadata = jaxbService.fromXml(FCPage.class, xml);
if(!deploymentCategory.isProduction()) {
metadataByXml.put(xml, metadata);
}
@@ -134,12 +134,12 @@ public class ObjectLayoutMetadataServiceDefault
@Override
@Programmatic
- public ObjectLayoutMetadata toMetadata(final Object domainObject) {
+ public FCPage toMetadata(final Object domainObject) {
return toMetadata(domainObject.getClass());
}
@Override
- public ObjectLayoutMetadata toMetadata(final Class<?> domainClass) {
+ public FCPage toMetadata(final Class<?> domainClass) {
final ObjectSpecification objectSpec = specificationLookup.loadSpecification(domainClass);
final ObjectLayoutMetadataFacet facet = objectSpec.getFacet(ObjectLayoutMetadataFacet.class);
return facet != null? facet.getMetadata(): null;
http://git-wip-us.apache.org/repos/asf/isis/blob/10d80f3a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/metamodel/MetadataMenu.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/metamodel/MetadataMenu.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/metamodel/MetadataMenu.java
index db40223..3066232 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/metamodel/MetadataMenu.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/metamodel/MetadataMenu.java
@@ -42,7 +42,7 @@ import org.apache.isis.applib.annotation.NatureOfService;
import org.apache.isis.applib.annotation.Programmatic;
import org.apache.isis.applib.annotation.RestrictTo;
import org.apache.isis.applib.annotation.SemanticsOf;
-import org.apache.isis.applib.layout.fixedcols.ObjectLayoutMetadata;
+import org.apache.isis.applib.layout.fixedcols.FCPage;
import org.apache.isis.applib.services.jaxb.JaxbService;
import org.apache.isis.applib.services.layout.ObjectLayoutMetadataService;
import org.apache.isis.applib.value.Blob;
@@ -108,7 +108,7 @@ public class MetadataMenu implements SpecificationLoaderSpiAware {
final OutputStreamWriter writer = new OutputStreamWriter(zos);
for (final ObjectSpecification objectSpec : domainObjectSpecs) {
final Class<?> domainClass = objectSpec.getCorrespondingClass();
- final ObjectLayoutMetadata metadata = objectLayoutMetadataService.toMetadata(domainClass);
+ final FCPage metadata = objectLayoutMetadataService.toMetadata(domainClass);
if(metadata != null) {
zos.putNextEntry(new ZipEntry(zipEntryNameFor(objectSpec)));
String xml = jaxbService.toXml(metadata);
http://git-wip-us.apache.org/repos/asf/isis/blob/10d80f3a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectSpecifications.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectSpecifications.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectSpecifications.java
index 209b105..686ab7c 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectSpecifications.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectSpecifications.java
@@ -25,7 +25,7 @@ import java.util.Set;
import com.google.common.collect.Lists;
-import org.apache.isis.applib.layout.fixedcols.ColumnMetadata;
+import org.apache.isis.applib.layout.fixedcols.FCColumn;
import org.apache.isis.core.metamodel.facets.object.membergroups.MemberGroupLayoutFacet;
@@ -37,7 +37,7 @@ public final class ObjectSpecifications {
public static List<String> orderByMemberGroups(
final ObjectSpecification objSpec,
final Set<String> groupNamesToOrder,
- final ColumnMetadata.Hint hint) {
+ final FCColumn.Hint hint) {
final MemberGroupLayoutFacet facet = objSpec.getFacet(MemberGroupLayoutFacet.class);
final List<String> leftColumnGroupNames = Lists.newArrayList(groupNamesToOrder);
@@ -47,10 +47,10 @@ public final class ObjectSpecifications {
return leftColumnGroupNames;
}
- if(hint == ColumnMetadata.Hint.MIDDLE) {
+ if(hint == FCColumn.Hint.MIDDLE) {
return facet.getColumnSpans().getMiddle()>0? facet.getMiddle(): Collections.<String>emptyList();
}
- if(hint == ColumnMetadata.Hint.RIGHT) {
+ if(hint == FCColumn.Hint.RIGHT) {
return facet.getColumnSpans().getRight()>0? facet.getRight(): Collections.<String>emptyList();
}
http://git-wip-us.apache.org/repos/asf/isis/blob/10d80f3a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/layoutxml/FCPageFacetDefaultTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/layoutxml/FCPageFacetDefaultTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/layoutxml/FCPageFacetDefaultTest.java
new file mode 100644
index 0000000..1f45123
--- /dev/null
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/layoutxml/FCPageFacetDefaultTest.java
@@ -0,0 +1,60 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.facets.object.layoutxml;
+
+import java.util.concurrent.atomic.AtomicReference;
+
+import org.junit.Test;
+
+import org.apache.isis.applib.layout.members.v1.FieldSet;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.nullValue;
+import static org.junit.Assert.assertThat;
+
+public class FCPageFacetDefaultTest {
+
+ @Test
+ public void xxx() throws Exception {
+
+ final AtomicReference<FieldSet> x = new AtomicReference<>();
+
+ FieldSet firstValue = new FieldSet();
+ FieldSet otherValue = new FieldSet();
+
+ assertThat(x.get(), is(nullValue()));
+
+ boolean b = x.compareAndSet(null, firstValue);
+ assertThat(b, is(true));
+ assertThat(x.get(), is(firstValue));
+
+ boolean b2 = x.compareAndSet(null, firstValue);
+ assertThat(b2, is(false));
+ assertThat(x.get(), is(firstValue));
+
+ boolean b3 = x.compareAndSet(null, otherValue);
+ assertThat(b3, is(false));
+ assertThat(x.get(), is(firstValue));
+
+ boolean b4 = x.compareAndSet(firstValue, otherValue);
+ assertThat(b4, is(true));
+ assertThat(x.get(), is(otherValue));
+
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis/blob/10d80f3a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/layoutxml/ObjectLayoutMetadataFacetDefaultTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/layoutxml/ObjectLayoutMetadataFacetDefaultTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/layoutxml/ObjectLayoutMetadataFacetDefaultTest.java
deleted file mode 100644
index 42fa829..0000000
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/layoutxml/ObjectLayoutMetadataFacetDefaultTest.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you 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.facets.object.layoutxml;
-
-import java.util.concurrent.atomic.AtomicReference;
-
-import org.junit.Test;
-
-import org.apache.isis.applib.layout.v1_0.PropertyGroupMetadata;
-
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.nullValue;
-import static org.junit.Assert.assertThat;
-
-public class ObjectLayoutMetadataFacetDefaultTest {
-
- @Test
- public void xxx() throws Exception {
-
- final AtomicReference<PropertyGroupMetadata> x = new AtomicReference<>();
-
- PropertyGroupMetadata firstValue = new PropertyGroupMetadata();
- PropertyGroupMetadata otherValue = new PropertyGroupMetadata();
-
- assertThat(x.get(), is(nullValue()));
-
- boolean b = x.compareAndSet(null, firstValue);
- assertThat(b, is(true));
- assertThat(x.get(), is(firstValue));
-
- boolean b2 = x.compareAndSet(null, firstValue);
- assertThat(b2, is(false));
- assertThat(x.get(), is(firstValue));
-
- boolean b3 = x.compareAndSet(null, otherValue);
- assertThat(b3, is(false));
- assertThat(x.get(), is(firstValue));
-
- boolean b4 = x.compareAndSet(firstValue, otherValue);
- assertThat(b4, is(true));
- assertThat(x.get(), is(otherValue));
-
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis/blob/10d80f3a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/layoutxml/v1_0/FCPageTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/layoutxml/v1_0/FCPageTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/layoutxml/v1_0/FCPageTest.java
new file mode 100644
index 0000000..88fcc50
--- /dev/null
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/layoutxml/v1_0/FCPageTest.java
@@ -0,0 +1,124 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.layoutxml.v1_0;
+
+import java.util.Map;
+
+import javax.xml.bind.Marshaller;
+
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.Lists;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+import org.apache.isis.applib.layout.members.v1.ActionLayoutData;
+import org.apache.isis.applib.layout.members.v1.CollectionLayoutData;
+import org.apache.isis.applib.layout.fixedcols.FCColumn;
+import org.apache.isis.applib.layout.fixedcols.FCPage;
+import org.apache.isis.applib.layout.members.v1.PropertyLayoutData;
+import org.apache.isis.applib.layout.members.v1.FieldSet;
+import org.apache.isis.applib.layout.fixedcols.FCTab;
+import org.apache.isis.applib.layout.fixedcols.FCTabGroup;
+import org.apache.isis.applib.services.jaxb.JaxbService;
+
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
+public class FCPageTest {
+
+ private JaxbService jaxbService;
+
+ @Before
+ public void setUp() throws Exception {
+ jaxbService = new JaxbService.Simple();
+ }
+
+ @After
+ public void tearDown() throws Exception {
+
+ }
+
+ @Test
+ public void xxx() throws Exception {
+
+ final FCPage FCPage = new FCPage();
+
+ FCPage.setTabGroups(Lists.<FCTabGroup>newArrayList());
+ FCPage.getTabGroups().add(new FCTabGroup());
+ FCTabGroup tabGroup = FCPage.getTabGroups().get(0);
+ FCTab FCTab = tabGroup.getTabs().get(0);
+ FCTab.setName("Common");
+ FCColumn left = FCTab.getLeft();
+
+ FieldSet leftPropGroup = new FieldSet();
+ left.setFieldSets(Lists.<FieldSet>newArrayList());
+ left.getFieldSets().add(leftPropGroup);
+ leftPropGroup.setName("General");
+
+ CollectionLayoutData similarToColl = new CollectionLayoutData();
+ left.setCollections(Lists.<CollectionLayoutData>newArrayList());
+ left.getCollections().add(similarToColl);
+ similarToColl.setId("similarTo");
+
+ left.getFieldSets().add(new FieldSet("General"));
+ PropertyLayoutData namePropertyLayoutData = new PropertyLayoutData("name");
+ left.getFieldSets().get(0).getProperties().add(namePropertyLayoutData);
+
+ ActionLayoutData updateNameActionLayoutData = new ActionLayoutData();
+ updateNameActionLayoutData.setId("updateName");
+ namePropertyLayoutData.setActions(Lists.<ActionLayoutData>newArrayList());
+ namePropertyLayoutData.getActions().add(updateNameActionLayoutData);
+
+ ActionLayoutData deleteActionLayoutData = new ActionLayoutData();
+ deleteActionLayoutData.setId("delete");
+ FCPage.setActions(Lists.<ActionLayoutData>newArrayList());
+ FCPage.getActions().add(deleteActionLayoutData);
+
+ String xml = jaxbService.toXml(FCPage,
+ ImmutableMap.<String,Object>of(
+ Marshaller.JAXB_SCHEMA_LOCATION,
+ "http://isis.apache.org/schema/applib/layout http://isis.apache.org/schema/applib/layout/layout-1.0.xsd"
+ ));
+ System.out.println(xml);
+
+ FCPage FCPageRoundtripped = jaxbService.fromXml(FCPage.class, xml);
+ String xmlRoundtripped = jaxbService.toXml(FCPageRoundtripped,
+ ImmutableMap.<String,Object>of(
+ Marshaller.JAXB_SCHEMA_LOCATION,
+ "http://isis.apache.org/schema/applib/layout http://isis.apache.org/schema/applib/layout/layout-1.0.xsd"
+ ));
+ assertThat(xml, is(equalTo(xmlRoundtripped)));
+
+
+ System.out.println("==========");
+
+ dumpXsd(FCPage);
+ }
+
+ protected void dumpXsd(final FCPage FCPage) {
+ Map<String, String> schemas = jaxbService.toXsd(FCPage, JaxbService.IsisSchemas.INCLUDE);
+ for (Map.Entry<String, String> entry : schemas.entrySet()) {
+ //System.out.println(entry.getKey() + ":");
+ System.out.println(entry.getValue());
+ }
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis/blob/10d80f3a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/layoutxml/v1_0/ObjectLayoutMetadataTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/layoutxml/v1_0/ObjectLayoutMetadataTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/layoutxml/v1_0/ObjectLayoutMetadataTest.java
deleted file mode 100644
index e0f9737..0000000
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/layoutxml/v1_0/ObjectLayoutMetadataTest.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you 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.layoutxml.v1_0;
-
-import java.util.Map;
-
-import javax.xml.bind.Marshaller;
-
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.Lists;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-import org.apache.isis.applib.layout.v1_0.ActionLayoutMetadata;
-import org.apache.isis.applib.layout.v1_0.CollectionLayoutMetadata;
-import org.apache.isis.applib.layout.fixedcols.ColumnMetadata;
-import org.apache.isis.applib.layout.fixedcols.ObjectLayoutMetadata;
-import org.apache.isis.applib.layout.v1_0.PropertyLayoutMetadata;
-import org.apache.isis.applib.layout.v1_0.PropertyGroupMetadata;
-import org.apache.isis.applib.layout.fixedcols.TabMetadata;
-import org.apache.isis.applib.layout.fixedcols.TabGroupMetadata;
-import org.apache.isis.applib.services.jaxb.JaxbService;
-
-import static org.hamcrest.CoreMatchers.equalTo;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-
-public class ObjectLayoutMetadataTest {
-
- private JaxbService jaxbService;
-
- @Before
- public void setUp() throws Exception {
- jaxbService = new JaxbService.Simple();
- }
-
- @After
- public void tearDown() throws Exception {
-
- }
-
- @Test
- public void xxx() throws Exception {
-
- final ObjectLayoutMetadata objectLayoutMetadata = new ObjectLayoutMetadata();
-
- objectLayoutMetadata.setTabGroups(Lists.<TabGroupMetadata>newArrayList());
- objectLayoutMetadata.getTabGroups().add(new TabGroupMetadata());
- TabGroupMetadata tabGroup = objectLayoutMetadata.getTabGroups().get(0);
- TabMetadata tabMetadata = tabGroup.getTabs().get(0);
- tabMetadata.setName("Common");
- ColumnMetadata left = tabMetadata.getLeft();
-
- PropertyGroupMetadata leftPropGroup = new PropertyGroupMetadata();
- left.setPropertyGroups(Lists.<PropertyGroupMetadata>newArrayList());
- left.getPropertyGroups().add(leftPropGroup);
- leftPropGroup.setName("General");
-
- CollectionLayoutMetadata similarToColl = new CollectionLayoutMetadata();
- left.setCollections(Lists.<CollectionLayoutMetadata>newArrayList());
- left.getCollections().add(similarToColl);
- similarToColl.setId("similarTo");
-
- left.getPropertyGroups().add(new PropertyGroupMetadata("General"));
- PropertyLayoutMetadata namePropertyLayoutMetadata = new PropertyLayoutMetadata("name");
- left.getPropertyGroups().get(0).getProperties().add(namePropertyLayoutMetadata);
-
- ActionLayoutMetadata updateNameActionLayoutMetadata = new ActionLayoutMetadata();
- updateNameActionLayoutMetadata.setId("updateName");
- namePropertyLayoutMetadata.setActions(Lists.<ActionLayoutMetadata>newArrayList());
- namePropertyLayoutMetadata.getActions().add(updateNameActionLayoutMetadata);
-
- ActionLayoutMetadata deleteActionLayoutMetadata = new ActionLayoutMetadata();
- deleteActionLayoutMetadata.setId("delete");
- objectLayoutMetadata.setActions(Lists.<ActionLayoutMetadata>newArrayList());
- objectLayoutMetadata.getActions().add(deleteActionLayoutMetadata);
-
- String xml = jaxbService.toXml(objectLayoutMetadata,
- ImmutableMap.<String,Object>of(
- Marshaller.JAXB_SCHEMA_LOCATION,
- "http://isis.apache.org/schema/applib/layout http://isis.apache.org/schema/applib/layout/layout-1.0.xsd"
- ));
- System.out.println(xml);
-
- ObjectLayoutMetadata objectLayoutMetadataRoundtripped = jaxbService.fromXml(ObjectLayoutMetadata.class, xml);
- String xmlRoundtripped = jaxbService.toXml(objectLayoutMetadataRoundtripped,
- ImmutableMap.<String,Object>of(
- Marshaller.JAXB_SCHEMA_LOCATION,
- "http://isis.apache.org/schema/applib/layout http://isis.apache.org/schema/applib/layout/layout-1.0.xsd"
- ));
- assertThat(xml, is(equalTo(xmlRoundtripped)));
-
-
- System.out.println("==========");
-
- dumpXsd(objectLayoutMetadata);
- }
-
- protected void dumpXsd(final ObjectLayoutMetadata objectLayoutMetadata) {
- Map<String, String> schemas = jaxbService.toXsd(objectLayoutMetadata, JaxbService.IsisSchemas.INCLUDE);
- for (Map.Entry<String, String> entry : schemas.entrySet()) {
- //System.out.println(entry.getKey() + ":");
- System.out.println(entry.getValue());
- }
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis/blob/10d80f3a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityCollectionModel.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityCollectionModel.java b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityCollectionModel.java
index 463c124..6f39c53 100644
--- a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityCollectionModel.java
+++ b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityCollectionModel.java
@@ -31,7 +31,7 @@ import com.google.common.collect.Iterables;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
-import org.apache.isis.applib.layout.v1_0.CollectionLayoutMetadata;
+import org.apache.isis.applib.layout.members.v1.CollectionLayoutData;
import org.apache.isis.core.commons.factory.InstanceUtil;
import org.apache.isis.core.commons.lang.ClassUtil;
import org.apache.isis.core.commons.lang.Closure;
@@ -325,19 +325,19 @@ public class EntityCollectionModel extends ModelAbstract<List<ObjectAdapter>> im
}
private EntityCollectionModel(final EntityModel entityModel) {
- this(entityModel.getObjectAdapterMemento(), entityModel.getCollectionLayoutMetadata());
+ this(entityModel.getObjectAdapterMemento(), entityModel.getCollectionLayoutData());
}
- private EntityCollectionModel(final ObjectAdapterMemento parentObjectAdapterMemento, final CollectionLayoutMetadata collectionLayoutMetadata) {
- this(parentObjectAdapterMemento, collectionFor(parentObjectAdapterMemento, collectionLayoutMetadata));
+ private EntityCollectionModel(final ObjectAdapterMemento parentObjectAdapterMemento, final CollectionLayoutData collectionLayoutData) {
+ this(parentObjectAdapterMemento, collectionFor(parentObjectAdapterMemento, collectionLayoutData));
}
private static OneToManyAssociation collectionFor(
- final ObjectAdapterMemento parentObjectAdapterMemento, final CollectionLayoutMetadata collectionLayoutMetadata) {
- if(collectionLayoutMetadata == null) {
+ final ObjectAdapterMemento parentObjectAdapterMemento, final CollectionLayoutData collectionLayoutData) {
+ if(collectionLayoutData == null) {
throw new IllegalArgumentException("EntityModel must have a CollectionLayoutMetadata");
}
- final String collectionId = collectionLayoutMetadata.getId();
+ final String collectionId = collectionLayoutData.getId();
final ObjectSpecId objectSpecId = parentObjectAdapterMemento.getObjectSpecId();
final ObjectSpecification objectSpec = getSpecificationLoaderStatic().lookupBySpecId(objectSpecId);
final OneToManyAssociation otma = (OneToManyAssociation) objectSpec.getAssociation(collectionId);