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 2021/05/14 08:27:25 UTC
[isis-app-helloworld] branch jdo-SNAPSHOT updated: rationalizing
with latest snapshot and jpa-SNAPSHOT
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch jdo-SNAPSHOT
in repository https://gitbox.apache.org/repos/asf/isis-app-helloworld.git
The following commit(s) were added to refs/heads/jdo-SNAPSHOT by this push:
new 7bb635f rationalizing with latest snapshot and jpa-SNAPSHOT
7bb635f is described below
commit 7bb635f32cf4742be907ea7cc1f061dd3caf0db6
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri May 14 09:27:14 2021 +0100
rationalizing with latest snapshot and jpa-SNAPSHOT
---
.../domainapp/modules/hello/dom/hwo/HelloWorldObject.java | 14 ++++++++++++--
.../modules/hello/dom/hwo/HelloWorldObject.layout.xml | 4 ++--
2 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/src/main/java/domainapp/modules/hello/dom/hwo/HelloWorldObject.java b/src/main/java/domainapp/modules/hello/dom/hwo/HelloWorldObject.java
index 194f189..0f628a9 100644
--- a/src/main/java/domainapp/modules/hello/dom/hwo/HelloWorldObject.java
+++ b/src/main/java/domainapp/modules/hello/dom/hwo/HelloWorldObject.java
@@ -48,7 +48,9 @@ public class HelloWorldObject implements Comparable<HelloWorldObject> {
return "Object: " + getName();
}
+
private String name;
+
@Name
@PropertyLayout(fieldSetId = "identity", sequence = "1")
public String getName() {
@@ -58,7 +60,9 @@ public class HelloWorldObject implements Comparable<HelloWorldObject> {
this.name = name;
}
+
private String notes;
+
@Notes
@PropertyLayout(fieldSetId = "details", sequence = "1", multiLine = 10, hidden = Where.ALL_TABLES)
public String getNotes() {
@@ -87,8 +91,14 @@ public class HelloWorldObject implements Comparable<HelloWorldObject> {
}
- @Action(semantics = SemanticsOf.NON_IDEMPOTENT_ARE_YOU_SURE, associateWith = "name")
- @ActionLayout(position = ActionLayout.Position.PANEL, describedAs = "Deletes this object from the persistent datastore")
+ @Action(
+ semantics = SemanticsOf.NON_IDEMPOTENT_ARE_YOU_SURE
+ )
+ @ActionLayout(
+ associateWith = "name",
+ describedAs = "Deletes this object from the persistent datastore",
+ position = ActionLayout.Position.PANEL
+ )
public void delete() {
final String title = titleService.titleOf(this);
messageService.informUser(String.format("'%s' deleted", title));
diff --git a/src/main/java/domainapp/modules/hello/dom/hwo/HelloWorldObject.layout.xml b/src/main/java/domainapp/modules/hello/dom/hwo/HelloWorldObject.layout.xml
index 6d270b3..dd54afa 100644
--- a/src/main/java/domainapp/modules/hello/dom/hwo/HelloWorldObject.layout.xml
+++ b/src/main/java/domainapp/modules/hello/dom/hwo/HelloWorldObject.layout.xml
@@ -14,14 +14,14 @@
<bs3:tab name="Identity">
<bs3:row>
<bs3:col span="12">
- <c:fieldSet id="identity"/>
+ <c:fieldSet name="Identity" id="identity"/>
</bs3:col>
</bs3:row>
</bs3:tab>
<bs3:tab name="Other">
<bs3:row>
<bs3:col span="12">
- <c:fieldSet id="other" unreferencedProperties="true"/>
+ <c:fieldSet name="Other" id="other" unreferencedProperties="true"/>
</bs3:col>
</bs3:row>
</bs3:tab>