From 1e77d8bcc5fdf27393889e91e67c4879573eeebf Mon Sep 17 00:00:00 2001
From: felmer <felmer>
Date: Tue, 7 Sep 2010 08:44:54 +0000
Subject: [PATCH] LMS-1734 handle also headers with only code in brackets
SVN: 17739
---
.../cisd/openbis/dss/generic/shared/utils/CodeAndLabel.java | 3 ++-
.../openbis/dss/generic/shared/utils/CodeAndLabelTest.java | 1 +
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/CodeAndLabel.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/CodeAndLabel.java
index 41338fd41c4..4a56256c45a 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/CodeAndLabel.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/CodeAndLabel.java
@@ -73,7 +73,8 @@ public class CodeAndLabel
}
}
code = normalize(c);
- label = t.trim();
+ String rest = t.trim();
+ label = rest.length() == 0 ? code : rest;
}
/**
diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/CodeAndLabelTest.java b/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/CodeAndLabelTest.java
index 68de4be9e49..ca06d9feefb 100644
--- a/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/CodeAndLabelTest.java
+++ b/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/CodeAndLabelTest.java
@@ -44,6 +44,7 @@ public class CodeAndLabelTest extends AssertJUnit
{
assertCodeAndTitle("ABC_1_2_3_4", "abc", new CodeAndLabel("<abc?1=2-3+4> abc"));
assertCodeAndTitle("ABC_123_", "abc<123>", new CodeAndLabel("abc<123>"));
+ assertCodeAndTitle("ABC", "ABC", new CodeAndLabel("<abc> "));
}
private void assertCodeAndTitle(String expectedCode, String expectedTitle,
--
GitLab