Author: tawus
Date: Wed Dec 7 13:44:14 2011
New Revision: 1211437
URL: http://svn.apache.org/viewvc?rev=1211437&view=rev
Log:
TAP5-1763: NPE is caused when you create a Translator with null message key.
Fixed by using the 'translator-name'-message in case the message key is null
Modified:
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/FieldTranslatorSourceImpl.java
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/FieldTranslatorSourceImplTest.java
Modified:
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/FieldTranslatorSourceImpl.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/FieldTranslatorSourceImpl.java?rev=1211437&r1=1211436&r2=1211437&view=diff
==============================================================================
---
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/FieldTranslatorSourceImpl.java
(original)
+++
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/FieldTranslatorSourceImpl.java
Wed Dec 7 13:44:14 2011
@@ -125,7 +125,14 @@ public class FieldTranslatorSourceImpl i
return overrideMessages.getFormatter(overrideKey);
// Otherwise, use the built-in validation message appropriate to this
validator.
+ String messageKey = translator.getMessageKey();
- return globalMessages.getFormatter(translator.getMessageKey());
+ // If no key has been specified, use translator name to create a key
+ if(messageKey == null)
+ {
+ messageKey = translatorName + "-message";
+ }
+
+ return globalMessages.getFormatter(messageKey);
}
}
Modified:
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/FieldTranslatorSourceImplTest.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/FieldTranslatorSourceImplTest.java?rev=1211437&r1=1211436&r2=1211437&view=diff
==============================================================================
---
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/FieldTranslatorSourceImplTest.java
(original)
+++
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/FieldTranslatorSourceImplTest.java
Wed Dec 7 13:44:14 2011
@@ -113,6 +113,50 @@ public class FieldTranslatorSourceImplTe
}
@Test
+ public void create_default_translator_with_name_and_null_key()
+ {
+ Field field = mockField();
+ Messages messages = mockMessages();
+ Locale locale = Locale.ENGLISH;
+ Class propertyType = Map.class;
+ TranslatorSource ts = mockTranslatorSource();
+ FormSupport fs = mockFormSupport();
+ Translator translator = mockTranslator("maptrans", Map.class);
+ Messages globalMessages = mockMessages();
+ MessageFormatter formatter = mockMessageFormatter();
+ MarkupWriter writer = mockMarkupWriter();
+ String label = "Field Label";
+ String message = "Woops, did it again.";
+ AnnotationProvider ap = mockAnnotationProvider(null);
+
+ train_findByType(ts, propertyType, translator);
+
+ train_getFormValidationId(fs, "myform");
+
+ train_contains(messages, "myform-myfield-maptrans-message", false);
+ train_contains(messages, "myfield-maptrans-message", false);
+ train_getMessageKey(translator, null);
+
+ train_getMessageFormatter(globalMessages, "maptrans-message",
formatter);
+ train_getLabel(field, label);
+ train_format(formatter, message, label);
+
+ translator.render(field, message, writer, fs);
+
+ replay();
+
+ FieldTranslatorSource source = new FieldTranslatorSourceImpl(ts,
globalMessages, fs);
+
+ FieldTranslator ft = source.createDefaultTranslator(field, "myfield",
messages, locale, propertyType, ap);
+
+ assertEquals(ft.getType(), Map.class);
+
+ ft.render(writer);
+
+ verify();
+ }
+
+ @Test
public void create_default_translator_with_name()
{
Field field = mockField();
