Changed DefinedTermBase.media form OneToMany to ManyToMany #560

[cdmlib.git] / cdmlib-model / src / main / java / eu / etaxonomy / cdm / jaxb / FormattedTextAdapter.java

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/jaxb/FormattedTextAdapter.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/jaxb/FormattedTextAdapter.java
index 7315a146eb58685c5533c47bc5eb56141a052569..3d36bc5ef24b20ce22640e32567b6a7e27ba28f0 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/jaxb/FormattedTextAdapter.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/jaxb/FormattedTextAdapter.java
@@ -1,3 +1,12 @@
+/**\r
+* Copyright (C) 2009 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.jaxb;\r
 \r
 import java.io.StringReader;\r
@@ -39,36 +48,27 @@ public class FormattedTextAdapter extends XmlAdapter<FormattedText,java.lang.Str
                                                         "xmlns:view",\r
                                                         "xmlns:xsi"};\r
 \r
-       private static final Log log = LogFactory.getLog(FormattedTextAdapter.class);\r
+       @SuppressWarnings("unused")\r
+       private static final Log logger = LogFactory.getLog(FormattedTextAdapter.class);\r
        \r
        public FormattedText marshal(String string) throws Exception {\r
                if(string != null) {\r
-                       \r
                        string = StringEscapeUtils.escapeXml(string);\r
-                       String documentString = "<?xml version=\"1.0\"?><Text>"  + string + "</Text>";\r
-                       log.debug("Parsing " + documentString);\r
-                       \r
+                       String documentString = "<?xml version=\"1.0\"?><text>"  + string + "</text>";\r
+                       //log.debug("Parsing " + documentString);\r
                        FormattedText text = new FormattedText();\r
                    DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();\r
                    DocumentBuilder parser = factory.newDocumentBuilder();\r
-                   //\r
-                  // System.err.println(documentString);\r
                    Document document = parser.parse(new InputSource(new StringReader(documentString)));\r
-                   \r
                    NodeList childNodes = document.getDocumentElement().getChildNodes();\r
-                   \r
                    for(int i = 0; i < childNodes.getLength(); i++) {\r
                        Node node = childNodes.item(i);\r
                        if(node instanceof org.w3c.dom.Text ) {\r
                                org.w3c.dom.Text textNode = (org.w3c.dom.Text) node;\r
-                               //if (documentString.contains("United Kingdom")){\r
-                   //                  System.err.println("w3c..." + textNode.getData());\r
-                               //}\r
-                       \r
+                               \r
                                text.getContent().add(textNode.getTextContent());\r
                        } else {\r
                            text.getContent().add(node);\r
-                               //System.err.println("no w3c..." + text.toString());\r
                        }\r
                    }\r
                    return text;\r
@@ -93,7 +93,6 @@ public class FormattedTextAdapter extends XmlAdapter<FormattedText,java.lang.Str
                                                attributes.removeNamedItem(prefix);\r
                                        } catch(DOMException de){\r
                                                if(de.code != DOMException.NOT_FOUND_ERR) {\r
-                                                       System.err.println("no such prefix: " + prefix);\r
                                                        throw de;\r
                                                }\r
                                        }\r
@@ -113,6 +112,8 @@ public class FormattedTextAdapter extends XmlAdapter<FormattedText,java.lang.Str
                StringWriter stringWriter = new StringWriter();\r
                Result output = new StreamResult(stringWriter);\r
                transformer.transform(input, output);\r
-               return stringWriter.toString();\r
+               String result = stringWriter.toString();\r
+               result = StringEscapeUtils.unescapeXml(result);\r
+               return result;\r
        }\r
 }\r