Project

General

Profile

« Previous | Next » 

Revision daeb8ba2

Added by Patrick Plitzner about 5 years ago

ref #8146 Adapt "add term wizard" to termType restriction

View differences:

eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/AvailableFeaturesWizard.java
13 13

  
14 14
import org.eclipse.jface.wizard.Wizard;
15 15

  
16
import eu.etaxonomy.cdm.model.term.DefinedTermBase;
16 17
import eu.etaxonomy.cdm.model.term.TermType;
17
import eu.etaxonomy.cdm.model.description.Feature;
18 18

  
19 19
/**
20 20
 * <p>AvailableFeaturesWizard class.</p>
......
27 27

  
28 28
	private AvailableFeaturesWizardPage page;
29 29

  
30
	private Set<Feature> additionalFeatures;
30
	private Set<DefinedTermBase> additionalFeatures;
31 31

  
32 32
    private TermType termType;
33 33

  
......
49 49
		return additionalFeatures.size() > 0;
50 50
	}
51 51

  
52
	public Set<Feature> getAdditionalFeatures() {
52
	public Set<DefinedTermBase> getAdditionalFeatures() {
53 53
		return additionalFeatures;
54 54
	}
55 55
}
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/AvailableFeaturesWizardPage.java
24 24
import eu.etaxonomy.cdm.api.service.IVocabularyService;
25 25
import eu.etaxonomy.cdm.model.term.DefinedTermBase;
26 26
import eu.etaxonomy.cdm.model.term.TermType;
27
import eu.etaxonomy.cdm.model.description.Feature;
28 27
import eu.etaxonomy.cdm.persistence.dto.TermDto;
29 28
import eu.etaxonomy.cdm.persistence.dto.TermVocabularyDto;
30 29
import eu.etaxonomy.taxeditor.editor.definedterm.DefinedTermSorter;
......
44 43
    private TermType termType;
45 44

  
46 45
	protected AvailableFeaturesWizardPage(TermType termType) {
47
		super("AvailableFeaturesWizardPage");
46
		super("Available Terms Wizard Page");
48 47
		this.termType = termType;
49
		setTitle("Available Features");
50
		setDescription("Please select features you want to add to the tree.");
48
		setTitle("Available Terms");
49
		setDescription("Please select terms you want to add to the tree.");
51 50
	}
52 51

  
53 52
	/** {@inheritDoc} */
......
62 61
		setControl(treeComposite);
63 62
	}
64 63

  
65
	public Set<Feature> getSelectedFeatures() {
64
	public Set<DefinedTermBase> getSelectedFeatures() {
66 65

  
67 66
        List<Object> checkedElements = Arrays.asList(treeComposite.getViewer().getCheckedElements());
68 67
        checkedElements = checkedElements.stream().filter(element->element instanceof TermDto).collect(Collectors.toList());
69 68

  
70
		Set<Feature> features = new HashSet<Feature>();
69
		Set<DefinedTermBase> terms = new HashSet<>();
71 70

  
72 71
		for(Object element : checkedElements){
73 72
		    if(element instanceof TermDto){
74
		        DefinedTermBase feature = CdmStore.getService(ITermService.class).load(((TermDto) element).getUuid());
75
		        features.add((Feature) feature);
73
		        DefinedTermBase term = CdmStore.getService(ITermService.class).load(((TermDto) element).getUuid());
74
		        terms.add(term);
76 75
		    }
77 76
		}
78
		return features;
77
		return terms;
79 78
	}
80 79

  
81 80
}
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/handler/AddChildFeatureHandler.java
24 24
import org.eclipse.jface.wizard.WizardDialog;
25 25
import org.eclipse.swt.widgets.Shell;
26 26

  
27
import eu.etaxonomy.cdm.model.description.Feature;
27
import eu.etaxonomy.cdm.model.term.DefinedTermBase;
28 28
import eu.etaxonomy.cdm.model.term.FeatureNode;
29 29
import eu.etaxonomy.taxeditor.featuretree.AvailableFeaturesWizard;
30 30
import eu.etaxonomy.taxeditor.featuretree.e4.IFeatureTreeEditor;
......
65 65
        WizardDialog dialog = new WizardDialog(shell, wizard);
66 66

  
67 67
        if (dialog.open() == IStatus.OK) {
68
            Collection<Feature> additionalFeatures = wizard.getAdditionalFeatures();
69
            for (Feature feature : additionalFeatures) {
70
                AddFeatureOperation operation = new AddFeatureOperation(feature.getUuid(), parent, editor, editor);
68
            Collection<DefinedTermBase> additionalTerms = wizard.getAdditionalFeatures();
69
            for (DefinedTermBase term : additionalTerms) {
70
                AddFeatureOperation operation = new AddFeatureOperation(term.getUuid(), parent, editor, editor);
71 71
                AbstractUtility.executeOperation(operation, sync);
72 72
            }
73 73
        }
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/handler/AddFeatureHandler.java
24 24
import org.eclipse.jface.wizard.WizardDialog;
25 25
import org.eclipse.swt.widgets.Shell;
26 26

  
27
import eu.etaxonomy.cdm.model.description.Feature;
27
import eu.etaxonomy.cdm.model.term.DefinedTermBase;
28 28
import eu.etaxonomy.cdm.model.term.FeatureTree;
29 29
import eu.etaxonomy.taxeditor.featuretree.AvailableFeaturesWizard;
30 30
import eu.etaxonomy.taxeditor.featuretree.e4.IFeatureTreeEditor;
......
64 64
        WizardDialog dialog = new WizardDialog(shell, wizard);
65 65

  
66 66
        if (dialog.open() == IStatus.OK) {
67
            Collection<Feature> additionalFeatures = wizard.getAdditionalFeatures();
68
            for (Feature feature : additionalFeatures) {
69
                AddFeatureOperation operation = new AddFeatureOperation(feature.getUuid(), tree.getRoot(), editor, editor);
67
            Collection<DefinedTermBase> additionalTerms = wizard.getAdditionalFeatures();
68
            for (DefinedTermBase term : additionalTerms) {
69
                AddFeatureOperation operation = new AddFeatureOperation(term.getUuid(), tree.getRoot(), editor, editor);
70 70
                AbstractUtility.executeOperation(operation, sync);
71 71
            }
72 72
        }

Also available in: Unified diff