Revision fdf9eec2
Added by Andreas Müller almost 10 years ago
cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/taxonx2013/TaxonXTreatmentExtractor.java | ||
---|---|---|
37 | 37 |
import eu.etaxonomy.cdm.model.agent.AgentBase; |
38 | 38 |
import eu.etaxonomy.cdm.model.agent.Person; |
39 | 39 |
import eu.etaxonomy.cdm.model.common.CdmBase; |
40 |
import eu.etaxonomy.cdm.model.common.DefinedTermBase; |
|
41 | 40 |
import eu.etaxonomy.cdm.model.common.IdentifiableSource; |
42 | 41 |
import eu.etaxonomy.cdm.model.common.LSID; |
43 | 42 |
import eu.etaxonomy.cdm.model.common.Language; |
... | ... | |
1400 | 1399 |
@SuppressWarnings("rawtypes") |
1401 | 1400 |
private Feature getFeatureObjectFromString(String featureName) { |
1402 | 1401 |
logger.info("getFeatureObjectFromString"); |
1403 |
List<DefinedTermBase> features = importer.getTermService().list(Feature.class, null,null,null,null);
|
|
1402 |
List<Feature> features = importer.getTermService().list(Feature.class, null,null,null,null);
|
|
1404 | 1403 |
Feature currentFeature=null; |
1405 |
for (DefinedTermBase feature: features){
|
|
1406 |
String tmpF = ((Feature)feature).getTitleCache();
|
|
1404 |
for (Feature feature: features){
|
|
1405 |
String tmpF = feature.getTitleCache();
|
|
1407 | 1406 |
if (tmpF.equalsIgnoreCase(featureName)) { |
1408 |
currentFeature=(Feature)feature;
|
|
1407 |
currentFeature=feature; |
|
1409 | 1408 |
// System.out.println("currentFeatureFromList "+currentFeature.getUuid()); |
1410 | 1409 |
} |
1411 | 1410 |
} |
... | ... | |
1864 | 1863 |
@SuppressWarnings("rawtypes") |
1865 | 1864 |
private Feature getNotMarkedUpFeatureObject() { |
1866 | 1865 |
logger.info("getNotMarkedUpFeatureObject"); |
1867 |
List<DefinedTermBase> features = importer.getTermService().list(Feature.class, null,null,null,null);
|
|
1866 |
List<Feature> features = importer.getTermService().list(Feature.class, null,null,null,null);
|
|
1868 | 1867 |
Feature currentFeature =null; |
1869 |
for (DefinedTermBase feat: features){
|
|
1870 |
String tmpF = ((Feature)feat).getTitleCache();
|
|
1868 |
for (Feature feat: features){
|
|
1869 |
String tmpF = feat.getTitleCache();
|
|
1871 | 1870 |
if (tmpF.equalsIgnoreCase(notMarkedUp)) { |
1872 |
currentFeature=(Feature)feat;
|
|
1871 |
currentFeature=feat; |
|
1873 | 1872 |
} |
1874 | 1873 |
} |
1875 | 1874 |
if (currentFeature == null) { |
... | ... | |
4545 | 4544 |
} |
4546 | 4545 |
} |
4547 | 4546 |
if (lsid !=null){ |
4548 |
List<TaxonBase> taxons = importer.getTaxonService().list(Taxon.class, 0, 0, null, null);
|
|
4547 |
List<Taxon> taxa = importer.getTaxonService().list(Taxon.class, 0, 0, null, null);
|
|
4549 | 4548 |
LSID currentlsid=null; |
4550 |
for (TaxonBase t:taxons){
|
|
4549 |
for (Taxon t:taxa){
|
|
4551 | 4550 |
currentlsid = t.getLsid(); |
4552 | 4551 |
if (currentlsid !=null){ |
4553 | 4552 |
if (currentlsid.getLsid().equals(lsid.getLsid())){ |
Also available in: Unified diff
better use of generics in service layer and persistence list methods