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:27 UTC
[11/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/applib/src/main/java/org/apache/isis/applib/layout/fixedcols/TabMetadata.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/layout/fixedcols/TabMetadata.java b/core/applib/src/main/java/org/apache/isis/applib/layout/fixedcols/TabMetadata.java
deleted file mode 100644
index 979b1b5..0000000
--- a/core/applib/src/main/java/org/apache/isis/applib/layout/fixedcols/TabMetadata.java
+++ /dev/null
@@ -1,173 +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.applib.layout.fixedcols;
-
-import java.io.Serializable;
-import java.util.List;
-
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlTransient;
-import javax.xml.bind.annotation.XmlType;
-
-import com.google.common.base.Predicate;
-import com.google.common.collect.Lists;
-
-import org.apache.isis.applib.annotation.Programmatic;
-import org.apache.isis.applib.layout.v1_0.CollectionLayoutMetadata;
-import org.apache.isis.applib.layout.v1_0.ColumnOwner;
-import org.apache.isis.applib.layout.v1_0.MemberLayoutMetadata;
-import org.apache.isis.applib.layout.v1_0.Owned;
-import org.apache.isis.applib.layout.v1_0.PropertyGroupMetadata;
-
-@XmlType(
- name="tab"
- , propOrder = {
- "name"
- , "left"
- , "middle"
- , "right"
- }
-)
-public class TabMetadata implements ColumnOwner, Serializable, Owned<TabGroupMetadata> {
-
- private static final long serialVersionUID = 1L;
-
- private String name;
-
- @XmlAttribute(required = true)
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
-
-
- private ColumnMetadata left = new ColumnMetadata();
-
- @XmlElement(required = true)
- public ColumnMetadata getLeft() {
- return left;
- }
-
- public void setLeft(final ColumnMetadata left) {
- this.left = left;
- }
-
-
- private ColumnMetadata middle;
-
- @XmlElement(required = false)
- public ColumnMetadata getMiddle() {
- return middle;
- }
-
- public void setMiddle(final ColumnMetadata middle) {
- this.middle = middle;
- }
-
-
- private ColumnMetadata right;
-
- @XmlElement(required = false)
- public ColumnMetadata getRight() {
- return right;
- }
-
- public void setRight(final ColumnMetadata right) {
- this.right = right;
- }
-
-
-
- private TabGroupMetadata owner;
- /**
- * Owner.
- *
- * <p>
- * Set programmatically by framework after reading in from XML.
- * </p>
- */
- @XmlTransient
- public TabGroupMetadata getOwner() {
- return owner;
- }
-
- public void setOwner(final TabGroupMetadata owner) {
- this.owner = owner;
- }
-
- /**
- * Aggregates the contents of all collections on this tab.
- */
- @Programmatic
- public List<MemberLayoutMetadata> getContents() {
- final List<MemberLayoutMetadata> contents = Lists.newArrayList();
- appendContent(contents, getLeft());
- appendContent(contents, getMiddle());
- appendContent(contents, getRight());
- return contents;
- }
-
-
-
-
- private String path;
-
- @Programmatic
- @XmlTransient
- public String getPath() {
- return path;
- }
-
- @Programmatic
- public void setPath(final String path) {
- this.path = path;
- }
-
-
-
- private static void appendContent(final List<MemberLayoutMetadata> contents, final ColumnMetadata columnMetadata) {
- if(columnMetadata == null) {
- return;
- }
- final List<PropertyGroupMetadata> propertyGroups = columnMetadata.getPropertyGroups();
- if(propertyGroups != null) {
- contents.addAll(propertyGroups);
- }
- final List<CollectionLayoutMetadata> collectionLayoutMetadatas = columnMetadata.getCollections();
- if(collectionLayoutMetadatas != null) {
- contents.addAll(collectionLayoutMetadatas);
- }
- }
-
- public static class Predicates {
- public static Predicate<TabMetadata> notEmpty() {
- return new Predicate<TabMetadata>() {
- @Override
- public boolean apply(final TabMetadata tabMetadata) {
- return !tabMetadata.getContents().isEmpty();
- }
- };
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/10d80f3a/core/applib/src/main/java/org/apache/isis/applib/layout/fixedcols/package-info.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/layout/fixedcols/package-info.java b/core/applib/src/main/java/org/apache/isis/applib/layout/fixedcols/package-info.java
new file mode 100644
index 0000000..af1fb85
--- /dev/null
+++ b/core/applib/src/main/java/org/apache/isis/applib/layout/fixedcols/package-info.java
@@ -0,0 +1,35 @@
+/*
+ * 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.
+ */
+
+/**
+ * The classes in this package define how to layout the properties, collections and actions of a domain object - the
+ * building blocks - as defined in the <code>members.v1</code> package.
+ *
+ * <p>
+ * The layout is reasonably flexible, being a half-way house between the annotation/JSON style layouts (pre 1.12.0)
+ * vs the fully flexible layouts provided by the <code>bootstrap3</code> layouts. In particular, they allow
+ * property fieldsets and collections to be grouped into tabs, with collections being laid out in any column.
+ * However, tab groups only appear in the central area of the page, and may only have a maximum of three columns.
+ * </p>
+ */
+@javax.xml.bind.annotation.XmlSchema(
+ namespace = "http://isis.apache.org/schema/applib/layout/fixedcols",
+ elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED
+)
+package org.apache.isis.applib.layout.fixedcols;
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis/blob/10d80f3a/core/applib/src/main/java/org/apache/isis/applib/layout/members/MemberRegion.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/layout/members/MemberRegion.java b/core/applib/src/main/java/org/apache/isis/applib/layout/members/MemberRegion.java
new file mode 100644
index 0000000..b4caf6f
--- /dev/null
+++ b/core/applib/src/main/java/org/apache/isis/applib/layout/members/MemberRegion.java
@@ -0,0 +1,33 @@
+/*
+ * 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.applib.layout.members;
+
+/**
+ * Represents an area on the page containing one or several related members.
+ *
+ * <p>
+ * Implementations include a <code>FieldSet</code> (containing a number
+ * of properties and their actions), and a <code>CollectionLayoutData</code>
+ * (containing a single collection and associated actions)
+ * </p>
+ */
+public interface MemberRegion extends Owned<MemberRegionOwner> {
+
+
+}
http://git-wip-us.apache.org/repos/asf/isis/blob/10d80f3a/core/applib/src/main/java/org/apache/isis/applib/layout/members/MemberRegionOwner.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/layout/members/MemberRegionOwner.java b/core/applib/src/main/java/org/apache/isis/applib/layout/members/MemberRegionOwner.java
new file mode 100644
index 0000000..174bfb1
--- /dev/null
+++ b/core/applib/src/main/java/org/apache/isis/applib/layout/members/MemberRegionOwner.java
@@ -0,0 +1,23 @@
+/*
+ * 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.applib.layout.members;
+
+public interface MemberRegionOwner extends Owner {
+
+}
http://git-wip-us.apache.org/repos/asf/isis/blob/10d80f3a/core/applib/src/main/java/org/apache/isis/applib/layout/members/Owned.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/layout/members/Owned.java b/core/applib/src/main/java/org/apache/isis/applib/layout/members/Owned.java
new file mode 100644
index 0000000..54ef692
--- /dev/null
+++ b/core/applib/src/main/java/org/apache/isis/applib/layout/members/Owned.java
@@ -0,0 +1,23 @@
+/*
+ * 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.applib.layout.members;
+
+public interface Owned<T extends Owner> {
+ T getOwner();
+}
http://git-wip-us.apache.org/repos/asf/isis/blob/10d80f3a/core/applib/src/main/java/org/apache/isis/applib/layout/members/Owner.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/layout/members/Owner.java b/core/applib/src/main/java/org/apache/isis/applib/layout/members/Owner.java
new file mode 100644
index 0000000..b0f9dd2
--- /dev/null
+++ b/core/applib/src/main/java/org/apache/isis/applib/layout/members/Owner.java
@@ -0,0 +1,24 @@
+/*
+ * 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.applib.layout.members;
+
+public interface Owner {
+
+
+}
http://git-wip-us.apache.org/repos/asf/isis/blob/10d80f3a/core/applib/src/main/java/org/apache/isis/applib/layout/members/v1/ActionLayoutData.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/layout/members/v1/ActionLayoutData.java b/core/applib/src/main/java/org/apache/isis/applib/layout/members/v1/ActionLayoutData.java
new file mode 100644
index 0000000..6e15728
--- /dev/null
+++ b/core/applib/src/main/java/org/apache/isis/applib/layout/members/v1/ActionLayoutData.java
@@ -0,0 +1,227 @@
+/*
+ * 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.applib.layout.members.v1;
+
+import java.io.Serializable;
+
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlTransient;
+import javax.xml.bind.annotation.XmlType;
+
+import org.apache.isis.applib.annotation.BookmarkPolicy;
+import org.apache.isis.applib.annotation.Where;
+import org.apache.isis.applib.layout.members.Owned;
+
+/**
+ * Describes the layout of a single action, broadly corresponding to {@link org.apache.isis.applib.annotation.ActionLayout}.
+ *
+ * <p>
+ * Note that {@link org.apache.isis.applib.annotation.ActionLayout#contributed()} is omitted because this only applies
+ * to domain services.
+ * </p>
+ */
+@XmlType(
+ name = "actionLayout"
+ , propOrder = {
+ "named"
+ , "describedAs"
+ , "metadataError"
+ }
+)
+public class ActionLayoutData implements Serializable, Owned<ActionOwner> {
+
+ private static final long serialVersionUID = 1L;
+
+ public ActionLayoutData() {
+ }
+ public ActionLayoutData(final String id) {
+ setId(id);
+ }
+
+ private String id;
+ /**
+ * Method name.
+ *
+ * <p>
+ * Overloaded methods are not supported.
+ * </p>
+ */
+ @XmlAttribute(name="id", required = true)
+ public String getId() {
+ return id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+
+
+ private BookmarkPolicy bookmarking;
+
+ @XmlAttribute(required = false)
+ public BookmarkPolicy getBookmarking() {
+ return bookmarking;
+ }
+
+ public void setBookmarking(BookmarkPolicy bookmarking) {
+ this.bookmarking = bookmarking;
+ }
+
+
+ private String cssClass;
+
+ @XmlAttribute(required = false)
+ public String getCssClass() {
+ return cssClass;
+ }
+
+ public void setCssClass(String cssClass) {
+ this.cssClass = cssClass;
+ }
+
+
+ private String cssClassFa;
+
+ @XmlAttribute(required = false)
+ public String getCssClassFa() {
+ return cssClassFa;
+ }
+
+ public void setCssClassFa(String cssClassFa) {
+ this.cssClassFa = cssClassFa;
+ }
+
+
+
+ private org.apache.isis.applib.annotation.ActionLayout.CssClassFaPosition cssClassFaPosition;
+
+ @XmlAttribute(required = false)
+ public org.apache.isis.applib.annotation.ActionLayout.CssClassFaPosition getCssClassFaPosition() {
+ return cssClassFaPosition;
+ }
+
+ public void setCssClassFaPosition(org.apache.isis.applib.annotation.ActionLayout.CssClassFaPosition cssClassFaPosition) {
+ this.cssClassFaPosition = cssClassFaPosition;
+ }
+
+
+ private String describedAs;
+
+ @XmlElement(required = false)
+ public String getDescribedAs() {
+ return describedAs;
+ }
+
+ public void setDescribedAs(String describedAs) {
+ this.describedAs = describedAs;
+ }
+
+
+
+ private Where hidden;
+
+ @XmlAttribute(required = false)
+ public Where getHidden() {
+ return hidden;
+ }
+
+ public void setHidden(Where hidden) {
+ this.hidden = hidden;
+ }
+
+
+
+ private String named;
+
+ @XmlElement(required = false)
+ public String getNamed() {
+ return named;
+ }
+
+ public void setNamed(String named) {
+ this.named = named;
+ }
+
+
+
+ private Boolean namedEscaped;
+
+ @XmlAttribute(required = false)
+ public Boolean getNamedEscaped() {
+ return namedEscaped;
+ }
+
+ public void setNamedEscaped(Boolean namedEscaped) {
+ this.namedEscaped = namedEscaped;
+ }
+
+
+
+ private org.apache.isis.applib.annotation.ActionLayout.Position position;
+
+ @XmlAttribute(required = false)
+ public org.apache.isis.applib.annotation.ActionLayout.Position getPosition() {
+ return position;
+ }
+
+ public void setPosition(org.apache.isis.applib.annotation.ActionLayout.Position position) {
+ this.position = position;
+ }
+
+
+
+
+ private ActionOwner owner;
+ /**
+ * Owner.
+ *
+ * <p>
+ * Set programmatically by framework after reading in from XML.
+ * </p>
+ */
+ @XmlTransient
+ public ActionOwner getOwner() {
+ return owner;
+ }
+
+ public void setOwner(final ActionOwner owner) {
+ this.owner = owner;
+ }
+
+
+ private String metadataError;
+
+ /**
+ * For diagnostics; populated by the framework if and only if a metadata error.
+ */
+ @XmlElement(required = false)
+ public String getMetadataError() {
+ return metadataError;
+ }
+
+ public void setMetadataError(final String metadataError) {
+ this.metadataError = metadataError;
+ }
+
+
+
+
+}
http://git-wip-us.apache.org/repos/asf/isis/blob/10d80f3a/core/applib/src/main/java/org/apache/isis/applib/layout/members/v1/ActionOwner.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/layout/members/v1/ActionOwner.java b/core/applib/src/main/java/org/apache/isis/applib/layout/members/v1/ActionOwner.java
new file mode 100644
index 0000000..2e604d2
--- /dev/null
+++ b/core/applib/src/main/java/org/apache/isis/applib/layout/members/v1/ActionOwner.java
@@ -0,0 +1,27 @@
+/*
+ * 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.applib.layout.members.v1;
+
+import java.util.List;
+
+import org.apache.isis.applib.layout.members.Owner;
+
+public interface ActionOwner extends Owner {
+ List<ActionLayoutData> getActions();
+}
http://git-wip-us.apache.org/repos/asf/isis/blob/10d80f3a/core/applib/src/main/java/org/apache/isis/applib/layout/members/v1/CollectionLayoutData.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/layout/members/v1/CollectionLayoutData.java b/core/applib/src/main/java/org/apache/isis/applib/layout/members/v1/CollectionLayoutData.java
new file mode 100644
index 0000000..8b9a608
--- /dev/null
+++ b/core/applib/src/main/java/org/apache/isis/applib/layout/members/v1/CollectionLayoutData.java
@@ -0,0 +1,261 @@
+/*
+ * 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.applib.layout.members.v1;
+
+import java.io.Serializable;
+import java.util.List;
+
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlElementWrapper;
+import javax.xml.bind.annotation.XmlTransient;
+import javax.xml.bind.annotation.XmlType;
+
+import com.google.common.base.Function;
+
+import org.apache.isis.applib.annotation.Programmatic;
+import org.apache.isis.applib.annotation.Where;
+import org.apache.isis.applib.layout.members.MemberRegion;
+import org.apache.isis.applib.layout.members.MemberRegionOwner;
+
+/**
+ * Describes the layout of a single collection, broadly corresponds to the {@link org.apache.isis.applib.annotation.CollectionLayout} annotation.
+ *
+ * <p>
+ * Note that {@link org.apache.isis.applib.annotation.CollectionLayout#render()} is omitted because
+ * {@link #defaultView} is its replacement.
+ * </p>
+ */
+@XmlType(
+ propOrder = {
+ "named"
+ ,"describedAs"
+ ,"sortedBy"
+ , "actions"
+ , "metadataError"
+ }
+)
+public class CollectionLayoutData implements MemberRegion, ActionOwner, Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ public CollectionLayoutData() {
+ }
+ public CollectionLayoutData(final String id) {
+ setId(id);
+ }
+
+
+ private String id;
+
+ /**
+ * Collection identifier, being the getter method without "get" prefix, first letter lower cased.
+ */
+ @XmlAttribute(required = true)
+ public String getId() {
+ return id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+
+
+ private String cssClass;
+
+ @XmlAttribute(required = false)
+ public String getCssClass() {
+ return cssClass;
+ }
+
+ public void setCssClass(String cssClass) {
+ this.cssClass = cssClass;
+ }
+
+
+
+ private String describedAs;
+
+ @XmlElement(required = false)
+ public String getDescribedAs() {
+ return describedAs;
+ }
+
+ public void setDescribedAs(String describedAs) {
+ this.describedAs = describedAs;
+ }
+
+
+
+ private String defaultView;
+
+ /**
+ * Typically <code>table</code> or <code>hidden</code>, but could be any other named view that is configured and
+ * appropriate, eg <code>gmap3</code> or <code>fullcalendar2</code>.
+ */
+ @XmlAttribute(required = false)
+ public String getDefaultView() {
+ return defaultView;
+ }
+
+ public void setDefaultView(String defaultView) {
+ this.defaultView = defaultView;
+ }
+
+
+ private Where hidden;
+
+ @XmlAttribute(required = false)
+ public Where getHidden() {
+ return hidden;
+ }
+
+ public void setHidden(Where hidden) {
+ this.hidden = hidden;
+ }
+
+
+ private String named;
+
+ @XmlElement(required = false)
+ public String getNamed() {
+ return named;
+ }
+
+ public void setNamed(String named) {
+ this.named = named;
+ }
+
+
+ private Boolean namedEscaped;
+
+ @XmlAttribute(required = false)
+ public Boolean getNamedEscaped() {
+ return namedEscaped;
+ }
+
+ public void setNamedEscaped(Boolean namedEscaped) {
+ this.namedEscaped = namedEscaped;
+ }
+
+
+ private Integer paged;
+
+ @XmlAttribute(required = false)
+ public Integer getPaged() {
+ return paged;
+ }
+
+ public void setPaged(Integer paged) {
+ this.paged = paged;
+ }
+
+
+
+ private String sortedBy;
+
+ @XmlElement(required = false)
+ public String getSortedBy() {
+ return sortedBy;
+ }
+
+ public void setSortedBy(String sortedBy) {
+ this.sortedBy = sortedBy;
+ }
+
+
+
+ private List<ActionLayoutData> actions;
+
+ @XmlElementWrapper(name = "actions", required = false)
+ @XmlElement(name = "action", required = false)
+ public List<ActionLayoutData> getActions() {
+ return actions;
+ }
+
+ public void setActions(List<ActionLayoutData> actionLayoutDatas) {
+ this.actions = actionLayoutDatas;
+ }
+
+
+
+ private MemberRegionOwner owner;
+ /**
+ * Owner.
+ *
+ * <p>
+ * Set programmatically by framework after reading in from XML.
+ * </p>
+ */
+ @XmlTransient
+ public MemberRegionOwner getOwner() {
+ return owner;
+ }
+
+ public void setOwner(final MemberRegionOwner owner) {
+ this.owner = owner;
+ }
+
+
+ private String metadataError;
+
+ /**
+ * For diagnostics; populated by the framework if and only if a metadata error.
+ */
+ @XmlElement(required = false)
+ public String getMetadataError() {
+ return metadataError;
+ }
+
+ public void setMetadataError(final String metadataError) {
+ this.metadataError = metadataError;
+ }
+
+
+
+
+ private String path;
+
+ @Programmatic
+ @XmlTransient
+ public String getPath() {
+ return path;
+ }
+
+ @Programmatic
+ public void setPath(final String path) {
+ this.path = path;
+ }
+
+
+
+ public static class Functions {
+ private Functions(){}
+
+ public static Function<CollectionLayoutData, String> id() {
+ return new Function<CollectionLayoutData, String>() {
+ @Override
+ public String apply(final CollectionLayoutData metadata) {
+ return metadata.getId();
+ }
+ };
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/isis/blob/10d80f3a/core/applib/src/main/java/org/apache/isis/applib/layout/members/v1/FieldSet.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/layout/members/v1/FieldSet.java b/core/applib/src/main/java/org/apache/isis/applib/layout/members/v1/FieldSet.java
new file mode 100644
index 0000000..59e7c46
--- /dev/null
+++ b/core/applib/src/main/java/org/apache/isis/applib/layout/members/v1/FieldSet.java
@@ -0,0 +1,152 @@
+/*
+ * 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.applib.layout.members.v1;
+
+import java.io.Serializable;
+import java.util.List;
+
+import javax.annotation.Nullable;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlElementWrapper;
+import javax.xml.bind.annotation.XmlTransient;
+import javax.xml.bind.annotation.XmlType;
+
+import com.google.common.base.Function;
+import com.google.common.collect.Lists;
+
+import org.apache.isis.applib.annotation.MemberOrder;
+import org.apache.isis.applib.annotation.Programmatic;
+import org.apache.isis.applib.layout.members.MemberRegion;
+import org.apache.isis.applib.layout.members.MemberRegionOwner;
+
+/**
+ * A {@link MemberRegion region} of the page containing a set of
+ * related {@link PropertyLayoutData properties} and associated
+ * {@link ActionLayoutData actions}.
+ */
+@XmlType(
+ propOrder = {
+ "name"
+ , "actions"
+ , "properties"
+ }
+)
+public class FieldSet implements MemberRegion, ActionOwner, Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ public FieldSet() {
+ }
+
+ public FieldSet(final String name) {
+ setName(name);
+ }
+
+ private String name;
+
+ /**
+ * Corresponds to the {@link MemberOrder#name()} (when applied to properties).
+ */
+ @XmlAttribute(required = true)
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+
+
+ private List<ActionLayoutData> actions = Lists.newArrayList();
+
+ @XmlElementWrapper(required = false)
+ @XmlElement(name = "action", required = false)
+ public List<ActionLayoutData> getActions() {
+ return actions;
+ }
+
+ public void setActions(List<ActionLayoutData> actionLayoutDatas) {
+ this.actions = actionLayoutDatas;
+ }
+
+
+
+ private List<PropertyLayoutData> properties = Lists.newArrayList();
+
+ @XmlElement(name = "property", required = true)
+ public List<PropertyLayoutData> getProperties() {
+ return properties;
+ }
+
+ public void setProperties(List<PropertyLayoutData> properties) {
+ this.properties = properties;
+ }
+
+
+ private MemberRegionOwner owner;
+ /**
+ * Owner.
+ *
+ * <p>
+ * Set programmatically by framework after reading in from XML.
+ * </p>
+ */
+ @XmlTransient
+ public MemberRegionOwner getOwner() {
+ return owner;
+ }
+
+ public void setOwner(final MemberRegionOwner owner) {
+ this.owner = owner;
+ }
+
+
+
+
+ private String path;
+
+ @Programmatic
+ @XmlTransient
+ public String getPath() {
+ return path;
+ }
+
+ @Programmatic
+ public void setPath(final String path) {
+ this.path = path;
+ }
+
+
+
+
+ public static class Util {
+ private Util(){}
+ public static Function<? super FieldSet, String> nameOf() {
+ return new Function<FieldSet, String>() {
+ @Nullable @Override
+ public String apply(@Nullable final FieldSet fieldSet) {
+ return fieldSet.getName();
+ }
+ };
+ }
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/isis/blob/10d80f3a/core/applib/src/main/java/org/apache/isis/applib/layout/members/v1/PropertyLayoutData.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/layout/members/v1/PropertyLayoutData.java b/core/applib/src/main/java/org/apache/isis/applib/layout/members/v1/PropertyLayoutData.java
new file mode 100644
index 0000000..3036c7f
--- /dev/null
+++ b/core/applib/src/main/java/org/apache/isis/applib/layout/members/v1/PropertyLayoutData.java
@@ -0,0 +1,246 @@
+/*
+ * 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.applib.layout.members.v1;
+
+import java.io.Serializable;
+import java.util.List;
+
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlElementWrapper;
+import javax.xml.bind.annotation.XmlTransient;
+import javax.xml.bind.annotation.XmlType;
+
+import org.apache.isis.applib.annotation.LabelPosition;
+import org.apache.isis.applib.annotation.Programmatic;
+import org.apache.isis.applib.annotation.Where;
+import org.apache.isis.applib.layout.members.Owned;
+
+/**
+ * Describes the layout of a single property, broadly corresponds to the {@link org.apache.isis.applib.annotation.PropertyLayout} annotation.
+ */
+@XmlType(
+ name = "propertyLayout"
+ , propOrder = {
+ "named"
+ , "describedAs"
+ , "actions"
+ , "metadataError"
+ }
+)
+public class PropertyLayoutData implements ActionOwner, Serializable, Owned<FieldSet> {
+
+ private static final long serialVersionUID = 1L;
+
+ public PropertyLayoutData() {
+ }
+
+ public PropertyLayoutData(final String id) {
+ this.id = id;
+ }
+
+ private String id;
+
+ /**
+ * Property identifier, being the getter method without "get" or "is" prefix, first letter lower cased.
+ */
+ @XmlAttribute(required = true)
+ public String getId() {
+ return id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+
+
+ private String cssClass;
+
+ @XmlAttribute(required = false)
+ public String getCssClass() {
+ return cssClass;
+ }
+
+ public void setCssClass(String cssClass) {
+ this.cssClass = cssClass;
+ }
+
+
+ private String describedAs;
+
+ @XmlElement(required = false)
+ public String getDescribedAs() {
+ return describedAs;
+ }
+
+ public void setDescribedAs(String describedAs) {
+ this.describedAs = describedAs;
+ }
+
+
+ private Where hidden;
+
+ @XmlAttribute(required = false)
+ public Where getHidden() {
+ return hidden;
+ }
+
+ public void setHidden(Where hidden) {
+ this.hidden = hidden;
+ }
+
+
+ private LabelPosition labelPosition;
+
+ @XmlAttribute(required = false)
+ public LabelPosition getLabelPosition() {
+ return labelPosition;
+ }
+
+ public void setLabelPosition(LabelPosition labelPosition) {
+ this.labelPosition = labelPosition;
+ }
+
+
+ private Integer multiLine;
+
+ @XmlAttribute(required = false)
+ public Integer getMultiLine() {
+ return multiLine;
+ }
+
+ public void setMultiLine(Integer multiLine) {
+ this.multiLine = multiLine;
+ }
+
+
+ private String named;
+
+ @XmlElement(required = false)
+ public String getNamed() {
+ return named;
+ }
+
+ public void setNamed(String named) {
+ this.named = named;
+ }
+
+
+ private Boolean namedEscaped;
+
+ @XmlAttribute(required = false)
+ public Boolean getNamedEscaped() {
+ return namedEscaped;
+ }
+
+ public void setNamedEscaped(Boolean namedEscaped) {
+ this.namedEscaped = namedEscaped;
+ }
+
+
+ private Boolean renderedAsDayBefore;
+
+ @XmlAttribute(required = false)
+ public Boolean getRenderedAsDayBefore() {
+ return renderedAsDayBefore;
+ }
+
+ public void setRenderedAsDayBefore(Boolean renderedAsDayBefore) {
+ this.renderedAsDayBefore = renderedAsDayBefore;
+ }
+
+
+ private Integer typicalLength;
+
+ @XmlAttribute(required = false)
+ public Integer getTypicalLength() {
+ return typicalLength;
+ }
+
+ public void setTypicalLength(Integer typicalLength) {
+ this.typicalLength = typicalLength;
+ }
+
+
+
+ private List<ActionLayoutData> actions;
+
+ @XmlElementWrapper(required = false)
+ @XmlElement(name = "action", required = false)
+ public List<ActionLayoutData> getActions() {
+ return actions;
+ }
+
+ public void setActions(List<ActionLayoutData> actionLayoutDatas) {
+ this.actions = actionLayoutDatas;
+ }
+
+
+ private FieldSet owner;
+ /**
+ * Owner.
+ *
+ * <p>
+ * Set programmatically by framework after reading in from XML.
+ * </p>
+ */
+ @XmlTransient
+ public FieldSet getOwner() {
+ return owner;
+ }
+
+ public void setOwner(final FieldSet owner) {
+ this.owner = owner;
+ }
+
+
+
+ private String metadataError;
+
+ /**
+ * For diagnostics; populated by the framework if and only if a metadata error.
+ */
+ @XmlElement(required = false)
+ public String getMetadataError() {
+ return metadataError;
+ }
+
+ public void setMetadataError(final String metadataError) {
+ this.metadataError = metadataError;
+ }
+
+
+
+
+ private String path;
+
+ @Programmatic
+ @XmlTransient
+ public String getPath() {
+ return path;
+ }
+
+ @Programmatic
+ public void setPath(final String path) {
+ this.path = path;
+ }
+
+
+}
http://git-wip-us.apache.org/repos/asf/isis/blob/10d80f3a/core/applib/src/main/java/org/apache/isis/applib/layout/members/v1/package-info.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/layout/members/v1/package-info.java b/core/applib/src/main/java/org/apache/isis/applib/layout/members/v1/package-info.java
new file mode 100644
index 0000000..40a6f0b
--- /dev/null
+++ b/core/applib/src/main/java/org/apache/isis/applib/layout/members/v1/package-info.java
@@ -0,0 +1,36 @@
+/*
+ * 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.
+ */
+
+/**
+ * The classes in this package provide layout metadata for a domain object's properties, collections and actions - the
+ * "building blocks" which then must be arranged into some sort of layout.
+ *
+ * <p>
+ * The <code>bootstrap3</code> and <code>fixedcols</code> packages both provide different ways of doing the layout,
+ * and both reference the classes in this package.
+ * </p>
+ *
+ */
+@javax.xml.bind.annotation.XmlSchema(
+ namespace = "http://isis.apache.org/schema/applib/layout/members",
+ elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED
+ // specifying the location seems to cause JaxbService#toXsd() to not generate the schema; not sure why...
+ //, location = ..."http://isis.apache.org/schema/metamodel/layout/members/v1/members-1.0.xsd"
+)
+package org.apache.isis.applib.layout.members.v1;
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis/blob/10d80f3a/core/applib/src/main/java/org/apache/isis/applib/layout/v1_0/ActionLayoutMetadata.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/layout/v1_0/ActionLayoutMetadata.java b/core/applib/src/main/java/org/apache/isis/applib/layout/v1_0/ActionLayoutMetadata.java
deleted file mode 100644
index 9cc269a..0000000
--- a/core/applib/src/main/java/org/apache/isis/applib/layout/v1_0/ActionLayoutMetadata.java
+++ /dev/null
@@ -1,226 +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.applib.layout.v1_0;
-
-import java.io.Serializable;
-
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlTransient;
-import javax.xml.bind.annotation.XmlType;
-
-import org.apache.isis.applib.annotation.BookmarkPolicy;
-import org.apache.isis.applib.annotation.Where;
-
-/**
- * Broadly corresponds to {@link org.apache.isis.applib.annotation.ActionLayout}.
- *
- * <p>
- * Note that {@link org.apache.isis.applib.annotation.ActionLayout#contributed()} is omitted because this only applies
- * to domain services.
- * </p>
- */
-@XmlType(
- name = "actionLayout"
- , propOrder = {
- "named"
- , "describedAs"
- , "metadataError"
- }
-)
-public class ActionLayoutMetadata implements Serializable, Owned<ActionOwner> {
-
- private static final long serialVersionUID = 1L;
-
- public ActionLayoutMetadata() {
- }
- public ActionLayoutMetadata(final String id) {
- setId(id);
- }
-
- private String id;
- /**
- * Method name.
- *
- * <p>
- * Overloaded methods are not supported.
- * </p>
- */
- @XmlAttribute(name="id", required = true)
- public String getId() {
- return id;
- }
-
- public void setId(String id) {
- this.id = id;
- }
-
-
-
- private BookmarkPolicy bookmarking;
-
- @XmlAttribute(required = false)
- public BookmarkPolicy getBookmarking() {
- return bookmarking;
- }
-
- public void setBookmarking(BookmarkPolicy bookmarking) {
- this.bookmarking = bookmarking;
- }
-
-
- private String cssClass;
-
- @XmlAttribute(required = false)
- public String getCssClass() {
- return cssClass;
- }
-
- public void setCssClass(String cssClass) {
- this.cssClass = cssClass;
- }
-
-
- private String cssClassFa;
-
- @XmlAttribute(required = false)
- public String getCssClassFa() {
- return cssClassFa;
- }
-
- public void setCssClassFa(String cssClassFa) {
- this.cssClassFa = cssClassFa;
- }
-
-
-
- private org.apache.isis.applib.annotation.ActionLayout.CssClassFaPosition cssClassFaPosition;
-
- @XmlAttribute(required = false)
- public org.apache.isis.applib.annotation.ActionLayout.CssClassFaPosition getCssClassFaPosition() {
- return cssClassFaPosition;
- }
-
- public void setCssClassFaPosition(org.apache.isis.applib.annotation.ActionLayout.CssClassFaPosition cssClassFaPosition) {
- this.cssClassFaPosition = cssClassFaPosition;
- }
-
-
- private String describedAs;
-
- @XmlElement(required = false)
- public String getDescribedAs() {
- return describedAs;
- }
-
- public void setDescribedAs(String describedAs) {
- this.describedAs = describedAs;
- }
-
-
-
- private Where hidden;
-
- @XmlAttribute(required = false)
- public Where getHidden() {
- return hidden;
- }
-
- public void setHidden(Where hidden) {
- this.hidden = hidden;
- }
-
-
-
- private String named;
-
- @XmlElement(required = false)
- public String getNamed() {
- return named;
- }
-
- public void setNamed(String named) {
- this.named = named;
- }
-
-
-
- private Boolean namedEscaped;
-
- @XmlAttribute(required = false)
- public Boolean getNamedEscaped() {
- return namedEscaped;
- }
-
- public void setNamedEscaped(Boolean namedEscaped) {
- this.namedEscaped = namedEscaped;
- }
-
-
-
- private org.apache.isis.applib.annotation.ActionLayout.Position position;
-
- @XmlAttribute(required = false)
- public org.apache.isis.applib.annotation.ActionLayout.Position getPosition() {
- return position;
- }
-
- public void setPosition(org.apache.isis.applib.annotation.ActionLayout.Position position) {
- this.position = position;
- }
-
-
-
-
- private ActionOwner owner;
- /**
- * Owner.
- *
- * <p>
- * Set programmatically by framework after reading in from XML.
- * </p>
- */
- @XmlTransient
- public ActionOwner getOwner() {
- return owner;
- }
-
- public void setOwner(final ActionOwner owner) {
- this.owner = owner;
- }
-
-
- private String metadataError;
-
- /**
- * For diagnostics; populated by the framework if and only if a metadata error.
- */
- @XmlElement(required = false)
- public String getMetadataError() {
- return metadataError;
- }
-
- public void setMetadataError(final String metadataError) {
- this.metadataError = metadataError;
- }
-
-
-
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/10d80f3a/core/applib/src/main/java/org/apache/isis/applib/layout/v1_0/ActionOwner.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/layout/v1_0/ActionOwner.java b/core/applib/src/main/java/org/apache/isis/applib/layout/v1_0/ActionOwner.java
deleted file mode 100644
index 4dde062..0000000
--- a/core/applib/src/main/java/org/apache/isis/applib/layout/v1_0/ActionOwner.java
+++ /dev/null
@@ -1,25 +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.applib.layout.v1_0;
-
-import java.util.List;
-
-public interface ActionOwner extends Owner {
- List<ActionLayoutMetadata> getActions();
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/10d80f3a/core/applib/src/main/java/org/apache/isis/applib/layout/v1_0/CollectionLayoutMetadata.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/layout/v1_0/CollectionLayoutMetadata.java b/core/applib/src/main/java/org/apache/isis/applib/layout/v1_0/CollectionLayoutMetadata.java
deleted file mode 100644
index 0dee4b6..0000000
--- a/core/applib/src/main/java/org/apache/isis/applib/layout/v1_0/CollectionLayoutMetadata.java
+++ /dev/null
@@ -1,259 +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.applib.layout.v1_0;
-
-import java.io.Serializable;
-import java.util.List;
-
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementWrapper;
-import javax.xml.bind.annotation.XmlTransient;
-import javax.xml.bind.annotation.XmlType;
-
-import com.google.common.base.Function;
-
-import org.apache.isis.applib.annotation.Programmatic;
-import org.apache.isis.applib.annotation.Where;
-
-/**
- * Broadly corresponds to the {@link org.apache.isis.applib.annotation.CollectionLayout} annotation.
- *
- * <p>
- * Note that {@link org.apache.isis.applib.annotation.CollectionLayout#render()} is omitted because
- * {@link #defaultView} is its replacement.
- * </p>
- */
-@XmlType(
- propOrder = {
- "named"
- ,"describedAs"
- ,"sortedBy"
- , "actions"
- , "metadataError"
- }
-)
-public class CollectionLayoutMetadata implements MemberLayoutMetadata, ActionOwner, Serializable {
-
- private static final long serialVersionUID = 1L;
-
- public CollectionLayoutMetadata() {
- }
- public CollectionLayoutMetadata(final String id) {
- setId(id);
- }
-
-
- private String id;
-
- /**
- * Collection identifier, being the getter method without "get" prefix, first letter lower cased.
- */
- @XmlAttribute(required = true)
- public String getId() {
- return id;
- }
-
- public void setId(String id) {
- this.id = id;
- }
-
-
-
- private String cssClass;
-
- @XmlAttribute(required = false)
- public String getCssClass() {
- return cssClass;
- }
-
- public void setCssClass(String cssClass) {
- this.cssClass = cssClass;
- }
-
-
-
- private String describedAs;
-
- @XmlElement(required = false)
- public String getDescribedAs() {
- return describedAs;
- }
-
- public void setDescribedAs(String describedAs) {
- this.describedAs = describedAs;
- }
-
-
-
- private String defaultView;
-
- /**
- * Typically <code>table</code> or <code>hidden</code>, but could be any other named view that is configured and
- * appropriate, eg <code>gmap3</code> or <code>fullcalendar2</code>.
- */
- @XmlAttribute(required = false)
- public String getDefaultView() {
- return defaultView;
- }
-
- public void setDefaultView(String defaultView) {
- this.defaultView = defaultView;
- }
-
-
- private Where hidden;
-
- @XmlAttribute(required = false)
- public Where getHidden() {
- return hidden;
- }
-
- public void setHidden(Where hidden) {
- this.hidden = hidden;
- }
-
-
- private String named;
-
- @XmlElement(required = false)
- public String getNamed() {
- return named;
- }
-
- public void setNamed(String named) {
- this.named = named;
- }
-
-
- private Boolean namedEscaped;
-
- @XmlAttribute(required = false)
- public Boolean getNamedEscaped() {
- return namedEscaped;
- }
-
- public void setNamedEscaped(Boolean namedEscaped) {
- this.namedEscaped = namedEscaped;
- }
-
-
- private Integer paged;
-
- @XmlAttribute(required = false)
- public Integer getPaged() {
- return paged;
- }
-
- public void setPaged(Integer paged) {
- this.paged = paged;
- }
-
-
-
- private String sortedBy;
-
- @XmlElement(required = false)
- public String getSortedBy() {
- return sortedBy;
- }
-
- public void setSortedBy(String sortedBy) {
- this.sortedBy = sortedBy;
- }
-
-
-
- private List<ActionLayoutMetadata> actions;
-
- @XmlElementWrapper(name = "actions", required = false)
- @XmlElement(name = "action", required = false)
- public List<ActionLayoutMetadata> getActions() {
- return actions;
- }
-
- public void setActions(List<ActionLayoutMetadata> actionLayoutMetadatas) {
- this.actions = actionLayoutMetadatas;
- }
-
-
-
- private MemberLayoutMetadataOwner owner;
- /**
- * Owner.
- *
- * <p>
- * Set programmatically by framework after reading in from XML.
- * </p>
- */
- @XmlTransient
- public MemberLayoutMetadataOwner getOwner() {
- return owner;
- }
-
- public void setOwner(final MemberLayoutMetadataOwner owner) {
- this.owner = owner;
- }
-
-
- private String metadataError;
-
- /**
- * For diagnostics; populated by the framework if and only if a metadata error.
- */
- @XmlElement(required = false)
- public String getMetadataError() {
- return metadataError;
- }
-
- public void setMetadataError(final String metadataError) {
- this.metadataError = metadataError;
- }
-
-
-
-
- private String path;
-
- @Programmatic
- @XmlTransient
- public String getPath() {
- return path;
- }
-
- @Programmatic
- public void setPath(final String path) {
- this.path = path;
- }
-
-
-
- public static class Functions {
- private Functions(){}
-
- public static Function<CollectionLayoutMetadata, String> id() {
- return new Function<CollectionLayoutMetadata, String>() {
- @Override
- public String apply(final CollectionLayoutMetadata metadata) {
- return metadata.getId();
- }
- };
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/10d80f3a/core/applib/src/main/java/org/apache/isis/applib/layout/v1_0/ColumnOwner.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/layout/v1_0/ColumnOwner.java b/core/applib/src/main/java/org/apache/isis/applib/layout/v1_0/ColumnOwner.java
deleted file mode 100644
index 62f6007..0000000
--- a/core/applib/src/main/java/org/apache/isis/applib/layout/v1_0/ColumnOwner.java
+++ /dev/null
@@ -1,23 +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.applib.layout.v1_0;
-
-public interface ColumnOwner extends Owner {
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/10d80f3a/core/applib/src/main/java/org/apache/isis/applib/layout/v1_0/MemberLayoutMetadata.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/layout/v1_0/MemberLayoutMetadata.java b/core/applib/src/main/java/org/apache/isis/applib/layout/v1_0/MemberLayoutMetadata.java
deleted file mode 100644
index 9361a36..0000000
--- a/core/applib/src/main/java/org/apache/isis/applib/layout/v1_0/MemberLayoutMetadata.java
+++ /dev/null
@@ -1,24 +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.applib.layout.v1_0;
-
-public interface MemberLayoutMetadata extends Owned<MemberLayoutMetadataOwner> {
-
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/10d80f3a/core/applib/src/main/java/org/apache/isis/applib/layout/v1_0/MemberLayoutMetadataOwner.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/layout/v1_0/MemberLayoutMetadataOwner.java b/core/applib/src/main/java/org/apache/isis/applib/layout/v1_0/MemberLayoutMetadataOwner.java
deleted file mode 100644
index 5aa26c6..0000000
--- a/core/applib/src/main/java/org/apache/isis/applib/layout/v1_0/MemberLayoutMetadataOwner.java
+++ /dev/null
@@ -1,23 +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.applib.layout.v1_0;
-
-public interface MemberLayoutMetadataOwner extends Owner {
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/10d80f3a/core/applib/src/main/java/org/apache/isis/applib/layout/v1_0/Owned.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/layout/v1_0/Owned.java b/core/applib/src/main/java/org/apache/isis/applib/layout/v1_0/Owned.java
deleted file mode 100644
index a209293..0000000
--- a/core/applib/src/main/java/org/apache/isis/applib/layout/v1_0/Owned.java
+++ /dev/null
@@ -1,23 +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.applib.layout.v1_0;
-
-public interface Owned<T extends Owner> {
- T getOwner();
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/10d80f3a/core/applib/src/main/java/org/apache/isis/applib/layout/v1_0/Owner.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/layout/v1_0/Owner.java b/core/applib/src/main/java/org/apache/isis/applib/layout/v1_0/Owner.java
deleted file mode 100644
index 4a94642..0000000
--- a/core/applib/src/main/java/org/apache/isis/applib/layout/v1_0/Owner.java
+++ /dev/null
@@ -1,24 +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.applib.layout.v1_0;
-
-public interface Owner {
-
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/10d80f3a/core/applib/src/main/java/org/apache/isis/applib/layout/v1_0/PropertyGroupMetadata.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/layout/v1_0/PropertyGroupMetadata.java b/core/applib/src/main/java/org/apache/isis/applib/layout/v1_0/PropertyGroupMetadata.java
deleted file mode 100644
index c5acbc0..0000000
--- a/core/applib/src/main/java/org/apache/isis/applib/layout/v1_0/PropertyGroupMetadata.java
+++ /dev/null
@@ -1,145 +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.applib.layout.v1_0;
-
-import java.io.Serializable;
-import java.util.List;
-
-import javax.annotation.Nullable;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementWrapper;
-import javax.xml.bind.annotation.XmlTransient;
-import javax.xml.bind.annotation.XmlType;
-
-import com.google.common.base.Function;
-import com.google.common.collect.Lists;
-
-import org.apache.isis.applib.annotation.MemberOrder;
-import org.apache.isis.applib.annotation.Programmatic;
-
-@XmlType(
- propOrder = {
- "name"
- , "actions"
- , "properties"
- }
-)
-public class PropertyGroupMetadata implements MemberLayoutMetadata, ActionOwner, Serializable {
-
- private static final long serialVersionUID = 1L;
-
- public PropertyGroupMetadata() {
- }
-
- public PropertyGroupMetadata(final String name) {
- setName(name);
- }
-
- private String name;
-
- /**
- * Corresponds to the {@link MemberOrder#name()} (when applied to properties).
- */
- @XmlAttribute(required = true)
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
-
-
- private List<ActionLayoutMetadata> actions = Lists.newArrayList();
-
- @XmlElementWrapper(required = false)
- @XmlElement(name = "action", required = false)
- public List<ActionLayoutMetadata> getActions() {
- return actions;
- }
-
- public void setActions(List<ActionLayoutMetadata> actionLayoutMetadatas) {
- this.actions = actionLayoutMetadatas;
- }
-
-
-
- private List<PropertyLayoutMetadata> properties = Lists.newArrayList();
-
- @XmlElement(name = "property", required = true)
- public List<PropertyLayoutMetadata> getProperties() {
- return properties;
- }
-
- public void setProperties(List<PropertyLayoutMetadata> properties) {
- this.properties = properties;
- }
-
-
- private MemberLayoutMetadataOwner owner;
- /**
- * Owner.
- *
- * <p>
- * Set programmatically by framework after reading in from XML.
- * </p>
- */
- @XmlTransient
- public MemberLayoutMetadataOwner getOwner() {
- return owner;
- }
-
- public void setOwner(final MemberLayoutMetadataOwner owner) {
- this.owner = owner;
- }
-
-
-
-
- private String path;
-
- @Programmatic
- @XmlTransient
- public String getPath() {
- return path;
- }
-
- @Programmatic
- public void setPath(final String path) {
- this.path = path;
- }
-
-
-
-
- public static class Util {
- private Util(){}
- public static Function<? super PropertyGroupMetadata, String> nameOf() {
- return new Function<PropertyGroupMetadata, String>() {
- @Nullable @Override
- public String apply(@Nullable final PropertyGroupMetadata propertyGroupMetadata) {
- return propertyGroupMetadata.getName();
- }
- };
- }
- }
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/10d80f3a/core/applib/src/main/java/org/apache/isis/applib/layout/v1_0/PropertyLayoutMetadata.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/layout/v1_0/PropertyLayoutMetadata.java b/core/applib/src/main/java/org/apache/isis/applib/layout/v1_0/PropertyLayoutMetadata.java
deleted file mode 100644
index f6a7ec4..0000000
--- a/core/applib/src/main/java/org/apache/isis/applib/layout/v1_0/PropertyLayoutMetadata.java
+++ /dev/null
@@ -1,245 +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.applib.layout.v1_0;
-
-import java.io.Serializable;
-import java.util.List;
-
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementWrapper;
-import javax.xml.bind.annotation.XmlTransient;
-import javax.xml.bind.annotation.XmlType;
-
-import org.apache.isis.applib.annotation.LabelPosition;
-import org.apache.isis.applib.annotation.Programmatic;
-import org.apache.isis.applib.annotation.Where;
-
-/**
- * Broadly corresponds to the {@link org.apache.isis.applib.annotation.PropertyLayout} annotation.
- */
-@XmlType(
- name = "propertyLayout"
- , propOrder = {
- "named"
- , "describedAs"
- , "actions"
- , "metadataError"
- }
-)
-public class PropertyLayoutMetadata implements ActionOwner, Serializable, Owned<PropertyGroupMetadata> {
-
- private static final long serialVersionUID = 1L;
-
- public PropertyLayoutMetadata() {
- }
-
- public PropertyLayoutMetadata(final String id) {
- this.id = id;
- }
-
- private String id;
-
- /**
- * Property identifier, being the getter method without "get" or "is" prefix, first letter lower cased.
- */
- @XmlAttribute(required = true)
- public String getId() {
- return id;
- }
-
- public void setId(String id) {
- this.id = id;
- }
-
-
-
- private String cssClass;
-
- @XmlAttribute(required = false)
- public String getCssClass() {
- return cssClass;
- }
-
- public void setCssClass(String cssClass) {
- this.cssClass = cssClass;
- }
-
-
- private String describedAs;
-
- @XmlElement(required = false)
- public String getDescribedAs() {
- return describedAs;
- }
-
- public void setDescribedAs(String describedAs) {
- this.describedAs = describedAs;
- }
-
-
- private Where hidden;
-
- @XmlAttribute(required = false)
- public Where getHidden() {
- return hidden;
- }
-
- public void setHidden(Where hidden) {
- this.hidden = hidden;
- }
-
-
- private LabelPosition labelPosition;
-
- @XmlAttribute(required = false)
- public LabelPosition getLabelPosition() {
- return labelPosition;
- }
-
- public void setLabelPosition(LabelPosition labelPosition) {
- this.labelPosition = labelPosition;
- }
-
-
- private Integer multiLine;
-
- @XmlAttribute(required = false)
- public Integer getMultiLine() {
- return multiLine;
- }
-
- public void setMultiLine(Integer multiLine) {
- this.multiLine = multiLine;
- }
-
-
- private String named;
-
- @XmlElement(required = false)
- public String getNamed() {
- return named;
- }
-
- public void setNamed(String named) {
- this.named = named;
- }
-
-
- private Boolean namedEscaped;
-
- @XmlAttribute(required = false)
- public Boolean getNamedEscaped() {
- return namedEscaped;
- }
-
- public void setNamedEscaped(Boolean namedEscaped) {
- this.namedEscaped = namedEscaped;
- }
-
-
- private Boolean renderedAsDayBefore;
-
- @XmlAttribute(required = false)
- public Boolean getRenderedAsDayBefore() {
- return renderedAsDayBefore;
- }
-
- public void setRenderedAsDayBefore(Boolean renderedAsDayBefore) {
- this.renderedAsDayBefore = renderedAsDayBefore;
- }
-
-
- private Integer typicalLength;
-
- @XmlAttribute(required = false)
- public Integer getTypicalLength() {
- return typicalLength;
- }
-
- public void setTypicalLength(Integer typicalLength) {
- this.typicalLength = typicalLength;
- }
-
-
-
- private List<ActionLayoutMetadata> actions;
-
- @XmlElementWrapper(required = false)
- @XmlElement(name = "action", required = false)
- public List<ActionLayoutMetadata> getActions() {
- return actions;
- }
-
- public void setActions(List<ActionLayoutMetadata> actionLayoutMetadatas) {
- this.actions = actionLayoutMetadatas;
- }
-
-
- private PropertyGroupMetadata owner;
- /**
- * Owner.
- *
- * <p>
- * Set programmatically by framework after reading in from XML.
- * </p>
- */
- @XmlTransient
- public PropertyGroupMetadata getOwner() {
- return owner;
- }
-
- public void setOwner(final PropertyGroupMetadata owner) {
- this.owner = owner;
- }
-
-
-
- private String metadataError;
-
- /**
- * For diagnostics; populated by the framework if and only if a metadata error.
- */
- @XmlElement(required = false)
- public String getMetadataError() {
- return metadataError;
- }
-
- public void setMetadataError(final String metadataError) {
- this.metadataError = metadataError;
- }
-
-
-
-
- private String path;
-
- @Programmatic
- @XmlTransient
- public String getPath() {
- return path;
- }
-
- @Programmatic
- public void setPath(final String path) {
- this.path = path;
- }
-
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/10d80f3a/core/applib/src/main/java/org/apache/isis/applib/layout/v1_0/package-info.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/layout/v1_0/package-info.java b/core/applib/src/main/java/org/apache/isis/applib/layout/v1_0/package-info.java
deleted file mode 100644
index f187ff2..0000000
--- a/core/applib/src/main/java/org/apache/isis/applib/layout/v1_0/package-info.java
+++ /dev/null
@@ -1,25 +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.
- */
-@javax.xml.bind.annotation.XmlSchema(
- namespace = "http://isis.apache.org/schema/applib/layout",
- elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED
- // specifying the location seems to cause JaxbService#toXsd() to not generate the schema; not sure why...
- //, location = "http://isis.apache.org/schema/metamodel/layout/layout-1.0.xsd"
-)
-package org.apache.isis.applib.layout.v1_0;
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis/blob/10d80f3a/core/applib/src/main/java/org/apache/isis/applib/services/layout/ObjectLayoutMetadataService.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/layout/ObjectLayoutMetadataService.java b/core/applib/src/main/java/org/apache/isis/applib/services/layout/ObjectLayoutMetadataService.java
index c4ad854..99f1a9d 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/layout/ObjectLayoutMetadataService.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/layout/ObjectLayoutMetadataService.java
@@ -17,7 +17,7 @@
package org.apache.isis.applib.services.layout;
import org.apache.isis.applib.annotation.Programmatic;
-import org.apache.isis.applib.layout.fixedcols.ObjectLayoutMetadata;
+import org.apache.isis.applib.layout.fixedcols.FCPage;
public interface ObjectLayoutMetadataService {
@@ -30,20 +30,17 @@ public interface ObjectLayoutMetadataService {
/**
* Returns raw (unnormalized) metadata, eg per the <code>.layout.xml</code> file.
*/
- @Programmatic
- ObjectLayoutMetadata fromXml(Class<?> domainClass);
+ @Programmatic FCPage fromXml(Class<?> domainClass);
/**
* Obtains the layout metadata, if any, for the (domain class of the) specified domain object.
*/
- @Programmatic
- ObjectLayoutMetadata toMetadata(Object domainObject);
+ @Programmatic FCPage toMetadata(Object domainObject);
/**
* Obtains the layout metadata, if any, for the specified domain class.
*/
- @Programmatic
- ObjectLayoutMetadata toMetadata(Class<?> domainClass);
+ @Programmatic FCPage toMetadata(Class<?> domainClass);
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis/blob/10d80f3a/core/applib/src/main/java/org/apache/isis/applib/services/layout/Object_downloadLayoutXml.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/layout/Object_downloadLayoutXml.java b/core/applib/src/main/java/org/apache/isis/applib/services/layout/Object_downloadLayoutXml.java
index 089461d..4532705 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/layout/Object_downloadLayoutXml.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/layout/Object_downloadLayoutXml.java
@@ -28,7 +28,7 @@ import org.apache.isis.applib.annotation.Mixin;
import org.apache.isis.applib.annotation.ParameterLayout;
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.value.Clob;
@@ -58,7 +58,7 @@ public class Object_downloadLayoutXml {
public Object $$(
@ParameterLayout(named = "File name")
final String fileName) {
- final ObjectLayoutMetadata metadata = getObjectLayoutMetadata();
+ final FCPage metadata = getObjectLayoutMetadata();
final String xml = jaxbService.toXml(metadata,
ImmutableMap.<String,Object>of(
Marshaller.JAXB_SCHEMA_LOCATION,
@@ -75,7 +75,7 @@ public class Object_downloadLayoutXml {
return Util.withSuffix(object.getClass().getSimpleName(), "layout.xml");
}
- protected ObjectLayoutMetadata getObjectLayoutMetadata() {
+ protected FCPage getObjectLayoutMetadata() {
return objectLayoutMetadataService.toMetadata(object);
}
http://git-wip-us.apache.org/repos/asf/isis/blob/10d80f3a/core/applib/src/main/java/org/apache/isis/applib/services/layout/Object_viewLayout.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/layout/Object_viewLayout.java b/core/applib/src/main/java/org/apache/isis/applib/services/layout/Object_viewLayout.java
index 4ba2145..ae7d907 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/layout/Object_viewLayout.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/layout/Object_viewLayout.java
@@ -25,7 +25,7 @@ import org.apache.isis.applib.annotation.Mixin;
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;
@Mixin
public class Object_viewLayout {
@@ -50,7 +50,7 @@ public class Object_viewLayout {
cssClassFa = "fa-th"
)
@MemberOrder(sequence = "550.2")
- public ObjectLayoutMetadata $$() {
+ public FCPage $$() {
return getObjectLayoutMetadata();
}
@@ -59,7 +59,7 @@ public class Object_viewLayout {
return getObjectLayoutMetadata() == null;
}
- protected ObjectLayoutMetadata getObjectLayoutMetadata() {
+ protected FCPage getObjectLayoutMetadata() {
return objectLayoutMetadataService.toMetadata(object);
}
http://git-wip-us.apache.org/repos/asf/isis/blob/10d80f3a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/ActionPositionFacetForActionXml.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/ActionPositionFacetForActionXml.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/ActionPositionFacetForActionXml.java
index d2ea8ea..daf84d1 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/ActionPositionFacetForActionXml.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/ActionPositionFacetForActionXml.java
@@ -19,14 +19,14 @@
package org.apache.isis.core.metamodel.facets.actions.layout;
-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.actions.position.ActionPositionFacet;
import org.apache.isis.core.metamodel.facets.actions.position.ActionPositionFacetAbstract;
public class ActionPositionFacetForActionXml extends ActionPositionFacetAbstract {
- public static ActionPositionFacet create(ActionLayoutMetadata actionLayout, FacetHolder holder) {
+ public static ActionPositionFacet 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/BookmarkPolicyFacetForActionXml.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/BookmarkPolicyFacetForActionXml.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/BookmarkPolicyFacetForActionXml.java
index 8ba315b..6cee700 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/BookmarkPolicyFacetForActionXml.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/BookmarkPolicyFacetForActionXml.java
@@ -20,14 +20,14 @@
package org.apache.isis.core.metamodel.facets.actions.layout;
import org.apache.isis.applib.annotation.BookmarkPolicy;
-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.object.bookmarkpolicy.BookmarkPolicyFacet;
import org.apache.isis.core.metamodel.facets.object.bookmarkpolicy.BookmarkPolicyFacetAbstract;
public class BookmarkPolicyFacetForActionXml extends BookmarkPolicyFacetAbstract {
- public static BookmarkPolicyFacet create(final ActionLayoutMetadata actionLayout, final FacetHolder holder) {
+ public static BookmarkPolicyFacet 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/CssClassFaFacetForActionXml.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/CssClassFaFacetForActionXml.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/CssClassFaFacetForActionXml.java
index b413266..95a62a2 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/CssClassFaFacetForActionXml.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/CssClassFaFacetForActionXml.java
@@ -21,7 +21,7 @@ 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.members.cssclassfa.CssClassFaFacet;
import org.apache.isis.core.metamodel.facets.members.cssclassfa.CssClassFaFacetAbstract;
@@ -29,7 +29,7 @@ import org.apache.isis.core.metamodel.facets.members.cssclassfa.CssClassFaPositi
public class CssClassFaFacetForActionXml extends CssClassFaFacetAbstract {
- public static CssClassFaFacet create(final ActionLayoutMetadata actionLayout, final FacetHolder holder) {
+ public static CssClassFaFacet 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/CssClassFacetForActionXml.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/CssClassFacetForActionXml.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/CssClassFacetForActionXml.java
index d50323f..f845680 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/CssClassFacetForActionXml.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/CssClassFacetForActionXml.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.members.cssclass.CssClassFacet;
import org.apache.isis.core.metamodel.facets.members.cssclass.CssClassFacetAbstract;
public class CssClassFacetForActionXml extends CssClassFacetAbstract {
- public static CssClassFacet create(ActionLayoutMetadata actionLayout, FacetHolder holder) {
+ public static CssClassFacet create(ActionLayoutData actionLayout, FacetHolder holder) {
if(actionLayout == null) {
return null;
}