Browse Source

Fix for #4463 - "widgetset version does not seem to match theme version" should not be output to console

svn changeset:12366/svn branch:6.3
tags/6.7.0.beta1
Artur Signell 14 years ago
parent
commit
f9fdcfb00d
1 changed files with 26 additions and 7 deletions
  1. 26
    7
      src/com/vaadin/terminal/gwt/client/VDebugConsole.java

+ 26
- 7
src/com/vaadin/terminal/gwt/client/VDebugConsole.java View File

@@ -186,10 +186,10 @@ public final class VDebugConsole extends VOverlay implements Console {
+ "behavior may occur.");
}

log("<div class=\"v-theme-version v-theme-version-"
logToDebugWindow("<div class=\"v-theme-version v-theme-version-"
+ VERSION.replaceAll("\\.", "_")
+ "\">Warning: widgetset version " + VERSION
+ " does not seem to match theme version </div>");
+ " does not seem to match theme version </div>", true);
}

private EventPreview dragpreview = new EventPreview() {
@@ -309,11 +309,32 @@ public final class VDebugConsole extends VOverlay implements Console {
msg = "null";
}

panel.add(new HTML(msg));
logToDebugWindow(msg, false);
System.out.println(msg);
consoleLog(msg);
}

/**
* Logs the given message to the debug window.
*
* @param msg
* The message to log. Must not be null.
*/
private void logToDebugWindow(String msg, boolean error) {
if (error) {
panel.add(createErrorHtml(msg));
} else {
panel.add(new HTML(msg));
}
}

private HTML createErrorHtml(String msg) {
HTML html = new HTML(msg);
html.getElement().getStyle().setColor("#f00");
html.getElement().getStyle().setFontWeight(FontWeight.BOLD);
return html;
}

/*
* (non-Javadoc)
*
@@ -324,10 +345,8 @@ public final class VDebugConsole extends VOverlay implements Console {
msg = "null";
}

HTML html = new HTML(msg);
html.getElement().getStyle().setColor("#f00");
html.getElement().getStyle().setFontWeight(FontWeight.BOLD);
panel.add(html);
logToDebugWindow(msg, true);

System.err.println(msg);
consoleErr(msg);
}

Loading…
Cancel
Save