Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 52939 invoked from network); 20 Jul 2007 17:13:28 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 20 Jul 2007 17:13:28 -0000 Received: (qmail 98589 invoked by uid 500); 20 Jul 2007 17:13:30 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 98560 invoked by uid 500); 20 Jul 2007 17:13:30 -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 98549 invoked by uid 99); 20 Jul 2007 17:13:30 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 20 Jul 2007 10:13:30 -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; Fri, 20 Jul 2007 10:13:27 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 88A9E1A981A; Fri, 20 Jul 2007 10:13:07 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r558059 - in /directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor: model/difference/DifferenceEngine.java view/widget/DifferencesWidget.java Date: Fri, 20 Jul 2007 17:13:06 -0000 To: commits@directory.apache.org From: pamarcelot@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070720171307.88A9E1A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: pamarcelot Date: Fri Jul 20 10:13:05 2007 New Revision: 558059 URL: http://svn.apache.org/viewvc?view=rev&rev=558059 Log: Added the OCs and ATs contained in a removed or added schema into its SchemaDifference as ObjectClassDifference and AttributeTypeDifference. Modified: directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/model/difference/DifferenceEngine.java directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/widget/DifferencesWidget.java Modified: directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/model/difference/DifferenceEngine.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/model/difference/DifferenceEngine.java?view=diff&rev=558059&r1=558058&r2=558059 ============================================================================== --- directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/model/difference/DifferenceEngine.java (original) +++ directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/model/difference/DifferenceEngine.java Fri Jul 20 10:13:05 2007 @@ -76,6 +76,20 @@ { SchemaDifference schemaDifference = new SchemaDifference( schemaFromL1, null, DifferenceType.REMOVED ); differences.add( schemaDifference ); + + // Adding attribute types + for ( AttributeTypeImpl at : schemaFromL2.getAttributeTypes() ) + { + schemaDifference.addAttributeTypeDifference( new AttributeTypeDifference( null, at, + DifferenceType.REMOVED ) ); + } + + // Adding object classes + for ( ObjectClassImpl oc : schemaFromL2.getObjectClasses() ) + { + schemaDifference.addObjectClassDifference( new ObjectClassDifference( null, oc, + DifferenceType.REMOVED ) ); + } } else { @@ -199,6 +213,20 @@ { SchemaDifference schemaDifference = new SchemaDifference( null, schemaFromL2, DifferenceType.ADDED ); differences.add( schemaDifference ); + + // Adding attribute types + for ( AttributeTypeImpl at : schemaFromL2.getAttributeTypes() ) + { + schemaDifference.addAttributeTypeDifference( new AttributeTypeDifference( null, at, + DifferenceType.ADDED ) ); + } + + // Adding object classes + for ( ObjectClassImpl oc : schemaFromL2.getObjectClasses() ) + { + schemaDifference.addObjectClassDifference( new ObjectClassDifference( null, oc, + DifferenceType.ADDED ) ); + } } } Modified: directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/widget/DifferencesWidget.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/widget/DifferencesWidget.java?view=diff&rev=558059&r1=558058&r2=558059 ============================================================================== --- directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/widget/DifferencesWidget.java (original) +++ directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/widget/DifferencesWidget.java Fri Jul 20 10:13:05 2007 @@ -67,12 +67,6 @@ */ public class DifferencesWidget { - /** The TreeViewer */ - private TreeViewer treeViewer; - - /** The TableViewer */ - private TableViewer tableViewer; - /** The PreferenceStore*/ private IPreferenceStore store; @@ -89,26 +83,20 @@ { if ( authorizedPrefs.contains( event.getProperty() ) ) { - // if ( PluginConstants.PREFS_SCHEMA_VIEW_GROUPING == event.getProperty() ) - // { - // view.reloadViewer(); - // } - // else - // { treeViewer.refresh(); - // } } } }; // The MenuItems + private TreeViewer treeViewer; + private TableViewer tableViewer; private MenuItem groupByType; private MenuItem groupByProperty; /** * Creates a new instance of DifferencesWidget. - * */ public DifferencesWidget() {