From 934d4a5fe084e0e0d005e686ad2ade2d36763f11 Mon Sep 17 00:00:00 2001 From: Keith Donald Date: Sat, 25 Jul 2009 04:07:21 +0000 Subject: [PATCH] moved model binding and validation related code into model module-level package; separated out ui concerns into ui subpackage --- .../{ui => model}/alert/Alert.java | 2 +- .../{ui => model}/alert/AlertContext.java | 2 +- .../{ui => model}/alert/Alerts.java | 2 +- .../{ui => model}/alert/Severity.java | 2 +- .../model/alert/package-info.java | 5 +++++ .../alert/support/DefaultAlertContext.java | 6 +++--- .../model/alert/support/package-info.java | 5 +++++ .../{ui/binding => model}/binder/Binder.java | 2 +- .../binder/BindingResult.java | 4 ++-- .../binder/BindingResults.java | 2 +- .../binder/MissingFieldException.java | 2 +- .../model/binder/package-info.java | 5 +++++ .../message/DefaultMessageResolver.java | 2 +- .../{ui => model}/message/MessageBuilder.java | 2 +- .../message/MessageResolutionException.java | 2 +- .../{ui => model}/message/MessageResolver.java | 2 +- .../message/MessageResolverBuilder.java | 2 +- .../message/ResolvableArgument.java | 2 +- .../model/message/package-info.java | 5 +++++ .../binding => model/ui}/BindingStatus.java | 2 +- .../{ui/binding => model/ui}/FieldModel.java | 5 ++--- .../ui}/FieldNotFoundException.java | 2 +- .../ui}/PresentationModel.java | 2 +- .../ui}/PresentationModelFactory.java | 2 +- .../binding => model/ui}/ValidationStatus.java | 2 +- .../ui}/binder/ArrayListBindingResults.java | 5 ++++- .../ui}/binder/BinderExecutor.java | 6 ++++-- .../ui}/binder/BindingStatusResult.java | 7 ++++--- .../ui}/binder/FieldNotEditableResult.java | 11 ++++++----- .../ui}/binder/FieldNotFoundResult.java | 11 ++++++----- .../ui}/binder/PresentationModelBinder.java | 14 +++++++++----- .../binding => model/ui}/binder/WebBinder.java | 6 +++--- .../model/ui/binder/package-info.java | 5 +++++ .../binding => model/ui}/config/Condition.java | 4 ++-- .../ui}/config/FieldModelConfiguration.java | 6 +++--- .../model/ui/config/package-info.java | 5 +++++ .../ui/format/AnnotationFormatterFactory.java | 2 +- .../{ => model}/ui/format/Formatted.java | 2 +- .../{ => model}/ui/format/Formatter.java | 2 +- .../ui/format/date/DateFormatter.java | 4 ++-- .../model/ui/format/date/package-info.java | 5 +++++ .../ui/format/number/CurrencyFormat.java | 2 +- .../ui/format/number/CurrencyFormatter.java | 4 ++-- .../number/CurrencyNumberFormatFactory.java | 2 +- .../ui/format/number/DecimalFormatter.java | 4 ++-- .../number/DefaultNumberFormatFactory.java | 2 +- .../ui/format/number/IntegerFormatter.java | 4 ++-- .../number/IntegerNumberFormatFactory.java | 2 +- .../ui/format/number/NumberFormatFactory.java | 2 +- .../ui/format/number/PercentFormatter.java | 4 ++-- .../number/PercentNumberFormatFactory.java | 2 +- .../model/ui/format/number/package-info.java | 5 +++++ .../model/ui/format/package-info.java | 5 +++++ .../springframework/model/ui/package-info.java | 5 +++++ .../ui}/support/CollectionTypeDescriptor.java | 2 +- .../ui}/support/DefaultFieldModel.java | 18 +++++++++--------- .../ui}/support/DefaultPresentationModel.java | 14 +++++++------- .../DefaultPresentationModelFactory.java | 6 +++--- .../ui}/support/FieldModelContext.java | 8 ++++---- .../ui}/support/FieldPath.java | 2 +- .../ui}/support/FieldPathElement.java | 2 +- .../ui}/support/FormatterRegistry.java | 6 +++--- .../ui}/support/GenericFormatterRegistry.java | 8 ++++---- .../ui}/support/ListElementValueModel.java | 2 +- .../ui}/support/MapValueValueModel.java | 2 +- .../ui}/support/PropertyValueModel.java | 2 +- .../ui}/support/ValueBuffer.java | 2 +- .../ui}/support/ValueModel.java | 2 +- .../model/ui/support/package-info.java | 5 +++++ .../{ui => model}/validation/Impact.java | 4 ++-- .../{ui => model}/validation/Message.java | 2 +- .../validation/ValidationConstraint.java | 2 +- .../model/validation/package-info.java | 5 +++++ .../org/springframework/ui/alert/package.html | 7 ------- .../ui/alert/support/package.html | 7 ------- .../ui/binding/binder/package.html | 7 ------- .../ui/binding/config/package.html | 7 ------- .../springframework/ui/binding/package.html | 7 ------- .../ui/binding/support/package.html | 7 ------- .../ui/format/date/package.html | 7 ------- .../ui/format/number/package.html | 7 ------- .../org/springframework/ui/format/package.html | 7 ------- .../springframework/ui/message/package.html | 7 ------- 83 files changed, 187 insertions(+), 186 deletions(-) rename org.springframework.context/src/main/java/org/springframework/{ui => model}/alert/Alert.java (96%) rename org.springframework.context/src/main/java/org/springframework/{ui => model}/alert/AlertContext.java (97%) rename org.springframework.context/src/main/java/org/springframework/{ui => model}/alert/Alerts.java (98%) rename org.springframework.context/src/main/java/org/springframework/{ui => model}/alert/Severity.java (96%) create mode 100644 org.springframework.context/src/main/java/org/springframework/model/alert/package-info.java rename org.springframework.context/src/main/java/org/springframework/{ui => model}/alert/support/DefaultAlertContext.java (92%) create mode 100644 org.springframework.context/src/main/java/org/springframework/model/alert/support/package-info.java rename org.springframework.context/src/main/java/org/springframework/{ui/binding => model}/binder/Binder.java (95%) rename org.springframework.context/src/main/java/org/springframework/{ui/binding => model}/binder/BindingResult.java (94%) rename org.springframework.context/src/main/java/org/springframework/{ui/binding => model}/binder/BindingResults.java (96%) rename org.springframework.context/src/main/java/org/springframework/{ui/binding => model}/binder/MissingFieldException.java (97%) create mode 100644 org.springframework.context/src/main/java/org/springframework/model/binder/package-info.java rename org.springframework.context/src/main/java/org/springframework/{ui => model}/message/DefaultMessageResolver.java (99%) rename org.springframework.context/src/main/java/org/springframework/{ui => model}/message/MessageBuilder.java (99%) rename org.springframework.context/src/main/java/org/springframework/{ui => model}/message/MessageResolutionException.java (96%) rename org.springframework.context/src/main/java/org/springframework/{ui => model}/message/MessageResolver.java (96%) rename org.springframework.context/src/main/java/org/springframework/{ui => model}/message/MessageResolverBuilder.java (99%) rename org.springframework.context/src/main/java/org/springframework/{ui => model}/message/ResolvableArgument.java (97%) create mode 100644 org.springframework.context/src/main/java/org/springframework/model/message/package-info.java rename org.springframework.context/src/main/java/org/springframework/{ui/binding => model/ui}/BindingStatus.java (96%) rename org.springframework.context/src/main/java/org/springframework/{ui/binding => model/ui}/FieldModel.java (97%) rename org.springframework.context/src/main/java/org/springframework/{ui/binding => model/ui}/FieldNotFoundException.java (96%) rename org.springframework.context/src/main/java/org/springframework/{ui/binding => model/ui}/PresentationModel.java (96%) rename org.springframework.context/src/main/java/org/springframework/{ui/binding => model/ui}/PresentationModelFactory.java (96%) rename org.springframework.context/src/main/java/org/springframework/{ui/binding => model/ui}/ValidationStatus.java (95%) rename org.springframework.context/src/main/java/org/springframework/{ui/binding => model/ui}/binder/ArrayListBindingResults.java (92%) rename org.springframework.context/src/main/java/org/springframework/{ui/binding => model/ui}/binder/BinderExecutor.java (88%) rename org.springframework.context/src/main/java/org/springframework/{ui/binding => model/ui}/binder/BindingStatusResult.java (86%) rename org.springframework.context/src/main/java/org/springframework/{ui/binding => model/ui}/binder/FieldNotEditableResult.java (86%) rename org.springframework.context/src/main/java/org/springframework/{ui/binding => model/ui}/binder/FieldNotFoundResult.java (86%) rename org.springframework.context/src/main/java/org/springframework/{ui/binding => model/ui}/binder/PresentationModelBinder.java (90%) rename org.springframework.context/src/main/java/org/springframework/{ui/binding => model/ui}/binder/WebBinder.java (95%) create mode 100644 org.springframework.context/src/main/java/org/springframework/model/ui/binder/package-info.java rename org.springframework.context/src/main/java/org/springframework/{ui/binding => model/ui}/config/Condition.java (92%) rename org.springframework.context/src/main/java/org/springframework/{ui/binding => model/ui}/config/FieldModelConfiguration.java (91%) create mode 100644 org.springframework.context/src/main/java/org/springframework/model/ui/config/package-info.java rename org.springframework.context/src/main/java/org/springframework/{ => model}/ui/format/AnnotationFormatterFactory.java (97%) rename org.springframework.context/src/main/java/org/springframework/{ => model}/ui/format/Formatted.java (96%) rename org.springframework.context/src/main/java/org/springframework/{ => model}/ui/format/Formatter.java (96%) rename org.springframework.context/src/main/java/org/springframework/{ => model}/ui/format/date/DateFormatter.java (95%) create mode 100644 org.springframework.context/src/main/java/org/springframework/model/ui/format/date/package-info.java rename org.springframework.context/src/main/java/org/springframework/{ => model}/ui/format/number/CurrencyFormat.java (95%) rename org.springframework.context/src/main/java/org/springframework/{ => model}/ui/format/number/CurrencyFormatter.java (95%) rename org.springframework.context/src/main/java/org/springframework/{ => model}/ui/format/number/CurrencyNumberFormatFactory.java (95%) rename org.springframework.context/src/main/java/org/springframework/{ => model}/ui/format/number/DecimalFormatter.java (95%) rename org.springframework.context/src/main/java/org/springframework/{ => model}/ui/format/number/DefaultNumberFormatFactory.java (97%) rename org.springframework.context/src/main/java/org/springframework/{ => model}/ui/format/number/IntegerFormatter.java (94%) rename org.springframework.context/src/main/java/org/springframework/{ => model}/ui/format/number/IntegerNumberFormatFactory.java (94%) rename org.springframework.context/src/main/java/org/springframework/{ => model}/ui/format/number/NumberFormatFactory.java (95%) rename org.springframework.context/src/main/java/org/springframework/{ => model}/ui/format/number/PercentFormatter.java (95%) rename org.springframework.context/src/main/java/org/springframework/{ => model}/ui/format/number/PercentNumberFormatFactory.java (95%) create mode 100644 org.springframework.context/src/main/java/org/springframework/model/ui/format/number/package-info.java create mode 100644 org.springframework.context/src/main/java/org/springframework/model/ui/format/package-info.java create mode 100644 org.springframework.context/src/main/java/org/springframework/model/ui/package-info.java rename org.springframework.context/src/main/java/org/springframework/{ui/binding => model/ui}/support/CollectionTypeDescriptor.java (97%) rename org.springframework.context/src/main/java/org/springframework/{ui/binding => model/ui}/support/DefaultFieldModel.java (96%) rename org.springframework.context/src/main/java/org/springframework/{ui/binding => model/ui}/support/DefaultPresentationModel.java (97%) rename org.springframework.context/src/main/java/org/springframework/{ui/binding => model/ui}/support/DefaultPresentationModelFactory.java (89%) rename org.springframework.context/src/main/java/org/springframework/{ui/binding => model/ui}/support/FieldModelContext.java (87%) rename org.springframework.context/src/main/java/org/springframework/{ui/binding => model/ui}/support/FieldPath.java (97%) rename org.springframework.context/src/main/java/org/springframework/{ui/binding => model/ui}/support/FieldPathElement.java (95%) rename org.springframework.context/src/main/java/org/springframework/{ui/binding => model/ui}/support/FormatterRegistry.java (93%) rename org.springframework.context/src/main/java/org/springframework/{ui/binding => model/ui}/support/GenericFormatterRegistry.java (97%) rename org.springframework.context/src/main/java/org/springframework/{ui/binding => model/ui}/support/ListElementValueModel.java (97%) rename org.springframework.context/src/main/java/org/springframework/{ui/binding => model/ui}/support/MapValueValueModel.java (97%) rename org.springframework.context/src/main/java/org/springframework/{ui/binding => model/ui}/support/PropertyValueModel.java (97%) rename org.springframework.context/src/main/java/org/springframework/{ui/binding => model/ui}/support/ValueBuffer.java (96%) rename org.springframework.context/src/main/java/org/springframework/{ui/binding => model/ui}/support/ValueModel.java (96%) create mode 100644 org.springframework.context/src/main/java/org/springframework/model/ui/support/package-info.java rename org.springframework.context/src/main/java/org/springframework/{ui => model}/validation/Impact.java (90%) rename org.springframework.context/src/main/java/org/springframework/{ui => model}/validation/Message.java (95%) rename org.springframework.context/src/main/java/org/springframework/{ui => model}/validation/ValidationConstraint.java (93%) create mode 100644 org.springframework.context/src/main/java/org/springframework/model/validation/package-info.java delete mode 100644 org.springframework.context/src/main/java/org/springframework/ui/alert/package.html delete mode 100644 org.springframework.context/src/main/java/org/springframework/ui/alert/support/package.html delete mode 100644 org.springframework.context/src/main/java/org/springframework/ui/binding/binder/package.html delete mode 100644 org.springframework.context/src/main/java/org/springframework/ui/binding/config/package.html delete mode 100644 org.springframework.context/src/main/java/org/springframework/ui/binding/package.html delete mode 100644 org.springframework.context/src/main/java/org/springframework/ui/binding/support/package.html delete mode 100644 org.springframework.context/src/main/java/org/springframework/ui/format/date/package.html delete mode 100644 org.springframework.context/src/main/java/org/springframework/ui/format/number/package.html delete mode 100644 org.springframework.context/src/main/java/org/springframework/ui/format/package.html delete mode 100644 org.springframework.context/src/main/java/org/springframework/ui/message/package.html diff --git a/org.springframework.context/src/main/java/org/springframework/ui/alert/Alert.java b/org.springframework.context/src/main/java/org/springframework/model/alert/Alert.java similarity index 96% rename from org.springframework.context/src/main/java/org/springframework/ui/alert/Alert.java rename to org.springframework.context/src/main/java/org/springframework/model/alert/Alert.java index 4dcef335546..ee485058246 100644 --- a/org.springframework.context/src/main/java/org/springframework/ui/alert/Alert.java +++ b/org.springframework.context/src/main/java/org/springframework/model/alert/Alert.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.ui.alert; +package org.springframework.model.alert; /** * Communicates an event of interest to the user. diff --git a/org.springframework.context/src/main/java/org/springframework/ui/alert/AlertContext.java b/org.springframework.context/src/main/java/org/springframework/model/alert/AlertContext.java similarity index 97% rename from org.springframework.context/src/main/java/org/springframework/ui/alert/AlertContext.java rename to org.springframework.context/src/main/java/org/springframework/model/alert/AlertContext.java index e9ef14665b1..c7b2c734b53 100644 --- a/org.springframework.context/src/main/java/org/springframework/ui/alert/AlertContext.java +++ b/org.springframework.context/src/main/java/org/springframework/model/alert/AlertContext.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.ui.alert; +package org.springframework.model.alert; import java.util.List; import java.util.Map; diff --git a/org.springframework.context/src/main/java/org/springframework/ui/alert/Alerts.java b/org.springframework.context/src/main/java/org/springframework/model/alert/Alerts.java similarity index 98% rename from org.springframework.context/src/main/java/org/springframework/ui/alert/Alerts.java rename to org.springframework.context/src/main/java/org/springframework/model/alert/Alerts.java index 599c0d238e7..943cb1ff953 100644 --- a/org.springframework.context/src/main/java/org/springframework/ui/alert/Alerts.java +++ b/org.springframework.context/src/main/java/org/springframework/model/alert/Alerts.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.ui.alert; +package org.springframework.model.alert; /** * A static factory for conveniently constructing Alerts. diff --git a/org.springframework.context/src/main/java/org/springframework/ui/alert/Severity.java b/org.springframework.context/src/main/java/org/springframework/model/alert/Severity.java similarity index 96% rename from org.springframework.context/src/main/java/org/springframework/ui/alert/Severity.java rename to org.springframework.context/src/main/java/org/springframework/model/alert/Severity.java index fa58fd9a1ff..8cde833f2b9 100644 --- a/org.springframework.context/src/main/java/org/springframework/ui/alert/Severity.java +++ b/org.springframework.context/src/main/java/org/springframework/model/alert/Severity.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.ui.alert; +package org.springframework.model.alert; /** * The set of alert severities. diff --git a/org.springframework.context/src/main/java/org/springframework/model/alert/package-info.java b/org.springframework.context/src/main/java/org/springframework/model/alert/package-info.java new file mode 100644 index 00000000000..fbf6fc793bd --- /dev/null +++ b/org.springframework.context/src/main/java/org/springframework/model/alert/package-info.java @@ -0,0 +1,5 @@ +/** + * A general-purpose Alerting API to communicate events of interest. + */ +package org.springframework.model.alert; + diff --git a/org.springframework.context/src/main/java/org/springframework/ui/alert/support/DefaultAlertContext.java b/org.springframework.context/src/main/java/org/springframework/model/alert/support/DefaultAlertContext.java similarity index 92% rename from org.springframework.context/src/main/java/org/springframework/ui/alert/support/DefaultAlertContext.java rename to org.springframework.context/src/main/java/org/springframework/model/alert/support/DefaultAlertContext.java index 90187b38a51..a68229a7da1 100644 --- a/org.springframework.context/src/main/java/org/springframework/ui/alert/support/DefaultAlertContext.java +++ b/org.springframework.context/src/main/java/org/springframework/model/alert/support/DefaultAlertContext.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.ui.alert.support; +package org.springframework.model.alert.support; import java.util.ArrayList; import java.util.Collections; @@ -22,8 +22,8 @@ import java.util.List; import java.util.Map; import org.springframework.core.style.ToStringCreator; -import org.springframework.ui.alert.Alert; -import org.springframework.ui.alert.AlertContext; +import org.springframework.model.alert.Alert; +import org.springframework.model.alert.AlertContext; import org.springframework.util.CachingMapDecorator; /** diff --git a/org.springframework.context/src/main/java/org/springframework/model/alert/support/package-info.java b/org.springframework.context/src/main/java/org/springframework/model/alert/support/package-info.java new file mode 100644 index 00000000000..049ffe346fd --- /dev/null +++ b/org.springframework.context/src/main/java/org/springframework/model/alert/support/package-info.java @@ -0,0 +1,5 @@ +/** + * AlertContext implementation suitable for use in most environments. + */ +package org.springframework.model.alert.support; + diff --git a/org.springframework.context/src/main/java/org/springframework/ui/binding/binder/Binder.java b/org.springframework.context/src/main/java/org/springframework/model/binder/Binder.java similarity index 95% rename from org.springframework.context/src/main/java/org/springframework/ui/binding/binder/Binder.java rename to org.springframework.context/src/main/java/org/springframework/model/binder/Binder.java index 64ef00576a5..09ebd1dd768 100644 --- a/org.springframework.context/src/main/java/org/springframework/ui/binding/binder/Binder.java +++ b/org.springframework.context/src/main/java/org/springframework/model/binder/Binder.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.ui.binding.binder; +package org.springframework.model.binder; import java.util.Map; diff --git a/org.springframework.context/src/main/java/org/springframework/ui/binding/binder/BindingResult.java b/org.springframework.context/src/main/java/org/springframework/model/binder/BindingResult.java similarity index 94% rename from org.springframework.context/src/main/java/org/springframework/ui/binding/binder/BindingResult.java rename to org.springframework.context/src/main/java/org/springframework/model/binder/BindingResult.java index 74f85838388..f935e75035d 100644 --- a/org.springframework.context/src/main/java/org/springframework/ui/binding/binder/BindingResult.java +++ b/org.springframework.context/src/main/java/org/springframework/model/binder/BindingResult.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.ui.binding.binder; +package org.springframework.model.binder; -import org.springframework.ui.alert.Alert; +import org.springframework.model.alert.Alert; /** * The result of a bind operation. diff --git a/org.springframework.context/src/main/java/org/springframework/ui/binding/binder/BindingResults.java b/org.springframework.context/src/main/java/org/springframework/model/binder/BindingResults.java similarity index 96% rename from org.springframework.context/src/main/java/org/springframework/ui/binding/binder/BindingResults.java rename to org.springframework.context/src/main/java/org/springframework/model/binder/BindingResults.java index 0c2e66c99ea..6b95155af36 100644 --- a/org.springframework.context/src/main/java/org/springframework/ui/binding/binder/BindingResults.java +++ b/org.springframework.context/src/main/java/org/springframework/model/binder/BindingResults.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.ui.binding.binder; +package org.springframework.model.binder; import java.util.List; diff --git a/org.springframework.context/src/main/java/org/springframework/ui/binding/binder/MissingFieldException.java b/org.springframework.context/src/main/java/org/springframework/model/binder/MissingFieldException.java similarity index 97% rename from org.springframework.context/src/main/java/org/springframework/ui/binding/binder/MissingFieldException.java rename to org.springframework.context/src/main/java/org/springframework/model/binder/MissingFieldException.java index ac948fdeb44..d1cbe1474af 100644 --- a/org.springframework.context/src/main/java/org/springframework/ui/binding/binder/MissingFieldException.java +++ b/org.springframework.context/src/main/java/org/springframework/model/binder/MissingFieldException.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.ui.binding.binder; +package org.springframework.model.binder; import java.util.List; import java.util.Map; diff --git a/org.springframework.context/src/main/java/org/springframework/model/binder/package-info.java b/org.springframework.context/src/main/java/org/springframework/model/binder/package-info.java new file mode 100644 index 00000000000..58ac5a552e9 --- /dev/null +++ b/org.springframework.context/src/main/java/org/springframework/model/binder/package-info.java @@ -0,0 +1,5 @@ +/** + * API for binding submitted field values in a single batch operation. + */ +package org.springframework.model.binder; + diff --git a/org.springframework.context/src/main/java/org/springframework/ui/message/DefaultMessageResolver.java b/org.springframework.context/src/main/java/org/springframework/model/message/DefaultMessageResolver.java similarity index 99% rename from org.springframework.context/src/main/java/org/springframework/ui/message/DefaultMessageResolver.java rename to org.springframework.context/src/main/java/org/springframework/model/message/DefaultMessageResolver.java index 3f5e198e3f7..37d4b5d3a15 100644 --- a/org.springframework.context/src/main/java/org/springframework/ui/message/DefaultMessageResolver.java +++ b/org.springframework.context/src/main/java/org/springframework/model/message/DefaultMessageResolver.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.ui.message; +package org.springframework.model.message; import java.util.Locale; import java.util.Map; diff --git a/org.springframework.context/src/main/java/org/springframework/ui/message/MessageBuilder.java b/org.springframework.context/src/main/java/org/springframework/model/message/MessageBuilder.java similarity index 99% rename from org.springframework.context/src/main/java/org/springframework/ui/message/MessageBuilder.java rename to org.springframework.context/src/main/java/org/springframework/model/message/MessageBuilder.java index 895560073a6..c9e043b544c 100644 --- a/org.springframework.context/src/main/java/org/springframework/ui/message/MessageBuilder.java +++ b/org.springframework.context/src/main/java/org/springframework/model/message/MessageBuilder.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.ui.message; +package org.springframework.model.message; import java.util.Locale; diff --git a/org.springframework.context/src/main/java/org/springframework/ui/message/MessageResolutionException.java b/org.springframework.context/src/main/java/org/springframework/model/message/MessageResolutionException.java similarity index 96% rename from org.springframework.context/src/main/java/org/springframework/ui/message/MessageResolutionException.java rename to org.springframework.context/src/main/java/org/springframework/model/message/MessageResolutionException.java index a56497733c4..b3c951e51ea 100644 --- a/org.springframework.context/src/main/java/org/springframework/ui/message/MessageResolutionException.java +++ b/org.springframework.context/src/main/java/org/springframework/model/message/MessageResolutionException.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.ui.message; +package org.springframework.model.message; /** * Runtime exception thrown by a {@link MessageResolver} if a message resolution fails. diff --git a/org.springframework.context/src/main/java/org/springframework/ui/message/MessageResolver.java b/org.springframework.context/src/main/java/org/springframework/model/message/MessageResolver.java similarity index 96% rename from org.springframework.context/src/main/java/org/springframework/ui/message/MessageResolver.java rename to org.springframework.context/src/main/java/org/springframework/model/message/MessageResolver.java index c0265d5359d..32d84dbbb29 100644 --- a/org.springframework.context/src/main/java/org/springframework/ui/message/MessageResolver.java +++ b/org.springframework.context/src/main/java/org/springframework/model/message/MessageResolver.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.ui.message; +package org.springframework.model.message; import java.util.Locale; diff --git a/org.springframework.context/src/main/java/org/springframework/ui/message/MessageResolverBuilder.java b/org.springframework.context/src/main/java/org/springframework/model/message/MessageResolverBuilder.java similarity index 99% rename from org.springframework.context/src/main/java/org/springframework/ui/message/MessageResolverBuilder.java rename to org.springframework.context/src/main/java/org/springframework/model/message/MessageResolverBuilder.java index 5658297c9b2..e7c8362ff76 100644 --- a/org.springframework.context/src/main/java/org/springframework/ui/message/MessageResolverBuilder.java +++ b/org.springframework.context/src/main/java/org/springframework/model/message/MessageResolverBuilder.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.ui.message; +package org.springframework.model.message; import java.util.LinkedHashMap; import java.util.LinkedHashSet; diff --git a/org.springframework.context/src/main/java/org/springframework/ui/message/ResolvableArgument.java b/org.springframework.context/src/main/java/org/springframework/model/message/ResolvableArgument.java similarity index 97% rename from org.springframework.context/src/main/java/org/springframework/ui/message/ResolvableArgument.java rename to org.springframework.context/src/main/java/org/springframework/model/message/ResolvableArgument.java index 380bb2192d9..a332fc04639 100644 --- a/org.springframework.context/src/main/java/org/springframework/ui/message/ResolvableArgument.java +++ b/org.springframework.context/src/main/java/org/springframework/model/message/ResolvableArgument.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.ui.message; +package org.springframework.model.message; import org.springframework.context.MessageSource; import org.springframework.context.MessageSourceResolvable; diff --git a/org.springframework.context/src/main/java/org/springframework/model/message/package-info.java b/org.springframework.context/src/main/java/org/springframework/model/message/package-info.java new file mode 100644 index 00000000000..11043e6afec --- /dev/null +++ b/org.springframework.context/src/main/java/org/springframework/model/message/package-info.java @@ -0,0 +1,5 @@ +/** + * An API for creating localized messages. + */ +package org.springframework.model.message; + diff --git a/org.springframework.context/src/main/java/org/springframework/ui/binding/BindingStatus.java b/org.springframework.context/src/main/java/org/springframework/model/ui/BindingStatus.java similarity index 96% rename from org.springframework.context/src/main/java/org/springframework/ui/binding/BindingStatus.java rename to org.springframework.context/src/main/java/org/springframework/model/ui/BindingStatus.java index d85b499baf6..0a4226a6a9e 100644 --- a/org.springframework.context/src/main/java/org/springframework/ui/binding/BindingStatus.java +++ b/org.springframework.context/src/main/java/org/springframework/model/ui/BindingStatus.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.ui.binding; +package org.springframework.model.ui; /** * FieldModel binding states. diff --git a/org.springframework.context/src/main/java/org/springframework/ui/binding/FieldModel.java b/org.springframework.context/src/main/java/org/springframework/model/ui/FieldModel.java similarity index 97% rename from org.springframework.context/src/main/java/org/springframework/ui/binding/FieldModel.java rename to org.springframework.context/src/main/java/org/springframework/model/ui/FieldModel.java index ccfba7519e7..7e9d4cb45ae 100644 --- a/org.springframework.context/src/main/java/org/springframework/ui/binding/FieldModel.java +++ b/org.springframework.context/src/main/java/org/springframework/model/ui/FieldModel.java @@ -13,10 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.ui.binding; +package org.springframework.model.ui; -import org.springframework.ui.alert.Alert; -import org.springframework.ui.alert.Severity; +import org.springframework.model.alert.Alert; /** * A model for a single data field containing dynamic information to display in the view. diff --git a/org.springframework.context/src/main/java/org/springframework/ui/binding/FieldNotFoundException.java b/org.springframework.context/src/main/java/org/springframework/model/ui/FieldNotFoundException.java similarity index 96% rename from org.springframework.context/src/main/java/org/springframework/ui/binding/FieldNotFoundException.java rename to org.springframework.context/src/main/java/org/springframework/model/ui/FieldNotFoundException.java index 998b4a86399..1182d7016c6 100644 --- a/org.springframework.context/src/main/java/org/springframework/ui/binding/FieldNotFoundException.java +++ b/org.springframework.context/src/main/java/org/springframework/model/ui/FieldNotFoundException.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.ui.binding; +package org.springframework.model.ui; /** * Thrown when a PresentationModel field cannot be found. diff --git a/org.springframework.context/src/main/java/org/springframework/ui/binding/PresentationModel.java b/org.springframework.context/src/main/java/org/springframework/model/ui/PresentationModel.java similarity index 96% rename from org.springframework.context/src/main/java/org/springframework/ui/binding/PresentationModel.java rename to org.springframework.context/src/main/java/org/springframework/model/ui/PresentationModel.java index c9c87097a0d..f893073444c 100644 --- a/org.springframework.context/src/main/java/org/springframework/ui/binding/PresentationModel.java +++ b/org.springframework.context/src/main/java/org/springframework/model/ui/PresentationModel.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.ui.binding; +package org.springframework.model.ui; /** * Represents the state and behavior of a presentation independently of the GUI controls used in the interface. diff --git a/org.springframework.context/src/main/java/org/springframework/ui/binding/PresentationModelFactory.java b/org.springframework.context/src/main/java/org/springframework/model/ui/PresentationModelFactory.java similarity index 96% rename from org.springframework.context/src/main/java/org/springframework/ui/binding/PresentationModelFactory.java rename to org.springframework.context/src/main/java/org/springframework/model/ui/PresentationModelFactory.java index 4ce62b77e8e..b13d92446bf 100644 --- a/org.springframework.context/src/main/java/org/springframework/ui/binding/PresentationModelFactory.java +++ b/org.springframework.context/src/main/java/org/springframework/model/ui/PresentationModelFactory.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.ui.binding; +package org.springframework.model.ui; /** * A factory for domain object PresentationModels. diff --git a/org.springframework.context/src/main/java/org/springframework/ui/binding/ValidationStatus.java b/org.springframework.context/src/main/java/org/springframework/model/ui/ValidationStatus.java similarity index 95% rename from org.springframework.context/src/main/java/org/springframework/ui/binding/ValidationStatus.java rename to org.springframework.context/src/main/java/org/springframework/model/ui/ValidationStatus.java index 3e5c31c01f4..b721f247d96 100644 --- a/org.springframework.context/src/main/java/org/springframework/ui/binding/ValidationStatus.java +++ b/org.springframework.context/src/main/java/org/springframework/model/ui/ValidationStatus.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.ui.binding; +package org.springframework.model.ui; /** * FieldModel Validation states. diff --git a/org.springframework.context/src/main/java/org/springframework/ui/binding/binder/ArrayListBindingResults.java b/org.springframework.context/src/main/java/org/springframework/model/ui/binder/ArrayListBindingResults.java similarity index 92% rename from org.springframework.context/src/main/java/org/springframework/ui/binding/binder/ArrayListBindingResults.java rename to org.springframework.context/src/main/java/org/springframework/model/ui/binder/ArrayListBindingResults.java index 8ea45639354..a0a03421b5e 100644 --- a/org.springframework.context/src/main/java/org/springframework/ui/binding/binder/ArrayListBindingResults.java +++ b/org.springframework.context/src/main/java/org/springframework/model/ui/binder/ArrayListBindingResults.java @@ -13,12 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.ui.binding.binder; +package org.springframework.model.ui.binder; import java.util.ArrayList; import java.util.Iterator; import java.util.List; +import org.springframework.model.binder.BindingResult; +import org.springframework.model.binder.BindingResults; + class ArrayListBindingResults implements BindingResults { private List results; diff --git a/org.springframework.context/src/main/java/org/springframework/ui/binding/binder/BinderExecutor.java b/org.springframework.context/src/main/java/org/springframework/model/ui/binder/BinderExecutor.java similarity index 88% rename from org.springframework.context/src/main/java/org/springframework/ui/binding/binder/BinderExecutor.java rename to org.springframework.context/src/main/java/org/springframework/model/ui/binder/BinderExecutor.java index 3a746903e85..6456d6b5aa9 100644 --- a/org.springframework.context/src/main/java/org/springframework/ui/binding/binder/BinderExecutor.java +++ b/org.springframework.context/src/main/java/org/springframework/model/ui/binder/BinderExecutor.java @@ -13,9 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.ui.binding.binder; +package org.springframework.model.ui.binder; -import org.springframework.ui.binding.config.FieldModelConfiguration; +import org.springframework.model.binder.Binder; +import org.springframework.model.binder.BindingResults; +import org.springframework.model.ui.config.FieldModelConfiguration; /** * A SPI interface that lets you configure a {@link Binder}, then execute it. diff --git a/org.springframework.context/src/main/java/org/springframework/ui/binding/binder/BindingStatusResult.java b/org.springframework.context/src/main/java/org/springframework/model/ui/binder/BindingStatusResult.java similarity index 86% rename from org.springframework.context/src/main/java/org/springframework/ui/binding/binder/BindingStatusResult.java rename to org.springframework.context/src/main/java/org/springframework/model/ui/binder/BindingStatusResult.java index 465d5b24ced..4e36ae05a7d 100644 --- a/org.springframework.context/src/main/java/org/springframework/ui/binding/binder/BindingStatusResult.java +++ b/org.springframework.context/src/main/java/org/springframework/model/ui/binder/BindingStatusResult.java @@ -13,10 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.ui.binding.binder; +package org.springframework.model.ui.binder; -import org.springframework.ui.alert.Alert; -import org.springframework.ui.alert.Severity; +import org.springframework.model.alert.Alert; +import org.springframework.model.alert.Severity; +import org.springframework.model.binder.BindingResult; class BindingStatusResult implements BindingResult { diff --git a/org.springframework.context/src/main/java/org/springframework/ui/binding/binder/FieldNotEditableResult.java b/org.springframework.context/src/main/java/org/springframework/model/ui/binder/FieldNotEditableResult.java similarity index 86% rename from org.springframework.context/src/main/java/org/springframework/ui/binding/binder/FieldNotEditableResult.java rename to org.springframework.context/src/main/java/org/springframework/model/ui/binder/FieldNotEditableResult.java index 2a0dffc66fc..3b79a3ccb33 100644 --- a/org.springframework.context/src/main/java/org/springframework/ui/binding/binder/FieldNotEditableResult.java +++ b/org.springframework.context/src/main/java/org/springframework/model/ui/binder/FieldNotEditableResult.java @@ -13,14 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.ui.binding.binder; +package org.springframework.model.ui.binder; import org.springframework.context.MessageSource; import org.springframework.core.style.StylerUtils; -import org.springframework.ui.alert.Alert; -import org.springframework.ui.alert.Severity; -import org.springframework.ui.message.MessageBuilder; -import org.springframework.ui.message.ResolvableArgument; +import org.springframework.model.alert.Alert; +import org.springframework.model.alert.Severity; +import org.springframework.model.binder.BindingResult; +import org.springframework.model.message.MessageBuilder; +import org.springframework.model.message.ResolvableArgument; class FieldNotEditableResult implements BindingResult { diff --git a/org.springframework.context/src/main/java/org/springframework/ui/binding/binder/FieldNotFoundResult.java b/org.springframework.context/src/main/java/org/springframework/model/ui/binder/FieldNotFoundResult.java similarity index 86% rename from org.springframework.context/src/main/java/org/springframework/ui/binding/binder/FieldNotFoundResult.java rename to org.springframework.context/src/main/java/org/springframework/model/ui/binder/FieldNotFoundResult.java index 2c3dcb0b442..92413551aea 100644 --- a/org.springframework.context/src/main/java/org/springframework/ui/binding/binder/FieldNotFoundResult.java +++ b/org.springframework.context/src/main/java/org/springframework/model/ui/binder/FieldNotFoundResult.java @@ -13,14 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.ui.binding.binder; +package org.springframework.model.ui.binder; import org.springframework.context.MessageSource; import org.springframework.core.style.StylerUtils; -import org.springframework.ui.alert.Alert; -import org.springframework.ui.alert.Severity; -import org.springframework.ui.message.MessageBuilder; -import org.springframework.ui.message.ResolvableArgument; +import org.springframework.model.alert.Alert; +import org.springframework.model.alert.Severity; +import org.springframework.model.binder.BindingResult; +import org.springframework.model.message.MessageBuilder; +import org.springframework.model.message.ResolvableArgument; class FieldNotFoundResult implements BindingResult { diff --git a/org.springframework.context/src/main/java/org/springframework/ui/binding/binder/PresentationModelBinder.java b/org.springframework.context/src/main/java/org/springframework/model/ui/binder/PresentationModelBinder.java similarity index 90% rename from org.springframework.context/src/main/java/org/springframework/ui/binding/binder/PresentationModelBinder.java rename to org.springframework.context/src/main/java/org/springframework/model/ui/binder/PresentationModelBinder.java index 9f02b081814..861461bb26d 100644 --- a/org.springframework.context/src/main/java/org/springframework/ui/binding/binder/PresentationModelBinder.java +++ b/org.springframework.context/src/main/java/org/springframework/model/ui/binder/PresentationModelBinder.java @@ -13,17 +13,21 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.ui.binding.binder; +package org.springframework.model.ui.binder; import java.util.ArrayList; import java.util.List; import java.util.Map; import org.springframework.context.MessageSource; -import org.springframework.ui.binding.BindingStatus; -import org.springframework.ui.binding.FieldModel; -import org.springframework.ui.binding.FieldNotFoundException; -import org.springframework.ui.binding.PresentationModel; +import org.springframework.model.binder.Binder; +import org.springframework.model.binder.BindingResult; +import org.springframework.model.binder.BindingResults; +import org.springframework.model.binder.MissingFieldException; +import org.springframework.model.ui.BindingStatus; +import org.springframework.model.ui.FieldModel; +import org.springframework.model.ui.FieldNotFoundException; +import org.springframework.model.ui.PresentationModel; import org.springframework.util.Assert; /** diff --git a/org.springframework.context/src/main/java/org/springframework/ui/binding/binder/WebBinder.java b/org.springframework.context/src/main/java/org/springframework/model/ui/binder/WebBinder.java similarity index 95% rename from org.springframework.context/src/main/java/org/springframework/ui/binding/binder/WebBinder.java rename to org.springframework.context/src/main/java/org/springframework/model/ui/binder/WebBinder.java index c6f6762bfc4..21a053debd2 100644 --- a/org.springframework.context/src/main/java/org/springframework/ui/binding/binder/WebBinder.java +++ b/org.springframework.context/src/main/java/org/springframework/model/ui/binder/WebBinder.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.ui.binding.binder; +package org.springframework.model.ui.binder; import java.util.LinkedHashMap; import java.util.Map; -import org.springframework.ui.binding.FieldModel; -import org.springframework.ui.binding.PresentationModel; +import org.springframework.model.ui.FieldModel; +import org.springframework.model.ui.PresentationModel; /** * A binder designed for use in HTTP (web) environments. diff --git a/org.springframework.context/src/main/java/org/springframework/model/ui/binder/package-info.java b/org.springframework.context/src/main/java/org/springframework/model/ui/binder/package-info.java new file mode 100644 index 00000000000..76001f2c20d --- /dev/null +++ b/org.springframework.context/src/main/java/org/springframework/model/ui/binder/package-info.java @@ -0,0 +1,5 @@ +/** + * Binder implementation that binds to PresentationModels. + */ +package org.springframework.model.ui.binder; + diff --git a/org.springframework.context/src/main/java/org/springframework/ui/binding/config/Condition.java b/org.springframework.context/src/main/java/org/springframework/model/ui/config/Condition.java similarity index 92% rename from org.springframework.context/src/main/java/org/springframework/ui/binding/config/Condition.java rename to org.springframework.context/src/main/java/org/springframework/model/ui/config/Condition.java index afd205748f0..82d2a409376 100644 --- a/org.springframework.context/src/main/java/org/springframework/ui/binding/config/Condition.java +++ b/org.springframework.context/src/main/java/org/springframework/model/ui/config/Condition.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.ui.binding.config; +package org.springframework.model.ui.config; -import org.springframework.ui.binding.FieldModel; +import org.springframework.model.ui.FieldModel; /** * A FieldModel condition. diff --git a/org.springframework.context/src/main/java/org/springframework/ui/binding/config/FieldModelConfiguration.java b/org.springframework.context/src/main/java/org/springframework/model/ui/config/FieldModelConfiguration.java similarity index 91% rename from org.springframework.context/src/main/java/org/springframework/ui/binding/config/FieldModelConfiguration.java rename to org.springframework.context/src/main/java/org/springframework/model/ui/config/FieldModelConfiguration.java index 3f88c64b078..f4239864b40 100644 --- a/org.springframework.context/src/main/java/org/springframework/ui/binding/config/FieldModelConfiguration.java +++ b/org.springframework.context/src/main/java/org/springframework/model/ui/config/FieldModelConfiguration.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.ui.binding.config; +package org.springframework.model.ui.config; -import org.springframework.ui.binding.FieldModel; -import org.springframework.ui.format.Formatter; +import org.springframework.model.ui.FieldModel; +import org.springframework.model.ui.format.Formatter; /** * A fluent interface for configuring a {@link FieldModel}. diff --git a/org.springframework.context/src/main/java/org/springframework/model/ui/config/package-info.java b/org.springframework.context/src/main/java/org/springframework/model/ui/config/package-info.java new file mode 100644 index 00000000000..c13f94c23e0 --- /dev/null +++ b/org.springframework.context/src/main/java/org/springframework/model/ui/config/package-info.java @@ -0,0 +1,5 @@ +/** + * PresentationModel configuration SPI. + */ +package org.springframework.model.ui.config; + diff --git a/org.springframework.context/src/main/java/org/springframework/ui/format/AnnotationFormatterFactory.java b/org.springframework.context/src/main/java/org/springframework/model/ui/format/AnnotationFormatterFactory.java similarity index 97% rename from org.springframework.context/src/main/java/org/springframework/ui/format/AnnotationFormatterFactory.java rename to org.springframework.context/src/main/java/org/springframework/model/ui/format/AnnotationFormatterFactory.java index 05bf91ba6ec..cdef31024c9 100644 --- a/org.springframework.context/src/main/java/org/springframework/ui/format/AnnotationFormatterFactory.java +++ b/org.springframework.context/src/main/java/org/springframework/model/ui/format/AnnotationFormatterFactory.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.ui.format; +package org.springframework.model.ui.format; import java.lang.annotation.Annotation; diff --git a/org.springframework.context/src/main/java/org/springframework/ui/format/Formatted.java b/org.springframework.context/src/main/java/org/springframework/model/ui/format/Formatted.java similarity index 96% rename from org.springframework.context/src/main/java/org/springframework/ui/format/Formatted.java rename to org.springframework.context/src/main/java/org/springframework/model/ui/format/Formatted.java index bac18638852..cb6e8e387f6 100644 --- a/org.springframework.context/src/main/java/org/springframework/ui/format/Formatted.java +++ b/org.springframework.context/src/main/java/org/springframework/model/ui/format/Formatted.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.ui.format; +package org.springframework.model.ui.format; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; diff --git a/org.springframework.context/src/main/java/org/springframework/ui/format/Formatter.java b/org.springframework.context/src/main/java/org/springframework/model/ui/format/Formatter.java similarity index 96% rename from org.springframework.context/src/main/java/org/springframework/ui/format/Formatter.java rename to org.springframework.context/src/main/java/org/springframework/model/ui/format/Formatter.java index e9342f6169c..bca8dbcac2c 100644 --- a/org.springframework.context/src/main/java/org/springframework/ui/format/Formatter.java +++ b/org.springframework.context/src/main/java/org/springframework/model/ui/format/Formatter.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.ui.format; +package org.springframework.model.ui.format; import java.text.ParseException; import java.util.Locale; diff --git a/org.springframework.context/src/main/java/org/springframework/ui/format/date/DateFormatter.java b/org.springframework.context/src/main/java/org/springframework/model/ui/format/date/DateFormatter.java similarity index 95% rename from org.springframework.context/src/main/java/org/springframework/ui/format/date/DateFormatter.java rename to org.springframework.context/src/main/java/org/springframework/model/ui/format/date/DateFormatter.java index d5c5c152bd8..fda53c44e21 100644 --- a/org.springframework.context/src/main/java/org/springframework/ui/format/date/DateFormatter.java +++ b/org.springframework.context/src/main/java/org/springframework/model/ui/format/date/DateFormatter.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.ui.format.date; +package org.springframework.model.ui.format.date; import java.text.DateFormat; import java.text.ParseException; @@ -23,7 +23,7 @@ import java.util.Locale; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.springframework.ui.format.Formatter; +import org.springframework.model.ui.format.Formatter; /** * A formatter for {@link Date} types. diff --git a/org.springframework.context/src/main/java/org/springframework/model/ui/format/date/package-info.java b/org.springframework.context/src/main/java/org/springframework/model/ui/format/date/package-info.java new file mode 100644 index 00000000000..c75f3230473 --- /dev/null +++ b/org.springframework.context/src/main/java/org/springframework/model/ui/format/date/package-info.java @@ -0,0 +1,5 @@ +/** + * Formatters for java.util.Date fields. + */ +package org.springframework.model.ui.format.date; + diff --git a/org.springframework.context/src/main/java/org/springframework/ui/format/number/CurrencyFormat.java b/org.springframework.context/src/main/java/org/springframework/model/ui/format/number/CurrencyFormat.java similarity index 95% rename from org.springframework.context/src/main/java/org/springframework/ui/format/number/CurrencyFormat.java rename to org.springframework.context/src/main/java/org/springframework/model/ui/format/number/CurrencyFormat.java index bd37362d6d7..109828b309d 100644 --- a/org.springframework.context/src/main/java/org/springframework/ui/format/number/CurrencyFormat.java +++ b/org.springframework.context/src/main/java/org/springframework/model/ui/format/number/CurrencyFormat.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.ui.format.number; +package org.springframework.model.ui.format.number; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; diff --git a/org.springframework.context/src/main/java/org/springframework/ui/format/number/CurrencyFormatter.java b/org.springframework.context/src/main/java/org/springframework/model/ui/format/number/CurrencyFormatter.java similarity index 95% rename from org.springframework.context/src/main/java/org/springframework/ui/format/number/CurrencyFormatter.java rename to org.springframework.context/src/main/java/org/springframework/model/ui/format/number/CurrencyFormatter.java index d12e1ea4323..e8d34e06b45 100644 --- a/org.springframework.context/src/main/java/org/springframework/ui/format/number/CurrencyFormatter.java +++ b/org.springframework.context/src/main/java/org/springframework/model/ui/format/number/CurrencyFormatter.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.ui.format.number; +package org.springframework.model.ui.format.number; import java.math.BigDecimal; import java.math.RoundingMode; @@ -22,7 +22,7 @@ import java.text.ParseException; import java.text.ParsePosition; import java.util.Locale; -import org.springframework.ui.format.Formatter; +import org.springframework.model.ui.format.Formatter; /** * A BigDecimal formatter for currency values. diff --git a/org.springframework.context/src/main/java/org/springframework/ui/format/number/CurrencyNumberFormatFactory.java b/org.springframework.context/src/main/java/org/springframework/model/ui/format/number/CurrencyNumberFormatFactory.java similarity index 95% rename from org.springframework.context/src/main/java/org/springframework/ui/format/number/CurrencyNumberFormatFactory.java rename to org.springframework.context/src/main/java/org/springframework/model/ui/format/number/CurrencyNumberFormatFactory.java index 648feb4ae0c..e0068f052ea 100644 --- a/org.springframework.context/src/main/java/org/springframework/ui/format/number/CurrencyNumberFormatFactory.java +++ b/org.springframework.context/src/main/java/org/springframework/model/ui/format/number/CurrencyNumberFormatFactory.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.ui.format.number; +package org.springframework.model.ui.format.number; import java.math.RoundingMode; import java.text.DecimalFormat; diff --git a/org.springframework.context/src/main/java/org/springframework/ui/format/number/DecimalFormatter.java b/org.springframework.context/src/main/java/org/springframework/model/ui/format/number/DecimalFormatter.java similarity index 95% rename from org.springframework.context/src/main/java/org/springframework/ui/format/number/DecimalFormatter.java rename to org.springframework.context/src/main/java/org/springframework/model/ui/format/number/DecimalFormatter.java index 1ba182f5625..f0969eab465 100644 --- a/org.springframework.context/src/main/java/org/springframework/ui/format/number/DecimalFormatter.java +++ b/org.springframework.context/src/main/java/org/springframework/model/ui/format/number/DecimalFormatter.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.ui.format.number; +package org.springframework.model.ui.format.number; import java.math.BigDecimal; import java.text.NumberFormat; @@ -21,7 +21,7 @@ import java.text.ParseException; import java.text.ParsePosition; import java.util.Locale; -import org.springframework.ui.format.Formatter; +import org.springframework.model.ui.format.Formatter; /** * A BigDecimal formatter for decimal values. diff --git a/org.springframework.context/src/main/java/org/springframework/ui/format/number/DefaultNumberFormatFactory.java b/org.springframework.context/src/main/java/org/springframework/model/ui/format/number/DefaultNumberFormatFactory.java similarity index 97% rename from org.springframework.context/src/main/java/org/springframework/ui/format/number/DefaultNumberFormatFactory.java rename to org.springframework.context/src/main/java/org/springframework/model/ui/format/number/DefaultNumberFormatFactory.java index 1cdd51262c8..1df4e823779 100644 --- a/org.springframework.context/src/main/java/org/springframework/ui/format/number/DefaultNumberFormatFactory.java +++ b/org.springframework.context/src/main/java/org/springframework/model/ui/format/number/DefaultNumberFormatFactory.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.ui.format.number; +package org.springframework.model.ui.format.number; import java.text.DecimalFormat; import java.text.NumberFormat; diff --git a/org.springframework.context/src/main/java/org/springframework/ui/format/number/IntegerFormatter.java b/org.springframework.context/src/main/java/org/springframework/model/ui/format/number/IntegerFormatter.java similarity index 94% rename from org.springframework.context/src/main/java/org/springframework/ui/format/number/IntegerFormatter.java rename to org.springframework.context/src/main/java/org/springframework/model/ui/format/number/IntegerFormatter.java index 3535dfc3837..b1593070f8b 100644 --- a/org.springframework.context/src/main/java/org/springframework/ui/format/number/IntegerFormatter.java +++ b/org.springframework.context/src/main/java/org/springframework/model/ui/format/number/IntegerFormatter.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.ui.format.number; +package org.springframework.model.ui.format.number; import java.text.NumberFormat; import java.text.ParseException; import java.text.ParsePosition; import java.util.Locale; -import org.springframework.ui.format.Formatter; +import org.springframework.model.ui.format.Formatter; /** * A Long formatter for whole integer values. diff --git a/org.springframework.context/src/main/java/org/springframework/ui/format/number/IntegerNumberFormatFactory.java b/org.springframework.context/src/main/java/org/springframework/model/ui/format/number/IntegerNumberFormatFactory.java similarity index 94% rename from org.springframework.context/src/main/java/org/springframework/ui/format/number/IntegerNumberFormatFactory.java rename to org.springframework.context/src/main/java/org/springframework/model/ui/format/number/IntegerNumberFormatFactory.java index 502c6dac998..f72b314aea3 100644 --- a/org.springframework.context/src/main/java/org/springframework/ui/format/number/IntegerNumberFormatFactory.java +++ b/org.springframework.context/src/main/java/org/springframework/model/ui/format/number/IntegerNumberFormatFactory.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.ui.format.number; +package org.springframework.model.ui.format.number; import java.text.NumberFormat; import java.util.Locale; diff --git a/org.springframework.context/src/main/java/org/springframework/ui/format/number/NumberFormatFactory.java b/org.springframework.context/src/main/java/org/springframework/model/ui/format/number/NumberFormatFactory.java similarity index 95% rename from org.springframework.context/src/main/java/org/springframework/ui/format/number/NumberFormatFactory.java rename to org.springframework.context/src/main/java/org/springframework/model/ui/format/number/NumberFormatFactory.java index 66f871afa06..d12933a98b8 100644 --- a/org.springframework.context/src/main/java/org/springframework/ui/format/number/NumberFormatFactory.java +++ b/org.springframework.context/src/main/java/org/springframework/model/ui/format/number/NumberFormatFactory.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.ui.format.number; +package org.springframework.model.ui.format.number; import java.text.NumberFormat; import java.util.Locale; diff --git a/org.springframework.context/src/main/java/org/springframework/ui/format/number/PercentFormatter.java b/org.springframework.context/src/main/java/org/springframework/model/ui/format/number/PercentFormatter.java similarity index 95% rename from org.springframework.context/src/main/java/org/springframework/ui/format/number/PercentFormatter.java rename to org.springframework.context/src/main/java/org/springframework/model/ui/format/number/PercentFormatter.java index 5044b28464e..224539c98c5 100644 --- a/org.springframework.context/src/main/java/org/springframework/ui/format/number/PercentFormatter.java +++ b/org.springframework.context/src/main/java/org/springframework/model/ui/format/number/PercentFormatter.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.ui.format.number; +package org.springframework.model.ui.format.number; import java.math.BigDecimal; import java.text.NumberFormat; @@ -21,7 +21,7 @@ import java.text.ParseException; import java.text.ParsePosition; import java.util.Locale; -import org.springframework.ui.format.Formatter; +import org.springframework.model.ui.format.Formatter; /** * A BigDecimal formatter for percent values. diff --git a/org.springframework.context/src/main/java/org/springframework/ui/format/number/PercentNumberFormatFactory.java b/org.springframework.context/src/main/java/org/springframework/model/ui/format/number/PercentNumberFormatFactory.java similarity index 95% rename from org.springframework.context/src/main/java/org/springframework/ui/format/number/PercentNumberFormatFactory.java rename to org.springframework.context/src/main/java/org/springframework/model/ui/format/number/PercentNumberFormatFactory.java index b6724a3e475..9e157805f03 100644 --- a/org.springframework.context/src/main/java/org/springframework/ui/format/number/PercentNumberFormatFactory.java +++ b/org.springframework.context/src/main/java/org/springframework/model/ui/format/number/PercentNumberFormatFactory.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.ui.format.number; +package org.springframework.model.ui.format.number; import java.text.DecimalFormat; import java.text.NumberFormat; diff --git a/org.springframework.context/src/main/java/org/springframework/model/ui/format/number/package-info.java b/org.springframework.context/src/main/java/org/springframework/model/ui/format/number/package-info.java new file mode 100644 index 00000000000..57c4013080c --- /dev/null +++ b/org.springframework.context/src/main/java/org/springframework/model/ui/format/number/package-info.java @@ -0,0 +1,5 @@ +/** + * Formatters for java.lang.Number properties. + */ +package org.springframework.model.ui.format.number; + diff --git a/org.springframework.context/src/main/java/org/springframework/model/ui/format/package-info.java b/org.springframework.context/src/main/java/org/springframework/model/ui/format/package-info.java new file mode 100644 index 00000000000..4773335f954 --- /dev/null +++ b/org.springframework.context/src/main/java/org/springframework/model/ui/format/package-info.java @@ -0,0 +1,5 @@ +/** + * A SPI for defining Formatters to format field model values for display in a UI. + */ +package org.springframework.model.ui.format; + diff --git a/org.springframework.context/src/main/java/org/springframework/model/ui/package-info.java b/org.springframework.context/src/main/java/org/springframework/model/ui/package-info.java new file mode 100644 index 00000000000..aa064ba1fbd --- /dev/null +++ b/org.springframework.context/src/main/java/org/springframework/model/ui/package-info.java @@ -0,0 +1,5 @@ +/** + * Spring's PresentationModel public API. + */ +package org.springframework.model.ui; + diff --git a/org.springframework.context/src/main/java/org/springframework/ui/binding/support/CollectionTypeDescriptor.java b/org.springframework.context/src/main/java/org/springframework/model/ui/support/CollectionTypeDescriptor.java similarity index 97% rename from org.springframework.context/src/main/java/org/springframework/ui/binding/support/CollectionTypeDescriptor.java rename to org.springframework.context/src/main/java/org/springframework/model/ui/support/CollectionTypeDescriptor.java index eb9f11c844e..d07a8e20dd1 100644 --- a/org.springframework.context/src/main/java/org/springframework/ui/binding/support/CollectionTypeDescriptor.java +++ b/org.springframework.context/src/main/java/org/springframework/model/ui/support/CollectionTypeDescriptor.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.ui.binding.support; +package org.springframework.model.ui.support; import org.springframework.util.Assert; import org.springframework.util.ObjectUtils; diff --git a/org.springframework.context/src/main/java/org/springframework/ui/binding/support/DefaultFieldModel.java b/org.springframework.context/src/main/java/org/springframework/model/ui/support/DefaultFieldModel.java similarity index 96% rename from org.springframework.context/src/main/java/org/springframework/ui/binding/support/DefaultFieldModel.java rename to org.springframework.context/src/main/java/org/springframework/model/ui/support/DefaultFieldModel.java index 5a0a8f30001..c5cc8c1ba8f 100644 --- a/org.springframework.context/src/main/java/org/springframework/ui/binding/support/DefaultFieldModel.java +++ b/org.springframework.context/src/main/java/org/springframework/model/ui/support/DefaultFieldModel.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.ui.binding.support; +package org.springframework.model.ui.support; import java.lang.reflect.ParameterizedType; import java.lang.reflect.Type; @@ -32,14 +32,14 @@ import org.springframework.core.convert.ConversionFailedException; import org.springframework.core.convert.TypeConverter; import org.springframework.core.convert.TypeDescriptor; import org.springframework.core.style.StylerUtils; -import org.springframework.ui.alert.Alert; -import org.springframework.ui.alert.Severity; -import org.springframework.ui.binding.BindingStatus; -import org.springframework.ui.binding.FieldModel; -import org.springframework.ui.binding.ValidationStatus; -import org.springframework.ui.format.Formatter; -import org.springframework.ui.message.MessageBuilder; -import org.springframework.ui.message.ResolvableArgument; +import org.springframework.model.alert.Alert; +import org.springframework.model.alert.Severity; +import org.springframework.model.message.MessageBuilder; +import org.springframework.model.message.ResolvableArgument; +import org.springframework.model.ui.BindingStatus; +import org.springframework.model.ui.FieldModel; +import org.springframework.model.ui.ValidationStatus; +import org.springframework.model.ui.format.Formatter; /** * Default FieldModel implementation suitable for use in most environments. diff --git a/org.springframework.context/src/main/java/org/springframework/ui/binding/support/DefaultPresentationModel.java b/org.springframework.context/src/main/java/org/springframework/model/ui/support/DefaultPresentationModel.java similarity index 97% rename from org.springframework.context/src/main/java/org/springframework/ui/binding/support/DefaultPresentationModel.java rename to org.springframework.context/src/main/java/org/springframework/model/ui/support/DefaultPresentationModel.java index 2e9ad0f0e45..04d49305b1f 100644 --- a/org.springframework.context/src/main/java/org/springframework/ui/binding/support/DefaultPresentationModel.java +++ b/org.springframework.context/src/main/java/org/springframework/model/ui/support/DefaultPresentationModel.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.ui.binding.support; +package org.springframework.model.ui.support; import java.beans.BeanInfo; import java.beans.IntrospectionException; @@ -29,12 +29,12 @@ import org.springframework.context.MessageSource; import org.springframework.core.GenericCollectionTypeResolver; import org.springframework.core.convert.TypeConverter; import org.springframework.core.convert.support.DefaultTypeConverter; -import org.springframework.ui.binding.FieldModel; -import org.springframework.ui.binding.FieldNotFoundException; -import org.springframework.ui.binding.PresentationModel; -import org.springframework.ui.binding.config.Condition; -import org.springframework.ui.binding.config.FieldModelConfiguration; -import org.springframework.ui.format.Formatter; +import org.springframework.model.ui.FieldModel; +import org.springframework.model.ui.FieldNotFoundException; +import org.springframework.model.ui.PresentationModel; +import org.springframework.model.ui.config.Condition; +import org.springframework.model.ui.config.FieldModelConfiguration; +import org.springframework.model.ui.format.Formatter; import org.springframework.util.Assert; /** diff --git a/org.springframework.context/src/main/java/org/springframework/ui/binding/support/DefaultPresentationModelFactory.java b/org.springframework.context/src/main/java/org/springframework/model/ui/support/DefaultPresentationModelFactory.java similarity index 89% rename from org.springframework.context/src/main/java/org/springframework/ui/binding/support/DefaultPresentationModelFactory.java rename to org.springframework.context/src/main/java/org/springframework/model/ui/support/DefaultPresentationModelFactory.java index c4bc1901d9a..186e3b3215e 100644 --- a/org.springframework.context/src/main/java/org/springframework/ui/binding/support/DefaultPresentationModelFactory.java +++ b/org.springframework.context/src/main/java/org/springframework/model/ui/support/DefaultPresentationModelFactory.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.ui.binding.support; +package org.springframework.model.ui.support; import java.util.IdentityHashMap; import java.util.Map; -import org.springframework.ui.binding.PresentationModel; -import org.springframework.ui.binding.PresentationModelFactory; +import org.springframework.model.ui.PresentationModel; +import org.springframework.model.ui.PresentationModelFactory; /** * Default PresentationModelFactory implementation that uses a {@link IdentityHashMap} to map domain models to PresentationModels. diff --git a/org.springframework.context/src/main/java/org/springframework/ui/binding/support/FieldModelContext.java b/org.springframework.context/src/main/java/org/springframework/model/ui/support/FieldModelContext.java similarity index 87% rename from org.springframework.context/src/main/java/org/springframework/ui/binding/support/FieldModelContext.java rename to org.springframework.context/src/main/java/org/springframework/model/ui/support/FieldModelContext.java index a2a7a343194..e39706b548d 100644 --- a/org.springframework.context/src/main/java/org/springframework/ui/binding/support/FieldModelContext.java +++ b/org.springframework.context/src/main/java/org/springframework/model/ui/support/FieldModelContext.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.ui.binding.support; +package org.springframework.model.ui.support; import org.springframework.context.MessageSource; import org.springframework.core.convert.TypeConverter; -import org.springframework.ui.binding.FieldModel; -import org.springframework.ui.binding.config.Condition; -import org.springframework.ui.format.Formatter; +import org.springframework.model.ui.FieldModel; +import org.springframework.model.ui.config.Condition; +import org.springframework.model.ui.format.Formatter; /** * A context that allows a FieldModel to access its external configuration. diff --git a/org.springframework.context/src/main/java/org/springframework/ui/binding/support/FieldPath.java b/org.springframework.context/src/main/java/org/springframework/model/ui/support/FieldPath.java similarity index 97% rename from org.springframework.context/src/main/java/org/springframework/ui/binding/support/FieldPath.java rename to org.springframework.context/src/main/java/org/springframework/model/ui/support/FieldPath.java index 60eeeb86d64..805b1bb6d86 100644 --- a/org.springframework.context/src/main/java/org/springframework/ui/binding/support/FieldPath.java +++ b/org.springframework.context/src/main/java/org/springframework/model/ui/support/FieldPath.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.ui.binding.support; +package org.springframework.model.ui.support; import java.util.ArrayList; import java.util.Collections; diff --git a/org.springframework.context/src/main/java/org/springframework/ui/binding/support/FieldPathElement.java b/org.springframework.context/src/main/java/org/springframework/model/ui/support/FieldPathElement.java similarity index 95% rename from org.springframework.context/src/main/java/org/springframework/ui/binding/support/FieldPathElement.java rename to org.springframework.context/src/main/java/org/springframework/model/ui/support/FieldPathElement.java index a19785899a1..678a30f2820 100644 --- a/org.springframework.context/src/main/java/org/springframework/ui/binding/support/FieldPathElement.java +++ b/org.springframework.context/src/main/java/org/springframework/model/ui/support/FieldPathElement.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.ui.binding.support; +package org.springframework.model.ui.support; class FieldPathElement { diff --git a/org.springframework.context/src/main/java/org/springframework/ui/binding/support/FormatterRegistry.java b/org.springframework.context/src/main/java/org/springframework/model/ui/support/FormatterRegistry.java similarity index 93% rename from org.springframework.context/src/main/java/org/springframework/ui/binding/support/FormatterRegistry.java rename to org.springframework.context/src/main/java/org/springframework/model/ui/support/FormatterRegistry.java index 3013fe2a046..5ba6f8acf80 100644 --- a/org.springframework.context/src/main/java/org/springframework/ui/binding/support/FormatterRegistry.java +++ b/org.springframework.context/src/main/java/org/springframework/model/ui/support/FormatterRegistry.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.ui.binding.support; +package org.springframework.model.ui.support; import java.beans.PropertyDescriptor; -import org.springframework.ui.format.AnnotationFormatterFactory; -import org.springframework.ui.format.Formatter; +import org.springframework.model.ui.format.AnnotationFormatterFactory; +import org.springframework.model.ui.format.Formatter; /** * A centralized registry of Formatters indexed by property types. diff --git a/org.springframework.context/src/main/java/org/springframework/ui/binding/support/GenericFormatterRegistry.java b/org.springframework.context/src/main/java/org/springframework/model/ui/support/GenericFormatterRegistry.java similarity index 97% rename from org.springframework.context/src/main/java/org/springframework/ui/binding/support/GenericFormatterRegistry.java rename to org.springframework.context/src/main/java/org/springframework/model/ui/support/GenericFormatterRegistry.java index cbb035b0d88..13eee16d2e7 100644 --- a/org.springframework.context/src/main/java/org/springframework/ui/binding/support/GenericFormatterRegistry.java +++ b/org.springframework.context/src/main/java/org/springframework/model/ui/support/GenericFormatterRegistry.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.ui.binding.support; +package org.springframework.model.ui.support; import java.beans.PropertyDescriptor; import java.lang.annotation.Annotation; @@ -37,9 +37,9 @@ import org.springframework.core.convert.TypeConverter; import org.springframework.core.convert.TypeDescriptor; import org.springframework.core.convert.support.ConversionUtils; import org.springframework.core.convert.support.DefaultTypeConverter; -import org.springframework.ui.format.AnnotationFormatterFactory; -import org.springframework.ui.format.Formatted; -import org.springframework.ui.format.Formatter; +import org.springframework.model.ui.format.AnnotationFormatterFactory; +import org.springframework.model.ui.format.Formatted; +import org.springframework.model.ui.format.Formatter; import org.springframework.util.Assert; import org.springframework.util.StringUtils; diff --git a/org.springframework.context/src/main/java/org/springframework/ui/binding/support/ListElementValueModel.java b/org.springframework.context/src/main/java/org/springframework/model/ui/support/ListElementValueModel.java similarity index 97% rename from org.springframework.context/src/main/java/org/springframework/ui/binding/support/ListElementValueModel.java rename to org.springframework.context/src/main/java/org/springframework/model/ui/support/ListElementValueModel.java index 56fd66643b2..7baed871c13 100644 --- a/org.springframework.context/src/main/java/org/springframework/ui/binding/support/ListElementValueModel.java +++ b/org.springframework.context/src/main/java/org/springframework/model/ui/support/ListElementValueModel.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.ui.binding.support; +package org.springframework.model.ui.support; import java.util.List; diff --git a/org.springframework.context/src/main/java/org/springframework/ui/binding/support/MapValueValueModel.java b/org.springframework.context/src/main/java/org/springframework/model/ui/support/MapValueValueModel.java similarity index 97% rename from org.springframework.context/src/main/java/org/springframework/ui/binding/support/MapValueValueModel.java rename to org.springframework.context/src/main/java/org/springframework/model/ui/support/MapValueValueModel.java index 2664cf6bf93..3b7596d45c2 100644 --- a/org.springframework.context/src/main/java/org/springframework/ui/binding/support/MapValueValueModel.java +++ b/org.springframework.context/src/main/java/org/springframework/model/ui/support/MapValueValueModel.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.ui.binding.support; +package org.springframework.model.ui.support; import java.util.Map; diff --git a/org.springframework.context/src/main/java/org/springframework/ui/binding/support/PropertyValueModel.java b/org.springframework.context/src/main/java/org/springframework/model/ui/support/PropertyValueModel.java similarity index 97% rename from org.springframework.context/src/main/java/org/springframework/ui/binding/support/PropertyValueModel.java rename to org.springframework.context/src/main/java/org/springframework/model/ui/support/PropertyValueModel.java index c89b2b581fd..8f56ef57f9d 100644 --- a/org.springframework.context/src/main/java/org/springframework/ui/binding/support/PropertyValueModel.java +++ b/org.springframework.context/src/main/java/org/springframework/model/ui/support/PropertyValueModel.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.ui.binding.support; +package org.springframework.model.ui.support; import java.beans.PropertyDescriptor; diff --git a/org.springframework.context/src/main/java/org/springframework/ui/binding/support/ValueBuffer.java b/org.springframework.context/src/main/java/org/springframework/model/ui/support/ValueBuffer.java similarity index 96% rename from org.springframework.context/src/main/java/org/springframework/ui/binding/support/ValueBuffer.java rename to org.springframework.context/src/main/java/org/springframework/model/ui/support/ValueBuffer.java index ff246749a72..9f2926468c0 100644 --- a/org.springframework.context/src/main/java/org/springframework/ui/binding/support/ValueBuffer.java +++ b/org.springframework.context/src/main/java/org/springframework/model/ui/support/ValueBuffer.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.ui.binding.support; +package org.springframework.model.ui.support; class ValueBuffer { diff --git a/org.springframework.context/src/main/java/org/springframework/ui/binding/support/ValueModel.java b/org.springframework.context/src/main/java/org/springframework/model/ui/support/ValueModel.java similarity index 96% rename from org.springframework.context/src/main/java/org/springframework/ui/binding/support/ValueModel.java rename to org.springframework.context/src/main/java/org/springframework/model/ui/support/ValueModel.java index a410e863f5d..b8c15efbc63 100644 --- a/org.springframework.context/src/main/java/org/springframework/ui/binding/support/ValueModel.java +++ b/org.springframework.context/src/main/java/org/springframework/model/ui/support/ValueModel.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.ui.binding.support; +package org.springframework.model.ui.support; import org.springframework.core.convert.TypeDescriptor; diff --git a/org.springframework.context/src/main/java/org/springframework/model/ui/support/package-info.java b/org.springframework.context/src/main/java/org/springframework/model/ui/support/package-info.java new file mode 100644 index 00000000000..17dd1cf8faa --- /dev/null +++ b/org.springframework.context/src/main/java/org/springframework/model/ui/support/package-info.java @@ -0,0 +1,5 @@ +/** + * Default implementation of a PresentationModel usable in most environments. + */ +package org.springframework.model.ui.support; + diff --git a/org.springframework.context/src/main/java/org/springframework/ui/validation/Impact.java b/org.springframework.context/src/main/java/org/springframework/model/validation/Impact.java similarity index 90% rename from org.springframework.context/src/main/java/org/springframework/ui/validation/Impact.java rename to org.springframework.context/src/main/java/org/springframework/model/validation/Impact.java index ab192fa0254..45e360702ea 100644 --- a/org.springframework.context/src/main/java/org/springframework/ui/validation/Impact.java +++ b/org.springframework.context/src/main/java/org/springframework/model/validation/Impact.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.ui.validation; +package org.springframework.model.validation; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; @@ -21,7 +21,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import org.springframework.ui.alert.Severity; +import org.springframework.model.alert.Severity; @Target({ElementType.TYPE}) @Retention(RetentionPolicy.RUNTIME) diff --git a/org.springframework.context/src/main/java/org/springframework/ui/validation/Message.java b/org.springframework.context/src/main/java/org/springframework/model/validation/Message.java similarity index 95% rename from org.springframework.context/src/main/java/org/springframework/ui/validation/Message.java rename to org.springframework.context/src/main/java/org/springframework/model/validation/Message.java index e5c00d2537f..e63c226a92b 100644 --- a/org.springframework.context/src/main/java/org/springframework/ui/validation/Message.java +++ b/org.springframework.context/src/main/java/org/springframework/model/validation/Message.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.ui.validation; +package org.springframework.model.validation; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; diff --git a/org.springframework.context/src/main/java/org/springframework/ui/validation/ValidationConstraint.java b/org.springframework.context/src/main/java/org/springframework/model/validation/ValidationConstraint.java similarity index 93% rename from org.springframework.context/src/main/java/org/springframework/ui/validation/ValidationConstraint.java rename to org.springframework.context/src/main/java/org/springframework/model/validation/ValidationConstraint.java index 7aef85a09e5..9df21005669 100644 --- a/org.springframework.context/src/main/java/org/springframework/ui/validation/ValidationConstraint.java +++ b/org.springframework.context/src/main/java/org/springframework/model/validation/ValidationConstraint.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.ui.validation; +package org.springframework.model.validation; public interface ValidationConstraint { boolean validate(T value); diff --git a/org.springframework.context/src/main/java/org/springframework/model/validation/package-info.java b/org.springframework.context/src/main/java/org/springframework/model/validation/package-info.java new file mode 100644 index 00000000000..544c5248941 --- /dev/null +++ b/org.springframework.context/src/main/java/org/springframework/model/validation/package-info.java @@ -0,0 +1,5 @@ +/** + * Model ValidationConstraint SPI. + */ +package org.springframework.model.validation; + diff --git a/org.springframework.context/src/main/java/org/springframework/ui/alert/package.html b/org.springframework.context/src/main/java/org/springframework/ui/alert/package.html deleted file mode 100644 index 478e1080e71..00000000000 --- a/org.springframework.context/src/main/java/org/springframework/ui/alert/package.html +++ /dev/null @@ -1,7 +0,0 @@ - - -

-An API for alerts to display in a user interface. -

- - \ No newline at end of file diff --git a/org.springframework.context/src/main/java/org/springframework/ui/alert/support/package.html b/org.springframework.context/src/main/java/org/springframework/ui/alert/support/package.html deleted file mode 100644 index 44fd00ef3a7..00000000000 --- a/org.springframework.context/src/main/java/org/springframework/ui/alert/support/package.html +++ /dev/null @@ -1,7 +0,0 @@ - - -

-Support implementation of the Alert API. -

- - \ No newline at end of file diff --git a/org.springframework.context/src/main/java/org/springframework/ui/binding/binder/package.html b/org.springframework.context/src/main/java/org/springframework/ui/binding/binder/package.html deleted file mode 100644 index 732f811c673..00000000000 --- a/org.springframework.context/src/main/java/org/springframework/ui/binding/binder/package.html +++ /dev/null @@ -1,7 +0,0 @@ - - -

-A system for binding submitted values to a PresentationModel in a single batch operation. -

- - \ No newline at end of file diff --git a/org.springframework.context/src/main/java/org/springframework/ui/binding/config/package.html b/org.springframework.context/src/main/java/org/springframework/ui/binding/config/package.html deleted file mode 100644 index 069d2533a32..00000000000 --- a/org.springframework.context/src/main/java/org/springframework/ui/binding/config/package.html +++ /dev/null @@ -1,7 +0,0 @@ - - -

-PresentationModel configuration SPI. -

- - \ No newline at end of file diff --git a/org.springframework.context/src/main/java/org/springframework/ui/binding/package.html b/org.springframework.context/src/main/java/org/springframework/ui/binding/package.html deleted file mode 100644 index 61d81625071..00000000000 --- a/org.springframework.context/src/main/java/org/springframework/ui/binding/package.html +++ /dev/null @@ -1,7 +0,0 @@ - - -

-Spring's PresentationModel public API. -

- - \ No newline at end of file diff --git a/org.springframework.context/src/main/java/org/springframework/ui/binding/support/package.html b/org.springframework.context/src/main/java/org/springframework/ui/binding/support/package.html deleted file mode 100644 index dc652e43016..00000000000 --- a/org.springframework.context/src/main/java/org/springframework/ui/binding/support/package.html +++ /dev/null @@ -1,7 +0,0 @@ - - -

-Default implementation of a PresentationModel usable in most environments. -

- - \ No newline at end of file diff --git a/org.springframework.context/src/main/java/org/springframework/ui/format/date/package.html b/org.springframework.context/src/main/java/org/springframework/ui/format/date/package.html deleted file mode 100644 index 65e89477af4..00000000000 --- a/org.springframework.context/src/main/java/org/springframework/ui/format/date/package.html +++ /dev/null @@ -1,7 +0,0 @@ - - -

-Formatters for java.util.Datec properties. -

- - \ No newline at end of file diff --git a/org.springframework.context/src/main/java/org/springframework/ui/format/number/package.html b/org.springframework.context/src/main/java/org/springframework/ui/format/number/package.html deleted file mode 100644 index b1e7aaa68ed..00000000000 --- a/org.springframework.context/src/main/java/org/springframework/ui/format/number/package.html +++ /dev/null @@ -1,7 +0,0 @@ - - -

-Formatters for java.lang.Number properties. -

- - \ No newline at end of file diff --git a/org.springframework.context/src/main/java/org/springframework/ui/format/package.html b/org.springframework.context/src/main/java/org/springframework/ui/format/package.html deleted file mode 100644 index 6473ca939a5..00000000000 --- a/org.springframework.context/src/main/java/org/springframework/ui/format/package.html +++ /dev/null @@ -1,7 +0,0 @@ - - -

-A SPI for defining Formatters to format property values for display in a user interface. -

- - \ No newline at end of file diff --git a/org.springframework.context/src/main/java/org/springframework/ui/message/package.html b/org.springframework.context/src/main/java/org/springframework/ui/message/package.html deleted file mode 100644 index 8e7dcdd2311..00000000000 --- a/org.springframework.context/src/main/java/org/springframework/ui/message/package.html +++ /dev/null @@ -1,7 +0,0 @@ - - -

-An API for creating localized messages to display in a user interface. -

- - \ No newline at end of file