Project

General

Profile

« Previous | Next » 

Revision 9dc896c9

Added by Andreas Müller almost 7 years ago

fix #6368 rename table and class TaxonNameBase

View differences:

cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/IdentifiableServiceBase.java
40 40 
import eu.etaxonomy.cdm.model.media.Rights;
41 41 
import eu.etaxonomy.cdm.model.name.INonViralName;
42 42 
import eu.etaxonomy.cdm.model.name.ITaxonName;
43 
import eu.etaxonomy.cdm.model.name.TaxonNameBase;
43 
import eu.etaxonomy.cdm.model.name.TaxonName;
44 44 
import eu.etaxonomy.cdm.model.reference.Reference;
45 45 
import eu.etaxonomy.cdm.model.reference.ReferenceFactory;
46 46 
import eu.etaxonomy.cdm.persistence.dao.common.IIdentifiableDao;
......
273 273 
				if (entity.getTitleCache() != null){
274 274 
					//System.err.println(entity.getTitleCache());
275 275 
				}else{
276 
				    //System.err.println("no titleCache" + ((TaxonNameBase<?,?>)entity).getNameCache());
276 
				    //System.err.println("no titleCache" + ((TaxonName<?,?>)entity).getNameCache());
277 277 
				}
278 278 
			}
279 279 
			saveOrUpdate(entitiesToUpdate);
......
360 360 
		String oldNameCache = null;
361 361 
		String oldFullTitleCache = null;
362 362 
		String oldAbbrevTitleCache = null;
363 
		if (entity instanceof TaxonNameBase ){
364 
		    if (((TaxonNameBase) entity).isNonViral()) {
363 
		if (entity instanceof TaxonName ){
364 
		    if (((TaxonName) entity).isNonViral()) {
365 365 
                try{
366 366 
                	INonViralName nvn = (INonViralName) entity;
367 367 
                	if (!nvn.isProtectedNameCache()){
......
391 391 
		String newTitleCache= null;
392 392 
		INonViralName nvn = null; //TODO find better solution
393 393 
		try{
394 
			if (entity instanceof TaxonNameBase){
394 
			if (entity instanceof TaxonName){
395 395 
				nvn = (ITaxonName) entity;
396 396 
				newTitleCache = entityCacheStrategy.getTitleCache(nvn);
397 397 
			} else{
398 398 
				 newTitleCache = entityCacheStrategy.getTitleCache(entity);
399 399 
			}
400 400 
		}catch (ClassCastException e){
401 
			nvn = HibernateProxyHelper.deproxy(entity, TaxonNameBase.class);
401 
			nvn = HibernateProxyHelper.deproxy(entity, TaxonName.class);
402 402 
			newTitleCache = entityCacheStrategy.getTitleCache(nvn);
403 403 
		}
404 404 

  		












Also available in:  Unified diff