Project

General

Profile

« Previous | Next » 

Revision 1594c653

Added by Andreas Müller over 2 years ago

ref #9890 move importDeduplicationHelper to import state and include state in helper (cont.)

View differences:

cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/ImportStateBase.java
53 53

  
54 54
	private boolean isCheck;
55 55

  
56
    private ImportDeduplicationHelper<ImportStateBase<CONFIG,?>> deduplicationHelper;
56
    private ImportDeduplicationHelper deduplicationHelper;
57 57

  
58 58
	private Map<Object,Classification> treeMap = new HashMap<>();
59 59

  
......
402 402
        return null;
403 403
    }
404 404

  
405
    public ImportDeduplicationHelper<ImportStateBase<CONFIG,?>> getDeduplicationHelper() {
405
    public ImportDeduplicationHelper getDeduplicationHelper() {
406 406
        return deduplicationHelper;
407 407
    }
408
    public void setDeduplicationHelper(ImportDeduplicationHelper<ImportStateBase<CONFIG,?>> deduplicationHelper) {
408
    public void setDeduplicationHelper(ImportDeduplicationHelper deduplicationHelper) {
409 409
        this.deduplicationHelper = deduplicationHelper;
410 410
    }
411 411

  
412 412
    @Override
413 413
    public void setCurrentIO(IO currentIO) {
414 414
        super.setCurrentIO(currentIO);
415
        this.deduplicationHelper.reset();
415
        if (this.deduplicationHelper != null){
416
            this.deduplicationHelper.reset();
417
        }
416 418
        this.deduplicationHelper = ImportDeduplicationHelper.NewInstance(currentIO, this);
417 419
    }
418 420
}

Also available in: Unified diff