From 770e6d623cf8f31c863782ff5a1c95d81ab85cf8 Mon Sep 17 00:00:00 2001 From: Cherian Mathew Date: Thu, 7 Aug 2014 09:30:07 +0000 Subject: [PATCH] MemberDetailElement : removed member label string EntitySelectionElement : removed " : " suffix to label string when label string is empty --- .../taxeditor/ui/section/group/MemberDetailElement.java | 2 +- .../taxeditor/ui/selection/EntitySelectionElement.java | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/group/MemberDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/group/MemberDetailElement.java index 1a828cb19..a4f0364ba 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/group/MemberDetailElement.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/group/MemberDetailElement.java @@ -64,7 +64,7 @@ public class MemberDetailElement extends AbstractEntityCollectionElement { public void createControls(ICdmFormElement element, int style) { selection_user = formFactory .createSelectionElement(User.class, - getConversationHolder(), element, "Member", entity, + getConversationHolder(), element, "", entity, EntitySelectionElement.EDITABLE, style); } diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/EntitySelectionElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/EntitySelectionElement.java index b6e5ca65e..35258c03a 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/EntitySelectionElement.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/EntitySelectionElement.java @@ -137,7 +137,7 @@ public class EntitySelectionElement extends this.isDeletable = (mode & DELETABLE) == DELETABLE; boolean isSelectable = (mode & SELECTABLE) == SELECTABLE; - this.labelString = labelString; + this.labelString = (labelString == null || labelString.equals("")) ? "" : labelString + " : "; this.conversation = conversation; @@ -158,8 +158,8 @@ public class EntitySelectionElement extends } private void createControls(Composite parent, int style) { - - label = formFactory.createLabel(getLayoutComposite(), labelString + " : ", + + label = formFactory.createLabel(getLayoutComposite(), labelString, SWT.NULL); addControl(label); -- 2.34.1