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 2014/11/18 14:20:34 UTC
[6/6] isis git commit: ISIS-537: fixing the hints for entity page,
plus trivial tidy-up.
ISIS-537: fixing the hints for entity page, plus trivial tidy-up.
Specifically:
- removing unused parameter to CollectionSelectorPanel's constructor
- removing comments.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/0a17eb4a
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/0a17eb4a
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/0a17eb4a
Branch: refs/heads/master
Commit: 0a17eb4a0a06b484b401d891dd426f914c9671a3
Parents: 41e608b
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Tue Nov 18 14:19:57 2014 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Tue Nov 18 14:19:57 2014 +0100
----------------------------------------------------------------------
.../collection/selector/CollectionSelectorPanel.java | 9 +++++----
.../entity/collections/EntityCollectionsPanel.java | 3 +--
.../standalonecollection/StandaloneCollectionPanel.java | 3 +--
3 files changed, 7 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/0a17eb4a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/selector/CollectionSelectorPanel.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/selector/CollectionSelectorPanel.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/selector/CollectionSelectorPanel.java
index 4225285..02aa720 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/selector/CollectionSelectorPanel.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/selector/CollectionSelectorPanel.java
@@ -36,11 +36,12 @@ import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
import org.apache.isis.core.commons.lang.StringExtensions;
import org.apache.isis.viewer.wicket.model.hints.IsisUiHintEvent;
+import org.apache.isis.viewer.wicket.model.hints.UiHintContainer;
import org.apache.isis.viewer.wicket.model.hints.UiHintPathSignificant;
import org.apache.isis.viewer.wicket.model.models.EntityCollectionModel;
+import org.apache.isis.viewer.wicket.model.models.EntityModel;
import org.apache.isis.viewer.wicket.ui.CollectionContentsAsFactory;
import org.apache.isis.viewer.wicket.ui.ComponentFactory;
-import org.apache.isis.viewer.wicket.ui.ComponentType;
import org.apache.isis.viewer.wicket.ui.panels.PanelAbstract;
import org.apache.isis.viewer.wicket.ui.util.CssClassAppender;
@@ -50,7 +51,7 @@ import org.apache.isis.viewer.wicket.ui.util.CssClassAppender;
* {@link org.apache.isis.viewer.wicket.model.models.EntityCollectionModel}.
*/
public class CollectionSelectorPanel
- extends PanelAbstract<EntityCollectionModel> implements UiHintPathSignificant /*, CollectionCountProvider*/ {
+ extends PanelAbstract<EntityCollectionModel> implements UiHintPathSignificant {
private static final long serialVersionUID = 1L;
@@ -68,7 +69,7 @@ public class CollectionSelectorPanel
private ComponentFactory selectedComponentFactory;
- public CollectionSelectorPanel(final String id, final EntityCollectionModel model, final ComponentFactory ignoreFactory) {
+ public CollectionSelectorPanel(final String id, final EntityCollectionModel model) {
super(id, model);
selectorHelper = new CollectionSelectorHelper(model, getComponentFactoryRegistry());
}
@@ -199,7 +200,7 @@ public class CollectionSelectorPanel
protected void setViewHintAndBroadcast(int viewNum, AjaxRequestTarget target) {
- final EntityCollectionModel uiHintContainer = getUiHintContainer(EntityCollectionModel.class);
+ final UiHintContainer uiHintContainer = getUiHintContainer(getModel().isParented()? EntityModel.class: EntityCollectionModel.class);
if(uiHintContainer == null) {
return;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/0a17eb4a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/collections/EntityCollectionsPanel.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/collections/EntityCollectionsPanel.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/collections/EntityCollectionsPanel.java
index 93288b1..d663d42 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/collections/EntityCollectionsPanel.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/collections/EntityCollectionsPanel.java
@@ -41,7 +41,6 @@ import org.apache.isis.viewer.wicket.ui.components.additionallinks.AdditionalLin
import org.apache.isis.viewer.wicket.ui.components.collection.CollectionPanel;
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.collectioncontents.multiple.CollectionContentsMultipleViewsPanelFactory;
import org.apache.isis.viewer.wicket.ui.components.widgets.containers.UiHintPathSignificantWebMarkupContainer;
import org.apache.isis.viewer.wicket.ui.panels.PanelAbstract;
import org.apache.isis.viewer.wicket.ui.util.CssClassAppender;
@@ -136,7 +135,7 @@ public class EntityCollectionsPanel extends PanelAbstract<EntityModel> {
permanentlyHide(ID_SELECTOR_DROPDOWN);
} else {
CollectionSelectorPanel selectorDropdownPanel;
- selectorDropdownPanel = new CollectionSelectorPanel(ID_SELECTOR_DROPDOWN, entityCollectionModel, new CollectionContentsMultipleViewsPanelFactory());
+ selectorDropdownPanel = new CollectionSelectorPanel(ID_SELECTOR_DROPDOWN, entityCollectionModel);
final Model<ComponentFactory> componentFactoryModel = new Model<>();
http://git-wip-us.apache.org/repos/asf/isis/blob/0a17eb4a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/standalonecollection/StandaloneCollectionPanel.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/standalonecollection/StandaloneCollectionPanel.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/standalonecollection/StandaloneCollectionPanel.java
index c1b333d..2677297 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/standalonecollection/StandaloneCollectionPanel.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/standalonecollection/StandaloneCollectionPanel.java
@@ -46,7 +46,6 @@ import org.apache.isis.viewer.wicket.ui.components.collection.selector.Collectio
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.components.collectioncontents.multiple.CollectionContentsMultipleViewsPanelFactory;
import org.apache.isis.viewer.wicket.ui.panels.PanelAbstract;
public class StandaloneCollectionPanel extends PanelAbstract<EntityCollectionModel>
@@ -90,7 +89,7 @@ public class StandaloneCollectionPanel extends PanelAbstract<EntityCollectionMod
permanentlyHide(ID_SELECTOR_DROPDOWN);
this.selectorDropdownPanel = null;
} else {
- CollectionSelectorPanel selectorDropdownPanel = new CollectionSelectorPanel(ID_SELECTOR_DROPDOWN, entityCollectionModel, new CollectionContentsMultipleViewsPanelFactory());
+ CollectionSelectorPanel selectorDropdownPanel = new CollectionSelectorPanel(ID_SELECTOR_DROPDOWN, entityCollectionModel);
final Model<ComponentFactory> componentFactoryModel = new Model<>();