Return-Path: Delivered-To: apmail-cocoon-cvs-archive@www.apache.org Received: (qmail 83382 invoked from network); 29 Dec 2004 10:33:00 -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:33:00 -0000 Received: (qmail 49567 invoked by uid 500); 29 Dec 2004 10:32:58 -0000 Delivered-To: apmail-cocoon-cvs-archive@cocoon.apache.org Received: (qmail 49525 invoked by uid 500); 29 Dec 2004 10:32:58 -0000 Mailing-List: contact cvs-help@cocoon.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@cocoon.apache.org list-help: list-unsubscribe: list-post: Delivered-To: mailing list cvs@cocoon.apache.org Received: (qmail 49508 invoked by uid 99); 29 Dec 2004 10:32:57 -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:32:57 -0800 Received: (qmail 83303 invoked by uid 65534); 29 Dec 2004 10:32:56 -0000 Date: 29 Dec 2004 10:32:56 -0000 Message-ID: <20041229103256.83298.qmail@minotaur.apache.org> From: antonio@apache.org To: cvs@cocoon.apache.org Subject: svn commit: r123620 - /cocoon/trunk/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:32:54 2004 New Revision: 123620 URL: http://svn.apache.org/viewcvs?view=rev&rev=123620 Log: Use StrinUtils.equals() Modified: cocoon/trunk/src/blocks/serializers/java/org/apache/cocoon/components/serializers/util/DocType.java Modified: cocoon/trunk/src/blocks/serializers/java/org/apache/cocoon/components/serializers/util/DocType.java Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/serializers/java/org/apache/cocoon/components/serializers/util/DocType.java?view=diff&rev=123620&p1=cocoon/trunk/src/blocks/serializers/java/org/apache/cocoon/components/serializers/util/DocType.java&r1=123619&p2=cocoon/trunk/src/blocks/serializers/java/org/apache/cocoon/components/serializers/util/DocType.java&r2=123620 ============================================================================== --- cocoon/trunk/src/blocks/serializers/java/org/apache/cocoon/components/serializers/util/DocType.java (original) +++ cocoon/trunk/src/blocks/serializers/java/org/apache/cocoon/components/serializers/util/DocType.java Wed Dec 29 02:32:54 2004 @@ -15,6 +15,8 @@ */ package org.apache.cocoon.components.serializers.util; +import org.apache.commons.lang.StringUtils; + /** * The DocType class encapsulates informations regarding * the document type public and system IDs and root element name. @@ -138,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; } }