You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tapestry.apache.org by hl...@apache.org on 2008/02/07 00:55:05 UTC
svn commit: r619225 - in /tapestry/tapestry5/trunk/tapestry-core/src:
main/java/org/apache/tapestry/internal/services/TranslatorSourceImpl.java
test/java/org/apache/tapestry/internal/services/TranslatorSourceImplTest.java
Author: hlship
Date: Wed Feb 6 15:55:02 2008
New Revision: 619225
URL: http://svn.apache.org/viewvc?rev=619225&view=rev
Log:
TAPESTRY-2085: When a user submit a form with a TextField and the value is missing or blank, the value null is passed through the component to the model property
Modified:
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/TranslatorSourceImpl.java
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/TranslatorSourceImplTest.java
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/TranslatorSourceImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/TranslatorSourceImpl.java?rev=619225&r1=619224&r2=619225&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/TranslatorSourceImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/TranslatorSourceImpl.java Wed Feb 6 15:55:02 2008
@@ -30,7 +30,7 @@
private final StrategyRegistry<Translator> _registry;
- public TranslatorSourceImpl(final Map<String, Translator> translators)
+ public TranslatorSourceImpl(Map<String, Translator> translators)
{
_translators = translators;
@@ -41,7 +41,7 @@
typeToTranslator.put(t.getType(), t);
}
- _registry = StrategyRegistry.newInstance(Translator.class, typeToTranslator);
+ _registry = StrategyRegistry.newInstance(Translator.class, typeToTranslator, true);
}
public Translator get(String name)
@@ -62,7 +62,6 @@
if (result == null)
{
-
List<String> names = CollectionFactory.newList();
for (Class type : _registry.getTypes())
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/TranslatorSourceImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/TranslatorSourceImplTest.java?rev=619225&r1=619224&r2=619225&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/TranslatorSourceImplTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/TranslatorSourceImplTest.java Wed Feb 6 15:55:02 2008
@@ -190,6 +190,58 @@
{
assertEquals(ex.getMessage(), expectedMessage);
}
+ }
+ @Test
+ public void find_by_type()
+ {
+ Translator t = mockTranslator();
+ Map<String, Translator> configuration = CollectionFactory.newMap();
+
+ configuration.put("string", t);
+
+ train_getType(t, String.class);
+
+ replay();
+
+ TranslatorSource source = new TranslatorSourceImpl(configuration);
+
+ assertSame(source.getByType(String.class), t);
+ assertSame(source.findByType(String.class), t);
+ assertNull(source.findByType(Integer.class));
+
+ verify();
+ }
+
+ @Test
+ public void get_by_type_not_found()
+ {
+ Translator string = mockTranslator();
+ Translator bool = mockTranslator();
+
+ Map<String, Translator> configuration = CollectionFactory.newMap();
+
+ configuration.put("string", string);
+ configuration.put("boolean", bool);
+
+ train_getType(string, String.class);
+ train_getType(bool, Boolean.class);
+
+ replay();
+
+ TranslatorSource source = new TranslatorSourceImpl(configuration);
+
+ try
+ {
+ source.getByType(Integer.class);
+ unreachable();
+ }
+ catch (IllegalArgumentException ex)
+ {
+ assertEquals(ex.getMessage(),
+ "No translator is defined for type java.lang.Integer. Registered types: java.lang.Boolean, java.lang.String.");
+ }
+
+ verify();
}
}