From e2e5ee97d8fb098747e82a1661d467a30edc079c Mon Sep 17 00:00:00 2001
From: Phillip Webb <pwebb@vmware.com>
Date: Wed, 14 Nov 2012 16:00:17 -0800
Subject: [PATCH] Additional FacesConversionService constructor

Add the inherited constructor allowing a delegate ConversionService
to be used

Issue: SWF-1562
---
 .../model/converter/FacesConversionService.java    | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/spring-faces/src/main/java/org/springframework/faces/model/converter/FacesConversionService.java b/spring-faces/src/main/java/org/springframework/faces/model/converter/FacesConversionService.java
index 1b531291..ffee6f05 100644
--- a/spring-faces/src/main/java/org/springframework/faces/model/converter/FacesConversionService.java
+++ b/spring-faces/src/main/java/org/springframework/faces/model/converter/FacesConversionService.java
@@ -14,19 +14,19 @@ package org.springframework.faces.model.converter;
 
 import javax.faces.model.DataModel;
 
-import org.springframework.binding.convert.ConversionService;
 import org.springframework.binding.convert.service.DefaultConversionService;
+import org.springframework.core.convert.ConversionService;
 import org.springframework.faces.model.OneSelectionTrackingListDataModel;
 
 /**
- * Convenient {@link ConversionService} implementation for JSF that composes JSF-specific converters with the standard
- * Web Flow converters.
- * 
+ * Convenient {@link org.springframework.binding.convert.ConversionService} implementation for JSF that composes
+ * JSF-specific converters with the standard Web Flow converters.
+ *
  * <p>
  * In addition to the standard Web Flow conversion, this service provide conversion from a list into a
  * {@link OneSelectionTrackingListDataModel} using a "dataModel" alias for the type.
  * </p>
- * 
+ *
  * @author Jeremy Grelle
  */
 public class FacesConversionService extends DefaultConversionService {
@@ -35,6 +35,10 @@ public class FacesConversionService extends DefaultConversionService {
 		addFacesConverters();
 	}
 
+	public FacesConversionService(ConversionService delegateConversionService) {
+		super(delegateConversionService);
+	}
+
 	protected void addFacesConverters() {
 		addConverter(new DataModelConverter());
 		addAlias("dataModel", DataModel.class);