Project

General

Profile

« Previous | Next » 

Revision b9a0d300

Added by Lorna Morris over 12 years ago

Committing changes to definedtermeditor after merge from branch

View differences:

eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NameDetailElement.java
19 19
import eu.etaxonomy.cdm.model.name.Rank;
20 20
import eu.etaxonomy.cdm.model.name.ZoologicalName;
21 21
import eu.etaxonomy.cdm.strategy.parser.ParserProblem;
22
import eu.etaxonomy.taxeditor.ui.combo.TermComboElement;
22 23
import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
23
import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.TermComboType;
24 24
import eu.etaxonomy.taxeditor.ui.forms.CheckboxElement;
25 25
import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
26 26
import eu.etaxonomy.taxeditor.ui.forms.IEnableableFormElement;
......
29 29
import eu.etaxonomy.taxeditor.ui.forms.SelectionArbitrator;
30 30
import eu.etaxonomy.taxeditor.ui.forms.TextWithLabelElement;
31 31
import eu.etaxonomy.taxeditor.ui.section.AbstractIdentifiableEntityDetailElement;
32
import eu.etaxonomy.taxeditor.ui.term.AbstractTermComboElement;
33 32

  
34 33
/**
35 34
 * <p>NameDetailElement class.</p>
......
40 39
 */
41 40
public class NameDetailElement extends AbstractIdentifiableEntityDetailElement<NonViralName> implements ISelectableElement, IEnableableFormElement{
42 41

  
43
	private AbstractTermComboElement<Rank> combo_rank;
42
	private TermComboElement<Rank> combo_rank;
44 43
	private TextWithLabelElement text_appendedPhrase;
45 44
	private TextWithLabelElement text_uninomial;
46 45
	private TextWithLabelElement text_infragenericEpithet;
......
75 74
		
76 75
		toggleable_cache = formFactory.createToggleableTextField(this, "Name Cache", nonViralName.getNameCache(), nonViralName.isProtectedNameCache(), style);
77 76
		
78
		combo_rank = formFactory.createTermComboElement(TermComboType.RANK, this, "Rank", nonViralName.getRank(), style);
77
		combo_rank = formFactory.createTermComboElement(Rank.class, this, "Rank", nonViralName.getRank(), style);
79 78

  
80 79
		createGenusOrUninomialControls(this, nonViralName, style);
81 80
		createInfragenerericEpithetControls(this, nonViralName, style);

Also available in: Unified diff