ImportWrapper for JAXB

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/ImportWrapper.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/ImportWrapper.java
index a20b3359e275b53f6a2c29ea9a2ff173f56362aa..21841ba92a7e28185963d6bb420c1cd8558f7128 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/ImportWrapper.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/ImportWrapper.java
@@ -44,13 +44,14 @@ public class ImportWrapper {
                result.add(wrapper);\r
                wrapper = TcsXml101WrapperInstance();\r
                result.add(wrapper);\r
-               \r
+               wrapper = Jaxb10WrapperInstance();\r
+               result.add(wrapper);\r
                return result;\r
        }\r
        \r
        public static ImportWrapper Abcd206WrapperInstance(){\r
                String label = "ABCD 2.06";\r
-               Class clazz = CdmDefaultImport.class;\r
+               Class<? extends ICdmImport> clazz = CdmDefaultImport.class;\r
                IImportConfigurator config = SpecimenImportConfigurator.NewInstance(null, null);\r
                ImportWrapper wrapper = new ImportWrapper();\r
                wrapper.setLabel(label);\r
@@ -62,7 +63,7 @@ public class ImportWrapper {
        \r
        public static ImportWrapper TcsXml101WrapperInstance(){\r
                String label = "TcsXML 1.1";\r
-               Class clazz = CdmDefaultImport.class;\r
+               Class<? extends ICdmImport> clazz = CdmDefaultImport.class;\r
                IImportConfigurator config = TcsXmlImportConfigurator.NewInstance(null, null);\r
                ImportWrapper wrapper = new ImportWrapper();\r
                wrapper.setLabel(label);\r
@@ -72,7 +73,7 @@ public class ImportWrapper {
        }\r
        \r
        \r
-       public static ImportWrapper JaxbWrapperInstance(){\r
+       public static ImportWrapper Jaxb10WrapperInstance(){\r
                String label = "CDM 1.0 XML";\r
                Class<? extends ICdmImport> clazz = CdmDefaultImport.class;\r
                IImportConfigurator config = JaxbImportConfigurator.NewInstance(null, null);\r