Project

General

Profile

« Previous | Next » 

Revision 5bfe953d

Added by Andreas Müller over 5 years ago

ref #7664 adapt app-import to typified return types

View differences:

app-import/src/main/java/eu/etaxonomy/cdm/io/wp6/CommonNameExcelImport.java
24 24
import eu.etaxonomy.cdm.io.common.mapping.UndefinedTransformerMethodException;
25 25
import eu.etaxonomy.cdm.io.excel.common.ExcelImportBase;
26 26
import eu.etaxonomy.cdm.io.excel.common.ExcelRowBase;
27
import eu.etaxonomy.cdm.model.common.DefinedTermBase;
28 27
import eu.etaxonomy.cdm.model.common.Language;
29 28
import eu.etaxonomy.cdm.model.common.OriginalSourceType;
30 29
import eu.etaxonomy.cdm.model.common.TermType;
......
182 181
				e.printStackTrace();
183 182
			}
184 183
			if (result == null){
185
				List<DefinedTermBase> candidates = getTermService().findByTitle(Country.class, area, null, criteria, null, null, orderHints, null).getRecords();
184
				List<? extends NamedArea> candidates = getTermService().findByTitle(Country.class, area, null, criteria, null, null, orderHints, null).getRecords();
186 185
				if (candidates.size() == 0){
187 186
					candidates = getTermService().findByTitle(NamedArea.class, area, null, criteria, null, null, orderHints, null).getRecords();
188 187
				}
189 188
				if (candidates.size()>0){
190 189
					//TODO
191
					result = (NamedArea)candidates.get(0);
190
					result = candidates.get(0);
192 191
				}else{
193 192
					UUID uuidArea;
194 193
					try {

Also available in: Unified diff