ref #9204 upgrade and remove further libraries in taxeditor (including commons-lang...

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

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/FeatureSelectionDialog.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/FeatureSelectionDialog.java
index d3ff2dca8e54a241fc09501a80a87afbf2acfe92..dc588186d4e5ca9380d974b2e3657778a221c05d 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/FeatureSelectionDialog.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/FeatureSelectionDialog.java
@@ -9,17 +9,13 @@
 
 package eu.etaxonomy.taxeditor.ui.dialog.selection;
 
-import java.util.ArrayList;
-import java.util.List;
 import java.util.UUID;
 
 import org.eclipse.swt.widgets.Shell;
 
-import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
 import eu.etaxonomy.cdm.api.service.ITermService;
-import eu.etaxonomy.cdm.model.common.DefinedTermBase;
+import eu.etaxonomy.cdm.model.term.DefinedTermBase;
 import eu.etaxonomy.cdm.model.description.Feature;
-import eu.etaxonomy.cdm.persistence.dto.UuidAndTitleCache;
 import eu.etaxonomy.taxeditor.newWizard.AbstractNewEntityWizard;
 import eu.etaxonomy.taxeditor.store.CdmStore;
 
@@ -31,8 +27,9 @@ import eu.etaxonomy.taxeditor.store.CdmStore;
 public class FeatureSelectionDialog extends
                AbstractFilteredCdmResourceSelectionDialog<Feature> {
 
-       public static Feature select(Shell shell, ConversationHolder conversation, Feature feature){
-               FeatureSelectionDialog dialog = new FeatureSelectionDialog(shell, conversation,
+       public static Feature select(Shell shell, //ConversationHolder conversation,
+               Feature feature){
+               FeatureSelectionDialog dialog = new FeatureSelectionDialog(shell, //conversation,
                                "Choose Feature", false, FeatureSelectionDialog.class.getCanonicalName(), feature);
                return getSelectionFromDialog(dialog);
        }
@@ -45,10 +42,11 @@ public class FeatureSelectionDialog extends
         * @param settings
         * @param cdmObject
         */
-       protected FeatureSelectionDialog(Shell shell,
-                       ConversationHolder conversation, String title, boolean multi,
+       protected FeatureSelectionDialog(Shell shell,//ConversationHolder conversation,
+                        String title, boolean multi,
                        String settings, Feature cdmObject) {
-               super(shell, conversation, title, multi, settings, cdmObject);
+               super(shell,//conversation,
+                       title, multi, settings, cdmObject);
        }
 
        @Override
@@ -64,17 +62,8 @@ public class FeatureSelectionDialog extends
        }
 
        @Override
-       protected void search() {
-               List<Feature> features = CdmStore.getService(ITermService.class).list(Feature.class, null, null, null, null);
-
-               List<UuidAndTitleCache<Feature>> featureUuidAndTitleCache = new ArrayList<UuidAndTitleCache<Feature>>();
-
-               for(Feature feature : features){
-                       UuidAndTitleCache<Feature> uuidAndTitleCache = new UuidAndTitleCache<Feature>(Feature.class, feature.getUuid(), feature.getId(), feature.getTitleCache());
-                       featureUuidAndTitleCache.add(uuidAndTitleCache);
-               }
-
-               model =  featureUuidAndTitleCache;
+       protected void callService(String pattern) {
+        model = CdmStore.getService(ITermService.class).getUuidAndTitleCache(Feature.class, limitOfInitialElements, pattern);
        }
 
        /* (non-Javadoc)