Revision bd5b538f
Added by Katja Luther almost 3 years ago
| 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; |
|
| 15 | 16 |
import eu.etaxonomy.cdm.model.name.NameTypeDesignation; |
| 16 | 17 |
import eu.etaxonomy.cdm.model.name.NameTypeDesignationStatus; |
| 17 | 18 |
import eu.etaxonomy.cdm.model.name.TaxonName; |
| ... | ... | |
| 102 | 103 |
} |
| 103 | 104 |
} |
| 104 | 105 |
getEntity().setTypeStatus(combo_typeStatus.getSelection()); |
| 106 |
if (getEntity().hasDesignationSource()){
|
|
| 107 |
DescriptionElementSource source = DescriptionElementSource.NewPrimarySourceInstance(null, null); |
|
| 108 |
entity.setSource(source); |
|
| 109 |
} |
|
| 105 | 110 |
|
| 106 | 111 |
setEntity(entity); |
| 107 | 112 |
} else if (eventSource == checkbox_notDesignated) {
|
| eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/SpecimenTypeDesignationElement.java | ||
|---|---|---|
| 13 | 13 |
|
| 14 | 14 |
import eu.etaxonomy.cdm.api.service.name.TypeDesignationStatusComparator; |
| 15 | 15 |
import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper; |
| 16 |
import eu.etaxonomy.cdm.model.description.DescriptionElementSource; |
|
| 16 | 17 |
import eu.etaxonomy.cdm.model.name.SpecimenTypeDesignation; |
| 17 | 18 |
import eu.etaxonomy.cdm.model.name.SpecimenTypeDesignationStatus; |
| 18 | 19 |
import eu.etaxonomy.cdm.model.occurrence.DerivedUnit; |
| ... | ... | |
| 89 | 90 |
} |
| 90 | 91 |
} |
| 91 | 92 |
getEntity().setTypeStatus(combo_typeStatus.getSelection()); |
| 93 |
if (entity.hasDesignationSource()){
|
|
| 94 |
DescriptionElementSource source = DescriptionElementSource.NewPrimarySourceInstance(null, null); |
|
| 95 |
entity.setSource(source); |
|
| 96 |
} |
|
| 92 | 97 |
setEntity(entity); |
| 93 | 98 |
|
| 94 | 99 |
} |
| eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/reference/AdvancedSourceElement.java | ||
|---|---|---|
| 79 | 79 |
@Override |
| 80 | 80 |
public void setEntity(OriginalSourceBase entity) {
|
| 81 | 81 |
super.setEntity(entity); |
| 82 |
// if (externalLinks != null){
|
|
| 83 |
// externalLinks.setEntity(entity); |
|
| 84 |
// } |
|
| 85 | 82 |
} |
| 86 | 83 |
|
| 87 |
// public ExternalLinksSection getExternalLinks() {
|
|
| 88 |
// return externalLinks; |
|
| 89 |
// } |
|
| 90 |
// |
|
| 91 |
// public void setExternalLinks(ExternalLinksSection externalLinks) {
|
|
| 92 |
// this.externalLinks = externalLinks; |
|
| 93 |
// } |
|
| 94 |
|
|
| 95 | 84 |
@Override |
| 96 | 85 |
public void handleEvent(Object eventSource) {
|
| 97 | 86 |
if (eventSource.equals(text_idInSource)){
|
| eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/reference/OriginalSourceElement.java | ||
|---|---|---|
| 12 | 12 |
import org.eclipse.jface.util.IPropertyChangeListener; |
| 13 | 13 |
import org.eclipse.ui.forms.widgets.TableWrapData; |
| 14 | 14 |
|
| 15 |
import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper; |
|
| 16 | 15 |
import eu.etaxonomy.cdm.model.common.CdmBase; |
| 17 | 16 |
import eu.etaxonomy.cdm.model.description.DescriptionElementSource; |
| 18 | 17 |
import eu.etaxonomy.cdm.model.reference.INomenclaturalReference; |
| ... | ... | |
| 52 | 51 |
@Override |
| 53 | 52 |
protected void createControls(ICdmFormElement formElement, OriginalSourceBase entity, int style) {
|
| 54 | 53 |
|
| 55 |
entity = HibernateProxyHelper.deproxy(entity); |
|
| 56 | 54 |
selection_Ref = formFactory.createSelectionElement(Reference.class, |
| 57 | 55 |
formElement, label, null, |
| 58 | 56 |
EntitySelectionElement.ALL, style, 100); |
Also available in: Unified diff
ref #9199: fix NPE for newly created designation source