From commits-return-15691-apmail-directory-commits-archive=directory.apache.org@directory.apache.org Wed Oct 03 13:32:34 2007 Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 58326 invoked from network); 3 Oct 2007 13:32:32 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 3 Oct 2007 13:32:32 -0000 Received: (qmail 87705 invoked by uid 500); 3 Oct 2007 13:32:21 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 87653 invoked by uid 500); 3 Oct 2007 13:32:21 -0000 Mailing-List: contact commits-help@directory.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@directory.apache.org Delivered-To: mailing list commits@directory.apache.org Received: (qmail 87642 invoked by uid 99); 3 Oct 2007 13:32:21 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 03 Oct 2007 06:32:21 -0700 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 03 Oct 2007 13:32:31 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 39E551A9832; Wed, 3 Oct 2007 06:32:11 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r581595 - in /directory/studio/trunk/studio-schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wrappers: SchemaErrorWrapper.java SchemaWarningWrapper.java Date: Wed, 03 Oct 2007 13:32:10 -0000 To: commits@directory.apache.org From: pamarcelot@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20071003133211.39E551A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: pamarcelot Date: Wed Oct 3 06:32:10 2007 New Revision: 581595 URL: http://svn.apache.org/viewvc?rev=581595&view=rev Log: Added equals() and hashCode() methods to fix visual issues. Modified: directory/studio/trunk/studio-schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wrappers/SchemaErrorWrapper.java directory/studio/trunk/studio-schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wrappers/SchemaWarningWrapper.java Modified: directory/studio/trunk/studio-schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wrappers/SchemaErrorWrapper.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wrappers/SchemaErrorWrapper.java?rev=581595&r1=581594&r2=581595&view=diff ============================================================================== --- directory/studio/trunk/studio-schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wrappers/SchemaErrorWrapper.java (original) +++ directory/studio/trunk/studio-schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wrappers/SchemaErrorWrapper.java Wed Oct 3 06:32:10 2007 @@ -82,4 +82,45 @@ { return false; } + + + /* (non-Javadoc) + * @see org.apache.directory.studio.schemaeditor.view.wrappers.AbstractTreeNode#equals(java.lang.Object) + */ + public boolean equals( Object obj ) + { + if ( obj instanceof SchemaWarningWrapper ) + { + if ( super.equals( obj ) ) + { + SchemaErrorWrapper sww = ( SchemaErrorWrapper ) obj; + + if ( ( schemaError != null ) && ( !schemaError.equals( sww.getSchemaError() ) ) ) + { + return false; + } + + return true; + } + } + + // Default + return false; + } + + + /* (non-Javadoc) + * @see org.apache.directory.studio.schemaeditor.view.wrappers.AbstractTreeNode#hashCode() + */ + public int hashCode() + { + int result = super.hashCode(); + + if ( schemaError != null ) + { + result = 37 * result + schemaError.hashCode(); + } + + return result; + } } Modified: directory/studio/trunk/studio-schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wrappers/SchemaWarningWrapper.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wrappers/SchemaWarningWrapper.java?rev=581595&r1=581594&r2=581595&view=diff ============================================================================== --- directory/studio/trunk/studio-schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wrappers/SchemaWarningWrapper.java (original) +++ directory/studio/trunk/studio-schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wrappers/SchemaWarningWrapper.java Wed Oct 3 06:32:10 2007 @@ -82,4 +82,45 @@ { return false; } + + + /* (non-Javadoc) + * @see org.apache.directory.studio.schemaeditor.view.wrappers.AbstractTreeNode#equals(java.lang.Object) + */ + public boolean equals( Object obj ) + { + if ( obj instanceof SchemaWarningWrapper ) + { + if ( super.equals( obj ) ) + { + SchemaWarningWrapper sww = ( SchemaWarningWrapper ) obj; + + if ( ( schemaWarning != null ) && ( !schemaWarning.equals( sww.getSchemaWarning() ) ) ) + { + return false; + } + + return true; + } + } + + // Default + return false; + } + + + /* (non-Javadoc) + * @see org.apache.directory.studio.schemaeditor.view.wrappers.AbstractTreeNode#hashCode() + */ + public int hashCode() + { + int result = super.hashCode(); + + if ( schemaWarning != null ) + { + result = 37 * result + schemaWarning.hashCode(); + } + + return result; + } }