Merge branch 'release/5.17.0'

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

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/TaxonNodeSelectionDialog.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/TaxonNodeSelectionDialog.java
index c0c4c25aeed09c5649a0c74da7f02e8649c23a97..3ac813c44dd7deea7ddfef106f5f5f2363f8552c 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/TaxonNodeSelectionDialog.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/TaxonNodeSelectionDialog.java
@@ -33,7 +33,6 @@ import eu.etaxonomy.taxeditor.store.CdmStore;
 
 /**
  * @author p.ciardelli
- * @version $Id: $
  */
 public class TaxonNodeSelectionDialog extends AbstractFilteredCdmResourceSelectionDialog<TaxonNode> implements SelectionListener{
 
@@ -98,7 +97,7 @@ public class TaxonNodeSelectionDialog extends AbstractFilteredCdmResourceSelecti
                fillClassifications();
                this.allowClassificationSelection = allowSelectClassification;
 
-               createClassificationSelectionCombo(shell);
+               //createClassificationSelectionCombo(shell);
        }
        protected TaxonNodeSelectionDialog(Shell shell, //ConversationHolder conversation,
             String title, Set<UUID> excludeTaxa, boolean multi, TaxonNode node, UUID classificationUUID) {
@@ -148,7 +147,6 @@ public class TaxonNodeSelectionDialog extends AbstractFilteredCdmResourceSelecti
                return classificationSelection;
        }
 
-       /** {@inheritDoc} */
        @Override
        protected String getTitle(TaxonNode taxonNode) {
                if(taxonNode != null && taxonNode.getTaxon() != null){
@@ -171,21 +169,18 @@ public class TaxonNodeSelectionDialog extends AbstractFilteredCdmResourceSelecti
         };
     }
 
-
-       /** {@inheritDoc} */
        @Override
        protected TaxonNode getPersistentObject(UUID uuid) {
                return CdmStore.getService(ITaxonNodeService.class).find(uuid);
        }
 
-       /** {@inheritDoc} */
        @Override
        protected void callService(String pattern) {
            model = CdmStore.getService(IClassificationService.class)
                        .getTaxonNodeUuidAndTitleCacheOfAcceptedTaxaByClassification(
-                                       selectedClassification.getUuid(), limitOfInitialElements, pattern, allowClassificationSelection);
+                                       selectedClassification.getUuid(), limitOfInitialElements, pattern, allowClassificationSelection, true);
        }
-       
+
        @Override
        protected void sort() {
            if(!PreferencesUtil.isSortTaxaByRankAndName()){
@@ -222,19 +217,16 @@ public class TaxonNodeSelectionDialog extends AbstractFilteredCdmResourceSelecti
                }
     }
 
-       /** {@inheritDoc} */
        @Override
        protected AbstractNewEntityWizard getNewEntityWizard(String parameter) {
                return null;
        }
 
-       /** {@inheritDoc} */
        @Override
        protected String[] getNewWizardText() {
                return null;
        }
 
-       /** {@inheritDoc} */
        @Override
     public void widgetSelected(SelectionEvent e) {
                selectedClassification = classifications.get(classificationSelectionCombo.getSelectionIndex());
@@ -245,9 +237,6 @@ public class TaxonNodeSelectionDialog extends AbstractFilteredCdmResourceSelecti
                }
        }
 
-       /** {@inheritDoc} */
        @Override
     public void widgetDefaultSelected(SelectionEvent e) {}
-
-
 }