aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArtur Signell <artur.signell@itmill.com>2008-08-08 11:46:59 +0000
committerArtur Signell <artur.signell@itmill.com>2008-08-08 11:46:59 +0000
commitbefc0df6da8eef56c3698b41bfc219e2e906708b (patch)
tree11bcae0885088f90273f3859b42fef6ec566cd62
parent1327596eb8ed9c97abcd4477156d9a960544c336 (diff)
downloadvaadin-framework-befc0df6da8eef56c3698b41bfc219e2e906708b.tar.gz
vaadin-framework-befc0df6da8eef56c3698b41bfc219e2e906708b.zip
Fix for #1925 Main window caption flashes at wrong charset in the application restart
svn changeset:5160/svn branch:trunk
-rw-r--r--src/com/itmill/toolkit/terminal/gwt/server/ApplicationServlet.java2
-rw-r--r--src/com/itmill/toolkit/tests/tickets/Ticket1925.java15
2 files changed, 17 insertions, 0 deletions
diff --git a/src/com/itmill/toolkit/terminal/gwt/server/ApplicationServlet.java b/src/com/itmill/toolkit/terminal/gwt/server/ApplicationServlet.java
index b9c7c15bc5..829989793c 100644
--- a/src/com/itmill/toolkit/terminal/gwt/server/ApplicationServlet.java
+++ b/src/com/itmill/toolkit/terminal/gwt/server/ApplicationServlet.java
@@ -805,6 +805,8 @@ public class ApplicationServlet extends HttpServlet {
page.write("<html xmlns=\"http://www.w3.org/1999/xhtml\""
+ ">\n<head>\n");
+ page
+ .write("<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\"/>\n");
page.write("<style type=\"text/css\">"
+ "html, body {height:100%;}</style>");
page.write("<title>" + title + "</title>");
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1925.java b/src/com/itmill/toolkit/tests/tickets/Ticket1925.java
new file mode 100644
index 0000000000..92c92eeba1
--- /dev/null
+++ b/src/com/itmill/toolkit/tests/tickets/Ticket1925.java
@@ -0,0 +1,15 @@
+package com.itmill.toolkit.tests.tickets;
+
+import com.itmill.toolkit.Application;
+import com.itmill.toolkit.ui.Window;
+
+public class Ticket1925 extends Application {
+
+ @Override
+ public void init() {
+ Window mainWindow = new Window("Test åäö");
+ setMainWindow(mainWindow);
+
+ }
+
+}