From fe8983caf3c11d61a796e635aad743eaf0564291 Mon Sep 17 00:00:00 2001
From: tpylak <tpylak>
Date: Thu, 30 Jul 2009 09:18:59 +0000
Subject: [PATCH] LMS-1020 minor: if vocabulary term has no label, they term
display should work as it used to (it's still clear what is the code)
SVN: 11942
---
.../model/renderer/VocabularyPropertyColRenderer.java | 8 +++++++-
.../openbis/generic/shared/basic/dto/VocabularyTerm.java | 8 +++++++-
2 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/model/renderer/VocabularyPropertyColRenderer.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/model/renderer/VocabularyPropertyColRenderer.java
index 2ed94de9d09..38ad9ab99bd 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/model/renderer/VocabularyPropertyColRenderer.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/model/renderer/VocabularyPropertyColRenderer.java
@@ -73,6 +73,12 @@ public class VocabularyPropertyColRenderer<T extends IEntityPropertiesHolder> ex
{
final String code = term.getCode();
final String label = term.getLabel();
- return (label != null ? label + " " : "") + "[" + code + "]";
+ if (label == null)
+ {
+ return code;
+ } else
+ {
+ return label + " [" + code + "]";
+ }
}
}
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/VocabularyTerm.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/VocabularyTerm.java
index d3e2a114f35..638b88db94a 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/VocabularyTerm.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/VocabularyTerm.java
@@ -82,7 +82,13 @@ public final class VocabularyTerm extends CodeWithRegistration<Vocabulary> imple
@Override
public String toString()
{
- return (getLabel() != null ? getLabel() + " " : "") + "[" + getCode() + "]";
+ if (label == null)
+ {
+ return getCode();
+ } else
+ {
+ return label + " [" + getCode() + "]";
+ }
}
public String getUrl()
--
GitLab