Return-Path: Delivered-To: apmail-incubator-jackrabbit-commits-archive@www.apache.org Received: (qmail 5476 invoked from network); 3 Jan 2005 13:21:29 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur-2.apache.org with SMTP; 3 Jan 2005 13:21:29 -0000 Received: (qmail 88005 invoked by uid 500); 3 Jan 2005 13:21:18 -0000 Mailing-List: contact jackrabbit-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: jackrabbit-dev@incubator.apache.org Delivered-To: mailing list jackrabbit-commits@incubator.apache.org Received: (qmail 87857 invoked by uid 500); 3 Jan 2005 13:21:15 -0000 Delivered-To: apmail-incubator-jackrabbit-cvs@incubator.apache.org Received: (qmail 87691 invoked by uid 99); 3 Jan 2005 13:21:12 -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; Mon, 03 Jan 2005 05:21:10 -0800 Received: (qmail 5166 invoked by uid 65534); 3 Jan 2005 13:21:08 -0000 Date: 3 Jan 2005 13:21:08 -0000 Message-ID: <20050103132108.5161.qmail@minotaur.apache.org> From: stefan@apache.org To: jackrabbit-cvs@incubator.apache.org Subject: svn commit: r123964 - /incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/nodetype/ChildNodeDef.java /incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/nodetype/NodeTypeDef.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: stefan Date: Mon Jan 3 05:21:07 2005 New Revision: 123964 URL: http://svn.apache.org/viewcvs?view=rev&rev=123964 Log: fixed issue JCR-35: NodeTypeDefDiff compares to restrictive http://issues.apache.org/jira/browse/JCR-35 NodeTypeDef did not override 'equals' method Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/nodetype/ChildNodeDef.java incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/nodetype/NodeTypeDef.java Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/nodetype/ChildNodeDef.java Url: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/nodetype/ChildNodeDef.java?view=diff&rev=123964&p1=incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/nodetype/ChildNodeDef.java&r1=123963&p2=incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/nodetype/ChildNodeDef.java&r2=123964 ============================================================================== --- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/nodetype/ChildNodeDef.java (original) +++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/nodetype/ChildNodeDef.java Mon Jan 3 05:21:07 2005 @@ -42,7 +42,7 @@ if (obj instanceof ChildNodeDef) { ChildNodeDef other = (ChildNodeDef) obj; return super.equals(obj) - && Arrays.equals(requiredPrimaryTypes, requiredPrimaryTypes) + && Arrays.equals(requiredPrimaryTypes, other.requiredPrimaryTypes) && (defaultPrimaryType == null ? other.defaultPrimaryType == null : defaultPrimaryType.equals(other.defaultPrimaryType)) && allowSameNameSibs == other.allowSameNameSibs; } Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/nodetype/NodeTypeDef.java Url: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/nodetype/NodeTypeDef.java?view=diff&rev=123964&p1=incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/nodetype/NodeTypeDef.java&r1=123963&p2=incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/nodetype/NodeTypeDef.java&r2=123964 ============================================================================== --- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/nodetype/NodeTypeDef.java (original) +++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/nodetype/NodeTypeDef.java Mon Jan 3 05:21:07 2005 @@ -22,6 +22,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.Set; +import java.util.Arrays; /** * A NodeTypeDef holds the definition of a node type. @@ -55,6 +56,22 @@ // clear dependencies (will be lazily built) clone.resetDependencies(); return clone; + } + + public boolean equals(Object obj) { + if (this == obj) { + return true; + } + if (obj instanceof NodeTypeDef) { + NodeTypeDef other = (NodeTypeDef) obj; + return (name == null ? other.name == null : name.equals(other.name)) + && Arrays.equals(supertypes, other.supertypes) + && mixin == other.mixin + && orderableChildNodes == other.orderableChildNodes + && Arrays.equals(propDefs, other.propDefs) + && Arrays.equals(nodeDefs, other.nodeDefs); + } + return false; } /**