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 5ffa558376138bc20f3b8db7b2bd3bfab4329fbb..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
@@ -1,4 +1,3 @@
-// $Id$
 /**
 * Copyright (C) 2007 EDIT
 * European Distributed Institute of Taxonomy
@@ -16,10 +15,10 @@ import java.util.UUID;
 
 import org.eclipse.swt.widgets.Shell;
 
-import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
 import eu.etaxonomy.cdm.api.service.IUserService;
+import eu.etaxonomy.cdm.common.CdmUtils;
 import eu.etaxonomy.cdm.model.common.User;
-import eu.etaxonomy.cdm.model.common.UuidAndTitleCache;
+import eu.etaxonomy.cdm.persistence.dto.UuidAndTitleCache;
 import eu.etaxonomy.taxeditor.newWizard.AbstractNewEntityWizard;
 import eu.etaxonomy.taxeditor.newWizard.NewUserWizard;
 import eu.etaxonomy.taxeditor.store.CdmStore;
@@ -39,8 +38,9 @@ public class UserSelectionDialog extends
         * @param user
         * @return
         */
-       public static User select(Shell shell, ConversationHolder conversation, User user){
-               UserSelectionDialog dialog = new UserSelectionDialog(shell, conversation,
+       public static User select(Shell shell, //ConversationHolder conversation,
+               User user){
+               UserSelectionDialog dialog = new UserSelectionDialog(shell, //conversation,
                                "Choose User", false, UserSelectionDialog.class.getCanonicalName(), user);
                return getSelectionFromDialog(dialog);
        }
@@ -53,22 +53,25 @@ public class UserSelectionDialog extends
         * @param settings
         * @param cdmObject
         */
-       protected UserSelectionDialog(Shell shell, ConversationHolder conversation,
+       protected UserSelectionDialog(Shell shell, //ConversationHolder conversation,
                        String title, boolean multi, String settings, User cdmObject) {
-               super(shell, conversation, title, multi, settings, cdmObject);
+               super(shell, //conversation,
+                       title, multi, settings, cdmObject);
        }
 
        /* (non-Javadoc)
-        * @see eu.etaxonomy.taxeditor.ui.dialogs.filteredSelection.AbstractFilteredCdmResourceSelectionDialog#initModel()
+        * @see eu.etaxonomy.taxeditor.ui.dialogs.filteredSelection.AbstractFilteredCdmResourceSelectionDialog#search
         */
        @Override
-       protected void initModel() {
+       protected void callService(String pattern) {
                List<User> users = CdmStore.getService(IUserService.class).list(User.class, null, null, null, null);
 
                model = new ArrayList<UuidAndTitleCache<User>>();
 
                for(User user : users){
-                       model.add(new UuidAndTitleCache<User>(User.class, user.getUuid(), user.getId(), String.format("%s, %s", user.getUsername(), user.getPerson())));
+                   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())));
+            }
                }
        }
 
@@ -76,8 +79,8 @@ public class UserSelectionDialog extends
         * @see eu.etaxonomy.taxeditor.ui.dialogs.filteredSelection.AbstractFilteredCdmResourceSelectionDialog#getNewWizardLinkText()
         */
        @Override
-       protected String getNewWizardLinkText() {
-               return String.format("Create a new <a>%1s</a>", "User ");
+       protected String[] getNewWizardText() {
+               return null;
        }
 
        /* (non-Javadoc)