svn changeset:5147/svn branch:trunktags/6.7.0.beta1
@@ -75,4 +75,13 @@ public class ApplicationConfiguration { | |||
return conf; | |||
} | |||
public native String getSerletVersion() | |||
/*-{ | |||
return this.@com.itmill.toolkit.terminal.gwt.client.ApplicationConfiguration::versionInfo.toolkitVersion; | |||
}-*/; | |||
public native String getApplicationVersion() | |||
/*-{ | |||
return this.@com.itmill.toolkit.terminal.gwt.client.ApplicationConfiguration::versionInfo.applicationVersion; | |||
}-*/; | |||
} |
@@ -107,7 +107,7 @@ public class ApplicationConnection { | |||
configuration = cnf; | |||
if (isDebugMode()) { | |||
console = new DebugConsole(this); | |||
console = new DebugConsole(this, cnf); | |||
} else { | |||
console = new NullConsole(); | |||
} |
@@ -18,9 +18,24 @@ import com.itmill.toolkit.terminal.gwt.client.ui.IWindow; | |||
public final class DebugConsole extends IWindow implements Console { | |||
/** | |||
* Builds number. For example 0-custom_tag in 5.0.0-custom_tag. | |||
*/ | |||
public static final String VERSION; | |||
/* Initialize version numbers from string replaced by build-script. */ | |||
static { | |||
if ("@VERSION@".equals("@" + "VERSION" + "@")) { | |||
VERSION = "5.9.9-INTERNAL-NONVERSIONED-DEBUG-BUILD"; | |||
} else { | |||
VERSION = "@VERSION@"; | |||
} | |||
} | |||
private final Panel panel; | |||
public DebugConsole(ApplicationConnection client) { | |||
public DebugConsole(ApplicationConnection client, | |||
ApplicationConfiguration cnf) { | |||
super(); | |||
this.client = client; | |||
panel = new FlowPanel(); | |||
@@ -30,6 +45,18 @@ public final class DebugConsole extends IWindow implements Console { | |||
setCaption("Debug window"); | |||
minimize(); | |||
show(); | |||
; | |||
log("Toolkit application servlet version: " + cnf.getSerletVersion()); | |||
log("Widget set is built on version: " + VERSION); | |||
log("Application version: " + cnf.getApplicationVersion()); | |||
if (!cnf.getSerletVersion().equals(VERSION)) { | |||
error("Warning: your widget set seems to be built with different " | |||
+ "version than the one used on server. Unexpected " | |||
+ "behavior may occur."); | |||
} | |||
} | |||
private void minimize() { |
@@ -851,13 +851,11 @@ public class ApplicationServlet extends HttpServlet { | |||
page.write("pathInfo: '" + pathInfo + "', "); | |||
page.write("themeUri:"); | |||
page.write(themeUri != null ? "'" + themeUri + "'" : "null"); | |||
if (testingApplication) { | |||
page.write(", versionInfo : {toolkitVersion:\""); | |||
page.write(VERSION); | |||
page.write("\",applicationVersion:\""); | |||
page.write(application.getVersion()); | |||
page.write("\"}"); | |||
} | |||
page.write(", versionInfo : {toolkitVersion:\""); | |||
page.write(VERSION); | |||
page.write("\",applicationVersion:\""); | |||
page.write(application.getVersion()); | |||
page.write("\"}"); | |||
page.write("};\n//]]>\n</script>\n"); | |||
if (themeName != null) { | |||
@@ -901,13 +899,11 @@ public class ApplicationServlet extends HttpServlet { | |||
page.write("pathInfo: '" + pathInfo + "', "); | |||
page.write("themeUri:"); | |||
page.write(themeUri != null ? "'" + themeUri + "'" : "null"); | |||
if (testingApplication) { | |||
page.write(", versionInfo : {toolkitVersion:\""); | |||
page.write(VERSION); | |||
page.write("\",applicationVersion:\""); | |||
page.write(application.getVersion()); | |||
page.write("\"}"); | |||
} | |||
page.write(", versionInfo : {toolkitVersion:\""); | |||
page.write(VERSION); | |||
page.write("\",applicationVersion:\""); | |||
page.write(application.getVersion()); | |||
page.write("\"}"); | |||
page.write("};\n//]]>\n</script>\n"); | |||
if (themeName != null) { |