Revision 9dc896c9
Added by Andreas Müller almost 7 years ago
| cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/parser/NonViralNameParserImpl.java | ||
|---|---|---|
| 37 | 37 |
import eu.etaxonomy.cdm.model.name.NomenclaturalStatus; |
| 38 | 38 |
import eu.etaxonomy.cdm.model.name.NomenclaturalStatusType; |
| 39 | 39 |
import eu.etaxonomy.cdm.model.name.Rank; |
| 40 |
import eu.etaxonomy.cdm.model.name.TaxonNameBase;
|
|
| 40 |
import eu.etaxonomy.cdm.model.name.TaxonName; |
|
| 41 | 41 |
import eu.etaxonomy.cdm.model.name.TaxonNameFactory; |
| 42 | 42 |
import eu.etaxonomy.cdm.model.reference.IBook; |
| 43 | 43 |
import eu.etaxonomy.cdm.model.reference.IBookSection; |
| ... | ... | |
| 136 | 136 |
} |
| 137 | 137 |
|
| 138 | 138 |
@Override |
| 139 |
public TaxonNameBase parseReferencedName(String fullReferenceString) {
|
|
| 139 |
public TaxonName parseReferencedName(String fullReferenceString) {
|
|
| 140 | 140 |
return parseReferencedName(fullReferenceString, null, null); |
| 141 | 141 |
} |
| 142 | 142 |
|
| 143 | 143 |
@Override |
| 144 |
public TaxonNameBase parseReferencedName(String fullReferenceString, NomenclaturalCode nomCode, Rank rank) {
|
|
| 144 |
public TaxonName parseReferencedName(String fullReferenceString, NomenclaturalCode nomCode, Rank rank) {
|
|
| 145 | 145 |
if (fullReferenceString == null){
|
| 146 | 146 |
return null; |
| 147 | 147 |
}else{
|
| 148 | 148 |
INonViralName result = getNonViralNameInstance(fullReferenceString, nomCode, rank); |
| 149 | 149 |
parseReferencedName(result, fullReferenceString, rank, MAKE_EMPTY); |
| 150 |
return TaxonNameBase.castAndDeproxy(result);
|
|
| 150 |
return TaxonName.castAndDeproxy(result); |
|
| 151 | 151 |
} |
| 152 | 152 |
} |
| 153 | 153 |
|
| ... | ... | |
| 383 | 383 |
|
| 384 | 384 |
//TODO make it an Array of status |
| 385 | 385 |
/** |
| 386 |
* Extracts a {@link NomenclaturalStatus} from the reference String and adds it to the @link {@link TaxonNameBase}.
|
|
| 386 |
* Extracts a {@link NomenclaturalStatus} from the reference String and adds it to the @link {@link TaxonName}.
|
|
| 387 | 387 |
* The nomenclatural status part ist deleted from the reference String. |
| 388 | 388 |
* @return String the new (shortend) reference String |
| 389 | 389 |
*/ |
| ... | ... | |
| 406 | 406 |
statusMatcher.find(); |
| 407 | 407 |
statusString = statusMatcher.group(0); |
| 408 | 408 |
try {
|
| 409 |
TaxonNameBase<?,?> nameToBeFilledCasted = TaxonNameBase.castAndDeproxy(nameToBeFilled);
|
|
| 409 |
TaxonName nameToBeFilledCasted = TaxonName.castAndDeproxy(nameToBeFilled);
|
|
| 410 | 410 |
NomenclaturalStatusType nomStatusType = NomenclaturalStatusType.getNomenclaturalStatusTypeByAbbreviation(statusString, nameToBeFilledCasted); |
| 411 | 411 |
if (! existingStatusTypeSet.contains(nomStatusType)){
|
| 412 | 412 |
NomenclaturalStatus nomStatus = NomenclaturalStatus.NewInstance(nomStatusType); |
| ... | ... | |
| 1467 | 1467 |
|
| 1468 | 1468 |
|
| 1469 | 1469 |
private void makeEmpty(INonViralName name){
|
| 1470 |
TaxonNameBase<?,?> nameToBeFilled = TaxonNameBase.castAndDeproxy(name);
|
|
| 1470 |
TaxonName nameToBeFilled = TaxonName.castAndDeproxy(name);
|
|
| 1471 | 1471 |
nameToBeFilled.setRank(null); |
| 1472 | 1472 |
nameToBeFilled.setTitleCache(null, false); |
| 1473 | 1473 |
nameToBeFilled.setFullTitleCache(null, false); |
Also available in: Unified diff
fix #6368 rename table and class TaxonNameBase