diff options
author | Artur Signell <artur@vaadin.com> | 2012-11-16 18:29:44 +0200 |
---|---|---|
committer | Artur Signell <artur@vaadin.com> | 2012-11-16 18:29:44 +0200 |
commit | 9a3a22cc9f8f95054e3528b0ffcc0b9e92cffbea (patch) | |
tree | 9f2c7302f294ffe8c02915b1d7f286733f815817 /server/src/com/vaadin/data | |
parent | 15f833480da7a5eff0d29c527cd956b9e9658401 (diff) | |
download | vaadin-framework-9a3a22cc9f8f95054e3528b0ffcc0b9e92cffbea.tar.gz vaadin-framework-9a3a22cc9f8f95054e3528b0ffcc0b9e92cffbea.zip |
Renamed VaadinServiceSession to VaadinSession (#10223)
Change-Id: Id7f367300c000aa47edc12084f4e9500502466c3
Diffstat (limited to 'server/src/com/vaadin/data')
-rw-r--r-- | server/src/com/vaadin/data/util/converter/ConverterUtil.java | 8 | ||||
-rw-r--r-- | server/src/com/vaadin/data/util/converter/DefaultConverterFactory.java | 4 |
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 6f2fecb9a2..5944b505ab 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.server.VaadinServiceSession; +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 VaadinServiceSession#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, VaadinServiceSession session) { + Class<MODELTYPE> modelType, VaadinSession session) { Converter<PRESENTATIONTYPE, MODELTYPE> converter = null; if (session == null) { - session = VaadinServiceSession.getCurrent(); + session = VaadinSession.getCurrent(); } if (session != null) { diff --git a/server/src/com/vaadin/data/util/converter/DefaultConverterFactory.java b/server/src/com/vaadin/data/util/converter/DefaultConverterFactory.java index 55d78c21b1..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.server.VaadinServiceSession; +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 VaadinServiceSession#setConverterFactory(ConverterFactory)}. + * {@link VaadinSession#setConverterFactory(ConverterFactory)}. * </p> * * @author Vaadin Ltd |