changed name for method mapper

diff --git a/.gitattributes b/.gitattributes
index e6b35d2e5184f2e0726c4c9b93f6bc992ce29b48..782c2dc16eab509acf9fe9a59d339ce8d3405c99 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -1440,7 +1440,7 @@ cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/mapping/DbImportMapping.java
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/mapping/DbImportMarkerCreationMapper.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/mapping/DbImportMarkerMapper.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/mapping/DbImportMediaMapper.java -text
-cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/mapping/DbImportMethodMapperBase.java -text
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/mapping/DbImportMethodMapper.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/mapping/DbImportMultiAttributeMapperBase.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/mapping/DbImportMultiLanguageTextMapper.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/mapping/DbImportNameTypeDesignationMapper.java -text

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/mapping/DbImportMethodMapperBase.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/mapping/DbImportMethodMapper.java
similarity index 82%
rename from cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/mapping/DbImportMethodMapperBase.java
rename to cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/mapping/DbImportMethodMapper.java
index cd5dfea16d1947bf9498e4ad4973bb759eed7652..0d8c11c92f291b73d9deea2b32d6febe8669aaa1 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/mapping/DbImportMethodMapperBase.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/mapping/DbImportMethodMapper.java
@@ -38,8 +38,8 @@ import eu.etaxonomy.cdm.model.reference.ReferenceBase;
  * @version 1.0\r
  */\r
 //TODO remove ANNOTATABLE by ISourcable (but this is not CDMBase yet therefore not trivial\r
-public class DbImportMethodMapperBase<CDMBASE extends VersionableEntity, STATE extends DbImportStateBase<?,?>> extends DbImportMultiAttributeMapperBase<CDMBASE, STATE>  {\r
-       private static final Logger logger = Logger.getLogger(DbImportMethodMapperBase.class);\r
+public class DbImportMethodMapper<CDMBASE extends VersionableEntity, STATE extends DbImportStateBase<?,?>> extends DbImportMultiAttributeMapperBase<CDMBASE, STATE>  {\r
+       private static final Logger logger = Logger.getLogger(DbImportMethodMapper.class);\r
        \r
        //******************************* ATTRIBUTES ***************************************/\r
        \r
@@ -60,13 +60,13 @@ public class DbImportMethodMapperBase<CDMBASE extends VersionableEntity, STATE e
 //             return result;\r
 //     }\r
 \r
-       public static <T extends DbImportStateBase> DbImportMethodMapperBase NewInstance(Class<?> clazz, String methodName, Class parameterTypes){\r
-               DbImportMethodMapperBase result = new DbImportMethodMapperBase(clazz, null, methodName, parameterTypes);\r
+       public static <T extends DbImportStateBase> DbImportMethodMapper NewInstance(Class<?> clazz, String methodName, Class parameterTypes){\r
+               DbImportMethodMapper result = new DbImportMethodMapper(clazz, null, methodName, parameterTypes);\r
                return result;\r
        }\r
        \r
-       public static <T extends DbImportStateBase> DbImportMethodMapperBase NewInstance(Object objectToInvoke, String methodName, Class<?> parameterType1, Class<?> parameterType2){\r
-               DbImportMethodMapperBase result = new DbImportMethodMapperBase(objectToInvoke.getClass(), objectToInvoke, methodName, parameterType1,parameterType2);\r
+       public static <T extends DbImportStateBase> DbImportMethodMapper NewInstance(Object objectToInvoke, String methodName, Class<?> parameterType1, Class<?> parameterType2){\r
+               DbImportMethodMapper result = new DbImportMethodMapper(objectToInvoke.getClass(), objectToInvoke, methodName, parameterType1,parameterType2);\r
                return result;\r
        }\r
        \r
@@ -77,7 +77,7 @@ public class DbImportMethodMapperBase<CDMBASE extends VersionableEntity, STATE e
         * @param methodName\r
         * @param parameterTypes\r
         */\r
-       protected DbImportMethodMapperBase(Class<?> clazz, Object objectToInoke, String methodName, Class<?>... parameterTypes) {\r
+       protected DbImportMethodMapper(Class<?> clazz, Object objectToInoke, String methodName, Class<?>... parameterTypes) {\r
                super();\r
                this.objectToInvoke = objectToInoke;\r
                try {\r