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 2011/07/15 18:39:34 UTC

svn commit: r1147225 - in /incubator/isis/trunk/framework: security/sql/ src/docbkx/guide/ viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/blocks/summary/ viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui...

Author: danhaywood
Date: Fri Jul 15 16:39:33 2011
New Revision: 1147225

URL: http://svn.apache.org/viewvc?rev=1147225&view=rev
Log:
ISIS-105 improved wicket choices support for values; also redesigned the page to put entity actions on the left, form on the right

Added:
    incubator/isis/trunk/framework/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuecollection/
      - copied from r1146473, incubator/isis/trunk/framework/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuecollection/
Modified:
    incubator/isis/trunk/framework/security/sql/pom.xml
    incubator/isis/trunk/framework/src/docbkx/guide/isis-contributors-guide.xml
    incubator/isis/trunk/framework/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/blocks/summary/EntitySummaryPanel.css
    incubator/isis/trunk/framework/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/blocks/summary/EntitySummaryPanel.html
    incubator/isis/trunk/framework/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueChoicesPanel.html
    incubator/isis/trunk/framework/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueChoicesPanel.java
    incubator/isis/trunk/framework/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuecollection/ValueCollection.html
    incubator/isis/trunk/framework/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuecollection/ValueCollection.java
    incubator/isis/trunk/framework/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.css

Modified: incubator/isis/trunk/framework/security/sql/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/security/sql/pom.xml?rev=1147225&r1=1147224&r2=1147225&view=diff
==============================================================================
--- incubator/isis/trunk/framework/security/sql/pom.xml (original)
+++ incubator/isis/trunk/framework/security/sql/pom.xml Fri Jul 15 16:39:33 2011
@@ -28,7 +28,7 @@
 
 	<groupId>org.apache.isis.security</groupId>
 	<artifactId>sql</artifactId>
-	<version>0.2.0-incubating-SNAPSHOT</version> 
+	<version>0.2.0-incubating-SNAPSHOT</version>
 
 	<name>SQL Security Implementation</name>
 

Modified: incubator/isis/trunk/framework/src/docbkx/guide/isis-contributors-guide.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/src/docbkx/guide/isis-contributors-guide.xml?rev=1147225&r1=1147224&r2=1147225&view=diff
==============================================================================
--- incubator/isis/trunk/framework/src/docbkx/guide/isis-contributors-guide.xml (original)
+++ incubator/isis/trunk/framework/src/docbkx/guide/isis-contributors-guide.xml Fri Jul 15 16:39:33 2011
@@ -4898,15 +4898,35 @@ $ svn commit -m "reintegrating release b
             </listitem>
 
             <listitem>
-              <para>Alternatively, then, you may well find it easy just to use
-              a directory comparison tool such as <emphasis>Beyond
-              Compare</emphasis> or <emphasis>WinMerge</emphasis> to compare
-              the branch workspace with the trunk workspace.</para>
-
-              <para>Set the tool's filters to compare only
-              <filename>pom.xml</filename> files, because these are the only
-              files that the release process in the branch will have updated
-              and require merging in.</para>
+              <para>Alternatively, then, you may well find it easy to perform
+              the edits manually:<itemizedlist>
+                  <listitem>
+                    <para>one option is to use a directory comparison tool
+                    such as <emphasis>Beyond Compare</emphasis> or
+                    <emphasis>WinMerge</emphasis> to compare the branch
+                    workspace with the trunk workspace.</para>
+
+                    <para>Set the tool's filters to compare only
+                    <filename>pom.xml</filename> files, because these are the
+                    only files that the release process in the branch will
+                    have updated and require merging in.</para>
+                  </listitem>
+
+                  <listitem>
+                    <para>or, you could use UNIX command line tools to perform
+                    an update.</para>
+
+                    <para>The following command will locate every pom.xml and
+                    perform in place updates, saving the original file to
+                    pom.xml.bak:</para>
+
+                    <programlisting>find . -name pom.xml -exec sed -i.bak -e 's/0\.1\.0/0\.2\.0/g' {} \;</programlisting>
+
+                    <para>The above works on Cygwin, too (though you may need
+                    to fully qualified the <filename>find</filename> command
+                    as <filename>/usr/bin/find</filename>).</para>
+                  </listitem>
+                </itemizedlist></para>
             </listitem>
           </itemizedlist>
         </sect2>

