You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2021/01/22 10:23:21 UTC
[isis-app-simpleapp] branch ISIS-1628 updated: rebase on jdo,
add title() inheritance test
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch ISIS-1628
in repository https://gitbox.apache.org/repos/asf/isis-app-simpleapp.git
The following commit(s) were added to refs/heads/ISIS-1628 by this push:
new 60b948b rebase on jdo, add title() inheritance test
60b948b is described below
commit 60b948bcea40636b7505fc09202dd6e744df6406
Author: Andi Huber <ah...@apache.org>
AuthorDate: Fri Jan 22 11:23:07 2021 +0100
rebase on jdo, add title() inheritance test
---
.../main/java/domainapp/modules/simple/dom/so/HasName.java | 11 +++++++++++
.../java/domainapp/modules/simple/dom/so/SimpleObject.java | 9 +++++----
.../domainapp/modules/simple/dom/so/SimpleObject.layout.xml | 2 +-
.../modules/simple/mixins/SimpleObject_numberOfChildren.java | 11 +----------
4 files changed, 18 insertions(+), 15 deletions(-)
diff --git a/module-simple/src/main/java/domainapp/modules/simple/dom/so/HasName.java b/module-simple/src/main/java/domainapp/modules/simple/dom/so/HasName.java
new file mode 100644
index 0000000..31c7288
--- /dev/null
+++ b/module-simple/src/main/java/domainapp/modules/simple/dom/so/HasName.java
@@ -0,0 +1,11 @@
+package domainapp.modules.simple.dom.so;
+
+abstract class HasName {
+
+ public abstract String getName();
+
+ public String title() {
+ return "Name: " + getName();
+ }
+
+}
diff --git a/module-simple/src/main/java/domainapp/modules/simple/dom/so/SimpleObject.java b/module-simple/src/main/java/domainapp/modules/simple/dom/so/SimpleObject.java
index cc7f996..56e7435 100644
--- a/module-simple/src/main/java/domainapp/modules/simple/dom/so/SimpleObject.java
+++ b/module-simple/src/main/java/domainapp/modules/simple/dom/so/SimpleObject.java
@@ -40,7 +40,8 @@ import lombok.val;
@DomainObjectLayout()
@XmlJavaTypeAdapter(PersistentEntityAdapter.class)
@ToString(onlyExplicitlyIncluded = true)
-public class SimpleObject implements Comparable<SimpleObject> {
+public class SimpleObject extends HasName
+implements Comparable<SimpleObject> {
public static SimpleObject withName(String name) {
val simpleObject = new SimpleObject();
@@ -57,9 +58,9 @@ public class SimpleObject implements Comparable<SimpleObject> {
private SimpleObject() {
}
- public String title() {
- return "Object: " + getName();
- }
+// public String title() {
+// return "Object: " + getName();
+// }
@Name
@Getter @Setter @ToString.Include
diff --git a/module-simple/src/main/java/domainapp/modules/simple/dom/so/SimpleObject.layout.xml b/module-simple/src/main/java/domainapp/modules/simple/dom/so/SimpleObject.layout.xml
index 0bd636d..82c14b2 100644
--- a/module-simple/src/main/java/domainapp/modules/simple/dom/so/SimpleObject.layout.xml
+++ b/module-simple/src/main/java/domainapp/modules/simple/dom/so/SimpleObject.layout.xml
@@ -21,7 +21,7 @@
</c:property>
<c:property id="notes"/>
</c:fieldSet>
- <c:fieldSet name="Contributed by Collection_count Mixin" id="other" unreferencedProperties="true">
+ <c:fieldSet name="Contributed by Collection_count Mixin" id="mixin_and_other" unreferencedProperties="true">
<c:property id="numberOfChildren">
<c:named>Number Of Children</c:named>
</c:property>
diff --git a/module-simple/src/main/java/domainapp/modules/simple/mixins/SimpleObject_numberOfChildren.java b/module-simple/src/main/java/domainapp/modules/simple/mixins/SimpleObject_numberOfChildren.java
index c4d810a..7cb7102 100644
--- a/module-simple/src/main/java/domainapp/modules/simple/mixins/SimpleObject_numberOfChildren.java
+++ b/module-simple/src/main/java/domainapp/modules/simple/mixins/SimpleObject_numberOfChildren.java
@@ -17,14 +17,5 @@ public class SimpleObject_numberOfChildren extends Collection_count {
super(simpleObject.getChildren());
}
- /*
- * ISIS-1628: the prop() method of the abstract super class needs to
- * be overridden in the concrete sub class.
- *
- * To replicate the problem remove this method and see how the contribution disappears from the UI.
- */
- @Override
- public int prop() {
- return super.prop();
- }
+
}