From 776636eb38aa8907e09b583fe7f2af21e2c091f6 Mon Sep 17 00:00:00 2001
From: Keith Donald <kdonald@vmware.com>
Date: Mon, 30 Jun 2008 21:24:58 +0000
Subject: [PATCH] IN PROGRESS - issue SWF-720: Multiple checkboxes to
 Collection mapping http://jira.springframework.org/browse/SWF-720

---
 .../binding/convert/service/DefaultConversionService.java | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/spring-binding/src/main/java/org/springframework/binding/convert/service/DefaultConversionService.java b/spring-binding/src/main/java/org/springframework/binding/convert/service/DefaultConversionService.java
index 21b22958..73f7eddf 100644
--- a/spring-binding/src/main/java/org/springframework/binding/convert/service/DefaultConversionService.java
+++ b/spring-binding/src/main/java/org/springframework/binding/convert/service/DefaultConversionService.java
@@ -18,6 +18,7 @@ package org.springframework.binding.convert.service;
 import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.util.Date;
+import java.util.Locale;
 
 import org.springframework.binding.convert.ConversionService;
 import org.springframework.binding.convert.converters.StringToBigDecimal;
@@ -72,12 +73,13 @@ public class DefaultConversionService extends GenericConversionService {
 		addConverter(new StringToBigInteger());
 		addConverter(new StringToBigDecimal());
 		addConverter(new StringToClass());
-		addConverter(new StringToLabeledEnum());
 		addConverter(new StringToLocale());
 		addConverter(new StringToDate());
+		addConverter(new StringToLabeledEnum());
 	}
 
 	protected void addDefaultAliases() {
+		addAlias("string", String.class);
 		addAlias("byte", Byte.class);
 		addAlias("boolean", Boolean.class);
 		addAlias("character", Character.class);
@@ -89,9 +91,9 @@ public class DefaultConversionService extends GenericConversionService {
 		addAlias("bigInteger", BigInteger.class);
 		addAlias("bigDecimal", BigDecimal.class);
 		addAlias("class", Class.class);
-		addAlias("labeledEnum", LabeledEnum.class);
+		addAlias("locale", Locale.class);
 		addAlias("date", Date.class);
-		addAlias("string", String.class);
+		addAlias("labeledEnum", LabeledEnum.class);
 	}
 
 	/**