final commit of Taraxacum import on behalf of anahit

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/ImportStateBase.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/ImportStateBase.java
index 656c2a92476bebf8099ff9b55b1cf04988837b75..c10472a3890ac2ef43e6d3a056237b6a30f20207 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/ImportStateBase.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/ImportStateBase.java
@@ -36,7 +36,7 @@ public abstract class ImportStateBase<CONFIG extends ImportConfiguratorBase> ext
        @SuppressWarnings("unused")\r
        private static final Logger logger = Logger.getLogger(ImportStateBase.class);\r
        \r
-       private Map<ReferenceBase,TaxonomicTree> treeMap = new HashMap<ReferenceBase,TaxonomicTree>();\r
+       private Map<Object,TaxonomicTree> treeMap = new HashMap<Object,TaxonomicTree>();\r
 \r
        private Map<ReferenceBase,UUID> treeUuidMap = new HashMap<ReferenceBase,UUID>();\r
 \r
@@ -83,14 +83,14 @@ public abstract class ImportStateBase<CONFIG extends ImportConfiguratorBase> ext
        /**\r
         * @return the treeMap\r
         */\r
-       public TaxonomicTree getTree(ReferenceBase ref) {\r
+       public TaxonomicTree getTree(Object ref) {\r
                return treeMap.get(ref);\r
        }\r
 \r
        /**\r
         * @param treeMap the treeMap to set\r
         */\r
-       public void putTree(ReferenceBase ref, TaxonomicTree tree) {\r
+       public void putTree(Object ref, TaxonomicTree tree) {\r
                if (tree != null){\r
                        this.treeMap.put(ref, tree);\r
                }\r

diff --git a/cdmlib-io/src/test/resources/eu/etaxonomy/cdm/io/excel/taxa/DenormalExplicit.xls b/cdmlib-io/src/test/resources/eu/etaxonomy/cdm/io/excel/taxa/DenormalExplicit.xls
index e7c458b34467d90b1de00290385c781e45cc9969..920c2144097214a23b5fdf54c2411954654ed02b 100644 (file)
Binary files a/cdmlib-io/src/test/resources/eu/etaxonomy/cdm/io/excel/taxa/DenormalExplicit.xls and b/cdmlib-io/src/test/resources/eu/etaxonomy/cdm/io/excel/taxa/DenormalExplicit.xls differ