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 2019/12/13 13:16:32 UTC
[isis] branch master updated: ISIS-2226: demo: show lifted
restriction for action prefixes
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 7f40b7d ISIS-2226: demo: show lifted restriction for action prefixes
7f40b7d is described below
commit 7f40b7d9fa3bcb99ddeef34ba9b8f2205c43bed8
Author: Andi Huber <ah...@apache.org>
AuthorDate: Fri Dec 13 14:16:21 2019 +0100
ISIS-2226: demo: show lifted restriction for action prefixes
don't need to use 'disAblexxx' any more, can use 'disablexxx' for
actions now
---
.../depargs/DependentArgsActionDemo_useAutoComplete.java | 2 ++
.../actions/depargs/DependentArgsActionDemo_useChoices.java | 2 ++
.../actions/depargs/DependentArgsActionDemo_useDefault.java | 2 ++
.../actions/depargs/DependentArgsActionDemo_useDisable.java | 2 ++
.../dom/actions/depargs/DependentArgsActionDemo_useHide.java | 4 +++-
.../demo/src/main/java/demoapp/dom/tooltip/TooltipDemo.java | 11 +++++++----
.../src/main/java/demoapp/dom/tooltip/TooltipDemo.layout.xml | 4 ++--
7 files changed, 20 insertions(+), 7 deletions(-)
diff --git a/examples/demo/src/main/java/demoapp/dom/actions/depargs/DependentArgsActionDemo_useAutoComplete.java b/examples/demo/src/main/java/demoapp/dom/actions/depargs/DependentArgsActionDemo_useAutoComplete.java
index 657b913..ec1e977 100644
--- a/examples/demo/src/main/java/demoapp/dom/actions/depargs/DependentArgsActionDemo_useAutoComplete.java
+++ b/examples/demo/src/main/java/demoapp/dom/actions/depargs/DependentArgsActionDemo_useAutoComplete.java
@@ -32,6 +32,7 @@ import org.apache.isis.applib.annotation.Parameter;
import org.apache.isis.applib.annotation.PromptStyle;
import org.apache.isis.applib.annotation.SemanticsOf;
import org.apache.isis.applib.services.message.MessageService;
+import org.apache.isis.incubator.model.applib.annotation.Supporting;
import lombok.RequiredArgsConstructor;
@@ -63,6 +64,7 @@ public class DependentArgsActionDemo_useAutoComplete {
// -- PARAM 1 (DemoItem)
+ //@Supporting
public Collection<DemoItem> autoComplete1$$(
Parity parity, // <-- the refining parameter from the dialog above
diff --git a/examples/demo/src/main/java/demoapp/dom/actions/depargs/DependentArgsActionDemo_useChoices.java b/examples/demo/src/main/java/demoapp/dom/actions/depargs/DependentArgsActionDemo_useChoices.java
index d132d16..033094a 100644
--- a/examples/demo/src/main/java/demoapp/dom/actions/depargs/DependentArgsActionDemo_useChoices.java
+++ b/examples/demo/src/main/java/demoapp/dom/actions/depargs/DependentArgsActionDemo_useChoices.java
@@ -31,6 +31,7 @@ import org.apache.isis.applib.annotation.Parameter;
import org.apache.isis.applib.annotation.PromptStyle;
import org.apache.isis.applib.annotation.SemanticsOf;
import org.apache.isis.applib.services.message.MessageService;
+import org.apache.isis.incubator.model.applib.annotation.Supporting;
import lombok.RequiredArgsConstructor;
@@ -62,6 +63,7 @@ public class DependentArgsActionDemo_useChoices {
// -- PARAM 1 (DemoItem)
+ //@Supporting
public Collection<DemoItem> choices1$$(
Parity parity // <-- the refining parameter from the dialog above
diff --git a/examples/demo/src/main/java/demoapp/dom/actions/depargs/DependentArgsActionDemo_useDefault.java b/examples/demo/src/main/java/demoapp/dom/actions/depargs/DependentArgsActionDemo_useDefault.java
index 670245e..2994588 100644
--- a/examples/demo/src/main/java/demoapp/dom/actions/depargs/DependentArgsActionDemo_useDefault.java
+++ b/examples/demo/src/main/java/demoapp/dom/actions/depargs/DependentArgsActionDemo_useDefault.java
@@ -29,6 +29,7 @@ import org.apache.isis.applib.annotation.ParameterLayout;
import org.apache.isis.applib.annotation.PromptStyle;
import org.apache.isis.applib.annotation.SemanticsOf;
import org.apache.isis.applib.services.message.MessageService;
+import org.apache.isis.incubator.model.applib.annotation.Supporting;
import lombok.RequiredArgsConstructor;
@@ -62,6 +63,7 @@ public class DependentArgsActionDemo_useDefault {
// -- PARAM 1 (String message)
+ //@Supporting
public String default1$$(Parity parity) {
if(parity == null) {
return "no parity selected";
diff --git a/examples/demo/src/main/java/demoapp/dom/actions/depargs/DependentArgsActionDemo_useDisable.java b/examples/demo/src/main/java/demoapp/dom/actions/depargs/DependentArgsActionDemo_useDisable.java
index afd97ca..7a3677e 100644
--- a/examples/demo/src/main/java/demoapp/dom/actions/depargs/DependentArgsActionDemo_useDisable.java
+++ b/examples/demo/src/main/java/demoapp/dom/actions/depargs/DependentArgsActionDemo_useDisable.java
@@ -29,6 +29,7 @@ import org.apache.isis.applib.annotation.ParameterLayout;
import org.apache.isis.applib.annotation.PromptStyle;
import org.apache.isis.applib.annotation.SemanticsOf;
import org.apache.isis.applib.services.message.MessageService;
+import org.apache.isis.incubator.model.applib.annotation.Supporting;
import lombok.RequiredArgsConstructor;
@@ -61,6 +62,7 @@ public class DependentArgsActionDemo_useDisable {
// -- PARAM 1 (String message)
+ //@Supporting
public String disable1$$(boolean disableMessageField) {
return disableMessageField
? "disabled by dependent argument"
diff --git a/examples/demo/src/main/java/demoapp/dom/actions/depargs/DependentArgsActionDemo_useHide.java b/examples/demo/src/main/java/demoapp/dom/actions/depargs/DependentArgsActionDemo_useHide.java
index a61d5e8..e29618c 100644
--- a/examples/demo/src/main/java/demoapp/dom/actions/depargs/DependentArgsActionDemo_useHide.java
+++ b/examples/demo/src/main/java/demoapp/dom/actions/depargs/DependentArgsActionDemo_useHide.java
@@ -29,6 +29,7 @@ import org.apache.isis.applib.annotation.ParameterLayout;
import org.apache.isis.applib.annotation.PromptStyle;
import org.apache.isis.applib.annotation.SemanticsOf;
import org.apache.isis.applib.services.message.MessageService;
+import org.apache.isis.incubator.model.applib.annotation.Supporting;
import lombok.RequiredArgsConstructor;
@@ -61,10 +62,11 @@ public class DependentArgsActionDemo_useHide {
// -- PARAM 1 (String message)
+ //@Supporting
public boolean hide1$$(boolean hideMessageField) {
return hideMessageField;
}
-
+
}
diff --git a/examples/demo/src/main/java/demoapp/dom/tooltip/TooltipDemo.java b/examples/demo/src/main/java/demoapp/dom/tooltip/TooltipDemo.java
index 40d1111..7aa693f 100644
--- a/examples/demo/src/main/java/demoapp/dom/tooltip/TooltipDemo.java
+++ b/examples/demo/src/main/java/demoapp/dom/tooltip/TooltipDemo.java
@@ -42,6 +42,7 @@ import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.PropertyLayout;
import org.apache.isis.applib.annotation.SemanticsOf;
import org.apache.isis.applib.value.Markup;
+import org.apache.isis.incubator.model.applib.annotation.Supporting;
import demoapp.dom.actions.assoc.DemoItem;
import demoapp.utils.DemoStub;
@@ -105,11 +106,12 @@ public class TooltipDemo extends DemoStub {
@ActionLayout(
named="Disabled Action", // metamodel validation is picky when method prefix 'disabled' is used
describedAs="This is a disabled action with a tooltip.")
- public TooltipDemo disAbledAction(){
+ public TooltipDemo disabledAction(){
return this;
}
- public String disableDisAbledAction() {
+ @Supporting
+ public String disableDisabledAction() {
return "Disabled for demonstration.";
}
@@ -119,11 +121,12 @@ public class TooltipDemo extends DemoStub {
cssClass="btn-danger",
describedAs="This is a disabled action with a tooltip and 'are you sure' "
+ "semantics.")
- public TooltipDemo disAbledActionWithConfirmation(){
+ public TooltipDemo disabledActionWithConfirmation(){
return this;
}
- public String disableDisAbledActionWithConfirmation() {
+ @Supporting
+ public String disableDisabledActionWithConfirmation() {
return "Disabled for demonstration.";
}
diff --git a/examples/demo/src/main/java/demoapp/dom/tooltip/TooltipDemo.layout.xml b/examples/demo/src/main/java/demoapp/dom/tooltip/TooltipDemo.layout.xml
index 0cfa146..851d12b 100644
--- a/examples/demo/src/main/java/demoapp/dom/tooltip/TooltipDemo.layout.xml
+++ b/examples/demo/src/main/java/demoapp/dom/tooltip/TooltipDemo.layout.xml
@@ -31,8 +31,8 @@
</cpt:fieldSet>
<cpt:fieldSet name="Actions" id="a3">
- <cpt:action id="disAbledAction" />
- <cpt:action id="disAbledActionWithConfirmation" />
+ <cpt:action id="disabledAction" />
+ <cpt:action id="disabledActionWithConfirmation" />
<cpt:property id="text3"/>
</cpt:fieldSet>