Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 37259 invoked from network); 30 Jul 2007 15:01:46 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 30 Jul 2007 15:01:46 -0000 Received: (qmail 48764 invoked by uid 500); 30 Jul 2007 15:01:31 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 48525 invoked by uid 500); 30 Jul 2007 15:01:29 -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 48412 invoked by uid 99); 30 Jul 2007 15:01:27 -0000 Received: from Unknown (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 30 Jul 2007 08:01:27 -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; Mon, 30 Jul 2007 15:00:34 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 2C5DF1A981A; Mon, 30 Jul 2007 08:00:10 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r561003 - in /directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor: ./ controller/ controller/actions/ model/ model/difference/ model/io/ model/schemachecker/ view/editors/attri... Date: Mon, 30 Jul 2007 15:00:09 -0000 To: commits@directory.apache.org From: pamarcelot@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070730150010.2C5DF1A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: pamarcelot Date: Mon Jul 30 08:00:07 2007 New Revision: 561003 URL: http://svn.apache.org/viewvc?view=rev&rev=561003 Log: Applied Formatting template. Modified: directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/SchemaImporter.java directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/controller/AttributeTypeAdapter.java directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/controller/ProblemsViewController.java directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/controller/SchemaAdapter.java directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/controller/SchemaListener.java directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/controller/actions/RenameProjectAction.java directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/model/MatchingRuleImpl.java directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/model/difference/AliasDifference.java directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/model/difference/MandatoryATDifference.java directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/model/difference/OrderingDifference.java directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/model/io/ProjectsExporter.java directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/model/io/XMLSchemaFileImporter.java directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/model/schemachecker/NoAliasWarning.java directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/model/schemachecker/NonExistingOCSuperiorError.java directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/model/schemachecker/SchemaCheckerListener.java directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/editors/attributetype/AttributeTypeEditor.java directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/views/SchemaViewSortingDialog.java directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/widget/DifferencesWidget.java directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/wizards/CommitChangesWizard.java directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/wizards/ExportProjectsWizard.java directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/wizards/ExportSchemasAsXmlWizard.java directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/wizards/ExportSchemasForADSWizard.java directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/wizards/ImportProjectsWizard.java directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/wizards/ImportSchemasFromOpenLdapWizard.java directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/wizards/ImportSchemasFromOpenLdapWizardPage.java directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/wizards/ImportSchemasFromXmlWizard.java directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/wizards/ImportSchemasFromXmlWizardPage.java directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/wizards/NewAttributeTypeContentWizardPage.java directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/wizards/NewAttributeTypeWizard.java directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/wizards/NewObjectClassWizard.java directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/wizards/NewProjectWizard.java directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/wrappers/difference/AttributeTypeDifferenceWrapper.java directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/wrappers/difference/ObjectClassDifferenceWrapper.java directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/wrappers/difference/WrapperState.java Modified: directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/SchemaImporter.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/SchemaImporter.java?view=diff&rev=561003&r1=561002&r2=561003 ============================================================================== --- directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/SchemaImporter.java (original) +++ directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/SchemaImporter.java Mon Jul 30 08:00:07 2007 @@ -135,7 +135,7 @@ schemas.add( getSchema( context, value ) ); } } - + return schemas; } Modified: directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/controller/AttributeTypeAdapter.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/controller/AttributeTypeAdapter.java?view=diff&rev=561003&r1=561002&r2=561003 ============================================================================== --- directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/controller/AttributeTypeAdapter.java (original) +++ directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/controller/AttributeTypeAdapter.java Mon Jul 30 08:00:07 2007 @@ -20,7 +20,6 @@ package org.apache.directory.studio.apacheds.schemaeditor.controller; - /** * This adapter class provides default implementations for the methods * described by the AttributeTypeListener interface. Modified: directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/controller/ProblemsViewController.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/controller/ProblemsViewController.java?view=diff&rev=561003&r1=561002&r2=561003 ============================================================================== --- directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/controller/ProblemsViewController.java (original) +++ directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/controller/ProblemsViewController.java Mon Jul 30 08:00:07 2007 @@ -132,7 +132,7 @@ } else { - view.setErrorsAndWarningsCount(0, 0); + view.setErrorsAndWarningsCount( 0, 0 ); view.getViewer().setInput( null ); } } Modified: directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/controller/SchemaAdapter.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/controller/SchemaAdapter.java?view=diff&rev=561003&r1=561002&r2=561003 ============================================================================== --- directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/controller/SchemaAdapter.java (original) +++ directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/controller/SchemaAdapter.java Mon Jul 30 08:00:07 2007 @@ -19,6 +19,7 @@ */ package org.apache.directory.studio.apacheds.schemaeditor.controller; + import org.apache.directory.studio.apacheds.schemaeditor.model.AttributeTypeImpl; import org.apache.directory.studio.apacheds.schemaeditor.model.MatchingRuleImpl; import org.apache.directory.studio.apacheds.schemaeditor.model.ObjectClassImpl; Modified: directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/controller/SchemaListener.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/controller/SchemaListener.java?view=diff&rev=561003&r1=561002&r2=561003 ============================================================================== --- directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/controller/SchemaListener.java (original) +++ directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/controller/SchemaListener.java Mon Jul 30 08:00:07 2007 @@ -19,6 +19,7 @@ */ package org.apache.directory.studio.apacheds.schemaeditor.controller; + import org.apache.directory.studio.apacheds.schemaeditor.model.AttributeTypeImpl; import org.apache.directory.studio.apacheds.schemaeditor.model.MatchingRuleImpl; import org.apache.directory.studio.apacheds.schemaeditor.model.ObjectClassImpl; Modified: directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/controller/actions/RenameProjectAction.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/controller/actions/RenameProjectAction.java?view=diff&rev=561003&r1=561002&r2=561003 ============================================================================== --- directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/controller/actions/RenameProjectAction.java (original) +++ directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/controller/actions/RenameProjectAction.java Mon Jul 30 08:00:07 2007 @@ -60,7 +60,7 @@ * @param view * the associate view */ - public RenameProjectAction( TableViewer viewer) + public RenameProjectAction( TableViewer viewer ) { super( "Rename Project..." ); setToolTipText( getText() ); Modified: directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/model/MatchingRuleImpl.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/model/MatchingRuleImpl.java?view=diff&rev=561003&r1=561002&r2=561003 ============================================================================== --- directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/model/MatchingRuleImpl.java (original) +++ directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/model/MatchingRuleImpl.java Mon Jul 30 08:00:07 2007 @@ -39,7 +39,7 @@ public class MatchingRuleImpl extends AbstractMatchingRule implements MutableSchemaObject { private static final long serialVersionUID = 1L; - + /** The OID of the syntax */ private String syntaxOid; Modified: directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/model/difference/AliasDifference.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/model/difference/AliasDifference.java?view=diff&rev=561003&r1=561002&r2=561003 ============================================================================== --- directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/model/difference/AliasDifference.java (original) +++ directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/model/difference/AliasDifference.java Mon Jul 30 08:00:07 2007 @@ -55,5 +55,5 @@ public AliasDifference( Object source, Object destination ) { super( source, destination ); - } + } } Modified: directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/model/difference/MandatoryATDifference.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/model/difference/MandatoryATDifference.java?view=diff&rev=561003&r1=561002&r2=561003 ============================================================================== --- directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/model/difference/MandatoryATDifference.java (original) +++ directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/model/difference/MandatoryATDifference.java Mon Jul 30 08:00:07 2007 @@ -43,6 +43,7 @@ super( source, destination, type ); } + /** * Creates a new instance of MandatoryATDifference. * Modified: directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/model/difference/OrderingDifference.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/model/difference/OrderingDifference.java?view=diff&rev=561003&r1=561002&r2=561003 ============================================================================== --- directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/model/difference/OrderingDifference.java (original) +++ directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/model/difference/OrderingDifference.java Mon Jul 30 08:00:07 2007 @@ -43,6 +43,7 @@ super( source, destination, type ); } + /** * Creates a new instance of OrderingDifference. * Modified: directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/model/io/ProjectsExporter.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/model/io/ProjectsExporter.java?view=diff&rev=561003&r1=561002&r2=561003 ============================================================================== --- directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/model/io/ProjectsExporter.java (original) +++ directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/model/io/ProjectsExporter.java Mon Jul 30 08:00:07 2007 @@ -131,7 +131,8 @@ } // Schemas - XMLSchemaFileExporter.addSchemas( project.getSchemaHandler().getSchemas().toArray( new Schema[0] ), element ); + XMLSchemaFileExporter + .addSchemas( project.getSchemaHandler().getSchemas().toArray( new Schema[0] ), element ); } } Modified: directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/model/io/XMLSchemaFileImporter.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/model/io/XMLSchemaFileImporter.java?view=diff&rev=561003&r1=561002&r2=561003 ============================================================================== --- directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/model/io/XMLSchemaFileImporter.java (original) +++ directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/model/io/XMLSchemaFileImporter.java Mon Jul 30 08:00:07 2007 @@ -161,7 +161,7 @@ public static Schema[] readSchemas( Element element, String path ) throws XMLSchemaFileImportException { List schemas = new ArrayList(); - + if ( !element.getName().equals( SCHEMAS_TAG ) ) { throw new XMLSchemaFileImportException( "The file '" + path + "' does not seem to be a valid Schema file." ); Modified: directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/model/schemachecker/NoAliasWarning.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/model/schemachecker/NoAliasWarning.java?view=diff&rev=561003&r1=561002&r2=561003 ============================================================================== --- directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/model/schemachecker/NoAliasWarning.java (original) +++ directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/model/schemachecker/NoAliasWarning.java Mon Jul 30 08:00:07 2007 @@ -22,6 +22,7 @@ import org.apache.directory.shared.ldap.schema.SchemaObject; + /** * This class represents the NoAliasWarning. * Modified: directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/model/schemachecker/NonExistingOCSuperiorError.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/model/schemachecker/NonExistingOCSuperiorError.java?view=diff&rev=561003&r1=561002&r2=561003 ============================================================================== --- directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/model/schemachecker/NonExistingOCSuperiorError.java (original) +++ directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/model/schemachecker/NonExistingOCSuperiorError.java Mon Jul 30 08:00:07 2007 @@ -52,7 +52,7 @@ this.supAlias = supAlias; } - + /* (non-Javadoc) * @see org.apache.directory.studio.apacheds.schemaeditor.model.schemachecker.SchemaError#getSource() */ Modified: directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/model/schemachecker/SchemaCheckerListener.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/model/schemachecker/SchemaCheckerListener.java?view=diff&rev=561003&r1=561002&r2=561003 ============================================================================== --- directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/model/schemachecker/SchemaCheckerListener.java (original) +++ directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/model/schemachecker/SchemaCheckerListener.java Mon Jul 30 08:00:07 2007 @@ -19,6 +19,7 @@ */ package org.apache.directory.studio.apacheds.schemaeditor.model.schemachecker; + /** * Classes which implement this interface provide methods that deal with the * events that are generated when an event occurrs on the SchemaChecker. Modified: directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/editors/attributetype/AttributeTypeEditor.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/AttributeTypeEditor.java?view=diff&rev=561003&r1=561002&r2=561003 ============================================================================== --- directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/editors/attributetype/AttributeTypeEditor.java (original) +++ directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/editors/attributetype/AttributeTypeEditor.java Mon Jul 30 08:00:07 2007 @@ -55,7 +55,7 @@ /** The ID of the Editor */ public static final String ID = Activator.PLUGIN_ID + ".view.attributeTypeEditor"; //$NON-NLS-1$ - + /** The editor */ private AttributeTypeEditor instance; Modified: directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/views/SchemaViewSortingDialog.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/views/SchemaViewSortingDialog.java?view=diff&rev=561003&r1=561002&r2=561003 ============================================================================== --- directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/views/SchemaViewSortingDialog.java (original) +++ directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/views/SchemaViewSortingDialog.java Mon Jul 30 08:00:07 2007 @@ -140,7 +140,7 @@ // Descending Button descendingButton = new Button( sortingGroupComposite, SWT.RADIO ); - descendingButton.setText( "Descending"); + descendingButton.setText( "Descending" ); descendingButton.setEnabled( true ); initFieldsFromPreferences(); 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=561003&r1=561002&r2=561003 ============================================================================== --- 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 Mon Jul 30 08:00:07 2007 @@ -19,6 +19,7 @@ */ package org.apache.directory.studio.apacheds.schemaeditor.view.widget; + import java.util.ArrayList; import java.util.List; @@ -55,6 +56,7 @@ import org.eclipse.ui.PlatformUI; import org.eclipse.ui.plugin.AbstractUIPlugin; + /** * This class represents the DifferencesWidget. *

@@ -63,307 +65,324 @@ * @author Apache Directory Project * @version $Rev$, $Date$ */ -public class DifferencesWidget { - /** The PreferenceStore */ - private IPreferenceStore store; - - /** The authorized Preferences keys */ - private List authorizedPrefs; - - /** The preference listener */ - private IPropertyChangeListener preferenceListener = new IPropertyChangeListener() { - /* - * (non-Javadoc) - * - * @see org.eclipse.jface.util.IPropertyChangeListener#propertyChange(org.eclipse.jface.util.PropertyChangeEvent) - */ - public void propertyChange(PropertyChangeEvent event) { - if (authorizedPrefs.contains(event.getProperty())) { - treeViewer.refresh(); - } - } - }; - - // The MenuItems - private TreeViewer treeViewer; - private TableViewer tableViewer; - private MenuItem groupByType; - private MenuItem groupByProperty; - - /** - * Creates a new instance of DifferencesWidget. - */ - public DifferencesWidget() { - store = Activator.getDefault().getPreferenceStore(); - } - - /** - * Creates the widget. - * - * @param parent - * the parent Composite - */ - public void createWidget(Composite parent) { - // Composite - Composite composite = new Composite(parent, SWT.NONE); - GridLayout gridLayout = new GridLayout(2, true); - gridLayout.marginBottom = 0; - gridLayout.marginHeight = 0; - gridLayout.marginLeft = 0; - gridLayout.marginRight = 0; - gridLayout.marginTop = 0; - gridLayout.marginWidth = 0; - composite.setLayout(gridLayout); - composite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true)); - - // Left Composite - Composite leftComposite = new Composite(composite, SWT.NONE); - gridLayout = new GridLayout(); - gridLayout.marginBottom = 0; - gridLayout.marginHeight = 0; - gridLayout.marginLeft = 0; - gridLayout.marginRight = 0; - gridLayout.marginTop = 0; - gridLayout.marginWidth = 0; - leftComposite.setLayout(gridLayout); - leftComposite - .setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true)); - - // ToolBar - final ToolBar leftToolBar = new ToolBar(leftComposite, SWT.HORIZONTAL - | SWT.FLAT); - leftToolBar.setLayoutData(new GridData(SWT.RIGHT, SWT.NONE, false, - false)); - // Creating the 'Menu' ToolBar item - final ToolItem leftMenuToolItem = new ToolItem(leftToolBar, SWT.PUSH); - leftMenuToolItem.setImage(AbstractUIPlugin.imageDescriptorFromPlugin( - Activator.PLUGIN_ID, PluginConstants.IMG_TOOLBAR_MENU) - .createImage()); - leftMenuToolItem.setToolTipText("Menu"); - // Creating the associated Menu - final Menu leftMenu = new Menu(PlatformUI.getWorkbench() - .getActiveWorkbenchWindow().getShell(), SWT.POP_UP); - // Adding the action to display the Menu when the item is clicked - leftMenuToolItem.addSelectionListener(new SelectionAdapter() { - public void widgetSelected(SelectionEvent event) { - Rectangle rect = leftMenuToolItem.getBounds(); - Point pt = new Point(rect.x, rect.y + rect.height); - pt = leftToolBar.toDisplay(pt); - leftMenu.setLocation(pt.x, pt.y); - leftMenu.setVisible(true); - } - }); - // Adding the 'Sorting...' MenuItem - MenuItem sortingMenuItem = new MenuItem(leftMenu, SWT.PUSH); - sortingMenuItem.setText("Sorting..."); - sortingMenuItem - .setImage(AbstractUIPlugin.imageDescriptorFromPlugin( - Activator.PLUGIN_ID, PluginConstants.IMG_SORTING) - .createImage()); - sortingMenuItem.addSelectionListener(new SelectionAdapter() { - public void widgetSelected(SelectionEvent arg0) { - new OpenSchemaViewSortingDialogAction().run(); - } - }); - // Adding the 'Separator' MenuItem - new MenuItem(leftMenu, SWT.SEPARATOR); - // Adding the 'Preferences...' MenuItem - MenuItem preferencesMenuItem = new MenuItem(leftMenu, SWT.PUSH); - preferencesMenuItem.setText("Preferences..."); - preferencesMenuItem.addSelectionListener(new SelectionAdapter() { - public void widgetSelected(SelectionEvent arg0) { - new OpenSchemaViewPreferenceAction().run(); - } - }); - - // TreeViewer - treeViewer = new TreeViewer(leftComposite, SWT.SINGLE | SWT.H_SCROLL - | SWT.V_SCROLL | SWT.BORDER); - treeViewer.getTree().setLayoutData( - new GridData(SWT.FILL, SWT.FILL, true, true)); - treeViewer - .setContentProvider(new DifferencesWidgetSchemaContentProvider()); - treeViewer.setLabelProvider(new DifferencesWidgetSchemaLabelProvider()); - treeViewer.addSelectionChangedListener(new ISelectionChangedListener() { - public void selectionChanged(SelectionChangedEvent event) { - StructuredSelection selection = (StructuredSelection) event - .getSelection(); - Object element = selection.getFirstElement(); - if (element instanceof AttributeTypeDifference) { - AttributeTypeDifference atd = (AttributeTypeDifference) element; - if (atd.getType().equals(DifferenceType.MODIFIED)) { - tableViewer.setInput(atd.getDifferences()); - return; - } - } else if (element instanceof ObjectClassDifference) { - ObjectClassDifference ocd = (ObjectClassDifference) element; - if (ocd.getType().equals(DifferenceType.MODIFIED)) { - tableViewer.setInput(ocd.getDifferences()); - return; - } - } - - // Default - tableViewer.setInput(null); - } - }); - treeViewer.addDoubleClickListener(new IDoubleClickListener() { - public void doubleClick(DoubleClickEvent event) { - StructuredSelection selection = (StructuredSelection) event - .getSelection(); - Object element = selection.getFirstElement(); - if ((element instanceof Folder) - || (element instanceof SchemaDifference)) { - treeViewer.setExpandedState(element, !treeViewer - .getExpandedState(element)); - } - } - }); - - // Right Composite - Composite rightComposite = new Composite(composite, SWT.NONE); - gridLayout = new GridLayout(); - gridLayout.marginBottom = 0; - gridLayout.marginHeight = 0; - gridLayout.marginLeft = 0; - gridLayout.marginRight = 0; - gridLayout.marginTop = 0; - gridLayout.marginWidth = 0; - rightComposite.setLayout(gridLayout); - rightComposite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, - true)); - - // ToolBar - final ToolBar rightToolBar = new ToolBar(rightComposite, SWT.HORIZONTAL - | SWT.FLAT); - rightToolBar.setLayoutData(new GridData(SWT.RIGHT, SWT.NONE, false, - false)); - // Creating the 'Menu' ToolBar item - final ToolItem rightMenuToolItem = new ToolItem(rightToolBar, SWT.PUSH); - rightMenuToolItem.setImage(AbstractUIPlugin.imageDescriptorFromPlugin( - Activator.PLUGIN_ID, PluginConstants.IMG_TOOLBAR_MENU) - .createImage()); - rightMenuToolItem.setToolTipText("Menu"); - // Creating the associated Menu - final Menu rightMenu = new Menu(PlatformUI.getWorkbench() - .getActiveWorkbenchWindow().getShell(), SWT.POP_UP); - // Adding the action to display the Menu when the item is clicked - rightMenuToolItem.addSelectionListener(new SelectionAdapter() { - public void widgetSelected(SelectionEvent event) { - Rectangle rect = rightMenuToolItem.getBounds(); - Point pt = new Point(rect.x, rect.y + rect.height); - pt = rightToolBar.toDisplay(pt); - rightMenu.setLocation(pt.x, pt.y); - rightMenu.setVisible(true); - } - }); - // Adding the 'Group By Property' MenuItem - groupByProperty = new MenuItem(rightMenu, SWT.CHECK); - groupByProperty.setText("Group By Property"); - groupByProperty.addSelectionListener(new SelectionAdapter() { - public void widgetSelected(SelectionEvent arg0) { - changeGrouping(PluginConstants.PREFS_DIFFERENCES_WIDGET_GROUPING_PROPERTY); - } - }); - // Adding the 'Group By Type' MenuItem - groupByType = new MenuItem(rightMenu, SWT.CHECK); - groupByType.setText("Group By Type"); - groupByType.addSelectionListener(new SelectionAdapter() { - public void widgetSelected(SelectionEvent arg0) { - changeGrouping(PluginConstants.PREFS_DIFFERENCES_WIDGET_GROUPING_TYPE); - } - }); - updateMenuItemsCheckStatus(); - - // TableViewer - tableViewer = new TableViewer(rightComposite, SWT.SINGLE | SWT.H_SCROLL - | SWT.V_SCROLL | SWT.BORDER); - tableViewer.getTable().setLayoutData( - new GridData(SWT.FILL, SWT.FILL, true, true)); - tableViewer - .setContentProvider(new DifferencesWidgetPropertiesContentProvider()); - tableViewer - .setLabelProvider(new DifferencesWidgetPropertiesLabelProvider()); - - initAuthorizedPrefs(); - initPreferencesListener(); - } - - /** - * Sets the Input of the DifferencesWidget. - * - * @param input - * the input - */ - public void setInput(List input) { - treeViewer.setInput(input); - } - - /** - * Changes the Grouping option. - * - * @param value - * the value to store in the PreferenceStore - */ - private void changeGrouping(int value) { - store - .setValue(PluginConstants.PREFS_DIFFERENCES_WIDGET_GROUPING, - value); - updateMenuItemsCheckStatus(); - tableViewer.refresh(); - } - - /** - * Updates the MenuItmes 'check' state according to the value from the - * PreferenceStore. - */ - private void updateMenuItemsCheckStatus() { - int prefValue = store - .getInt(PluginConstants.PREFS_DIFFERENCES_WIDGET_GROUPING); - if (prefValue == PluginConstants.PREFS_DIFFERENCES_WIDGET_GROUPING_PROPERTY) { - groupByProperty.setSelection(true); - groupByType.setSelection(false); - } else if (prefValue == PluginConstants.PREFS_DIFFERENCES_WIDGET_GROUPING_TYPE) { - groupByProperty.setSelection(false); - groupByType.setSelection(true); - } else { - groupByProperty.setSelection(false); - groupByType.setSelection(false); - } - } - - /** - * Initializes the Authorized Prefs IDs. - */ - private void initAuthorizedPrefs() { - authorizedPrefs = new ArrayList(); - authorizedPrefs.add(PluginConstants.PREFS_SCHEMA_VIEW_LABEL); - authorizedPrefs.add(PluginConstants.PREFS_SCHEMA_VIEW_ABBREVIATE); - authorizedPrefs - .add(PluginConstants.PREFS_SCHEMA_VIEW_ABBREVIATE_MAX_LENGTH); - authorizedPrefs - .add(PluginConstants.PREFS_SCHEMA_VIEW_SECONDARY_LABEL_DISPLAY); - authorizedPrefs.add(PluginConstants.PREFS_SCHEMA_VIEW_SECONDARY_LABEL); - authorizedPrefs - .add(PluginConstants.PREFS_SCHEMA_VIEW_SECONDARY_LABEL_ABBREVIATE); - authorizedPrefs - .add(PluginConstants.PREFS_SCHEMA_VIEW_SECONDARY_LABEL_ABBREVIATE_MAX_LENGTH); - authorizedPrefs.add(PluginConstants.PREFS_SCHEMA_VIEW_GROUPING); - authorizedPrefs.add(PluginConstants.PREFS_SCHEMA_VIEW_SORTING_BY); - authorizedPrefs.add(PluginConstants.PREFS_SCHEMA_VIEW_SORTING_ORDER); - } - - /** - * Initializes the listener on the preferences store - */ - private void initPreferencesListener() { - store.addPropertyChangeListener(preferenceListener); - } - - /** - * Disposes the SWT resources allocated by this dialog page. - */ - public void dispose() { - store.removePropertyChangeListener(preferenceListener); - } +public class DifferencesWidget +{ + /** The PreferenceStore */ + private IPreferenceStore store; + + /** The authorized Preferences keys */ + private List authorizedPrefs; + + /** The preference listener */ + private IPropertyChangeListener preferenceListener = new IPropertyChangeListener() + { + /* + * (non-Javadoc) + * + * @see org.eclipse.jface.util.IPropertyChangeListener#propertyChange(org.eclipse.jface.util.PropertyChangeEvent) + */ + public void propertyChange( PropertyChangeEvent event ) + { + if ( authorizedPrefs.contains( event.getProperty() ) ) + { + treeViewer.refresh(); + } + } + }; + + // The MenuItems + private TreeViewer treeViewer; + private TableViewer tableViewer; + private MenuItem groupByType; + private MenuItem groupByProperty; + + + /** + * Creates a new instance of DifferencesWidget. + */ + public DifferencesWidget() + { + store = Activator.getDefault().getPreferenceStore(); + } + + + /** + * Creates the widget. + * + * @param parent + * the parent Composite + */ + public void createWidget( Composite parent ) + { + // Composite + Composite composite = new Composite( parent, SWT.NONE ); + GridLayout gridLayout = new GridLayout( 2, true ); + gridLayout.marginBottom = 0; + gridLayout.marginHeight = 0; + gridLayout.marginLeft = 0; + gridLayout.marginRight = 0; + gridLayout.marginTop = 0; + gridLayout.marginWidth = 0; + composite.setLayout( gridLayout ); + composite.setLayoutData( new GridData( SWT.FILL, SWT.FILL, true, true ) ); + + // Left Composite + Composite leftComposite = new Composite( composite, SWT.NONE ); + gridLayout = new GridLayout(); + gridLayout.marginBottom = 0; + gridLayout.marginHeight = 0; + gridLayout.marginLeft = 0; + gridLayout.marginRight = 0; + gridLayout.marginTop = 0; + gridLayout.marginWidth = 0; + leftComposite.setLayout( gridLayout ); + leftComposite.setLayoutData( new GridData( SWT.FILL, SWT.FILL, true, true ) ); + + // ToolBar + final ToolBar leftToolBar = new ToolBar( leftComposite, SWT.HORIZONTAL | SWT.FLAT ); + leftToolBar.setLayoutData( new GridData( SWT.RIGHT, SWT.NONE, false, false ) ); + // Creating the 'Menu' ToolBar item + final ToolItem leftMenuToolItem = new ToolItem( leftToolBar, SWT.PUSH ); + leftMenuToolItem.setImage( AbstractUIPlugin.imageDescriptorFromPlugin( Activator.PLUGIN_ID, + PluginConstants.IMG_TOOLBAR_MENU ).createImage() ); + leftMenuToolItem.setToolTipText( "Menu" ); + // Creating the associated Menu + final Menu leftMenu = new Menu( PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), SWT.POP_UP ); + // Adding the action to display the Menu when the item is clicked + leftMenuToolItem.addSelectionListener( new SelectionAdapter() + { + public void widgetSelected( SelectionEvent event ) + { + Rectangle rect = leftMenuToolItem.getBounds(); + Point pt = new Point( rect.x, rect.y + rect.height ); + pt = leftToolBar.toDisplay( pt ); + leftMenu.setLocation( pt.x, pt.y ); + leftMenu.setVisible( true ); + } + } ); + // Adding the 'Sorting...' MenuItem + MenuItem sortingMenuItem = new MenuItem( leftMenu, SWT.PUSH ); + sortingMenuItem.setText( "Sorting..." ); + sortingMenuItem.setImage( AbstractUIPlugin.imageDescriptorFromPlugin( Activator.PLUGIN_ID, + PluginConstants.IMG_SORTING ).createImage() ); + sortingMenuItem.addSelectionListener( new SelectionAdapter() + { + public void widgetSelected( SelectionEvent arg0 ) + { + new OpenSchemaViewSortingDialogAction().run(); + } + } ); + // Adding the 'Separator' MenuItem + new MenuItem( leftMenu, SWT.SEPARATOR ); + // Adding the 'Preferences...' MenuItem + MenuItem preferencesMenuItem = new MenuItem( leftMenu, SWT.PUSH ); + preferencesMenuItem.setText( "Preferences..." ); + preferencesMenuItem.addSelectionListener( new SelectionAdapter() + { + public void widgetSelected( SelectionEvent arg0 ) + { + new OpenSchemaViewPreferenceAction().run(); + } + } ); + + // TreeViewer + treeViewer = new TreeViewer( leftComposite, SWT.SINGLE | SWT.H_SCROLL | SWT.V_SCROLL | SWT.BORDER ); + treeViewer.getTree().setLayoutData( new GridData( SWT.FILL, SWT.FILL, true, true ) ); + treeViewer.setContentProvider( new DifferencesWidgetSchemaContentProvider() ); + treeViewer.setLabelProvider( new DifferencesWidgetSchemaLabelProvider() ); + treeViewer.addSelectionChangedListener( new ISelectionChangedListener() + { + public void selectionChanged( SelectionChangedEvent event ) + { + StructuredSelection selection = ( StructuredSelection ) event.getSelection(); + Object element = selection.getFirstElement(); + if ( element instanceof AttributeTypeDifference ) + { + AttributeTypeDifference atd = ( AttributeTypeDifference ) element; + if ( atd.getType().equals( DifferenceType.MODIFIED ) ) + { + tableViewer.setInput( atd.getDifferences() ); + return; + } + } + else if ( element instanceof ObjectClassDifference ) + { + ObjectClassDifference ocd = ( ObjectClassDifference ) element; + if ( ocd.getType().equals( DifferenceType.MODIFIED ) ) + { + tableViewer.setInput( ocd.getDifferences() ); + return; + } + } + + // Default + tableViewer.setInput( null ); + } + } ); + treeViewer.addDoubleClickListener( new IDoubleClickListener() + { + public void doubleClick( DoubleClickEvent event ) + { + StructuredSelection selection = ( StructuredSelection ) event.getSelection(); + Object element = selection.getFirstElement(); + if ( ( element instanceof Folder ) || ( element instanceof SchemaDifference ) ) + { + treeViewer.setExpandedState( element, !treeViewer.getExpandedState( element ) ); + } + } + } ); + + // Right Composite + Composite rightComposite = new Composite( composite, SWT.NONE ); + gridLayout = new GridLayout(); + gridLayout.marginBottom = 0; + gridLayout.marginHeight = 0; + gridLayout.marginLeft = 0; + gridLayout.marginRight = 0; + gridLayout.marginTop = 0; + gridLayout.marginWidth = 0; + rightComposite.setLayout( gridLayout ); + rightComposite.setLayoutData( new GridData( SWT.FILL, SWT.FILL, true, true ) ); + + // ToolBar + final ToolBar rightToolBar = new ToolBar( rightComposite, SWT.HORIZONTAL | SWT.FLAT ); + rightToolBar.setLayoutData( new GridData( SWT.RIGHT, SWT.NONE, false, false ) ); + // Creating the 'Menu' ToolBar item + final ToolItem rightMenuToolItem = new ToolItem( rightToolBar, SWT.PUSH ); + rightMenuToolItem.setImage( AbstractUIPlugin.imageDescriptorFromPlugin( Activator.PLUGIN_ID, + PluginConstants.IMG_TOOLBAR_MENU ).createImage() ); + rightMenuToolItem.setToolTipText( "Menu" ); + // Creating the associated Menu + final Menu rightMenu = new Menu( PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), SWT.POP_UP ); + // Adding the action to display the Menu when the item is clicked + rightMenuToolItem.addSelectionListener( new SelectionAdapter() + { + public void widgetSelected( SelectionEvent event ) + { + Rectangle rect = rightMenuToolItem.getBounds(); + Point pt = new Point( rect.x, rect.y + rect.height ); + pt = rightToolBar.toDisplay( pt ); + rightMenu.setLocation( pt.x, pt.y ); + rightMenu.setVisible( true ); + } + } ); + // Adding the 'Group By Property' MenuItem + groupByProperty = new MenuItem( rightMenu, SWT.CHECK ); + groupByProperty.setText( "Group By Property" ); + groupByProperty.addSelectionListener( new SelectionAdapter() + { + public void widgetSelected( SelectionEvent arg0 ) + { + changeGrouping( PluginConstants.PREFS_DIFFERENCES_WIDGET_GROUPING_PROPERTY ); + } + } ); + // Adding the 'Group By Type' MenuItem + groupByType = new MenuItem( rightMenu, SWT.CHECK ); + groupByType.setText( "Group By Type" ); + groupByType.addSelectionListener( new SelectionAdapter() + { + public void widgetSelected( SelectionEvent arg0 ) + { + changeGrouping( PluginConstants.PREFS_DIFFERENCES_WIDGET_GROUPING_TYPE ); + } + } ); + updateMenuItemsCheckStatus(); + + // TableViewer + tableViewer = new TableViewer( rightComposite, SWT.SINGLE | SWT.H_SCROLL | SWT.V_SCROLL | SWT.BORDER ); + tableViewer.getTable().setLayoutData( new GridData( SWT.FILL, SWT.FILL, true, true ) ); + tableViewer.setContentProvider( new DifferencesWidgetPropertiesContentProvider() ); + tableViewer.setLabelProvider( new DifferencesWidgetPropertiesLabelProvider() ); + + initAuthorizedPrefs(); + initPreferencesListener(); + } + + + /** + * Sets the Input of the DifferencesWidget. + * + * @param input + * the input + */ + public void setInput( List input ) + { + treeViewer.setInput( input ); + } + + + /** + * Changes the Grouping option. + * + * @param value + * the value to store in the PreferenceStore + */ + private void changeGrouping( int value ) + { + store.setValue( PluginConstants.PREFS_DIFFERENCES_WIDGET_GROUPING, value ); + updateMenuItemsCheckStatus(); + tableViewer.refresh(); + } + + + /** + * Updates the MenuItmes 'check' state according to the value from the + * PreferenceStore. + */ + private void updateMenuItemsCheckStatus() + { + int prefValue = store.getInt( PluginConstants.PREFS_DIFFERENCES_WIDGET_GROUPING ); + if ( prefValue == PluginConstants.PREFS_DIFFERENCES_WIDGET_GROUPING_PROPERTY ) + { + groupByProperty.setSelection( true ); + groupByType.setSelection( false ); + } + else if ( prefValue == PluginConstants.PREFS_DIFFERENCES_WIDGET_GROUPING_TYPE ) + { + groupByProperty.setSelection( false ); + groupByType.setSelection( true ); + } + else + { + groupByProperty.setSelection( false ); + groupByType.setSelection( false ); + } + } + + + /** + * Initializes the Authorized Prefs IDs. + */ + private void initAuthorizedPrefs() + { + authorizedPrefs = new ArrayList(); + authorizedPrefs.add( PluginConstants.PREFS_SCHEMA_VIEW_LABEL ); + authorizedPrefs.add( PluginConstants.PREFS_SCHEMA_VIEW_ABBREVIATE ); + authorizedPrefs.add( PluginConstants.PREFS_SCHEMA_VIEW_ABBREVIATE_MAX_LENGTH ); + authorizedPrefs.add( PluginConstants.PREFS_SCHEMA_VIEW_SECONDARY_LABEL_DISPLAY ); + authorizedPrefs.add( PluginConstants.PREFS_SCHEMA_VIEW_SECONDARY_LABEL ); + authorizedPrefs.add( PluginConstants.PREFS_SCHEMA_VIEW_SECONDARY_LABEL_ABBREVIATE ); + authorizedPrefs.add( PluginConstants.PREFS_SCHEMA_VIEW_SECONDARY_LABEL_ABBREVIATE_MAX_LENGTH ); + authorizedPrefs.add( PluginConstants.PREFS_SCHEMA_VIEW_GROUPING ); + authorizedPrefs.add( PluginConstants.PREFS_SCHEMA_VIEW_SORTING_BY ); + authorizedPrefs.add( PluginConstants.PREFS_SCHEMA_VIEW_SORTING_ORDER ); + } + + + /** + * Initializes the listener on the preferences store + */ + private void initPreferencesListener() + { + store.addPropertyChangeListener( preferenceListener ); + } + + + /** + * Disposes the SWT resources allocated by this dialog page. + */ + public void dispose() + { + store.removePropertyChangeListener( preferenceListener ); + } } Modified: directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/wizards/CommitChangesWizard.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/wizards/CommitChangesWizard.java?view=diff&rev=561003&r1=561002&r2=561003 ============================================================================== --- directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/wizards/CommitChangesWizard.java (original) +++ directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/wizards/CommitChangesWizard.java Mon Jul 30 08:00:07 2007 @@ -36,7 +36,7 @@ public class CommitChangesWizard extends Wizard implements IExportWizard { public static final String ID = Activator.PLUGIN_ID + ".wizards.CommitChangesWizard"; - + // The pages of the wizard private CommitChangesInformationWizardPage commitChangesInformation; private CommitChangesDifferencesWizardPage commitChangesDifferences; Modified: directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/wizards/ExportProjectsWizard.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/wizards/ExportProjectsWizard.java?view=diff&rev=561003&r1=561002&r2=561003 ============================================================================== --- directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/wizards/ExportProjectsWizard.java (original) +++ directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/wizards/ExportProjectsWizard.java Mon Jul 30 08:00:07 2007 @@ -45,7 +45,7 @@ public class ExportProjectsWizard extends Wizard implements IExportWizard { public static final String ID = Activator.PLUGIN_ID + ".wizards.ExportProjectsWizard"; - + /** The selected projects */ private Project[] selectedProjects = new Project[0]; Modified: directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/wizards/ExportSchemasAsXmlWizard.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/wizards/ExportSchemasAsXmlWizard.java?view=diff&rev=561003&r1=561002&r2=561003 ============================================================================== --- directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/wizards/ExportSchemasAsXmlWizard.java (original) +++ directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/wizards/ExportSchemasAsXmlWizard.java Mon Jul 30 08:00:07 2007 @@ -45,7 +45,7 @@ public class ExportSchemasAsXmlWizard extends Wizard implements IExportWizard { public static final String ID = Activator.PLUGIN_ID + ".wizards.ExportSchemasAsXmlWizard"; - + /** The selected schemas */ private Schema[] selectedSchemas = new Schema[0]; Modified: directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/wizards/ExportSchemasForADSWizard.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/wizards/ExportSchemasForADSWizard.java?view=diff&rev=561003&r1=561002&r2=561003 ============================================================================== --- directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/wizards/ExportSchemasForADSWizard.java (original) +++ directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/wizards/ExportSchemasForADSWizard.java Mon Jul 30 08:00:07 2007 @@ -135,7 +135,7 @@ catch ( InvocationTargetException e ) { // Nothing to do (it will never occur) - e.printStackTrace(); + e.printStackTrace(); } catch ( InterruptedException e ) { Modified: directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/wizards/ImportProjectsWizard.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/wizards/ImportProjectsWizard.java?view=diff&rev=561003&r1=561002&r2=561003 ============================================================================== --- directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/wizards/ImportProjectsWizard.java (original) +++ directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/wizards/ImportProjectsWizard.java Mon Jul 30 08:00:07 2007 @@ -45,7 +45,7 @@ public class ImportProjectsWizard extends Wizard implements IImportWizard { public static final String ID = Activator.PLUGIN_ID + ".wizards.ImportProjectsWizard"; - + // The pages of the wizard private ImportProjectsWizardPage page; Modified: directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/wizards/ImportSchemasFromOpenLdapWizard.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/wizards/ImportSchemasFromOpenLdapWizard.java?view=diff&rev=561003&r1=561002&r2=561003 ============================================================================== --- directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/wizards/ImportSchemasFromOpenLdapWizard.java (original) +++ directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/wizards/ImportSchemasFromOpenLdapWizard.java Mon Jul 30 08:00:07 2007 @@ -46,7 +46,7 @@ public class ImportSchemasFromOpenLdapWizard extends Wizard implements IImportWizard { public static final String ID = Activator.PLUGIN_ID + ".wizards.ImportSchemasFromOpenLdapWizard"; - + /** The SchemaHandler */ private SchemaHandler schemaHandler; @@ -76,9 +76,9 @@ public boolean performFinish() { final File[] selectedSchemasFiles = page.getSelectedSchemaFiles(); - + schemaChecker.disableModificationsListening(); - + try { getContainer().run( true, false, new IRunnableWithProgress() @@ -102,7 +102,7 @@ } monitor.worked( 1 ); } - + monitor.done(); } } ); Modified: directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/wizards/ImportSchemasFromOpenLdapWizardPage.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/wizards/ImportSchemasFromOpenLdapWizardPage.java?view=diff&rev=561003&r1=561002&r2=561003 ============================================================================== --- directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/wizards/ImportSchemasFromOpenLdapWizardPage.java (original) +++ directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/wizards/ImportSchemasFromOpenLdapWizardPage.java Mon Jul 30 08:00:07 2007 @@ -286,8 +286,7 @@ return; } } - - + // Schemas table if ( schemaFilesTableViewer.getCheckedElements().length == 0 ) { Modified: directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/wizards/ImportSchemasFromXmlWizard.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/wizards/ImportSchemasFromXmlWizard.java?view=diff&rev=561003&r1=561002&r2=561003 ============================================================================== --- directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/wizards/ImportSchemasFromXmlWizard.java (original) +++ directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/wizards/ImportSchemasFromXmlWizard.java Mon Jul 30 08:00:07 2007 @@ -47,7 +47,7 @@ public class ImportSchemasFromXmlWizard extends Wizard implements IImportWizard { public static final String ID = Activator.PLUGIN_ID + ".wizards.ImportSchemasFromXmlWizard"; - + /** The SchemaHandler */ private SchemaHandler schemaHandler; Modified: directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/wizards/ImportSchemasFromXmlWizardPage.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/wizards/ImportSchemasFromXmlWizardPage.java?view=diff&rev=561003&r1=561002&r2=561003 ============================================================================== --- directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/wizards/ImportSchemasFromXmlWizardPage.java (original) +++ directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/wizards/ImportSchemasFromXmlWizardPage.java Mon Jul 30 08:00:07 2007 @@ -286,8 +286,7 @@ return; } } - - + // Schemas table if ( schemaFilesTableViewer.getCheckedElements().length == 0 ) { @@ -326,7 +325,7 @@ List schemaFiles = new ArrayList(); for ( Object schemaFile : selectedSchemaFile ) { - schemaFiles.add( (( File ) schemaFile).getAbsolutePath() ); + schemaFiles.add( ( ( File ) schemaFile ).getAbsolutePath() ); } return schemaFiles.toArray( new String[0] ); Modified: directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/wizards/NewAttributeTypeContentWizardPage.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/wizards/NewAttributeTypeContentWizardPage.java?view=diff&rev=561003&r1=561002&r2=561003 ============================================================================== --- directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/wizards/NewAttributeTypeContentWizardPage.java (original) +++ directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/wizards/NewAttributeTypeContentWizardPage.java Mon Jul 30 08:00:07 2007 @@ -214,7 +214,7 @@ displayErrorMessage( "The superior attribute type does not exist." ); return; } - + displayErrorMessage( null ); } Modified: directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/wizards/NewAttributeTypeWizard.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/wizards/NewAttributeTypeWizard.java?view=diff&rev=561003&r1=561002&r2=561003 ============================================================================== --- directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/wizards/NewAttributeTypeWizard.java (original) +++ directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/wizards/NewAttributeTypeWizard.java Mon Jul 30 08:00:07 2007 @@ -38,7 +38,7 @@ public class NewAttributeTypeWizard extends Wizard implements INewWizard { public static final String ID = Activator.PLUGIN_ID + ".wizards.NewAttributeTypeWizard"; - + /** The selected schema */ private Schema selectedSchema; Modified: directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/wizards/NewObjectClassWizard.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/wizards/NewObjectClassWizard.java?view=diff&rev=561003&r1=561002&r2=561003 ============================================================================== --- directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/wizards/NewObjectClassWizard.java (original) +++ directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/wizards/NewObjectClassWizard.java Mon Jul 30 08:00:07 2007 @@ -38,7 +38,7 @@ public class NewObjectClassWizard extends Wizard implements INewWizard { public static final String ID = Activator.PLUGIN_ID + ".wizards.NewObjectClassWizard"; - + /** The selected schema */ private Schema selectedSchema; Modified: directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/wizards/NewProjectWizard.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/wizards/NewProjectWizard.java?view=diff&rev=561003&r1=561002&r2=561003 ============================================================================== --- directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/wizards/NewProjectWizard.java (original) +++ directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/wizards/NewProjectWizard.java Mon Jul 30 08:00:07 2007 @@ -38,7 +38,7 @@ public class NewProjectWizard extends Wizard implements INewWizard { public static final String ID = Activator.PLUGIN_ID + ".wizards.NewProjectWizard"; - + // The pages of the wizard private NewProjectWizardPage page; Modified: directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/wrappers/difference/AttributeTypeDifferenceWrapper.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/wrappers/difference/AttributeTypeDifferenceWrapper.java?view=diff&rev=561003&r1=561002&r2=561003 ============================================================================== --- directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/wrappers/difference/AttributeTypeDifferenceWrapper.java (original) +++ directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/wrappers/difference/AttributeTypeDifferenceWrapper.java Mon Jul 30 08:00:07 2007 @@ -40,7 +40,8 @@ * @param parent * the parent TreeNode */ - public AttributeTypeDifferenceWrapper( Object originalObject, Object modifiedObject, WrapperState state, TreeNode parent ) + public AttributeTypeDifferenceWrapper( Object originalObject, Object modifiedObject, WrapperState state, + TreeNode parent ) { super( originalObject, modifiedObject, state, parent ); } Modified: directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/wrappers/difference/ObjectClassDifferenceWrapper.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/wrappers/difference/ObjectClassDifferenceWrapper.java?view=diff&rev=561003&r1=561002&r2=561003 ============================================================================== --- directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/wrappers/difference/ObjectClassDifferenceWrapper.java (original) +++ directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/wrappers/difference/ObjectClassDifferenceWrapper.java Mon Jul 30 08:00:07 2007 @@ -40,7 +40,8 @@ * @param parent * the parent TreeNode */ - public ObjectClassDifferenceWrapper( Object originalObject, Object modifiedObject, WrapperState state, TreeNode parent ) + public ObjectClassDifferenceWrapper( Object originalObject, Object modifiedObject, WrapperState state, + TreeNode parent ) { super( originalObject, modifiedObject, state, parent ); } Modified: directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/wrappers/difference/WrapperState.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/wrappers/difference/WrapperState.java?view=diff&rev=561003&r1=561002&r2=561003 ============================================================================== --- directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/wrappers/difference/WrapperState.java (original) +++ directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/wrappers/difference/WrapperState.java Mon Jul 30 08:00:07 2007 @@ -1,10 +1,7 @@ - package org.apache.directory.studio.apacheds.schemaeditor.view.wrappers.difference; + public enum WrapperState { - IDENTICAL, - ADDED, - MODFIED, - REMOVED + IDENTICAL, ADDED, MODFIED, REMOVED }