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 2020/03/21 13:43:45 UTC

[isis] branch master updated: ISIS-2318: polishing the Mixin Demo

This is an automated email from the ASF dual-hosted git repository.

ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git


The following commit(s) were added to refs/heads/master by this push:
     new 2e02a9b  ISIS-2318: polishing the Mixin Demo
2e02a9b is described below

commit 2e02a9b91632219e474c7b3f10e3ecd502bab5fe
Author: Andi Huber <ah...@apache.org>
AuthorDate: Sat Mar 21 14:43:34 2020 +0100

    ISIS-2318: polishing the Mixin Demo
---
 .../src/main/java/demoapp/dom/mixins/MixinDemo.adoc   |  2 +-
 .../src/main/java/demoapp/dom/mixins/MixinDemo.java   | 12 ++++++++++++
 .../main/java/demoapp/dom/mixins/MixinDemo.layout.xml |  6 +++---
 .../demoapp/dom/mixins/MixinDemo_mixedInAction.java   | 19 +++++++++----------
 4 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/examples/demo/src/main/java/demoapp/dom/mixins/MixinDemo.adoc b/examples/demo/src/main/java/demoapp/dom/mixins/MixinDemo.adoc
index faa9471..f138ce1 100644
--- a/examples/demo/src/main/java/demoapp/dom/mixins/MixinDemo.adoc
+++ b/examples/demo/src/main/java/demoapp/dom/mixins/MixinDemo.adoc
@@ -1,7 +1,7 @@
 (since 1.x)
 
 The framework allows for tiny chunks of domain logic like `Update Name` or `Delete`, 
-to be contributed and encapsulated within separate classes: `Mixins`
+to be contributed by and encapsulated within separate classes: `Mixins`
 
 `Mixins` contribute their domain logic to a domain object via a single mixed in member, which is one of 
 
diff --git a/examples/demo/src/main/java/demoapp/dom/mixins/MixinDemo.java b/examples/demo/src/main/java/demoapp/dom/mixins/MixinDemo.java
index 488c5d2..09cdb75 100644
--- a/examples/demo/src/main/java/demoapp/dom/mixins/MixinDemo.java
+++ b/examples/demo/src/main/java/demoapp/dom/mixins/MixinDemo.java
@@ -27,8 +27,14 @@ import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
 
 import org.apache.isis.applib.annotation.DomainObject;
+import org.apache.isis.applib.annotation.Editing;
 import org.apache.isis.applib.annotation.Nature;
 import org.apache.isis.applib.annotation.Programmatic;
+import org.apache.isis.applib.annotation.Property;
+import org.apache.isis.applib.annotation.PropertyLayout;
+
+import lombok.Getter;
+import lombok.Setter;
 
 import demoapp.dom.actions.assoc.DemoItem;
 import demoapp.utils.DemoStub;
@@ -44,6 +50,10 @@ public class MixinDemo extends DemoStub {
         return "Mixin Demo";
     }
 
+    @Property(editing = Editing.DISABLED) // inline edit disabled, but allows updates via mixin
+    @PropertyLayout(multiLine = 3)
+    @Getter @Setter private String note;
+    
     // ---
 
     List<DemoItem> collection;
@@ -51,6 +61,8 @@ public class MixinDemo extends DemoStub {
     @Override @Programmatic
     public void initDefaults() {
 
+        note = "Update me! The button below is contributed by one of my mixins.";
+        
         collection = new ArrayList<>();
         collection.add(DemoItem.of("first"));
         collection.add(DemoItem.of("second"));
diff --git a/examples/demo/src/main/java/demoapp/dom/mixins/MixinDemo.layout.xml b/examples/demo/src/main/java/demoapp/dom/mixins/MixinDemo.layout.xml
index cf0cde4..1794555 100644
--- a/examples/demo/src/main/java/demoapp/dom/mixins/MixinDemo.layout.xml
+++ b/examples/demo/src/main/java/demoapp/dom/mixins/MixinDemo.layout.xml
@@ -13,10 +13,10 @@
 		</bs3:col>
 	</bs3:row>
 	<bs3:row>
-		<bs3:col span="6">
+		<bs3:col span="4">
 
 			<cpt:fieldSet name="Actions" id="actions">
-				<cpt:action id="mixedInAction" />
+				<cpt:property id="note"/>
 			</cpt:fieldSet>
 
 			<cpt:fieldSet name="Properties" id="mixedInProperty">
@@ -26,7 +26,7 @@
 			<cpt:collection defaultView="table" id="mixedInCollection"/>
 			
 		</bs3:col>
-		<bs3:col span="6" unreferencedCollections="true">
+		<bs3:col span="8" unreferencedCollections="true">
 			<cpt:fieldSet name="Description" id="description"
 				unreferencedProperties="true">
 				<cpt:property id="description" labelPosition="NONE" />
diff --git a/examples/demo/src/main/java/demoapp/dom/mixins/MixinDemo_mixedInAction.java b/examples/demo/src/main/java/demoapp/dom/mixins/MixinDemo_mixedInAction.java
index aa3d4f4..a5009b9 100644
--- a/examples/demo/src/main/java/demoapp/dom/mixins/MixinDemo_mixedInAction.java
+++ b/examples/demo/src/main/java/demoapp/dom/mixins/MixinDemo_mixedInAction.java
@@ -18,27 +18,26 @@
  */
 package demoapp.dom.mixins;
 
-import javax.inject.Inject;
-
 import org.apache.isis.applib.annotation.Action;
-import org.apache.isis.applib.services.message.MessageService;
+import org.apache.isis.applib.annotation.ActionLayout;
 
 import lombok.RequiredArgsConstructor;
 
-@Action
+@Action(associateWith = "note")
+@ActionLayout(named = "Update Note")
 @RequiredArgsConstructor
 public class MixinDemo_mixedInAction {
     
-    @Inject private MessageService messageService;
-
     private final MixinDemo holder;
     
-    public MixinDemo act() {
-        
-        messageService.informUser("Greetings from the MixinDemo's mixed-in action!");
-        
+    public MixinDemo act(String newNote) {
+        holder.setNote(newNote);
         return holder;
     }
     
+    public String default0Act() {
+        return holder.getNote();
+    }
+    
 }
  
\ No newline at end of file