Project

General

Profile

« Previous | Next » 

Revision 2720ea2c

Added by Andreas Müller over 3 years ago

cleanup

View differences:

cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/descriptive/owl/in/StructureTreeOwlImport.java
33 33
/**
34 34
 * @author pplitzner
35 35
 * @since Apr 24, 2019
36
 *
37 36
 */
38 37
@Component("structureTreeOwlImport")
39 38
public class StructureTreeOwlImport extends CdmImportBase<StructureTreeOwlImportConfigurator, StructureTreeOwlImportState> {
40 39

  
41 40
    private static final long serialVersionUID = -3659780404413458511L;
42

  
43
    static final org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(StructureTreeOwlImport.class);
44

  
41
    private static final org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(StructureTreeOwlImport.class);
45 42

  
46 43
    @Override
47 44
    protected boolean doCheck(StructureTreeOwlImportState state) {
......
60 57
        while(iterator.hasNext()){
61 58
            Resource treeResource = iterator.next();
62 59
            UUID treeUuid = UUID.fromString(treeResource.getProperty(OwlUtil.propUuid).getString());
63
            TermTree termTree = getTermTreeService().find(treeUuid);
60
            TermTree<?> termTree = getTermTreeService().find(treeUuid);
64 61
            if(termTree==null){
65 62
                String type = treeResource.getProperty(OwlUtil.propType).getString();
66 63
                TermTree<Feature> featureTree = TermTree.NewInstance(TermType.getByKey(type));
......
97 94
            // import term
98 95
            UUID termUuid = UUID.fromString(termResource.getProperty(OwlUtil.propUuid).getString());
99 96
            T term = (T)getTermService().find(termUuid);
100
            if(term==null){
97
            if(term == null){
101 98
                term = (T)OwlImportUtil.createTerm(termResource, this, model, state);
102
                term = (T) getTermService().save(term);
99
                term = getTermService().save(term);
103 100
                vocabulary.addTerm(term); // only add term if it does not already exist
104 101
            }
105 102

  
......
153 150
        return featureState;
154 151
    }
155 152

  
156

  
157

  
158 153
    @Override
159 154
    protected boolean isIgnore(StructureTreeOwlImportState state) {
160 155
        return false;
161 156
    }
162

  
163
}
157
}

Also available in: Unified diff