Revision 8ea93946
Added by Andreas Müller about 3 years ago
| eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewTaxonNodeWizard.java | ||
|---|---|---|
| 21 | 21 |
import eu.etaxonomy.cdm.api.service.dto.CreateTaxonDTO; |
| 22 | 22 |
import eu.etaxonomy.cdm.model.common.Language; |
| 23 | 23 |
import eu.etaxonomy.cdm.model.common.LanguageString; |
| 24 |
import eu.etaxonomy.cdm.model.description.DescriptionElementSource;
|
|
| 24 |
import eu.etaxonomy.cdm.model.reference.NamedSource;
|
|
| 25 | 25 |
import eu.etaxonomy.cdm.model.taxon.ITaxonTreeNode; |
| 26 | 26 |
import eu.etaxonomy.cdm.model.taxon.TaxonNode; |
| 27 | 27 |
import eu.etaxonomy.cdm.model.taxon.TaxonNodeStatus; |
| ... | ... | |
| 70 | 70 |
TaxonNode parent = getParentEntity(); |
| 71 | 71 |
|
| 72 | 72 |
Map<Language, LanguageString> notes = ((TaxonNodeDetailElement)taxonNodePage.getDetailElement()).getMultiLanguageTextExcludedNotes(); |
| 73 |
DescriptionElementSource source = parent.getSource().checkEmpty()? null: parent.getSource(); |
|
| 74 |
|
|
| 73 |
NamedSource source = parent.getSource().checkEmpty()? null: parent.getSource(); |
|
| 75 | 74 |
|
| 76 | 75 |
TaxonNodeStatus status = ((TaxonNodeDetailElement)taxonNodePage.getDetailElement()).getTaxonNodeStatus(); |
| 77 | 76 |
if (status == null){
|
| eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/classification/TaxonNodeDetailElement.java | ||
|---|---|---|
| 25 | 25 |
import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper; |
| 26 | 26 |
import eu.etaxonomy.cdm.model.common.Language; |
| 27 | 27 |
import eu.etaxonomy.cdm.model.common.LanguageString; |
| 28 |
import eu.etaxonomy.cdm.model.description.DescriptionElementSource; |
|
| 29 | 28 |
import eu.etaxonomy.cdm.model.metadata.CdmPreference; |
| 30 | 29 |
import eu.etaxonomy.cdm.model.metadata.PreferencePredicate; |
| 31 | 30 |
import eu.etaxonomy.cdm.model.metadata.PublishEnum; |
| 32 | 31 |
import eu.etaxonomy.cdm.model.name.TaxonName; |
| 32 |
import eu.etaxonomy.cdm.model.reference.NamedSource; |
|
| 33 | 33 |
import eu.etaxonomy.cdm.model.reference.Reference; |
| 34 | 34 |
import eu.etaxonomy.cdm.model.taxon.Classification; |
| 35 | 35 |
import eu.etaxonomy.cdm.model.taxon.Taxon; |
| ... | ... | |
| 246 | 246 |
multiLanguageTextStatusNotes.setIndent(10); |
| 247 | 247 |
singleSourceSection = formFactory.createOriginalSourceElement(formElement, entity, ""); |
| 248 | 248 |
if (isCreateNew() || entity.getSource() == null){
|
| 249 |
DescriptionElementSource source = DescriptionElementSource.NewPrimarySourceInstance(null, null);
|
|
| 249 |
NamedSource source = NamedSource.NewPrimarySourceInstance(null, null);
|
|
| 250 | 250 |
entity.setSource(source); |
| 251 | 251 |
singleSourceSection.setEntity(source); |
| 252 | 252 |
}else{
|
| eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/AbstractTypeDesignationElement.java | ||
|---|---|---|
| 99 | 99 |
} |
| 100 | 100 |
} |
| 101 | 101 |
if (entity.hasDesignationSource()){
|
| 102 |
singleSourceElement.setEntity(entity.getSource(true)); |
|
| 102 |
singleSourceElement.setEntity(entity.getDesignationSource(true));
|
|
| 103 | 103 |
} |
| 104 | 104 |
sourceSection = formFactory.createSourceSection(getConversationHolder(), formElement, StoreUtil.getSectionStyle(SourceSection.class, IdentifiableSource.class.getCanonicalName())); |
| 105 | 105 |
sourceSection.setLayoutData(LayoutConstants.FILL_HORIZONTALLY(2, 1)); |
| eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NameTypeDesignationElement.java | ||
|---|---|---|
| 12 | 12 |
import org.eclipse.swt.events.SelectionListener; |
| 13 | 13 |
|
| 14 | 14 |
import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper; |
| 15 |
import eu.etaxonomy.cdm.model.description.DescriptionElementSource; |
|
| 16 | 15 |
import eu.etaxonomy.cdm.model.name.NameTypeDesignation; |
| 17 | 16 |
import eu.etaxonomy.cdm.model.name.NameTypeDesignationStatus; |
| 18 | 17 |
import eu.etaxonomy.cdm.model.name.TaxonName; |
| 18 |
import eu.etaxonomy.cdm.model.reference.NamedSource; |
|
| 19 | 19 |
import eu.etaxonomy.cdm.model.term.TermType; |
| 20 | 20 |
import eu.etaxonomy.taxeditor.l10n.Messages; |
| 21 | 21 |
import eu.etaxonomy.taxeditor.model.MessagingUtils; |
| ... | ... | |
| 103 | 103 |
} |
| 104 | 104 |
getEntity().setTypeStatus(combo_typeStatus.getSelection()); |
| 105 | 105 |
if (getEntity().hasDesignationSource()){
|
| 106 |
DescriptionElementSource source = DescriptionElementSource.NewPrimarySourceInstance(null, null);
|
|
| 107 |
entity.setSource(source); |
|
| 106 |
NamedSource source = NamedSource.NewPrimarySourceInstance(null, null);
|
|
| 107 |
entity.setDesignationSource(source);
|
|
| 108 | 108 |
} |
| 109 | 109 |
|
| 110 | 110 |
setEntity(entity); |
| eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/SpecimenTypeDesignationElement.java | ||
|---|---|---|
| 12 | 12 |
|
| 13 | 13 |
import eu.etaxonomy.cdm.compare.name.TypeDesignationStatusComparator; |
| 14 | 14 |
import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper; |
| 15 |
import eu.etaxonomy.cdm.model.description.DescriptionElementSource; |
|
| 16 | 15 |
import eu.etaxonomy.cdm.model.name.SpecimenTypeDesignation; |
| 17 | 16 |
import eu.etaxonomy.cdm.model.name.SpecimenTypeDesignationStatus; |
| 18 | 17 |
import eu.etaxonomy.cdm.model.occurrence.DerivedUnit; |
| 19 | 18 |
import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationType; |
| 19 |
import eu.etaxonomy.cdm.model.reference.NamedSource; |
|
| 20 | 20 |
import eu.etaxonomy.cdm.model.term.TermType; |
| 21 | 21 |
import eu.etaxonomy.taxeditor.l10n.Messages; |
| 22 | 22 |
import eu.etaxonomy.taxeditor.model.MessagingUtils; |
| ... | ... | |
| 86 | 86 |
} |
| 87 | 87 |
getEntity().setTypeStatus(combo_typeStatus.getSelection()); |
| 88 | 88 |
if (entity.hasDesignationSource()){
|
| 89 |
DescriptionElementSource source = DescriptionElementSource.NewPrimarySourceInstance(null, null);
|
|
| 90 |
entity.setSource(source); |
|
| 89 |
NamedSource source = NamedSource.NewPrimarySourceInstance(null, null);
|
|
| 90 |
entity.setDesignationSource(source);
|
|
| 91 | 91 |
} |
| 92 | 92 |
setEntity(entity); |
| 93 | 93 |
|
| eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/reference/NomenclaturalReferenceDetailSection.java | ||
|---|---|---|
| 13 | 13 |
|
| 14 | 14 |
import eu.etaxonomy.cdm.api.conversation.ConversationHolder; |
| 15 | 15 |
import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper; |
| 16 |
import eu.etaxonomy.cdm.model.description.DescriptionElementSource;
|
|
| 16 |
import eu.etaxonomy.cdm.model.name.NomenclaturalSource;
|
|
| 17 | 17 |
import eu.etaxonomy.cdm.model.name.TaxonName; |
| 18 | 18 |
import eu.etaxonomy.cdm.model.taxon.TaxonBase; |
| 19 | 19 |
import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory; |
| ... | ... | |
| 63 | 63 |
protected void setSectionTitle() {
|
| 64 | 64 |
String title = ""; |
| 65 | 65 |
if(getEntity() != null && getEntity().getNomenclaturalSource() != null){
|
| 66 |
DescriptionElementSource reference = getEntity().getNomenclaturalSource();
|
|
| 66 |
NomenclaturalSource reference = getEntity().getNomenclaturalSource();
|
|
| 67 | 67 |
if (reference != null && reference.getCitation() != null){
|
| 68 | 68 |
String nomenclaturalCitation = reference.getCitation().getNomenclaturalCitation(reference.getCitationMicroReference()); |
| 69 | 69 |
title = ": " + nomenclaturalCitation; |
| eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/AbstractSingleSourceElement.java | ||
|---|---|---|
| 9 | 9 |
package eu.etaxonomy.taxeditor.ui.section.supplemental; |
| 10 | 10 |
|
| 11 | 11 |
import eu.etaxonomy.cdm.model.common.SingleSourcedEntityBase; |
| 12 |
import eu.etaxonomy.cdm.model.description.DescriptionElementSource;
|
|
| 12 |
import eu.etaxonomy.cdm.model.reference.NamedSource;
|
|
| 13 | 13 |
import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory; |
| 14 | 14 |
import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement; |
| 15 | 15 |
import eu.etaxonomy.taxeditor.ui.element.ISelectableElement; |
| ... | ... | |
| 54 | 54 |
public void createControls(ICdmFormElement formElement, T entity, int style) {
|
| 55 | 55 |
singleSourceSection = formFactory.createOriginalSourceElement(formElement, entity, label); |
| 56 | 56 |
if (entity.getSource() == null){
|
| 57 |
DescriptionElementSource source = DescriptionElementSource.NewPrimarySourceInstance(null, null);
|
|
| 57 |
NamedSource source = NamedSource.NewPrimarySourceInstance(null, null);
|
|
| 58 | 58 |
entity.setSource(source); |
| 59 | 59 |
singleSourceSection.setEntity(source); |
| 60 | 60 |
}else{
|
| eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/AbstractSourcedEntityElement.java | ||
|---|---|---|
| 11 | 11 |
import org.eclipse.swt.events.SelectionListener; |
| 12 | 12 |
|
| 13 | 13 |
import eu.etaxonomy.cdm.model.common.SingleSourcedEntityBase; |
| 14 |
import eu.etaxonomy.cdm.model.description.DescriptionElementSource;
|
|
| 14 |
import eu.etaxonomy.cdm.model.reference.NamedSource;
|
|
| 15 | 15 |
import eu.etaxonomy.taxeditor.ui.element.AbstractFormSection; |
| 16 | 16 |
import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory; |
| 17 | 17 |
import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement; |
| ... | ... | |
| 61 | 61 |
sourceElement = formFactory.createOriginalSourceElement(formElement, entity, label); |
| 62 | 62 |
|
| 63 | 63 |
if (entity.getSource() == null){
|
| 64 |
DescriptionElementSource source = DescriptionElementSource.NewPrimarySourceInstance(null, null);
|
|
| 64 |
NamedSource source = NamedSource.NewPrimarySourceInstance(null, null);
|
|
| 65 | 65 |
entity.setSource(source); |
| 66 | 66 |
sourceElement.setEntity(source); |
| 67 | 67 |
}else{
|
Also available in: Unified diff
ref #9332 adapt TaxEditor code to .designationSource