From: Cherian Mathew <c.mathew@bgbm.org>
Date: Thu, 7 Aug 2014 09:30:07 +0000 (+0000)
Subject: MemberDetailElement : removed member label string
X-Git-Tag: 3.6.0~514
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/770e6d623cf8f31c863782ff5a1c95d81ab85cf8

MemberDetailElement : removed member label string
EntitySelectionElement : removed " : " suffix to label string when label string is empty
---

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<User> {
 	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<T extends ICdmBase> 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<T extends ICdmBase> extends
 	}
 
 	private void createControls(Composite parent, int style) {
-
-		label = formFactory.createLabel(getLayoutComposite(), labelString + " : ",
+		
+		label = formFactory.createLabel(getLayoutComposite(), labelString,
 				SWT.NULL);
 
 		addControl(label);