diff --git a/org.springframework.context/src/main/java/org/springframework/format/FormatterRegistry.java b/org.springframework.context/src/main/java/org/springframework/format/FormatterRegistry.java index 923d7448b4e..45511524289 100644 --- a/org.springframework.context/src/main/java/org/springframework/format/FormatterRegistry.java +++ b/org.springframework.context/src/main/java/org/springframework/format/FormatterRegistry.java @@ -29,7 +29,7 @@ public interface FormatterRegistry { /** * Adds a Formatter to format fields of a specific type. - * The Formatter will delegate to the specified printer for printing and parser for parsing. + * The Formatter will delegate to the specified printer for printing and the specified parser for parsing. *

* On print, if the Printer's type T is declared and fieldType is not assignable to T, * a coersion to T will be attempted before delegating to printer to print a field value. diff --git a/org.springframework.context/src/main/java/org/springframework/format/annotation/DateTimeFormat.java b/org.springframework.context/src/main/java/org/springframework/format/annotation/DateTimeFormat.java index d6100498da4..76482250e10 100644 --- a/org.springframework.context/src/main/java/org/springframework/format/annotation/DateTimeFormat.java +++ b/org.springframework.context/src/main/java/org/springframework/format/annotation/DateTimeFormat.java @@ -21,8 +21,9 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; /** - * Indicates a property should be formatted as a date time. + * Declares that a field should be formatted as a date time. * @author Keith Donald + * @since 3.0 */ @Target( { ElementType.METHOD, ElementType.FIELD }) @Retention(RetentionPolicy.RUNTIME) diff --git a/org.springframework.context/src/main/java/org/springframework/format/annotation/ISODateTimeFormat.java b/org.springframework.context/src/main/java/org/springframework/format/annotation/ISODateTimeFormat.java index 1e698068fb2..24d793b2a3c 100644 --- a/org.springframework.context/src/main/java/org/springframework/format/annotation/ISODateTimeFormat.java +++ b/org.springframework.context/src/main/java/org/springframework/format/annotation/ISODateTimeFormat.java @@ -21,8 +21,9 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; /** - * Indicates a property should be formatted as a ISO date time. + * Declares that a field should be formatted as a ISO date time. * @author Keith Donald + * @since 3.0 */ @Target( { ElementType.METHOD, ElementType.FIELD }) @Retention(RetentionPolicy.RUNTIME) diff --git a/org.springframework.context/src/main/java/org/springframework/format/datetime/joda/AbstractDateTimeAnnotationFormatterFactory.java b/org.springframework.context/src/main/java/org/springframework/format/datetime/joda/AbstractDateTimeAnnotationFormatterFactory.java index bf21ce6102d..e2f3ead18e2 100644 --- a/org.springframework.context/src/main/java/org/springframework/format/datetime/joda/AbstractDateTimeAnnotationFormatterFactory.java +++ b/org.springframework.context/src/main/java/org/springframework/format/datetime/joda/AbstractDateTimeAnnotationFormatterFactory.java @@ -38,6 +38,7 @@ import org.springframework.format.Printer; * Base class for annotation-based Joda DateTime formatters. * Can format any Joda {@link ReadableInstant} or {@link ReadablePartial} property, as well as standard {@link Date}, {@link Calendar}, and Long properties. * @author Keith Donald + * @since 3.0 * @param the format annotation parameter type to be declared by subclasses */ abstract class AbstractDateTimeAnnotationFormatterFactory implements AnnotationFormatterFactory { diff --git a/org.springframework.context/src/main/java/org/springframework/format/datetime/joda/DateTimeFormatAnnotationFormatterFactory.java b/org.springframework.context/src/main/java/org/springframework/format/datetime/joda/DateTimeFormatAnnotationFormatterFactory.java index d2771e069cd..0340dfd91e4 100644 --- a/org.springframework.context/src/main/java/org/springframework/format/datetime/joda/DateTimeFormatAnnotationFormatterFactory.java +++ b/org.springframework.context/src/main/java/org/springframework/format/datetime/joda/DateTimeFormatAnnotationFormatterFactory.java @@ -20,8 +20,7 @@ import org.springframework.format.annotation.DateTimeFormat; import org.springframework.format.annotation.DateTimeFormat.Style; /** - * Formats properties annotated with the {@link DateTimeFormat} annotation. - * + * Formats fields annotated with the {@link DateTimeFormat} annotation. * @author Keith Donald * @since 3.0 * @see DateTimeFormat diff --git a/org.springframework.context/src/main/java/org/springframework/format/datetime/joda/DateTimeParser.java b/org.springframework.context/src/main/java/org/springframework/format/datetime/joda/DateTimeParser.java index b2bc74e447a..2c46181cc3c 100644 --- a/org.springframework.context/src/main/java/org/springframework/format/datetime/joda/DateTimeParser.java +++ b/org.springframework.context/src/main/java/org/springframework/format/datetime/joda/DateTimeParser.java @@ -25,6 +25,7 @@ import org.springframework.format.Parser; /** * Parses Joda Time {@link DateTime} instances using a {@link DateTimeFormatter}. * @author Keith Donald + * @since 3.0 */ public final class DateTimeParser implements Parser { diff --git a/org.springframework.context/src/main/java/org/springframework/format/datetime/joda/ISODateTimeFormatAnnotationFormatterFactory.java b/org.springframework.context/src/main/java/org/springframework/format/datetime/joda/ISODateTimeFormatAnnotationFormatterFactory.java index 467aab3c8ab..8112160d5f0 100644 --- a/org.springframework.context/src/main/java/org/springframework/format/datetime/joda/ISODateTimeFormatAnnotationFormatterFactory.java +++ b/org.springframework.context/src/main/java/org/springframework/format/datetime/joda/ISODateTimeFormatAnnotationFormatterFactory.java @@ -20,8 +20,7 @@ import org.springframework.format.annotation.ISODateTimeFormat; import org.springframework.format.annotation.ISODateTimeFormat.Style; /** - * Formats properties annotated with the {@link ISODateTimeFormat} annotation. - * + * Formats fields annotated with the {@link ISODateTimeFormat} annotation. * @author Keith Donald * @since 3.0 * @see ISODateTimeFormat diff --git a/org.springframework.context/src/main/java/org/springframework/format/datetime/joda/JodaTimeContext.java b/org.springframework.context/src/main/java/org/springframework/format/datetime/joda/JodaTimeContext.java index 01b8090e048..ab3a2ec6f9e 100644 --- a/org.springframework.context/src/main/java/org/springframework/format/datetime/joda/JodaTimeContext.java +++ b/org.springframework.context/src/main/java/org/springframework/format/datetime/joda/JodaTimeContext.java @@ -23,6 +23,7 @@ import org.joda.time.format.DateTimeFormatter; * A context that holds user-specific Joda Time settings such as the user's Chronology (calendar system) and time zone. * A null property value indicate the user has not specified a setting. * @author Keith Donald + * @since 3.0 * @see JodaTimeContextHolder */ public class JodaTimeContext { diff --git a/org.springframework.context/src/main/java/org/springframework/format/datetime/joda/JodaTimeContextHolder.java b/org.springframework.context/src/main/java/org/springframework/format/datetime/joda/JodaTimeContextHolder.java index 123d97b26d1..e6d2fd8cf24 100644 --- a/org.springframework.context/src/main/java/org/springframework/format/datetime/joda/JodaTimeContextHolder.java +++ b/org.springframework.context/src/main/java/org/springframework/format/datetime/joda/JodaTimeContextHolder.java @@ -22,6 +22,7 @@ import org.springframework.core.NamedInheritableThreadLocal; /** * A holder for a thread-local user {@link JodaTimeContext}. + * @since 3.0 * @author Keith Donald */ public final class JodaTimeContextHolder { diff --git a/org.springframework.context/src/main/java/org/springframework/format/datetime/joda/JodaTimeConverters.java b/org.springframework.context/src/main/java/org/springframework/format/datetime/joda/JodaTimeConverters.java index 17854558c09..da7c9d0cacd 100644 --- a/org.springframework.context/src/main/java/org/springframework/format/datetime/joda/JodaTimeConverters.java +++ b/org.springframework.context/src/main/java/org/springframework/format/datetime/joda/JodaTimeConverters.java @@ -28,8 +28,9 @@ import org.springframework.core.convert.converter.Converter; import org.springframework.core.convert.converter.ConverterRegistry; /** - * Installs lower-level type converters required to integrate Joda Time support into Spring's formatting and field binding systems. - * @author Keith Donald + * Installs lower-level type converters required to integrate Joda Time support into Spring's field formatting system. + * @author Keith Donald + * @since 3.0 */ final class JodaTimeConverters { diff --git a/org.springframework.context/src/main/java/org/springframework/format/datetime/joda/JodaTimeFormattingConfigurer.java b/org.springframework.context/src/main/java/org/springframework/format/datetime/joda/JodaTimeFormattingConfigurer.java index 070d3f6be98..be534611ebd 100644 --- a/org.springframework.context/src/main/java/org/springframework/format/datetime/joda/JodaTimeFormattingConfigurer.java +++ b/org.springframework.context/src/main/java/org/springframework/format/datetime/joda/JodaTimeFormattingConfigurer.java @@ -33,6 +33,12 @@ import org.springframework.format.Printer; /** * Configures Joda Time's Formatting system for use with Spring. * @author Keith Donald + * @since 3.0 + * @see #setDateStyle(String) + * @see #setTimeStyle(String) + * @see #setTimeStyle(String) + * @see #setUseISOFormat(boolean) + * @see #installJodaTimeFormatting(FormatterRegistry) */ public class JodaTimeFormattingConfigurer { diff --git a/org.springframework.context/src/main/java/org/springframework/format/datetime/joda/MillisecondInstantPrinter.java b/org.springframework.context/src/main/java/org/springframework/format/datetime/joda/MillisecondInstantPrinter.java index d98da64dd4b..dbce3f320eb 100644 --- a/org.springframework.context/src/main/java/org/springframework/format/datetime/joda/MillisecondInstantPrinter.java +++ b/org.springframework.context/src/main/java/org/springframework/format/datetime/joda/MillisecondInstantPrinter.java @@ -23,6 +23,7 @@ import org.springframework.format.Printer; /** * Prints Long instances using a {@link DateTimeFormatter}. * @author Keith Donald + * @since 3.0 */ public final class MillisecondInstantPrinter implements Printer { diff --git a/org.springframework.context/src/main/java/org/springframework/format/datetime/joda/ReadableInstantPrinter.java b/org.springframework.context/src/main/java/org/springframework/format/datetime/joda/ReadableInstantPrinter.java index 0e682d8c658..7a7c541ef10 100644 --- a/org.springframework.context/src/main/java/org/springframework/format/datetime/joda/ReadableInstantPrinter.java +++ b/org.springframework.context/src/main/java/org/springframework/format/datetime/joda/ReadableInstantPrinter.java @@ -24,6 +24,7 @@ import org.springframework.format.Printer; /** * Prints Joda Time {@link ReadableInstant} instances using a {@link DateTimeFormatter}. * @author Keith Donald + * @since 3.0 */ public final class ReadableInstantPrinter implements Printer { diff --git a/org.springframework.context/src/main/java/org/springframework/format/datetime/joda/ReadablePartialPrinter.java b/org.springframework.context/src/main/java/org/springframework/format/datetime/joda/ReadablePartialPrinter.java index 2ba5058c810..152b255ef78 100644 --- a/org.springframework.context/src/main/java/org/springframework/format/datetime/joda/ReadablePartialPrinter.java +++ b/org.springframework.context/src/main/java/org/springframework/format/datetime/joda/ReadablePartialPrinter.java @@ -24,6 +24,7 @@ import org.springframework.format.Printer; /** * Prints Joda Time {@link ReadablePartial} instances using a {@link DateTimeFormatter}. * @author Keith Donald + * @since 3.0 */ public final class ReadablePartialPrinter implements Printer { diff --git a/org.springframework.context/src/main/java/org/springframework/format/support/FormattingConversionService.java b/org.springframework.context/src/main/java/org/springframework/format/support/FormattingConversionService.java index 986e2c85bde..8f16c7e1d92 100644 --- a/org.springframework.context/src/main/java/org/springframework/format/support/FormattingConversionService.java +++ b/org.springframework.context/src/main/java/org/springframework/format/support/FormattingConversionService.java @@ -54,7 +54,7 @@ public class FormattingConversionService implements FormatterRegistry, Conversio /** * Creates a new FormattingConversionService, initially with no Formatters registered. - * The conversion logic contained in the parent is merged with this service. + * The conversion logic contained in the specified parent is merged with this service. */ public FormattingConversionService(ConversionService parent) { this.conversionService.setParent(parent);