isis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From danhayw...@apache.org
Subject svn commit: r1393105 - in /incubator/isis/trunk/framework/viewer/wicket: wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/ wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncon...
Date Tue, 02 Oct 2012 19:08:54 GMT
Author: danhaywood
Date: Tue Oct  2 19:08:52 2012
New Revision: 1393105

URL: http://svn.apache.org/viewvc?rev=1393105&view=rev
Log:
ISIS-232: select alternative views using links

rather than using the drop-down box

Added:
    incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/selector/dropdown/
    incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/selector/dropdown/CollectionContentsDropDownSelector.css
      - copied, changed from r1393101, incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/selector/CollectionContentsSelector.css
    incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/selector/dropdown/CollectionContentsDropDownSelector.html
      - copied, changed from r1393101, incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/selector/CollectionContentsSelector.html
    incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/selector/dropdown/CollectionContentsDropDownSelector.java
      - copied, changed from r1393101, incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/selector/CollectionContentsSelector.java
    incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/selector/dropdown/CollectionContentsDropDownSelectorFactory.java
      - copied, changed from r1393101, incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/selector/CollectionContentsSelectorFactory.java
    incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/selector/links/
    incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/selector/links/CollectionContentsLinksSelector.css
      - copied, changed from r1393101, incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/selector/CollectionContentsSelector.css
    incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/selector/links/CollectionContentsLinksSelector.html
      - copied, changed from r1393101, incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/selector/CollectionContentsSelector.html
    incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/selector/links/CollectionContentsLinksSelector.java
      - copied, changed from r1393101, incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/selector/CollectionContentsSelector.java
    incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/selector/links/CollectionContentsLinksSelectorFactory.java
      - copied, changed from r1393101, incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/selector/CollectionContentsSelectorFactory.java
    incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/selector/dropdown/
    incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/selector/dropdown/EntityDropDownSelector.css
      - copied, changed from r1393101, incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/selector/EntitySelector.css
    incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/selector/dropdown/EntityDropDownSelector.html
      - copied, changed from r1393101, incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/selector/EntitySelector.html
    incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/selector/dropdown/EntityDropDownSelector.java
      - copied, changed from r1393101, incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/selector/EntitySelector.java
    incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/selector/dropdown/EntityDropDownSelectorFactory.java
      - copied, changed from r1393101, incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/selector/EntitySelectorFactory.java
    incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/selector/links/
    incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/selector/links/EntityLinksSelector.css
      - copied, changed from r1393101, incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/SelectorPanelAbstract.css
    incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/selector/links/EntityLinksSelector.html
      - copied, changed from r1393101, incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/selector/EntitySelector.html
    incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/selector/links/EntityLinksSelector.java
      - copied, changed from r1393101, incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/selector/EntitySelector.java
    incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/selector/links/EntityLinksSelectorFactory.java
      - copied, changed from r1393101, incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/selector/EntitySelectorFactory.java
    incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/dropdown/
    incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/dropdown/DropDownChoiceComponentFactory.java
      - copied, changed from r1393101, incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/DropDownChoiceComponentFactory.java
    incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/dropdown/DropDownSelectorPanelAbstract.css
      - copied, changed from r1393101, incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/SelectorPanelAbstract.css
    incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/dropdown/DropDownSelectorPanelAbstract.html
      - copied, changed from r1393101, incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/SelectorPanelAbstract.html
    incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/dropdown/DropDownSelectorPanelAbstract.java
      - copied, changed from r1393101, incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/SelectorPanelAbstract.java
    incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/links/
    incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/links/LinksSelectorPanelAbstract.css
      - copied, changed from r1393101, incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/selector/EntitySelector.css
    incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/links/LinksSelectorPanelAbstract.html
      - copied, changed from r1393101, incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/SelectorPanelAbstract.html
    incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/links/LinksSelectorPanelAbstract.java
      - copied, changed from r1393101, incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/SelectorPanelAbstract.java
Removed:
    incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/selector/CollectionContentsSelector.css
    incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/selector/CollectionContentsSelector.html
    incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/selector/CollectionContentsSelector.java
    incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/selector/CollectionContentsSelectorFactory.java
    incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/selector/EntitySelector.css
    incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/selector/EntitySelector.html
    incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/selector/EntitySelector.java
    incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/selector/EntitySelectorFactory.java
    incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/DropDownChoiceComponentFactory.java
    incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/SelectorPanelAbstract.css
    incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/SelectorPanelAbstract.html
    incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/SelectorPanelAbstract.java
