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 20:02:24 UTC
svn commit: r1144712 - in
/incubator/isis/trunk/framework/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuecollection:
ValueCollection.html ValueCollection.java
Author: kevin
Date: Sat Jul 9 18:02:24 2011
New Revision: 1144712
URL: http://svn.apache.org/viewvc?rev=1144712&view=rev
Log:
At least it renders, now, even if both a text field *and* a drop-down list are visible.
Modified:
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
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=1144712&r1=1144711&r2=1144712&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 Sat Jul 9 18:02:24 2011
@@ -26,6 +26,18 @@
<body>
<wicket:panel>
<div class="string scalarPanel">
+ <select for="scalarValue" wicket:id="scalarValue"/>
+ <label for="scalarValue" wicket:id="scalarIfRegular">
+ <input type="text" wicket:id="valueId"/>
+ <span wicket:id="scalarName" class="scalarName">[Label text]</span>
+ </label>
+
+ <!--
+ <span class="entityLink">
+ <input type="text" wicket:id="valueId"/>
+ <select wicket:id="choices"/>
+ </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=1144712&r1=1144711&r2=1144712&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 Sat Jul 9 18:02:24 2011
@@ -66,7 +66,6 @@ public class ValueCollection extends Sca
protected FormComponentLabel addComponentForRegular() {
// buildGui);
valueIdField = createField();
- syncWithInput();
// }}
addStandardSemantics();
@@ -75,6 +74,8 @@ public class ValueCollection extends Sca
final FormComponentLabel labelIfRegular = createFormComponentLabel();
addOrReplace(labelIfRegular);
+ syncWithInput();
+
addOrReplace(new ComponentFeedbackPanel(ID_FEEDBACK, valueIdField));
return labelIfRegular;
}
@@ -176,7 +177,6 @@ public class ValueCollection extends Sca
// }
private TextField<ObjectAdapterMemento> valueIdField;
- static final String ID_VALUE_DETAILS = "valueDetails";
private ObjectAdapterMemento pending;
// private void addOrReplaceIdField() {
@@ -214,8 +214,6 @@ public class ValueCollection extends Sca
if (adapter != null && scalarModel.isEntityDetailsVisible()) {
// final ScalarModel entityModel = new ScalarModel(adapter);
// addOrReplace(new EntityCombinedPanel(ID_VALUE_DETAILS, entityModel));
- } else {
- permanentlyHide(ID_VALUE_DETAILS);
}
}