ref #8146 Adapt AvailableFeaturesWizard

 - temporary disable usage of facet search

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/AvailableFeaturesWizard.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/AvailableFeaturesWizard.java
index bcb659649ab8b74395c498e5af31b7c3a846fbb1..61397b95527b2255757cb303b7b57fe9fadaabd3 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/AvailableFeaturesWizard.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/AvailableFeaturesWizard.java
@@ -13,6 +13,7 @@ import java.util.Set;
 
 import org.eclipse.jface.wizard.Wizard;
 
+import eu.etaxonomy.cdm.model.common.TermType;
 import eu.etaxonomy.cdm.model.description.Feature;
 
 /**
@@ -28,13 +29,16 @@ public class AvailableFeaturesWizard extends Wizard {
 
        private Set<Feature> additionalFeatures;
 
-       public AvailableFeaturesWizard(){
+    private TermType termType;
+
+       public AvailableFeaturesWizard(TermType termType){
+           this.termType = termType;
        }
 
        /** {@inheritDoc} */
        @Override
        public void addPages() {
-               page = new AvailableFeaturesWizardPage();
+               page = new AvailableFeaturesWizardPage(termType);
                addPage(page);
        }
 

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/AvailableFeaturesWizardPage.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/AvailableFeaturesWizardPage.java
index 674a0f8674d52524fc937f431c22843b273af98f..c1e36469f76dbca415411a427096d30fe2d5495e 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/AvailableFeaturesWizardPage.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/AvailableFeaturesWizardPage.java
@@ -41,9 +41,11 @@ import eu.etaxonomy.taxeditor.store.CdmStore;
 public class AvailableFeaturesWizardPage extends WizardPage {
 
     private CheckBoxTreeComposite treeComposite;
+    private TermType termType;
 
-       protected AvailableFeaturesWizardPage() {
+       protected AvailableFeaturesWizardPage(TermType termType) {
                super("AvailableFeaturesWizardPage");
+               this.termType = termType;
                setTitle("Available Features");
                setDescription("Please select features you want to add to the tree.");
        }
@@ -52,7 +54,7 @@ public class AvailableFeaturesWizardPage extends WizardPage {
        @Override
        public void createControl(Composite parent) {
         treeComposite = new CheckBoxTreeComposite(parent, new TermDtoContentProvider(), new TermDtoLabelProvider(), SWT.NONE);
-        List<TermVocabularyDto> vocabularyDtos = CdmStore.getService(IVocabularyService.class).findVocabularyDtoByTermType(TermType.Feature);
+        List<TermVocabularyDto> vocabularyDtos = CdmStore.getService(IVocabularyService.class).findVocabularyDtoByTermType(termType);
         treeComposite.getViewer().setComparator(new DefinedTermSorter());
         treeComposite.getViewer().setInput(vocabularyDtos);
         GridLayoutFactory.fillDefaults().applyTo(treeComposite);

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 b52634116adf3baae7aa85aae6eed2b5b5f688ad..7e42205b08d78d5a1c2c1ab72fe701c0e41f5df7 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.List;
+import java.util.Collection;
 
 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.cdm.persistence.dto.TermDto;
-import eu.etaxonomy.taxeditor.featuretree.TermChooseWizard;
+import eu.etaxonomy.taxeditor.featuretree.AvailableFeaturesWizard;
 import eu.etaxonomy.taxeditor.featuretree.e4.IFeatureTreeEditor;
 import eu.etaxonomy.taxeditor.featuretree.e4.operation.AddFeatureOperation;
 import eu.etaxonomy.taxeditor.model.AbstractUtility;
@@ -50,13 +50,24 @@ public class AddChildFeatureHandler {
         }
         FeatureNode parent = (FeatureNode)selection.getFirstElement();
 
-        TermChooseWizard wizard = new TermChooseWizard(parent.getTermType());
+//        TermChooseWizard wizard = new TermChooseWizard(parent.getTermType());
+//        WizardDialog dialog = new WizardDialog(shell, wizard);
+//
+//        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);
+//            }
+//        }
+
+        AvailableFeaturesWizard wizard = new AvailableFeaturesWizard(parent.getTermType());
         WizardDialog dialog = new WizardDialog(shell, wizard);
 
         if (dialog.open() == IStatus.OK) {
-            List<TermDto> selectedTerms = wizard.getSelectedTerms();
-            for (TermDto termDto: selectedTerms) {
-                AddFeatureOperation operation = new AddFeatureOperation(termDto.getUuid(), parent, editor, editor);
+            Collection<Feature> additionalFeatures = wizard.getAdditionalFeatures();
+            for (Feature feature : additionalFeatures) {
+                AddFeatureOperation operation = new AddFeatureOperation(feature.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 001d874885feb82ac9df8a2efb5f36a38d1d20a6..5f0364ff7da65c459ea4985fd8940d1c735530fa 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
@@ -8,7 +8,7 @@
 */
 package eu.etaxonomy.taxeditor.featuretree.e4.handler;
 
-import java.util.List;
+import java.util.Collection;
 
 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.FeatureTree;
-import eu.etaxonomy.cdm.persistence.dto.TermDto;
-import eu.etaxonomy.taxeditor.featuretree.TermChooseWizard;
+import eu.etaxonomy.taxeditor.featuretree.AvailableFeaturesWizard;
 import eu.etaxonomy.taxeditor.featuretree.e4.IFeatureTreeEditor;
 import eu.etaxonomy.taxeditor.featuretree.e4.operation.AddFeatureOperation;
 import eu.etaxonomy.taxeditor.model.AbstractUtility;
@@ -48,14 +48,25 @@ public class AddFeatureHandler {
             return;
         }
         FeatureTree tree = (FeatureTree) selection.getFirstElement();
+//
+//        TermChooseWizard wizard = new TermChooseWizard(tree.getTermType());
+//        WizardDialog dialog = new WizardDialog(shell, wizard);
+//
+//        if (dialog.open() == IStatus.OK) {
+//            List<TermDto> selectedTerms = wizard.getSelectedTerms();
+//            for (TermDto termDto: selectedTerms) {
+//                AddFeatureOperation operation = new AddFeatureOperation(termDto.getUuid(), tree.getRoot(), editor, editor);
+//                AbstractUtility.executeOperation(operation, sync);
+//            }
+//        }
 
-        TermChooseWizard wizard = new TermChooseWizard(tree.getTermType());
+        AvailableFeaturesWizard wizard = new AvailableFeaturesWizard(tree.getTermType());
         WizardDialog dialog = new WizardDialog(shell, wizard);
 
         if (dialog.open() == IStatus.OK) {
-            List<TermDto> selectedTerms = wizard.getSelectedTerms();
-            for (TermDto termDto: selectedTerms) {
-                AddFeatureOperation operation = new AddFeatureOperation(termDto.getUuid(), tree.getRoot(), editor, editor);
+            Collection<Feature> additionalFeatures = wizard.getAdditionalFeatures();
+            for (Feature feature : additionalFeatures) {
+                AddFeatureOperation operation = new AddFeatureOperation(feature.getUuid(), tree.getRoot(), editor, editor);
                 AbstractUtility.executeOperation(operation, sync);
             }
         }