Revision eda6214b
Added by Andreas Müller over 7 years ago
| 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; |
| ... | ... | |
| 967 | 967 |
|
| 968 | 968 |
@Override |
| 969 | 969 |
public void setInJournal(IJournal journal) {
|
| 970 |
this.inReference = (Reference)journal; |
|
| 971 |
|
|
| 970 |
setInReference((Reference)journal); //user setter to invoke aspect #1815 |
|
| 972 | 971 |
} |
| 973 | 972 |
|
| 974 | 973 |
@Override |
| 975 | 974 |
@Transient // prevent from being serialized by webservice |
| 976 | 975 |
public IPrintSeries getInSeries() {
|
| 977 |
IPrintSeries printSeries = this.inReference; |
|
| 978 |
return printSeries; |
|
| 976 |
return this.inReference; |
|
| 979 | 977 |
} |
| 980 | 978 |
|
| 981 | 979 |
@Override |
| 982 | 980 |
public void setInSeries(IPrintSeries inSeries) {
|
| 983 |
this.inReference = (Reference) inSeries;
|
|
| 981 |
setInReference((Reference)inSeries); //user setter to invoke aspect #1815
|
|
| 984 | 982 |
} |
| 985 | 983 |
|
| 986 | 984 |
@Override |
| ... | ... | |
| 994 | 992 |
|
| 995 | 993 |
@Override |
| 996 | 994 |
public void setInBook(IBook book) {
|
| 997 |
this.inReference = (Reference) book;
|
|
| 995 |
setInReference((Reference)book); //user setter to invoke aspect #1815
|
|
| 998 | 996 |
} |
| 999 | 997 |
|
| 1000 | 998 |
@Override |
| ... | ... | |
| 1006 | 1004 |
|
| 1007 | 1005 |
@Override |
| 1008 | 1006 |
public void setInProceedings(IProceedings proceeding) {
|
| 1009 |
this.inReference = (Reference) proceeding;
|
|
| 1007 |
setInReference((Reference)proceeding); //user setter to invoke aspect #1815
|
|
| 1010 | 1008 |
} |
| 1011 | 1009 |
|
| 1012 | 1010 |
//*************************** CACHE STRATEGIES ******************************/ |
| cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/cache/reference/DefaultReferenceCacheStrategyTest.java | ||
|---|---|---|
| 146 | 146 |
Assert.assertEquals("Team1, My article in " + DefaultReferenceCacheStrategy.UNDEFINED_JOURNAL + ". 1975", article1.getTitleCache());
|
| 147 | 147 |
} |
| 148 | 148 |
|
| 149 |
@Ignore |
|
| 150 | 149 |
@Test |
| 151 |
//This test is just to show that there is still the title cache bug which is not |
|
| 152 |
//set to null by setInJournal(null) |
|
| 150 |
//This test is just to show that setInJournal(null) now resets caches #1815 |
|
| 153 | 151 |
public void testArticleGetTitleCache2(){
|
| 154 | 152 |
journal1.setTitle("My journal");
|
| 155 | 153 |
journal1.setAuthorship(articleTeam2); |
| ... | ... | |
| 359 | 357 |
|
| 360 | 358 |
} |
| 361 | 359 |
|
| 362 |
@Ignore |
|
| 363 | 360 |
@Test |
| 364 |
//This test is just to show that there is still the title cache bug which is not |
|
| 365 |
//set to null by setInBook(null) and others |
|
| 361 |
//This test is just to show that setInBook(null) now resets caches #1815 |
|
| 366 | 362 |
public void testBookSectionGetTitleCache2(){
|
| 367 | 363 |
book1.setTitle("My book");
|
| 368 | 364 |
book1.setAuthorship(bookTeam1); |
Also available in: Unified diff
Fix failing inReference cache reset #1815