Fix bug in VocabularyTerm rendering. Code duplication refactored

SVN: 13524

openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/model/renderer/VocabularyPropertyColRenderer.java

@@ -72,15 +72,7 @@ public class VocabularyPropertyColRenderer<T extends IEntityPropertiesHolder> ex
 
     public static final String renderCodeWithLabel(VocabularyTerm term)
     {
-        final String code = term.getCode();
-        final String label = term.getLabel();
-        if (label == null)
-        {
-            return code;
-        } else
-        {
-            return label + " [" + code + "]";
-        }
+        return term.toString();
     }
 
     public static final String renderAsTooltip(VocabularyTerm term)

openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/VocabularyTerm.java

@@ -84,13 +84,8 @@ public final class VocabularyTerm extends CodeWithRegistration<Vocabulary> imple
     @Override
     public String toString()
     {
-        if (label == null)
-        {
-            return getCode();
-        } else
-        {
-            return label + " [" + getCode() + "]";
-        }
+        String code = getCode();
+        return label == null ? code : (code == null ? label : label + " [" + code + "]");
     }
 
     public String getUrl()