ref #8146 Restrict "add term wizard" by termType

[taxeditor.git] / eu.etaxonomy.taxeditor.store / src / main / java / eu / etaxonomy / taxeditor / featuretree / e4 / handler / AddChildFeatureHandler.java

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/handler/AddChildFeatureHandler.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/handler/AddChildFeatureHandler.java
index 0ea64f91e168dc3e84d42247fc5ffe8f1fc97f44..b52634116adf3baae7aa85aae6eed2b5b5f688ad 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/handler/AddChildFeatureHandler.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/handler/AddChildFeatureHandler.java
@@ -8,7 +8,7 @@
 */
 package eu.etaxonomy.taxeditor.featuretree.e4.handler;
 
-import java.util.Collection;
+import java.util.List;
 
 import javax.inject.Named;
 
@@ -24,9 +24,9 @@ import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.wizard.WizardDialog;
 import org.eclipse.swt.widgets.Shell;
 
-import eu.etaxonomy.cdm.model.description.Feature;
 import eu.etaxonomy.cdm.model.description.FeatureNode;
-import eu.etaxonomy.taxeditor.featuretree.AvailableFeaturesWizard;
+import eu.etaxonomy.cdm.persistence.dto.TermDto;
+import eu.etaxonomy.taxeditor.featuretree.TermChooseWizard;
 import eu.etaxonomy.taxeditor.featuretree.e4.IFeatureTreeEditor;
 import eu.etaxonomy.taxeditor.featuretree.e4.operation.AddFeatureOperation;
 import eu.etaxonomy.taxeditor.model.AbstractUtility;
@@ -48,16 +48,15 @@ public class AddChildFeatureHandler {
         if (StoreUtil.promptCheckIsDirty(editor)) {
             return;
         }
+        FeatureNode parent = (FeatureNode)selection.getFirstElement();
 
-        AvailableFeaturesWizard wizard = new AvailableFeaturesWizard();
+        TermChooseWizard wizard = new TermChooseWizard(parent.getTermType());
         WizardDialog dialog = new WizardDialog(shell, wizard);
 
-        Object next = selection.getFirstElement();
-        if (dialog.open() == IStatus.OK && next instanceof FeatureNode) {
-            FeatureNode parent = (FeatureNode)next;
-            Collection<Feature> additionalFeatures = wizard.getAdditionalFeatures();
-            for (Feature feature : additionalFeatures) {
-                AddFeatureOperation operation = new AddFeatureOperation(feature.getUuid(), parent, editor, editor);
+        if (dialog.open() == IStatus.OK) {
+            List<TermDto> selectedTerms = wizard.getSelectedTerms();
+            for (TermDto termDto: selectedTerms) {
+                AddFeatureOperation operation = new AddFeatureOperation(termDto.getUuid(), parent, editor, editor);
                 AbstractUtility.executeOperation(operation, sync);
             }
         }