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/05/07 10:21:50 UTC
[isis] 01/06: ISIS-2361: minor formating
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
commit 24fa5def8d7c1a285ca13d06d9b225910c1fd210
Author: Andi Huber <ah...@apache.org>
AuthorDate: Thu May 7 07:26:12 2020 +0200
ISIS-2361: minor formating
---
.../java/demoapp/dom/actions/assoc/AssociatedActionDemo.java | 7 ++++---
.../actions/depargs/DependentArgsActionDemo_bulkAction.java | 7 ++++++-
.../viewer/wicket/ui/components/widgets/select2/Select2.java | 12 ++++++------
.../ui/components/widgets/select2/Select2MultiChoiceExt.java | 2 +-
4 files changed, 17 insertions(+), 11 deletions(-)
diff --git a/examples/demo/src/main/java/demoapp/dom/actions/assoc/AssociatedActionDemo.java b/examples/demo/src/main/java/demoapp/dom/actions/assoc/AssociatedActionDemo.java
index 11e7345..72a4fc9 100644
--- a/examples/demo/src/main/java/demoapp/dom/actions/assoc/AssociatedActionDemo.java
+++ b/examples/demo/src/main/java/demoapp/dom/actions/assoc/AssociatedActionDemo.java
@@ -54,9 +54,10 @@ public class AssociatedActionDemo extends DemoStub {
@ActionLayout(promptStyle = PromptStyle.DIALOG_MODAL)
@Action(associateWith="items")
public AssociatedActionDemo doSomethingWithItems(
- Set<DemoItem> items,
- int test
- ) {
+
+ // bulk selection
+ Set<DemoItem> items) {
+
if(items!=null) {
items.forEach(item->messageService.informUser(item.getName()));
}
diff --git a/examples/demo/src/main/java/demoapp/dom/actions/depargs/DependentArgsActionDemo_bulkAction.java b/examples/demo/src/main/java/demoapp/dom/actions/depargs/DependentArgsActionDemo_bulkAction.java
index 60514f0..318a9b0 100644
--- a/examples/demo/src/main/java/demoapp/dom/actions/depargs/DependentArgsActionDemo_bulkAction.java
+++ b/examples/demo/src/main/java/demoapp/dom/actions/depargs/DependentArgsActionDemo_bulkAction.java
@@ -69,7 +69,7 @@ public class DependentArgsActionDemo_bulkAction {
int b,
// PARAM 3
- @Parameter(optionality = Optionality.MANDATORY)
+ @Parameter(optionality = Optionality.OPTIONAL)
int c,
// PARAM 4
@@ -105,6 +105,11 @@ public class DependentArgsActionDemo_bulkAction {
return _Lists.of(1,2,3,4);
}
+ @Model
+ public String validate3Act(Parameters params) {
+ return params.c() < 2 ? "please specify c>=2" : null;
+ }
+
// @Model
// public int default3Act(Parameters params) {
// _Probe.sysOut("p2: %d %d %d %d", params.a, params.b, params.c, params.d);
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/Select2.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/Select2.java
index 05da7b6..17a6897 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/Select2.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/Select2.java
@@ -53,10 +53,10 @@ public class Select2 implements Serializable {
null,
Select2MultiChoiceExt.create(id,
ScalarModelWithMultiPending.Util.createModel(scalarModel), scalarModel))
- : new Select2(
- Select2ChoiceExt.create(id,
- ScalarModelWithPending.Util.createModel(scalarModel), scalarModel),
- null);
+ : new Select2(
+ Select2ChoiceExt.create(id,
+ ScalarModelWithPending.Util.createModel(scalarModel), scalarModel),
+ null);
}
private Select2(
@@ -69,13 +69,13 @@ public class Select2 implements Serializable {
public AbstractSelect2Choice component() {
return select2Choice != null
? select2Choice
- : select2MultiChoice;
+ : select2MultiChoice;
}
public ChoiceExt choiceExt() {
return select2Choice != null
? select2Choice
- : select2MultiChoice;
+ : select2MultiChoice;
}
public void clearInput() {
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/Select2MultiChoiceExt.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/Select2MultiChoiceExt.java
index de50859..eac3bf3 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/Select2MultiChoiceExt.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/Select2MultiChoiceExt.java
@@ -25,9 +25,9 @@ import org.apache.wicket.model.IModel;
import org.wicketstuff.select2.Select2MultiChoice;
import org.apache.isis.core.metamodel.spec.ObjectSpecId;
+import org.apache.isis.core.webapp.context.memento.ObjectMemento;
import org.apache.isis.viewer.wicket.model.models.ScalarModel;
import org.apache.isis.viewer.wicket.ui.components.widgets.select2.providers.EmptyChoiceProvider;
-import org.apache.isis.core.webapp.context.memento.ObjectMemento;
public class Select2MultiChoiceExt
extends Select2MultiChoice<ObjectMemento>