From: Matti Tahvonen <matti.tahvonen@itmill.com>
Date: Fri, 14 Aug 2009 09:02:21 +0000 (+0000)
Subject: #3191
X-Git-Tag: 6.7.0.beta1~2619
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=603ba66af2f4b849ccf181c8b65189859f49217b;p=vaadin-framework.git

#3191

svn changeset:8482/svn branch:6.1
---

diff --git a/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java b/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java
index a6b035f975..9f579cf81c 100644
--- a/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java
+++ b/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java
@@ -1383,7 +1383,7 @@ public abstract class AbstractApplicationServlet extends HttpServlet {
         writeAjaxPageHtmlMainDiv(page, appId, classNames, divStyle);
 
         if (!fragment) {
-            writeAjaxPageHtmlBodyEnd(page);
+            page.write("</body>\n</html>\n");
         }
 
         page.close();
@@ -1427,6 +1427,7 @@ public abstract class AbstractApplicationServlet extends HttpServlet {
             throws IOException {
         page.write("<div id=\"" + appId + "\" class=\"" + classNames + "\" "
                 + (divStyle != null ? divStyle : "") + "></div>\n");
+        page.write("<noscript>" + getNoScriptMessage() + "</noscript>");
     }
 
     /**
@@ -1567,23 +1568,6 @@ public abstract class AbstractApplicationServlet extends HttpServlet {
         return widgetset;
     }
 
-    /**
-     * Method to write the end of the html kickstart page.
-     * <p>
-     * This method is responsible for closing body and html tags.
-     * <p>
-     * Override this method if you want to add some custom html to the end of
-     * the page.
-     * 
-     * @param page
-     * @throws IOException
-     */
-    protected void writeAjaxPageHtmlBodyEnd(final BufferedWriter page)
-            throws IOException {
-        page.write("<noscript>" + getNoScriptMessage() + "</noscript>");
-        page.write("</body>\n</html>\n");
-    }
-
     /**
      * 
      * Method to open the body tag of the html kickstart page.