You are viewing a plain text version of this content. The canonical link for it is here.
Posted to slide-dev@jakarta.apache.org by re...@apache.org on 2001/06/09 02:13:16 UTC

cvs commit: jakarta-slide/src/util/org/apache/util XMLPrinter.java

remm        01/06/08 17:13:16

  Modified:    src/util/org/apache/util XMLPrinter.java
  Log:
  - if you only specify a namespace print it as xmlns="namespace"
  
  Patch submitted by Dirk Verbeeck <dirk.verbeeck at the-ecorp.com>
  
  Revision  Changes    Path
  1.4       +18 -7     jakarta-slide/src/util/org/apache/util/XMLPrinter.java
  
  Index: XMLPrinter.java
  ===================================================================
  RCS file: /home/cvs/jakarta-slide/src/util/org/apache/util/XMLPrinter.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- XMLPrinter.java	2001/05/08 22:24:29	1.3
  +++ XMLPrinter.java	2001/06/09 00:13:16	1.4
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-slide/src/util/org/apache/util/XMLPrinter.java,v 1.3 2001/05/08 22:24:29 remm Exp $
  - * $Revision: 1.3 $
  - * $Date: 2001/05/08 22:24:29 $
  + * $Header: /home/cvs/jakarta-slide/src/util/org/apache/util/XMLPrinter.java,v 1.4 2001/06/09 00:13:16 remm Exp $
  + * $Revision: 1.4 $
  + * $Date: 2001/06/09 00:13:16 $
    *
    * ====================================================================
    *
  @@ -70,6 +70,7 @@
    * WebdavXMLPrinter helper class.
    * 
    * @author <a href="mailto:remm@apache.org">Remy Maucherat</a>
  + * @author Dirk Verbeeck
    */
   public class XMLPrinter {
       
  @@ -222,7 +223,7 @@
           if ((namespace != null) && (namespace.length() > 0)) {
               switch (type) {
               case OPENING:
  -                if (namespaceInfo != null) {
  +                if ((namespaceInfo != null) && (namespaceInfo.length() > 0)) {
                       buffer.append("<" + namespace + ":" + name + " xmlns:" 
                                     + namespace + "=\"" 
                                     + namespaceInfo + "\">");
  @@ -235,7 +236,7 @@
                   break;
               case NO_CONTENT:
               default:
  -                if (namespaceInfo != null) {
  +                if ((namespaceInfo != null)  && (namespaceInfo.length() > 0)) {
                       buffer.append("<" + namespace + ":" + name + " xmlns:" 
                                     + namespace + "=\"" 
                                     + namespaceInfo + "\"/>");
  @@ -247,14 +248,24 @@
           } else {
               switch (type) {
               case OPENING:
  -                buffer.append("<" + name + ">");
  +                if ((namespaceInfo != null) && (namespaceInfo.length()>0)) {
  +                    buffer.append("<" + name + " xmlns=\"" + namespaceInfo 
  +                                  + "\">");
  +                } else {
  +                    buffer.append("<" + name + ">");
  +                }
                   break;
               case CLOSING:
                   buffer.append("</" + name + ">");
                   break;
               case NO_CONTENT:
               default:
  -                buffer.append("<" + name + "/>");
  +                if ((namespaceInfo != null) && (namespaceInfo.length()>0)) {
  +                    buffer.append("<" + name + " xmlns=\"" + namespaceInfo 
  +                                  + "\"/>");
  +                } else {
  +                    buffer.append("<" + name + "/>");
  +                }
                   break;
               }
           }