Return-Path: 
 <cvs-return-21510-apmail-cocoon-cvs-archive=cocoon.apache.org@cocoon.apache.org>
Delivered-To: apmail-cocoon-cvs-archive@www.apache.org
Received: (qmail 92411 invoked from network); 29 Dec 2004 10:50:18 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur-2.apache.org with SMTP; 29 Dec 2004 10:50:18 -0000
Received: (qmail 80098 invoked by uid 500); 29 Dec 2004 10:50:16 -0000
Delivered-To: apmail-cocoon-cvs-archive@cocoon.apache.org
Received: (qmail 80015 invoked by uid 500); 29 Dec 2004 10:50:16 -0000
Mailing-List: contact cvs-help@cocoon.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@cocoon.apache.org
list-help: <mailto:cvs-help@cocoon.apache.org>
list-unsubscribe: <mailto:cvs-unsubscribe@cocoon.apache.org>
list-post: <mailto:cvs@cocoon.apache.org>
Delivered-To: mailing list cvs@cocoon.apache.org
Received: (qmail 80002 invoked by uid 99); 29 Dec 2004 10:50:15 -0000
X-ASF-Spam-Status: No, hits=-9.8 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from minotaur.apache.org (HELO minotaur.apache.org)
 (209.237.227.194)
  by apache.org (qpsmtpd/0.28) with SMTP; Wed, 29 Dec 2004 02:50:15 -0800
Received: (qmail 92326 invoked by uid 65534); 29 Dec 2004 10:50:14 -0000
Date: 29 Dec 2004 10:50:14 -0000
Message-ID: <20041229105014.92324.qmail@minotaur.apache.org>
From: antonio@apache.org
To: cvs@cocoon.apache.org
Subject: svn commit: r123622 -
 /cocoon/branches/BRANCH_2_1_X/src/blocks/serializers/java/org/apache/cocoon/components/serializers/util/DocType.java
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Virus-Checked: Checked
X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N

Author: antonio
Date: Wed Dec 29 02:50:13 2004
New Revision: 123622

URL: http://svn.apache.org/viewcvs?view=rev&rev=123622
Log:
New method toString(), use StrinUtils.equals()
Modified:
   cocoon/branches/BRANCH_2_1_X/src/blocks/serializers/java/org/apache/cocoon/components/serializers/util/DocType.java

Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/serializers/java/org/apache/cocoon/components/serializers/util/DocType.java
Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/serializers/java/org/apache/cocoon/components/serializers/util/DocType.java?view=diff&rev=123622&p1=cocoon/branches/BRANCH_2_1_X/src/blocks/serializers/java/org/apache/cocoon/components/serializers/util/DocType.java&r1=123621&p2=cocoon/branches/BRANCH_2_1_X/src/blocks/serializers/java/org/apache/cocoon/components/serializers/util/DocType.java&r2=123622
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/serializers/java/org/apache/cocoon/components/serializers/util/DocType.java	(original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/serializers/java/org/apache/cocoon/components/serializers/util/DocType.java	Wed Dec 29 02:50:13 2004
@@ -15,14 +15,24 @@
  */
 package org.apache.cocoon.components.serializers.util;
 
+import org.apache.commons.lang.StringUtils;
+
 /**
  * The <code>DocType</code> class encapsulates informations regarding
  * the document type public and system IDs and root element name.
  * 
  * @author <a href="mailto:pier@apache.org">Pier Fumagalli</a>, February 2003
- * @version CVS $Id: DocType.java,v 1.2 2004/04/30 19:34:46 pier Exp $
+ * @version CVS $Id$
  */
 public class DocType {
+
+    private static final char S_DOCTYPE_1[] = "<!DOCTYPE ".toCharArray();
+    private static final char S_DOCTYPE_2[] = " PUBLIC \"".toCharArray();
+    private static final char S_DOCTYPE_3[] = "\" \"".toCharArray();
+    private static final char S_DOCTYPE_4[] = " SYSTEM \"".toCharArray();
+    private static final char S_DOCTYPE_5[] = "\">".toCharArray();
+    private static final char S_DOCTYPE_6[] = ">".toCharArray();
+    
     /** The name of the root element. */
     protected String root_name = null;
     /** The configured system identifier. */
@@ -93,6 +103,33 @@
     }
 
     /**
+     * Return the document type declaration as a string
+     */
+    public String toString() {
+        StringBuffer buf = new StringBuffer();
+
+        buf.append(S_DOCTYPE_1); // [<!DOCTYPE ]
+        buf.append(this.root_name);
+        if (this.public_id != null) {
+            buf.append(S_DOCTYPE_2); // [ PUBLIC "]
+            buf.append(this.public_id);
+            /* This is wrong in XML, but not in SGML/HTML */
+            if (this.system_id != null) {
+                buf.append(S_DOCTYPE_3); // [" "]
+                buf.append(this.system_id);
+            }
+            buf.append(S_DOCTYPE_5); // [">]
+        } else if (this.system_id != null) {
+            buf.append(S_DOCTYPE_4); // [ SYSTEM "]
+            buf.append(this.system_id);
+            buf.append(S_DOCTYPE_5); // [">]
+        } else {
+            buf.append(S_DOCTYPE_6); // [>]
+        }
+        return(buf.toString());
+    }
+
+    /**
      * Check if the specified object is equal to this <code>DocType</code>
      * instance.
      */
@@ -103,18 +140,11 @@
         if (!(object instanceof DocType)) return(false);
         DocType doctype = (DocType)object;
 
-        if (this.public_id == null) {
-            if (doctype.public_id != null) return(false);
-        } else {
-            if (!this.public_id.equals(doctype.public_id)) return(false);
+        if (StringUtils.equals(this.public_id, doctype.public_id)
+            && StringUtils.equals(this.system_id, doctype.system_id)
+            && this.root_name.equals(doctype.root_name)) {
+            return true;
         }
-        
-        if (this.system_id == null) {
-            if (doctype.system_id != null) return(false);
-        } else {
-            if (!this.system_id.equals(doctype.system_id)) return(false);
-        }
-
-        return(this.root_name.equals(doctype.root_name));
+        return false;
     }
 }