]> source.dussan.org Git - vaadin-framework.git/commitdiff
projects / vaadin-framework.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 0f494df)
Removed failing (non-existent) theme file request when using default theme.
authorJani Laakso <jani.laakso@itmill.com>
Wed, 14 Nov 2007 18:40:09 +0000 (18:40 +0000)
committerJani Laakso <jani.laakso@itmill.com>
Wed, 14 Nov 2007 18:40:09 +0000 (18:40 +0000)
svn changeset:2815/svn branch:trunk

src/com/itmill/toolkit/terminal/gwt/server/ApplicationServlet.java patch | blob | history

diff --git a/src/com/itmill/toolkit/terminal/gwt/server/ApplicationServlet.java b/src/com/itmill/toolkit/terminal/gwt/server/ApplicationServlet.java
index 62ef67ee5356b6178b76370c7c6d2f85633d9719..b70166cbc7dded2807ed1b495a10077ed49021ab 100644 (file)
--- a/src/com/itmill/toolkit/terminal/gwt/server/ApplicationServlet.java
+++ b/src/com/itmill/toolkit/terminal/gwt/server/ApplicationServlet.java
@@ -387,7 +387,7 @@ public class ApplicationServlet extends HttpServlet {
 
                                // Handle parameters
                                Map parameters = request.getParameterMap();
-                               if (window != null && parameters != null )
+                               if (window != null && parameters != null)
                                        window.handleParameters(parameters);
 
                                writeAjaxPage(request, response, window, themeName);
@@ -515,9 +515,10 @@ public class ApplicationServlet extends HttpServlet {
                                + "<script language='javascript' src='" + contextPath + "/"
                                + WIDGETSET_DIRECTORY_PATH + widgetset + "/" + widgetset
                                + ".nocache.js'></script>\n");
-               page.write("<link REL=\"stylesheet\" TYPE=\"text/css\" HREF=\""
-                               + contextPath + "/" + THEME_DIRECTORY_PATH + themeName
-                               + "/styles.css\">\n");
+               if (!themeName.equals("default"))
+                       page.write("<link REL=\"stylesheet\" TYPE=\"text/css\" HREF=\""
+                                       + contextPath + "/" + THEME_DIRECTORY_PATH + themeName
+                                       + "/styles.css\">\n");
                page
                                .write("</head>\n<body style=\"width:100%;height:100%;border:0;margin:0;overflow:auto;\">\n"
                                                + "     <iframe id=\"__gwt_historyFrame\" style=\"width:0;height:0;border:0;overflow:hidden\"></iframe>\n"
Vaadin 6, 7, 8 is a Java framework for modern Java web applications: https://github.com/vaadin/framework