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 2018/09/28 13:58:49 UTC
[isis] 07/07: ISIS-1976: remove leftovers from bulk action support
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch v2
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 58c450f5b0841d81d7816a24eaa3fbd1ca67dfd1
Author: Andi Huber <ah...@apache.org>
AuthorDate: Fri Sep 28 15:57:18 2018 +0200
ISIS-1976: remove leftovers from bulk action support
Task-Url: https://issues.apache.org/jira/browse/ISIS-1976
---
.../StandaloneCollectionPanel.html | 4 --
.../StandaloneCollectionPanel.java | 48 +---------------------
2 files changed, 1 insertion(+), 51 deletions(-)
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/standalonecollection/StandaloneCollectionPanel.html b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/standalonecollection/StandaloneCollectionPanel.html
index 0f407f5..b24f3c1 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/standalonecollection/StandaloneCollectionPanel.html
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/standalonecollection/StandaloneCollectionPanel.html
@@ -33,10 +33,6 @@
<div class="iconAndTitle panel-heading actionPanelHeaderNew">
<span wicket:id="actionName" class="actionName panel-title">[action name]</span>
- <div class="btn-group">
- <div wicket:id="additionalLinks"></div>
- </div>
-
<div class="pull-right btn-group selectorDropdown">
<span wicket:id="selectorDropdown"/>
</div>
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/standalonecollection/StandaloneCollectionPanel.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/standalonecollection/StandaloneCollectionPanel.java
index 24332ba..1d5f323 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/standalonecollection/StandaloneCollectionPanel.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/standalonecollection/StandaloneCollectionPanel.java
@@ -21,16 +21,12 @@ package org.apache.isis.viewer.wicket.ui.components.standalonecollection;
import java.util.List;
-import org.apache.wicket.Component;
import org.apache.wicket.MarkupContainer;
-import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.model.Model;
-import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
-import org.apache.isis.viewer.wicket.model.common.OnSelectionHandler;
import org.apache.isis.viewer.wicket.model.models.ActionModel;
import org.apache.isis.viewer.wicket.model.models.ActionPromptProvider;
import org.apache.isis.viewer.wicket.model.models.EntityCollectionModel;
@@ -38,18 +34,16 @@ import org.apache.isis.viewer.wicket.ui.ComponentFactory;
import org.apache.isis.viewer.wicket.ui.ComponentType;
import org.apache.isis.viewer.wicket.ui.app.registry.ComponentFactoryRegistry;
import org.apache.isis.viewer.wicket.ui.components.actionprompt.ActionPromptModalWindow;
-import org.apache.isis.viewer.wicket.ui.components.collection.bulk.BulkActionsProvider;
import org.apache.isis.viewer.wicket.ui.components.collection.count.CollectionCountProvider;
import org.apache.isis.viewer.wicket.ui.components.collection.selector.CollectionSelectorHelper;
import org.apache.isis.viewer.wicket.ui.components.collection.selector.CollectionSelectorPanel;
import org.apache.isis.viewer.wicket.ui.components.collection.selector.CollectionSelectorProvider;
-import org.apache.isis.viewer.wicket.ui.components.collectioncontents.ajaxtable.columns.ObjectAdapterToggleboxColumn;
import org.apache.isis.viewer.wicket.ui.panels.PanelAbstract;
import org.apache.isis.viewer.wicket.ui.util.Components;
import org.apache.isis.viewer.wicket.ui.util.CssClassAppender;
public class StandaloneCollectionPanel extends PanelAbstract<EntityCollectionModel>
-implements CollectionCountProvider, CollectionSelectorProvider, BulkActionsProvider, ActionPromptProvider {
+implements CollectionCountProvider, CollectionSelectorProvider, ActionPromptProvider {
private static final long serialVersionUID = 1L;
@@ -121,46 +115,6 @@ implements CollectionCountProvider, CollectionSelectorProvider, BulkActionsProvi
}
-
- // -- BulkActionsProvider
-
- ObjectAdapterToggleboxColumn toggleboxColumn;
-
- @Override
- public ObjectAdapterToggleboxColumn getToggleboxColumn() {
-
- if (toggleboxColumn == null) {
-
- final EntityCollectionModel entityCollectionModel = getModel();
- if(entityCollectionModel.isParented()) {
- return null;
- }
-
- toggleboxColumn = new ObjectAdapterToggleboxColumn();
- final OnSelectionHandler handler = new OnSelectionHandler() {
-
- private static final long serialVersionUID = 1L;
-
- @Override
- public void onSelected(
- final Component context,
- final ObjectAdapter selectedAdapter,
- final AjaxRequestTarget ajaxRequestTarget) {
- getModel().toggleSelectionOn(selectedAdapter);
- }
-
- };
- toggleboxColumn.setOnSelectionHandler(handler);
- }
-
- return toggleboxColumn;
- }
-
- @Override
- public void configureBulkActions(final ObjectAdapterToggleboxColumn toggleboxColumn) {
- }
-
-
// -- CollectionSelectorProvider
@Override