ref #6794 remove OrderedTermBase in app-import

diff --git a/app-import/src/main/java/eu/etaxonomy/cdm/io/greece/FloraHellenicaTermImport.java b/app-import/src/main/java/eu/etaxonomy/cdm/io/greece/FloraHellenicaTermImport.java
index 7933a829969fcb26b0a53dbb7f7b98e67a44791b..ba6409594e7497f4c9ac11db6d8e2b707efc2a4a 100644 (file)
--- a/app-import/src/main/java/eu/etaxonomy/cdm/io/greece/FloraHellenicaTermImport.java
+++ b/app-import/src/main/java/eu/etaxonomy/cdm/io/greece/FloraHellenicaTermImport.java
@@ -27,7 +27,7 @@ import eu.etaxonomy.cdm.model.description.PresenceAbsenceTerm;
 import eu.etaxonomy.cdm.model.description.State;
 import eu.etaxonomy.cdm.model.location.NamedArea;
 import eu.etaxonomy.cdm.model.location.NamedAreaType;
-import eu.etaxonomy.cdm.model.term.OrderedTermBase;
+import eu.etaxonomy.cdm.model.term.DefinedTermBase;
 import eu.etaxonomy.cdm.model.term.OrderedTermVocabulary;
 import eu.etaxonomy.cdm.model.term.TermNode;
 import eu.etaxonomy.cdm.model.term.TermTree;
@@ -405,8 +405,6 @@ public class FloraHellenicaTermImport <CONFIG extends FloraHellenicaImportConfig
         addStatus(state, "RR", "Range-restricted", "", FloraHellenicaTransformer.uuidStatusRangeRestricted, statusVoc);
         addStatus(state, "?RR", "?Range-restricted", "", FloraHellenicaTransformer.uuidStatusRangeRestrictedDoubtfully, statusVoc);
 
-
-
         this.getVocabularyService().save(statusVoc);
         return;
     }
@@ -482,11 +480,11 @@ public class FloraHellenicaTermImport <CONFIG extends FloraHellenicaImportConfig
         return newState;
     }
 
-    private OrderedTermBase addStatus(SimpleExcelTaxonImportState<FloraHellenicaImportConfigurator> state,
+    private DefinedTermBase addStatus(SimpleExcelTaxonImportState<FloraHellenicaImportConfigurator> state,
             String abbrev, String stateLabel, String description, UUID uuid,
             OrderedTermVocabulary voc) {
         FloraHellenicaImportConfigurator config = state.getConfig();
-        OrderedTermBase<?> newStatus;
+        DefinedTermBase<?> newStatus;
         if (config.isStatusAsDistribution()){
             newStatus = PresenceAbsenceTerm.NewPresenceInstance( description, stateLabel, abbrev);
         }else{

diff --git a/app-import/src/main/java/eu/etaxonomy/cdm/io/redlist/bfnXml/in/BfnXmlImportAddtionalTerms.java b/app-import/src/main/java/eu/etaxonomy/cdm/io/redlist/bfnXml/in/BfnXmlImportAddtionalTerms.java
index 05fdb2bf776724967cea558a5ca9467813f5d546..fe769eefad1141e1ad79eeb6cad9103b75df8a38 100644 (file)
--- a/app-import/src/main/java/eu/etaxonomy/cdm/io/redlist/bfnXml/in/BfnXmlImportAddtionalTerms.java
+++ b/app-import/src/main/java/eu/etaxonomy/cdm/io/redlist/bfnXml/in/BfnXmlImportAddtionalTerms.java
@@ -24,7 +24,6 @@ import eu.etaxonomy.cdm.model.location.NamedArea;
 import eu.etaxonomy.cdm.model.location.NamedAreaLevel;
 import eu.etaxonomy.cdm.model.location.NamedAreaType;
 import eu.etaxonomy.cdm.model.term.DefinedTermBase;
-import eu.etaxonomy.cdm.model.term.OrderedTermBase;
 import eu.etaxonomy.cdm.model.term.OrderedTermVocabulary;
 import eu.etaxonomy.cdm.model.term.TermType;
 import eu.etaxonomy.cdm.model.term.TermVocabulary;
@@ -249,12 +248,6 @@ public class BfnXmlImportAddtionalTerms extends BfnXmlImportBase {
        }
        }
 
-
-       /**
-        * @param vocabularyService
-        * @param term
-        * @param vocUUID
-        */
        @SuppressWarnings({ "unchecked", "rawtypes" })
        private OrderedTermVocabulary createOrUpdateTermVocabulary(TermType termType, IVocabularyService vocabularyService, DefinedTermBase term, String strTermVocabulary) {
                OrderedTermVocabulary termVocabulary = null;
@@ -284,7 +277,7 @@ public class BfnXmlImportAddtionalTerms extends BfnXmlImportBase {
                                termVocabulary.setUuid(vocUUID);
                        }
                }
-               termVocabulary.addTerm((OrderedTermBase) term);
+               termVocabulary.addTerm(term);
                vocabularyService.saveOrUpdate(termVocabulary);
 
                return termVocabulary;