Revision 04cfada2
Added by Andreas Kohlbecker over 6 years ago
src/main/java/eu/etaxonomy/cdm/vaadin/ui/RegistrationUIDefaults.java | ||
---|---|---|
10 | 10 |
|
11 | 11 |
import java.util.EnumSet; |
12 | 12 |
|
13 |
import eu.etaxonomy.cdm.model.name.NomenclaturalCode; |
|
13 | 14 |
import eu.etaxonomy.cdm.model.reference.ReferenceType; |
14 | 15 |
|
15 | 16 |
/** |
... | ... | |
46 | 47 |
ReferenceType.Report |
47 | 48 |
); |
48 | 49 |
|
50 |
/** |
|
51 |
* TODO make configurable as preset and in TaxonNameEditor |
|
52 |
*/ |
|
53 |
public static final NomenclaturalCode NOMENCLATURAL_CODE = NomenclaturalCode.ICNAFP; |
|
49 | 54 |
} |
src/main/java/eu/etaxonomy/cdm/vaadin/view/name/TaxonNameEditorPresenter.java | ||
---|---|---|
41 | 41 |
import eu.etaxonomy.cdm.vaadin.event.TaxonNameEditorAction; |
42 | 42 |
import eu.etaxonomy.cdm.vaadin.event.ToOneRelatedEntityButtonUpdater; |
43 | 43 |
import eu.etaxonomy.cdm.vaadin.security.UserHelper; |
44 |
import eu.etaxonomy.cdm.vaadin.ui.RegistrationUIDefaults; |
|
44 | 45 |
import eu.etaxonomy.cdm.vaadin.util.CdmTitleCacheCaptionGenerator; |
45 | 46 |
import eu.etaxonomy.cdm.vaadin.view.reference.ReferencePopupEditor; |
46 | 47 |
import eu.etaxonomy.vaadin.mvp.AbstractCdmEditorPresenter; |
... | ... | |
157 | 158 |
if(identifier != null){ |
158 | 159 |
taxonName = getRepo().getNameService().load(identifier, initStrategy); |
159 | 160 |
} else { |
160 |
taxonName = TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES());
|
|
161 |
taxonName = TaxonNameFactory.NewNameInstance(RegistrationUIDefaults.NOMENCLATURAL_CODE, Rank.SPECIES());
|
|
161 | 162 |
} |
162 | 163 |
|
163 | 164 |
if(getView().isModeEnabled(TaxonNamePopupEditorMode.nomenclaturalReferenceSectionEditingOnly)){ |
src/main/java/eu/etaxonomy/cdm/vaadin/view/registration/RegistrationWorkingsetPresenter.java | ||
---|---|---|
51 | 51 |
import eu.etaxonomy.cdm.vaadin.model.EntityReference; |
52 | 52 |
import eu.etaxonomy.cdm.vaadin.model.registration.RegistrationWorkingSet; |
53 | 53 |
import eu.etaxonomy.cdm.vaadin.security.UserHelper; |
54 |
import eu.etaxonomy.cdm.vaadin.ui.RegistrationUIDefaults; |
|
54 | 55 |
import eu.etaxonomy.cdm.vaadin.util.CdmTitleCacheCaptionGenerator; |
55 | 56 |
import eu.etaxonomy.cdm.vaadin.util.converter.TypeDesignationSetManager.TypeDesignationWorkingSetType; |
56 | 57 |
import eu.etaxonomy.cdm.vaadin.view.name.SpecimenTypeDesignationWorkingsetPopupEditor; |
... | ... | |
259 | 260 |
return; |
260 | 261 |
} |
261 | 262 |
|
262 |
newTaxonNameForRegistration = TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES());
|
|
263 |
newTaxonNameForRegistration = TaxonNameFactory.NewNameInstance(RegistrationUIDefaults.NOMENCLATURAL_CODE, Rank.SPECIES());
|
|
263 | 264 |
newTaxonNameForRegistration.setNomenclaturalReference(getRepo().getReferenceService().find(workingset.getCitationId())); |
264 | 265 |
EntityChangeEvent nameSaveEvent = getTaxonNameStore().saveBean(newTaxonNameForRegistration); |
265 | 266 |
newTaxonNameForRegistration = getRepo().getNameService().find(nameSaveEvent.getEntityId()); |
Also available in: Unified diff
making use of new TaxonNameFactory.NewNameInstance method