updated Media.addDescription to media.putDescription #2511

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/markup/MarkupDocumentImportNoComponent.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/markup/MarkupDocumentImportNoComponent.java
index 2ead380936b446d0257aceb7fdf5f6e5d9f19a03..586826db3b8c445e52fbffd17d750cb7731f5186 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/markup/MarkupDocumentImportNoComponent.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/markup/MarkupDocumentImportNoComponent.java
@@ -868,7 +868,7 @@ public class MarkupDocumentImportNoComponent extends MarkupImportBase {
                                }\r
                                // legend\r
                                if (StringUtils.isNotBlank(legendString)) {\r
-                                       media.addDescription(legendString, getDefaultLanguage(state));\r
+                                       media.putDescription(getDefaultLanguage(state), legendString);\r
                                }\r
                                if (StringUtils.isNotBlank(numString)) {\r
                                        // TODO use concrete source (e.g. DAPHNIPHYLLACEAE in FM\r

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/sdd/in/SDDDataSetImport.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/sdd/in/SDDDataSetImport.java
index 74027291ec6950afdc4aeddbfd92606572d9ac58..410e1fc792d86ae3a20ffce0b5c4921175481ef2 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/sdd/in/SDDDataSetImport.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/sdd/in/SDDDataSetImport.java
@@ -364,17 +364,17 @@ public class SDDDataSetImport extends CdmImportBase<SDDImportConfigurator, SDDIm
        \r
        /**\r
         * \r
-        * @param ve\r
+        * @param media\r
         * @param langLabDet\r
         */\r
-       private void makeRepresentationForMedia(Media m, Map<Language, List<String>> langLabDet) {\r
+       private void makeRepresentationForMedia(Media media, Map<Language, List<String>> langLabDet) {\r
                for (Language lang : langLabDet.keySet()){\r
                        List<String> labDet = langLabDet.get(lang);\r
                        if (labDet.get(0) != null){\r
-                               m.putTitle(LanguageString.NewInstance(labDet.get(0), lang));\r
+                               media.putTitle(LanguageString.NewInstance(labDet.get(0), lang));\r
                        }\r
                        if (labDet.size()>1) {\r
-                               m.addDescription(labDet.get(1), lang);\r
+                               media.putDescription(lang, labDet.get(1));\r
                        }\r
                }\r
        }\r

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/sdd/in/SDDImport.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/sdd/in/SDDImport.java
index fcf65577d5b7fdf65848a17ca8d725afe8dab5d7..595d1b8dd95261a8fc5fc79e761b2542180f3487 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/sdd/in/SDDImport.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/sdd/in/SDDImport.java
@@ -339,17 +339,17 @@ public class SDDImport extends XmlImportBase<SDDImportConfigurator, SDDImportSta
        \r
        /**\r
         * \r
-        * @param ve\r
+        * @param media\r
         * @param langLabDet\r
         */\r
-       private void makeRepresentationForMedia(Media m, Map<Language, List<String>> langLabDet) {\r
+       private void makeRepresentationForMedia(Media media, Map<Language, List<String>> langLabDet) {\r
                for (Language lang : langLabDet.keySet()){\r
                        List<String> labDet = langLabDet.get(lang);\r
                        if (labDet.get(0) != null){\r
-                               m.putTitle(LanguageString.NewInstance(labDet.get(0), lang));\r
+                               media.putTitle(LanguageString.NewInstance(labDet.get(0), lang));\r
                        }\r
                        if (labDet.size()>1) {\r
-                               m.addDescription(labDet.get(1), lang);\r
+                               media.putDescription(lang, labDet.get(1));\r
                        }\r
                }\r
        }\r

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/media/Media.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/media/Media.java
index 13255461052b4399be9ec4f2ff524542061e332f..26d80bca17168a5d8c6b69a4b0f02e434740c1b4 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/media/Media.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/media/Media.java
@@ -366,10 +366,14 @@ public class Media extends IdentifiableEntity<IIdentifiableEntityCacheStrategy>
         this.description.put(description.getLanguage(), description);
     }
 
-    public void addDescription(String text, Language language){
+//    public void addDescription(String text, Language language){
+//        this.description.put(language, LanguageString.NewInstance(text, language));
+//    }
+
+    public void putDescription(Language language, String text){
         this.description.put(language, LanguageString.NewInstance(text, language));
     }
-
+    
     public void removeDescription(Language language){
         this.description.remove(language);
     }

diff --git a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/media/MediaTest.java b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/media/MediaTest.java
index 6b822d6552103bd20c20be408239ef896a0083e0..315fad658aa1103a07da92350c25c70cf3241aea 100644 (file)
--- a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/media/MediaTest.java
+++ b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/media/MediaTest.java
@@ -84,7 +84,7 @@ public class MediaTest {
         media1.setMediaCreated(new DateTime(2002, 1,1,0,0,0,0));\r
         languageString1 = LanguageString.NewInstance("media1Desc", Language.DEFAULT());\r
         media1.addDescription(languageString1);\r
-        media1.addDescription("media1Desc2", Language.GERMAN());\r
+        media1.putDescription(Language.GERMAN(), "media1Desc2");\r
         mediaRepresentation1 = MediaRepresentation.NewInstance();\r
         mediaRepresentation2 = MediaRepresentation.NewInstance();\r
         mediaRepresentation1.setMimeType("MimeType1");\r
@@ -246,9 +246,9 @@ public class MediaTest {
     public void testAddDescriptionStringLanguage() {\r
         Assert.assertTrue("Clone must have a german language description", media1.getAllDescriptions().containsKey(Language.GERMAN()));\r
         Assert.assertSame("Description1 must be the same", "media1Desc2", media1.getAllDescriptions().get(Language.GERMAN()).getText() );\r
-        media1.addDescription("testDesc", Language.DEFAULT());\r
+        media1.putDescription(Language.DEFAULT(), "testDesc");\r
         Assert.assertEquals("Number of descriptions must be 2", 2, media1.getAllDescriptions().size() );\r
-        media1.addDescription("testDesc2", Language.DEFAULT());\r
+        media1.putDescription(Language.DEFAULT(), "testDesc2");\r
         Assert.assertEquals("Number of descriptions must be 2", 2, media1.getAllDescriptions().size() );\r
         Assert.assertSame("Default language description must be 'testDesc2'", "testDesc2", media1.getAllDescriptions().get(Language.DEFAULT()).getText() );\r
     }\r