diff --git a/spring-binding/src/main/java/org/springframework/binding/format/adapters/FormatterPropertyEditor.java b/spring-binding/src/main/java/org/springframework/binding/format/adapters/FormatterPropertyEditor.java deleted file mode 100644 index e1fd45a5..00000000 --- a/spring-binding/src/main/java/org/springframework/binding/format/adapters/FormatterPropertyEditor.java +++ /dev/null @@ -1,49 +0,0 @@ -/* - * Copyright 2004-2008 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.springframework.binding.format.adapters; - -import java.beans.PropertyEditorSupport; - -import org.springframework.binding.format.Formatter; - -/** - * Adapts a formatter to the property editor contract. - * - * @author Keith Donald - */ -public class FormatterPropertyEditor extends PropertyEditorSupport { - - /** - * The wrapped formatter. - */ - private Formatter formatter; - - /** - * Creates a formatter property editor. - * @param formatter the formatter to adapt - */ - public FormatterPropertyEditor(Formatter formatter) { - this.formatter = formatter; - } - - public String getAsText() { - return formatter.format(getValue()); - } - - public void setAsText(String text) throws IllegalArgumentException { - setValue(formatter.parse(text)); - } -} \ No newline at end of file diff --git a/spring-binding/src/main/java/org/springframework/binding/format/adapters/package.html b/spring-binding/src/main/java/org/springframework/binding/format/adapters/package.html deleted file mode 100644 index 5df26ec6..00000000 --- a/spring-binding/src/main/java/org/springframework/binding/format/adapters/package.html +++ /dev/null @@ -1,7 +0,0 @@ - - -

-Contains Formatter adapters, including a adapter that adapts a PropertyEditor to the Formatter interface. -

- - \ No newline at end of file diff --git a/spring-binding/src/main/java/org/springframework/binding/format/adapters/PropertyEditorFormatter.java b/spring-binding/src/main/java/org/springframework/binding/format/formatters/PropertyEditorFormatter.java similarity index 96% rename from spring-binding/src/main/java/org/springframework/binding/format/adapters/PropertyEditorFormatter.java rename to spring-binding/src/main/java/org/springframework/binding/format/formatters/PropertyEditorFormatter.java index 7823665f..02b6ae63 100644 --- a/spring-binding/src/main/java/org/springframework/binding/format/adapters/PropertyEditorFormatter.java +++ b/spring-binding/src/main/java/org/springframework/binding/format/formatters/PropertyEditorFormatter.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.binding.format.adapters; +package org.springframework.binding.format.formatters; import java.beans.PropertyEditor; diff --git a/spring-webflow/src/main/java/org/springframework/webflow/mvc/view/MessageContextErrors.java b/spring-binding/src/main/java/org/springframework/binding/message/MessageContextErrors.java similarity index 93% rename from spring-webflow/src/main/java/org/springframework/webflow/mvc/view/MessageContextErrors.java rename to spring-binding/src/main/java/org/springframework/binding/message/MessageContextErrors.java index 7690fd4d..5f309ea4 100644 --- a/spring-webflow/src/main/java/org/springframework/webflow/mvc/view/MessageContextErrors.java +++ b/spring-binding/src/main/java/org/springframework/binding/message/MessageContextErrors.java @@ -13,12 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.webflow.mvc.view; +package org.springframework.binding.message; import java.util.List; -import org.springframework.binding.message.MessageBuilder; -import org.springframework.binding.message.MessageContext; import org.springframework.validation.AbstractErrors; import org.springframework.validation.Errors; diff --git a/spring-faces/src/main/java/org/springframework/faces/webflow/FlowActionListener.java b/spring-faces/src/main/java/org/springframework/faces/webflow/FlowActionListener.java index 741b6e2f..a137c083 100644 --- a/spring-faces/src/main/java/org/springframework/faces/webflow/FlowActionListener.java +++ b/spring-faces/src/main/java/org/springframework/faces/webflow/FlowActionListener.java @@ -31,6 +31,7 @@ import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.BeanFactory; import org.springframework.binding.expression.Expression; import org.springframework.binding.message.MessageContext; +import org.springframework.binding.message.MessageContextErrors; import org.springframework.util.ReflectionUtils; import org.springframework.util.StringUtils; import org.springframework.validation.Errors; @@ -39,7 +40,6 @@ import org.springframework.webflow.definition.TransitionableStateDefinition; import org.springframework.webflow.execution.RequestContext; import org.springframework.webflow.execution.RequestContextHolder; import org.springframework.webflow.execution.View; -import org.springframework.webflow.mvc.view.MessageContextErrors; /** * The default {@link ActionListener} implementation to be used with Web Flow. diff --git a/spring-webflow/src/main/java/org/springframework/webflow/mvc/view/AbstractMvcView.java b/spring-webflow/src/main/java/org/springframework/webflow/mvc/view/AbstractMvcView.java index eac9d49b..37f86d67 100644 --- a/spring-webflow/src/main/java/org/springframework/webflow/mvc/view/AbstractMvcView.java +++ b/spring-webflow/src/main/java/org/springframework/webflow/mvc/view/AbstractMvcView.java @@ -40,6 +40,7 @@ import org.springframework.binding.mapping.impl.DefaultMapping; import org.springframework.binding.mapping.impl.DefaultMappingContext; import org.springframework.binding.message.MessageBuilder; import org.springframework.binding.message.MessageContext; +import org.springframework.binding.message.MessageContextErrors; import org.springframework.binding.message.MessageResolver; import org.springframework.util.ReflectionUtils; import org.springframework.util.StringUtils;