From 98ccca987fe20e4ef8c4619e1809e18d4c6308bb Mon Sep 17 00:00:00 2001
From: buczekp <buczekp>
Date: Tue, 10 Aug 2010 10:55:17 +0000
Subject: [PATCH] [LMS-1676] fixed dependencies
SVN: 17375
---
.../client/application/renderer/InternalLinkCellRenderer.java | 3 ++-
.../specific/sample/ParentGeneratedFromSampleColDef.java | 3 +--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/renderer/InternalLinkCellRenderer.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/renderer/InternalLinkCellRenderer.java
index 0e74b76fadf..f0f07834993 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/renderer/InternalLinkCellRenderer.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/renderer/InternalLinkCellRenderer.java
@@ -6,6 +6,7 @@ import com.extjs.gxt.ui.client.widget.grid.Grid;
import com.extjs.gxt.ui.client.widget.grid.GridCellRenderer;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.model.BaseEntityModel;
+import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.widget.MultilineHTML;
public class InternalLinkCellRenderer implements GridCellRenderer<BaseEntityModel<?>>
{
@@ -34,7 +35,7 @@ public class InternalLinkCellRenderer implements GridCellRenderer<BaseEntityMode
String tokenOrNull = model.tryGetLink(property);
if (tokenOrNull == null && renderOriginalValueForEmptyToken)
{
- return originalValue;
+ return new MultilineHTML(originalValue).toString();
} else
{
String href = "#" + (tokenOrNull != null ? tokenOrNull : "");
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/columns/specific/sample/ParentGeneratedFromSampleColDef.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/columns/specific/sample/ParentGeneratedFromSampleColDef.java
index c1de7882d3e..549ca83249d 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/columns/specific/sample/ParentGeneratedFromSampleColDef.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/columns/specific/sample/ParentGeneratedFromSampleColDef.java
@@ -16,7 +16,6 @@
package ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.columns.specific.sample;
-import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.widget.MultilineHTML;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.Sample;
public class ParentGeneratedFromSampleColDef extends AbstractParentSampleColDef
@@ -77,7 +76,7 @@ public class ParentGeneratedFromSampleColDef extends AbstractParentSampleColDef
sb.append(getAsValue(parent)).append("\n");
counter++;
}
- return new MultilineHTML(sb.toString()).toString();
+ return sb.toString();
}
}
--
GitLab