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/06/26 07:06:21 UTC
[isis] 05/05: ISIS-2222: renames PrimitivesDemo to WrapperDemo
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch ISIS-2222
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 98d1f84296e1a0dc0ebed2c05ab38372da4b16ac
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Jun 26 08:05:52 2020 +0100
ISIS-2222: renames PrimitivesDemo to WrapperDemo
---
.../src/main/java/demoapp/dom/menubars.layout.xml | 8 ++---
.../main/java/demoapp/dom/types/DataTypesMenu.java | 39 +++++++++++-----------
.../WrapperDemo-description.adoc} | 0
.../WrapperDemo.java} | 6 ++--
.../WrapperDemo.layout.xml} | 0
5 files changed, 25 insertions(+), 28 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 8c5e59e..af24e6a 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
@@ -26,12 +26,8 @@
<mb3:serviceAction objectType="demo.DataTypesMenu" id="primitiveBooleans"/>
</mb3:section>
<mb3:section>
- <mb3:serviceAction objectType="demo.DataTypesMenu" id="text">
- <cpt:named>Text</cpt:named>
- </mb3:serviceAction>
- <mb3:serviceAction objectType="demo.DataTypesMenu" id="primitives">
- <cpt:named>Primitives</cpt:named>
- </mb3:serviceAction>
+ <mb3:serviceAction objectType="demo.DataTypesMenu" id="text"/>
+ <mb3:serviceAction objectType="demo.DataTypesMenu" id="wrappers"/>
<mb3:serviceAction objectType="demo.DataTypesMenu" id="temporals">
<cpt:named>Temporal Types</cpt:named>
</mb3:serviceAction>
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/DataTypesMenu.java b/examples/demo/domain/src/main/java/demoapp/dom/types/DataTypesMenu.java
index c9fa3f5..dd828b6 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/DataTypesMenu.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/DataTypesMenu.java
@@ -32,6 +32,7 @@ import org.apache.isis.applib.annotation.ActionLayout;
import org.apache.isis.applib.annotation.DomainObjectLayout;
import org.apache.isis.applib.annotation.DomainService;
import org.apache.isis.applib.annotation.NatureOfService;
+import org.apache.isis.applib.annotation.SemanticsOf;
import org.apache.isis.applib.services.factory.FactoryService;
import org.apache.isis.applib.value.Blob;
import org.apache.isis.applib.value.Clob;
@@ -48,7 +49,7 @@ import lombok.extern.log4j.Log4j2;
import demoapp.dom.types.blob.BlobDemo;
import demoapp.dom.types.clob.ClobDemo;
import demoapp.dom.types.markup.MarkupDemo;
-import demoapp.dom.types.primitive.PrimitivesDemo;
+import demoapp.dom.types.wrapper.WrapperDemo;
import demoapp.dom.types.primitive.booleans.PrimitiveBooleans;
import demoapp.dom.types.primitive.bytes.PrimitiveBytes;
import demoapp.dom.types.primitive.chars.PrimitiveChars;
@@ -82,10 +83,10 @@ public class DataTypesMenu {
return demo;
}
- @Action
+ @Action(semantics = SemanticsOf.SAFE)
@ActionLayout(cssClassFa="fa-hashtag")
- public PrimitivesDemo primitives(){
- val demo = factoryService.viewModel(PrimitivesDemo.class);
+ public WrapperDemo wrappers(){
+ val demo = factoryService.viewModel(WrapperDemo.class);
demo.setJavaLangByte(Byte.MAX_VALUE);
demo.setJavaLangShort(Short.MAX_VALUE);
@@ -98,7 +99,7 @@ public class DataTypesMenu {
return demo;
}
- @Action
+ @Action(semantics = SemanticsOf.SAFE)
@ActionLayout(cssClassFa="fa-clock")
public TemporalDemo temporals(){
val demo = factoryService.viewModel(TemporalDemo.class);
@@ -114,7 +115,7 @@ public class DataTypesMenu {
return demo;
}
- @Action
+ @Action(semantics = SemanticsOf.SAFE)
@ActionLayout(cssClassFa="fa-at")
public UuidDemo uuid(){
val demo = factoryService.viewModel(UuidDemo.class);
@@ -122,7 +123,7 @@ public class DataTypesMenu {
return demo;
}
- @Action
+ @Action(semantics = SemanticsOf.SAFE)
@ActionLayout(cssClassFa="fa-cloud")
public BlobDemo blobs(){
val demo = factoryService.viewModel(BlobDemo.class);
@@ -136,8 +137,8 @@ public class DataTypesMenu {
return demo;
}
-
- @Action
+
+ @Action(semantics = SemanticsOf.SAFE)
@ActionLayout(cssClassFa="fa-cloud")
public ClobDemo clobs(){
val demo = factoryService.viewModel(ClobDemo.class);
@@ -151,8 +152,8 @@ public class DataTypesMenu {
return demo;
}
-
- @Action
+
+ @Action(semantics = SemanticsOf.SAFE)
@ActionLayout(cssClassFa="fa-code")
public MarkupDemo markup(){
val demo = factoryService.viewModel(MarkupDemo.class);
@@ -168,49 +169,49 @@ public class DataTypesMenu {
}
- @Action
+ @Action(semantics = SemanticsOf.SAFE)
@ActionLayout(cssClassFa="fa-hashtag")
public PrimitiveBytes primitiveBytes(){
return new PrimitiveBytes();
}
- @Action
+ @Action(semantics = SemanticsOf.SAFE)
@ActionLayout(cssClassFa="fa-hashtag")
public PrimitiveShorts primitiveShorts(){
return new PrimitiveShorts();
}
- @Action
+ @Action(semantics = SemanticsOf.SAFE)
@ActionLayout(cssClassFa="fa-hashtag")
public PrimitiveInts primitiveInts(){
return new PrimitiveInts();
}
- @Action
+ @Action(semantics = SemanticsOf.SAFE)
@ActionLayout(cssClassFa="fa-hashtag")
public PrimitiveLongs primitiveLongs(){
return new PrimitiveLongs();
}
- @Action
+ @Action(semantics = SemanticsOf.SAFE)
@ActionLayout(cssClassFa="fa-hashtag")
public PrimitiveFloats primitiveFloats(){
return new PrimitiveFloats();
}
- @Action
+ @Action(semantics = SemanticsOf.SAFE)
@ActionLayout(cssClassFa="fa-hashtag")
public PrimitiveDoubles primitiveDoubles(){
return new PrimitiveDoubles();
}
- @Action
+ @Action(semantics = SemanticsOf.SAFE)
@ActionLayout(cssClassFa="fa-hashtag")
public PrimitiveChars primitiveChars(){
return new PrimitiveChars();
}
- @Action
+ @Action(semantics = SemanticsOf.SAFE)
@ActionLayout(cssClassFa="fa-hashtag")
public PrimitiveBooleans primitiveBooleans(){
return new PrimitiveBooleans();
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/PrimitivesDemo-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/types/wrapper/WrapperDemo-description.adoc
similarity index 100%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/primitive/PrimitivesDemo-description.adoc
rename to examples/demo/domain/src/main/java/demoapp/dom/types/wrapper/WrapperDemo-description.adoc
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/PrimitivesDemo.java b/examples/demo/domain/src/main/java/demoapp/dom/types/wrapper/WrapperDemo.java
similarity index 97%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/primitive/PrimitivesDemo.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/wrapper/WrapperDemo.java
index 819c155..1bbe2ec 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/PrimitivesDemo.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/wrapper/WrapperDemo.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package demoapp.dom.types.primitive;
+package demoapp.dom.types.wrapper;
import java.util.List;
@@ -45,7 +45,7 @@ import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
@XmlAccessorType(XmlAccessType.FIELD)
@DomainObject(nature=Nature.VIEW_MODEL, objectType = "demo.Primitives", editing=Editing.ENABLED)
@Log4j2
-public class PrimitivesDemo implements HasAsciiDocDescription {
+public class WrapperDemo implements HasAsciiDocDescription {
public String title() {
return "Primitives Demo";
@@ -63,7 +63,7 @@ public class PrimitivesDemo implements HasAsciiDocDescription {
}
@Action
- public PrimitivesDemo calculateNull() {
+ public WrapperDemo calculateNull() {
return null;
}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/PrimitivesDemo.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/types/wrapper/WrapperDemo.layout.xml
similarity index 100%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/primitive/PrimitivesDemo.layout.xml
rename to examples/demo/domain/src/main/java/demoapp/dom/types/wrapper/WrapperDemo.layout.xml