Project

General

Profile

« Previous | Next » 

Revision ac5fb7af

Added by Andreas Müller about 7 years ago

ref #6369 adapt existing occurrences of interface to removed generics in cdmlib-app

View differences:

cdm-eflora/src/main/java/eu/etaxonomy/cdm/io/eflora/centralAfrica/ericaceae/CentralAfricaEricaceaeTaxonImport.java
31 31 
import eu.etaxonomy.cdm.model.description.TaxonDescription;
32 32 
import eu.etaxonomy.cdm.model.description.TextData;
33 33 
import eu.etaxonomy.cdm.model.name.HomotypicalGroup;
34 
import eu.etaxonomy.cdm.model.name.NonViralName;
34 
import eu.etaxonomy.cdm.model.name.INonViralName;
35 35 
import eu.etaxonomy.cdm.model.name.SpecimenTypeDesignation;
36 36 
import eu.etaxonomy.cdm.model.name.TaxonNameBase;
37 37 
import eu.etaxonomy.cdm.model.name.TypeDesignationBase;
......
47 47 
 */
48 48 
@Component
49 49 
public class CentralAfricaEricaceaeTaxonImport  extends EfloraTaxonImport  {
50 
	private static final Logger logger = Logger.getLogger(CentralAfricaEricaceaeTaxonImport.class);
50 
    private static final long serialVersionUID = 6442665916458420942L;
51 
    private static final Logger logger = Logger.getLogger(CentralAfricaEricaceaeTaxonImport.class);
51 52 

  		




  52
  53
  
    

  		




  53
  
  
    

  		




  54
  
  
    

  		




  55
  
  
    
	/* (non-Javadoc)


  		




  56
  
  
    
	 * @see eu.etaxonomy.cdm.io.eflora.EfloraTaxonImport#handleNomenclaturalReference(eu.etaxonomy.cdm.model.name.NonViralName, java.lang.String)


  		




  57
  
  
    
	 */


  		




  58
  54
  
    
	@Override


  		




  59
  
  
    
	protected TeamOrPersonBase handleNomenclaturalReference(NonViralName name, String value) {


  		




  
  55
  
    
	protected TeamOrPersonBase handleNomenclaturalReference(TaxonNameBase name, String value) {


  		




  60
  56
  
    
		Reference nomRef = ReferenceFactory.newGeneric();


  		




  61
  57
  
    
		nomRef.setTitleCache(value, true);


  		




  62
  58
  
    
		parseNomStatus(nomRef, name);


  		




  ......




  68
  64
  
    
		microReference = parseHomonym(microReference, name);


  		




  69
  65
  
    
		name.setNomenclaturalMicroReference(microReference);


  		




  70
  66
  
    

  		




  71
  
  
    
		TeamOrPersonBase  nameTeam = CdmBase.deproxy(name.getCombinationAuthorship(), TeamOrPersonBase.class);


  		




  72
  
  
    
		TeamOrPersonBase  refTeam = nomRef.getAuthorship();


  		




  
  67
  
    
		TeamOrPersonBase<?>  nameTeam = CdmBase.deproxy(name.getCombinationAuthorship(), TeamOrPersonBase.class);


  		




  
  68
  
    
		TeamOrPersonBase<?>  refTeam = nomRef.getAuthorship();


  		




  73
  69
  
    
		if (nameTeam == null ){


  		




  74
  70
  
    
			logger.warn("Name has nom. ref. but no author team. Name: " + name.getTitleCache() + ", Nom.Ref.: " + value);


  		




  75
  71
  
    
		}else if (refTeam == null ){


  		




  ......




  167
  163
  
    
	 * @param value


  		




  168
  164
  
    
	 */


  		




  169
  165
  
    
	@Override


  		




  170
  
  
    
	protected TeamOrPersonBase<?> handleNameUsage(Taxon taxon, NonViralName<?> name, String referenceTitle, TeamOrPersonBase lastTeam) {


  		




  
  166
  
    
	protected TeamOrPersonBase<?> handleNameUsage(Taxon taxon, INonViralName name,


  		




  
  167
  
    
	        String referenceTitle, TeamOrPersonBase lastTeam) {


  		




  
  168
  
    

  		




  171
  169
  
    
		Reference ref = ReferenceFactory.newGeneric();


  		




  172
  170
  
    

  		




  173
  171
  
    
		ref.setTitleCache(referenceTitle, true);


  		




  ......




  190
  188
  
    
	//		parseReferenceType(ref);


  		




  191
  189
  
    

  		




  192
  190
  
    
			TextData textData = TextData.NewInstance(Feature.CITATION());


  		




  193
  
  
    
			textData.addSource(OriginalSourceType.PrimaryTaxonomicSource, null, null, singleRef, microReference, name, null);


  		




  
  191
  
    
			textData.addSource(OriginalSourceType.PrimaryTaxonomicSource, null, null, singleRef, microReference, (TaxonNameBase) name, null);


  		




  194
  192
  
    
			description.addElement(textData);


  		




  195
  193
  
    
		}


  		




  196
  194
  
    
		return team;


  		




  ......




  229
  227
  
    

  		




  230
  228
  
    
	}


  		




  231
  229
  
    

  		




  232
  
  
    
	protected TeamOrPersonBase getReferenceAuthor (Reference ref, NonViralName name) {


  		




  
  230
  
    
	protected TeamOrPersonBase getReferenceAuthor (Reference ref, INonViralName name) {


  		




  233
  231
  
    
		String titleString = ref.getTitleCache();


  		




  234
  232
  
    
		String re = "\\(.*\\)";


  		




  235
  233
  
    
		Pattern pattern = Pattern.compile(re);


  		




  ......




  248
  246
  
    

  		




  249
  247
  
    
	}


  		




  250
  248
  
    

  		




  251
  
  
    
	private TeamOrPersonBase getAuthorTeam(String authorString, NonViralName name) {


  		




  
  249
  
    
	private TeamOrPersonBase getAuthorTeam(String authorString, INonViralName name) {


  		




  252
  250
  
    
		//TODO atomize


  		




  253
  251
  
    
//		TeamOrPersonBase nameTeam = CdmBase.deproxy(name.getCombinationAuthorship(), TeamOrPersonBase.class);


  		




  254
  252
  
    
//		String nameTeamTitle = nameTeam == null ? "" : nameTeam.getNomenclaturalTitle();


  		




  ......




  367
  365
  
    
	}


  		




  368
  366
  
    

  		




  369
  367
  
    
	@Override


  		




  370
  
  
    
    protected void handleGenus(String value, TaxonNameBase taxonName) {


  		




  
  368
  
    
    protected void handleGenus(String value, INonViralName taxonName) {


  		




  371
  369
  
    
		// do nothing


  		




  372
  370
  
    
	}


  		




  373
  371
  
    

  		












Also available in:  Unified diff