refactoring for SDDImport

[cdmlib.git] / cdmlib-io / src / main / java / eu / etaxonomy / cdm / io / berlinModel / CdmOneToManyMapper.java

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/CdmOneToManyMapper.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/CdmOneToManyMapper.java
index b917ac23649e08023ed6025967658b77a3d2e6a0..215e11130a785a78e57f45ee952998025774f7d7 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/CdmOneToManyMapper.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/CdmOneToManyMapper.java
@@ -10,15 +10,12 @@
 package eu.etaxonomy.cdm.io.berlinModel;\r
 \r
 import java.util.ArrayList;\r
-import java.util.HashSet;\r
 import java.util.List;\r
-import java.util.Set;\r
 \r
 import org.apache.log4j.Logger;\r
 \r
-import eu.etaxonomy.cdm.io.common.CdmAttributeMapperBase;\r
-import eu.etaxonomy.cdm.io.common.CdmSingleAttributeMapperBase;\r
-import eu.etaxonomy.cdm.io.common.IXmlMapper;\r
+import eu.etaxonomy.cdm.io.common.mapping.CdmSingleAttributeMapperBase;\r
+import eu.etaxonomy.cdm.io.common.mapping.MultipleAttributeMapperBase;\r
 import eu.etaxonomy.cdm.model.common.CdmBase;\r
 \r
 /**\r
@@ -26,11 +23,10 @@ import eu.etaxonomy.cdm.model.common.CdmBase;
  * @created 20.03.2008\r
  * @version 1.0\r
  */\r
-public class CdmOneToManyMapper<ONE extends CdmBase, MANY extends CdmBase, SINGLE_MAPPER extends CdmSingleAttributeMapperBase> extends CdmAttributeMapperBase {\r
+public class CdmOneToManyMapper<ONE extends CdmBase, MANY extends CdmBase, SINGLE_MAPPER extends CdmSingleAttributeMapperBase> extends MultipleAttributeMapperBase<SINGLE_MAPPER> {\r
        @SuppressWarnings("unused")\r
        private static Logger logger = Logger.getLogger(CdmOneToManyMapper.class);\r
 \r
-       private List<SINGLE_MAPPER> singleMappers = new ArrayList<SINGLE_MAPPER>();\r
        private Class<MANY> manyClass;\r
        private Class<ONE> oneClass;\r
        private String singleAttributeName;\r
@@ -47,12 +43,12 @@ public class CdmOneToManyMapper<ONE extends CdmBase, MANY extends CdmBase, SINGL
                this.singleAttributeName = singleAttributeName;\r
        }\r
        \r
-       @Override\r
-       public Set<String> getSourceAttributes(){\r
-               Set<String> result = new HashSet<String>();\r
-               result.addAll(getSourceAttributeList());\r
-               return result;\r
-       }\r
+//     @Override\r
+//     public Set<String> getSourceAttributes(){\r
+//             Set<String> result = new HashSet<String>();\r
+//             result.addAll(getSourceAttributeList());\r
+//             return result;\r
+//     }\r
        \r
        @Override\r
        public List<String> getSourceAttributeList(){\r
@@ -63,12 +59,12 @@ public class CdmOneToManyMapper<ONE extends CdmBase, MANY extends CdmBase, SINGL
                return result;\r
        }\r
        \r
-       @Override\r
-       public Set<String> getDestinationAttributes(){\r
-               Set<String> result = new HashSet<String>();\r
-               result.addAll(getDestinationAttributeList());\r
-               return result;\r
-       }\r
+//     @Override\r
+//     public Set<String> getDestinationAttributes(){\r
+//             Set<String> result = new HashSet<String>();\r
+//             result.addAll(getDestinationAttributeList());\r
+//             return result;\r
+//     }\r
        \r
        @Override\r
        public List<String> getDestinationAttributeList(){\r