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 2020/01/23 12:04:00 UTC
[isis] 08/08: ISIS-2062: sync adoc
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 8515c9b2e688d20ee30315fbb1b884da00d6e9ee
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Thu Jan 23 11:29:23 2020 +0000
ISIS-2062: sync adoc
---
.../layout/component/ActionLayoutDataOwner.java | 4 +--
.../layout/component/CollectionLayoutData.java | 21 +++++++--------
.../examples/layout/component/FieldSet.java | 31 ++++++++++------------
.../layout/component/PropertyLayoutData.java | 14 ++++------
.../examples/layout/grid/bootstrap3/BS3Col.java | 15 +++++------
5 files changed, 36 insertions(+), 49 deletions(-)
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/layout/component/ActionLayoutDataOwner.java b/api/applib/src/main/adoc/modules/applib-cm/examples/layout/component/ActionLayoutDataOwner.java
index c4153d0..c4b07bb 100644
--- a/api/applib/src/main/adoc/modules/applib-cm/examples/layout/component/ActionLayoutDataOwner.java
+++ b/api/applib/src/main/adoc/modules/applib-cm/examples/layout/component/ActionLayoutDataOwner.java
@@ -21,8 +21,6 @@ package org.apache.isis.applib.layout.component;
import java.util.List;
public interface ActionLayoutDataOwner extends Owner {
-
List<ActionLayoutData> getActions();
- void addAction(ActionLayoutData actionLayoutData);
-
+ void setActions(List<ActionLayoutData> actions);
}
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/layout/component/CollectionLayoutData.java b/api/applib/src/main/adoc/modules/applib-cm/examples/layout/component/CollectionLayoutData.java
index 6991c75..46d4bb2 100644
--- a/api/applib/src/main/adoc/modules/applib-cm/examples/layout/component/CollectionLayoutData.java
+++ b/api/applib/src/main/adoc/modules/applib-cm/examples/layout/component/CollectionLayoutData.java
@@ -19,18 +19,17 @@
package org.apache.isis.applib.layout.component;
import java.io.Serializable;
+import java.util.ArrayList;
import java.util.List;
import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementRef;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
import org.apache.isis.applib.annotation.Where;
import org.apache.isis.applib.layout.links.Link;
-import org.apache.isis.core.commons.internal.concurrent._ConcurrentListWrapper;
/**
* Describes the layout of a single collection, broadly corresponds to the {@link org.apache.isis.applib.annotation.CollectionLayout} annotation.
@@ -197,24 +196,24 @@ HasCssClass, HasDescribedAs, HasHidden, HasNamed {
this.sortedBy = sortedBy;
}
- private _ConcurrentListWrapper<ActionLayoutData> actions = new _ConcurrentListWrapper<>();
+
+
+ private List<ActionLayoutData> actions = new ArrayList<>();
// no wrapper
@Override
- @XmlElementRef(type = ActionLayoutData.class, name = "action", required = false)
+ @XmlElement(name = "action", required = false)
public List<ActionLayoutData> getActions() {
- return actions.snapshot();
+ return actions;
}
- public void setActions(List<ActionLayoutData> actionLayoutDatas) {
- this.actions.replace(actionLayoutDatas);
- }
-
@Override
- public void addAction(ActionLayoutData actionLayoutData) {
- this.actions.add(actionLayoutData);
+ public void setActions(List<ActionLayoutData> actionLayoutDatas) {
+ this.actions = actionLayoutDatas;
}
+
+
private CollectionLayoutDataOwner owner;
/**
* Owner.
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/layout/component/FieldSet.java b/api/applib/src/main/adoc/modules/applib-cm/examples/layout/component/FieldSet.java
index c5e071b..335d65a 100644
--- a/api/applib/src/main/adoc/modules/applib-cm/examples/layout/component/FieldSet.java
+++ b/api/applib/src/main/adoc/modules/applib-cm/examples/layout/component/FieldSet.java
@@ -19,6 +19,7 @@
package org.apache.isis.applib.layout.component;
import java.io.Serializable;
+import java.util.ArrayList;
import java.util.List;
import javax.xml.bind.annotation.XmlAttribute;
@@ -29,7 +30,6 @@ import javax.xml.bind.annotation.XmlType;
import org.apache.isis.applib.annotation.MemberOrder;
import org.apache.isis.applib.layout.grid.bootstrap3.BS3Col;
-import org.apache.isis.core.commons.internal.concurrent._ConcurrentListWrapper;
/**
* A {@link MemberRegion region} of the page containing a set of
@@ -133,40 +133,37 @@ Serializable {
this.name = name;
}
- private _ConcurrentListWrapper<ActionLayoutData> actions = new _ConcurrentListWrapper<>();
+
+
+ private List<ActionLayoutData> actions = new ArrayList<>();
// no wrapper
@Override
@XmlElement(name = "action", required = false)
public List<ActionLayoutData> getActions() {
- return actions.snapshot();
+ return actions;
}
- public void setActions(List<ActionLayoutData> actionLayoutDatas) {
- this.actions.replace(actionLayoutDatas);
- }
-
@Override
- public void addAction(ActionLayoutData actionLayoutData) {
- this.actions.add(actionLayoutData);
+ public void setActions(List<ActionLayoutData> actionLayoutDatas) {
+ this.actions = actionLayoutDatas;
}
-
- private _ConcurrentListWrapper<PropertyLayoutData> properties = new _ConcurrentListWrapper<>();
+
+
+
+ private List<PropertyLayoutData> properties = new ArrayList<>();
// no wrapper; required=false because may be auto-generated
@XmlElement(name = "property", required = false)
public List<PropertyLayoutData> getProperties() {
- return properties.snapshot();
+ return properties;
}
public void setProperties(List<PropertyLayoutData> properties) {
- this.properties.replace(properties);
- }
-
- public void addProperty(PropertyLayoutData actionLayoutData) {
- this.properties.add(actionLayoutData);
+ this.properties = properties;
}
+
private FieldSetOwner owner;
/**
* Owner.
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/layout/component/PropertyLayoutData.java b/api/applib/src/main/adoc/modules/applib-cm/examples/layout/component/PropertyLayoutData.java
index a782ff4..817a6aa 100644
--- a/api/applib/src/main/adoc/modules/applib-cm/examples/layout/component/PropertyLayoutData.java
+++ b/api/applib/src/main/adoc/modules/applib-cm/examples/layout/component/PropertyLayoutData.java
@@ -19,6 +19,7 @@
package org.apache.isis.applib.layout.component;
import java.io.Serializable;
+import java.util.ArrayList;
import java.util.List;
import javax.xml.bind.annotation.XmlAttribute;
@@ -33,7 +34,6 @@ import org.apache.isis.applib.annotation.RenderDay;
import org.apache.isis.applib.annotation.Repainting;
import org.apache.isis.applib.annotation.Where;
import org.apache.isis.applib.layout.links.Link;
-import org.apache.isis.core.commons.internal.concurrent._ConcurrentListWrapper;
/**
* Describes the layout of a single property, broadly corresponds to the {@link org.apache.isis.applib.annotation.PropertyLayout} annotation.
@@ -234,22 +234,18 @@ HasCssClass, HasDescribedAs, HasHidden, HasNamed {
this.repainting = repainting;
}
- private _ConcurrentListWrapper<ActionLayoutData> actions = new _ConcurrentListWrapper<>();
+ private List<ActionLayoutData> actions = new ArrayList<>();
// no wrapper
@Override
@XmlElement(name = "action", required = false)
public List<ActionLayoutData> getActions() {
- return actions.snapshot();
+ return actions;
}
- public void setActions(List<ActionLayoutData> actionLayoutDatas) {
- this.actions.replace(actionLayoutDatas);
- }
-
@Override
- public void addAction(ActionLayoutData actionLayoutData) {
- this.actions.add(actionLayoutData);
+ public void setActions(List<ActionLayoutData> actionLayoutDatas) {
+ this.actions = actionLayoutDatas;
}
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3Col.java b/api/applib/src/main/adoc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3Col.java
index 439b9b1..7f44432 100644
--- a/api/applib/src/main/adoc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3Col.java
+++ b/api/applib/src/main/adoc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3Col.java
@@ -35,7 +35,6 @@ import org.apache.isis.applib.layout.component.DomainObjectLayoutData;
import org.apache.isis.applib.layout.component.DomainObjectLayoutDataOwner;
import org.apache.isis.applib.layout.component.FieldSet;
import org.apache.isis.applib.layout.component.FieldSetOwner;
-import org.apache.isis.core.commons.internal.concurrent._ConcurrentListWrapper;
/**
* A column within a row which, depending on its {@link #getSpan()}, could be as narrow as 1/12th of the page's width, all the way up to spanning the entire page.
@@ -172,25 +171,23 @@ CollectionLayoutDataOwner, DomainObjectLayoutDataOwner {
}
- private _ConcurrentListWrapper<ActionLayoutData> actions = new _ConcurrentListWrapper<>();
+
+ private List<ActionLayoutData> actions = new ArrayList<>();
// no wrapper
@Override
@XmlElementRef(type = ActionLayoutData.class, name = "action", required = false)
public List<ActionLayoutData> getActions() {
- return actions.snapshot();
+ return actions;
}
- public void setActions(List<ActionLayoutData> actionLayoutDatas) {
- this.actions.replace(actionLayoutDatas);
- }
-
@Override
- public void addAction(ActionLayoutData actionLayoutData) {
- this.actions.add(actionLayoutData);
+ public void setActions(final List<ActionLayoutData> actions) {
+ this.actions = actions;
}
+
private List<BS3Row> rows = new ArrayList<>();
// no wrapper