Project

General

Profile

« Previous | Next » 

Revision 23783f7a

Added by Niels Hoffmann over 12 years ago

Refactoring of selection elements. Additional minor refactoring. Fixed a bug with Translation Editor (#2752)

View differences:

eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/key/PolytomousKeyNodeDetailElement.java
3 3
 */
4 4
package eu.etaxonomy.taxeditor.ui.section.key;
5 5

  
6
import eu.etaxonomy.cdm.model.description.Feature;
7
import eu.etaxonomy.cdm.model.description.PolytomousKey;
6 8
import eu.etaxonomy.cdm.model.description.PolytomousKeyNode;
9
import eu.etaxonomy.cdm.model.taxon.Taxon;
7 10
import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
8
import eu.etaxonomy.taxeditor.ui.element.CdmPropertyChangeEvent;
9 11
import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement;
10 12
import eu.etaxonomy.taxeditor.ui.element.KeyStatementElement;
11 13
import eu.etaxonomy.taxeditor.ui.element.NumberWithLabelElement;
12
import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory.SelectionType;
13 14
import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement;
14
import eu.etaxonomy.taxeditor.ui.selection.FeatureSelectionElement;
15
import eu.etaxonomy.taxeditor.ui.selection.PolytomousKeyNodeSelectionElement;
16
import eu.etaxonomy.taxeditor.ui.selection.PolytomousKeySelectionElement;
17
import eu.etaxonomy.taxeditor.ui.selection.TaxonSelectionElement;
15
import eu.etaxonomy.taxeditor.ui.selection.EntitySelectionElement;
18 16

  
19 17
/**
20 18
 * @author n.hoffmann
......
25 23

  
26 24
	private KeyStatementElement element_statement;
27 25

  
28
	private FeatureSelectionElement selection_feature;
26
	private EntitySelectionElement<Feature> selection_feature;
29 27

  
30
	private TaxonSelectionElement selection_taxon;
28
	private EntitySelectionElement<Taxon> selection_taxon;
31 29

  
32
	private PolytomousKeySelectionElement selection_subkey;
30
	private EntitySelectionElement<PolytomousKey> selection_subkey;
33 31

  
34
	private PolytomousKeyNodeSelectionElement selection_otherNode;
32
	private EntitySelectionElement<PolytomousKeyNode> selection_otherNode;
35 33

  
36 34
	private KeyStatementElement element_question;
37 35

  
......
56 54
			element_question = formFactory.createKeyStatementElement(
57 55
					formElement, "Question", parent.getQuestion(), 50, style);
58 56

  
59
			selection_feature = (FeatureSelectionElement) formFactory
60
					.createSelectionElement(SelectionType.FEATURE,
57
			selection_feature = formFactory
58
					.createSelectionElement(Feature.class,
61 59
							getConversationHolder(), formElement, "Feature",
62 60
							parent.getFeature(),
63
							FeatureSelectionElement.DEFAULT, style);
61
							EntitySelectionElement.EDITABLE | EntitySelectionElement.DELETABLE, style);
64 62
		}
65 63

  
66 64
		element_statement = formFactory.createKeyStatementElement(formElement,
67 65
				"Statement", entity.getStatement(), 50, style);
68 66

  
69 67
		if (entity.isLeaf()) {
70
			selection_taxon = (TaxonSelectionElement) formFactory
71
					.createSelectionElement(SelectionType.TAXON,
68
			selection_taxon = formFactory
69
					.createSelectionElement(Taxon.class,
72 70
							getConversationHolder(), formElement, "Taxon",
73
							entity.getTaxon(), TaxonSelectionElement.DELETABLE,
71
							entity.getTaxon(), EntitySelectionElement.NOTHING,
74 72
							style);
75 73
		}
76 74

  
77
		selection_subkey = (PolytomousKeySelectionElement) formFactory
78
				.createSelectionElement(SelectionType.POLYTOMOUS_KEY,
75
		selection_subkey = formFactory
76
				.createSelectionElement(PolytomousKey.class,
79 77
						getConversationHolder(), formElement, "Subkey",
80 78
						entity.getSubkey(),
81
						PolytomousKeySelectionElement.DEFAULT, style);
79
						EntitySelectionElement.EDITABLE | EntitySelectionElement.DELETABLE, style);
82 80

  
83
		selection_otherNode = (PolytomousKeyNodeSelectionElement) formFactory
84
				.createSelectionElement(SelectionType.POLYTOMOUS_KEY_NODE,
81
		selection_otherNode = formFactory
82
				.createSelectionElement(PolytomousKeyNode.class,
85 83
						getConversationHolder(), formElement, "Other Node",
86 84
						entity.getOtherNode(),
87
						PolytomousKeyNodeSelectionElement.DEFAULT, style);
85
						EntitySelectionElement.DELETABLE, style);
88 86

  
89 87
		formFactory.createMultiLanguageTextElement(formElement,
90 88
				"Modifying Text", entity.getModifyingText(), 50, style);

Also available in: Unified diff