Project

General

Profile

« Previous | Next » 

Revision 8e9a7092

Added by Andreas Müller almost 8 years ago

minor

View differences:

cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/reference/Reference.java
53 53
import eu.etaxonomy.cdm.model.common.TimePeriod;
54 54
import eu.etaxonomy.cdm.model.media.IdentifiableMediaEntity;
55 55
import eu.etaxonomy.cdm.model.name.TaxonNameBase;
56
import eu.etaxonomy.cdm.strategy.cache.reference.INomenclaturalReferenceCacheStrategy;
57 56
import eu.etaxonomy.cdm.strategy.cache.reference.DefaultReferenceCacheStrategy;
57
import eu.etaxonomy.cdm.strategy.cache.reference.INomenclaturalReferenceCacheStrategy;
58 58
import eu.etaxonomy.cdm.strategy.match.Match;
59 59
import eu.etaxonomy.cdm.strategy.match.MatchMode;
60 60
import eu.etaxonomy.cdm.strategy.merge.Merge;
......
374 374
        }
375 375
        // is reference dirty, i.e. equal NULL?
376 376
        if (abbrevTitleCache == null){
377
            this.abbrevTitleCache = generateAbbrevTitle();
377
            this.abbrevTitleCache = generateAbbrevTitleCache();
378 378
            this.abbrevTitleCache = getTruncatedCache(this.abbrevTitleCache) ;
379 379
        }
380 380
        return abbrevTitleCache;
......
731 731
		return super.generateTitle();
732 732
	}
733 733

  
734
    public String generateAbbrevTitle() {
735
		return getCacheStrategy().getFullAbbrevTitleString(this);
734
    public String generateAbbrevTitleCache() {
735
		return getCacheStrategy().getNomenclaturalCache(this);
736 736
	}
737 737

  
738
    public String fullAbbrevTitleString() {
739
        return getCacheStrategy().getFullAbbrevTitleString(this);
740
    }
741

  
738 742
	/**
739 743
	 * Returns a string representation for the year of publication / creation
740 744
	 * of <i>this</i> reference. If the {@link #getDatePublished() datePublished}
......
967 971

  
968 972
	@Override
969 973
    public void setInJournal(IJournal journal) {
970
		this.inReference = (Reference)journal;
971

  
974
		setInReference((Reference)journal);  //user setter to invoke aspect #1815
972 975
	}
973 976

  
974 977
	@Override
975 978
    @Transient // prevent from being serialized by webservice
976 979
	public IPrintSeries getInSeries() {
977
		IPrintSeries printSeries = this.inReference;
978
		return printSeries;
980
		return this.inReference;
979 981
	}
980 982

  
981 983
	@Override
982 984
    public void setInSeries(IPrintSeries inSeries) {
983
		this.inReference = (Reference) inSeries;
985
	    setInReference((Reference)inSeries);  //user setter to invoke aspect  #1815
984 986
	}
985 987

  
986 988
	@Override
......
994 996

  
995 997
	@Override
996 998
    public void setInBook(IBook book) {
997
		this.inReference = (Reference) book;
999
	    setInReference((Reference)book);  //user setter to invoke aspect #1815
998 1000
	}
999 1001

  
1000 1002
	@Override
......
1006 1008

  
1007 1009
	@Override
1008 1010
    public void setInProceedings(IProceedings proceeding) {
1009
		this.inReference = (Reference) proceeding;
1011
        setInReference((Reference)proceeding);  //user setter to invoke aspect #1815
1010 1012
	}
1011 1013

  
1012 1014
//*************************** CACHE STRATEGIES ******************************/

Also available in: Unified diff