cleanup

[taxeditor.git] / eu.etaxonomy.taxeditor.store / src / main / java / eu / etaxonomy / taxeditor / featuretree / AvailableFeaturesWizardPage.java

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 bdd7df8b798f9f0f048ad743b91a60e760c0a006..84dc238a28e2e71257ce1042510c580507bd78e7 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
@@ -15,15 +15,13 @@ import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
 
 import java.util.Set;
 import java.util.stream.Collectors;
 

-import org.eclipse.jface.layout.GridLayoutFactory;

 import org.eclipse.jface.wizard.WizardPage;
 import org.eclipse.swt.SWT;
 import org.eclipse.jface.wizard.WizardPage;
 import org.eclipse.swt.SWT;

+import org.eclipse.swt.layout.GridData;

 import org.eclipse.swt.widgets.Composite;
 
 import eu.etaxonomy.cdm.api.service.ITermService;
 import org.eclipse.swt.widgets.Composite;
 
 import eu.etaxonomy.cdm.api.service.ITermService;

-import eu.etaxonomy.cdm.api.service.IVocabularyService;

 import eu.etaxonomy.cdm.model.term.DefinedTermBase;
 import eu.etaxonomy.cdm.model.term.DefinedTermBase;

-import eu.etaxonomy.cdm.model.term.TermType;

 import eu.etaxonomy.cdm.persistence.dto.TermDto;
 import eu.etaxonomy.cdm.persistence.dto.TermVocabularyDto;
 import eu.etaxonomy.taxeditor.editor.definedterm.DefinedTermSorter;
 import eu.etaxonomy.cdm.persistence.dto.TermDto;
 import eu.etaxonomy.cdm.persistence.dto.TermVocabularyDto;
 import eu.etaxonomy.taxeditor.editor.definedterm.DefinedTermSorter;


@@ -40,23 +38,28 @@ import eu.etaxonomy.taxeditor.store.CdmStore;
 public class AvailableFeaturesWizardPage extends WizardPage {
 
     private CheckBoxTreeComposite treeComposite;
 public class AvailableFeaturesWizardPage extends WizardPage {
 
     private CheckBoxTreeComposite treeComposite;

-    private TermType termType;
+    private List<TermVocabularyDto> vocabularies;

 
 

-       protected AvailableFeaturesWizardPage(TermType termType) {
+       protected AvailableFeaturesWizardPage(List<TermVocabularyDto> vocabularies, boolean singleSelection) {

                super("Available Terms Wizard Page");
                super("Available Terms Wizard Page");

-               this.termType = termType;
+               this.vocabularies = vocabularies;

                setTitle("Available Terms");
                setTitle("Available Terms");

-               setDescription("Please select terms you want to add to the tree.");
+               if(singleSelection){
+                   setDescription("Please select one single term");
+               }
+               else{
+                   setDescription("Please select terms.");
+               }

        }
 
        /** {@inheritDoc} */
        @Override
        public void createControl(Composite parent) {
         treeComposite = new CheckBoxTreeComposite(parent, new TermDtoContentProvider(), new TermDtoLabelProvider(), SWT.NONE);
        }
 
        /** {@inheritDoc} */
        @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);

         treeComposite.getViewer().setComparator(new DefinedTermSorter());
         treeComposite.getViewer().setComparator(new DefinedTermSorter());

-        treeComposite.getViewer().setInput(vocabularyDtos);
-        GridLayoutFactory.fillDefaults().applyTo(treeComposite);
+        treeComposite.getViewer().setInput(vocabularies);
+        treeComposite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 1, 1));
+        treeComposite.getViewer().addSelectionChangedListener(e->getWizard().getContainer().updateButtons());

 
                setControl(treeComposite);
        }
 
                setControl(treeComposite);
        }