Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 84521 invoked from network); 26 Jul 2007 08:01:13 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 26 Jul 2007 08:01:13 -0000 Received: (qmail 38859 invoked by uid 500); 26 Jul 2007 08:01:14 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 38821 invoked by uid 500); 26 Jul 2007 08:01:13 -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 38810 invoked by uid 99); 26 Jul 2007 08:01:13 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 26 Jul 2007 01:01:13 -0700 X-ASF-Spam-Status: No, hits=-99.5 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME 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; Thu, 26 Jul 2007 01:01:12 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id ECE6A1A981A; Thu, 26 Jul 2007 01:00:51 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r559738 - in /directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/editors: attributetype/ objectclass/ schema/ Date: Thu, 26 Jul 2007 08:00:51 -0000 To: commits@directory.apache.org From: pamarcelot@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070726080051.ECE6A1A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: pamarcelot Date: Thu Jul 26 01:00:48 2007 New Revision: 559738 URL: http://svn.apache.org/viewvc?view=rev&rev=559738 Log: Modified the Editors Input to be able to open two objects sharing the same oid. Modified: directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/editors/attributetype/AttributeTypeEditorInput.java directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/editors/objectclass/ObjectClassEditorInput.java directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/editors/schema/SchemaEditorInput.java Modified: directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/editors/attributetype/AttributeTypeEditorInput.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/editors/attributetype/AttributeTypeEditorInput.java?view=diff&rev=559738&r1=559737&r2=559738 ============================================================================== --- directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/editors/attributetype/AttributeTypeEditorInput.java (original) +++ directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/editors/attributetype/AttributeTypeEditorInput.java Thu Jul 26 01:00:48 2007 @@ -128,7 +128,7 @@ } AttributeTypeEditorInput other = ( AttributeTypeEditorInput ) obj; - return other.getAttributeType().getOid().equals( this.attributeType.getOid() ); + return other.getAttributeType().equals( this.attributeType ); } Modified: directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/editors/objectclass/ObjectClassEditorInput.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/editors/objectclass/ObjectClassEditorInput.java?view=diff&rev=559738&r1=559737&r2=559738 ============================================================================== --- directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/editors/objectclass/ObjectClassEditorInput.java (original) +++ directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/editors/objectclass/ObjectClassEditorInput.java Thu Jul 26 01:00:48 2007 @@ -120,7 +120,7 @@ if ( !( obj instanceof ObjectClassEditorInput ) ) return false; ObjectClassEditorInput other = ( ObjectClassEditorInput ) obj; - return other.getObjectClass().getOid().equals( this.objectClass.getOid() ); + return other.getObjectClass().equals( this.objectClass ); } Modified: directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/editors/schema/SchemaEditorInput.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/editors/schema/SchemaEditorInput.java?view=diff&rev=559738&r1=559737&r2=559738 ============================================================================== --- directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/editors/schema/SchemaEditorInput.java (original) +++ directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/editors/schema/SchemaEditorInput.java Thu Jul 26 01:00:48 2007 @@ -110,7 +110,7 @@ if ( !( obj instanceof SchemaEditorInput ) ) return false; SchemaEditorInput other = ( SchemaEditorInput ) obj; - return other.getSchema().getName().equals( this.schema.getName() ); + return other.getSchema().equals( this.schema ); }