Modified:
    incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTableFactory.java
    incubator/isis/trunk/framework/viewer/wicket/wicket-viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/components/ComponentFactoryRegistrarDefault.java

Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTableFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTableFactory.java?rev=1393105&r1=1393104&r2=1393105&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTableFactory.java (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTableFactory.java Tue Oct  2 19:08:52 2012
@@ -34,7 +34,7 @@ public class CollectionContentsAsAjaxTab
 
     private static final long serialVersionUID = 1L;
 
-    private static final String NAME = "styled";
+    private static final String NAME = "table";
 
     public CollectionContentsAsAjaxTableFactory() {
         super(ComponentType.COLLECTION_CONTENTS, NAME);

Copied: incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/selector/dropdown/CollectionContentsDropDownSelector.css (from r1393101, incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/selector/CollectionContentsSelector.css)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/selector/dropdown/CollectionContentsDropDownSelector.css?p2=incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/selector/dropdown/CollectionContentsDropDownSelector.css&p1=incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/selector/CollectionContentsSelector.css&r1=1393101&r2=1393105&rev=1393105&view=diff
==============================================================================
    (empty)

Copied: incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/selector/dropdown/CollectionContentsDropDownSelector.html (from r1393101, incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/selector/CollectionContentsSelector.html)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/selector/dropdown/CollectionContentsDropDownSelector.html?p2=incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/selector/dropdown/CollectionContentsDropDownSelector.html&p1=incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/selector/CollectionContentsSelector.html&r1=1393101&r2=1393105&rev=1393105&view=diff
==============================================================================
    (empty)

Copied: incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/selector/dropdown/CollectionContentsDropDownSelector.java (from r1393101, incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/selector/CollectionContentsSelector.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/selector/dropdown/CollectionContentsDropDownSelector.java?p2=incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/selector/dropdown/CollectionContentsDropDownSelector.java&p1=incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/selector/CollectionContentsSelector.java&r1=1393101&r2=1393105&rev=1393105&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/selector/CollectionContentsSelector.java (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/selector/dropdown/CollectionContentsDropDownSelector.java Tue Oct  2 19:08:52 2012
@@ -17,12 +17,12 @@
  *  under the License.
  */
 
-package org.apache.isis.viewer.wicket.ui.components.collectioncontents.selector;
+package org.apache.isis.viewer.wicket.ui.components.collectioncontents.selector.dropdown;
 
 import org.apache.isis.viewer.wicket.model.models.EntityCollectionModel;
 import org.apache.isis.viewer.wicket.ui.ComponentFactory;
 import org.apache.isis.viewer.wicket.ui.ComponentType;
-import org.apache.isis.viewer.wicket.ui.selector.SelectorPanelAbstract;
+import org.apache.isis.viewer.wicket.ui.selector.dropdown.DropDownSelectorPanelAbstract;
 
 /**
  * Provides a drop-down for selecting other views that support
@@ -31,17 +31,17 @@ import org.apache.isis.viewer.wicket.ui.
  * 
  * <p>
  * Most of the heavy lifting is factored out into the superclass,
- * {@link SelectorPanelAbstract}.
+ * {@link DropDownSelectorPanelAbstract}.
  * 
  * <p>
  * Note that this class is {@link ComponentFactoryListDefault registered} prior
  * to any other views.
  */
-public class CollectionContentsSelector extends SelectorPanelAbstract<EntityCollectionModel> {
+public class CollectionContentsDropDownSelector extends DropDownSelectorPanelAbstract<EntityCollectionModel> {
 
     private static final long serialVersionUID = 1L;
 
-    public CollectionContentsSelector(final String id, final EntityCollectionModel model, final ComponentFactory factory) {
+    public CollectionContentsDropDownSelector(final String id, final EntityCollectionModel model, final ComponentFactory factory) {
         super(id, ComponentType.COLLECTION_CONTENTS.toString(), model, factory);
     }
 

Copied: incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/selector/dropdown/CollectionContentsDropDownSelectorFactory.java (from r1393101, incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/selector/CollectionContentsSelectorFactory.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/selector/dropdown/CollectionContentsDropDownSelectorFactory.java?p2=incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/selector/dropdown/CollectionContentsDropDownSelectorFactory.java&p1=incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/selector/CollectionContentsSelectorFactory.java&r1=1393101&r2=1393105&rev=1393105&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/selector/CollectionContentsSelectorFactory.java (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/selector/dropdown/CollectionContentsDropDownSelectorFactory.java Tue Oct  2 19:08:52 2012
@@ -17,7 +17,7 @@
  *  under the License.
  */
 
-package org.apache.isis.viewer.wicket.ui.components.collectioncontents.selector;
+package org.apache.isis.viewer.wicket.ui.components.collectioncontents.selector.dropdown;
 
 import org.apache.wicket.Component;
 import org.apache.wicket.model.IModel;
@@ -26,15 +26,20 @@ import org.apache.isis.viewer.wicket.mod
 import org.apache.isis.viewer.wicket.ui.ComponentFactory;
 import org.apache.isis.viewer.wicket.ui.ComponentFactoryAbstract;
 import org.apache.isis.viewer.wicket.ui.ComponentType;
+import org.apache.isis.viewer.wicket.ui.components.collectioncontents.selector.links.CollectionContentsLinksSelectorFactory;
 
 /**
- * {@link ComponentFactory} for {@link CollectionContentsSelector}.
+ * {@link ComponentFactory} for {@link CollectionContentsDropDownSelector}.
+ * 
+ * <p>
+ * Either this class or {@link CollectionContentsLinksSelectorFactory} should be
+ * registered, but not both.
  */
-public class CollectionContentsSelectorFactory extends ComponentFactoryAbstract {
+public class CollectionContentsDropDownSelectorFactory extends ComponentFactoryAbstract {
 
     private static final long serialVersionUID = 1L;
 
-    public CollectionContentsSelectorFactory() {
+    public CollectionContentsDropDownSelectorFactory() {
         super(ComponentType.COLLECTION_CONTENTS);
     }
 
@@ -46,6 +51,6 @@ public class CollectionContentsSelectorF
     @Override
     public Component createComponent(final String id, final IModel<?> model) {
         final EntityCollectionModel collectionModel = (EntityCollectionModel) model;
-        return new CollectionContentsSelector(id, collectionModel, this);
+        return new CollectionContentsDropDownSelector(id, collectionModel, this);
     }
 }

Copied: incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/selector/links/CollectionContentsLinksSelector.css (from r1393101, incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/selector/CollectionContentsSelector.css)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/selector/links/CollectionContentsLinksSelector.css?p2=incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/selector/links/CollectionContentsLinksSelector.css&p1=incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/selector/CollectionContentsSelector.css&r1=1393101&r2=1393105&rev=1393105&view=diff
==============================================================================
    (empty)

Copied: incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/selector/links/CollectionContentsLinksSelector.html (from r1393101, incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/selector/CollectionContentsSelector.html)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/selector/links/CollectionContentsLinksSelector.html?p2=incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/selector/links/CollectionContentsLinksSelector.html&p1=incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/selector/CollectionContentsSelector.html&r1=1393101&r2=1393105&rev=1393105&view=diff
==============================================================================
    (empty)

Copied: incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/selector/links/CollectionContentsLinksSelector.java (from r1393101, incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/selector/CollectionContentsSelector.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/selector/links/CollectionContentsLinksSelector.java?p2=incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/selector/links/CollectionContentsLinksSelector.java&p1=incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/selector/CollectionContentsSelector.java&r1=1393101&r2=1393105&rev=1393105&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/selector/CollectionContentsSelector.java (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/selector/links/CollectionContentsLinksSelector.java Tue Oct  2 19:08:52 2012
@@ -17,31 +17,27 @@
  *  under the License.
  */
 
-package org.apache.isis.viewer.wicket.ui.components.collectioncontents.selector;
+package org.apache.isis.viewer.wicket.ui.components.collectioncontents.selector.links;
 
 import org.apache.isis.viewer.wicket.model.models.EntityCollectionModel;
 import org.apache.isis.viewer.wicket.ui.ComponentFactory;
 import org.apache.isis.viewer.wicket.ui.ComponentType;
-import org.apache.isis.viewer.wicket.ui.selector.SelectorPanelAbstract;
+import org.apache.isis.viewer.wicket.ui.selector.links.LinksSelectorPanelAbstract;
 
 /**
- * Provides a drop-down for selecting other views that support
+ * Provides a list of links for selecting other views that support
  * {@link ComponentType#COLLECTION_CONTENTS} with a backing
  * {@link EntityCollectionModel}.
  * 
  * <p>
  * Most of the heavy lifting is factored out into the superclass,
- * {@link SelectorPanelAbstract}.
- * 
- * <p>
- * Note that this class is {@link ComponentFactoryListDefault registered} prior
- * to any other views.
+ * {@link LinksSelectorPanelAbstract}.
  */
-public class CollectionContentsSelector extends SelectorPanelAbstract<EntityCollectionModel> {
+public class CollectionContentsLinksSelector extends LinksSelectorPanelAbstract<EntityCollectionModel> {
 
     private static final long serialVersionUID = 1L;
 
-    public CollectionContentsSelector(final String id, final EntityCollectionModel model, final ComponentFactory factory) {
+    public CollectionContentsLinksSelector(final String id, final EntityCollectionModel model, final ComponentFactory factory) {
         super(id, ComponentType.COLLECTION_CONTENTS.toString(), model, factory);
     }
 

Copied: incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/selector/links/CollectionContentsLinksSelectorFactory.java (from r1393101, incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/selector/CollectionContentsSelectorFactory.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/selector/links/CollectionContentsLinksSelectorFactory.java?p2=incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/selector/links/CollectionContentsLinksSelectorFactory.java&p1=incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/selector/CollectionContentsSelectorFactory.java&r1=1393101&r2=1393105&rev=1393105&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/selector/CollectionContentsSelectorFactory.java (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/selector/links/CollectionContentsLinksSelectorFactory.java Tue Oct  2 19:08:52 2012
@@ -17,7 +17,7 @@
  *  under the License.
  */
 
-package org.apache.isis.viewer.wicket.ui.components.collectioncontents.selector;
+package org.apache.isis.viewer.wicket.ui.components.collectioncontents.selector.links;
 
 import org.apache.wicket.Component;
 import org.apache.wicket.model.IModel;
@@ -26,15 +26,20 @@ import org.apache.isis.viewer.wicket.mod
 import org.apache.isis.viewer.wicket.ui.ComponentFactory;
 import org.apache.isis.viewer.wicket.ui.ComponentFactoryAbstract;
 import org.apache.isis.viewer.wicket.ui.ComponentType;
+import org.apache.isis.viewer.wicket.ui.components.collectioncontents.selector.dropdown.CollectionContentsDropDownSelectorFactory;
 
 /**
- * {@link ComponentFactory} for {@link CollectionContentsSelector}.
+ * {@link ComponentFactory} for {@link CollectionContentsLinksSelector}.
+ * 
+ * <p>
+ * Either this class or {@link CollectionContentsDropDownSelectorFactory} should be
+ * registered, but not both.
  */
-public class CollectionContentsSelectorFactory extends ComponentFactoryAbstract {
+public class CollectionContentsLinksSelectorFactory extends ComponentFactoryAbstract {
 
     private static final long serialVersionUID = 1L;
 
-    public CollectionContentsSelectorFactory() {
+    public CollectionContentsLinksSelectorFactory() {
         super(ComponentType.COLLECTION_CONTENTS);
     }
 
@@ -46,6 +51,6 @@ public class CollectionContentsSelectorF
     @Override
     public Component createComponent(final String id, final IModel<?> model) {
         final EntityCollectionModel collectionModel = (EntityCollectionModel) model;
-        return new CollectionContentsSelector(id, collectionModel, this);
+        return new CollectionContentsLinksSelector(id, collectionModel, this);
     }
 }

Copied: incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/selector/dropdown/EntityDropDownSelector.css (from r1393101, incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/selector/EntitySelector.css)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/selector/dropdown/EntityDropDownSelector.css?p2=incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/selector/dropdown/EntityDropDownSelector.css&p1=incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/selector/EntitySelector.css&r1=1393101&r2=1393105&rev=1393105&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/selector/EntitySelector.css (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/selector/dropdown/EntityDropDownSelector.css Tue Oct  2 19:08:52 2012
@@ -16,6 +16,6 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-.entitiesSelector select {
+.entitySelector select {
 	margin-bottom: 1em;
 }

Copied: incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/selector/dropdown/EntityDropDownSelector.html (from r1393101, incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/selector/EntitySelector.html)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/selector/dropdown/EntityDropDownSelector.html?p2=incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/selector/dropdown/EntityDropDownSelector.html&p1=incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/selector/EntitySelector.html&r1=1393101&r2=1393105&rev=1393105&view=diff
==============================================================================
    (empty)

Copied: incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/selector/dropdown/EntityDropDownSelector.java (from r1393101, incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/selector/EntitySelector.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/selector/dropdown/EntityDropDownSelector.java?p2=incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/selector/dropdown/EntityDropDownSelector.java&p1=incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/selector/EntitySelector.java&r1=1393101&r2=1393105&rev=1393105&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/selector/EntitySelector.java (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/selector/dropdown/EntityDropDownSelector.java Tue Oct  2 19:08:52 2012
@@ -17,12 +17,12 @@
  *  under the License.
  */
 
-package org.apache.isis.viewer.wicket.ui.components.entity.selector;
+package org.apache.isis.viewer.wicket.ui.components.entity.selector.dropdown;
 
 import org.apache.isis.viewer.wicket.model.models.EntityModel;
 import org.apache.isis.viewer.wicket.ui.ComponentFactory;
 import org.apache.isis.viewer.wicket.ui.ComponentType;
-import org.apache.isis.viewer.wicket.ui.selector.SelectorPanelAbstract;
+import org.apache.isis.viewer.wicket.ui.selector.dropdown.DropDownSelectorPanelAbstract;
 
 /**
  * Provides a drop-down for selecting other views that support
@@ -30,18 +30,18 @@ import org.apache.isis.viewer.wicket.ui.
  * 
  * <p>
  * Most of the heavy lifting is factored out into the superclass,
- * {@link SelectorPanelAbstract}.
+ * {@link DropDownSelectorPanelAbstract}.
  * 
  * <p>
  * Note that this class should be registered (in
  * <tt>ComponentFactoryListDefault</tt>) prior to any other views.
  */
-public class EntitySelector extends SelectorPanelAbstract<EntityModel> {
+public class EntityDropDownSelector extends DropDownSelectorPanelAbstract<EntityModel> {
 
     private static final long serialVersionUID = 1L;
 
-    public EntitySelector(final String id, final EntityModel model, final ComponentFactory factory) {
-        super(id, "entity", model, factory);
+    public EntityDropDownSelector(final String id, final EntityModel model, final ComponentFactory factory) {
+        super(id, ComponentType.ENTITY.toString(), model, factory);
     }
 
 }

Copied: incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/selector/dropdown/EntityDropDownSelectorFactory.java (from r1393101, incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/selector/EntitySelectorFactory.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/selector/dropdown/EntityDropDownSelectorFactory.java?p2=incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/selector/dropdown/EntityDropDownSelectorFactory.java&p1=incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/selector/EntitySelectorFactory.java&r1=1393101&r2=1393105&rev=1393105&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/selector/EntitySelectorFactory.java (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/selector/dropdown/EntityDropDownSelectorFactory.java Tue Oct  2 19:08:52 2012
@@ -17,7 +17,7 @@
  *  under the License.
  */
 
-package org.apache.isis.viewer.wicket.ui.components.entity.selector;
+package org.apache.isis.viewer.wicket.ui.components.entity.selector.dropdown;
 
 import org.apache.wicket.Component;
 import org.apache.wicket.model.IModel;
@@ -26,21 +26,26 @@ import org.apache.isis.viewer.wicket.mod
 import org.apache.isis.viewer.wicket.ui.ComponentFactory;
 import org.apache.isis.viewer.wicket.ui.ComponentType;
 import org.apache.isis.viewer.wicket.ui.components.entity.EntityComponentFactoryAbstract;
+import org.apache.isis.viewer.wicket.ui.components.entity.selector.links.EntityLinksSelectorFactory;
 
 /**
- * {@link ComponentFactory} for {@link EntitySelector}.
+ * {@link ComponentFactory} for {@link EntityDropDownSelector}.
+ * 
+ * <p>
+ * Either this selector, or {@link EntityLinksSelectorFactory} should be registered;
+ * but not both.
  */
-public class EntitySelectorFactory extends EntityComponentFactoryAbstract {
+public class EntityDropDownSelectorFactory extends EntityComponentFactoryAbstract {
 
     private static final long serialVersionUID = 1L;
 
-    public EntitySelectorFactory() {
+    public EntityDropDownSelectorFactory() {
         super(ComponentType.ENTITY);
     }
 
     @Override
     public Component createComponent(final String id, final IModel<?> model) {
         final EntityModel entityModel = (EntityModel) model;
-        return new EntitySelector(id, entityModel, this);
+        return new EntityDropDownSelector(id, entityModel, this);
     }
 }

Copied: incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/selector/links/EntityLinksSelector.css (from r1393101, incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/SelectorPanelAbstract.css)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/selector/links/EntityLinksSelector.css?p2=incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/selector/links/EntityLinksSelector.css&p1=incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/SelectorPanelAbstract.css&r1=1393101&r2=1393105&rev=1393105&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/SelectorPanelAbstract.css (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/selector/links/EntityLinksSelector.css Tue Oct  2 19:08:52 2012
@@ -16,6 +16,3 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-.selector > p {
-	margin-bottom: 0.8em;
-}
\ No newline at end of file

Copied: incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/selector/links/EntityLinksSelector.html (from r1393101, incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/selector/EntitySelector.html)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/selector/links/EntityLinksSelector.html?p2=incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/selector/links/EntityLinksSelector.html&p1=incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/selector/EntitySelector.html&r1=1393101&r2=1393105&rev=1393105&view=diff
==============================================================================
    (empty)

Copied: incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/selector/links/EntityLinksSelector.java (from r1393101, incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/selector/EntitySelector.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/selector/links/EntityLinksSelector.java?p2=incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/selector/links/EntityLinksSelector.java&p1=incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/selector/EntitySelector.java&r1=1393101&r2=1393105&rev=1393105&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/selector/EntitySelector.java (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/selector/links/EntityLinksSelector.java Tue Oct  2 19:08:52 2012
@@ -17,31 +17,27 @@
  *  under the License.
  */
 
-package org.apache.isis.viewer.wicket.ui.components.entity.selector;
+package org.apache.isis.viewer.wicket.ui.components.entity.selector.links;
 
 import org.apache.isis.viewer.wicket.model.models.EntityModel;
 import org.apache.isis.viewer.wicket.ui.ComponentFactory;
 import org.apache.isis.viewer.wicket.ui.ComponentType;
-import org.apache.isis.viewer.wicket.ui.selector.SelectorPanelAbstract;
+import org.apache.isis.viewer.wicket.ui.selector.links.LinksSelectorPanelAbstract;
 
 /**
- * Provides a drop-down for selecting other views that support
+ * Provides a list of links for selecting other views that support
  * {@link ComponentType#ENTITY} with a backing {@link EntityModel}.
  * 
  * <p>
  * Most of the heavy lifting is factored out into the superclass,
- * {@link SelectorPanelAbstract}.
- * 
- * <p>
- * Note that this class should be registered (in
- * <tt>ComponentFactoryListDefault</tt>) prior to any other views.
+ * {@link LinksSelectorPanelAbstract}.
  */
-public class EntitySelector extends SelectorPanelAbstract<EntityModel> {
+public class EntityLinksSelector extends LinksSelectorPanelAbstract<EntityModel> {
 
     private static final long serialVersionUID = 1L;
 
-    public EntitySelector(final String id, final EntityModel model, final ComponentFactory factory) {
-        super(id, "entity", model, factory);
+    public EntityLinksSelector(final String id, final EntityModel model, final ComponentFactory factory) {
+        super(id, ComponentType.ENTITY.toString(), model, factory);
     }
 
 }

Copied: incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/selector/links/EntityLinksSelectorFactory.java (from r1393101, incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/selector/EntitySelectorFactory.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/selector/links/EntityLinksSelectorFactory.java?p2=incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/selector/links/EntityLinksSelectorFactory.java&p1=incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/selector/EntitySelectorFactory.java&r1=1393101&r2=1393105&rev=1393105&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/selector/EntitySelectorFactory.java (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/selector/links/EntityLinksSelectorFactory.java Tue Oct  2 19:08:52 2012
@@ -17,7 +17,7 @@
  *  under the License.
  */
 
-package org.apache.isis.viewer.wicket.ui.components.entity.selector;
+package org.apache.isis.viewer.wicket.ui.components.entity.selector.links;
 
 import org.apache.wicket.Component;
 import org.apache.wicket.model.IModel;
@@ -26,21 +26,26 @@ import org.apache.isis.viewer.wicket.mod
 import org.apache.isis.viewer.wicket.ui.ComponentFactory;
 import org.apache.isis.viewer.wicket.ui.ComponentType;
 import org.apache.isis.viewer.wicket.ui.components.entity.EntityComponentFactoryAbstract;
+import org.apache.isis.viewer.wicket.ui.components.entity.selector.dropdown.EntityDropDownSelectorFactory;
 
 /**
- * {@link ComponentFactory} for {@link EntitySelector}.
+ * {@link ComponentFactory} for {@link EntityLinksSelector}.
+ * 
+ * <p>
+ * Either this selector, or {@link EntityDropDownSelectorFactory} should be registered;
+ * but not both.
  */
-public class EntitySelectorFactory extends EntityComponentFactoryAbstract {
+public class EntityLinksSelectorFactory extends EntityComponentFactoryAbstract {
 
     private static final long serialVersionUID = 1L;
 
-    public EntitySelectorFactory() {
+    public EntityLinksSelectorFactory() {
         super(ComponentType.ENTITY);
     }
 
     @Override
     public Component createComponent(final String id, final IModel<?> model) {
         final EntityModel entityModel = (EntityModel) model;
-        return new EntitySelector(id, entityModel, this);
+        return new EntityLinksSelector(id, entityModel, this);
     }
 }

Copied: incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/dropdown/DropDownChoiceComponentFactory.java (from r1393101, incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/DropDownChoiceComponentFactory.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/dropdown/DropDownChoiceComponentFactory.java?p2=incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/dropdown/DropDownChoiceComponentFactory.java&p1=incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/DropDownChoiceComponentFactory.java&r1=1393101&r2=1393105&rev=1393105&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/DropDownChoiceComponentFactory.java (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/dropdown/DropDownChoiceComponentFactory.java Tue Oct  2 19:08:52 2012
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.viewer.wicket.ui.selector;
+package org.apache.isis.viewer.wicket.ui.selector.dropdown;
 
 import java.util.List;
 
@@ -34,7 +34,7 @@ import org.apache.isis.viewer.wicket.ui.
  * {@link ComponentFactory}s.
  * 
  * <p>
- * Used by {@link SelectorPanelAbstract}.
+ * Used by {@link DropDownSelectorPanelAbstract}.
  */
 public class DropDownChoiceComponentFactory extends DropDownChoice<ComponentFactory> {
 

Copied: incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/dropdown/DropDownSelectorPanelAbstract.css (from r1393101, incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/SelectorPanelAbstract.css)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/dropdown/DropDownSelectorPanelAbstract.css?p2=incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/dropdown/DropDownSelectorPanelAbstract.css&p1=incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/SelectorPanelAbstract.css&r1=1393101&r2=1393105&rev=1393105&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/SelectorPanelAbstract.css (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/dropdown/DropDownSelectorPanelAbstract.css Tue Oct  2 19:08:52 2012
@@ -16,6 +16,6 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-.selector > p {
+.dropDownSelector > p {
 	margin-bottom: 0.8em;
 }
\ No newline at end of file

Copied: incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/dropdown/DropDownSelectorPanelAbstract.html (from r1393101, incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/SelectorPanelAbstract.html)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/dropdown/DropDownSelectorPanelAbstract.html?p2=incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/dropdown/DropDownSelectorPanelAbstract.html&p1=incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/SelectorPanelAbstract.html&r1=1393101&r2=1393105&rev=1393105&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/SelectorPanelAbstract.html (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/dropdown/DropDownSelectorPanelAbstract.html Tue Oct  2 19:08:52 2012
@@ -21,8 +21,9 @@
 <html>
 	<body>
 		<wicket:panel>
-			<div class="selector">
-				<p wicket:id="views"><select wicket:id="viewsDropDown"/>
+			<div class="dropDownSelector">
+				<p wicket:id="views">
+					<select wicket:id="viewsDropDown"/>
 				</p>
 				<div class="views">
 					<wicket:child/>

Copied: incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/dropdown/DropDownSelectorPanelAbstract.java (from r1393101, incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/SelectorPanelAbstract.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/dropdown/DropDownSelectorPanelAbstract.java?p2=incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/dropdown/DropDownSelectorPanelAbstract.java&p1=incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/SelectorPanelAbstract.java&r1=1393101&r2=1393105&rev=1393105&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/SelectorPanelAbstract.java (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/dropdown/DropDownSelectorPanelAbstract.java Tue Oct  2 19:08:52 2012
@@ -17,7 +17,7 @@
  *  under the License.
  */
 
-package org.apache.isis.viewer.wicket.ui.selector;
+package org.apache.isis.viewer.wicket.ui.selector.dropdown;
 
 import java.util.List;
 
@@ -43,7 +43,7 @@ import org.apache.isis.viewer.wicket.ui.
 import org.apache.isis.viewer.wicket.ui.components.collectioncontents.unresolved.CollectionContentsAsUnresolvedFactory;
 import org.apache.isis.viewer.wicket.ui.panels.PanelAbstract;
 
-public abstract class SelectorPanelAbstract<T extends IModel<?>> extends PanelAbstract<T> {
+public abstract class DropDownSelectorPanelAbstract<T extends IModel<?>> extends PanelAbstract<T> {
 
     private static final long serialVersionUID = 1L;
 
@@ -52,7 +52,7 @@ public abstract class SelectorPanelAbstr
 
     private final ComponentType componentType;
 
-    public SelectorPanelAbstract(final String id, final String underlyingId, final T model, final ComponentFactory factory) {
+    public DropDownSelectorPanelAbstract(final String id, final String underlyingId, final T model, final ComponentFactory factory) {
         super(id, model);
 
         componentType = factory.getComponentType();
@@ -70,17 +70,19 @@ public abstract class SelectorPanelAbstr
             componentFactoryModel.setObject(selectedComponentFactory);
 
             final WebMarkupContainer views = new WebMarkupContainer(ID_VIEWS);
+            
             final DropDownChoiceComponentFactory viewsDropDown = new DropDownChoiceComponentFactory(ID_VIEWS_DROP_DOWN, componentFactoryModel, componentFactories, this, underlyingId, model);
             views.addOrReplace(viewsDropDown);
+
             addOrReplace(views);
         } else {
             permanentlyHide(ID_VIEWS);
         }
         addOrReplace(selectedComponentFactory.createComponent(underlyingId, model));
     }
-    
+
     private static Predicate<ComponentFactory> determineInitialFactory(IModel<?> model) {
-        return isResolveFacet(model) 
+        return hasResolveEagerlyFacet(model) 
                 ? new Predicate<ComponentFactory>() {
                     @Override
                     public boolean apply(@Nullable ComponentFactory input) {
@@ -90,7 +92,7 @@ public abstract class SelectorPanelAbstr
                 : Predicates.<ComponentFactory>alwaysTrue();
     }
 
-    private static boolean isResolveFacet(IModel<?> model) {
+    private static boolean hasResolveEagerlyFacet(IModel<?> model) {
         if(!(model instanceof EntityCollectionModel)) {
             return false;
         }
@@ -118,7 +120,6 @@ public abstract class SelectorPanelAbstr
     @Override
     public void renderHead(final IHeaderResponse response) {
         super.renderHead(response);
-        renderHead(response, SelectorPanelAbstract.class);
+        renderHead(response, DropDownSelectorPanelAbstract.class);
     }
-
 }

Copied: incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/links/LinksSelectorPanelAbstract.css (from r1393101, incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/selector/EntitySelector.css)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/links/LinksSelectorPanelAbstract.css?p2=incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/links/LinksSelectorPanelAbstract.css&p1=incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/selector/EntitySelector.css&r1=1393101&r2=1393105&rev=1393105&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/selector/EntitySelector.css (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/links/LinksSelectorPanelAbstract.css Tue Oct  2 19:08:52 2012
@@ -16,6 +16,20 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-.entitiesSelector select {
-	margin-bottom: 1em;
+
+.linksSelector .viewList {
+	font-size: smaller;
 }
+
+.linksSelector .viewList {
+	display: inline;
+}
+
+.linksSelector .viewList span {
+	margin-right: 8px;
+}
+
+.linksSelector .viewItem {
+	display: inline;
+}
+

Copied: incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/links/LinksSelectorPanelAbstract.html (from r1393101, incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/SelectorPanelAbstract.html)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/links/LinksSelectorPanelAbstract.html?p2=incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/links/LinksSelectorPanelAbstract.html&p1=incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/SelectorPanelAbstract.html&r1=1393101&r2=1393105&rev=1393105&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/SelectorPanelAbstract.html (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/links/LinksSelectorPanelAbstract.html Tue Oct  2 19:08:52 2012
@@ -21,8 +21,15 @@
 <html>
 	<body>
 		<wicket:panel>
-			<div class="selector">
-				<p wicket:id="views"><select wicket:id="viewsDropDown"/>
+			<div class="linksSelector">
+				<p wicket:id="views">
+					<ul wicket:id="viewList" class="viewList">
+				  		<li wicket:id="viewItem" class="viewItem">
+				  			<a href="#" wicket:id="viewLink">
+				  				<span wicket:id="viewTitle">[link title]</span>
+			  				</a>
+			  	  		</li>
+					</ul>
 				</p>
 				<div class="views">
 					<wicket:child/>

Copied: incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/links/LinksSelectorPanelAbstract.java (from r1393101, incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/SelectorPanelAbstract.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/links/LinksSelectorPanelAbstract.java?p2=incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/links/LinksSelectorPanelAbstract.java&p1=incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/SelectorPanelAbstract.java&r1=1393101&r2=1393105&rev=1393105&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/SelectorPanelAbstract.java (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/links/LinksSelectorPanelAbstract.java Tue Oct  2 19:08:52 2012
@@ -17,7 +17,7 @@
  *  under the License.
  */
 
-package org.apache.isis.viewer.wicket.ui.selector;
+package org.apache.isis.viewer.wicket.ui.selector.links;
 
 import java.util.List;
 
@@ -29,8 +29,14 @@ import com.google.common.collect.Collect
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
 
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.markup.html.AjaxLink;
 import org.apache.wicket.markup.head.IHeaderResponse;
 import org.apache.wicket.markup.html.WebMarkupContainer;
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.link.AbstractLink;
+import org.apache.wicket.markup.html.list.ListItem;
+import org.apache.wicket.markup.html.list.ListView;
 import org.apache.wicket.model.IModel;
 import org.apache.wicket.model.Model;
 
@@ -43,16 +49,22 @@ import org.apache.isis.viewer.wicket.ui.
 import org.apache.isis.viewer.wicket.ui.components.collectioncontents.unresolved.CollectionContentsAsUnresolvedFactory;
 import org.apache.isis.viewer.wicket.ui.panels.PanelAbstract;
 
-public abstract class SelectorPanelAbstract<T extends IModel<?>> extends PanelAbstract<T> {
+public abstract class LinksSelectorPanelAbstract<T extends IModel<?>> extends PanelAbstract<T> {
 
     private static final long serialVersionUID = 1L;
 
     private static final String ID_VIEWS = "views";
-    private static final String ID_VIEWS_DROP_DOWN = "viewsDropDown";
+
+    private static final String ID_VIEW_LIST = "viewList";
+    private static final String ID_VIEW_LINK = "viewLink";
+    private static final String ID_VIEW_ITEM = "viewItem";
+    private static final String ID_VIEW_TITLE = "viewTitle";
 
     private final ComponentType componentType;
 
-    public SelectorPanelAbstract(final String id, final String underlyingId, final T model, final ComponentFactory factory) {
+    private ComponentFactory selectedComponentFactory;
+
+    public LinksSelectorPanelAbstract(final String id, final String underlyingId, final T model, final ComponentFactory factory) {
         super(id, model);
 
         componentType = factory.getComponentType();
@@ -70,17 +82,60 @@ public abstract class SelectorPanelAbstr
             componentFactoryModel.setObject(selectedComponentFactory);
 
             final WebMarkupContainer views = new WebMarkupContainer(ID_VIEWS);
-            final DropDownChoiceComponentFactory viewsDropDown = new DropDownChoiceComponentFactory(ID_VIEWS_DROP_DOWN, componentFactoryModel, componentFactories, this, underlyingId, model);
-            views.addOrReplace(viewsDropDown);
+            
+            final WebMarkupContainer container = new WebMarkupContainer(ID_VIEW_LIST);
+            
+            views.addOrReplace(container);
+            views.setOutputMarkupId(true);
+            
+            this.setOutputMarkupId(true);
+
+            final ListView<ComponentFactory> listView = new ListView<ComponentFactory>(ID_VIEW_ITEM, componentFactories) {
+
+                private static final long serialVersionUID = 1L;
+
+                @Override
+                protected void populateItem(ListItem<ComponentFactory> item) {
+                    final ComponentFactory componentFactory = item.getModelObject();
+                    
+                    final AbstractLink link = new AjaxLink<Void>(ID_VIEW_LINK) {
+
+                                private static final long serialVersionUID = 1L;
+
+                                @Override
+                                public void onClick(AjaxRequestTarget target) {
+                                    LinksSelectorPanelAbstract<T> selectorPanel = LinksSelectorPanelAbstract.this;
+                                    selectorPanel.select(underlyingId, model, componentFactory);
+                                    target.add(selectorPanel, views);
+                                }
+                            };
+                            
+                    link.add(new Label(ID_VIEW_TITLE, nameFor(componentFactory)));
+                    item.add(link);
+                    LinksSelectorPanelAbstract<T> selectorPanel = LinksSelectorPanelAbstract.this;
+                    link.setEnabled(selectorPanel.selectedComponentFactory != componentFactory);
+                }
+
+                private String nameFor(final ComponentFactory componentFactory) {
+                    return componentFactory instanceof CollectionContentsAsUnresolvedFactory ? "hide" : componentFactory.getName();
+                }
+            };
+            container.add(listView);
+            
             addOrReplace(views);
         } else {
             permanentlyHide(ID_VIEWS);
         }
+        select(underlyingId, model, selectedComponentFactory);
+    }
+
+    private void select(final String underlyingId, final T model, final ComponentFactory selectedComponentFactory) {
         addOrReplace(selectedComponentFactory.createComponent(underlyingId, model));
+        this.selectedComponentFactory = selectedComponentFactory;
     }
-    
+
     private static Predicate<ComponentFactory> determineInitialFactory(IModel<?> model) {
-        return isResolveFacet(model) 
+        return hasResolveEagerlyFacet(model) 
                 ? new Predicate<ComponentFactory>() {
                     @Override
                     public boolean apply(@Nullable ComponentFactory input) {
@@ -90,7 +145,7 @@ public abstract class SelectorPanelAbstr
                 : Predicates.<ComponentFactory>alwaysTrue();
     }
 
-    private static boolean isResolveFacet(IModel<?> model) {
+    private static boolean hasResolveEagerlyFacet(IModel<?> model) {
         if(!(model instanceof EntityCollectionModel)) {
             return false;
         }
@@ -118,7 +173,7 @@ public abstract class SelectorPanelAbstr
     @Override
     public void renderHead(final IHeaderResponse response) {
         super.renderHead(response);
-        renderHead(response, SelectorPanelAbstract.class);
+        renderHead(response, LinksSelectorPanelAbstract.class);
     }
 
 }

Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/components/ComponentFactoryRegistrarDefault.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/components/ComponentFactoryRegistrarDefault.java?rev=1393105&r1=1393104&r2=1393105&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/components/ComponentFactoryRegistrarDefault.java (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/components/ComponentFactoryRegistrarDefault.java Tue Oct  2 19:08:52 2012
@@ -35,7 +35,8 @@ import org.apache.isis.viewer.wicket.ui.
 import org.apache.isis.viewer.wicket.ui.components.collection.CollectionPanelFactory;
 import org.apache.isis.viewer.wicket.ui.components.collectioncontents.ajaxtable.CollectionContentsAsAjaxTableFactory;
 import org.apache.isis.viewer.wicket.ui.components.collectioncontents.icons.CollectionContentsAsIconsFactory;
-import org.apache.isis.viewer.wicket.ui.components.collectioncontents.selector.CollectionContentsSelectorFactory;
+import org.apache.isis.viewer.wicket.ui.components.collectioncontents.selector.dropdown.CollectionContentsDropDownSelectorFactory;
+import org.apache.isis.viewer.wicket.ui.components.collectioncontents.selector.links.CollectionContentsLinksSelectorFactory;
 import org.apache.isis.viewer.wicket.ui.components.collectioncontents.unresolved.CollectionContentsAsUnresolvedFactory;
 import org.apache.isis.viewer.wicket.ui.components.empty.EmptyCollectionPanelFactory;
 import org.apache.isis.viewer.wicket.ui.components.entity.blocks.icontitle.EntityIconAndTitlePanelFactory;
@@ -45,7 +46,8 @@ import org.apache.isis.viewer.wicket.ui.
 import org.apache.isis.viewer.wicket.ui.components.entity.blocks.propcoll.EntityPropertiesPanelFactory;
 import org.apache.isis.viewer.wicket.ui.components.entity.blocks.summary.EntitySummaryPanelFactory;
 import org.apache.isis.viewer.wicket.ui.components.entity.combined.EntityCombinedPanelFactory;
-import org.apache.isis.viewer.wicket.ui.components.entity.selector.EntitySelectorFactory;
+import org.apache.isis.viewer.wicket.ui.components.entity.selector.dropdown.EntityDropDownSelectorFactory;
+import org.apache.isis.viewer.wicket.ui.components.entity.selector.links.EntityLinksSelectorFactory;
 import org.apache.isis.viewer.wicket.ui.components.scalars.isisapplib.IsisColorPanelFactory;
 import org.apache.isis.viewer.wicket.ui.components.scalars.isisapplib.IsisDatePanelFactory;
 import org.apache.isis.viewer.wicket.ui.components.scalars.isisapplib.IsisDateTimePanelFactory;
@@ -107,11 +109,23 @@ public class ComponentFactoryRegistrarDe
      */
     protected void addComponentFactoriesActingAsSelectors(final ComponentFactoryList componentFactories) {
         
-    	componentFactories.add(new EntitySelectorFactory());
-    	
-        componentFactories.add(new CollectionContentsSelectorFactory());
-        componentFactories.add(new CollectionContentsAsUnresolvedFactory()); // make
-                                                                             // first
+        // either this set...
+    	// addDropDownSelectorFactories(componentFactories);
+
+        // ... or this set (but not both)
+        addLinksSelectorFactories(componentFactories);
+
+        componentFactories.add(new CollectionContentsAsUnresolvedFactory()); // to prevent eager loading
+    }
+
+    protected void addLinksSelectorFactories(final ComponentFactoryList componentFactories) {
+        componentFactories.add(new EntityLinksSelectorFactory());
+        componentFactories.add(new CollectionContentsLinksSelectorFactory());
+    }
+
+    protected void addDropDownSelectorFactories(final ComponentFactoryList componentFactories) {
+        componentFactories.add(new EntityDropDownSelectorFactory());
+        componentFactories.add(new CollectionContentsDropDownSelectorFactory());
     }
 
     protected void addComponentFactoriesUsingServiceLoader(final ComponentFactoryList componentFactories) {



Mime
View raw message