opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-2.14' into stable-2.15

Browse Source 
* stable-2.14:
  Fix error dialog not honoring line breaks

Change-Id: If2f43c6b568fcc5ff36ffef3f9553a349103b233
This commit is contained in:
David Pursehouse 2018-01-30 16:38:39 +09:00
commit eda423834d
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gerrit-gwtui/src/main/java/com/google/gerrit/client/ErrorDialog.java
View File

@ -88,7 +88,7 @@ public class ErrorDialog extends PopupPanel {
/** Create a dialog box to show a single message string. */
public ErrorDialog(String message) {
this();
body.add(new Label(message));
body.add(createErrorMsgLabel(message));
}
/** Create a dialog box to show a single message string. */
@ -145,12 +145,16 @@ public class ErrorDialog extends PopupPanel {
}
if (msg != null) {
final Label m = new Label(msg);
m.getElement().getStyle().setProperty("whiteSpace", "pre");
body.add(m);
body.add(createErrorMsgLabel(msg));
}
}
private Label createErrorMsgLabel(String message) {
Label m = new Label(message);
m.getElement().getStyle().setProperty("white-space", "pre");
return m;
}
public ErrorDialog setText(String t) {
text.setText(t);
return this;