diff options
| author | Leif Åstrand <leif@vaadin.com> | 2012-09-27 16:14:07 +0300 |
|---|---|---|
| committer | Leif Åstrand <leif@vaadin.com> | 2012-09-28 14:14:33 +0300 |
| commit | af8fb8ddd2ab54c08a8ac2c120a8d357c98057ec (patch) | |
| tree | c32c0abdadecc7d2af43abdb03cf907feb043af2 /server/src/com/vaadin/data | |
| parent | 01ff5a924b8fdeeda8cbd21973fc1ecd206ef043 (diff) | |
| download | vaadin-framework-af8fb8ddd2ab54c08a8ac2c120a8d357c98057ec.tar.gz vaadin-framework-af8fb8ddd2ab54c08a8ac2c120a8d357c98057ec.zip | |
Rename VaadinSession -> VaadinServiceSession (#9733)
Change-Id: I4472cebf2f9f4cf3e0dea31a0dda8dc892323c5c
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 5944b505ab..6f2fecb9a2 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.VaadinSession; +import com.vaadin.server.VaadinServiceSession; 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 VaadinSession#getCurrent()}. + * {@link VaadinServiceSession#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, VaadinSession session) { + Class<MODELTYPE> modelType, VaadinServiceSession session) { Converter<PRESENTATIONTYPE, MODELTYPE> converter = null; if (session == null) { - session = VaadinSession.getCurrent(); + session = VaadinServiceSession.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 17b89ccb20..55d78c21b1 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.VaadinSession; +import com.vaadin.server.VaadinServiceSession; /** * 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 VaadinSession#setConverterFactory(ConverterFactory)}. + * {@link VaadinServiceSession#setConverterFactory(ConverterFactory)}. * </p> * * @author Vaadin Ltd |