bugfixing for moving mapper classes from io.common to io.common.mapping. NOT READY...

diff --git a/.gitattributes b/.gitattributes
index 7d416d658b9b4b97a83f18f18090f4f8c55f9da6..0a34431c9b52954417d5f79dd0dc5f80521c9b92 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -1251,15 +1251,12 @@ cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/out/mapper/RefDetailMapp
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/out/mapper/TeamOrPersonMapper.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/CdmApplicationAwareDefaultExport.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/CdmApplicationAwareDefaultImport.java -text
-cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/CdmAttributeMapperBase.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/CdmDefaultExport.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/CdmDefaultIOBase.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/CdmDefaultImport.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/CdmExportBase.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/CdmImportBase.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/CdmIoBase.java -text
-cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/CdmIoMapping.java -text
-cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/CdmSingleAttributeMapperBase.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/DbExportBase.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/DbExportConfiguratorBase.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/DbExportStateBase.java -text
@@ -1275,7 +1272,6 @@ cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/IExportConfigurator.java -tex
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/IImportConfigurator.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/IIoConfigurator.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/IOValidator.java -text
-cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/IXmlMapper.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/ImportConfiguratorBase.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/ImportHelper.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/ImportStateBase.java -text
@@ -1283,7 +1279,6 @@ cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/ImportWrapper.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/IoConfiguratorBase.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/IoStateBase.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/MapWrapper.java -text
-cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/MultipleAttributeMapperBase.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/Source.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/SourceConnectionException.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/XmlExportConfiguratorBase.java -text
@@ -1291,6 +1286,7 @@ cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/XmlExportState.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/XmlImportState.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/mapping/CdmAttributeMapperBase.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/mapping/CdmIoMapping.java -text
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/mapping/CdmSingleAttributeMapperBase.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/mapping/DbImportExtensionMapper.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/mapping/DbImportMapperBase.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/mapping/DbImportMapping.java -text
@@ -1299,6 +1295,7 @@ cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/mapping/DbImportStringMapper.
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/mapping/DbSingleAttributeImportMapperBase.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/mapping/IDbImportMapper.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/mapping/IMappingImport.java -text
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/mapping/IXmlMapper.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/mapping/MultipleAttributeMapperBase.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/excel/common/ExcelImportConfiguratorBase.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/excel/common/ExcelImportState.java -text

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/CdmBooleanMapper.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/CdmBooleanMapper.java
index cc068e7467c8353b2fca8b2b8e249030fddc98df..40c8d9758989e4c268dc863a706fd00f968045da 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/CdmBooleanMapper.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/CdmBooleanMapper.java
@@ -9,7 +9,7 @@
 \r
 package eu.etaxonomy.cdm.io.berlinModel;\r
 \r
