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 2021/05/22 20:12:07 UTC
[isis] branch master updated: ISIS-2253: more housekeeping
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 f5e3c03 ISIS-2253: more housekeeping
f5e3c03 is described below
commit f5e3c0317fc937a71e65d5ab1ebebb95605879d1
Author: andi-huber <ah...@apache.org>
AuthorDate: Sat May 22 22:11:02 2021 +0200
ISIS-2253: more housekeeping
---
.../ui/components/collection/CollectionPanel.java | 54 +++++++---------------
.../collection/bulk/BulkActionsProvider.java | 2 -
.../CollectionContentsAsAjaxTablePanel.java | 3 +-
3 files changed, 17 insertions(+), 42 deletions(-)
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/CollectionPanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/CollectionPanel.java
index 40afb6e..e069615 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/CollectionPanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/CollectionPanel.java
@@ -19,7 +19,6 @@
package org.apache.isis.viewer.wicket.ui.components.collection;
-import java.io.Serializable;
import java.util.List;
import org.apache.wicket.Component;
@@ -31,7 +30,6 @@ import org.apache.isis.commons.collections.Can;
import org.apache.isis.core.metamodel.spec.ManagedObject;
import org.apache.isis.core.runtime.memento.ObjectMemento;
import org.apache.isis.viewer.wicket.model.common.OnSelectionHandler;
-import org.apache.isis.viewer.wicket.model.models.EntityCollectionModel;
import org.apache.isis.viewer.wicket.model.models.EntityCollectionModelParented;
import org.apache.isis.viewer.wicket.model.models.ToggledMementosProvider;
import org.apache.isis.viewer.wicket.ui.ComponentType;
@@ -44,9 +42,8 @@ import org.apache.isis.viewer.wicket.ui.components.scalars.ScalarPanelAbstract;
import org.apache.isis.viewer.wicket.ui.components.widgets.checkbox.ContainedToggleboxPanel;
import org.apache.isis.viewer.wicket.ui.panels.PanelAbstract;
-import lombok.val;
-
import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;
+import lombok.val;
/**
* Panel for rendering entity collection; analogous to (any concrete subclass
@@ -54,7 +51,10 @@ import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel
*/
public class CollectionPanel
extends PanelAbstract<List<ManagedObject>, EntityCollectionModelParented>
-implements CollectionSelectorProvider, BulkActionsProvider {
+implements
+ CollectionSelectorProvider,
+ ToggledMementosProvider,
+ BulkActionsProvider {
private static final long serialVersionUID = 1L;
@@ -71,8 +71,7 @@ implements CollectionSelectorProvider, BulkActionsProvider {
val associatedActions = collectionModel.getAssociatedActions();
- val toggledMementosProvider =
- new MyToggledMementosProvider(collectionModel, this, this);
+ val toggledMementosProvider = this;
val entityActionLinks = LinkAndLabelUtil
.asActionLinksForAdditionalLinksPanel(
@@ -158,44 +157,23 @@ implements CollectionSelectorProvider, BulkActionsProvider {
return toggleboxColumn;
}
+ // -- TOGGLED MEMENTOS PROVIDER
@Override
- public void configureBulkActions(final ObjectAdapterToggleboxColumn toggleboxColumn) {
+ public Can<ObjectMemento> getToggles() {
+ return getModel().getToggleMementosList();
}
- private static class MyToggledMementosProvider implements ToggledMementosProvider, Serializable {
- private static final long serialVersionUID = 1L;
- private final EntityCollectionModel collectionModel;
- private final BulkActionsProvider bulkActionsProvider;
- private final CollectionPanel collectionPanel;
-
- MyToggledMementosProvider(
- final EntityCollectionModel collectionModel,
- final BulkActionsProvider bulkActionsProvider,
- final CollectionPanel collectionPanel) {
- this.collectionModel = collectionModel;
- this.bulkActionsProvider = bulkActionsProvider;
- this.collectionPanel = collectionPanel;
- }
-
- @Override
- public Can<ObjectMemento> getToggles() {
- return collectionModel.getToggleMementosList();
- }
-
- @Override
- public void clearToggles(final AjaxRequestTarget target) {
- collectionModel.clearToggleMementosList();
+ @Override
+ public void clearToggles(final AjaxRequestTarget target) {
+ getModel().clearToggleMementosList();
- final ObjectAdapterToggleboxColumn toggleboxColumn = bulkActionsProvider.getToggleboxColumn();
- if(toggleboxColumn != null) {
- toggleboxColumn.clearToggles();
- target.add(collectionPanel);
- }
+ final ObjectAdapterToggleboxColumn toggleboxColumn = getToggleboxColumn();
+ if(toggleboxColumn != null) {
+ toggleboxColumn.clearToggles();
+ target.add(this);
}
}
-
-
}
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/bulk/BulkActionsProvider.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/bulk/BulkActionsProvider.java
index 335b8dc..248d1ae 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/bulk/BulkActionsProvider.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/bulk/BulkActionsProvider.java
@@ -24,7 +24,5 @@ import org.apache.isis.viewer.wicket.ui.components.collectioncontents.ajaxtable.
public interface BulkActionsProvider extends Serializable {
- void configureBulkActions(ObjectAdapterToggleboxColumn toggleboxColumn);
-
ObjectAdapterToggleboxColumn getToggleboxColumn();
}
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.java
index 5d4944e..8288b76 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.java
@@ -77,7 +77,6 @@ implements CollectionCountProvider {
private IsisAjaxFallbackDataTable<ManagedObject, String> dataTable;
-
public CollectionContentsAsAjaxTablePanel(final String id, final EntityCollectionModel model) {
super(id, model);
}
@@ -102,7 +101,7 @@ implements CollectionCountProvider {
if(toggleboxColumn != null) {
columns.add(toggleboxColumn);
}
- bulkActionsProvider.configureBulkActions(toggleboxColumn);
+
}
val collectionModel = getModel();