Project

General

Profile

« Previous | Next » 

Revision bff0daf9

Added by Andreas Müller over 4 years ago

fix some compile errors in ERMS and FauEu

View differences:

cdm-pesi/src/main/java/eu/etaxonomy/cdm/io/pesi/erms/ErmsImportRankMap.java
87 87
                            if (rankId == 214){
88 88
                                rank = Rank.SPECIESAGGREGATE();
89 89
                            }else if (rankId == 216){
90
                                rank = getRank(state, ErmsTransformer.uuidRankCollectiveSpecies, "Collective Species", "Collective Species", "Coll. sp.", voc, Rank.INFRACLASS(), RankClass.Suprageneric);
90
                                rank = getRank(state, Rank.uuidRankCollSpecies, "Collective Species", "Collective Species", "Coll. sp.", voc, Rank.INFRACLASS(), RankClass.Suprageneric);
91 91
                            }
92 92
                        }
93 93
                    }
cdm-pesi/src/main/java/eu/etaxonomy/cdm/io/pesi/erms/ErmsTransformer.java
16 16
import org.apache.commons.lang.StringUtils;
17 17
import org.apache.log4j.Logger;
18 18

  
19
import eu.etaxonomy.cdm.io.berlinModel.BerlinModelTransformer;
20 19
import eu.etaxonomy.cdm.io.common.mapping.InputTransformerBase;
21 20
import eu.etaxonomy.cdm.io.common.mapping.UndefinedTransformerMethodException;
22 21
import eu.etaxonomy.cdm.model.common.ExtensionType;
......
50 49
	public static final UUID uuidRankSuperdomain = UUID.fromString("66d4d773-4946-4e02-b758-8903563eaa26");
51 50
    public static final UUID uuidRankSubterclass = UUID.fromString("39257363-913b-4b3a-a536-b415360dfc8c");
52 51
    public static final UUID uuidRankParvorder = UUID.fromString("d26b8cae-96f9-4aee-81f2-98e36f1db7c3");
53
    public static final UUID uuidRankCollectiveSpecies = BerlinModelTransformer.uuidRankCollSpecies;
54

  
55 52

  
56 53

  
57 54
	//language uuids
cdm-pesi/src/main/java/eu/etaxonomy/cdm/io/pesi/faunaEuropaea/FaunaEuropaeaVernacularNamesImport.java
32 32

  
33 33
@Component
34 34
public class FaunaEuropaeaVernacularNamesImport extends FaunaEuropaeaImportBase {
35
	private static final Logger logger = Logger.getLogger(FaunaEuropaeaVernacularNamesImport.class);
35

  
36
    private static final long serialVersionUID = 168771351441040059L;
37

  
38
    private static final Logger logger = Logger.getLogger(FaunaEuropaeaVernacularNamesImport.class);
36 39

  
37 40
	private HashMap<String, Reference> sourceMap = new HashMap<String, Reference>();
38 41
	private Reference pesiProject = ReferenceFactory.newDatabase();
......
281 284
					if (lang == null){
282 285
						UUID uuidLanguageVoc = UUID.fromString("434cea89-9052-4567-b2db-ff77f42e9084");
283 286
						logger.info("languageFk = " + fauEuHelperVernacularName.getLanguageFk());
284
						TermVocabulary<Language> voc = getVocabulary(TermType.Language, uuidLanguageVoc, "User Defined Languages", "User Defined Languages", null, null, false, lang);
287
						TermVocabulary<Language> voc = getVocabulary(state, TermType.Language, uuidLanguageVoc, "User Defined Languages", "User Defined Languages", null, null, false, lang);
285 288
						lang = Language.NewInstance("Dummy", "", "");
286 289
						voc.addTerm(lang);
287 290
						lang =(Language)getTermService().save(lang);

Also available in: Unified diff