You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2016/02/05 12:46:09 UTC
isis git commit: ISIS-993: deleting unused fields from
CollectionContentsMultipleViewsPanel
Repository: isis
Updated Branches:
refs/heads/ISIS-993 20faf33a0 -> f233f418a
ISIS-993: deleting unused fields from CollectionContentsMultipleViewsPanel
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/f233f418
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/f233f418
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/f233f418
Branch: refs/heads/ISIS-993
Commit: f233f418a340c319648f756436265c7368bd3697
Parents: 20faf33
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Thu Feb 4 16:45:19 2016 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Thu Feb 4 16:45:19 2016 +0000
----------------------------------------------------------------------
.../multiple/CollectionContentsMultipleViewsPanel.java | 11 +----------
.../CollectionContentsMultipleViewsPanelFactory.java | 2 +-
2 files changed, 2 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/f233f418/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/multiple/CollectionContentsMultipleViewsPanel.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/multiple/CollectionContentsMultipleViewsPanel.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/multiple/CollectionContentsMultipleViewsPanel.java
index bfa63fa..5647679 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/multiple/CollectionContentsMultipleViewsPanel.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/multiple/CollectionContentsMultipleViewsPanel.java
@@ -54,26 +54,18 @@ public class CollectionContentsMultipleViewsPanel
private static final String UIHINT_VIEW = "view";
- private final ComponentFactory ignoreFactory;
-
- private final ComponentType componentType;
private final String underlyingIdPrefix;
private final CollectionSelectorHelper selectorHelper;
- private ComponentFactory selectedComponentFactory;
private Component selectedComponent;
private Component[] underlyingViews;
- private CollectionSelectorPanel selectorDropdownPanel;
public CollectionContentsMultipleViewsPanel(
final String id,
- final EntityCollectionModel model,
- final ComponentFactory ignoreFactory) {
+ final EntityCollectionModel model) {
super(id, model);
- this.ignoreFactory = ignoreFactory;
this.underlyingIdPrefix = ComponentType.COLLECTION_CONTENTS.toString();
- this.componentType = ignoreFactory.getComponentType();
selectorHelper = new CollectionSelectorHelper(model, getComponentFactoryRegistry(), model.<Integer>getSessionAttribute(EntityCollectionModel.SESSION_ATTRIBUTE_SELECTED_ITEM));
}
@@ -168,7 +160,6 @@ public class CollectionContentsMultipleViewsPanel
component.setDefaultModel(isSelected? getModel(): dummyModel);
}
- this.selectedComponentFactory = ignoreFactory;
this.selectedComponent = underlyingViews[underlyingViewNum];
http://git-wip-us.apache.org/repos/asf/isis/blob/f233f418/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/multiple/CollectionContentsMultipleViewsPanelFactory.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/multiple/CollectionContentsMultipleViewsPanelFactory.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/multiple/CollectionContentsMultipleViewsPanelFactory.java
index 53b8092..d5a0bea 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/multiple/CollectionContentsMultipleViewsPanelFactory.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/multiple/CollectionContentsMultipleViewsPanelFactory.java
@@ -47,7 +47,7 @@ public class CollectionContentsMultipleViewsPanelFactory extends ComponentFactor
@Override
public Component createComponent(final String id, final IModel<?> model) {
final EntityCollectionModel collectionModel = (EntityCollectionModel) model;
- return new CollectionContentsMultipleViewsPanel(id, collectionModel, this);
+ return new CollectionContentsMultipleViewsPanel(id, collectionModel);
}
}