-import eu.etaxonomy.cdm.io.common.CdmSingleAttributeMapperBase;\r
+import eu.etaxonomy.cdm.io.common.mapping.CdmSingleAttributeMapperBase;\r
 \r
 /**\r
  * @author a.mueller\r

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/CdmExtensionMapper.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/CdmExtensionMapper.java
index 6a4db74453390ee92ce135929ce4c8cfe5f4216e..fe9225a10db0fea72ff656faaf3538f0fcdb270a 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/CdmExtensionMapper.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/CdmExtensionMapper.java
@@ -19,8 +19,8 @@ import org.apache.log4j.Logger;
 import eu.etaxonomy.cdm.api.service.ITermService;\r
 import eu.etaxonomy.cdm.common.CdmUtils;\r
 import eu.etaxonomy.cdm.io.berlinModel.in.BerlinModelImportState;\r
-import eu.etaxonomy.cdm.io.common.CdmSingleAttributeMapperBase;\r
 import eu.etaxonomy.cdm.io.common.Source;\r
+import eu.etaxonomy.cdm.io.common.mapping.CdmSingleAttributeMapperBase;\r
 import eu.etaxonomy.cdm.model.common.CdmBase;\r
 import eu.etaxonomy.cdm.model.common.Extension;\r
 import eu.etaxonomy.cdm.model.common.ExtensionType;\r

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 570e161657752f37da91426c0fbc4dd02f00a2d4..016cc76c67680ebbc5f5b79a3765e880e4d5ae93 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
@@ -16,9 +16,9 @@ import java.util.Set;
 \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.MultipleAttributeMapperBase;\r
+import eu.etaxonomy.cdm.io.common.mapping.CdmAttributeMapperBase;\r
+import eu.etaxonomy.cdm.io.common.mapping.MultipleAttributeMapperBase;\r
+import eu.etaxonomy.cdm.io.common.mapping.CdmSingleAttributeMapperBase;\r
 import eu.etaxonomy.cdm.model.common.CdmBase;\r
 \r
 /**\r

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/CdmStringMapper.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/CdmStringMapper.java
index ff2a485042bed3c8e44f8078051534bb2fddd30c..0f2e345a982430b467ba666a01af2d94445916ad 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/CdmStringMapper.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/CdmStringMapper.java
@@ -11,7 +11,7 @@ package eu.etaxonomy.cdm.io.berlinModel;
 \r
 import org.apache.log4j.Logger;\r
 \r
-import eu.etaxonomy.cdm.io.common.CdmSingleAttributeMapperBase;\r
+import eu.etaxonomy.cdm.io.common.mapping.CdmSingleAttributeMapperBase;\r
 \r
 /**\r
  * @author a.mueller\r

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelReferenceImport.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelReferenceImport.java
index 9b48be4cc2e41565d9fd751b6f922844b1777da4..b156eaf90f7abb7f742e78ec658fe2e4944ea7f3 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelReferenceImport.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelReferenceImport.java
@@ -46,14 +46,14 @@ import eu.etaxonomy.cdm.common.CdmUtils;
 import eu.etaxonomy.cdm.io.berlinModel.CdmExtensionMapper;\r
 import eu.etaxonomy.cdm.io.berlinModel.CdmOneToManyMapper;\r
 import eu.etaxonomy.cdm.io.berlinModel.CdmStringMapper;\r
-import eu.etaxonomy.cdm.io.common.CdmAttributeMapperBase;\r
-import eu.etaxonomy.cdm.io.common.CdmIoMapping;\r
-import eu.etaxonomy.cdm.io.common.CdmSingleAttributeMapperBase;\r
+import eu.etaxonomy.cdm.io.common.mapping.CdmAttributeMapperBase;\r
+import eu.etaxonomy.cdm.io.common.mapping.CdmIoMapping;\r
 import eu.etaxonomy.cdm.io.common.ICdmIO;\r
 import eu.etaxonomy.cdm.io.common.IImportConfigurator;\r
 import eu.etaxonomy.cdm.io.common.ImportHelper;\r
 import eu.etaxonomy.cdm.io.common.MapWrapper;\r
 import eu.etaxonomy.cdm.io.common.Source;\r
+import eu.etaxonomy.cdm.io.common.mapping.CdmSingleAttributeMapperBase;\r
 import eu.etaxonomy.cdm.model.agent.Team;\r
 import eu.etaxonomy.cdm.model.agent.TeamOrPersonBase;\r
 import eu.etaxonomy.cdm.model.common.CdmBase;\r

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/out/BerlinModelExportMapping.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/out/BerlinModelExportMapping.java
index e0cf37335afb23f6f2353df6d2a509588686f1b7..2b6099802dd5d70db11e106a00b925e1a5ba0dba 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/out/BerlinModelExportMapping.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/out/BerlinModelExportMapping.java
@@ -19,8 +19,8 @@ import org.apache.log4j.Logger;
 \r
 import eu.etaxonomy.cdm.io.berlinModel.out.mapper.IDbExportMapper;\r
 import eu.etaxonomy.cdm.io.berlinModel.out.mapper.IndexCounter;\r
-import eu.etaxonomy.cdm.io.common.CdmAttributeMapperBase;\r
-import eu.etaxonomy.cdm.io.common.CdmIoMapping;\r
+import eu.etaxonomy.cdm.io.common.mapping.CdmAttributeMapperBase;\r
+import eu.etaxonomy.cdm.io.common.mapping.CdmIoMapping;\r
 import eu.etaxonomy.cdm.io.common.DbExportStateBase;\r
 import eu.etaxonomy.cdm.io.common.Source;\r
 import eu.etaxonomy.cdm.model.common.CdmBase;\r

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/out/CollectionExportMapping.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/out/CollectionExportMapping.java
index 5bff8cd90ffd86a1a4454c177753443e59e1262f..c26c7b8fdb0dc0eaffeb87af0358654c7529fb5f 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/out/CollectionExportMapping.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/out/CollectionExportMapping.java
@@ -19,7 +19,7 @@ import eu.etaxonomy.cdm.io.berlinModel.out.mapper.DbSequenceMapper;
 import eu.etaxonomy.cdm.io.berlinModel.out.mapper.IDbExportMapper;\r
 import eu.etaxonomy.cdm.io.berlinModel.out.mapper.IdMapper;\r
 import eu.etaxonomy.cdm.io.berlinModel.out.mapper.IndexCounter;\r
-import eu.etaxonomy.cdm.io.common.CdmAttributeMapperBase;\r
+import eu.etaxonomy.cdm.io.common.mapping.CdmAttributeMapperBase;\r
 import eu.etaxonomy.cdm.io.common.DbExportStateBase;\r
 import eu.etaxonomy.cdm.io.common.ImportHelper;\r
 import eu.etaxonomy.cdm.io.common.Source;\r

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/out/mapper/CreatedAndNotesMapper.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/out/mapper/CreatedAndNotesMapper.java
index 044f2f273e4b1542b439bc3270c7364ef7e49707..d747d116dfcbd3633125a169f0b382adefa9bb14 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/out/mapper/CreatedAndNotesMapper.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/out/mapper/CreatedAndNotesMapper.java
@@ -17,7 +17,7 @@ import org.apache.log4j.Logger;
 \r
 import eu.etaxonomy.cdm.common.CdmUtils;\r
 import eu.etaxonomy.cdm.io.common.DbExportStateBase;\r
-import eu.etaxonomy.cdm.io.common.MultipleAttributeMapperBase;\r
+import eu.etaxonomy.cdm.io.common.mapping.MultipleAttributeMapperBase;\r
 import eu.etaxonomy.cdm.model.common.AnnotatableEntity;\r
 import eu.etaxonomy.cdm.model.common.Annotation;\r
 import eu.etaxonomy.cdm.model.common.AnnotationType;\r

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/out/mapper/DbSingleAttributeExportMapperBase.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/out/mapper/DbSingleAttributeExportMapperBase.java
index 84531882e4c9cddd58b4fbacfd986816f29aa153..b10a5e77f71721119f350c7c8c1131359f264f31 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/out/mapper/DbSingleAttributeExportMapperBase.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/out/mapper/DbSingleAttributeExportMapperBase.java
@@ -19,10 +19,10 @@ import org.apache.log4j.Logger;
 import org.joda.time.DateTime;\r
 \r
 import eu.etaxonomy.cdm.common.CdmUtils;\r
-import eu.etaxonomy.cdm.io.common.CdmSingleAttributeMapperBase;\r
 import eu.etaxonomy.cdm.io.common.DbExportStateBase;\r
 import eu.etaxonomy.cdm.io.common.ImportHelper;\r
 import eu.etaxonomy.cdm.io.common.Source;\r
+import eu.etaxonomy.cdm.io.common.mapping.CdmSingleAttributeMapperBase;\r
 import eu.etaxonomy.cdm.model.common.CdmBase;\r
 \r
 /**\r

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/CdmAttributeMapperBase.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/CdmAttributeMapperBase.java
deleted file mode 100644 (file)
index 4ba8ced..0000000
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/CdmAttributeMapperBase.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/**\r
-* Copyright (C) 2007 EDIT\r
-* European Distributed Institute of Taxonomy \r
-* http://www.e-taxonomy.eu\r
-* \r
-* The contents of this file are subject to the Mozilla Public License Version 1.1\r
-* See LICENSE.TXT at the top of this package for the full license terms.\r
-*/\r
-\r
-package eu.etaxonomy.cdm.io.common;\r
-\r
-import java.util.List;\r
-import java.util.Set;\r
-\r
-import org.apache.log4j.Logger;\r
-\r
-import eu.etaxonomy.cdm.common.CdmUtils;\r
-\r
-/**\r
- * @author a.mueller\r
- * @created 05.08.2008\r
- * @version 1.0\r
- */\r
-public abstract class CdmAttributeMapperBase {\r
-       @SuppressWarnings("unused")\r
-       private static final Logger logger = Logger.getLogger(CdmAttributeMapperBase.class);\r
-       \r
-       public abstract Set<String> getSourceAttributes();\r
-       \r
-       public abstract Set<String> getDestinationAttributes();\r
-       \r
-       public abstract List<String> getSourceAttributeList();\r
-       \r
-       public abstract List<String> getDestinationAttributeList();\r
-       \r
-       public String toString(){\r
-               String[] a;\r
-               String sourceAtt = CdmUtils.concat(",", getSourceAttributeList().toArray(new String[1]));\r
-               String destAtt = CdmUtils.concat(",", getDestinationAttributeList().toArray(new String[1]));\r
-               return this.getClass().getSimpleName() +"[" + sourceAtt + "->" + destAtt + "]";\r
-       }\r
-       \r
-}
\ No newline at end of file

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/CdmIoMapping.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/CdmIoMapping.java
deleted file mode 100644 (file)
index 23f6421..0000000
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/CdmIoMapping.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/**\r
-* Copyright (C) 2007 EDIT\r
-* European Distributed Institute of Taxonomy \r
-* http://www.e-taxonomy.eu\r
-* \r
-* The contents of this file are subject to the Mozilla Public License Version 1.1\r
-* See LICENSE.TXT at the top of this package for the full license terms.\r
-*/\r
-\r
-package eu.etaxonomy.cdm.io.common;\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.berlinModel.out.mapper.IDbExportMapper;\r
-\r
-\r
-/**\r
- * @author a.mueller\r
- * @created 27.07.2008\r
- * @version 1.0\r
- */\r
-public class CdmIoMapping {\r
-       private static final Logger logger = Logger.getLogger(CdmIoMapping.class);\r
-       \r
-       //protected List<CdmAttributeMapperBase> mapperList = new ArrayList<CdmAttributeMapperBase>();\r
-       protected List<CdmAttributeMapperBase> mapperList = new ArrayList<CdmAttributeMapperBase>();\r
-       Set<String> sourceAttributes = new HashSet<String>();\r
-       Set<String> destinationAttributes = new HashSet<String>();\r
-       List<String> sourceAttributeList = new ArrayList<String>();\r
-       List<String> destinationAttributeList = new ArrayList<String>();\r
-       \r
-       \r
-       public void addMapper(CdmAttributeMapperBase mapper){\r
-               if (mapper == null){\r
-                       return;\r
-               }\r
-               mapperList.add(mapper);\r
-               if (mapper instanceof CdmSingleAttributeMapperBase){\r
-                       CdmSingleAttributeMapperBase singleMapper = (CdmSingleAttributeMapperBase)mapper;\r
-                       sourceAttributes.addAll(singleMapper.getSourceAttributes());\r
-                       sourceAttributeList.addAll(singleMapper.getSourceAttributeList());\r
-                       destinationAttributes.addAll(singleMapper.getDestinationAttributes());\r
-                       destinationAttributeList.addAll(singleMapper.getDestinationAttributeList());\r
-               }else if (mapper instanceof MultipleAttributeMapperBase){\r
-                       MultipleAttributeMapperBase<?> multipleMapper = (MultipleAttributeMapperBase<?>)mapper;\r
-                       sourceAttributes.addAll(multipleMapper.getSourceAttributes());\r
-                       sourceAttributeList.addAll(multipleMapper.getSourceAttributes());\r
-                       destinationAttributes.addAll(multipleMapper.getDestinationAttributes());\r
-                       destinationAttributeList.addAll(multipleMapper.getDestinationAttributeList());\r
-               }else{\r
-                       logger.error("Unknown mapper type: " + mapper.getClass().getSimpleName());\r
-                       throw new IllegalArgumentException("Unknown mapper type: " + mapper.getClass().getSimpleName());\r
-               }\r
-       }\r
-       \r
-       public Set<String> getSourceAttributes(){\r
-               Set<String> result = new HashSet<String>();\r
-               result.addAll(sourceAttributes);\r
-               return result;\r
-       }\r
-       \r
-       public Set<String> getSourceAttributesLowerCase(){\r
-               Set<String> result = new HashSet<String>();\r
-               for(String attr : sourceAttributes){\r
-                       if (attr != null){\r
-                               result.add(attr.toLowerCase());\r
-                       }else{\r
-                               result.add(null);\r
-                       }\r
-               }\r
-               return result;\r
-       }\r
-       \r
-       public Set<String> getDestinationAttributes(){\r
-               Set<String> result = new HashSet<String>();\r
-               result.addAll(destinationAttributes);\r
-               return result;\r
-       }\r
-       \r
-       public List<String> getDestinationAttributeList(){\r
-               List<String> result = new ArrayList<String>();\r
-               result.addAll(destinationAttributeList);\r
-               return result;\r
-       }\r
-       \r
-}\r

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/MultipleAttributeMapperBase.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/MultipleAttributeMapperBase.java
deleted file mode 100644 (file)
index d4ec1d2..0000000
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/MultipleAttributeMapperBase.java
+++ /dev/null
@@ -1,83 +0,0 @@
-// $Id$\r
-/**\r
-* Copyright (C) 2007 EDIT\r
-* European Distributed Institute of Taxonomy \r
-* http://www.e-taxonomy.eu\r
-* \r
-* The contents of this file are subject to the Mozilla Public License Version 1.1\r
-* See LICENSE.TXT at the top of this package for the full license terms.\r
-*/\r
-\r
-package eu.etaxonomy.cdm.io.common;\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
-\r
-/**\r
- * @author a.mueller\r
- * @created 12.05.2009\r
- * @version 1.0\r
- */\r
-public abstract class MultipleAttributeMapperBase<SINGLE_MAPPER extends CdmSingleAttributeMapperBase> extends CdmAttributeMapperBase {\r
-       @SuppressWarnings("unused")\r
-       private static final Logger logger = Logger.getLogger(MultipleAttributeMapperBase.class);\r
-\r
-       protected List<SINGLE_MAPPER> singleMappers = new ArrayList<SINGLE_MAPPER>();\r
-\r
-       \r
-       /**\r
-        * \r
-        */\r
-       public MultipleAttributeMapperBase() {\r
-               singleMappers = new ArrayList<SINGLE_MAPPER>();\r
-       }\r
-\r
-       /* (non-Javadoc)\r
-        * @see eu.etaxonomy.cdm.io.common.CdmAttributeMapperBase#getDestinationAttributeList()\r
-        */\r
-       @Override\r
-       public List<String> getDestinationAttributeList() {\r
-               List<String> result = new ArrayList<String>();\r
-               for (SINGLE_MAPPER singleMapper : singleMappers){\r
-                       result.add(singleMapper.getDestinationAttribute());\r
-               }\r
-               return result;\r
-       }\r
-\r
-       /* (non-Javadoc)\r
-        * @see eu.etaxonomy.cdm.io.common.CdmAttributeMapperBase#getDestinationAttributes()\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
-       /* (non-Javadoc)\r
-        * @see eu.etaxonomy.cdm.io.common.CdmAttributeMapperBase#getSourceAttributeList()\r
-        */\r
-       @Override\r
-       public List<String> getSourceAttributeList() {\r
-               List<String> result = new ArrayList<String>();\r
-               for (SINGLE_MAPPER singleMapper : singleMappers){\r
-                       result.add(singleMapper.getSourceAttribute());\r
-               }\r
-               return result;\r
-       }\r
-\r
-       /* (non-Javadoc)\r
-        * @see eu.etaxonomy.cdm.io.common.CdmAttributeMapperBase#getSourceAttributes()\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

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/mapping/CdmIoMapping.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/mapping/CdmIoMapping.java
index 55cf4f3bc12344a2c1c17e1fe37a873e15fb912f..1ed4c23fa2281a2db3c2f340b1c5814c95d1791c 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/mapping/CdmIoMapping.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/mapping/CdmIoMapping.java
@@ -16,7 +16,6 @@ import java.util.Set;
 \r
 import org.apache.log4j.Logger;\r
 \r
-import eu.etaxonomy.cdm.io.common.CdmSingleAttributeMapperBase;\r
 \r
 \r
 /**\r

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/CdmSingleAttributeMapperBase.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/mapping/CdmSingleAttributeMapperBase.java
similarity index 91%
rename from cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/CdmSingleAttributeMapperBase.java
rename to cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/mapping/CdmSingleAttributeMapperBase.java
index 1d0c17cb75c93960e603c10356e9c4069d5bfccf..9fc83f63618ce6d21d404ca79b1459bb3bed218e 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/CdmSingleAttributeMapperBase.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/mapping/CdmSingleAttributeMapperBase.java
@@ -7,7 +7,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.\r
 */\r
 \r
-package eu.etaxonomy.cdm.io.common;\r
+package eu.etaxonomy.cdm.io.common.mapping;\r
 \r
 import java.util.ArrayList;\r
 import java.util.HashSet;\r
@@ -16,6 +16,8 @@ import java.util.Set;
 \r
 import org.apache.log4j.Logger;\r
 \r
+import eu.etaxonomy.cdm.io.common.mapping.CdmAttributeMapperBase;\r
+\r
 /**\r
  * @author a.mueller\r
  * @created 05.08.2008\r

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/mapping/DbSingleAttributeImportMapperBase.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/mapping/DbSingleAttributeImportMapperBase.java
index 974edb14d714cbf873c0fa8fa278b1ae5bb5c5e5..97deafd87f1e15c235cfb24e2e7317f0aefb4139 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/mapping/DbSingleAttributeImportMapperBase.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/mapping/DbSingleAttributeImportMapperBase.java
@@ -15,7 +15,6 @@ import java.sql.SQLException;
 \r
 import org.apache.log4j.Logger;\r
 \r
-import eu.etaxonomy.cdm.io.common.CdmSingleAttributeMapperBase;\r
 import eu.etaxonomy.cdm.io.common.DbImportStateBase;\r
 import eu.etaxonomy.cdm.io.common.Source;\r
 import eu.etaxonomy.cdm.model.common.CdmBase;\r

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/IXmlMapper.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/mapping/IXmlMapper.java
similarity index 88%
rename from cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/IXmlMapper.java
rename to cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/mapping/IXmlMapper.java
index f78cfd7d2c1d25c7389d9c0b0994436e5b6c9e25..86e7de529d36f3037e9f6043553b11b60b1f6d29 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/IXmlMapper.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/mapping/IXmlMapper.java
@@ -8,7 +8,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.\r
 */\r
 \r
-package eu.etaxonomy.cdm.io.common;\r
+package eu.etaxonomy.cdm.io.common.mapping;\r
 \r
 import org.jdom.Content;\r
 import org.jdom.Element;\r

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/mapping/MultipleAttributeMapperBase.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/mapping/MultipleAttributeMapperBase.java
index 93ba90c15f444ef2b6b7e8681d0a50b8d149f45e..a840242f2de925f87a2823fb41b76259c06370a3 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/mapping/MultipleAttributeMapperBase.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/mapping/MultipleAttributeMapperBase.java
@@ -17,7 +17,6 @@ import java.util.Set;
 \r
 import org.apache.log4j.Logger;\r
 \r
-import eu.etaxonomy.cdm.io.common.CdmSingleAttributeMapperBase;\r
 \r
 \r
 /**\r

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/tcsrdf/CdmOneToManyXmlMapper.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/tcsrdf/CdmOneToManyXmlMapper.java
index f1202661dcc9f84e6b4565d414eb3c2474a9ae24..5bf47b57505f9ca1c862e40b9501fd288e59ef25 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/tcsrdf/CdmOneToManyXmlMapper.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/tcsrdf/CdmOneToManyXmlMapper.java
@@ -16,8 +16,8 @@ import org.jdom.Element;
 import org.jdom.Namespace;\r
 \r
 import eu.etaxonomy.cdm.io.berlinModel.CdmOneToManyMapper;\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.IXmlMapper;\r
 import eu.etaxonomy.cdm.model.common.CdmBase;\r
 \r
 /**\r

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/tcsrdf/CdmSingleAttributeXmlMapperBase.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/tcsrdf/CdmSingleAttributeXmlMapperBase.java
index 8e98a4e76d7d565da48b0c4d5a03334f8bb2fec2..aa3df07ecb63e46c4ab63669fc524bb5d8c31ccf 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/tcsrdf/CdmSingleAttributeXmlMapperBase.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/tcsrdf/CdmSingleAttributeXmlMapperBase.java
@@ -13,8 +13,8 @@ import org.jdom.Content;
 import org.jdom.Element;\r
 import org.jdom.Namespace;\r
 \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.IXmlMapper;\r
 \r
 \r
 /**\r

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/tcsrdf/TcsRdfImportBase.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/tcsrdf/TcsRdfImportBase.java
index b8bf8d8955964ae770508a1d8e1c4151e8ca8ab5..437c6f735058f578d64782fd363961738e07466c 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/tcsrdf/TcsRdfImportBase.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/tcsrdf/TcsRdfImportBase.java
@@ -28,10 +28,10 @@ import org.jdom.Text;
 import eu.etaxonomy.cdm.io.common.CdmImportBase;\r
 import eu.etaxonomy.cdm.io.common.CdmIoBase;\r
 import eu.etaxonomy.cdm.io.common.IImportConfigurator;\r
-import eu.etaxonomy.cdm.io.common.IXmlMapper;\r
 import eu.etaxonomy.cdm.io.common.ImportHelper;\r
 import eu.etaxonomy.cdm.io.common.ImportStateBase;\r
 import eu.etaxonomy.cdm.io.common.MapWrapper;\r
+import eu.etaxonomy.cdm.io.common.mapping.IXmlMapper;\r
 import eu.etaxonomy.cdm.model.common.CdmBase;\r
 \r
 /**\r

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/tcsrdf/TcsRdfReferenceImport.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/tcsrdf/TcsRdfReferenceImport.java
index 7bb5780b7ba1024b6267f65a9d31feec75e95ed6..abff01683aa7383b8a6a5adefbbf6ebfdcd0fd41 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/tcsrdf/TcsRdfReferenceImport.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/tcsrdf/TcsRdfReferenceImport.java
@@ -26,12 +26,12 @@ import org.springframework.stereotype.Component;
 import eu.etaxonomy.cdm.common.CdmUtils;\r
 import eu.etaxonomy.cdm.common.XmlHelp;\r
 import eu.etaxonomy.cdm.io.berlinModel.CdmOneToManyMapper;\r
-import eu.etaxonomy.cdm.io.common.CdmSingleAttributeMapperBase;\r
 import eu.etaxonomy.cdm.io.common.ICdmIO;\r
 import eu.etaxonomy.cdm.io.common.IImportConfigurator;\r
-import eu.etaxonomy.cdm.io.common.IXmlMapper;\r
 import eu.etaxonomy.cdm.io.common.ImportHelper;\r
 import eu.etaxonomy.cdm.io.common.MapWrapper;\r
+import eu.etaxonomy.cdm.io.common.mapping.CdmSingleAttributeMapperBase;\r
+import eu.etaxonomy.cdm.io.common.mapping.IXmlMapper;\r
 import eu.etaxonomy.cdm.model.agent.Team;\r
 import eu.etaxonomy.cdm.model.agent.TeamOrPersonBase;\r
 import eu.etaxonomy.cdm.model.common.Marker;\r