Rename Application to VaadinSession (#9402)

2 files changed, 6 insertions, 6 deletions

diff --git a/server/src/com/vaadin/data/util/converter/ConverterUtil.java b/server/src/com/vaadin/data/util/converter/ConverterUtil.java
index 36cd6d0859..a6014bb3eb 100644
--- a/server/src/com/vaadin/data/util/converter/ConverterUtil.java
+++ b/server/src/com/vaadin/data/util/converter/ConverterUtil.java
@@ -18,7 +18,7 @@ package com.vaadin.data.util.converter;
 import java.io.Serializable;
 import java.util.Locale;
 
-import com.vaadin.Application;
+import com.vaadin.server.VaadinSession;
 
 public class ConverterUtil implements Serializable {
 
@@ -26,7 +26,7 @@ public class ConverterUtil implements Serializable {
      * Finds a converter that can convert from the given presentation type to
      * the given model type and back. Uses the given application to find a
      * {@link ConverterFactory} or, if application is null, uses the
-     * {@link Application#getCurrent()}.
+     * {@link VaadinSession#getCurrent()}.
      * 
      * @param <PRESENTATIONTYPE>
      *            The presentation type
@@ -44,10 +44,10 @@ public class ConverterUtil implements Serializable {
      */
     public static <PRESENTATIONTYPE, MODELTYPE> Converter<PRESENTATIONTYPE, MODELTYPE> getConverter(
             Class<PRESENTATIONTYPE> presentationType,
-            Class<MODELTYPE> modelType, Application application) {
+            Class<MODELTYPE> modelType, VaadinSession application) {
         Converter<PRESENTATIONTYPE, MODELTYPE> converter = null;
         if (application == null) {
-            application = Application.getCurrent();
+            application = VaadinSession.getCurrent();
         }
 
         if (application != null) {
diff --git a/server/src/com/vaadin/data/util/converter/DefaultConverterFactory.java b/server/src/com/vaadin/data/util/converter/DefaultConverterFactory.java
index ffd432076f..17b89ccb20 100644
--- a/server/src/com/vaadin/data/util/converter/DefaultConverterFactory.java
+++ b/server/src/com/vaadin/data/util/converter/DefaultConverterFactory.java
@@ -19,14 +19,14 @@ package com.vaadin.data.util.converter;
 import java.util.Date;
 import java.util.logging.Logger;
 
-import com.vaadin.Application;
+import com.vaadin.server.VaadinSession;
 
 /**
  * Default implementation of {@link ConverterFactory}. 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 Application#setConverterFactory(ConverterFactory)}.
+ * {@link VaadinSession#setConverterFactory(ConverterFactory)}.
  * </p>
  * 
  * @author Vaadin Ltd