Project

General

Profile

« Previous | Next » 

Revision e3a4a3ff

Added by Andreas Müller almost 7 years ago

ref #6446 merge taxon name subclasses in TaxEditor

View differences:

eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NameTypeDesignationElement.java
15 15
import eu.etaxonomy.cdm.model.common.TermType;
16 16
import eu.etaxonomy.cdm.model.name.NameTypeDesignation;
17 17
import eu.etaxonomy.cdm.model.name.NameTypeDesignationStatus;
18
import eu.etaxonomy.cdm.model.name.TaxonNameBase;
18
import eu.etaxonomy.cdm.model.name.TaxonName;
19 19
import eu.etaxonomy.taxeditor.ui.combo.TermComboElement;
20 20
import eu.etaxonomy.taxeditor.ui.element.AbstractFormSection;
21 21
import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
......
34 34

  
35 35
	private CheckboxElement checkbox_rejectedType;
36 36
	private CheckboxElement checkbox_conservedType;
37
	private EntitySelectionElement<TaxonNameBase> selection_typeName;
37
	private EntitySelectionElement<TaxonName> selection_typeName;
38 38
	private TermComboElement<NameTypeDesignationStatus> combo_typeStatus;
39 39

  
40 40
	public NameTypeDesignationElement(CdmFormFactory formFactory,
......
52 52
		checkbox_conservedType = formFactory.createCheckbox(formElement,
53 53
				"Conserved Type", false, style);
54 54
		selection_typeName = formFactory
55
				.createSelectionElement(TaxonNameBase.class,
55
				.createSelectionElement(TaxonName.class,
56 56
						getConversationHolder(), formElement, "Name", null,
57 57
						EntitySelectionElement.ALL, style);
58 58
		combo_typeStatus = formFactory.createDefinedTermComboElement(TermType.NameTypeDesignationStatus, formElement,
......
68 68
		checkbox_conservedType.setSelection(entity.isConservedType());
69 69
		checkbox_rejectedType.setSelection(entity.isRejectedType());
70 70

  
71
		selection_typeName.setEntity((TaxonNameBase) HibernateProxyHelper.deproxy(entity.getTypeName()));
71
		selection_typeName.setEntity((TaxonName) HibernateProxyHelper.deproxy(entity.getTypeName()));
72 72

  
73 73
		combo_typeStatus.setSelection(HibernateProxyHelper.deproxy(entity.getTypeStatus(), NameTypeDesignationStatus.class));
74 74

  

Also available in: Unified diff