Unmarshall TextData/MultiLanguageText for one entry in Map

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/jaxb/MultilanguageTextAdapter.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/jaxb/MultilanguageTextAdapter.java
index 65d841435811a65827f466a1adb0d05cd1af0bac..ad5ddcc5e65b3d39fa93dffcfffb655385a25e6b 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/jaxb/MultilanguageTextAdapter.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/jaxb/MultilanguageTextAdapter.java
@@ -13,6 +13,7 @@ import javax.xml.bind.annotation.adapters.XmlAdapter;
  * @created 02.09.2008\r
  */\r
 import java.util.ArrayList;\r
+import java.util.HashMap;\r
 import java.util.List;\r
 import java.util.Map;\r
 import java.util.concurrent.ConcurrentHashMap;\r
@@ -40,8 +41,8 @@ public class MultilanguageTextAdapter extends XmlAdapter<MultilanguageTextHelper
                for(Language language : value.keySet()) {\r
                        multilanguageTextHelper.setLanguage(language);\r
                        multilanguageTextHelper.setLanguageString(value.get(language));\r
-//                     multilanguageText.add(value.get(language));\r
                        \r
+//                     multilanguageText.add(value.get(language));\r
                }\r
 \r
                return multilanguageTextHelper;\r
@@ -52,14 +53,10 @@ public class MultilanguageTextAdapter extends XmlAdapter<MultilanguageTextHelper
 //     public Map<Language, LanguageString> unmarshal(MultilanguageText value)\r
                        throws Exception {\r
                \r
-//             Map<Language, LanguageString> map = new ConcurrentHashMap<Language, LanguageString>();\r
-//             \r
-//             for(Language language : value.keySet()) {\r
-//                     map.put(language, value.get(language));\r
-//             }\r
-//             \r
-//             return map;\r
-       \r
-       return null;\r
+               Map<Language, LanguageString> map = new HashMap<Language, LanguageString>();\r
+               \r
+               map.put(value.getLanguage(), value.getLanguageString());\r
+               \r
+               return map;\r
        }\r
 }\r

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/MultilanguageTextHelper.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/MultilanguageTextHelper.java
index f8eaac43aa436751a20407edad81e92ddd9014d3..f9dac91454717ba407773bab7ca0a097c5fcfb53 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/MultilanguageTextHelper.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/MultilanguageTextHelper.java
@@ -6,11 +6,16 @@
 \r
 package eu.etaxonomy.cdm.model.common;\r
 \r
+import java.util.HashMap;\r
+import java.util.Map;\r
+\r
 import javax.persistence.Transient;\r
 import javax.xml.bind.annotation.XmlAccessType;\r
 import javax.xml.bind.annotation.XmlAccessorType;\r
 import javax.xml.bind.annotation.XmlElement;\r
+import javax.xml.bind.annotation.XmlIDREF;\r
 import javax.xml.bind.annotation.XmlRootElement;\r
+import javax.xml.bind.annotation.XmlSchemaType;\r
 import javax.xml.bind.annotation.XmlType;\r
 \r
 /**\r
@@ -26,11 +31,17 @@ import javax.xml.bind.annotation.XmlType;
 public class MultilanguageTextHelper {\r
 \r
        @XmlElement(name = "Language")\r
+    @XmlIDREF\r
+    @XmlSchemaType(name = "IDREF")\r
        private Language language;\r
        \r
        @XmlElement(name = "LanguageString")\r
+    @XmlIDREF\r
+    @XmlSchemaType(name = "IDREF")\r
        private LanguageString languageString;\r
        \r
+//     private HashMap<Language, LanguageString> mlText;\r
+       \r
        public MultilanguageTextHelper() {\r
        }\r
        \r