diff options
author | Artur Signell <artur@vaadin.com> | 2016-08-18 09:27:03 +0300 |
---|---|---|
committer | Artur Signell <artur@vaadin.com> | 2016-08-18 09:27:03 +0300 |
commit | 6d54d78944f6c3278eed3bb5e7ee19687ee5714e (patch) | |
tree | 8142f622e644e98bb3f8d19a7021fd125f9fed40 /server/src/main/java/com/vaadin/legacy | |
parent | 7b899665d07be33f86015f71695868c70bc5a589 (diff) | |
download | vaadin-framework-6d54d78944f6c3278eed3bb5e7ee19687ee5714e.tar.gz vaadin-framework-6d54d78944f6c3278eed3bb5e7ee19687ee5714e.zip |
Format using Eclipse Neon
Change-Id: I33f1cc33969ff74a95b1b8cc0f2add589be5aae0
Diffstat (limited to 'server/src/main/java/com/vaadin/legacy')
35 files changed, 173 insertions, 140 deletions
diff --git a/server/src/main/java/com/vaadin/legacy/data/Validator.java b/server/src/main/java/com/vaadin/legacy/data/Validator.java index 319f4ae138..3d4052329a 100644 --- a/server/src/main/java/com/vaadin/legacy/data/Validator.java +++ b/server/src/main/java/com/vaadin/legacy/data/Validator.java @@ -25,8 +25,8 @@ import com.vaadin.server.VaadinServlet; * valid or not. * <p> * Implementors of this class can be added to any - * {@link com.vaadin.legacy.data.Validatable Validatable} implementor to verify its - * value. + * {@link com.vaadin.legacy.data.Validatable Validatable} implementor to verify + * its value. * </p> * <p> * {@link #validate(Object)} can be used to check if a value is valid. An diff --git a/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyAbstractStringToNumberConverter.java b/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyAbstractStringToNumberConverter.java index 4b14f66df9..1191c5cd29 100644 --- a/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyAbstractStringToNumberConverter.java +++ b/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyAbstractStringToNumberConverter.java @@ -32,8 +32,8 @@ import java.util.Locale; * @author Vaadin Ltd * @since 7.1 */ -public abstract class LegacyAbstractStringToNumberConverter<T> implements - LegacyConverter<String, T> { +public abstract class LegacyAbstractStringToNumberConverter<T> + implements LegacyConverter<String, T> { /** * Returns the format used by {@link #convertToPresentation(Object, Locale)} diff --git a/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyConverter.java b/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyConverter.java index 1fdd0755b9..d9e9c8d35a 100644 --- a/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyConverter.java +++ b/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyConverter.java @@ -122,8 +122,8 @@ public interface LegacyConverter<PRESENTATION, MODEL> extends Serializable { /** * An exception that signals that the value passed to * {@link LegacyConverter#convertToPresentation(Object, Class, Locale)} or - * {@link LegacyConverter#convertToModel(Object, Class, Locale)} could not be - * converted. + * {@link LegacyConverter#convertToModel(Object, Class, Locale)} could not + * be converted. * * @author Vaadin Ltd * @since 7.0 diff --git a/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyConverterUtil.java b/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyConverterUtil.java index 42d268f781..3afd4e288e 100644 --- a/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyConverterUtil.java +++ b/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyConverterUtil.java @@ -84,8 +84,8 @@ public class LegacyConverterUtil implements Serializable { public static <PRESENTATIONTYPE, MODELTYPE> PRESENTATIONTYPE convertFromModel( MODELTYPE modelValue, Class<? extends PRESENTATIONTYPE> presentationType, - LegacyConverter<PRESENTATIONTYPE, MODELTYPE> converter, Locale locale) - throws LegacyConverter.ConversionException { + LegacyConverter<PRESENTATIONTYPE, MODELTYPE> converter, + Locale locale) throws LegacyConverter.ConversionException { if (converter != null) { /* * If there is a converter, always use it. It must convert or throw @@ -116,8 +116,7 @@ public class LegacyConverterUtil implements Serializable { throw new LegacyConverter.ConversionException( "Unable to convert value of type " + modelValue.getClass().getName() - + " to presentation type " - + presentationType + + " to presentation type " + presentationType + ". No converter is set and the types are not compatible."); } } @@ -146,8 +145,8 @@ public class LegacyConverterUtil implements Serializable { */ public static <MODELTYPE, PRESENTATIONTYPE> MODELTYPE convertToModel( PRESENTATIONTYPE presentationValue, Class<MODELTYPE> modelType, - LegacyConverter<PRESENTATIONTYPE, MODELTYPE> converter, Locale locale) - throws LegacyConverter.ConversionException { + LegacyConverter<PRESENTATIONTYPE, MODELTYPE> converter, + Locale locale) throws LegacyConverter.ConversionException { if (converter != null) { /* * If there is a converter, always use it. It must convert or throw @@ -181,8 +180,7 @@ public class LegacyConverterUtil implements Serializable { throw new LegacyConverter.ConversionException( "Unable to convert value of type " + presentationValue.getClass().getName() - + " to model type " - + modelType + + " to model type " + modelType + ". No converter is set and the types are not compatible."); } @@ -235,8 +233,9 @@ public class LegacyConverterUtil implements Serializable { * @return true if the converter possibly support conversion between the * given presentation and model type, false otherwise */ - public static boolean canConverterPossiblyHandle(LegacyConverter<?, ?> converter, - Class<?> presentationType, Class<?> modelType) { + public static boolean canConverterPossiblyHandle( + LegacyConverter<?, ?> converter, Class<?> presentationType, + Class<?> modelType) { if (converter == null) { return false; } diff --git a/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyDateToLongConverter.java b/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyDateToLongConverter.java index 04d037b12f..b4e5801db2 100644 --- a/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyDateToLongConverter.java +++ b/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyDateToLongConverter.java @@ -55,9 +55,9 @@ public class LegacyDateToLongConverter implements LegacyConverter<Date, Long> { public Date convertToPresentation(Long value, Class<? extends Date> targetType, Locale locale) { if (targetType != getPresentationType()) { - throw new ConversionException("Converter only supports " - + getPresentationType().getName() + " (targetType was " - + targetType.getName() + ")"); + throw new ConversionException( + "Converter only supports " + getPresentationType().getName() + + " (targetType was " + targetType.getName() + ")"); } if (value == null) { return null; diff --git a/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyDateToSqlDateConverter.java b/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyDateToSqlDateConverter.java index 1ea4eaca8c..e6ac11e020 100644 --- a/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyDateToSqlDateConverter.java +++ b/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyDateToSqlDateConverter.java @@ -32,16 +32,17 @@ import java.util.Locale; * @since 7.1 * @author Vaadin Ltd */ -public class LegacyDateToSqlDateConverter implements LegacyConverter<Date, java.sql.Date> { +public class LegacyDateToSqlDateConverter + implements LegacyConverter<Date, java.sql.Date> { @Override public java.sql.Date convertToModel(Date value, Class<? extends java.sql.Date> targetType, Locale locale) throws ConversionException { if (targetType != getModelType()) { - throw new ConversionException("Converter only supports " - + getModelType().getName() + " (targetType was " - + targetType.getName() + ")"); + throw new ConversionException( + "Converter only supports " + getModelType().getName() + + " (targetType was " + targetType.getName() + ")"); } if (value == null) { @@ -56,9 +57,9 @@ public class LegacyDateToSqlDateConverter implements LegacyConverter<Date, java. Class<? extends Date> targetType, Locale locale) throws ConversionException { if (targetType != getPresentationType()) { - throw new ConversionException("Converter only supports " - + getPresentationType().getName() + " (targetType was " - + targetType.getName() + ")"); + throw new ConversionException( + "Converter only supports " + getPresentationType().getName() + + " (targetType was " + targetType.getName() + ")"); } if (value == null) { diff --git a/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyDefaultConverterFactory.java b/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyDefaultConverterFactory.java index c647981650..f578ad6a2d 100644 --- a/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyDefaultConverterFactory.java +++ b/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyDefaultConverterFactory.java @@ -24,8 +24,9 @@ import java.util.logging.Logger; import com.vaadin.server.VaadinSession; /** - * Default implementation of {@link LegacyConverterFactory}. Provides converters for - * standard types like {@link String}, {@link Double} and {@link Date}. </p> + * Default implementation of {@link LegacyConverterFactory}. Provides converters + * for standard types like {@link String}, {@link Double} and {@link Date}. + * </p> * <p> * Custom converters can be provided by extending this class and using * {@link VaadinSession#setConverterFactory(LegacyConverterFactory)}. @@ -56,7 +57,8 @@ public class LegacyDefaultConverterFactory implements LegacyConverterFactory { if (reverseConverter != null) { log.finest(getClass().getName() + " created a reverse " + reverseConverter.getClass()); - return new LegacyReverseConverter<PRESENTATION, MODEL>(reverseConverter); + return new LegacyReverseConverter<PRESENTATION, MODEL>( + reverseConverter); } log.finest(getClass().getName() + " could not find a converter for " @@ -70,13 +72,15 @@ public class LegacyDefaultConverterFactory implements LegacyConverterFactory { Class<PRESENTATION> presentationType, Class<MODEL> modelType) { if (presentationType == String.class) { // TextField converters and more - LegacyConverter<PRESENTATION, MODEL> converter = (LegacyConverter<PRESENTATION, MODEL>) createStringConverter(modelType); + LegacyConverter<PRESENTATION, MODEL> converter = (LegacyConverter<PRESENTATION, MODEL>) createStringConverter( + modelType); if (converter != null) { return converter; } } else if (presentationType == Date.class) { // DateField converters and more - LegacyConverter<PRESENTATION, MODEL> converter = (LegacyConverter<PRESENTATION, MODEL>) createDateConverter(modelType); + LegacyConverter<PRESENTATION, MODEL> converter = (LegacyConverter<PRESENTATION, MODEL>) createDateConverter( + modelType); if (converter != null) { return converter; } @@ -86,7 +90,8 @@ public class LegacyDefaultConverterFactory implements LegacyConverterFactory { } - protected LegacyConverter<Date, ?> createDateConverter(Class<?> sourceType) { + protected LegacyConverter<Date, ?> createDateConverter( + Class<?> sourceType) { if (Long.class.isAssignableFrom(sourceType)) { return new LegacyDateToLongConverter(); } else if (java.sql.Date.class.isAssignableFrom(sourceType)) { @@ -96,7 +101,8 @@ public class LegacyDefaultConverterFactory implements LegacyConverterFactory { } } - protected LegacyConverter<String, ?> createStringConverter(Class<?> sourceType) { + protected LegacyConverter<String, ?> createStringConverter( + Class<?> sourceType) { if (Double.class.isAssignableFrom(sourceType)) { return new LegacyStringToDoubleConverter(); } else if (Float.class.isAssignableFrom(sourceType)) { diff --git a/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyReverseConverter.java b/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyReverseConverter.java index 6841e99b6e..4750b3358f 100644 --- a/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyReverseConverter.java +++ b/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyReverseConverter.java @@ -19,8 +19,8 @@ package com.vaadin.legacy.data.util.converter; import java.util.Locale; /** - * A converter that wraps another {@link LegacyConverter} and reverses source and - * target types. + * A converter that wraps another {@link LegacyConverter} and reverses source + * and target types. * * @param <MODEL> * The source type @@ -30,8 +30,8 @@ import java.util.Locale; * @author Vaadin Ltd * @since 7.0 */ -public class LegacyReverseConverter<PRESENTATION, MODEL> implements - LegacyConverter<PRESENTATION, MODEL> { +public class LegacyReverseConverter<PRESENTATION, MODEL> + implements LegacyConverter<PRESENTATION, MODEL> { private LegacyConverter<MODEL, PRESENTATION> realConverter; @@ -42,7 +42,8 @@ public class LegacyReverseConverter<PRESENTATION, MODEL> implements * @param converter * The converter to use in a reverse fashion */ - public LegacyReverseConverter(LegacyConverter<MODEL, PRESENTATION> converter) { + public LegacyReverseConverter( + LegacyConverter<MODEL, PRESENTATION> converter) { this.realConverter = converter; } diff --git a/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyStringToBigDecimalConverter.java b/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyStringToBigDecimalConverter.java index 4b6c2151a0..0a3b40389f 100644 --- a/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyStringToBigDecimalConverter.java +++ b/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyStringToBigDecimalConverter.java @@ -34,8 +34,8 @@ import java.util.Locale; * @author Vaadin Ltd * @since 7.2 */ -public class LegacyStringToBigDecimalConverter extends - LegacyAbstractStringToNumberConverter<BigDecimal> { +public class LegacyStringToBigDecimalConverter + extends LegacyAbstractStringToNumberConverter<BigDecimal> { @Override protected NumberFormat getFormat(Locale locale) { NumberFormat numberFormat = super.getFormat(locale); diff --git a/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyStringToBigIntegerConverter.java b/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyStringToBigIntegerConverter.java index f2d3754dd2..0ff70a4788 100644 --- a/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyStringToBigIntegerConverter.java +++ b/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyStringToBigIntegerConverter.java @@ -35,8 +35,8 @@ import java.util.Locale; * @author Vaadin Ltd * @since 7.4 */ -public class LegacyStringToBigIntegerConverter extends - LegacyAbstractStringToNumberConverter<BigInteger> { +public class LegacyStringToBigIntegerConverter + extends LegacyAbstractStringToNumberConverter<BigInteger> { @Override protected NumberFormat getFormat(Locale locale) { diff --git a/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyStringToBooleanConverter.java b/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyStringToBooleanConverter.java index 7d36a9d248..11f96d3e6d 100644 --- a/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyStringToBooleanConverter.java +++ b/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyStringToBooleanConverter.java @@ -19,22 +19,30 @@ package com.vaadin.legacy.data.util.converter; import java.util.Locale; /** - * A converter that converts from {@link String} to {@link Boolean} and back. The String representation is given by - * {@link Boolean#toString()} or provided in constructor {@link #StringToBooleanConverter(String, String)}. - * <p> Leading and trailing white spaces are ignored when converting from a String. </p> - * <p> For language-dependent representation, subclasses should overwrite {@link #getFalseString(Locale)} and {@link #getTrueString(Locale)}</p> + * A converter that converts from {@link String} to {@link Boolean} and back. + * The String representation is given by {@link Boolean#toString()} or provided + * in constructor {@link #StringToBooleanConverter(String, String)}. + * <p> + * Leading and trailing white spaces are ignored when converting from a String. + * </p> + * <p> + * For language-dependent representation, subclasses should overwrite + * {@link #getFalseString(Locale)} and {@link #getTrueString(Locale)} + * </p> * * @author Vaadin Ltd * @since 7.0 */ -public class LegacyStringToBooleanConverter implements LegacyConverter<String, Boolean> { +public class LegacyStringToBooleanConverter + implements LegacyConverter<String, Boolean> { private final String trueString; private final String falseString; /** - * Creates converter with default string representations - "true" and "false" + * Creates converter with default string representations - "true" and + * "false" * */ public LegacyStringToBooleanConverter() { @@ -45,10 +53,13 @@ public class LegacyStringToBooleanConverter implements LegacyConverter<String, B * Creates converter with custom string representation. * * @since 7.5.4 - * @param falseString string representation for <code>false</code> - * @param trueString string representation for <code>true</code> + * @param falseString + * string representation for <code>false</code> + * @param trueString + * string representation for <code>true</code> */ - public LegacyStringToBooleanConverter(String trueString, String falseString) { + public LegacyStringToBooleanConverter(String trueString, + String falseString) { this.trueString = trueString; this.falseString = falseString; } @@ -82,7 +93,8 @@ public class LegacyStringToBooleanConverter implements LegacyConverter<String, B } /** - * Gets the string representation for true. Default is "true", if not set in constructor. + * Gets the string representation for true. Default is "true", if not set in + * constructor. * * @return the string representation for true */ @@ -91,7 +103,8 @@ public class LegacyStringToBooleanConverter implements LegacyConverter<String, B } /** - * Gets the string representation for false. Default is "false", if not set in constructor. + * Gets the string representation for false. Default is "false", if not set + * in constructor. * * @return the string representation for false */ @@ -121,11 +134,12 @@ public class LegacyStringToBooleanConverter implements LegacyConverter<String, B } /** - * Gets the locale-depended string representation for false. - * Default is locale-independent value provided by {@link #getFalseString()} + * Gets the locale-depended string representation for false. Default is + * locale-independent value provided by {@link #getFalseString()} * * @since 7.5.4 - * @param locale to be used + * @param locale + * to be used * @return the string representation for false */ protected String getFalseString(Locale locale) { @@ -133,11 +147,12 @@ public class LegacyStringToBooleanConverter implements LegacyConverter<String, B } /** - * Gets the locale-depended string representation for true. - * Default is locale-independent value provided by {@link #getTrueString()} + * Gets the locale-depended string representation for true. Default is + * locale-independent value provided by {@link #getTrueString()} * * @since 7.5.4 - * @param locale to be used + * @param locale + * to be used * @return the string representation for true */ protected String getTrueString(Locale locale) { diff --git a/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyStringToByteConverter.java b/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyStringToByteConverter.java index 0531322663..dd0d2e4b05 100644 --- a/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyStringToByteConverter.java +++ b/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyStringToByteConverter.java @@ -30,8 +30,8 @@ import java.util.Locale; * @author Vaadin Ltd * @since 7.4 */ -public class LegacyStringToByteConverter extends - LegacyAbstractStringToNumberConverter<Byte> { +public class LegacyStringToByteConverter + extends LegacyAbstractStringToNumberConverter<Byte> { /** * Returns the format used by diff --git a/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyStringToCollectionConverter.java b/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyStringToCollectionConverter.java index 59321d5fb3..aa057630ca 100644 --- a/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyStringToCollectionConverter.java +++ b/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyStringToCollectionConverter.java @@ -38,8 +38,8 @@ import java.util.Locale; * * @author Vaadin Ltd */ -public class LegacyStringToCollectionConverter implements - LegacyConverter<String, Collection> { +public class LegacyStringToCollectionConverter + implements LegacyConverter<String, Collection> { private final String delimiter; private final LegacyConverter<String, ?> tokenConverter; @@ -77,8 +77,8 @@ public class LegacyStringToCollectionConverter implements * @param tokenType * expected token model type */ - public LegacyStringToCollectionConverter(LegacyConverter<String, ?> tokenConverter, - Class<?> tokenType) { + public LegacyStringToCollectionConverter( + LegacyConverter<String, ?> tokenConverter, Class<?> tokenType) { this(", ", tokenConverter, tokenType); } @@ -205,7 +205,8 @@ public class LegacyStringToCollectionConverter implements public static class DefaultCollectionFactory implements CollectionFactory { @Override - public Collection<?> createCollection(Class<? extends Collection> type) { + public Collection<?> createCollection( + Class<? extends Collection> type) { if (type.isAssignableFrom(ArrayList.class)) { return new ArrayList(); } else if (type.isAssignableFrom(HashSet.class)) { diff --git a/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyStringToDateConverter.java b/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyStringToDateConverter.java index 40780bfdd0..035410dd5a 100644 --- a/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyStringToDateConverter.java +++ b/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyStringToDateConverter.java @@ -34,7 +34,8 @@ import java.util.Locale; * @author Vaadin Ltd * @since 7.0 */ -public class LegacyStringToDateConverter implements LegacyConverter<String, Date> { +public class LegacyStringToDateConverter + implements LegacyConverter<String, Date> { /** * Returns the format used by @@ -68,9 +69,9 @@ public class LegacyStringToDateConverter implements LegacyConverter<String, Date Locale locale) throws com.vaadin.legacy.data.util.converter.LegacyConverter.ConversionException { if (targetType != getModelType()) { - throw new ConversionException("Converter only supports " - + getModelType().getName() + " (targetType was " - + targetType.getName() + ")"); + throw new ConversionException( + "Converter only supports " + getModelType().getName() + + " (targetType was " + targetType.getName() + ")"); } if (value == null) { diff --git a/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyStringToDoubleConverter.java b/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyStringToDoubleConverter.java index 191648fba9..9232c37c7e 100644 --- a/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyStringToDoubleConverter.java +++ b/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyStringToDoubleConverter.java @@ -33,8 +33,8 @@ import java.util.Locale; * @author Vaadin Ltd * @since 7.0 */ -public class LegacyStringToDoubleConverter extends - LegacyAbstractStringToNumberConverter<Double> { +public class LegacyStringToDoubleConverter + extends LegacyAbstractStringToNumberConverter<Double> { /* * (non-Javadoc) diff --git a/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyStringToEnumConverter.java b/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyStringToEnumConverter.java index ef1dec64eb..19c9ce2cd5 100644 --- a/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyStringToEnumConverter.java +++ b/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyStringToEnumConverter.java @@ -36,7 +36,8 @@ import java.util.Locale; * @author Vaadin Ltd * @since 7.4 */ -public class LegacyStringToEnumConverter implements LegacyConverter<String, Enum> { +public class LegacyStringToEnumConverter + implements LegacyConverter<String, Enum> { @Override public Enum convertToModel(String value, Class<? extends Enum> targetType, @@ -71,8 +72,8 @@ public class LegacyStringToEnumConverter implements LegacyConverter<String, Enum } if (!enumType.isEnum()) { - throw new ConversionException(enumType.getName() - + " is not an enum type"); + throw new ConversionException( + enumType.getName() + " is not an enum type"); } // First test for the human-readable value since that's the more likely @@ -128,8 +129,8 @@ public class LegacyStringToEnumConverter implements LegacyConverter<String, Enum // FOO_BAR -> Foo bar // _FOO -> _foo String result = enumString.substring(0, 1).toUpperCase(locale); - result += enumString.substring(1).toLowerCase(locale) - .replace('_', ' '); + result += enumString.substring(1).toLowerCase(locale).replace('_', + ' '); return result; } else { return enumString; diff --git a/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyStringToFloatConverter.java b/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyStringToFloatConverter.java index 0d24e16a35..5a4eb3ca1c 100644 --- a/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyStringToFloatConverter.java +++ b/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyStringToFloatConverter.java @@ -33,8 +33,8 @@ import java.util.Locale; * @author Vaadin Ltd * @since 7.0 */ -public class LegacyStringToFloatConverter extends - LegacyAbstractStringToNumberConverter<Float> { +public class LegacyStringToFloatConverter + extends LegacyAbstractStringToNumberConverter<Float> { /* * (non-Javadoc) @@ -44,9 +44,8 @@ public class LegacyStringToFloatConverter extends * java.util.Locale) */ @Override - public Float convertToModel(String value, - Class<? extends Float> targetType, Locale locale) - throws ConversionException { + public Float convertToModel(String value, Class<? extends Float> targetType, + Locale locale) throws ConversionException { Number n = convertToNumber(value, targetType, locale); return n == null ? null : n.floatValue(); } diff --git a/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyStringToIntegerConverter.java b/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyStringToIntegerConverter.java index 37c00b7c3e..b481dc23ae 100644 --- a/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyStringToIntegerConverter.java +++ b/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyStringToIntegerConverter.java @@ -30,8 +30,8 @@ import java.util.Locale; * @author Vaadin Ltd * @since 7.0 */ -public class LegacyStringToIntegerConverter extends - LegacyAbstractStringToNumberConverter<Integer> { +public class LegacyStringToIntegerConverter + extends LegacyAbstractStringToNumberConverter<Integer> { /** * Returns the format used by diff --git a/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyStringToLongConverter.java b/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyStringToLongConverter.java index 0de27bc3f3..481a3892b4 100644 --- a/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyStringToLongConverter.java +++ b/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyStringToLongConverter.java @@ -30,8 +30,8 @@ import java.util.Locale; * @author Vaadin Ltd * @since 7.2 */ -public class LegacyStringToLongConverter extends - LegacyAbstractStringToNumberConverter<Long> { +public class LegacyStringToLongConverter + extends LegacyAbstractStringToNumberConverter<Long> { /** * Returns the format used by diff --git a/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyStringToShortConverter.java b/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyStringToShortConverter.java index 8b1646542f..aad0eba9f7 100644 --- a/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyStringToShortConverter.java +++ b/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyStringToShortConverter.java @@ -30,8 +30,8 @@ import java.util.Locale; * @author Vaadin Ltd * @since 7.4 */ -public class LegacyStringToShortConverter extends - LegacyAbstractStringToNumberConverter<Short> { +public class LegacyStringToShortConverter + extends LegacyAbstractStringToNumberConverter<Short> { /** * Returns the format used by @@ -58,9 +58,8 @@ public class LegacyStringToShortConverter extends * java.lang.Class, java.util.Locale) */ @Override - public Short convertToModel(String value, - Class<? extends Short> targetType, Locale locale) - throws ConversionException { + public Short convertToModel(String value, Class<? extends Short> targetType, + Locale locale) throws ConversionException { Number n = convertToNumber(value, targetType, locale); if (n == null) { diff --git a/server/src/main/java/com/vaadin/legacy/data/validator/LegacyAbstractStringValidator.java b/server/src/main/java/com/vaadin/legacy/data/validator/LegacyAbstractStringValidator.java index 3610a01dec..c8a01ff021 100644 --- a/server/src/main/java/com/vaadin/legacy/data/validator/LegacyAbstractStringValidator.java +++ b/server/src/main/java/com/vaadin/legacy/data/validator/LegacyAbstractStringValidator.java @@ -28,7 +28,8 @@ package com.vaadin.legacy.data.validator; * @since 5.4 */ @SuppressWarnings("serial") -public abstract class LegacyAbstractStringValidator extends LegacyAbstractValidator<String> { +public abstract class LegacyAbstractStringValidator + extends LegacyAbstractValidator<String> { /** * Constructs a validator for strings. @@ -41,7 +42,7 @@ public abstract class LegacyAbstractStringValidator extends LegacyAbstractValida * @param errorMessage * the message to be included in an {@link InvalidValueException} * (with "{0}" replaced by the value that failed validation). - * */ + */ public LegacyAbstractStringValidator(String errorMessage) { super(errorMessage); } diff --git a/server/src/main/java/com/vaadin/legacy/data/validator/LegacyAbstractValidator.java b/server/src/main/java/com/vaadin/legacy/data/validator/LegacyAbstractValidator.java index a496e96663..035f0c822d 100644 --- a/server/src/main/java/com/vaadin/legacy/data/validator/LegacyAbstractValidator.java +++ b/server/src/main/java/com/vaadin/legacy/data/validator/LegacyAbstractValidator.java @@ -18,8 +18,8 @@ package com.vaadin.legacy.data.validator; import com.vaadin.legacy.data.Validator; /** - * Abstract {@link com.vaadin.legacy.data.Validator Validator} implementation that - * provides a basic Validator implementation except the + * Abstract {@link com.vaadin.legacy.data.Validator Validator} implementation + * that provides a basic Validator implementation except the * {@link #isValidValue(Object)} method. * <p> * To include the value that failed validation in the exception message you can diff --git a/server/src/main/java/com/vaadin/legacy/data/validator/LegacyBeanValidator.java b/server/src/main/java/com/vaadin/legacy/data/validator/LegacyBeanValidator.java index 823001a419..1c973dda4b 100644 --- a/server/src/main/java/com/vaadin/legacy/data/validator/LegacyBeanValidator.java +++ b/server/src/main/java/com/vaadin/legacy/data/validator/LegacyBeanValidator.java @@ -119,10 +119,11 @@ public class LegacyBeanValidator implements Validator { for (Object v : violations) { final ConstraintViolation<?> violation = (ConstraintViolation<?>) v; String msg = getJavaxBeanValidatorFactory() - .getMessageInterpolator().interpolate( - violation.getMessageTemplate(), - new SimpleContext(value, violation - .getConstraintDescriptor()), locale); + .getMessageInterpolator() + .interpolate(violation.getMessageTemplate(), + new SimpleContext(value, + violation.getConstraintDescriptor()), + locale); causes[i] = new InvalidValueException(msg); ++i; } diff --git a/server/src/main/java/com/vaadin/legacy/data/validator/LegacyBigDecimalRangeValidator.java b/server/src/main/java/com/vaadin/legacy/data/validator/LegacyBigDecimalRangeValidator.java index 46d8c99437..2280619835 100644 --- a/server/src/main/java/com/vaadin/legacy/data/validator/LegacyBigDecimalRangeValidator.java +++ b/server/src/main/java/com/vaadin/legacy/data/validator/LegacyBigDecimalRangeValidator.java @@ -24,7 +24,8 @@ import java.math.BigDecimal; * @since 7.4 */ @SuppressWarnings("serial") -public class LegacyBigDecimalRangeValidator extends LegacyRangeValidator<BigDecimal> { +public class LegacyBigDecimalRangeValidator + extends LegacyRangeValidator<BigDecimal> { /** * Creates a validator for checking that an BigDecimal is within a given @@ -42,8 +43,8 @@ public class LegacyBigDecimalRangeValidator extends LegacyRangeValidator<BigDeci * @param maxValue * The maximum value to accept or null for no limit */ - public LegacyBigDecimalRangeValidator(String errorMessage, BigDecimal minValue, - BigDecimal maxValue) { + public LegacyBigDecimalRangeValidator(String errorMessage, + BigDecimal minValue, BigDecimal maxValue) { super(errorMessage, BigDecimal.class, minValue, maxValue); } diff --git a/server/src/main/java/com/vaadin/legacy/data/validator/LegacyBigIntegerRangeValidator.java b/server/src/main/java/com/vaadin/legacy/data/validator/LegacyBigIntegerRangeValidator.java index 4e11a65c78..456a63a15e 100644 --- a/server/src/main/java/com/vaadin/legacy/data/validator/LegacyBigIntegerRangeValidator.java +++ b/server/src/main/java/com/vaadin/legacy/data/validator/LegacyBigIntegerRangeValidator.java @@ -24,7 +24,8 @@ import java.math.BigInteger; * @since 7.4 */ @SuppressWarnings("serial") -public class LegacyBigIntegerRangeValidator extends LegacyRangeValidator<BigInteger> { +public class LegacyBigIntegerRangeValidator + extends LegacyRangeValidator<BigInteger> { /** * Creates a validator for checking that an BigInteger is within a given @@ -42,8 +43,8 @@ public class LegacyBigIntegerRangeValidator extends LegacyRangeValidator<BigInte * @param maxValue * The maximum value to accept or null for no limit */ - public LegacyBigIntegerRangeValidator(String errorMessage, BigInteger minValue, - BigInteger maxValue) { + public LegacyBigIntegerRangeValidator(String errorMessage, + BigInteger minValue, BigInteger maxValue) { super(errorMessage, BigInteger.class, minValue, maxValue); } diff --git a/server/src/main/java/com/vaadin/legacy/data/validator/LegacyByteRangeValidator.java b/server/src/main/java/com/vaadin/legacy/data/validator/LegacyByteRangeValidator.java index 1f795d1e42..4186168d23 100644 --- a/server/src/main/java/com/vaadin/legacy/data/validator/LegacyByteRangeValidator.java +++ b/server/src/main/java/com/vaadin/legacy/data/validator/LegacyByteRangeValidator.java @@ -39,7 +39,8 @@ public class LegacyByteRangeValidator extends LegacyRangeValidator<Byte> { * @param maxValue * The maximum value to accept or null for no limit */ - public LegacyByteRangeValidator(String errorMessage, Byte minValue, Byte maxValue) { + public LegacyByteRangeValidator(String errorMessage, Byte minValue, + Byte maxValue) { super(errorMessage, Byte.class, minValue, maxValue); } diff --git a/server/src/main/java/com/vaadin/legacy/data/validator/LegacyDoubleValidator.java b/server/src/main/java/com/vaadin/legacy/data/validator/LegacyDoubleValidator.java index dd45f365d0..7f72d831ca 100644 --- a/server/src/main/java/com/vaadin/legacy/data/validator/LegacyDoubleValidator.java +++ b/server/src/main/java/com/vaadin/legacy/data/validator/LegacyDoubleValidator.java @@ -20,14 +20,14 @@ import com.vaadin.legacy.data.util.converter.LegacyStringToDoubleConverter; /** * String validator for a double precision floating point number. See - * {@link com.vaadin.legacy.data.validator.LegacyAbstractStringValidator} for more - * information. + * {@link com.vaadin.legacy.data.validator.LegacyAbstractStringValidator} for + * more information. * * @author Vaadin Ltd. * @since 5.4 - * @deprecated As of 7.0. Use a {@link LegacyStringToDoubleConverter} converter on the - * field instead or bind the field to a {@link Property} of type - * {@link Double}. + * @deprecated As of 7.0. Use a {@link LegacyStringToDoubleConverter} converter + * on the field instead or bind the field to a {@link Property} of + * type {@link Double}. */ @Deprecated @SuppressWarnings("serial") @@ -40,8 +40,8 @@ public class LegacyDoubleValidator extends LegacyAbstractStringValidator { * @param errorMessage * the message to display in case the value does not validate. * @deprecated As of 7.0. Use a Double converter on the field instead and/or - * use a {@link LegacyDoubleRangeValidator} for validating that the - * value is inside a given range. + * use a {@link LegacyDoubleRangeValidator} for validating that + * the value is inside a given range. */ @Deprecated public LegacyDoubleValidator(String errorMessage) { diff --git a/server/src/main/java/com/vaadin/legacy/data/validator/LegacyEmailValidator.java b/server/src/main/java/com/vaadin/legacy/data/validator/LegacyEmailValidator.java index d6a7cdd485..fec2519871 100644 --- a/server/src/main/java/com/vaadin/legacy/data/validator/LegacyEmailValidator.java +++ b/server/src/main/java/com/vaadin/legacy/data/validator/LegacyEmailValidator.java @@ -20,8 +20,8 @@ package com.vaadin.legacy.data.validator; * complete according to RFC 822 but handles the vast majority of valid e-mail * addresses correctly. * - * See {@link com.vaadin.legacy.data.validator.LegacyAbstractStringValidator} for more - * information. + * See {@link com.vaadin.legacy.data.validator.LegacyAbstractStringValidator} + * for more information. * * <p> * An empty string or a null is always accepted - use the required flag on @@ -43,8 +43,7 @@ public class LegacyEmailValidator extends LegacyRegexpValidator { * the message to display in case the value does not validate. */ public LegacyEmailValidator(String errorMessage) { - super( - "^([a-zA-Z0-9_\\.\\-+])+@(([a-zA-Z0-9-])+\\.)+([a-zA-Z0-9]{2,4})+$", + super("^([a-zA-Z0-9_\\.\\-+])+@(([a-zA-Z0-9-])+\\.)+([a-zA-Z0-9]{2,4})+$", true, errorMessage); } } diff --git a/server/src/main/java/com/vaadin/legacy/data/validator/LegacyIntegerValidator.java b/server/src/main/java/com/vaadin/legacy/data/validator/LegacyIntegerValidator.java index dc34215680..31a5c0dc26 100644 --- a/server/src/main/java/com/vaadin/legacy/data/validator/LegacyIntegerValidator.java +++ b/server/src/main/java/com/vaadin/legacy/data/validator/LegacyIntegerValidator.java @@ -20,14 +20,14 @@ import com.vaadin.legacy.data.util.converter.LegacyStringToIntegerConverter; /** * String validator for integers. See - * {@link com.vaadin.legacy.data.validator.LegacyAbstractStringValidator} for more - * information. + * {@link com.vaadin.legacy.data.validator.LegacyAbstractStringValidator} for + * more information. * * @author Vaadin Ltd. * @since 5.4 - * @deprecated As of 7.0. Use a {@link LegacyStringToIntegerConverter} converter on - * the field instead or bind the field to a {@link Property} of type - * {@link Integer}. + * @deprecated As of 7.0. Use a {@link LegacyStringToIntegerConverter} converter + * on the field instead or bind the field to a {@link Property} of + * type {@link Integer}. */ @SuppressWarnings("serial") @Deprecated @@ -40,8 +40,8 @@ public class LegacyIntegerValidator extends LegacyAbstractStringValidator { * @param errorMessage * the message to display in case the value does not validate. * @deprecated As of 7.0. Use an Integer converter on the field instead - * and/or use an {@link LegacyIntegerRangeValidator} for validating - * that the value is inside a given range. + * and/or use an {@link LegacyIntegerRangeValidator} for + * validating that the value is inside a given range. */ @Deprecated public LegacyIntegerValidator(String errorMessage) { diff --git a/server/src/main/java/com/vaadin/legacy/data/validator/LegacyLongRangeValidator.java b/server/src/main/java/com/vaadin/legacy/data/validator/LegacyLongRangeValidator.java index 4fb38de459..c7db9be6d3 100644 --- a/server/src/main/java/com/vaadin/legacy/data/validator/LegacyLongRangeValidator.java +++ b/server/src/main/java/com/vaadin/legacy/data/validator/LegacyLongRangeValidator.java @@ -39,7 +39,8 @@ public class LegacyLongRangeValidator extends LegacyRangeValidator<Long> { * @param maxValue * The maximum value to accept or null for no limit */ - public LegacyLongRangeValidator(String errorMessage, Long minValue, Long maxValue) { + public LegacyLongRangeValidator(String errorMessage, Long minValue, + Long maxValue) { super(errorMessage, Long.class, minValue, maxValue); } diff --git a/server/src/main/java/com/vaadin/legacy/data/validator/LegacyRangeValidator.java b/server/src/main/java/com/vaadin/legacy/data/validator/LegacyRangeValidator.java index d9106e9bc6..10eddd0cbf 100644 --- a/server/src/main/java/com/vaadin/legacy/data/validator/LegacyRangeValidator.java +++ b/server/src/main/java/com/vaadin/legacy/data/validator/LegacyRangeValidator.java @@ -24,8 +24,8 @@ package com.vaadin.legacy.data.validator; * {@link LegacyIntegerRangeValidator}, {@link LegacyDoubleRangeValidator} or * {@link LegacyDateRangeValidator} in applications. * <p> - * Note that {@link LegacyRangeValidator} always accept null values. Make a field - * required to ensure that no empty values are accepted or override + * Note that {@link LegacyRangeValidator} always accept null values. Make a + * field required to ensure that no empty values are accepted or override * {@link #isValidValue(Comparable)}. * </p> * @@ -35,7 +35,8 @@ package com.vaadin.legacy.data.validator; * @author Vaadin Ltd. * @since 7.0 */ -public class LegacyRangeValidator<T extends Comparable> extends LegacyAbstractValidator<T> { +public class LegacyRangeValidator<T extends Comparable> + extends LegacyAbstractValidator<T> { private T minValue = null; private boolean minValueIncluded = true; diff --git a/server/src/main/java/com/vaadin/legacy/data/validator/LegacyRegexpValidator.java b/server/src/main/java/com/vaadin/legacy/data/validator/LegacyRegexpValidator.java index 0bc93f44b2..a843b1aff7 100644 --- a/server/src/main/java/com/vaadin/legacy/data/validator/LegacyRegexpValidator.java +++ b/server/src/main/java/com/vaadin/legacy/data/validator/LegacyRegexpValidator.java @@ -27,8 +27,8 @@ import java.util.regex.Pattern; * {@link java.util.regex.Pattern#sum} * </p> * <p> - * See {@link com.vaadin.legacy.data.validator.LegacyAbstractStringValidator} for more - * information. + * See {@link com.vaadin.legacy.data.validator.LegacyAbstractStringValidator} + * for more information. * </p> * <p> * An empty string or a null is always accepted - use the required flag on @@ -71,7 +71,8 @@ public class LegacyRegexpValidator extends LegacyAbstractStringValidator { * @param errorMessage * the message to display in case the value does not validate. */ - public LegacyRegexpValidator(String regexp, boolean complete, String errorMessage) { + public LegacyRegexpValidator(String regexp, boolean complete, + String errorMessage) { super(errorMessage); pattern = Pattern.compile(regexp); this.complete = complete; diff --git a/server/src/main/java/com/vaadin/legacy/ui/LegacyCheckBox.java b/server/src/main/java/com/vaadin/legacy/ui/LegacyCheckBox.java index baa98a4c19..94cd322d0f 100644 --- a/server/src/main/java/com/vaadin/legacy/ui/LegacyCheckBox.java +++ b/server/src/main/java/com/vaadin/legacy/ui/LegacyCheckBox.java @@ -66,7 +66,8 @@ public class LegacyCheckBox extends LegacyAbstractField<Boolean> { } }; - FocusAndBlurServerRpcImpl focusBlurRpc = new FocusAndBlurServerRpcImpl(this) { + FocusAndBlurServerRpcImpl focusBlurRpc = new FocusAndBlurServerRpcImpl( + this) { @Override protected void fireEvent(Event event) { LegacyCheckBox.this.fireEvent(event); @@ -130,8 +131,8 @@ public class LegacyCheckBox extends LegacyAbstractField<Boolean> { /* * Overridden to keep the shared state in sync with the LegacyAbstractField - * internal value. Should be removed once LegacyAbstractField is refactored to use - * shared state. + * internal value. Should be removed once LegacyAbstractField is refactored + * to use shared state. * * See tickets #10921 and #11064. */ @@ -221,9 +222,8 @@ public class LegacyCheckBox extends LegacyAbstractField<Boolean> { public void readDesign(Element design, DesignContext designContext) { super.readDesign(design, designContext); if (design.hasAttr("checked")) { - this.setValue( - DesignAttributeHandler.readAttribute("checked", - design.attributes(), Boolean.class), false, true); + this.setValue(DesignAttributeHandler.readAttribute("checked", + design.attributes(), Boolean.class), false, true); } } @@ -248,7 +248,8 @@ public class LegacyCheckBox extends LegacyAbstractField<Boolean> { @Override public void writeDesign(Element design, DesignContext designContext) { super.writeDesign(design, designContext); - LegacyCheckBox def = (LegacyCheckBox) designContext.getDefaultInstance(this); + LegacyCheckBox def = (LegacyCheckBox) designContext + .getDefaultInstance(this); Attributes attr = design.attributes(); DesignAttributeHandler.writeAttribute("checked", attr, getValue(), def.getValue(), Boolean.class); diff --git a/server/src/main/java/com/vaadin/legacy/ui/LegacyInlineDateField.java b/server/src/main/java/com/vaadin/legacy/ui/LegacyInlineDateField.java index d7f5fc520f..f85e680e39 100644 --- a/server/src/main/java/com/vaadin/legacy/ui/LegacyInlineDateField.java +++ b/server/src/main/java/com/vaadin/legacy/ui/LegacyInlineDateField.java @@ -37,7 +37,8 @@ public class LegacyInlineDateField extends LegacyDateField { super(); } - public LegacyInlineDateField(Property dataSource) throws IllegalArgumentException { + public LegacyInlineDateField(Property dataSource) + throws IllegalArgumentException { super(dataSource); } diff --git a/server/src/main/java/com/vaadin/legacy/ui/LegacyPopupDateField.java b/server/src/main/java/com/vaadin/legacy/ui/LegacyPopupDateField.java index 05091b8663..681ec40b09 100644 --- a/server/src/main/java/com/vaadin/legacy/ui/LegacyPopupDateField.java +++ b/server/src/main/java/com/vaadin/legacy/ui/LegacyPopupDateField.java @@ -42,7 +42,8 @@ public class LegacyPopupDateField extends LegacyDateField { super(); } - public LegacyPopupDateField(Property dataSource) throws IllegalArgumentException { + public LegacyPopupDateField(Property dataSource) + throws IllegalArgumentException { super(dataSource); } |