From 1cb92c5fde5ca4ed27ba8faed661d4e7e78aa4d8 Mon Sep 17 00:00:00 2001
From: buczekp <buczekp>
Date: Fri, 22 Oct 2010 15:09:28 +0000
Subject: [PATCH] [LMS-1845] minor: preserve linebreaks in multiline error
messages
SVN: 18419
---
.../application/ui/PropertyValueRenderers.java | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/PropertyValueRenderers.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/PropertyValueRenderers.java
index d3fb8254c2b..b864b52670e 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/PropertyValueRenderers.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/PropertyValueRenderers.java
@@ -276,8 +276,10 @@ public final class PropertyValueRenderers
&& StringEscapeUtils.unescapeHtml(value).startsWith(
BasicConstant.ERROR_PROPERTY_PREFIX))
{
- return createHtmlWidget(StringEscapeUtils.unescapeHtml(value).substring(
- BasicConstant.ERROR_PROPERTY_PREFIX.length()));
+ String errorMsgText =
+ StringEscapeUtils.unescapeHtml(value).substring(
+ BasicConstant.ERROR_PROPERTY_PREFIX.length());
+ return createMultilineHtmlWidget(errorMsgText);
}
// handle normal values
switch (getDataTypeCode(object))
@@ -329,8 +331,12 @@ public final class PropertyValueRenderers
private Widget createMultilineHtmlWidget(IEntityProperty object)
{
- return MultilineStringPropertyValueRenderer
- .createMultilineHtmlWidget(object.getValue());
+ return createMultilineHtmlWidget(object.getValue());
+ }
+
+ private Widget createMultilineHtmlWidget(String multilineText)
+ {
+ return MultilineStringPropertyValueRenderer.createMultilineHtmlWidget(multilineText);
}
private Widget createHtmlWidget(String html)
--
GitLab