Browse Source

fixes #1733, version information is now printed on clients "DebugConsole"

svn changeset:5147/svn branch:trunk
tags/6.7.0.beta1
Matti Tahvonen 16 years ago
parent
commit
a614d853fa

+ 9
- 0
src/com/itmill/toolkit/terminal/gwt/client/ApplicationConfiguration.java View File

return conf; 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;
}-*/;
} }

+ 1
- 1
src/com/itmill/toolkit/terminal/gwt/client/ApplicationConnection.java View File

configuration = cnf; configuration = cnf;


if (isDebugMode()) { if (isDebugMode()) {
console = new DebugConsole(this);
console = new DebugConsole(this, cnf);
} else { } else {
console = new NullConsole(); console = new NullConsole();
} }

+ 28
- 1
src/com/itmill/toolkit/terminal/gwt/client/DebugConsole.java View File



public final class DebugConsole extends IWindow implements Console { 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; private final Panel panel;


public DebugConsole(ApplicationConnection client) {
public DebugConsole(ApplicationConnection client,
ApplicationConfiguration cnf) {
super(); super();
this.client = client; this.client = client;
panel = new FlowPanel(); panel = new FlowPanel();
setCaption("Debug window"); setCaption("Debug window");
minimize(); minimize();
show(); 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() { private void minimize() {

+ 10
- 14
src/com/itmill/toolkit/terminal/gwt/server/ApplicationServlet.java View File

page.write("pathInfo: '" + pathInfo + "', "); page.write("pathInfo: '" + pathInfo + "', ");
page.write("themeUri:"); page.write("themeUri:");
page.write(themeUri != null ? "'" + themeUri + "'" : "null"); 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"); page.write("};\n//]]>\n</script>\n");


if (themeName != null) { if (themeName != null) {
page.write("pathInfo: '" + pathInfo + "', "); page.write("pathInfo: '" + pathInfo + "', ");
page.write("themeUri:"); page.write("themeUri:");
page.write(themeUri != null ? "'" + themeUri + "'" : "null"); 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"); page.write("};\n//]]>\n</script>\n");


if (themeName != null) { if (themeName != null) {

Loading…
Cancel
Save