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 / TermVocabularySelectionDialog.java

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/TermVocabularySelectionDialog.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/TermVocabularySelectionDialog.java
index a71532ee96f735d5cd6acb34738f0e0f1c04b5ca..10beb90b3e99fb38e5bfe8c3c0634f4f446d9caf 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/TermVocabularySelectionDialog.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/TermVocabularySelectionDialog.java
@@ -16,8 +16,8 @@ import java.util.UUID;
 import org.eclipse.swt.widgets.Shell;
 
 import eu.etaxonomy.cdm.api.service.IVocabularyService;
-import eu.etaxonomy.cdm.model.common.TermType;
-import eu.etaxonomy.cdm.model.common.TermVocabulary;
+import eu.etaxonomy.cdm.model.term.TermType;
+import eu.etaxonomy.cdm.model.term.TermVocabulary;
 import eu.etaxonomy.taxeditor.newWizard.AbstractNewEntityWizard;
 import eu.etaxonomy.taxeditor.newWizard.NewFeatureVocabularyWizard;
 import eu.etaxonomy.taxeditor.store.CdmStore;
@@ -39,11 +39,11 @@ public class TermVocabularySelectionDialog extends
     }
 
     public static TermVocabulary select(String dialogTitle, Shell shell, TermVocabulary voc){
-        return select_internal(dialogTitle, shell, Collections.singleton(voc), null);
+        return select_internal(dialogTitle, shell, voc!=null?Collections.singleton(voc):null, null);
     }
 
     public static TermVocabulary select(Shell shell, TermVocabulary voc){
-        return select_internal("Choose Vocabulary", shell, Collections.singleton(voc), null);
+        return select_internal("Choose Vocabulary", shell, voc!=null?Collections.singleton(voc):null, null);
     }
 
     private static TermVocabulary select_internal(String dialogTitle, Shell shell, Set<TermVocabulary> vocabulariesToBeFiltered,
@@ -80,7 +80,7 @@ public class TermVocabularySelectionDialog extends
 
        @Override
        protected AbstractNewEntityWizard getNewEntityWizard(String parameter) {
-        return new NewFeatureVocabularyWizard();
+        return new NewFeatureVocabularyWizard(termType);
        }
 
 }