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.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNavigatorDataChangeBehavior.java
21 21

  
22 22
import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;
23 23
import eu.etaxonomy.cdm.model.common.CdmBase;
24
import eu.etaxonomy.cdm.model.name.TaxonNameBase;
24
import eu.etaxonomy.cdm.model.name.TaxonName;
25 25
import eu.etaxonomy.cdm.model.taxon.ITaxonTreeNode;
26 26
import eu.etaxonomy.cdm.model.taxon.Taxon;
27 27
import eu.etaxonomy.cdm.persistence.hibernate.CdmDataChangeEvent;
......
91 91
			}
92 92

  
93 93
			// name updates of the accepted taxon of open editors are relevant
94
			if(eventType == EventType.UPDATE && event.getEntity() instanceof TaxonNameBase){
95
				TaxonNameBase name = null;
96
				if(eventEntity instanceof TaxonNameBase){
97
					name = (TaxonNameBase) eventEntity;
94
			if(eventType == EventType.UPDATE && event.getEntity() instanceof TaxonName){
95
				TaxonName name = null;
96
				if(eventEntity instanceof TaxonName){
97
					name = (TaxonName) eventEntity;
98 98
				}else if(eventEntity instanceof Taxon){
99 99
					name = ((Taxon) eventEntity).getName();
100 100
				}else{
......
116 116

  
117 117

  
118 118
			if(eventType == EventType.UPDATE && event.getEntity() instanceof Taxon){
119
				TaxonNameBase name = null;
119
				TaxonName name = null;
120 120
				if(eventEntity instanceof Taxon){
121 121
					name = ((Taxon) eventEntity).getName();
122 122
				}else{
......
158 158
//		}
159 159
	}
160 160

  
161
	/* (non-Javadoc)
162
	 * @see eu.etaxonomy.taxeditor.store.model.IDataChangeBehavior#reactOnDataChange(java.lang.Object, eu.etaxonomy.cdm.persistence.hibernate.CdmCrudEvent)
163
	 */
164 161
	/** {@inheritDoc} */
165 162
	@Override
166 163
	public void reactOnDataChange(CdmDataChangeMap events) {

Also available in: Unified diff