You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ke...@apache.org on 2011/07/09 16:29:57 UTC

svn commit: r1144677 - in /incubator/isis/trunk/framework/viewer/wicket: ui/src/main/java/org/apache/isis/viewer/wicket/ui/ ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuecollection/ viewer/src/main/java/org/apache/isis/viewe...

Author: kevin
Date: Sat Jul  9 14:29:57 2011
New Revision: 1144677

URL: http://svn.apache.org/viewvc?rev=1144677&view=rev
Log:
Factory not needed - value choices support, continued.

Removed:
    incubator/isis/trunk/framework/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuecollection/ValueCollectionFactory.java
Modified:
    incubator/isis/trunk/framework/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/ComponentType.java
    incubator/isis/trunk/framework/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/components/ComponentFactoryListDefault.java

Modified: incubator/isis/trunk/framework/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/ComponentType.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/ComponentType.java?rev=1144677&r1=1144676&r2=1144677&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/ComponentType.java (original)
+++ incubator/isis/trunk/framework/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/ComponentType.java Sat Jul  9 14:29:57 2011
@@ -112,11 +112,7 @@ public enum ComponentType {
     /**
      * A void result from an action.
      */
-    VOID_RETURN,
-    /**
-     * A collection of values.
-     */
-    VALUE_COLLECTION;
+    VOID_RETURN;
 
     /**
      * Returns the {@link #name()} formatted as {@link Strings#camelCase(String) camel case}.

Modified: incubator/isis/trunk/framework/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/components/ComponentFactoryListDefault.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/components/ComponentFactoryListDefault.java?rev=1144677&r1=1144676&r2=1144677&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/components/ComponentFactoryListDefault.java (original)
+++ incubator/isis/trunk/framework/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/components/ComponentFactoryListDefault.java Sat Jul  9 14:29:57 2011
@@ -71,7 +71,6 @@ import org.apache.isis.viewer.wicket.ui.
 import org.apache.isis.viewer.wicket.ui.components.voidreturn.VoidReturnPanelFactory;
 import org.apache.isis.viewer.wicket.ui.components.welcome.WelcomePanelFactory;
 import org.apache.isis.viewer.wicket.ui.components.widgets.entitylink.EntityLinkFactory;
-import org.apache.isis.viewer.wicket.ui.components.widgets.valuecollection.ValueCollectionFactory;
 
 /**
  * Default implementation of {@link ComponentFactoryList} that registers a hardcoded set of built-in
@@ -124,16 +123,6 @@ public class ComponentFactoryListDefault
         addComponentFactoriesForValue(componentFactories);
         addComponentFactoriesForParameters(componentFactories);
 
-        // TODO: KAM support for value choices:
-        addComponentFactoriesForValueChoices(componentFactories);
-
-    }
-
-    /**
-     * Trying to add support for value choices.
-     */
-    protected void addComponentFactoriesForValueChoices(List<ComponentFactory> componentFactories) {
-        componentFactories.add(new ValueCollectionFactory());
     }
 
     protected void addComponentFactoriesForSpecial(final List<ComponentFactory> componentFactories) {