Project

General

Profile

« Previous | Next » 

Revision ded3de15

Added by Andreas Müller about 7 years ago

ref #6365 use TaxonNameFactory for factory methods in cdmlib-app

View differences:

app-import/src/main/java/eu/etaxonomy/cdm/io/cuba/CubaExcelImport.java
54 54 
import eu.etaxonomy.cdm.model.name.NomenclaturalStatusType;
55 55 
import eu.etaxonomy.cdm.model.name.Rank;
56 56 
import eu.etaxonomy.cdm.model.name.TaxonNameBase;
57 
import eu.etaxonomy.cdm.model.name.TaxonNameFactory;
57 58 
import eu.etaxonomy.cdm.model.reference.Reference;
58 59 
import eu.etaxonomy.cdm.model.reference.ReferenceFactory;
59 60 
import eu.etaxonomy.cdm.model.taxon.Classification;
......
918 919 
            if (genus != null){
919 920 
                higherNode = genus.getTaxonNodes().iterator().next();
920 921 
            }else{
921 
                BotanicalName name = BotanicalName.NewInstance(Rank.GENUS());
922 
                BotanicalName name = TaxonNameFactory.NewBotanicalInstance(Rank.GENUS());
922 923 
                name.addSource(makeOriginalSource(state));
923 924 
                name.setGenusOrUninomial(genusStr);
924 925 
                genus = Taxon.NewInstance(name, sec);
......
1223 1224 
    private BotanicalName makeFamilyName(CubaImportState state, String famStr) {
1224 1225 
        BotanicalName name = state.getFamilyName(famStr);
1225 1226 
        if (name == null){
1226 
            name = BotanicalName.NewInstance(Rank.FAMILY());
1227 
            name = TaxonNameFactory.NewBotanicalInstance(Rank.FAMILY());
1227 1228 
            name.setGenusOrUninomial(famStr);
1228 1229 
            state.putFamilyName(famStr, name);
1229 1230 
            name.addSource(makeOriginalSource(state));
......
1257 1258 
                classification.getRootNode().setUuid(rootUuid);
1258 1259 
            }
1259 1260 

  		




  1260
  
  
    
            BotanicalName plantaeName = BotanicalName.NewInstance(Rank.KINGDOM());


  		




  
  1261
  
    
            BotanicalName plantaeName = TaxonNameFactory.NewBotanicalInstance(Rank.KINGDOM());


  		




  1261
  1262
  
    
            plantaeName.setGenusOrUninomial("Plantae");


  		




  1262
  1263
  
    
            Taxon plantae = Taxon.NewInstance(plantaeName, sec);


  		




  1263
  1264
  
    
            TaxonNode plantaeNode = classification.addChildTaxon(plantae, null, null);


  		












Also available in:  Unified diff