#8101 Swapped generics parameter order for Converter based on API review

meeting

10 files changed, 46 insertions, 48 deletions

diff --git a/src/com/vaadin/data/util/converter/Converter.java b/src/com/vaadin/data/util/converter/Converter.java
index 2a2c3025d9..f48246ff4c 100644
--- a/src/com/vaadin/data/util/converter/Converter.java
+++ b/src/com/vaadin/data/util/converter/Converter.java
@@ -38,7 +38,7 @@ import java.util.Locale;
  * @VERSION@

  * @since 7.0

  */

-public interface Converter<MODEL, PRESENTATION> extends Serializable {

+public interface Converter<PRESENTATION, MODEL> extends Serializable {

 

     /**

      * Converts the given value from target type to source type.

diff --git a/src/com/vaadin/data/util/converter/ConverterFactory.java b/src/com/vaadin/data/util/converter/ConverterFactory.java
index 1770bf85ac..451f84185d 100644
--- a/src/com/vaadin/data/util/converter/ConverterFactory.java
+++ b/src/com/vaadin/data/util/converter/ConverterFactory.java
@@ -7,7 +7,8 @@ package com.vaadin.data.util.converter;
 import java.io.Serializable;

 

 /**

- * Factory interface for providing Converters based on a source and target type.

+ * Factory interface for providing Converters based on a presentation type and a

+ * model type.

  * 

  * @author Vaadin Ltd.

  * @version

@@ -16,7 +17,7 @@ import java.io.Serializable;
  * 

  */

 public interface ConverterFactory extends Serializable {

-    <SOURCE, TARGET> Converter<SOURCE, TARGET> createConverter(

-            Class<SOURCE> sourceType, Class<TARGET> targetType);

+    public <PRESENTATION, MODEL> Converter<PRESENTATION, MODEL> createConverter(

+            Class<PRESENTATION> presentationType, Class<MODEL> modelType);

 

 }

diff --git a/src/com/vaadin/data/util/converter/LongToDateConverter.java b/src/com/vaadin/data/util/converter/DateToLongConverter.java
index c22e8af16e..c9a76ec39b 100644
--- a/src/com/vaadin/data/util/converter/LongToDateConverter.java
+++ b/src/com/vaadin/data/util/converter/DateToLongConverter.java
@@ -15,7 +15,7 @@ import java.util.Locale;
  * @VERSION@

  * @since 7.0

  */

-public class LongToDateConverter implements Converter<Long, Date> {

+public class DateToLongConverter implements Converter<Date, Long> {

 

     /*

      * (non-Javadoc)

diff --git a/src/com/vaadin/data/util/converter/DefaultConverterFactory.java b/src/com/vaadin/data/util/converter/DefaultConverterFactory.java
index 073eb10d55..9233624819 100644
--- a/src/com/vaadin/data/util/converter/DefaultConverterFactory.java
+++ b/src/com/vaadin/data/util/converter/DefaultConverterFactory.java
@@ -27,10 +27,10 @@ public class DefaultConverterFactory implements ConverterFactory {
     private final static Logger log = Logger

             .getLogger(DefaultConverterFactory.class.getName());

 

-    public <SOURCE, TARGET> Converter<SOURCE, TARGET> createConverter(

-            Class<SOURCE> sourceType, Class<TARGET> targetType) {

-        Converter<SOURCE, TARGET> converter = findConverter(sourceType,

-                targetType);

+    public <PRESENTATION, MODEL> Converter<PRESENTATION, MODEL> createConverter(

+            Class<PRESENTATION> presentationType, Class<MODEL> modelType) {

+        Converter<PRESENTATION, MODEL> converter = findConverter(

+                presentationType, modelType);

         if (converter != null) {

             log.finest(getClass().getName() + " created a "

                     + converter.getClass());

@@ -38,32 +38,32 @@ public class DefaultConverterFactory implements ConverterFactory {
         }

 

         // Try to find a reverse converter

-        Converter<TARGET, SOURCE> reverseConverter = findConverter(targetType,

-                sourceType);

+        Converter<MODEL, PRESENTATION> reverseConverter = findConverter(

+                modelType, presentationType);

         if (reverseConverter != null) {

             log.finest(getClass().getName() + " created a reverse "

                     + reverseConverter.getClass());

-            return new ReverseConverter<SOURCE, TARGET>(reverseConverter);

+            return new ReverseConverter<PRESENTATION, MODEL>(reverseConverter);

         }

 

         log.finest(getClass().getName() + " could not find a converter for "

-                + sourceType.getName() + " to " + targetType.getName()

+                + presentationType.getName() + " to " + modelType.getName()

                 + " conversion");

         return null;

 

     }

 

-    protected <SOURCE, TARGET> Converter<SOURCE, TARGET> findConverter(

-            Class<SOURCE> sourceType, Class<TARGET> targetType) {

-        if (targetType == String.class) {

+    protected <PRESENTATION, MODEL> Converter<PRESENTATION, MODEL> findConverter(

+            Class<PRESENTATION> presentationType, Class<MODEL> modelType) {

+        if (presentationType == String.class) {

             // TextField converters and more

-            Converter<SOURCE, TARGET> converter = (Converter<SOURCE, TARGET>) createStringConverter(sourceType);

+            Converter<PRESENTATION, MODEL> converter = (Converter<PRESENTATION, MODEL>) createStringConverter(modelType);

             if (converter != null) {

                 return converter;

             }

-        } else if (targetType == Date.class) {

+        } else if (presentationType == Date.class) {

             // DateField converters and more

-            Converter<SOURCE, TARGET> converter = (Converter<SOURCE, TARGET>) createDateConverter(sourceType);

+            Converter<PRESENTATION, MODEL> converter = (Converter<PRESENTATION, MODEL>) createDateConverter(modelType);

             if (converter != null) {

                 return converter;

             }

@@ -73,25 +73,25 @@ public class DefaultConverterFactory implements ConverterFactory {
 

     }

 

-    protected Converter<?, Date> createDateConverter(Class<?> sourceType) {

+    protected Converter<Date, ?> createDateConverter(Class<?> sourceType) {

         if (Long.class.isAssignableFrom(sourceType)) {

-            return new LongToDateConverter();

+            return new DateToLongConverter();

         } else {

             return null;

         }

     }

 

-    protected Converter<?, String> createStringConverter(Class<?> sourceType) {

+    protected Converter<String, ?> createStringConverter(Class<?> sourceType) {

         if (Double.class.isAssignableFrom(sourceType)) {

-            return new DoubleToStringConverter();

+            return new StringToDoubleConverter();

         } else if (Integer.class.isAssignableFrom(sourceType)) {

-            return new IntegerToStringConverter();

+            return new StringToIntegerConverter();

         } else if (Boolean.class.isAssignableFrom(sourceType)) {

-            return new BooleanToStringConverter();

+            return new StringToBooleanConverter();

         } else if (Number.class.isAssignableFrom(sourceType)) {

-            return new NumberToStringConverter();

+            return new StringToNumberConverter();

         } else if (Date.class.isAssignableFrom(sourceType)) {

-            return new DateToStringConverter();

+            return new StringToDateConverter();

         } else {

             return null;

         }

diff --git a/src/com/vaadin/data/util/converter/ReverseConverter.java b/src/com/vaadin/data/util/converter/ReverseConverter.java
index c86ba72395..45f5abda65 100644
--- a/src/com/vaadin/data/util/converter/ReverseConverter.java
+++ b/src/com/vaadin/data/util/converter/ReverseConverter.java
@@ -20,10 +20,10 @@ import java.util.Locale;
  * @VERSION@

  * @since 7.0

  */

-public class ReverseConverter<MODEL, PRESENTATION> implements

-        Converter<MODEL, PRESENTATION> {

+public class ReverseConverter<PRESENTATION, MODEL> implements

+        Converter<PRESENTATION, MODEL> {

 

-    private Converter<PRESENTATION, MODEL> realConverter;

+    private Converter<MODEL, PRESENTATION> realConverter;

 

     /**

      * Creates a converter from source to target based on a converter that

@@ -32,7 +32,7 @@ public class ReverseConverter<MODEL, PRESENTATION> implements
      * @param converter

      *            The converter to use in a reverse fashion

      */

-    public ReverseConverter(Converter<PRESENTATION, MODEL> converter) {

+    public ReverseConverter(Converter<MODEL, PRESENTATION> converter) {

         this.realConverter = converter;

     }

 

diff --git a/src/com/vaadin/data/util/converter/BooleanToStringConverter.java b/src/com/vaadin/data/util/converter/StringToBooleanConverter.java
index 9c6add7c99..5dfcf87e40 100644
--- a/src/com/vaadin/data/util/converter/BooleanToStringConverter.java
+++ b/src/com/vaadin/data/util/converter/StringToBooleanConverter.java
@@ -7,7 +7,7 @@ package com.vaadin.data.util.converter;
 import java.util.Locale;

 

 /**

- * A converter that converts from {@link Boolean} to {@link String} and back.

+ * A converter that converts from {@link String} to {@link Boolean} and back.

  * The String representation is given by Boolean.toString().

  * <p>

  * Leading and trailing white spaces are ignored when converting from a String.

@@ -18,7 +18,7 @@ import java.util.Locale;
  * @VERSION@

  * @since 7.0

  */

-public class BooleanToStringConverter implements Converter<Boolean, String> {

+public class StringToBooleanConverter implements Converter<String, Boolean> {

 

     /*

      * (non-Javadoc)

diff --git a/src/com/vaadin/data/util/converter/DateToStringConverter.java b/src/com/vaadin/data/util/converter/StringToDateConverter.java
index 947a426db6..c97090334d 100644
--- a/src/com/vaadin/data/util/converter/DateToStringConverter.java
+++ b/src/com/vaadin/data/util/converter/StringToDateConverter.java
@@ -24,12 +24,11 @@ import java.util.Locale;
  * @VERSION@

  * @since 7.0

  */

-public class DateToStringConverter implements Converter<Date, String> {

+public class StringToDateConverter implements Converter<String, Date> {

 

     /**

-     * Returns the format used by

-     * {@link #convertToPresentation(Date, Locale)} and

-     * {@link #convertToModel(String, Locale)}.

+     * Returns the format used by {@link #convertToPresentation(Date, Locale)}

+     * and {@link #convertToModel(String, Locale)}.

      * 

      * @param locale

      *            The locale to use

diff --git a/src/com/vaadin/data/util/converter/DoubleToStringConverter.java b/src/com/vaadin/data/util/converter/StringToDoubleConverter.java
index a6bebaddd3..0c60aea5cb 100644
--- a/src/com/vaadin/data/util/converter/DoubleToStringConverter.java
+++ b/src/com/vaadin/data/util/converter/StringToDoubleConverter.java
@@ -9,7 +9,7 @@ import java.text.ParsePosition;
 import java.util.Locale;

 

 /**

- * A converter that converts from {@link Double} to {@link String} and back.

+ * A converter that converts from {@link String} to {@link Double} and back.

  * Uses the given locale and a {@link NumberFormat} instance for formatting and

  * parsing.

  * <p>

@@ -24,12 +24,11 @@ import java.util.Locale;
  * @VERSION@

  * @since 7.0

  */

-public class DoubleToStringConverter implements Converter<Double, String> {

+public class StringToDoubleConverter implements Converter<String, Double> {

 

     /**

-     * Returns the format used by

-     * {@link #convertToPresentation(Double, Locale)} and

-     * {@link #convertToModel(String, Locale)}.

+     * Returns the format used by {@link #convertToPresentation(Double, Locale)}

+     * and {@link #convertToModel(String, Locale)}.

      * 

      * @param locale

      *            The locale to use

diff --git a/src/com/vaadin/data/util/converter/IntegerToStringConverter.java b/src/com/vaadin/data/util/converter/StringToIntegerConverter.java
index 5c0d6761c0..7fa4458c51 100644
--- a/src/com/vaadin/data/util/converter/IntegerToStringConverter.java
+++ b/src/com/vaadin/data/util/converter/StringToIntegerConverter.java
@@ -9,7 +9,7 @@ import java.text.ParsePosition;
 import java.util.Locale;

 

 /**

- * A converter that converts from {@link Integer} to {@link String} and back.

+ * A converter that converts from {@link String} to {@link Integer} and back.

  * Uses the given locale and a {@link NumberFormat} instance for formatting and

  * parsing.

  * <p>

@@ -21,7 +21,7 @@ import java.util.Locale;
  * @VERSION@

  * @since 7.0

  */

-public class IntegerToStringConverter implements Converter<Integer, String> {

+public class StringToIntegerConverter implements Converter<String, Integer> {

 

     /**

      * Returns the format used by

diff --git a/src/com/vaadin/data/util/converter/NumberToStringConverter.java b/src/com/vaadin/data/util/converter/StringToNumberConverter.java
index cd4c1363b7..8975dad9f3 100644
--- a/src/com/vaadin/data/util/converter/NumberToStringConverter.java
+++ b/src/com/vaadin/data/util/converter/StringToNumberConverter.java
@@ -20,12 +20,11 @@ import java.util.Locale;
  * @VERSION@

  * @since 7.0

  */

-public class NumberToStringConverter implements Converter<Number, String> {

+public class StringToNumberConverter implements Converter<String, Number> {

 

     /**

-     * Returns the format used by

-     * {@link #convertToPresentation(Number, Locale)} and

-     * {@link #convertToModel(String, Locale)}.

+     * Returns the format used by {@link #convertToPresentation(Number, Locale)}

+     * and {@link #convertToModel(String, Locale)}.

      * 

      * @param locale

      *            The locale to use