Revision 67a8edee
Added by Andreas Müller over 11 years ago
| cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/TaxonNameBase.java | ||
|---|---|---|
| 20 | 20 |
import javax.persistence.FetchType; |
| 21 | 21 |
import javax.persistence.Inheritance; |
| 22 | 22 |
import javax.persistence.InheritanceType; |
| 23 |
import javax.persistence.JoinTable; |
|
| 24 |
import javax.persistence.JoinColumn; |
|
| 25 | 23 |
import javax.persistence.ManyToMany; |
| 26 | 24 |
import javax.persistence.ManyToOne; |
| 27 | 25 |
import javax.persistence.OneToMany; |
| ... | ... | |
| 66 | 64 |
import eu.etaxonomy.cdm.strategy.cache.name.INameCacheStrategy; |
| 67 | 65 |
import eu.etaxonomy.cdm.strategy.match.IMatchable; |
| 68 | 66 |
import eu.etaxonomy.cdm.strategy.match.Match; |
| 69 |
import eu.etaxonomy.cdm.strategy.match.MatchMode; |
|
| 70 | 67 |
import eu.etaxonomy.cdm.strategy.match.Match.ReplaceMode; |
| 68 |
import eu.etaxonomy.cdm.strategy.match.MatchMode; |
|
| 71 | 69 |
import eu.etaxonomy.cdm.strategy.merge.Merge; |
| 72 | 70 |
import eu.etaxonomy.cdm.strategy.merge.MergeMode; |
| 73 | 71 |
import eu.etaxonomy.cdm.strategy.parser.ParserProblem; |
| ... | ... | |
| 322 | 320 |
|
| 323 | 321 |
@Transient |
| 324 | 322 |
public List<Object> getTaggedName(){
|
| 325 |
return getCacheStrategy().getTaggedName(this); |
|
| 323 |
return getCacheStrategy().getTaggedNameDeprecated(this);
|
|
| 326 | 324 |
} |
| 327 | 325 |
|
| 328 | 326 |
@Transient |
| cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/TaggedTextGenerator.java | ||
|---|---|---|
| 58 | 58 |
// - infraGenericEpithet "Cicerbita" |
| 59 | 59 |
// - infraSpecificEpithet null |
| 60 | 60 |
|
| 61 |
List<Object> taggedName = taxonNameBase.getCacheStrategy().getTaggedName(taxonNameBase); |
|
| 61 |
List<Object> taggedName = taxonNameBase.getCacheStrategy().getTaggedNameDeprecated(taxonNameBase);
|
|
| 62 | 62 |
for (Object token : taggedName){
|
| 63 | 63 |
TaggedText tag = new TaggedText(); |
| 64 | 64 |
if (String.class.isInstance(token)){
|
| cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/cache/name/INameCacheStrategy.java | ||
|---|---|---|
| 34 | 34 |
* @param taxonNameBase |
| 35 | 35 |
* @return |
| 36 | 36 |
*/ |
| 37 |
public List<Object> getTaggedName(T taxonNameBase); |
|
| 37 |
public List<Object> getTaggedNameDeprecated(T taxonNameBase);
|
|
| 38 | 38 |
|
| 39 | 39 |
/** |
| 40 | 40 |
* Returns a list of name typified tokens that together make up the name (including authorship etc.). |
| cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/cache/name/NameCacheStrategyBase.java | ||
|---|---|---|
| 52 | 52 |
/* (non-Javadoc) |
| 53 | 53 |
* @see eu.etaxonomy.cdm.strategy.cache.name.INameCacheStrategy#getTaggedName(eu.etaxonomy.cdm.model.name.TaxonNameBase) |
| 54 | 54 |
*/ |
| 55 |
public abstract List<Object> getTaggedName(T taxonNameBase); |
|
| 55 |
public abstract List<Object> getTaggedNameDeprecated(T taxonNameBase);
|
|
| 56 | 56 |
|
| 57 | 57 |
/* (non-Javadoc) |
| 58 | 58 |
* @see eu.etaxonomy.cdm.strategy.cache.name.INameCacheStrategy#getTaggedTitle(eu.etaxonomy.cdm.model.name.TaxonNameBase) |
| cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/cache/name/NonViralNameDefaultCacheStrategy.java | ||
|---|---|---|
| 695 | 695 |
* @see eu.etaxonomy.cdm.strategy.INameCacheStrategy#getTaggedName(eu.etaxonomy.cdm.model.common.CdmBase) |
| 696 | 696 |
*/ |
| 697 | 697 |
@Override |
| 698 |
public List<Object> getTaggedName(T nonViralName) {
|
|
| 698 |
@Deprecated |
|
| 699 |
public List<Object> getTaggedNameDeprecated(T nonViralName) {
|
|
| 699 | 700 |
List<Object> tags = new ArrayList<Object>(); |
| 700 | 701 |
|
| 701 | 702 |
if (nonViralName.isProtectedNameCache() || |
| cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/cache/name/NonViralNameDefaultCacheStrategyTest.java | ||
|---|---|---|
| 505 | 505 |
} |
| 506 | 506 |
|
| 507 | 507 |
/** |
| 508 |
* Test method for {@link eu.etaxonomy.cdm.strategy.cache.name.NonViralNameDefaultCacheStrategy#getTaggedName(eu.etaxonomy.cdm.model.name.NonViralName)}.
|
|
| 508 |
* Test method for {@link eu.etaxonomy.cdm.strategy.cache.name.NonViralNameDefaultCacheStrategy#getTaggedNameDeprecated(eu.etaxonomy.cdm.model.name.NonViralName)}.
|
|
| 509 | 509 |
*/ |
| 510 | 510 |
@Test |
| 511 | 511 |
public void testGetTaggedNameSpeciesAggregate() {
|
| 512 | 512 |
BotanicalName speciesAggregate = BotanicalName.NewInstance(Rank.SPECIESAGGREGATE()); |
| 513 | 513 |
speciesAggregate.setGenusOrUninomial("Mygenus");
|
| 514 | 514 |
speciesAggregate.setSpecificEpithet("myspecies");
|
| 515 |
List<Object> taggedName = strategy.getTaggedName(speciesAggregate); |
|
| 515 |
List<Object> taggedName = strategy.getTaggedNameDeprecated(speciesAggregate);
|
|
| 516 | 516 |
Assert.assertEquals("1rd tag must be genus epithet", "Mygenus", taggedName.get(0));
|
| 517 | 517 |
Assert.assertEquals("2rd tag must be species epithet", "myspecies", taggedName.get(1));
|
| 518 | 518 |
Assert.assertEquals("3rd tag must be aggregate marker", "aggr.",taggedName.get(2));
|
| ... | ... | |
| 521 | 521 |
|
| 522 | 522 |
@Test |
| 523 | 523 |
public void testGetTaggedNameSubspecies(){
|
| 524 |
List taggedName = strategy.getTaggedName(subSpeciesName); |
|
| 524 |
List taggedName = strategy.getTaggedNameDeprecated(subSpeciesName);
|
|
| 525 | 525 |
Assert.assertEquals("First tag should be 'Abies'", "Abies", taggedName.get(0));
|
| 526 | 526 |
Assert.assertEquals("Second tag should be 'alba'", "alba", taggedName.get(1));
|
| 527 | 527 |
Assert.assertEquals("Third tag should be subspecies rank", Rank.SUBSPECIES(), taggedName.get(2));
|
Also available in: Unified diff
renamed getTaggedName -> getTaggedNameDeprecated