Project

General

Profile

Revision c975a066

IDc975a066778240d962524aeb26300d814c9ace7e
Parent 77bc4e69
Child 7b179f56

Added by Patrick Plitzner over 3 years ago

Fix compile error - Remove generics from AbcdImportConfigurator

View differences:

eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/ImportManager.java
43 43
import eu.etaxonomy.cdm.io.sdd.in.SDDImportConfigurator;
44 44
import eu.etaxonomy.cdm.io.service.IIOService;
45 45
import eu.etaxonomy.cdm.io.specimen.abcd206.in.Abcd206ImportConfigurator;
46
import eu.etaxonomy.cdm.io.specimen.abcd206.in.Abcd206ImportState;
47 46
import eu.etaxonomy.cdm.io.specimen.excel.in.SpecimenCdmExcelImportConfigurator;
48 47
import eu.etaxonomy.cdm.io.specimen.gbif.in.GbifImportConfigurator;
49 48
import eu.etaxonomy.cdm.io.specimen.gbif.in.GbifImportState;
......
444 443

  
445 444
	}
446 445

  
447
	public Job createIOServiceJob(final Abcd206ImportConfigurator<Abcd206ImportState, InputStream> configurator) {
446
	public Job createIOServiceJob(final Abcd206ImportConfigurator configurator) {
448 447
		 Assert.isNotNull(configurator, "Configuration may not be null");
449 448
	        final Display display = Display.getDefault();
450 449
	        Job job = new Job("Import: " + " Dwca") {
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/AbcdImportConfiguratorWizardPage.java
18 18
import org.eclipse.swt.widgets.Composite;
19 19

  
20 20
import eu.etaxonomy.cdm.io.specimen.abcd206.in.Abcd206ImportConfigurator;
21
import eu.etaxonomy.cdm.io.specimen.abcd206.in.Abcd206ImportState;
22 21

  
23 22
/**
24
 * 
23
 *
25 24
 * @author pplitzner
26 25
 *
27 26
 */
28 27
public class AbcdImportConfiguratorWizardPage extends WizardPage {
29 28

  
30 29
	public static final String PAGE_NAME = "AbcdImportConfiguratorWizardPage";
31
	
32
	private Abcd206ImportConfigurator<Abcd206ImportState, ?> configurator;
33 30

  
34
	protected AbcdImportConfiguratorWizardPage(String title, String description, Abcd206ImportConfigurator<Abcd206ImportState, ?> configurator) {
31
	private Abcd206ImportConfigurator configurator;
32

  
33
	protected AbcdImportConfiguratorWizardPage(String title, String description, Abcd206ImportConfigurator configurator) {
35 34
		super(PAGE_NAME);
36 35
		this.configurator = configurator;
37 36
		setTitle(title);
38 37
		setDescription(description);
39 38
	}
40 39

  
41
	public static AbcdImportConfiguratorWizardPage createPage(Abcd206ImportConfigurator<Abcd206ImportState, ?> configurator){
40
	public static AbcdImportConfiguratorWizardPage createPage(Abcd206ImportConfigurator configurator){
42 41
		return new AbcdImportConfiguratorWizardPage("Configure import parameters",
43 42
				"Tooltips will explain parameters in more detail", configurator);
44 43
	}
......
76 75
				configurator.setIgnoreImportOfExistingSpecimen(!configurator.isIgnoreImportOfExistingSpecimen());
77 76
			}
78 77
		});
79
		
78

  
80 79
		Button checkBoxIgnoreAuthorship = new Button(composite, SWT.CHECK);
81 80
		checkBoxIgnoreAuthorship.setSelection(configurator.isIgnoreAuthorship());
82 81
		checkBoxIgnoreAuthorship.setText("Ignore Authorship for name matching");
......
89 88
				configurator.setIgnoreAuthorship(!configurator.isIgnoreAuthorship());
90 89
			}
91 90
		});
92
		
91

  
93 92
		Button checkBoxMapUnitIdToCatalogNumber = new Button(composite, SWT.CHECK);
94 93
		checkBoxMapUnitIdToCatalogNumber.setSelection(configurator.isMapUnitIdToCatalogNumber());
95 94
		checkBoxMapUnitIdToCatalogNumber.setText("Map UnitID to catalog number");
......
102 101
				configurator.setMapUnitIdToCatalogNumber(!configurator.isMapUnitIdToCatalogNumber());
103 102
			}
104 103
		});
105
		
104

  
106 105
		Button checkBoxMapUnitIdToAccessionNumber = new Button(composite, SWT.CHECK);
107 106
		checkBoxMapUnitIdToAccessionNumber.setSelection(configurator.isMapUnitIdToAccessionNumber());
108 107
		checkBoxMapUnitIdToAccessionNumber.setText("Map UnitID to accession number");
......
115 114
				configurator.setMapUnitIdToAccessionNumber(!configurator.isMapUnitIdToAccessionNumber());
116 115
			}
117 116
		});
118
		
117

  
119 118
		Button checkBoxMapUnitIdToBarcode = new Button(composite, SWT.CHECK);
120 119
		checkBoxMapUnitIdToBarcode.setSelection(configurator.isMapUnitIdToBarcode());
121 120
		checkBoxMapUnitIdToBarcode.setText("Map UnitID to barcode");
......
128 127
				configurator.setMapUnitIdToBarcode(!configurator.isMapUnitIdToBarcode());
129 128
			}
130 129
		});
131
		
130

  
132 131
		Button checkBoxRemoveCountry = new Button(composite, SWT.CHECK);
133 132
		checkBoxRemoveCountry.setSelection(configurator.isRemoveCountryFromLocalityText());
134 133
		checkBoxRemoveCountry.setText("Remove country from locality text");
......
142 141
				configurator.setRemoveCountryFromLocalityText(!configurator.isRemoveCountryFromLocalityText());
143 142
			}
144 143
		});
145
		
144

  
146 145
		Button checkBoxMoveToDefaultClassification = new Button(composite, SWT.CHECK);
147 146
		checkBoxMoveToDefaultClassification.setSelection(configurator.isMoveNewTaxaToDefaultClassification());
148 147
		checkBoxMoveToDefaultClassification.setText("Create new classification for new taxa");
......
155 154
				configurator.setRemoveCountryFromLocalityText(!configurator.isRemoveCountryFromLocalityText());
156 155
			}
157 156
		});
158
		
157

  
159 158
		setControl(composite);
160 159
	}
161
	
160

  
162 161
}

Also available in: Unified diff

Add picture from clipboard (Maximum size: 40 MB)