From b2faadeeb37a036aab6f2d5240c3abe73d604f24 Mon Sep 17 00:00:00 2001
From: buczekp <buczekp>
Date: Wed, 6 Oct 2010 09:25:52 +0000
Subject: [PATCH] minor: improve MultilineHTML to 'preserve' all whitespace
(not only newlines)
SVN: 18172
---
.../client/application/ui/widget/MultilineHTML.java | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/widget/MultilineHTML.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/widget/MultilineHTML.java
index 0806a834fb7..85cb6c3f72f 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/widget/MultilineHTML.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/widget/MultilineHTML.java
@@ -39,18 +39,24 @@ public final class MultilineHTML extends HTML
// Another way to implement this would be to preserve white-space:
// getElement().getStyle().setProperty("whiteSpace", "pre");
// but then too long lines would not fit in property grid with no word wrapping.
- // So the only option is to replace newlines with <br/>
- super(replaceNewlinesWithBRs(html));
+ // So the only option is to replace newlines with <br/> and use ' ' for other
+ // whitespace characters.
+ super(preserveWhitespace(html));
}
private static final String BR = DOM.toString(DOM.createElement("br"));
- private static String replaceNewlinesWithBRs(String html)
+ private static String preserveWhitespace(String html)
{
String result = html;
// to be independent of regexp implementation we have to replace newlines in two steps
result = result.replaceAll("\n\r", BR);
result = result.replaceAll("[\n\r]", BR);
+ // additionally preserve remaining whitespace (tabs and spaces) using ' '
+ // the trick is not to change all whitespace to make word wrapping possible
+ result = result.replaceAll("\t", " ");
+ result = result.replaceAll("[\t]", " ");
+ result = result.replaceAll(" ", " ");
// result will not be wrapped in AbstractBrowserGrid so we wrap it up in div with tooltip
return wrapUpInDivWithTooltip(result, html);
}
--
GitLab