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 2022/04/14 07:46:18 UTC
[isis] 01/01: ISIS-3005: investigate DataRowToggle issue (1)
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch 3005_bulktoggle_wkt
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 9d4ea5f2cb5d6041d43005739caddbf8e69865c5
Author: Andi Huber <ah...@apache.org>
AuthorDate: Thu Apr 14 09:46:12 2022 +0200
ISIS-3005: investigate DataRowToggle issue (1)
---
.../wicket/model/models/binding/BooleanBinding.java | 12 +++++++++---
.../model/models/interaction/coll/DataRowToggleWkt.java | 10 ++++++++--
.../wicket/model/models/interaction/coll/DataRowWkt.java | 7 ++++++-
.../ajaxtable/columns/BulkToggleWkt.java | 16 ++++++++++++++--
4 files changed, 37 insertions(+), 8 deletions(-)
diff --git a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/binding/BooleanBinding.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/binding/BooleanBinding.java
index 2ddf42d66d..d97adab0a7 100644
--- a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/binding/BooleanBinding.java
+++ b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/binding/BooleanBinding.java
@@ -18,8 +18,11 @@
*/
package org.apache.isis.viewer.wicket.model.models.binding;
+import java.util.Optional;
+
import org.apache.wicket.model.ChainingModel;
import org.apache.wicket.model.IModel;
+import org.springframework.lang.Nullable;
import org.apache.isis.commons.internal.binding._BindableAbstract;
@@ -38,15 +41,18 @@ extends ChainingModel<Boolean> {
@Override
public final Boolean getObject() {
- return getBindable(model()).getValue();
+ return getBindable(model())
+ .map(_BindableAbstract::getValue)
+ .orElse(null);
}
@Override
public final void setObject(final Boolean value) {
- getBindable(model()).setValue(value);
+ getBindable(model())
+ .ifPresent(bindable->bindable.setValue(value));
}
- protected abstract _BindableAbstract<Boolean> getBindable(T model);
+ protected abstract Optional<_BindableAbstract<Boolean>> getBindable(@Nullable T model);
@SuppressWarnings("unchecked")
protected T model() {
diff --git a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/interaction/coll/DataRowToggleWkt.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/interaction/coll/DataRowToggleWkt.java
index c57acf8c9a..24aefd5918 100644
--- a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/interaction/coll/DataRowToggleWkt.java
+++ b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/interaction/coll/DataRowToggleWkt.java
@@ -18,7 +18,10 @@
*/
package org.apache.isis.viewer.wicket.model.models.interaction.coll;
+import java.util.Optional;
+
import org.apache.wicket.model.IModel;
+import org.springframework.lang.Nullable;
import org.apache.isis.commons.internal.binding._BindableAbstract;
import org.apache.isis.core.metamodel.interactions.managed.nonscalar.DataRow;
@@ -39,8 +42,11 @@ extends BooleanBinding<DataRow> {
}
@Override
- protected _BindableAbstract<Boolean> getBindable(final DataRow dataRow) {
- return dataRow.getSelectToggle();
+ protected Optional<_BindableAbstract<Boolean>> getBindable(
+ final @Nullable DataRow dataRow) {
+ return dataRow!=null
+ ? Optional.ofNullable(dataRow.getSelectToggle())
+ : Optional.empty();
}
}
diff --git a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/interaction/coll/DataRowWkt.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/interaction/coll/DataRowWkt.java
index f2ed1842bf..6b4899ee06 100644
--- a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/interaction/coll/DataRowWkt.java
+++ b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/interaction/coll/DataRowWkt.java
@@ -18,6 +18,7 @@
*/
package org.apache.isis.viewer.wicket.model.models.interaction.coll;
+import java.util.Optional;
import java.util.UUID;
import org.apache.wicket.model.ChainingModel;
@@ -55,7 +56,7 @@ extends ChainingModel<DataRow> {
}
@Override
- public DataRow getObject() {
+ public final DataRow getObject() {
if(dataRow==null) {
dataRow = getDataTableModel().lookupDataRow(uuid)
.orElse(null);
@@ -63,6 +64,10 @@ extends ChainingModel<DataRow> {
return dataRow;
}
+ public Optional<DataRow> dataRow() {
+ return Optional.ofNullable(getObject());
+ }
+
// -- HELPER
private DataTableModel getDataTableModel() {
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/BulkToggleWkt.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/BulkToggleWkt.java
index df4f27385c..d961bcd0d1 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/BulkToggleWkt.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/BulkToggleWkt.java
@@ -18,7 +18,10 @@
*/
package org.apache.isis.viewer.wicket.ui.components.collectioncontents.ajaxtable.columns;
+import java.util.Optional;
+
import org.apache.wicket.model.IModel;
+import org.springframework.lang.Nullable;
import org.apache.isis.commons.internal.binding._BindableAbstract;
import org.apache.isis.core.metamodel.interactions.managed.nonscalar.DataTableModel;
@@ -38,8 +41,17 @@ extends BooleanBinding<DataTableModel> {
}
@Override
- protected _BindableAbstract<Boolean> getBindable(final DataTableModel dataTable) {
- return dataTable.getSelectAllToggle();
+ protected Optional<_BindableAbstract<Boolean>> getBindable(
+ final @Nullable DataTableModel dataTable) {
+
+ if(dataTable==null) {
+ //XXX debug
+ System.err.printf("BulkToggleWkt %s%n", "unexpected dataTable null");
+ }
+
+ return dataTable!=null
+ ? Optional.ofNullable(dataTable.getSelectAllToggle())
+ : Optional.empty();
}
}