You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@causeway.apache.org by da...@apache.org on 2023/05/26 06:04:21 UTC
[causeway] branch master updated (f6da8aa818 -> a7983b85b3)
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/causeway.git
from f6da8aa818 CAUSEWAY-3444: fixes potential NPE as reported by sonarcloud
new 51d38eead0 CAUSEWAY-2485: removes CAUSEWAY-3427 as a claimed issue
new 7a77bce857 CAUSEWAY-2485: no longer calls out CAUSEWAY-3437 as a claimed issue, in the demo app
new a7983b85b3 CAUSEWAY-2485: improves demo for action layout describedAs
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../cssClass/ActionLayoutCssClassPage-description.adoc | 9 +++++++--
.../ActionLayoutDescribedAsPage-description.adoc | 15 ++++++++++++++-
.../describedAs/ActionLayoutDescribedAsPage.java | 8 ++------
.../describedAs/ActionLayoutDescribedAsPage.layout.xml | 7 ++++++-
.../optionality/PropertyOptionalityPage-description.adoc | 4 +++-
5 files changed, 32 insertions(+), 11 deletions(-)
[causeway] 02/03: CAUSEWAY-2485: no longer calls out CAUSEWAY-3437 as a claimed issue, in the demo app
Posted by da...@apache.org.
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/causeway.git
commit 7a77bce8578735305bfbbcaaf3921320de1bb65d
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri May 26 06:54:58 2023 +0100
CAUSEWAY-2485: no longer calls out CAUSEWAY-3437 as a claimed issue, in the demo app
---
.../Property/optionality/PropertyOptionalityPage-description.adoc | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/optionality/PropertyOptionalityPage-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/optionality/PropertyOptionalityPage-description.adoc
index 647249123b..769774360f 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/optionality/PropertyOptionalityPage-description.adoc
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/optionality/PropertyOptionalityPage-description.adoc
@@ -87,7 +87,9 @@ In addition to specifying optionality at the framework level, it's also importan
If using JPA or JDO entities, the framework will infer the optionality semantics automatically.
-WARNING: link:https://issues.apache.org/jira/browse/CAUSEWAY-3437[CAUSEWAY-3437] is to extend the framework to infer optionality from these JPA/JDO/JAXB equivalents.
+// Once link:https://issues.apache.org/jira/browse/CAUSEWAY-3437[CAUSEWAY-3437] is implemented, update the paragraph above to say:
+//
+// The framework will infer the optionality semantics automatically from each of these, meaning that `@Property#optionality` can be omitted.
Be aware that JPA, JDO and JAXB all assume a property is not required by default, whereas Apache Causeway assumes that properties are required by default.
[causeway] 01/03: CAUSEWAY-2485: removes CAUSEWAY-3427 as a claimed issue
Posted by da...@apache.org.
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/causeway.git
commit 51d38eead052abc20e9f54ca4ac87163b4ef229c
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri May 26 06:49:43 2023 +0100
CAUSEWAY-2485: removes CAUSEWAY-3427 as a claimed issue
---
.../cssClass/ActionLayoutCssClassPage-description.adoc | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/cssClass/ActionLayoutCssClassPage-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/cssClass/ActionLayoutCssClassPage-description.adoc
index d606462f51..dfdb966e1c 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/cssClass/ActionLayoutCssClassPage-description.adoc
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/cssClass/ActionLayoutCssClassPage-description.adoc
@@ -57,12 +57,17 @@ include::ActionLayoutCssClassPage.java[tags=panel-btn-primary]
include::ActionLayoutCssClassPage.java[tags=panel-btn-secondary]
----
<.> appends the `btn-warning` CSS class to the action's button, in effect rendering it with _Bootstrap_ `Warning` style
-<.> specifies the order in which associated actions in the same position are rendered
=== Positioned on the drop-down of the panel that contains the property:
-WARNING: although the CSS class is applied, the Bootstrap styling does not apply; see link:https://issues.apache.org/jira/browse/CAUSEWAY-3427[CAUSEWAY-3427].
+[NOTE]
+====
+For this position, although the CSS class is applied, the Bootstrap styling does not apply.
+This is arguably an issue with the bootstrap theme.
+
+Use the `application.css` file to apply appropriate styling if you require it.
+====
Two actions:
[causeway] 03/03: CAUSEWAY-2485: improves demo for action layout describedAs
Posted by da...@apache.org.
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/causeway.git
commit a7983b85b3731302332ac12dc5a303d0e0dd996c
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri May 26 07:03:43 2023 +0100
CAUSEWAY-2485: improves demo for action layout describedAs
---
.../ActionLayoutDescribedAsPage-description.adoc | 15 ++++++++++++++-
.../describedAs/ActionLayoutDescribedAsPage.java | 8 ++------
.../describedAs/ActionLayoutDescribedAsPage.layout.xml | 7 ++++++-
3 files changed, 22 insertions(+), 8 deletions(-)
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/describedAs/ActionLayoutDescribedAsPage-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/describedAs/ActionLayoutDescribedAsPage-description.adoc
index 03aebc5e65..7358830bc7 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/describedAs/ActionLayoutDescribedAsPage-description.adoc
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/describedAs/ActionLayoutDescribedAsPage-description.adoc
@@ -35,7 +35,7 @@ include::ActionLayoutDescribedAsPage.java[tags=panel-dropdown]
----
<.> in effect adds a tooltip to this action's button, that shows on _mouse over_
-* actions associated with the `children` collection:
+* action associated with the `children` collection:
+
[source,java,indent=0]
----
@@ -65,3 +65,16 @@ Instead of using `@ActionLayout#describedAs`, it is also possible to specify a t
One advantage of using the `.layout.xml` file is that changes can be picked up without having to restart the application.
On the other hand, including descriptions can make that file rather large.
+
+The `removeChild` action is implemented this way:
+
+[source,xml]
+.layout.xml
+----
+<cpt:collection id="children">
+ <cpt:action id="addChild"/>
+ <cpt:action id="removeChild">
+ <cpt:describedAs>Removes a child from the collection</cpt:describedAs>
+ </cpt:action>
+</cpt:collection>
+----
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/describedAs/ActionLayoutDescribedAsPage.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/describedAs/ActionLayoutDescribedAsPage.java
index bc200b1b87..72458d92b9 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/describedAs/ActionLayoutDescribedAsPage.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/describedAs/ActionLayoutDescribedAsPage.java
@@ -131,13 +131,10 @@ public class ActionLayoutDescribedAsPage
getChildren().add(new ActionLayoutDescribedAsChildVm(newValue));
return this;
}
+//end::collection[]
@Action
- @ActionLayout(
- associateWith = "children",
- describedAs = "Removes a child from the collection", // <1>
- sequence = "2"
- )
+ // no @ActionLayout, instead uses .layout.xml
public Object removeChild(final ActionLayoutDescribedAsChildVm child) {
getChildren().removeIf(x -> x.getValue().equals(child.getValue()));
return this;
@@ -145,7 +142,6 @@ public class ActionLayoutDescribedAsPage
public List<ActionLayoutDescribedAsChildVm> choices0RemoveChild() {
return getChildren();
}
-//end::collection[]
//tag::delete[]
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/describedAs/ActionLayoutDescribedAsPage.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/describedAs/ActionLayoutDescribedAsPage.layout.xml
index c7b57f8994..7acb41a199 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/describedAs/ActionLayoutDescribedAsPage.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/describedAs/ActionLayoutDescribedAsPage.layout.xml
@@ -36,7 +36,12 @@
</bs3:row>
<bs3:row>
<bs3:col span="12">
- <cpt:collection id="children"/>
+ <cpt:collection id="children">
+ <cpt:action id="addChild"/>
+ <cpt:action id="removeChild">
+ <cpt:describedAs>Removes a child from the collection</cpt:describedAs>
+ </cpt:action>
+ </cpt:collection>
</bs3:col>
</bs3:row>
</bs3:col>