Project

General

Profile

« Previous | Next » 

Revision 531fc7bc

Added by Andreas Müller almost 8 years ago

Remove generics from Reference in cdmlib (except for cdmlib-model) #5830

View differences:

cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/taxonx2013/TaxonXImport.java
54 54
public class TaxonXImport extends SpecimenImportBase<TaxonXImportConfigurator, TaxonXImportState> implements ICdmIO<TaxonXImportState> {
55 55
    private static final Logger logger = Logger.getLogger(TaxonXImport.class);
56 56
    private static String prefix = "";
57
    
57

  
58 58
    public static String LOG_FOLDER = "C:\\Users\\pesiimport\\.cdmLibrary\\log\\taxonX\\";
59 59

  
60 60
    private Classification classification = null;
61
    private Reference<?> ref = null;
61
    private Reference ref = null;
62 62

  
63 63
    private TaxonXImportState taxonXstate;
64 64
    private TaxonXDataHolder dataHolder;
......
91 91
        logger.info("SET CLASSIFICATION "+classification);
92 92
        String classificationName = taxonXstate.getConfig().getClassificationName();
93 93
        String defaultClassificatioName = taxonXstate.getConfig().getImportClassificationName();
94
        
94

  
95 95
        List<Classification> classifList = getClassificationService().list(Classification.class, null, null, null, null);
96 96
        Map<String,Classification> classificationMap = new HashMap<String,Classification>();
97 97
        ArrayList<String> nodeList = new ArrayList<String>();
......
145 145
        ref=getReferenceService().find(ref.getUuid());
146 146
        if (!classificationMap.containsKey(s)){
147 147
            //System.out.println("Classif inconnue ?? "+s+", "+classifDic);
148
        	Reference<?> classificationReference = null;
149
        	        
148
        	Reference classificationReference = null;
149

  
150 150
        	if (s.equalsIgnoreCase(other)){
151 151
                classificationName = askForValue("classification name ?", classificationName);
152 152
            	classificationReference = ReferenceFactory.newDatabase();
......
216 216

  
217 217

  
218 218

  
219
        Reference<?> secundum = taxonXstate.getConfig().getSecundum();
219
        Reference secundum = taxonXstate.getConfig().getSecundum();
220 220
        List<Reference> references = this.getReferenceService().list(Reference.class, null, null, null, null);
221 221
        boolean refFound = false;
222
        for (Reference<?> re:references){
222
        for (Reference re:references){
223 223
            if (re.getCitation().equalsIgnoreCase(secundum.getCitation())){
224 224
                refFound = true;
225 225
                secundum = re;
......
234 234
        }
235 235

  
236 236

  
237
        Reference<?> urlRef = taxonXstate.getConfig().getOriginalSourceURL();
238
        for (Reference<?> re:references){
237
        Reference urlRef = taxonXstate.getConfig().getOriginalSourceURL();
238
        for (Reference re:references){
239 239
            if (re.getCitation().equalsIgnoreCase(urlRef.getCitation())){
240 240
                urlRef=re;
241 241
            }
......
359 359
        }
360 360
        return cR;
361 361
    }
362
    
362

  
363 363

  
364 364
    @Override
365 365
    protected boolean isIgnore(TaxonXImportState state) {

Also available in: Unified diff