Project

General

Profile

« Previous | Next » 

Revision ea7deae0

Added by Andreas Müller almost 7 years ago

fix #6671 remove generics for TaxonName

View differences:

app-import/src/main/java/eu/etaxonomy/cdm/io/greece/FloraHellenicaSynonymImport.java
130 130
        if (misappliedNecAuthor != null){
131 131
            nvn.setAuthorshipCache(misappliedNecAuthor);
132 132
        }
133
        TaxonName<?,?> name = TaxonName.castAndDeproxy(nvn);
133
        TaxonName name = TaxonName.castAndDeproxy(nvn);
134 134

  
135 135
        if (hasStatus){
136 136
            try {
......
171 171
     * @param parsedSynStr
172 172
     */
173 173
    private void handleSynonymNon(SimpleExcelTaxonImportState<CONFIG> state,
174
            TaxonName<?, ?> name, String nonPart, String line) {
174
            TaxonName name, String nonPart, String line) {
175 175
        String[] splits = nonPart.split(" nec ");
176 176

  
177
        TaxonNameBase<?,?> lastHomonym = null;
177
        TaxonName lastHomonym = null;
178 178
        for (String split : splits){
179 179
            split = split.trim();
180 180
//            Saponaria illyrica Ard.
......
182 182
//            S. columnae Aurnier
183 183
//            S. columnae Aurnier nec (Rchb. f.) H. Fleischm.
184 184
//            T. glaucescens Rchb.
185
            TaxonName<?,?> nonName;
185
            TaxonName nonName;
186 186
            if (split.matches("(Saponaria illyrica Ard.|Crepis nemausensis Gouan|S. columnae Aurnier|T. glaucescens Rchb.|Linaria stricta Guss.)"
187 187
                    + "")){
188 188
                if (split.startsWith("S.")){

Also available in: Unified diff