Project

General

Profile

« Previous | Next » 

Revision c2877394

Added by Andreas Müller almost 7 years ago

fix #6790 IO class hierarchy creates problems in eclipse in cdmlib-apps

View differences:

app-import/src/main/java/eu/etaxonomy/cdm/app/caryophyllales/TaxonExcelCaryophyllales.java
1 1
package eu.etaxonomy.cdm.app.caryophyllales;
2 2

  
3 3
import eu.etaxonomy.cdm.io.excel.taxa.NormalExplicitRow;
4
import eu.etaxonomy.cdm.io.excel.taxa.TaxonExcelImportBase;
4 5
import eu.etaxonomy.cdm.io.excel.taxa.TaxonExcelImportState;
5
import eu.etaxonomy.cdm.io.excel.taxa.TaxonExcelImporterBase;
6 6

  
7
public class TaxonExcelCaryophyllales extends TaxonExcelImporterBase {
7
public class TaxonExcelCaryophyllales extends TaxonExcelImportBase {
8 8
    private static final long serialVersionUID = 7516628978483172010L;
9 9
    protected static final String AUTHOR_COLUMN = "Authorship";
10 10
	protected static final String SPECIES_HYBRID_MARKER = "Species hybrid marker";
app-import/src/main/java/eu/etaxonomy/cdm/io/cuba/CubaExcelImport.java
25 25

  
26 26
import eu.etaxonomy.cdm.common.CdmUtils;
27 27
import eu.etaxonomy.cdm.io.common.mapping.UndefinedTransformerMethodException;
28
import eu.etaxonomy.cdm.io.excel.common.ExcelImporterBase;
28
import eu.etaxonomy.cdm.io.excel.common.ExcelImportBase;
29
import eu.etaxonomy.cdm.io.excel.common.ExcelRowBase;
29 30
import eu.etaxonomy.cdm.model.agent.Person;
30 31
import eu.etaxonomy.cdm.model.agent.Team;
31 32
import eu.etaxonomy.cdm.model.agent.TeamOrPersonBase;
......
74 75
 */
75 76

  
76 77
@Component
77
public class CubaExcelImport extends ExcelImporterBase<CubaImportState> {
78
public class CubaExcelImport
79
        extends ExcelImportBase<CubaImportState, CubaImportConfigurator, ExcelRowBase> {
78 80
    private static final long serialVersionUID = -747486709409732371L;
79 81
    private static final Logger logger = Logger.getLogger(CubaExcelImport.class);
80 82

  
app-import/src/main/java/eu/etaxonomy/cdm/io/cyprus/CyprusDistributionImport.java
26 26
import eu.etaxonomy.cdm.common.CdmUtils;
27 27
import eu.etaxonomy.cdm.io.common.mapping.IInputTransformer;
28 28
import eu.etaxonomy.cdm.io.common.mapping.UndefinedTransformerMethodException;
29
import eu.etaxonomy.cdm.io.excel.common.ExcelImporterBase;
29
import eu.etaxonomy.cdm.io.excel.common.ExcelImportBase;
30
import eu.etaxonomy.cdm.io.excel.common.ExcelRowBase;
30 31
import eu.etaxonomy.cdm.model.common.CdmBase;
31 32
import eu.etaxonomy.cdm.model.common.OriginalSourceType;
32 33
import eu.etaxonomy.cdm.model.common.TermType;
......
51 52
 */
52 53

  
53 54
@Component
54
public class CyprusDistributionImport extends ExcelImporterBase<CyprusImportState> {
55
public class CyprusDistributionImport
56
       extends ExcelImportBase<CyprusImportState, CyprusImportConfigurator, ExcelRowBase> {
55 57
    private static final long serialVersionUID = -8527569026580975181L;
56 58
    private static final Logger logger = Logger.getLogger(CyprusDistributionImport.class);
57 59

  
app-import/src/main/java/eu/etaxonomy/cdm/io/cyprus/CyprusExcelImport.java
24 24
import eu.etaxonomy.cdm.io.common.TdwgAreaProvider;
25 25
import eu.etaxonomy.cdm.io.common.mapping.IInputTransformer;
26 26
import eu.etaxonomy.cdm.io.common.mapping.UndefinedTransformerMethodException;
27
import eu.etaxonomy.cdm.io.excel.common.ExcelImporterBase;
27
import eu.etaxonomy.cdm.io.excel.common.ExcelImportBase;
28
import eu.etaxonomy.cdm.io.excel.common.ExcelRowBase;
28 29
import eu.etaxonomy.cdm.model.common.Language;
29 30
import eu.etaxonomy.cdm.model.description.Distribution;
30 31
import eu.etaxonomy.cdm.model.description.Feature;
......
50 51
 */
51 52

  
52 53
@Component
53
public class CyprusExcelImport extends ExcelImporterBase<CyprusImportState> {
54
	private static final Logger logger = Logger.getLogger(CyprusExcelImport.class);
54
public class CyprusExcelImport
55
        extends ExcelImportBase<CyprusImportState, CyprusImportConfigurator, ExcelRowBase> {
56

  
57
    private static final long serialVersionUID = 4449832452730987788L;
58

  
59
    private static final Logger logger = Logger.getLogger(CyprusExcelImport.class);
55 60

  
56 61
	public static Set<String> validMarkers = new HashSet<String>(Arrays.asList(new String[]{"", "valid", "accepted", "a", "v", "t"}));
57 62
	public static Set<String> synonymMarkers = new HashSet<String>(Arrays.asList(new String[]{"", "invalid", "synonym", "s", "i"}));
......
127 132
    	state.setCyprusRow(cyprusRow);
128 133

  
129 134
    	for (String originalKey: keys) {
130
    		Integer index = 0;
131 135
    		String indexedKey = CdmUtils.removeDuplicateWhitespace(originalKey.trim()).toString();
132 136
    		String[] split = indexedKey.split("_");
133 137
    		String key = split[0];
134 138
    		if (split.length > 1){
135 139
    			String indexString = split[1];
136 140
    			try {
137
					index = Integer.valueOf(indexString);
141
					Integer.valueOf(indexString);
138 142
				} catch (NumberFormatException e) {
139 143
					String message = "Index must be integer";
140 144
					logger.error(message);
......
193 197
    	return;
194 198
    }
195 199

  
196
	private static INonViralNameParser nameParser = NonViralNameParserImpl.NewInstance();
200
	private static INonViralNameParser<INonViralName> nameParser = NonViralNameParserImpl.NewInstance();
197 201
	private static NomenclaturalCode nc = NomenclaturalCode.ICNAFP;
198 202
	private Feature redBookCategory;
199 203
	private Feature endemism;
......
513 517
	 * @param nc
514 518
	 * @return
515 519
	 */
516
	private TaxonBase createTaxon(CyprusImportState state, Rank rank, String taxonNameStr,
517
			Class statusClass, NomenclaturalCode nc) {
518
		TaxonBase taxonBase;
520
	private TaxonBase<?> createTaxon(CyprusImportState state, Rank rank, String taxonNameStr,
521
			Class<?> statusClass, NomenclaturalCode nc) {
522
		TaxonBase<?> taxonBase;
519 523
		INonViralName taxonNameBase = null;
520 524
		if (nc == NomenclaturalCode.ICVCN){
521 525
			logger.warn("ICVCN not yet supported");
......
552 556
		Classification tree = state.getTree(sec);
553 557
		if (tree == null){
554 558
			tree = makeTree(state, sec);
555
			tree.setTitleCache(state.getConfig().getSourceReferenceTitle());
559
			tree.setTitleCache(state.getConfig().getSourceReferenceTitle(), true);
556 560
		}
557 561
		if (sec.equals(childTaxon.getSec())){
558 562
			success &=  (null !=  tree.addParentChild(parentTaxon, childTaxon, citation, microCitation));
app-import/src/main/java/eu/etaxonomy/cdm/io/mexico/SimpleExcelTaxonImport.java
15 15

  
16 16
import org.apache.log4j.Logger;
17 17

  
18
import eu.etaxonomy.cdm.io.excel.common.ExcelImportBase;
18 19
import eu.etaxonomy.cdm.io.excel.common.ExcelImportConfiguratorBase;
19
import eu.etaxonomy.cdm.io.excel.common.ExcelImporterBase;
20
import eu.etaxonomy.cdm.io.excel.common.ExcelRowBase;
20 21
import eu.etaxonomy.cdm.model.agent.Person;
21 22
import eu.etaxonomy.cdm.model.agent.Team;
22 23
import eu.etaxonomy.cdm.model.agent.TeamOrPersonBase;
......
38 39
 * @date 16.06.2016
39 40
 */
40 41
public abstract class SimpleExcelTaxonImport<CONFIG extends ExcelImportConfiguratorBase>
41
        extends ExcelImporterBase<SimpleExcelTaxonImportState<CONFIG>>{
42
        extends ExcelImportBase<SimpleExcelTaxonImportState<CONFIG>, CONFIG, ExcelRowBase>{
42 43

  
43 44
    private static final long serialVersionUID = -4345647703312616421L;
44 45

  
app-import/src/main/java/eu/etaxonomy/cdm/io/wp6/CommonNameExcelImport.java
22 22

  
23 23
import eu.etaxonomy.cdm.common.CdmUtils;
24 24
import eu.etaxonomy.cdm.io.common.mapping.UndefinedTransformerMethodException;
25
import eu.etaxonomy.cdm.io.excel.common.ExcelImporterBase;
25
import eu.etaxonomy.cdm.io.excel.common.ExcelImportBase;
26
import eu.etaxonomy.cdm.io.excel.common.ExcelRowBase;
26 27
import eu.etaxonomy.cdm.model.common.DefinedTermBase;
27 28
import eu.etaxonomy.cdm.model.common.Language;
28 29
import eu.etaxonomy.cdm.model.common.OriginalSourceType;
......
43 44
 */
44 45

  
45 46
@Component
46
public class CommonNameExcelImport extends ExcelImporterBase<CichorieaeCommonNameImportState> {
47
public class CommonNameExcelImport
48
            extends ExcelImportBase<CichorieaeCommonNameImportState, CommonNameImportConfigurator, ExcelRowBase> {
47 49

  
48 50
    private static final long serialVersionUID = 747044451715401750L;
49 51
    private static final Logger logger = Logger.getLogger(CommonNameExcelImport.class);
app-import/src/main/java/eu/etaxonomy/cdm/io/wp6/CommonNameRow.java
27 27
/**
28 28
 * @author a.babadshanjan
29 29
 * @created 13.01.2009
30
 * @version 1.0
31 30
 */
32 31
public class CommonNameRow {
32

  
33 33
	private static final Logger logger = Logger.getLogger(CommonNameRow.class);
34 34

  
35 35

  

Also available in: Unified diff