svn commit: r1146750 - in /incubator/isis/trunk/framework/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components: scalars/ widgets/valuechoices/

[ke...@apache.org]

Author: kevin
Date: Thu Jul 14 15:23:21 2011
New Revision: 1146750

URL: http://svn.apache.org/viewvc?rev=1146750&view=rev
Log:
Complete move and rename of ValueCollection to ValueChoicesPanel.

Added:
    incubator/isis/trunk/framework/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueChoicesPanel.css
      - copied unchanged from r1146739, incubator/isis/trunk/framework/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueCollection.css
    incubator/isis/trunk/framework/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueChoicesPanel.html
      - copied unchanged from r1146739, incubator/isis/trunk/framework/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueCollection.html
    incubator/isis/trunk/framework/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueChoicesPanel.java
      - copied, changed from r1146739, incubator/isis/trunk/framework/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueCollection.java
Removed:
    incubator/isis/trunk/framework/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueCollection.css
    incubator/isis/trunk/framework/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueCollection.html
    incubator/isis/trunk/framework/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueCollection.java
Modified:
    incubator/isis/trunk/framework/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ComponentFactoryScalarAbstract.java

Modified: incubator/isis/trunk/framework/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ComponentFactoryScalarAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ComponentFactoryScalarAbstract.java?rev=1146750&r1=1146749&r2=1146750&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ComponentFactoryScalarAbstract.java (original)
+++ incubator/isis/trunk/framework/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ComponentFactoryScalarAbstract.java Thu Jul 14 15:23:21 2011
@@ -28,7 +28,7 @@ import org.apache.isis.core.metamodel.ad
 import org.apache.isis.viewer.wicket.model.models.ScalarModel;
 import org.apache.isis.viewer.wicket.ui.ComponentFactoryAbstract;
 import org.apache.isis.viewer.wicket.ui.ComponentType;
-import org.apache.isis.viewer.wicket.ui.components.widgets.valuechoices.ValueCollection;
+import org.apache.isis.viewer.wicket.ui.components.widgets.valuechoices.ValueChoicesPanel;
 
 public abstract class ComponentFactoryScalarAbstract extends ComponentFactoryAbstract {
 
@@ -57,10 +57,10 @@ public abstract class ComponentFactorySc
         final ScalarModel scalarModel = (ScalarModel) model;
         // return createComponent(id, scalarModel);
 
-        // TODO: This is where the ValueCollection panel gets created.
+        // TODO: This is where the ValueChoicesPanel panel gets created.
         final List<ObjectAdapter> choices = scalarModel.getChoices();
         if (choices.size() > 0) {
-            return new ValueCollection(id, scalarModel);
+            return new ValueChoicesPanel(id, scalarModel);
         } else {
             return createComponent(id, scalarModel);
         }

Copied: incubator/isis/trunk/framework/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueChoicesPanel.java (from r1146739, incubator/isis/trunk/framework/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueCollection.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueChoicesPanel.java?p2=incubator/isis/trunk/framework/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueChoicesPanel.java&p1=incubator/isis/trunk/framework/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueCollection.java&r1=1146739&r2=1146750&rev=1146750&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueCollection.java (original)
+++ incubator/isis/trunk/framework/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueChoicesPanel.java Thu Jul 14 15:23:21 2011
@@ -45,8 +45,8 @@ import org.apache.isis.viewer.wicket.ui.
  * 
  * @version $Rev$ $Date$
  */
-public class ValueCollection extends ScalarPanelAbstract { // ScalarPanelTextFieldAbstract
-    private static final Logger LOG = Logger.getLogger(ValueCollection.class);
+public class ValueChoicesPanel extends ScalarPanelAbstract { // ScalarPanelTextFieldAbstract
+    private static final Logger LOG = Logger.getLogger(ValueChoicesPanel.class);
 
     private static final long serialVersionUID = 1L;
 
@@ -62,7 +62,7 @@ public class ValueCollection extends Sca
     private TextField<ObjectAdapterMemento> valueField;
     private ObjectAdapterMemento pending;
 
-    public ValueCollection(final String id, final ScalarModel scalarModel) {
+    public ValueChoicesPanel(final String id, final ScalarModel scalarModel) {
         super(id, scalarModel);
         pending = scalarModel.getObjectAdapterMemento();
     }
@@ -99,7 +99,7 @@ public class ValueCollection extends Sca
                     return pending;
                 }
                 LOG.info("TextField: pending is null");
-                final ObjectAdapter adapter = ValueCollection.this.getModelValue();
+                final ObjectAdapter adapter = ValueChoicesPanel.this.getModelValue();
                 return ObjectAdapterMemento.createOrNull(adapter);
             }