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/04/13 22:54:27 UTC
[isis-app-helloworld] branch jdo-SNAPSHOT updated (7cd93a3 ->
f6ecfa9)
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a change to branch jdo-SNAPSHOT
in repository https://gitbox.apache.org/repos/asf/isis-app-helloworld.git.
from 7cd93a3 updates parent pom to 2.0.0-M5.20210413-1443-108a3a48
add bbe4ecf simplifying layouts
new f6ecfa9 Merge branch 'jdo' into jdo-SNAPSHOT
The 1 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:
.../modules/hello/dom/hwo/HelloWorldObject.java | 11 ++--
.../hello/dom/hwo/HelloWorldObject.layout.xml | 17 +----
src/main/resources/menubars.layout.xml | 72 +++++-----------------
3 files changed, 27 insertions(+), 73 deletions(-)
[isis-app-helloworld] 01/01: Merge branch 'jdo' into jdo-SNAPSHOT
Posted by da...@apache.org.
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
commit f6ecfa924df6ce84e36e1e164daf87d000d9104d
Merge: 7cd93a3 bbe4ecf
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Tue Apr 13 23:32:59 2021 +0100
Merge branch 'jdo' into jdo-SNAPSHOT
.../modules/hello/dom/hwo/HelloWorldObject.java | 11 ++--
.../hello/dom/hwo/HelloWorldObject.layout.xml | 17 +----
src/main/resources/menubars.layout.xml | 72 +++++-----------------
3 files changed, 27 insertions(+), 73 deletions(-)
diff --cc src/main/java/domainapp/modules/hello/dom/hwo/HelloWorldObject.java
index 6f43512,3c9127f..bcd6498
--- a/src/main/java/domainapp/modules/hello/dom/hwo/HelloWorldObject.java
+++ b/src/main/java/domainapp/modules/hello/dom/hwo/HelloWorldObject.java
@@@ -47,9 -49,9 +48,9 @@@ public class HelloWorldObject implement
return "Object: " + getName();
}
- @Name
- @MemberOrder(name = "identity", sequence = "1")
+ private String name;
+ @Name
+ @PropertyLayout(fieldSetId = "identity", sequence = "1")
- private String name;
public String getName() {
return name;
}
@@@ -57,9 -59,10 +58,9 @@@
this.name = name;
}
-- @Notes
- @PropertyLayout(fieldSetId = "details", sequence = "1")
- @MemberOrder(name = "details", sequence = "1")
private String notes;
- @PropertyLayout(multiLine = 10, hidden = Where.ALL_TABLES)
++ @Notes
++ @PropertyLayout(fieldSetId = "details", sequence = "1", multiLine = 10, hidden = Where.ALL_TABLES)
public String getNotes() {
return notes;
}
diff --cc src/main/java/domainapp/modules/hello/dom/hwo/HelloWorldObject.layout.xml
index abe9b03,ec42d19..6d270b3
--- 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,23 -14,14 +14,14 @@@
<bs3:tab name="Identity">
<bs3:row>
<bs3:col span="12">
- <c:fieldSet name="Identity" id="identity">
- <c:action id="delete">
- <c:describedAs>Deletes this object from the persistent datastore</c:describedAs>
- </c:action>
- <c:property id="name" namedEscaped="true">
- <c:action id="updateName">
- <c:describedAs>Updates the object's name</c:describedAs>
- </c:action>
- </c:property>
- </c:fieldSet>
- <c:fieldSet name="Identity"/>
++ <c:fieldSet id="identity"/>
</bs3:col>
</bs3:row>
</bs3:tab>
<bs3:tab name="Other">
<bs3:row>
<bs3:col span="12">
- <c:fieldSet name="Other" id="other" unreferencedProperties="true"/>
- <c:fieldSet name="Other" unreferencedProperties="true"/>
++ <c:fieldSet id="other" unreferencedProperties="true"/>
</bs3:col>
</bs3:row>
</bs3:tab>