ref #8041 Remove "New" option for groups and user selection dialog

[taxeditor.git] / eu.etaxonomy.taxeditor.store / src / main / java / eu / etaxonomy / taxeditor / ui / dialog / selection / UserSelectionDialog.java

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/UserSelectionDialog.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/UserSelectionDialog.java
index 0f5e9da0550761b7b27a4221fa6ddcc3d9aa0439..986a1f6f8912da8f18150e56d5fd187d73618d5d 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/UserSelectionDialog.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/UserSelectionDialog.java
@@ -16,6 +16,7 @@ import java.util.UUID;
 import org.eclipse.swt.widgets.Shell;
 
 import eu.etaxonomy.cdm.api.service.IUserService;
+import eu.etaxonomy.cdm.common.CdmUtils;
 import eu.etaxonomy.cdm.model.common.User;
 import eu.etaxonomy.cdm.persistence.dto.UuidAndTitleCache;
 import eu.etaxonomy.taxeditor.newWizard.AbstractNewEntityWizard;
@@ -68,7 +69,7 @@ public class UserSelectionDialog extends
                model = new ArrayList<UuidAndTitleCache<User>>();
 
                for(User user : users){
-                   if (user.getUsername().matches(pattern)) {
+                   if (pattern == null || user.getUsername().matches(CdmUtils.quoteRegExWithWildcard(pattern) + ".*")) {
                 model.add(new UuidAndTitleCache<User>(User.class, user.getUuid(), user.getId(), String.format("%s, %s", user.getUsername(), user.getPerson())));
             }
                }
@@ -79,7 +80,7 @@ public class UserSelectionDialog extends
         */
        @Override
        protected String[] getNewWizardText() {
-               return new String[]{"New User"};
+               return null;
        }
 
        /* (non-Javadoc)