Project

General

Profile

« Previous | Next » 

Revision c5d04eba

Added by Andreas Müller over 2 years ago

cleanup

View differences:

app-import/src/main/java/eu/etaxonomy/cdm/io/greece/FloraHellenicaImportBase.java
19 19
import eu.etaxonomy.cdm.io.mexico.SimpleExcelTaxonImportState;
20 20
import eu.etaxonomy.cdm.model.common.IdentifiableSource;
21 21
import eu.etaxonomy.cdm.model.description.TaxonDescription;
22
import eu.etaxonomy.cdm.model.name.IBotanicalName;
23
import eu.etaxonomy.cdm.model.name.INonViralName;
24 22
import eu.etaxonomy.cdm.model.name.Rank;
25 23
import eu.etaxonomy.cdm.model.name.TaxonName;
26 24
import eu.etaxonomy.cdm.model.name.TaxonNameFactory;
......
141 139
    }
142 140

  
143 141

  
144
    protected IBotanicalName makeFamilyName(SimpleExcelTaxonImportState<CONFIG> state,
142
    protected TaxonName makeFamilyName(SimpleExcelTaxonImportState<CONFIG> state,
145 143
            String famStr) {
146 144
        TaxonName name = TaxonNameFactory.NewBotanicalInstance(Rank.FAMILY());
147 145
        famStr = famStr.substring(0,1).toUpperCase() + famStr.substring(1).toLowerCase();
......
150 148
        return name;
151 149
    }
152 150

  
153
    protected <NAME extends INonViralName> NAME replaceNameAuthorsAndReferences(SimpleExcelTaxonImportState<CONFIG> state, NAME name) {
154
        NAME result = state.getDeduplicationHelper().getExistingName(name);
151
    protected TaxonName replaceNameAuthorsAndReferences(SimpleExcelTaxonImportState<CONFIG> state, TaxonName name) {
152
        TaxonName result = state.getDeduplicationHelper().getExistingName(name);
155 153
        state.getDeduplicationHelper().replaceAuthorNamesAndNomRef(result);
156 154
        return result;
157 155
    }

Also available in: Unified diff