diff --git a/spring-context/src/main/java/org/springframework/ui/context/HierarchicalThemeSource.java b/spring-context/src/main/java/org/springframework/ui/context/HierarchicalThemeSource.java index 81027c6ffc3..ab52272b0df 100644 --- a/spring-context/src/main/java/org/springframework/ui/context/HierarchicalThemeSource.java +++ b/spring-context/src/main/java/org/springframework/ui/context/HierarchicalThemeSource.java @@ -24,7 +24,7 @@ import org.springframework.lang.Nullable; * * @author Jean-Pierre Pawlak * @author Juergen Hoeller - * @deprecated as of 6.0, with no concrete replacement + * @deprecated as of 6.0 in favor of using CSS, without direct replacement */ @Deprecated(since = "6.0") public interface HierarchicalThemeSource extends ThemeSource { diff --git a/spring-context/src/main/java/org/springframework/ui/context/Theme.java b/spring-context/src/main/java/org/springframework/ui/context/Theme.java index a24e66ca12d..2b079104149 100644 --- a/spring-context/src/main/java/org/springframework/ui/context/Theme.java +++ b/spring-context/src/main/java/org/springframework/ui/context/Theme.java @@ -28,7 +28,7 @@ import org.springframework.context.MessageSource; * @since 17.06.2003 * @see ThemeSource * @see org.springframework.web.servlet.ThemeResolver - * @deprecated as of 6.0, with no direct replacement + * @deprecated as of 6.0 in favor of using CSS, without direct replacement */ @Deprecated(since = "6.0") public interface Theme { diff --git a/spring-context/src/main/java/org/springframework/ui/context/ThemeSource.java b/spring-context/src/main/java/org/springframework/ui/context/ThemeSource.java index e55f2a41d0a..e5374da4a1d 100644 --- a/spring-context/src/main/java/org/springframework/ui/context/ThemeSource.java +++ b/spring-context/src/main/java/org/springframework/ui/context/ThemeSource.java @@ -26,7 +26,7 @@ import org.springframework.lang.Nullable; * @author Jean-Pierre Pawlak * @author Juergen Hoeller * @see Theme - * @deprecated as of 6.0, with no direct replacement + * @deprecated as of 6.0 in favor of using CSS, without direct replacement */ @Deprecated(since = "6.0") public interface ThemeSource { diff --git a/spring-context/src/main/java/org/springframework/ui/context/support/DelegatingThemeSource.java b/spring-context/src/main/java/org/springframework/ui/context/support/DelegatingThemeSource.java index 1c777a5b6c1..9e79100a531 100644 --- a/spring-context/src/main/java/org/springframework/ui/context/support/DelegatingThemeSource.java +++ b/spring-context/src/main/java/org/springframework/ui/context/support/DelegatingThemeSource.java @@ -31,7 +31,7 @@ import org.springframework.ui.context.ThemeSource; * @author Juergen Hoeller * @since 1.2.4 * @see UiApplicationContextUtils - * @deprecated as of 6.0, with no direct replacement + * @deprecated as of 6.0 in favor of using CSS, without direct replacement */ @Deprecated(since = "6.0") public class DelegatingThemeSource implements HierarchicalThemeSource { diff --git a/spring-context/src/main/java/org/springframework/ui/context/support/ResourceBundleThemeSource.java b/spring-context/src/main/java/org/springframework/ui/context/support/ResourceBundleThemeSource.java index 0a18a57c2e2..cdf955bb37f 100644 --- a/spring-context/src/main/java/org/springframework/ui/context/support/ResourceBundleThemeSource.java +++ b/spring-context/src/main/java/org/springframework/ui/context/support/ResourceBundleThemeSource.java @@ -42,7 +42,7 @@ import org.springframework.ui.context.ThemeSource; * @see #setBasenamePrefix * @see java.util.ResourceBundle * @see org.springframework.context.support.ResourceBundleMessageSource - * @deprecated as of 6.0, with no direct replacement + * @deprecated as of 6.0 in favor of using CSS, without direct replacement */ @Deprecated(since = "6.0") public class ResourceBundleThemeSource implements HierarchicalThemeSource, BeanClassLoaderAware { diff --git a/spring-context/src/main/java/org/springframework/ui/context/support/SimpleTheme.java b/spring-context/src/main/java/org/springframework/ui/context/support/SimpleTheme.java index 5b386310f54..fed03d160c8 100644 --- a/spring-context/src/main/java/org/springframework/ui/context/support/SimpleTheme.java +++ b/spring-context/src/main/java/org/springframework/ui/context/support/SimpleTheme.java @@ -26,7 +26,7 @@ import org.springframework.util.Assert; * * @author Juergen Hoeller * @since 17.06.2003 - * @deprecated as of 6.0, with no concrete replacement + * @deprecated as of 6.0 in favor of using CSS, without direct replacement */ @Deprecated(since = "6.0") public class SimpleTheme implements Theme { diff --git a/spring-context/src/main/java/org/springframework/ui/context/support/UiApplicationContextUtils.java b/spring-context/src/main/java/org/springframework/ui/context/support/UiApplicationContextUtils.java index 20d71999c39..41b0a0ded1f 100644 --- a/spring-context/src/main/java/org/springframework/ui/context/support/UiApplicationContextUtils.java +++ b/spring-context/src/main/java/org/springframework/ui/context/support/UiApplicationContextUtils.java @@ -31,7 +31,7 @@ import org.springframework.ui.context.ThemeSource; * @author Jean-Pierre Pawlak * @author Juergen Hoeller * @since 17.06.2003 - * @deprecated as of 6.0, with no direct replacement + * @deprecated as of 6.0 in favor of using CSS, without direct replacement */ @Deprecated(since = "6.0") public abstract class UiApplicationContextUtils { diff --git a/spring-web/src/main/java/org/springframework/web/util/CookieGenerator.java b/spring-web/src/main/java/org/springframework/web/util/CookieGenerator.java index 7ddcd372f23..2352befa930 100644 --- a/spring-web/src/main/java/org/springframework/web/util/CookieGenerator.java +++ b/spring-web/src/main/java/org/springframework/web/util/CookieGenerator.java @@ -29,15 +29,13 @@ import org.springframework.util.Assert; * as bean properties and being able to add and remove cookie to/from a * given response. * - *

Can serve as base class for components that generate specific cookies, - * such as CookieThemeResolver. + *

Can serve as base class for components that generate specific cookies. * * @author Juergen Hoeller * @since 1.1.4 * @see #addCookie * @see #removeCookie - * @see org.springframework.web.servlet.theme.CookieThemeResolver - * @deprecated since 6.0 in favor of {@link org.springframework.http.ResponseCookie} + * @deprecated as of 6.0 in favor of {@link org.springframework.http.ResponseCookie} */ @Deprecated public class CookieGenerator { diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/ThemeResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/ThemeResolver.java index c3b2eff1a50..e3bcf3db17a 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/ThemeResolver.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/ThemeResolver.java @@ -45,7 +45,7 @@ import org.springframework.lang.Nullable; * @since 17.06.2003 * @see org.springframework.ui.context.Theme * @see org.springframework.ui.context.ThemeSource - * @deprecated as of 6.0, with no direct replacement + * @deprecated as of 6.0 in favor of using CSS, without direct replacement */ @Deprecated(since = "6.0") public interface ThemeResolver { diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/theme/AbstractThemeResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/theme/AbstractThemeResolver.java index 79e8d536a6b..558e9310f3c 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/theme/AbstractThemeResolver.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/theme/AbstractThemeResolver.java @@ -25,7 +25,7 @@ import org.springframework.web.servlet.ThemeResolver; * @author Juergen Hoeller * @author Jean-Pierre Pawlak * @since 17.06.2003 - * @deprecated as of 6.0, with no concrete replacement + * @deprecated as of 6.0 in favor of using CSS, without direct replacement */ @Deprecated(since = "6.0") public abstract class AbstractThemeResolver implements ThemeResolver { diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/theme/CookieThemeResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/theme/CookieThemeResolver.java index 2d796711ea8..84264963190 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/theme/CookieThemeResolver.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/theme/CookieThemeResolver.java @@ -39,7 +39,7 @@ import org.springframework.web.util.WebUtils; * @author Juergen Hoeller * @since 17.06.2003 * @see #setThemeName - * @deprecated as of 6.0, with no direct replacement + * @deprecated as of 6.0 in favor of using CSS, without direct replacement */ @Deprecated(since = "6.0") public class CookieThemeResolver extends CookieGenerator implements ThemeResolver { diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/theme/FixedThemeResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/theme/FixedThemeResolver.java index 64d1a6bf3a6..f042e1254bc 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/theme/FixedThemeResolver.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/theme/FixedThemeResolver.java @@ -33,7 +33,7 @@ import org.springframework.lang.Nullable; * @author Juergen Hoeller * @since 17.06.2003 * @see #setDefaultThemeName - * @deprecated as of 6.0, with no direct replacement + * @deprecated as of 6.0 in favor of using CSS, without direct replacement */ @Deprecated(since = "6.0") public class FixedThemeResolver extends AbstractThemeResolver { diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/theme/SessionThemeResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/theme/SessionThemeResolver.java index 9a99cbd7cf6..6ca0fdb4333 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/theme/SessionThemeResolver.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/theme/SessionThemeResolver.java @@ -36,7 +36,7 @@ import org.springframework.web.util.WebUtils; * @author Juergen Hoeller * @since 17.06.2003 * @see #setThemeName - * @deprecated as of 6.0, with no concrete replacement + * @deprecated as of 6.0 in favor of using CSS, without direct replacement */ @Deprecated(since = "6.0") public class SessionThemeResolver extends AbstractThemeResolver { diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/theme/ThemeChangeInterceptor.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/theme/ThemeChangeInterceptor.java index 97d6d5984bd..a5c216e3847 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/theme/ThemeChangeInterceptor.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/theme/ThemeChangeInterceptor.java @@ -31,7 +31,7 @@ import org.springframework.web.servlet.support.RequestContextUtils; * @author Juergen Hoeller * @since 20.06.2003 * @see org.springframework.web.servlet.ThemeResolver - * @deprecated as of 6.0, with no concrete replacement + * @deprecated as of 6.0 in favor of using CSS, without direct replacement */ @Deprecated(since = "6.0") public class ThemeChangeInterceptor implements HandlerInterceptor { diff --git a/src/docs/asciidoc/web/webmvc.adoc b/src/docs/asciidoc/web/webmvc.adoc index 7deb5472fcb..841b3fc8aa6 100644 --- a/src/docs/asciidoc/web/webmvc.adoc +++ b/src/docs/asciidoc/web/webmvc.adoc @@ -1052,6 +1052,9 @@ application, thereby enhancing user experience. A theme is a collection of stati resources, typically style sheets and images, that affect the visual style of the application. +WARNING: as of 6.0 support for themes has been deprecated theme in favor of using CSS, +and without any special support on the server side. + [[mvc-themeresolver-defining]] ==== Defining a theme