Project

General

Profile

« Previous | Next » 

Revision e6d7b501

Added by Andreas Müller almost 7 years ago

ref #6368 remove TaxonNameBase subclasses

View differences:

cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/taxonx2013/TaxonXTreatmentExtractor.java
56 56 
import eu.etaxonomy.cdm.model.name.NomenclaturalStatusType;
57 57 
import eu.etaxonomy.cdm.model.name.Rank;
58 58 
import eu.etaxonomy.cdm.model.name.TaxonNameBase;
59 
import eu.etaxonomy.cdm.model.name.ZoologicalName;
60 59 
import eu.etaxonomy.cdm.model.occurrence.DerivedUnit;
61 60 
import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationType;
62 61 
import eu.etaxonomy.cdm.model.reference.Reference;
......
2622 2621 
    private ITaxonNameBase parseWithExtension(INonViralNameParser parser, String atomisedNameStr, Rank rank, String followingText, HashMap<String, String> atomisedMap) {
2623 2622 
    	Object[] nameExtensionResult = getPossibleExtension(followingText, atomisedMap, nomenclaturalCode);
2624 2623 

  		




  2625
  
  
    
    	ITaxonNameBase name = parser.parseFullName(atomisedNameStr, nomenclaturalCode, rank);


  		




  
  2624
  
    
    	TaxonNameBase name = (TaxonNameBase)parser.parseFullName(atomisedNameStr, nomenclaturalCode, rank);


  		




  2626
  2625
  
    
    	if (nameExtensionResult != null && nameExtensionResult[0] != null){


  		




  2627
  2626
  
    
    		String ext = (String)nameExtensionResult[0];


  		




  2628
  
  
    
    		ITaxonNameBase extName =parser.parseFullName(atomisedNameStr + " " + ext, nomenclaturalCode, rank);


  		




  
  2627
  
    
    		TaxonNameBase extName = (TaxonNameBase)parser.parseFullName(atomisedNameStr + " " + ext, nomenclaturalCode, rank);


  		




  2629
  2628
  
    
    		if (! extName.hasProblem()){


  		




  2630
  2629
  
    
    			name = extName;


  		




  2631
  2630
  
    
    			this.usedFollowingTextPrefix = ext;


  		




  ......




  2635
  2634
  
    
    			}


  		




  2636
  2635
  
    
    			if ((Boolean)(nameExtensionResult[2])){


  		




  2637
  2636
  
    
    				//TODO BasionymYear etc.


  		




  2638
  
  
    
    				Integer origYear = ((ZoologicalName)name).getPublicationYear();


  		




  
  2637
  
    
    				Integer origYear = name.getPublicationYear();


  		




  2639
  2638
  
    
    				if (origYear != null){


  		




  2640
  2639
  
    
        				atomisedMap.put(PUBLICATION_YEAR, origYear.toString());


  		




  2641
  2640
  
    
    				}


  		












Also available in:  Unified diff