From 4c310c9cbdf1ccb23c5f851630163b2c8843c85b Mon Sep 17 00:00:00 2001
From: =?utf8?q?Leif=20=C3=85strand?= <leif@vaadin.com>
Date: Mon, 19 Dec 2011 12:57:28 +0200
Subject: [PATCH] Set the v-theme-xxx class when the theme name is acutally
 known

---
 src/com/vaadin/terminal/gwt/client/ui/VView.java  |  6 ++++++
 .../terminal/gwt/server/AjaxPageHandler.java      | 15 +++------------
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/src/com/vaadin/terminal/gwt/client/ui/VView.java b/src/com/vaadin/terminal/gwt/client/ui/VView.java
index 50666e1674..9dc282b683 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VView.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VView.java
@@ -793,6 +793,12 @@ public class VView extends SimplePanel implements Container, ResizeHandler,
         // No longer added by AbstractApplicationServlet/Portlet
         root.removeStyleName("v-app-loading");
 
+        String themeUri = applicationConnection.getConfiguration()
+                .getThemeUri();
+        String themeName = themeUri.substring(themeUri.lastIndexOf('/'));
+        themeName = themeName.replaceAll("[^a-zA-Z0-9]", "");
+        root.addStyleName("v-theme-" + themeName);
+
         root.add(this);
 
         if (applicationConnection.getConfiguration().isStandalone()) {
diff --git a/src/com/vaadin/terminal/gwt/server/AjaxPageHandler.java b/src/com/vaadin/terminal/gwt/server/AjaxPageHandler.java
index 0f61cd03ef..d40a18308b 100644
--- a/src/com/vaadin/terminal/gwt/server/AjaxPageHandler.java
+++ b/src/com/vaadin/terminal/gwt/server/AjaxPageHandler.java
@@ -219,28 +219,19 @@ public abstract class AjaxPageHandler implements RequestHandler {
             throws IOException {
         Writer page = context.getWriter();
         String style = getMainDivStyle(context);
-        String themeName = context.getThemeName();
 
         /*- Add classnames;
          *      .v-app
          *      .v-app-loading
          *      .v-app-<simpleName for app class>
-         *      .v-theme-<themeName, remove non-alphanum>
+         *- Additionally added from javascript:
+         *      .v-theme-<themeName, remove non-alphanum> 
          */
 
         String appClass = "v-app-"
                 + getApplicationCSSClassName(context.getApplication());
 
-        String themeClass = "";
-        if (themeName != null) {
-            themeClass = "v-theme-" + themeName.replaceAll("[^a-zA-Z0-9]", "");
-        } else {
-            themeClass = "v-theme-"
-                    + AbstractApplicationServlet.getDefaultTheme().replaceAll(
-                            "[^a-zA-Z0-9]", "");
-        }
-
-        String classNames = "v-app " + themeClass + " " + appClass;
+        String classNames = "v-app " + appClass;
 
         if (style != null && style.length() != 0) {
             style = " style=\"" + style + "\"";
-- 
2.39.5