From 329a8fc4c22c5a4c405786e12186046a777aa300 Mon Sep 17 00:00:00 2001
From: Matti Tahvonen <matti.tahvonen@itmill.com>
Date: Tue, 8 Apr 2008 06:58:05 +0000
Subject: [PATCH] fixes #1544

svn changeset:4148/svn branch:trunk
---
 .../gwt/client/ApplicationConfiguration.java         |  4 ++++
 .../terminal/gwt/client/ApplicationConnection.java   | 12 ++++++++++--
 .../terminal/gwt/server/ApplicationServlet.java      |  9 ---------
 3 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ApplicationConfiguration.java b/src/com/itmill/toolkit/terminal/gwt/client/ApplicationConfiguration.java
index 7bdd9d176a..aefc931c4c 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ApplicationConfiguration.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/ApplicationConfiguration.java
@@ -32,6 +32,10 @@ public class ApplicationConfiguration {
         id = appId;
     }
 
+    public JavaScriptObject getVersionInfoJSObject() {
+        return versionInfo;
+    }
+
     private native void loadFromDOM()
     /*-{
 
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ApplicationConnection.java b/src/com/itmill/toolkit/terminal/gwt/client/ApplicationConnection.java
index 6a82ad789f..1b8f0f0b31 100755
--- a/src/com/itmill/toolkit/terminal/gwt/client/ApplicationConnection.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/ApplicationConnection.java
@@ -154,15 +154,23 @@ public class ApplicationConnection {
          client.isActive = function() {
              return ap.@com.itmill.toolkit.terminal.gwt.client.ApplicationConnection::hasActiveRequest()();
          }
-         if ($wnd.itmill.versionInfo) {
+         var vi = ap.@com.itmill.toolkit.terminal.gwt.client.ApplicationConnection::getVersionInfo()();
+         if (vi) {
              client.getVersionInfo = function() {
-                 return $wnd.itmill.versionInfo;
+                 return vi;
              }
          }
          $wnd.top.itmill.registerToTT(client);
          this.@com.itmill.toolkit.terminal.gwt.client.ApplicationConnection::ttClientWrapper = client;
     }-*/;
 
+    /**
+     * Helper for tt initialization
+     */
+    private JavaScriptObject getVersionInfo() {
+        return configuration.getVersionInfoJSObject();
+    }
+
     private native void uninitializeTestingTools()
     /*-{
          $wnd.top.itmill.unregisterFromTT(this.@com.itmill.toolkit.terminal.gwt.client.ApplicationConnection::ttClientWrapper);
diff --git a/src/com/itmill/toolkit/terminal/gwt/server/ApplicationServlet.java b/src/com/itmill/toolkit/terminal/gwt/server/ApplicationServlet.java
index 792212ab61..ad206cf326 100644
--- a/src/com/itmill/toolkit/terminal/gwt/server/ApplicationServlet.java
+++ b/src/com/itmill/toolkit/terminal/gwt/server/ApplicationServlet.java
@@ -754,15 +754,6 @@ public class ApplicationServlet extends HttpServlet {
             page.write("\"}");
         }
         page.write("\n}}\n");
-        if (testingToolsActive) {
-            // TODO backwards compatibility; TT does not (yet) support multiple
-            // apps on one page
-            page.write(", versionInfo : {toolkitVersion:\"");
-            page.write(VERSION);
-            page.write("\",applicationVersion:\"");
-            page.write(application.getVersion());
-            page.write("\"}");
-        }
 
         page.write("};\n</script>\n");
 
-- 
2.39.5