Modified: incubator/isis/trunk/framework/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/blocks/summary/EntitySummaryPanel.css
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/blocks/summary/EntitySummaryPanel.css?rev=1147225&r1=1147224&r2=1147225&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/blocks/summary/EntitySummaryPanel.css (original)
+++ incubator/isis/trunk/framework/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/blocks/summary/EntitySummaryPanel.css Fri Jul 15 16:39:33 2011
@@ -20,7 +20,16 @@
 }
 
 div.entitySummary {
-	padding:1em;
+	/*padding:1em;*/
+}
+
+div.entitySummary .iconAndTitle {
+    padding:1em;
+}
+
+div.entitySummary .actions {
+    float:left;
+    padding:1em;
 }
 
 .entitySummary .entityImage {

Modified: incubator/isis/trunk/framework/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/blocks/summary/EntitySummaryPanel.html
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/blocks/summary/EntitySummaryPanel.html?rev=1147225&r1=1147224&r2=1147225&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/blocks/summary/EntitySummaryPanel.html (original)
+++ incubator/isis/trunk/framework/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/blocks/summary/EntitySummaryPanel.html Fri Jul 15 16:39:33 2011
@@ -20,20 +20,22 @@
 <html>
 	<body>
 		<wicket:panel>
-			<div class="entitySummary panel">
-				<img wicket:id="entityImage" class="entityImage"/>
-				<label wicket:id=entityTitle" class="entityTitle">[title]</label>
-				
-				<table style="display:inline;">
-	   			<tbody>
-	      			<tr>
-						<td>
-			      			<span class="entityActions" wicket:id="entityActions"/>
-		      			</td>
-	     			</tr>
-     			</tbody>
-  			</table>
-				
+			<div class="entitySummary">
+			     <div class="iconAndTitle panel">
+    				<img wicket:id="entityImage" class="entityImage"/>
+    				<label wicket:id=entityTitle" class="entityTitle">[title]</label>
+                 </div>
+                <div class="actions panel">				
+    				<table>
+        	   			<tbody>
+        	      			<tr>
+        						<td>
+        			      			<span class="entityActions" wicket:id="entityActions"/>
+        		      			</td>
+        	     			</tr>
+             			</tbody>
+      			   </table>
+  			   </div>
 			</div>
 		</wicket:panel>
 	</body>

Modified: incubator/isis/trunk/framework/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueChoicesPanel.html
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.html?rev=1147225&r1=1147224&r2=1147225&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueChoicesPanel.html (original)
+++ incubator/isis/trunk/framework/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueChoicesPanel.html Fri Jul 15 16:39:33 2011
@@ -29,12 +29,9 @@
 				<label for="scalarValue" wicket:id="scalarIfRegular">
 					<span wicket:id="scalarName" class="scalarName">[Label text]</span>
 	      			<span class="scalarValue">
-						<input type="text" wicket:id="valueId"/>
+						<select wicket:id="valueId"/>
 					</span>
 				</label>
-	      			<span class="scalarValue">
-						<select wicket:id="scalarChoices"/>
-					</span>
 			
 				<label wicket:id="scalarIfCompact"></label>
       			<span wicket:id="feedback"></span>

Modified: incubator/isis/trunk/framework/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueChoicesPanel.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?rev=1147225&r1=1147224&r2=1147225&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueChoicesPanel.java (original)
+++ incubator/isis/trunk/framework/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueChoicesPanel.java Fri Jul 15 16:39:33 2011
@@ -18,18 +18,6 @@ package org.apache.isis.viewer.wicket.ui
 
 import java.util.List;
 
-import com.google.common.collect.Lists;
-
-import org.apache.log4j.Logger;
-import org.apache.wicket.AttributeModifier;
-import org.apache.wicket.Component;
-import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.markup.html.form.FormComponentLabel;
-import org.apache.wicket.markup.html.form.TextField;
-import org.apache.wicket.markup.html.panel.ComponentFeedbackPanel;
-import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.Model;
-
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.facets.maxlen.MaxLengthFacet;
 import org.apache.isis.core.metamodel.facets.typicallen.TypicalLengthFacet;
@@ -39,11 +27,20 @@ import org.apache.isis.viewer.wicket.mod
 import org.apache.isis.viewer.wicket.model.util.Mementos;
 import org.apache.isis.viewer.wicket.ui.components.scalars.ScalarPanelAbstract;
 import org.apache.isis.viewer.wicket.ui.components.widgets.dropdownchoices.DropDownChoicesForValueMementos;
+import org.apache.log4j.Logger;
+import org.apache.wicket.AttributeModifier;
+import org.apache.wicket.Component;
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.form.FormComponent;
+import org.apache.wicket.markup.html.form.FormComponentLabel;
+import org.apache.wicket.markup.html.panel.ComponentFeedbackPanel;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.Model;
+
+import com.google.common.collect.Lists;
 
 /**
  * Initial skeleton - trying to add support for value choices.
- * 
- * @version $Rev$ $Date$
  */
 public class ValueChoicesPanel extends ScalarPanelAbstract { // ScalarPanelTextFieldAbstract
     private static final Logger LOG = Logger.getLogger(ValueChoicesPanel.class);
@@ -55,11 +52,10 @@ public class ValueChoicesPanel extends S
     private static final String ID_FEEDBACK = "feedback";
 
     private static final String ID_SCALAR_NAME = "scalarName";
-    private static final String ID_SCALAR_VALUE_CHOICES = "scalarChoices";
 
     private static final String ID_VALUE_ID = "valueId";
 
-    private TextField<ObjectAdapterMemento> valueField;
+    private FormComponent<ObjectAdapterMemento> valueField;
     private ObjectAdapterMemento pending;
 
     public ValueChoicesPanel(final String id, final ScalarModel scalarModel) {
@@ -69,26 +65,23 @@ public class ValueChoicesPanel extends S
 
     @Override
     protected FormComponentLabel addComponentForRegular() {
-        valueField = createField();
-        valueField.setEnabled(false); // the value field is never directly editable.
-
+        
+        final IModel<ObjectAdapterMemento> modelObject = createModel();
+        final IModel<List<? extends ObjectAdapterMemento>> choicesMementos = getChoicesModel();
+        valueField = createDropDownChoices(choicesMementos, modelObject);
+        
         addStandardSemantics();
         // addSemantics();
 
-        syncWithInput(true);
-
         final FormComponentLabel labelIfRegular = createFormComponentLabel();
         addOrReplace(labelIfRegular);
 
-        addOrReplace(dropDownChoicesForValueMementos);
-
         addOrReplace(new ComponentFeedbackPanel(ID_FEEDBACK, valueField));
         return labelIfRegular;
     }
 
-    private TextField<ObjectAdapterMemento> createField() {
-
-        return new TextField<ObjectAdapterMemento>(ID_VALUE_ID, new Model<ObjectAdapterMemento>() {
+    private Model<ObjectAdapterMemento> createModel() {
+        return new Model<ObjectAdapterMemento>() {
 
             private static final long serialVersionUID = 1L;
 
@@ -116,14 +109,12 @@ public class ValueChoicesPanel extends S
 
             }
 
-        }) {
-            private static final long serialVersionUID = 1L;
         };
     }
 
     protected void addStandardSemantics() {
         setRequiredIfSpecified();
-        setTextFieldSizeIfSpecified();
+        //setSizeIfSpecified();
     }
 
     private void setRequiredIfSpecified() {
@@ -132,8 +123,9 @@ public class ValueChoicesPanel extends S
         valueField.setRequired(required);
     }
 
-    private void setTextFieldSizeIfSpecified() {
+    private void setSizeIfSpecified() {
         final int size = determineSize();
+        
         if (size != -1) {
             valueField.add(new AttributeModifier("size", true, new Model<String>("" + size)));
         }
@@ -181,32 +173,20 @@ public class ValueChoicesPanel extends S
         return scalarModel.getObject();
     }
 
-    DropDownChoicesForValueMementos dropDownChoicesForValueMementos;
-
-    private void syncWithInput(boolean readonlyMode) {
-
-        // choices drop-down
-        final IModel<List<? extends ObjectAdapterMemento>> choicesMementos = getChoicesModel();
-
-        final IModel<ObjectAdapterMemento> modelObject = valueField.getModel();
-
-        dropDownChoicesForValueMementos =
-            new DropDownChoicesForValueMementos(ID_SCALAR_VALUE_CHOICES, modelObject, choicesMementos);
 
+    private DropDownChoicesForValueMementos createDropDownChoices(final IModel<List<? extends ObjectAdapterMemento>> choicesMementos, final IModel<ObjectAdapterMemento> modelObject) {
+        String id = ID_VALUE_ID;
+        return new DropDownChoicesForValueMementos(id, modelObject, choicesMementos);
     }
 
     @Override
     protected void onBeforeRenderWhenViewMode() { // View: Read only
-        // show value as (disabled) string
-        dropDownChoicesForValueMementos.setVisible(false);
-        valueField.setVisible(true);
+        valueField.setEnabled(false);
     }
 
     @Override
     protected void onBeforeRenderWhenEnabled() { // Edit: read/write
-        // Show drop-down list of values
-        dropDownChoicesForValueMementos.setVisible(true);
-        valueField.setVisible(false);
+        valueField.setEnabled(true);
     }
 
     private IModel<List<? extends ObjectAdapterMemento>> getChoicesModel() {

Modified: incubator/isis/trunk/framework/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuecollection/ValueCollection.html
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuecollection/ValueCollection.html?rev=1147225&r1=1146473&r2=1147225&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuecollection/ValueCollection.html (original)
+++ incubator/isis/trunk/framework/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuecollection/ValueCollection.html Fri Jul 15 16:39:33 2011
@@ -29,12 +29,9 @@
 				<label for="scalarValue" wicket:id="scalarIfRegular">
 					<span wicket:id="scalarName" class="scalarName">[Label text]</span>
 	      			<span class="scalarValue">
-						<input type="text" wicket:id="valueId"/>
+						<select wicket:id="valueId"/>
 					</span>
 				</label>
-	      			<span class="scalarValue">
-						<select wicket:id="scalarChoices"/>
-					</span>
 			
 				<label wicket:id="scalarIfCompact"></label>
       			<span wicket:id="feedback"></span>

Modified: incubator/isis/trunk/framework/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuecollection/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/valuecollection/ValueCollection.java?rev=1147225&r1=1146473&r2=1147225&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuecollection/ValueCollection.java (original)
+++ incubator/isis/trunk/framework/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuecollection/ValueCollection.java Fri Jul 15 16:39:33 2011
@@ -18,18 +18,6 @@ package org.apache.isis.viewer.wicket.ui
 
 import java.util.List;
 
-import com.google.common.collect.Lists;
-
-import org.apache.log4j.Logger;
-import org.apache.wicket.AttributeModifier;
-import org.apache.wicket.Component;
-import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.markup.html.form.FormComponentLabel;
-import org.apache.wicket.markup.html.form.TextField;
-import org.apache.wicket.markup.html.panel.ComponentFeedbackPanel;
-import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.Model;
-
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.facets.maxlen.MaxLengthFacet;
 import org.apache.isis.core.metamodel.facets.typicallen.TypicalLengthFacet;
@@ -39,11 +27,20 @@ import org.apache.isis.viewer.wicket.mod
 import org.apache.isis.viewer.wicket.model.util.Mementos;
 import org.apache.isis.viewer.wicket.ui.components.scalars.ScalarPanelAbstract;
 import org.apache.isis.viewer.wicket.ui.components.widgets.dropdownchoices.DropDownChoicesForValueMementos;
+import org.apache.log4j.Logger;
+import org.apache.wicket.AttributeModifier;
+import org.apache.wicket.Component;
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.form.FormComponent;
+import org.apache.wicket.markup.html.form.FormComponentLabel;
+import org.apache.wicket.markup.html.panel.ComponentFeedbackPanel;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.Model;
+
+import com.google.common.collect.Lists;
 
 /**
  * Initial skeleton - trying to add support for value choices.
- * 
- * @version $Rev$ $Date$
  */
 public class ValueCollection extends ScalarPanelAbstract { // ScalarPanelTextFieldAbstract
     private static final Logger LOG = Logger.getLogger(ValueCollection.class);
@@ -55,11 +52,10 @@ public class ValueCollection extends Sca
     private static final String ID_FEEDBACK = "feedback";
 
     private static final String ID_SCALAR_NAME = "scalarName";
-    private static final String ID_SCALAR_VALUE_CHOICES = "scalarChoices";
 
     private static final String ID_VALUE_ID = "valueId";
 
-    private TextField<ObjectAdapterMemento> valueField;
+    private FormComponent<ObjectAdapterMemento> valueField;
     private ObjectAdapterMemento pending;
 
     public ValueCollection(final String id, final ScalarModel scalarModel) {
@@ -69,26 +65,23 @@ public class ValueCollection extends Sca
 
     @Override
     protected FormComponentLabel addComponentForRegular() {
-        valueField = createField();
-        valueField.setEnabled(false); // the value field is never directly editable.
-
+        
+        final IModel<ObjectAdapterMemento> modelObject = createModel();
+        final IModel<List<? extends ObjectAdapterMemento>> choicesMementos = getChoicesModel();
+        valueField = createDropDownChoices(choicesMementos, modelObject);
+        
         addStandardSemantics();
         // addSemantics();
 
-        syncWithInput(true);
-
         final FormComponentLabel labelIfRegular = createFormComponentLabel();
         addOrReplace(labelIfRegular);
 
-        addOrReplace(dropDownChoicesForValueMementos);
-
         addOrReplace(new ComponentFeedbackPanel(ID_FEEDBACK, valueField));
         return labelIfRegular;
     }
 
-    private TextField<ObjectAdapterMemento> createField() {
-
-        return new TextField<ObjectAdapterMemento>(ID_VALUE_ID, new Model<ObjectAdapterMemento>() {
+    private Model<ObjectAdapterMemento> createModel() {
+        return new Model<ObjectAdapterMemento>() {
 
             private static final long serialVersionUID = 1L;
 
@@ -116,14 +109,12 @@ public class ValueCollection extends Sca
 
             }
 
-        }) {
-            private static final long serialVersionUID = 1L;
         };
     }
 
     protected void addStandardSemantics() {
         setRequiredIfSpecified();
-        setTextFieldSizeIfSpecified();
+        //setSizeIfSpecified();
     }
 
     private void setRequiredIfSpecified() {
@@ -132,8 +123,9 @@ public class ValueCollection extends Sca
         valueField.setRequired(required);
     }
 
-    private void setTextFieldSizeIfSpecified() {
+    private void setSizeIfSpecified() {
         final int size = determineSize();
+        
         if (size != -1) {
             valueField.add(new AttributeModifier("size", true, new Model<String>("" + size)));
         }
@@ -181,32 +173,20 @@ public class ValueCollection extends Sca
         return scalarModel.getObject();
     }
 
-    DropDownChoicesForValueMementos dropDownChoicesForValueMementos;
-
-    private void syncWithInput(boolean readonlyMode) {
-
-        // choices drop-down
-        final IModel<List<? extends ObjectAdapterMemento>> choicesMementos = getChoicesModel();
-
-        final IModel<ObjectAdapterMemento> modelObject = valueField.getModel();
-
-        dropDownChoicesForValueMementos =
-            new DropDownChoicesForValueMementos(ID_SCALAR_VALUE_CHOICES, modelObject, choicesMementos);
 
+    private DropDownChoicesForValueMementos createDropDownChoices(final IModel<List<? extends ObjectAdapterMemento>> choicesMementos, final IModel<ObjectAdapterMemento> modelObject) {
+        String id = ID_VALUE_ID;
+        return new DropDownChoicesForValueMementos(id, modelObject, choicesMementos);
     }
 
     @Override
     protected void onBeforeRenderWhenViewMode() { // View: Read only
-        // show value as (disabled) string
-        dropDownChoicesForValueMementos.setVisible(false);
-        valueField.setVisible(true);
+        valueField.setEnabled(false);
     }
 
     @Override
     protected void onBeforeRenderWhenEnabled() { // Edit: read/write
-        // Show drop-down list of values
-        dropDownChoicesForValueMementos.setVisible(true);
-        valueField.setVisible(false);
+        valueField.setEnabled(true);
     }
 
     private IModel<List<? extends ObjectAdapterMemento>> getChoicesModel() {

Modified: incubator/isis/trunk/framework/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.css
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.css?rev=1147225&r1=1147224&r2=1147225&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.css (original)
+++ incubator/isis/trunk/framework/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.css Fri Jul 15 16:39:33 2011
@@ -78,7 +78,7 @@ body {
 }
 
 .panel, fieldset {
-	background-color: #D7E7F5;
+	/* background-color: #D7E7F5; */
 	margin: 3px 0px;
 }
 .panel {
@@ -235,7 +235,7 @@ tr.section td {
 fieldset.propertiesAndOrCollections {
 	padding-top: 1em;
 	padding-bottom: 1em;
-	background-color: #D7E7F5;
+	/* background-color: #D7E7F5; */
 }