Project

General

Profile

« Previous | Next » 

Revision 22e0d6ae

Added by Andreas Müller over 4 years ago

ref #8509 use EnumSet instead of BitSet for source definition

View differences:

cdm-pesi/src/main/java/eu/etaxonomy/cdm/io/pesi/out/PesiTransformer.java
10 10

  
11 11
import java.sql.ResultSet;
12 12
import java.sql.SQLException;
13
import java.util.BitSet;
13
import java.util.EnumSet;
14 14
import java.util.HashMap;
15 15
import java.util.HashSet;
16 16
import java.util.Map;
......
26 26
import eu.etaxonomy.cdm.io.common.mapping.UndefinedTransformerMethodException;
27 27
import eu.etaxonomy.cdm.io.common.mapping.out.ExportTransformerBase;
28 28
import eu.etaxonomy.cdm.io.pesi.erms.ErmsTransformer;
29
import eu.etaxonomy.cdm.io.pesi.out.PesiExportBase.PesiSource;
29 30
import eu.etaxonomy.cdm.model.common.CdmBase;
30 31
import eu.etaxonomy.cdm.model.common.Language;
31 32
import eu.etaxonomy.cdm.model.common.RelationshipBase;
......
2097 2098
		return result;
2098 2099
	}
2099 2100

  
2100
	public static Integer getQualityStatusKeyBySource(BitSet sources, TaxonName taxonName) {
2101
		if (sources.get(SOURCE_EM)){
2101
	public static Integer getQualityStatusKeyBySource(EnumSet<PesiSource> sources, TaxonName taxonName) {
2102
		if (sources.contains(PesiSource.EM)){
2102 2103
			return QUALITY_STATUS_ADD_BY_DBMT;
2103
		}else if (sources.get(SOURCE_ERMS)){
2104
		}else if (sources.contains(PesiSource.ERMS)){
2104 2105
			Set<String> statusSet = getAllQualityStatus(taxonName);
2105 2106
			if (statusSet.size() > 1){
2106 2107
				logger.warn("ERMS TaxonName has more than 1 quality status: " + taxonName.getTitleCache() + "; lisd=" + taxonName.getLsid());
......
2172 2173
		}
2173 2174
	}
2174 2175

  
2175
	public static String getOriginalDbBySources(BitSet sources) {
2176
	public static String getOriginalDbBySources(EnumSet<PesiSource> sources) {
2176 2177
		String result = "";
2177
		if (sources.get(SOURCE_EM)){
2178
		if (sources.contains(PesiSource.EM)){
2178 2179
			result = CdmUtils.concat(",", result,  SOURCE_STR_EM);
2179 2180
		}
2180
		if (sources.get(SOURCE_FE)){
2181
		if (sources.contains(PesiSource.FE)){
2181 2182
			result = CdmUtils.concat(",", result,  SOURCE_STR_FE);
2182 2183
		}
2183
		if (sources.get(SOURCE_IF)){
2184
		if (sources.contains(PesiSource.IF)){
2184 2185
			result = CdmUtils.concat(",", result,  SOURCE_STR_IF);
2185 2186
		}
2186
		if (sources.get(SOURCE_ERMS)){
2187
		if (sources.contains(PesiSource.ERMS)){
2187 2188
			result = CdmUtils.concat(",", result,  SOURCE_STR_ERMS);
2188 2189
		}
2189 2190

  

Also available in: Unified diff