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/occurrence/FieldObservationDetailElement.java
11 11
package eu.etaxonomy.taxeditor.ui.section.occurrence;
12 12

  
13 13
import eu.etaxonomy.cdm.api.facade.DerivedUnitFacade;
14
import eu.etaxonomy.cdm.model.description.Sex;
15
import eu.etaxonomy.cdm.model.description.Stage;
14 16
import eu.etaxonomy.taxeditor.store.CdmStore;
17
import eu.etaxonomy.taxeditor.ui.combo.TermComboElement;
15 18
import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
16
import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.TermComboType;
17
import eu.etaxonomy.taxeditor.ui.forms.CdmPropertyChangeEvent;
18 19
import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
19 20
import eu.etaxonomy.taxeditor.ui.forms.NumberWithLabelElement;
20 21
import eu.etaxonomy.taxeditor.ui.forms.TextWithLabelElement;
21 22
import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement;
22
import eu.etaxonomy.taxeditor.ui.term.SexComboElement;
23
import eu.etaxonomy.taxeditor.ui.term.StageComboElement;
24 23

  
25 24
/**
26 25
 * <p>FieldObservationDetailElement class.</p>
......
41 40

  
42 41
	private NumberWithLabelElement number_individualCount;
43 42

  
44
	private SexComboElement combo_sex;
43
	private TermComboElement<Sex> combo_sex;
45 44

  
46
	private StageComboElement combo_lifeStage;
45
	private TermComboElement<Stage> combo_lifeStage;
47 46
	
48 47
	/**
49 48
	 * <p>Constructor for FieldObservationDetailElement.</p>
......
67 66
		text_fieldNotes = formFactory.createTextWithLabelElement(formElement, "Field Notes", entity.getFieldNotes(), style);
68 67
		
69 68
		number_individualCount = formFactory.createIntegerTextWithLabelElement(formElement, "Individual Count", entity.getIndividualCount(), style);
70
		combo_lifeStage = (StageComboElement) formFactory.createTermComboElement(TermComboType.STAGE, formElement, "Life Stage", entity.getLifeStage(), style);
71
		combo_sex = (SexComboElement) formFactory.createTermComboElement(TermComboType.SEX, formElement, "Sex", entity.getSex(), style);
69
		combo_lifeStage = formFactory.createTermComboElement(Stage.class, formElement, "Life Stage", entity.getLifeStage(), style);
70
		combo_sex = formFactory.createTermComboElement(Sex.class, formElement, "Sex", entity.getSex(), style);
72 71
	}
73 72

  
74 73
	/** {@inheritDoc} */

Also available in: Unified diff