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 1a828cb19fb054e659840644306709ea9ec9ce7f..a4f0364ba89c74545a4a69c18a597b1ba1561177 100644 (file)
--- 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,
        public void createControls(ICdmFormElement element, int style) {
                selection_user = formFactory
                                .createSelectionElement(User.class,

-                                               getConversationHolder(), element, "Member", entity,
+                                               getConversationHolder(), element, "", entity,

                                                EntitySelectionElement.EDITABLE, style);
        }
 
                                                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 b6e5ca65e58550e6c63749de99ae445445121b21..35258c03aed6f6da3c33e87ce350d2ece1dc5d91 100644 (file)
--- 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.isDeletable = (mode & DELETABLE) == DELETABLE;
                boolean isSelectable = (mode & SELECTABLE) == SELECTABLE;
 

-               this.labelString = labelString;
+               this.labelString = (labelString == null || labelString.equals("")) ? "" : labelString + " : ";

 
                this.conversation = conversation;
 
 
                this.conversation = conversation;
 


@@ -158,8 +158,8 @@ public class EntitySelectionElement<T extends ICdmBase> extends
        }
 
        private void createControls(Composite parent, int style) {
        }
 
        private void createControls(Composite parent, int style) {

-
-               label = formFactory.createLabel(getLayoutComposite(), labelString + " : ",
+               
+               label = formFactory.createLabel(getLayoutComposite(), labelString,

                                SWT.NULL);
 
                addControl(label);
                                SWT.NULL);
 
                addControl(label);