summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArtur Signell <artur@vaadin.com>2012-09-25 09:14:44 +0300
committerArtur Signell <artur@vaadin.com>2012-09-25 09:14:44 +0300
commit35f00592e6c1b756b642ad4329a9a14314b80fe1 (patch)
tree279b3b1d401ef201648980b07187fcd371c5a12c
parent0c2096c4eb6e52dc08b60eced771bb008d219664 (diff)
downloadvaadin-framework-35f00592e6c1b756b642ad4329a9a14314b80fe1.tar.gz
vaadin-framework-35f00592e6c1b756b642ad4329a9a14314b80fe1.zip
Map PortalDefaultWidgetSet -> DefaultWidgetSet when source is portal (#9731)
-rw-r--r--server/src/com/vaadin/server/VaadinPortletService.java7
1 files changed, 7 insertions, 0 deletions
diff --git a/server/src/com/vaadin/server/VaadinPortletService.java b/server/src/com/vaadin/server/VaadinPortletService.java
index 02974aeea5..8025fa7713 100644
--- a/server/src/com/vaadin/server/VaadinPortletService.java
+++ b/server/src/com/vaadin/server/VaadinPortletService.java
@@ -51,6 +51,13 @@ public class VaadinPortletService extends VaadinService {
// portal property
widgetset = VaadinPortletRequest.cast(request).getPortalProperty(
VaadinPortlet.PORTAL_PARAMETER_VAADIN_WIDGETSET);
+ if ("com.vaadin.portal.gwt.PortalDefaultWidgetSet"
+ .equals(widgetset)) {
+ // For backwards compatibility - automatically map old portal
+ // default widget set to default widget set
+ widgetset = VaadinPortlet.DEFAULT_WIDGETSET;
+
+ }
}
if (widgetset == null) {