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/11 18:00:48 UTC
svn commit: r1145215 - in /incubator/isis/trunk/framework/viewer/wicket:
ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/
ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/dropdownchoices/
ui/src/main/java/org/ap...
Author: kevin
Date: Mon Jul 11 16:00:47 2011
New Revision: 1145215
URL: http://svn.apache.org/viewvc?rev=1145215&view=rev
Log:
Seems to support rendering a choicesXXXX for value types. Layout needs a little cleanup. Existing value not assigned to drop-down list.
Modified:
incubator/isis/trunk/framework/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ComponentFactoryScalarAbstract.java
incubator/isis/trunk/framework/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/dropdownchoices/DropDownChoicesForValueMementos.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/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/ConverterForObjectAdapterMemento.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=1145215&r1=1145214&r2=1145215&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 Mon Jul 11 16:00:47 2011
@@ -19,12 +19,16 @@
package org.apache.isis.viewer.wicket.ui.components.scalars;
+import java.util.List;
+
import org.apache.wicket.Component;
import org.apache.wicket.model.IModel;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
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.valuecollection.ValueCollection;
public abstract class ComponentFactoryScalarAbstract extends ComponentFactoryAbstract {
@@ -51,15 +55,15 @@ public abstract class ComponentFactorySc
@Override
public final Component createComponent(final String id, final IModel<?> model) {
final ScalarModel scalarModel = (ScalarModel) model;
- return createComponent(id, scalarModel);
+ // return createComponent(id, scalarModel);
// TODO: This is where the ValueCollection panel gets created.
- // final List<ObjectAdapter> choices = scalarModel.getChoices();
- // if (choices.size() > 0) {
- // return new ValueCollection(id, scalarModel);
- // } else {
- // return createComponent(id, scalarModel);
- // }
+ final List<ObjectAdapter> choices = scalarModel.getChoices();
+ if (choices.size() > 0) {
+ return new ValueCollection(id, scalarModel);
+ } else {
+ return createComponent(id, scalarModel);
+ }
}
protected abstract Component createComponent(String id, ScalarModel scalarModel);
Modified: incubator/isis/trunk/framework/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/dropdownchoices/DropDownChoicesForValueMementos.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/dropdownchoices/DropDownChoicesForValueMementos.java?rev=1145215&r1=1145214&r2=1145215&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/dropdownchoices/DropDownChoicesForValueMementos.java (original)
+++ incubator/isis/trunk/framework/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/dropdownchoices/DropDownChoicesForValueMementos.java Mon Jul 11 16:00:47 2011
@@ -60,6 +60,6 @@ public class DropDownChoicesForValueMeme
@Override
protected boolean wantOnSelectionChangedNotifications() {
- return true;
+ return false;// true;
}
}
\ No newline at end of file
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=1145215&r1=1145214&r2=1145215&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 Mon Jul 11 16:00:47 2011
@@ -26,11 +26,15 @@
<body>
<wicket:panel>
<div class="string scalarPanel">
- <select for="scalarValue" wicket:id="scalarChoices"/>
<label for="scalarValue" wicket:id="scalarIfRegular">
- <input type="text" wicket:id="valueId"/>
<span wicket:id="scalarName" class="scalarName">[Label text]</span>
+ <span class="scalarValue">
+ <input type="text" 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=1145215&r1=1145214&r2=1145215&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 Mon Jul 11 16:00:47 2011
@@ -71,10 +71,12 @@ public class ValueCollection extends Sca
addStandardSemantics();
// addSemantics();
+ syncWithInput(true);
+
final FormComponentLabel labelIfRegular = createFormComponentLabel();
addOrReplace(labelIfRegular);
- syncWithInput(true);
+ addOrReplace(dropDownChoicesForValueMementos);
addOrReplace(new ComponentFeedbackPanel(ID_FEEDBACK, valueIdField));
return labelIfRegular;
@@ -151,10 +153,11 @@ public class ValueCollection extends Sca
final FormComponentLabel scalarNameAndValue = new FormComponentLabel(ID_SCALAR_IF_REGULAR, valueIdField);
- scalarNameAndValue.add(valueIdField);
-
final Label scalarName = new Label(ID_SCALAR_NAME, getFormat().getLabelCaption(valueIdField));
scalarNameAndValue.add(scalarName);
+ scalarNameAndValue.add(valueIdField);
+
+ // scalarNameAndValue.add(dropDownChoicesForValueMementos);
return scalarNameAndValue;
}
@@ -184,7 +187,6 @@ public class ValueCollection extends Sca
dropDownChoicesForValueMementos =
new DropDownChoicesForValueMementos(ID_SCALAR_VALUE_CHOICES, modelObject, choicesMementos);
- addOrReplace(dropDownChoicesForValueMementos);
}
Modified: incubator/isis/trunk/framework/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/ConverterForObjectAdapterMemento.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/ConverterForObjectAdapterMemento.java?rev=1145215&r1=1145214&r2=1145215&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/ConverterForObjectAdapterMemento.java (original)
+++ incubator/isis/trunk/framework/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/ConverterForObjectAdapterMemento.java Mon Jul 11 16:00:47 2011
@@ -22,6 +22,8 @@ package org.apache.isis.viewer.wicket.vi
import java.util.Locale;
import org.apache.commons.lang.StringUtils;
+import org.apache.wicket.util.convert.IConverter;
+
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.oid.Oid;
import org.apache.isis.core.metamodel.adapter.oid.stringable.OidStringifier;
@@ -29,7 +31,6 @@ import org.apache.isis.runtimes.dflt.run
import org.apache.isis.runtimes.dflt.runtime.system.persistence.AdapterManager;
import org.apache.isis.runtimes.dflt.runtime.system.persistence.PersistenceSession;
import org.apache.isis.viewer.wicket.model.mementos.ObjectAdapterMemento;
-import org.apache.wicket.util.convert.IConverter;
/**
* Implementation of a Wicket {@link IConverter} for {@link ObjectAdapterMemento}s, converting to-and-from their
@@ -64,8 +65,10 @@ public class ConverterForObjectAdapterMe
final Oid oid = memento.getObjectAdapter().getOid();
if (oid == null) {
// values don't have an Oid, but we don't support 'em
- throw new IllegalStateException(
- "cannot convert memento to OBJECT_OID; memento's adapter is a value so has no OBJECT_OID");
+ return memento.toString();
+
+ // throw new IllegalStateException(
+ // "cannot convert memento to OBJECT_OID; memento's adapter is a value so has no OBJECT_OID");
}
return getOidStringifier().enString(oid);
}