Project

General

Profile

« Previous | Next » 

Revision 9dc896c9

Added by Andreas Müller almost 7 years ago

fix #6368 rename table and class TaxonNameBase

View differences:

cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/markup/MarkupNomenclatureImport.java
33 33 
import eu.etaxonomy.cdm.model.name.NomenclaturalStatus;
34 34 
import eu.etaxonomy.cdm.model.name.NomenclaturalStatusType;
35 35 
import eu.etaxonomy.cdm.model.name.Rank;
36 
import eu.etaxonomy.cdm.model.name.TaxonNameBase;
36 
import eu.etaxonomy.cdm.model.name.TaxonName;
37 37 
import eu.etaxonomy.cdm.model.reference.IArticle;
38 38 
import eu.etaxonomy.cdm.model.reference.IBook;
39 39 
import eu.etaxonomy.cdm.model.reference.IJournal;
......
162 162 
				if (isStartingElement(next, NOM)) {
163 163 
					// TODO should we check if the type is always a species, is
164 164 
					// this a rule?
165 
					TaxonNameBase<?,?> speciesName = TaxonNameBase.castAndDeproxy(
165 
					TaxonName speciesName = TaxonName.castAndDeproxy(
166 166 
					        handleNom(state, reader, next, null));
167 
					for (TaxonNameBase<?, ?> name : homotypicalGroup
167 
					for (TaxonName<?, ?> name : homotypicalGroup
168 168 
							.getTypifiedNames()) {
169 169 
						name.addNameTypeDesignation(speciesName, null, null,
170 170 
								null, status, false, false, false, false);
......
622 622 
			if (taxon.getHomotypicGroup().equals(homotypicalGroup)) {
623 623 
				synonymType = SynonymType.HOMOTYPIC_SYNONYM_OF();
624 624 
			}
625 
			taxon.addSynonymName(TaxonNameBase.castAndDeproxy(name), synonymType);
625 
			taxon.addSynonymName(TaxonName.castAndDeproxy(name), synonymType);
626 626 
		} else {
627 627 
			name = taxon.getName();
628 628 
		}
......
633 633 
			XMLEvent parentEvent, INonViralName nvn, TaxonRelationship misappliedRel) throws XMLStreamException {
634 634 
		String classValue = getClassOnlyAttribute(parentEvent);
635 635 

  		




  636
  
  
    
		TaxonNameBase<?,?> name = TaxonNameBase.castAndDeproxy(nvn);


  		




  
  636
  
    
		TaxonName name = TaxonName.castAndDeproxy(nvn);


  		




  637
  637
  
    
		state.setCitation(true);


  		




  638
  638
  
    
		boolean hasRefPart = false;


  		




  639
  639
  
    
		Map<String, String> refMap = new HashMap<>();


  		




  ......




  659
  659
  
    
	}


  		




  660
  660
  
    

  		




  661
  661
  
    

  		




  662
  
  
    
	private void doCitation(MarkupImportState state, TaxonNameBase<?,?> name,


  		




  
  662
  
    
	private void doCitation(MarkupImportState state, TaxonName name,


  		




  663
  663
  
    
			String classValue, TaxonRelationship misappliedRel,


  		




  664
  664
  
    
			Reference reference, String microCitation,


  		




  665
  665
  
    
			XMLEvent parentEvent) {


  		












Also available in:  Unified diff