You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tapestry.apache.org by jk...@apache.org on 2006/12/16 21:12:16 UTC
svn commit: r487872 - in /tapestry/tapestry4/trunk/tapestry-framework/src:
java/org/apache/tapestry/form/LabeledPropertySelectionModel.java
java/org/apache/tapestry/form/TextArea.java
test/org/apache/tapestry/form/LabeledPropertySelectionModelTest.java
Author: jkuhnert
Date: Sat Dec 16 12:12:16 2006
New Revision: 487872
URL: http://svn.apache.org/viewvc?view=rev&rev=487872
Log:
Fixes TAPESTRY-686. TextArea was using a literal String value property instead of Object. Changed to Object
type as strings are correctly translated by the contributed translator binding.
Modified:
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/LabeledPropertySelectionModel.java
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/TextArea.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/LabeledPropertySelectionModelTest.java
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/LabeledPropertySelectionModel.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/LabeledPropertySelectionModel.java?view=diff&rev=487872&r1=487871&r2=487872
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/LabeledPropertySelectionModel.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/LabeledPropertySelectionModel.java Sat Dec 16 12:12:16 2006
@@ -214,7 +214,7 @@
{
if (value == null)
return null;
-
+
return value.equals(_value) ? _option : _model.translateValue(value);
}
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/TextArea.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/TextArea.java?view=diff&rev=487872&r1=487871&r2=487872
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/TextArea.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/TextArea.java Sat Dec 16 12:12:16 2006
@@ -31,9 +31,9 @@
TranslatedField
{
- public abstract String getValue();
+ public abstract Object getValue();
- public abstract void setValue(String value);
+ public abstract void setValue(Object value);
/**
* @see org.apache.tapestry.form.AbstractFormComponent#renderFormComponent(org.apache.tapestry.IMarkupWriter,
@@ -42,7 +42,7 @@
protected void renderFormComponent(IMarkupWriter writer, IRequestCycle cycle)
{
String value = getTranslatedFieldSupport().format(this, getValue());
-
+
renderDelegatePrefix(writer, cycle);
writer.begin("textarea");
@@ -74,14 +74,13 @@
protected void rewindFormComponent(IMarkupWriter writer, IRequestCycle cycle)
{
String value = cycle.getParameter(getName());
-
+
try
{
- String text = (String) getTranslatedFieldSupport().parse(this,
- value);
-
+ String text = (String) getTranslatedFieldSupport().parse(this, value);
+
getValidatableFieldSupport().validate(this, writer, cycle, text);
-
+
setValue(text);
}
catch (ValidatorException e)
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/LabeledPropertySelectionModelTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/LabeledPropertySelectionModelTest.java?view=diff&rev=487872&r1=487871&r2=487872
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/LabeledPropertySelectionModelTest.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/LabeledPropertySelectionModelTest.java Sat Dec 16 12:12:16 2006
@@ -26,14 +26,14 @@
@Test
public class LabeledPropertySelectionModelTest extends BaseComponentTestCase
{
- public void testNullValue()
+ public void test_Null_Value()
{
LabeledPropertySelectionModel model = new LabeledPropertySelectionModel();
-
+
assertEquals(null, model.translateValue(null));
}
- public void testEmptyModel()
+ public void test_Empty_Model()
{
LabeledPropertySelectionModel model = new LabeledPropertySelectionModel();
@@ -42,7 +42,7 @@
assertEquals(model.getOptionCount(), 1);
}
- public void testDefaultLabeledModel()
+ public void test_Default_Labeled_Model()
{
LabeledPropertySelectionModel model = new LabeledPropertySelectionModel(createInnerModel());
@@ -51,7 +51,7 @@
validateModel(model);
}
- public void testLabeledModel()
+ public void test_Labeled_Model()
{
String label = "Select a value";
Object option = null;