ref #8146 Restrict "add term wizard" by termType

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/TermChooseWizard.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/TermChooseWizard.java
index de17944eedde7cbba5aa976f06921c3c36aa9402..2a8f1cd8b89b519514148468901816f938c6e7d0 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/TermChooseWizard.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/TermChooseWizard.java
@@ -13,6 +13,7 @@ import java.util.List;
 
 import org.eclipse.jface.wizard.Wizard;
 
+import eu.etaxonomy.cdm.model.common.TermType;
 import eu.etaxonomy.cdm.persistence.dto.TermDto;
 
 /**
@@ -27,7 +28,10 @@ public class TermChooseWizard extends Wizard {
 
        private List<TermDto> selectedTerms;
 
-       public TermChooseWizard(){
+    private TermType termType;
+
+       public TermChooseWizard(TermType termType){
+           this.termType = termType;
        }
 
     public List<TermDto> getSelectedTerms() {
@@ -36,7 +40,7 @@ public class TermChooseWizard extends Wizard {
 
        @Override
        public void addPages() {
-               page = new TermChooseWizardPage();
+               page = new TermChooseWizardPage(termType);
                addPage(page);
        }
 

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/TermChooseWizardPage.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/TermChooseWizardPage.java
index 073a381f80d0b32afcde781eb5685bff989b5c59..20318ea1e5e104d9b2e250c0d8752cf82b5677e0 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/TermChooseWizardPage.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/TermChooseWizardPage.java
@@ -30,17 +30,19 @@ import eu.etaxonomy.taxeditor.view.search.facet.term.TermSearchController;
 public class TermChooseWizardPage extends WizardPage {
 
     private TermSearchController controller;
+    private TermType termType;
 
-       protected TermChooseWizardPage() {
+       protected TermChooseWizardPage(TermType termType) {
                super("Term Choose Wizard");
                setTitle("Term Choose Wizard");
                setDescription("Please search and select the terms you want to add to the tree.");
+               this.termType = termType;
        }
 
        @Override
        public void createControl(Composite parent) {
         SearchComposite searchComposite = new SearchComposite(parent, SWT.NONE);
-        controller = new TermSearchController(searchComposite, TermType.Feature);
+        controller = new TermSearchController(searchComposite, termType);
                setControl(searchComposite);
        }
 

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);
             }
         }

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/handler/AddFeatureHandler.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/handler/AddFeatureHandler.java
index e0eb2cbdcf371e275a4b81c02eeb434a0711c9da..001d874885feb82ac9df8a2efb5f36a38d1d20a6 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/handler/AddFeatureHandler.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/handler/AddFeatureHandler.java
@@ -44,18 +44,15 @@ public class AddFeatureHandler {
             @Named(IServiceConstants.ACTIVE_SELECTION)IStructuredSelection selection,
             @Named(IServiceConstants.ACTIVE_PART)MPart thisPart, UISynchronize sync) {
         IFeatureTreeEditor editor = ((IFeatureTreeEditor) thisPart.getObject());
-
         if (StoreUtil.promptCheckIsDirty(editor)) {
             return;
         }
+        FeatureTree tree = (FeatureTree) selection.getFirstElement();
 
-
-        TermChooseWizard wizard = new TermChooseWizard();
-        //      AvailableFeaturesWizard wizard = new AvailableFeaturesWizard();
+        TermChooseWizard wizard = new TermChooseWizard(tree.getTermType());
         WizardDialog dialog = new WizardDialog(shell, wizard);
 
         if (dialog.open() == IStatus.OK) {
-            FeatureTree tree = (FeatureTree) selection.getFirstElement();
             List<TermDto> selectedTerms = wizard.getSelectedTerms();
             for (TermDto termDto: selectedTerms) {
                 AddFeatureOperation operation = new AddFeatureOperation(termDto.getUuid(), tree.getRoot(), editor, editor);