cleanup

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/mapping/DbImportAnnotationMapper.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/mapping/DbImportAnnotationMapper.java
index 3b01b13a7ebe194b8bfd9ab1def4c5ac35329361..bbaab679a720e4d8a5488edcfc8b02b1c837007f 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/mapping/DbImportAnnotationMapper.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/mapping/DbImportAnnotationMapper.java
@@ -51,7 +51,7 @@ public class DbImportAnnotationMapper extends DbSingleAttributeImportMapperBase<
        public static DbImportAnnotationMapper NewInstance(String dbAttributeString, UUID uuid, String label, String text, String labelAbbrev){\r
                Language language = null;\r
                AnnotationType annotationType = null;\r
-               return new DbImportAnnotationMapper(dbAttributeString, uuid, label, text, labelAbbrev, language, annotationType);\r
+               return new DbImportAnnotationMapper(dbAttributeString, language, annotationType);\r
        }\r
        \r
        /**\r
@@ -65,7 +65,7 @@ public class DbImportAnnotationMapper extends DbSingleAttributeImportMapperBase<
         */\r
        public static DbImportAnnotationMapper NewInstance(String dbAttributeString, UUID uuid, String label, String text, String labelAbbrev, Language language){\r
                AnnotationType annotationType = null;\r
-               return new DbImportAnnotationMapper(dbAttributeString, uuid, label, text, labelAbbrev, language, annotationType);\r
+               return new DbImportAnnotationMapper(dbAttributeString, language, annotationType);\r
        }\r
        \r
        /**\r
@@ -85,19 +85,15 @@ public class DbImportAnnotationMapper extends DbSingleAttributeImportMapperBase<
         * @return\r
         */\r
        public static DbImportAnnotationMapper NewInstance(String dbAttributeString, AnnotationType annotationType, Language language){\r
-               String label = null;\r
-               String text = null;\r
-               String labelAbbrev = null;\r
-               UUID uuid = null;\r
-               return new DbImportAnnotationMapper(dbAttributeString, uuid, label, text, labelAbbrev, language, annotationType);\r
+//             String label = null;\r
+//             String text = null;\r
+//             String labelAbbrev = null;\r
+//             UUID uuid = null;\r
+               return new DbImportAnnotationMapper(dbAttributeString, language, annotationType);\r
        }\r
 \r
        \r
        private AnnotationType annotationType;\r
-       private String label;\r
-       private String text;\r
-       private String labelAbbrev;\r
-       private UUID uuid;\r
        private Language language;\r
 \r
        /**\r
@@ -107,12 +103,8 @@ public class DbImportAnnotationMapper extends DbSingleAttributeImportMapperBase<
         * @param text\r
         * @param labelAbbrev\r
         */\r
-       private DbImportAnnotationMapper(String dbAttributeString, UUID uuid, String label, String text, String labelAbbrev, Language language, AnnotationType annotationType) {\r
+       private DbImportAnnotationMapper(String dbAttributeString, Language language, AnnotationType annotationType) {\r
                super(dbAttributeString, dbAttributeString);\r
-               this.uuid = uuid;\r
-               this.label = label;\r
-               this.text = text;\r
-               this.labelAbbrev = labelAbbrev;\r
                this.language = language;\r
                this.annotationType = annotationType;\r
        }\r