[MMBASE CVS] contributions/CMSContainer/cmsc/utilities/src/java/com/finalist/cmsc/util XmlUtil.java

[Nico Klasens]

Update of 
/var/cvs/contributions/CMSContainer/cmsc/utilities/src/java/com/finalist/cmsc/util
In directory 
james.mmbase.org:/tmp/cvs-serv29030/cmsc/utilities/src/java/com/finalist/cmsc/util

Modified Files:
        XmlUtil.java 
Log Message:
CMSC-1071  Inline urls in richtext fields are not ampersands escaped


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/utilities/src/java/com/finalist/cmsc/util
See also: http://www.mmbase.org/jira/browse/CMSC-1071


Index: XmlUtil.java
===================================================================
RCS file: 
/var/cvs/contributions/CMSContainer/cmsc/utilities/src/java/com/finalist/cmsc/util/XmlUtil.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- XmlUtil.java        25 Jul 2008 15:54:04 -0000      1.1
+++ XmlUtil.java        24 Sep 2008 13:27:37 -0000      1.2
@@ -1,27 +1,16 @@
 package com.finalist.cmsc.util;
 
-import java.io.ByteArrayInputStream;
-import java.io.CharArrayWriter;
-import java.io.InputStream;
-import java.io.UnsupportedEncodingException;
+import java.io.*;
 import java.util.*;
 
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.FactoryConfigurationError;
-import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.parsers.*;
 import javax.xml.transform.*;
 import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.stream.StreamResult;
 
 import org.mmbase.util.logging.Logger;
 import org.mmbase.util.logging.Logging;
-import org.w3c.dom.Document;
-import org.w3c.dom.DocumentFragment;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.Text;
+import org.w3c.dom.*;
 
 /**
  * Common utilities for handling XML.
@@ -94,7 +83,9 @@
                        logger.error(e.getMessage());
                        logger.debug(e);
                } finally {
-                       if( caw != null ) caw.close();
+                       if( caw != null ) {
+            caw.close();
+         }
                }
                return "";
     }
@@ -123,7 +114,9 @@
                        logger.error( e.getMessage() );
                        logger.debug(e);
                } finally {
-                  if( caw != null ) caw.close();
+                  if( caw != null ) {
+            caw.close();
+         }
                }
                return "";
        }
@@ -164,7 +157,9 @@
                        logger.error(e.getMessage());
                        logger.debug(e);
                } finally {
-                       if( caw != null ) caw.close();
+                       if( caw != null ) {
+            caw.close();
+         }
                }
                return "";
        }
@@ -366,8 +361,9 @@
                 }
                 childnode = childnode.getNextSibling();
             }
-            if (value.length() > 0) 
+            if (value.length() > 0) {
                 return value.toString();
+            }
         } catch (Exception e) {
             logger.error(e.getMessage(), e);
         }
@@ -465,11 +461,11 @@
        if (xml == null) {
            throw new IllegalArgumentException("xml string is null");
        }
-      return xml.replaceAll("&(?!amp;|lt;|gt;|#\\d+;|quot;)", "&");
+       return xml.replaceAll("&(?!lt;|gt;)", "&");
    }
 
    /**
-    * Escapes XML entities.
+    * Unscapes XML entities.
     *
     * @param xml the input xml
     * @return escaped xml
@@ -478,7 +474,7 @@
        if (xml == null) {
            throw new IllegalArgumentException("xml string is null");
        }
-      return xml.replaceAll("&(?!amp;|lt;|gt;|#\\d+;|quot;)", "&");
+      return xml.replaceAll("&(?!lt;|gt;)", "&");
    }
 
    
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs