diff options
| author | Marc Englund <marc.englund@itmill.com> | 2009-05-14 13:25:14 +0000 |
|---|---|---|
| committer | Marc Englund <marc.englund@itmill.com> | 2009-05-14 13:25:14 +0000 |
| commit | 8edeee183f4d3fa7244e142ad0918c7e1d60a3e2 (patch) | |
| tree | 835fd98e411d92a0b4728e3300b2d6b78126d039 | |
| parent | fbcf675ecb1240a9847447904b929e53b9ba4e81 (diff) | |
| download | vaadin-framework-8edeee183f4d3fa7244e142ad0918c7e1d60a3e2.tar.gz vaadin-framework-8edeee183f4d3fa7244e142ad0918c7e1d60a3e2.zip | |
toolkitVersion -> vaadinVersion
svn changeset:7815/svn branch:6.0
| -rw-r--r-- | WebContent/multiapp.html | 6 | ||||
| -rw-r--r-- | src/com/vaadin/terminal/gwt/client/ApplicationConfiguration.java | 2 | ||||
| -rw-r--r-- | src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/WebContent/multiapp.html b/WebContent/multiapp.html index 8e37550e41..ace7231d5d 100644 --- a/WebContent/multiapp.html +++ b/WebContent/multiapp.html @@ -9,19 +9,19 @@ appUri:'/FeatureBrowser', pathInfo: '/', themeUri: '/VAADIN/themes/example', - versionInfo : {toolkitVersion:"5.9.9-INTERNAL-NONVERSIONED-DEBUG-BUILD",applicationVersion:"NONVERSIONED"} + versionInfo : {vaadinVersion:"6.0.0-INTERNAL-NONVERSIONED-DEBUG-BUILD",applicationVersion:"NONVERSIONED"} }, 'calc' :{ appUri:'/Calc', pathInfo: '/', themeUri: '/VAADIN/themes/example', - versionInfo : {toolkitVersion:"5.9.9-INTERNAL-NONVERSIONED-DEBUG-BUILD",applicationVersion:"NONVERSIONED"} + versionInfo : {vaadinVersion:"6-INTERNAL-NONVERSIONED-DEBUG-BUILD",applicationVersion:"NONVERSIONED"} }, 'hello' :{ appUri:'/HelloWorld', pathInfo: '/', themeUri: '/VAADIN/themes/example', - versionInfo : {toolkitVersion:"5.9.9-INTERNAL-NONVERSIONED-DEBUG-BUILD",applicationVersion:"NONVERSIONED"} + versionInfo : {vaadinVersion:"6.0.0-INTERNAL-NONVERSIONED-DEBUG-BUILD",applicationVersion:"NONVERSIONED"} } diff --git a/src/com/vaadin/terminal/gwt/client/ApplicationConfiguration.java b/src/com/vaadin/terminal/gwt/client/ApplicationConfiguration.java index e27283258a..0eb505761b 100644 --- a/src/com/vaadin/terminal/gwt/client/ApplicationConfiguration.java +++ b/src/com/vaadin/terminal/gwt/client/ApplicationConfiguration.java @@ -187,7 +187,7 @@ public class ApplicationConfiguration { public native String getServletVersion() /*-{ - return this.@com.vaadin.terminal.gwt.client.ApplicationConfiguration::versionInfo.toolkitVersion; + return this.@com.vaadin.terminal.gwt.client.ApplicationConfiguration::versionInfo.vaadinVersion; }-*/; public native String getApplicationVersion() diff --git a/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java b/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java index 6180993faa..96c0440b57 100644 --- a/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java +++ b/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java @@ -1222,7 +1222,7 @@ public abstract class AbstractApplicationServlet extends HttpServlet { } page.write("themeUri:"); page.write(themeUri != null ? "'" + themeUri + "'" : "null"); - page.write(", versionInfo : {toolkitVersion:\""); + page.write(", versionInfo : {vaadinVersion:\""); page.write(VERSION); page.write("\",applicationVersion:\""); page.write(application.getVersion()); @@ -1295,7 +1295,7 @@ public abstract class AbstractApplicationServlet extends HttpServlet { } page.write("themeUri:"); page.write(themeUri != null ? "'" + themeUri + "'" : "null"); - page.write(", versionInfo : {toolkitVersion:\""); + page.write(", versionInfo : {vaadinVersion:\""); page.write(VERSION); page.write("\",applicationVersion:\""); page.write(application.getVersion()); |