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/07/04 16:30:31 UTC
[isis] 03/04: ISIS-2222: WIP adding other value types - now runs,
at least
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 e062f80fea93173279671c9c053da5feddecce83
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Sat Jul 4 13:34:45 2020 +0100
ISIS-2222: WIP adding other value types - now runs, at least
still need sample data and validate pages work.
---
examples/demo/domain/src/main/java/demoapp/dom/menubars.layout.xml | 6 +++++-
.../domain/src/main/java/demoapp/dom/types/isis/IsisTypesMenu.java | 4 ++--
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/menubars.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/menubars.layout.xml
index dda7b8c..c7e3832 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/menubars.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/menubars.layout.xml
@@ -39,6 +39,10 @@
<mb3:serviceAction objectType="demo.JavaLangTypesMenu" id="strings"/>
<mb3:serviceAction objectType="demo.JavaLangTypesMenu" id="voids"/>
</mb3:section>
+ </mb3:menu>
+
+ <mb3:menu>
+ <mb3:named>More Types</mb3:named>
<mb3:section>
<mb3:serviceAction objectType="demo.JavaUtilTypesMenu" id="javaUtilDates"/>
<mb3:serviceAction objectType="demo.JavaUtilTypesMenu" id="javaUtilUuids"/>
@@ -71,7 +75,7 @@
</mb3:menu>
<mb3:menu>
- <mb3:named>Data Types (old)</mb3:named>
+ <mb3:named>Data Types (to remove)</mb3:named>
<mb3:section>
<mb3:serviceAction objectType="demo.DataTypesMenu" id="text"/>
<mb3:serviceAction objectType="demo.DataTypesMenu" id="wrappers"/>
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/IsisTypesMenu.java b/examples/demo/domain/src/main/java/demoapp/dom/types/isis/IsisTypesMenu.java
index 6462917..a930264 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/IsisTypesMenu.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/isis/IsisTypesMenu.java
@@ -36,8 +36,8 @@ import demoapp.dom.types.isis.passwords.IsisPasswords;
import demoapp.dom.types.javamath.bigdecimals.JavaMathBigDecimals;
import demoapp.dom.types.javamath.bigintegers.JavaMathBigIntegers;
-@DomainService(nature=NatureOfService.VIEW, objectType = "demo.JavaMathTypesMenu")
-@DomainObjectLayout(named="JavaMathTypes")
+@DomainService(nature=NatureOfService.VIEW, objectType = "demo.IsisTypesMenu")
+@DomainObjectLayout(named="Isis Types")
@Log4j2
public class IsisTypesMenu {