]> 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: d545e9a)
Title of generated page is no longer "IT Mill Toolkit 5" if the mainwindow has a...
authorMarc Englund <marc.englund@itmill.com>
Mon, 3 Mar 2008 10:04:32 +0000 (10:04 +0000)
committerMarc Englund <marc.englund@itmill.com>
Mon, 3 Mar 2008 10:04:32 +0000 (10:04 +0000)
svn changeset:3957/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 605bfd89bc1aff2ceb2fbfb7d2bc089493bdc007..f9f31d8bcd21f2b08cff72ba79d2d37a93fcbb38 100644 (file)
--- a/src/com/itmill/toolkit/terminal/gwt/server/ApplicationServlet.java
+++ b/src/com/itmill/toolkit/terminal/gwt/server/ApplicationServlet.java
@@ -643,6 +643,8 @@ public class ApplicationServlet extends HttpServlet {
                 response.getOutputStream()));
         final String pathInfo = request.getPathInfo() == null ? "/" : request
                 .getPathInfo();
+        String title = ((window == null || window.getCaption() == null) ? "IT Mill Toolkit 5"
+                : window.getCaption());
         page
                 .write("<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" "
                         + "\"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n");
@@ -650,7 +652,9 @@ public class ApplicationServlet extends HttpServlet {
         page
                 .write("<html xmlns=\"http://www.w3.org/1999/xhtml\" style=\"width:100%;"
                         + "height:100%;border:0;margin:0;\">\n<head>\n"
-                        + "<title>IT Mill Toolkit 5</title>\n"
+                        + "<title>"
+                        + title
+                        + "</title>\n"
                         + "<script type=\"text/javascript\">\n"
                         + "    var itmill = {\n" + "           appUri:'");
 
Vaadin 6, 7, 8 is a Java framework for modern Java web applications: https://github.com/vaadin/framework