From ed6fd1705050f6d3c552a27e90388f4423857524 Mon Sep 17 00:00:00 2001
From: Artur Signell <artur@vaadin.com>
Date: Thu, 22 Dec 2011 22:23:14 +0200
Subject: [PATCH] Corrected error message to show model and not presentation
 type when conversion fails

---
 .../vaadin/data/util/converter/StringToBooleanConverter.java  | 4 ++--
 src/com/vaadin/data/util/converter/StringToDateConverter.java | 2 +-
 .../vaadin/data/util/converter/StringToDoubleConverter.java   | 2 +-
 .../vaadin/data/util/converter/StringToNumberConverter.java   | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/com/vaadin/data/util/converter/StringToBooleanConverter.java b/src/com/vaadin/data/util/converter/StringToBooleanConverter.java
index 1913266db2..3b2034a361 100644
--- a/src/com/vaadin/data/util/converter/StringToBooleanConverter.java
+++ b/src/com/vaadin/data/util/converter/StringToBooleanConverter.java
@@ -41,8 +41,8 @@ public class StringToBooleanConverter implements Converter<String, Boolean> {
         } else if (getFalseString().equals(value)) {
             return false;
         } else {
-            throw new ConversionException("Cannot convert " + value
-                    + " to Boolean");
+            throw new ConversionException("Cannot convert " + value + " to "
+                    + getModelType().getName());
         }
     }
 
diff --git a/src/com/vaadin/data/util/converter/StringToDateConverter.java b/src/com/vaadin/data/util/converter/StringToDateConverter.java
index 96b144f6ea..2aa9395532 100644
--- a/src/com/vaadin/data/util/converter/StringToDateConverter.java
+++ b/src/com/vaadin/data/util/converter/StringToDateConverter.java
@@ -65,7 +65,7 @@ public class StringToDateConverter implements Converter<String, Date> {
         Date parsedValue = getFormat(locale).parse(value, parsePosition);
         if (parsePosition.getIndex() != value.length()) {
             throw new ConversionException("Could not convert '" + value
-                    + "' to " + getPresentationType().getName());
+                    + "' to " + getModelType().getName());
         }
 
         return parsedValue;
diff --git a/src/com/vaadin/data/util/converter/StringToDoubleConverter.java b/src/com/vaadin/data/util/converter/StringToDoubleConverter.java
index d9441422ad..29c6329451 100644
--- a/src/com/vaadin/data/util/converter/StringToDoubleConverter.java
+++ b/src/com/vaadin/data/util/converter/StringToDoubleConverter.java
@@ -62,7 +62,7 @@ public class StringToDoubleConverter implements Converter<String, Double> {
         Number parsedValue = getFormat(locale).parse(value, parsePosition);
         if (parsePosition.getIndex() != value.length()) {
             throw new ConversionException("Could not convert '" + value
-                    + "' to " + getPresentationType().getName());
+                    + "' to " + getModelType().getName());
         }
         return parsedValue.doubleValue();
     }
diff --git a/src/com/vaadin/data/util/converter/StringToNumberConverter.java b/src/com/vaadin/data/util/converter/StringToNumberConverter.java
index c71b7180e9..64944a434c 100644
--- a/src/com/vaadin/data/util/converter/StringToNumberConverter.java
+++ b/src/com/vaadin/data/util/converter/StringToNumberConverter.java
@@ -60,7 +60,7 @@ public class StringToNumberConverter implements Converter<String, Number> {
         Number parsedValue = getFormat(locale).parse(value, parsePosition);
         if (parsePosition.getIndex() != value.length()) {
             throw new ConversionException("Could not convert '" + value
-                    + "' to " + getPresentationType().getName());
+                    + "' to " + getModelType().getName());
         }
 
         if (parsedValue == null) {
-- 
2.39.5