Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 54722 invoked from network); 21 Aug 2007 15:00:49 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 21 Aug 2007 15:00:49 -0000 Received: (qmail 46521 invoked by uid 500); 21 Aug 2007 15:00:46 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 46465 invoked by uid 500); 21 Aug 2007 15:00:46 -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 46454 invoked by uid 99); 21 Aug 2007 15:00:46 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 21 Aug 2007 08:00:46 -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; Tue, 21 Aug 2007 15:01:19 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id D76161A981A; Tue, 21 Aug 2007 08:00:22 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r568154 - in /directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor: ./ controller/ controller/actions/ model/difference/ view/editors/attributetype/ view/editors/objectclass/ vi... Date: Tue, 21 Aug 2007 14:59:57 -0000 To: commits@directory.apache.org From: pamarcelot@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20070821150022.D76161A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: pamarcelot Date: Tue Aug 21 07:59:52 2007 New Revision: 568154 URL: http://svn.apache.org/viewvc?rev=568154&view=rev Log: Cleaned Todos. Improved the NewProjectWizard (Added 2 new wizard pages). Added: directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/wizards/NewProjectWizardConnectionSelectionPage.java directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/wizards/NewProjectWizardInformationPage.java - copied, changed from r567593, directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/wizards/NewProjectWizardPage.java directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/wizards/NewProjectWizardSchemasSelectionPage.java Removed: directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/wizards/NewProjectWizardPage.java Modified: directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/PluginUtils.java directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/controller/HierarchyViewController.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/ProjectsHandler.java directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/controller/SchemaViewController.java directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/controller/actions/OpenElementAction.java directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/controller/actions/OpenTypeHierarchyAction.java directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/model/difference/EqualityDifference.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/editors/objectclass/ObjectClassEditor.java directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/editors/schema/SchemaEditorOverviewPage.java directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/search/SearchPage.java directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/views/SearchView.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/ExportSchemasAsOpenLdapWizard.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/ImportSchemasFromXmlWizard.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/wizards/NewSchemaWizardPage.java Modified: directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/PluginUtils.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/PluginUtils.java?rev=568154&r1=568153&r2=568154&view=diff ============================================================================== --- directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/PluginUtils.java (original) +++ directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/PluginUtils.java Tue Aug 21 07:59:52 2007 @@ -140,8 +140,7 @@ } catch ( ProjectsImportException e ) { - // TODO Auto-generated catch block - e.printStackTrace(); + // TODO Add an error and a log } for ( Project project : projects ) @@ -168,8 +167,7 @@ } catch ( IOException e ) { - // TODO Auto-generated catch block - e.printStackTrace(); + // TODO Add an error and a log } } } Modified: directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/controller/HierarchyViewController.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/controller/HierarchyViewController.java?rev=568154&r1=568153&r2=568154&view=diff ============================================================================== --- directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/controller/HierarchyViewController.java (original) +++ directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/controller/HierarchyViewController.java Tue Aug 21 07:59:52 2007 @@ -129,7 +129,7 @@ } catch ( PartInitException e ) { - // TODO ADD A LOGGER + // TODO Add an error and a log } } } 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?rev=568154&r1=568153&r2=568154&view=diff ============================================================================== --- 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 Tue Aug 21 07:59:52 2007 @@ -241,7 +241,7 @@ } catch ( PartInitException e ) { - // TODO + // TODO Add an error and a log } } } Modified: directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/controller/ProjectsHandler.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/controller/ProjectsHandler.java?rev=568154&r1=568153&r2=568154&view=diff ============================================================================== --- directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/controller/ProjectsHandler.java (original) +++ directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/controller/ProjectsHandler.java Tue Aug 21 07:59:52 2007 @@ -38,12 +38,6 @@ * @author Apache Directory Project * @version $Rev$, $Date$ */ -/** - * TODO ProjectsHandler. - * - * @author Apache Directory Project - * @version $Rev$, $Date$ - */ public class ProjectsHandler { /** The ProjectsHandler instance */ Modified: directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/controller/SchemaViewController.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/controller/SchemaViewController.java?rev=568154&r1=568153&r2=568154&view=diff ============================================================================== --- directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/controller/SchemaViewController.java (original) +++ directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/controller/SchemaViewController.java Tue Aug 21 07:59:52 2007 @@ -606,8 +606,7 @@ } catch ( PartInitException e ) { - // logger.debug( "error when opening the editor" ); //$NON-NLS-1$ - e.printStackTrace(); // TODO + // TODO Add an error and a log } } } Modified: directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/controller/actions/OpenElementAction.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/controller/actions/OpenElementAction.java?rev=568154&r1=568153&r2=568154&view=diff ============================================================================== --- directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/controller/actions/OpenElementAction.java (original) +++ directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/controller/actions/OpenElementAction.java Tue Aug 21 07:59:52 2007 @@ -88,7 +88,7 @@ } catch ( PartInitException e ) { - // TODO Add logging + // TODO Add an error and a log } } else if ( selectedItem instanceof ObjectClassWrapper ) @@ -101,7 +101,7 @@ } catch ( PartInitException e ) { - // TODO Add logging + // TODO Add an error and a log } } else if ( selectedItem instanceof SchemaWrapper ) @@ -113,7 +113,7 @@ } catch ( PartInitException e ) { - // TODO Add logging + // TODO Add an error and a log } } else if ( selectedItem instanceof Folder ) Modified: directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/controller/actions/OpenTypeHierarchyAction.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/controller/actions/OpenTypeHierarchyAction.java?rev=568154&r1=568153&r2=568154&view=diff ============================================================================== --- directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/controller/actions/OpenTypeHierarchyAction.java (original) +++ directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/controller/actions/OpenTypeHierarchyAction.java Tue Aug 21 07:59:52 2007 @@ -163,7 +163,7 @@ } catch ( PartInitException e ) { - // TODO Add a logger + // TODO Add an error and a log } } Modified: directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/model/difference/EqualityDifference.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/model/difference/EqualityDifference.java?rev=568154&r1=568153&r2=568154&view=diff ============================================================================== --- directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/model/difference/EqualityDifference.java (original) +++ directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/model/difference/EqualityDifference.java Tue Aug 21 07:59:52 2007 @@ -41,7 +41,6 @@ public EqualityDifference( Object source, Object destination, DifferenceType type ) { super( source, destination, type ); - // TODO Auto-generated constructor stub } 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?rev=568154&r1=568153&r2=568154&view=diff ============================================================================== --- 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 Tue Aug 21 07:59:52 2007 @@ -87,7 +87,7 @@ { if ( !sourceCode.canLeaveThePage() ) { - notifyError( "AttributeTypeEditor.Souce_Code_Error_cannot_return_to_Overview_page" ); //TODO + notifyError( "The editor of the Source Code contains errors, you cannot return to the Overview page until these errors are fixed." ); return; } @@ -190,7 +190,7 @@ // Verifying if there is an error on the source code page if ( !sourceCode.canLeaveThePage() ) { - notifyError( "AttributeTypeEditor.Souce_Code_Error_cannot_save_object_class" ); //TODO + notifyError( "The editor of the Source Code contains errors, you cannot save the attribute type until these errors are fixed." ); monitor.setCanceled( true ); return; } Modified: directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/editors/objectclass/ObjectClassEditor.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/ObjectClassEditor.java?rev=568154&r1=568153&r2=568154&view=diff ============================================================================== --- directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/editors/objectclass/ObjectClassEditor.java (original) +++ directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/editors/objectclass/ObjectClassEditor.java Tue Aug 21 07:59:52 2007 @@ -86,7 +86,7 @@ { if ( !sourceCode.canLeaveThePage() ) { - notifyError( "Source_Code_Error_cannot_return_to_Overview_page" ); //TODO + notifyError( "The editor of the Source Code contains errors, you cannot return to the Overview page until these errors are fixed." ); return; } @@ -188,7 +188,7 @@ // Verifying if there is an error on the source code page if ( !sourceCode.canLeaveThePage() ) { - notifyError( "Source_Code_Error_cannot_save_object_class" ); //TODO + notifyError( "The editor of the Source Code contains errors, you cannot save the object class until these errors are fixed." ); monitor.setCanceled( true ); return; } Modified: directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/editors/schema/SchemaEditorOverviewPage.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/SchemaEditorOverviewPage.java?rev=568154&r1=568153&r2=568154&view=diff ============================================================================== --- directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/editors/schema/SchemaEditorOverviewPage.java (original) +++ directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/editors/schema/SchemaEditorOverviewPage.java Tue Aug 21 07:59:52 2007 @@ -152,7 +152,7 @@ } catch ( PartInitException exception ) { - //TODO Add a logger + // TODO Add an error and a log } } } @@ -179,7 +179,7 @@ } catch ( PartInitException exception ) { - //TODO Add a logger + // TODO Add an error and a log } } } Modified: directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/search/SearchPage.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/search/SearchPage.java?rev=568154&r1=568153&r2=568154&view=diff ============================================================================== --- directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/search/SearchPage.java (original) +++ directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/search/SearchPage.java Tue Aug 21 07:59:52 2007 @@ -285,8 +285,7 @@ } catch ( PartInitException e ) { - // TODO ADD Logger - e.printStackTrace(); + // TODO Add an error and a log } return true; Modified: directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/views/SearchView.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/views/SearchView.java?rev=568154&r1=568153&r2=568154&view=diff ============================================================================== --- directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/views/SearchView.java (original) +++ directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/views/SearchView.java Tue Aug 21 07:59:52 2007 @@ -482,7 +482,7 @@ } catch ( PartInitException exception ) { - //TODO: Add a logger + // TODO Add an error and a log } } } 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?rev=568154&r1=568153&r2=568154&view=diff ============================================================================== --- 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 Tue Aug 21 07:59:52 2007 @@ -95,8 +95,7 @@ } catch ( IOException e ) { - // TODO Auto-generated catch block - e.printStackTrace(); + // TODO Add an error and a log } monitor.worked( 1 ); } Modified: directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/wizards/ExportSchemasAsOpenLdapWizard.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/wizards/ExportSchemasAsOpenLdapWizard.java?rev=568154&r1=568153&r2=568154&view=diff ============================================================================== --- directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/wizards/ExportSchemasAsOpenLdapWizard.java (original) +++ directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/wizards/ExportSchemasAsOpenLdapWizard.java Tue Aug 21 07:59:52 2007 @@ -95,8 +95,7 @@ } catch ( IOException e ) { - // TODO Auto-generated catch block - e.printStackTrace(); + // TODO Add an error and a log } monitor.worked( 1 ); } 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?rev=568154&r1=568153&r2=568154&view=diff ============================================================================== --- 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 Tue Aug 21 07:59:52 2007 @@ -98,8 +98,7 @@ } catch ( IOException e ) { - // TODO Auto-generated catch block - e.printStackTrace(); + // TODO Add an error and a log } monitor.worked( 1 ); } @@ -134,8 +133,7 @@ } catch ( IOException e ) { - // TODO Auto-generated catch block - e.printStackTrace(); + // TODO Add an error and a log } monitor.worked( 1 ); monitor.done(); 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?rev=568154&r1=568153&r2=568154&view=diff ============================================================================== --- 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 Tue Aug 21 07:59:52 2007 @@ -118,13 +118,11 @@ } catch ( IOException e ) { - // TODO Auto-generated catch block - e.printStackTrace(); + // TODO Add an error and a log } catch ( NamingException e ) { - // TODO Auto-generated catch block - e.printStackTrace(); + // TODO Add an error and a log } monitor.worked( 1 ); } @@ -167,8 +165,7 @@ } catch ( NamingException e ) { - // TODO Auto-generated catch block - e.printStackTrace(); + // TODO Add an error and a log } } @@ -180,8 +177,7 @@ } catch ( IOException e ) { - // TODO Auto-generated catch block - e.printStackTrace(); + // TODO Add an error and a log } monitor.worked( 1 ); monitor.done(); 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?rev=568154&r1=568153&r2=568154&view=diff ============================================================================== --- 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 Tue Aug 21 07:59:52 2007 @@ -91,8 +91,7 @@ } catch ( ProjectsImportException e ) { - // TODO Auto-generated catch block - e.printStackTrace(); + // TODO Add an error and a log } monitor.worked( 1 ); } 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?rev=568154&r1=568153&r2=568154&view=diff ============================================================================== --- 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 Tue Aug 21 07:59:52 2007 @@ -97,8 +97,7 @@ } catch ( OpenLdapSchemaFileImportException e ) { - // TODO Auto-generated catch block - e.printStackTrace(); + // TODO Add an error and a log } monitor.worked( 1 ); } 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?rev=568154&r1=568153&r2=568154&view=diff ============================================================================== --- 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 Tue Aug 21 07:59:52 2007 @@ -111,8 +111,7 @@ } catch ( XMLSchemaFileImportException e ) { - // TODO Auto-generated catch block - e.printStackTrace(); + // TODO Add an error and a log } monitor.worked( 1 ); } 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?rev=568154&r1=568153&r2=568154&view=diff ============================================================================== --- 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 Tue Aug 21 07:59:52 2007 @@ -23,7 +23,9 @@ import org.apache.directory.studio.apacheds.schemaeditor.Activator; import org.apache.directory.studio.apacheds.schemaeditor.controller.ProjectsHandler; import org.apache.directory.studio.apacheds.schemaeditor.model.Project; +import org.apache.directory.studio.apacheds.schemaeditor.model.Project.ProjectType; import org.eclipse.jface.viewers.IStructuredSelection; +import org.eclipse.jface.wizard.IWizardPage; import org.eclipse.jface.wizard.Wizard; import org.eclipse.ui.INewWizard; import org.eclipse.ui.IWorkbench; @@ -40,7 +42,9 @@ public static final String ID = Activator.PLUGIN_ID + ".wizards.NewProjectWizard"; // The pages of the wizard - private NewProjectWizardPage page; + private NewProjectWizardInformationPage informationPage; + private NewProjectWizardConnectionSelectionPage connectionSelectionPage; + private NewProjectWizardSchemasSelectionPage schemasSelectionPage; /* (non-Javadoc) @@ -49,10 +53,14 @@ public void addPages() { // Creating pages - page = new NewProjectWizardPage(); + informationPage = new NewProjectWizardInformationPage(); + connectionSelectionPage = new NewProjectWizardConnectionSelectionPage(); + schemasSelectionPage = new NewProjectWizardSchemasSelectionPage(); // Adding pages - addPage( page ); + addPage( informationPage ); + addPage( connectionSelectionPage ); + addPage( schemasSelectionPage ); } @@ -61,12 +69,61 @@ */ public boolean performFinish() { - Project project = new Project( page.getProjectType(), page.getProjectName() ); + Project project = new Project( informationPage.getProjectType(), informationPage.getProjectName() ); ProjectsHandler projectsHandler = Activator.getDefault().getProjectsHandler(); projectsHandler.addProject( project ); projectsHandler.openProject( project ); return true; + } + + + /* (non-Javadoc) + * @see org.eclipse.jface.wizard.Wizard#getNextPage(org.eclipse.jface.wizard.IWizardPage) + */ + public IWizardPage getNextPage( IWizardPage page ) + { + if ( page.equals( informationPage ) ) + { + if ( informationPage.getProjectType().equals( ProjectType.APACHE_DIRECTORY_SERVER ) ) + { + return connectionSelectionPage; + } + else if ( informationPage.getProjectType().equals( ProjectType.OFFLINE ) ) + { + return schemasSelectionPage; + } + + // Default + return null; + } + + // Default + return null; + } + + + /* (non-Javadoc) + * @see org.eclipse.jface.wizard.Wizard#getPreviousPage(org.eclipse.jface.wizard.IWizardPage) + */ + public IWizardPage getPreviousPage( IWizardPage page ) + { + if ( ( page.equals( connectionSelectionPage ) ) || ( page.equals( schemasSelectionPage ) ) ) + { + return informationPage; + } + + // Default + return null; + } + + + /* (non-Javadoc) + * @see org.eclipse.jface.wizard.Wizard#canFinish() + */ + public boolean canFinish() + { + return !getContainer().getCurrentPage().equals( informationPage ); } Added: directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/wizards/NewProjectWizardConnectionSelectionPage.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/wizards/NewProjectWizardConnectionSelectionPage.java?rev=568154&view=auto ============================================================================== --- directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/wizards/NewProjectWizardConnectionSelectionPage.java (added) +++ directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/wizards/NewProjectWizardConnectionSelectionPage.java Tue Aug 21 07:59:52 2007 @@ -0,0 +1,101 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * + */ +package org.apache.directory.studio.apacheds.schemaeditor.view.wizards; + + +import org.apache.directory.studio.apacheds.schemaeditor.Activator; +import org.apache.directory.studio.apacheds.schemaeditor.PluginConstants; +import org.eclipse.jface.wizard.WizardPage; +import org.eclipse.swt.SWT; +import org.eclipse.swt.layout.GridData; +import org.eclipse.swt.layout.GridLayout; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Label; +import org.eclipse.ui.plugin.AbstractUIPlugin; + + +/** + * This class represents the Information Page of the NewProjectWizard. + *

+ * It is used to let the user create a new Project + * + * @author Apache Directory Project + * @version $Rev$, $Date$ + */ +public class NewProjectWizardConnectionSelectionPage extends WizardPage +{ + // UI Fields + + /** + * Creates a new instance of NewProjectWizardConnectionSelectionPage. + */ + protected NewProjectWizardConnectionSelectionPage() + { + super( "NewProjectWizardConnectionSelectionPage" ); + setTitle( "Create a Schema project." ); + setDescription( "Please select a connection." ); + setImageDescriptor( AbstractUIPlugin.imageDescriptorFromPlugin( Activator.PLUGIN_ID, + PluginConstants.IMG_PROJECT_NEW_WIZARD ) ); + setPageComplete( false ); + } + + + /* (non-Javadoc) + * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite) + */ + public void createControl( Composite parent ) + { + Composite composite = new Composite( parent, SWT.NONE ); + composite.setLayout( new GridLayout() ); + + // Connection + Label label = new Label( composite, SWT.NONE ); + label.setText( "Choose a connection:" ); + label.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false ) ); + + initFields(); + + setControl( composite ); + } + + + /** + * Initializes the UI Fields. + */ + private void initFields() + { + displayErrorMessage( null ); + setPageComplete( false ); + } + + + /** + * Displays an error message and set the page status as incomplete + * if the message is not null. + * + * @param message + * the message to display + */ + private void displayErrorMessage( String message ) + { + setErrorMessage( message ); + setPageComplete( message == null ); + } +} Copied: directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/wizards/NewProjectWizardInformationPage.java (from r567593, directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/wizards/NewProjectWizardPage.java) URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/wizards/NewProjectWizardInformationPage.java?p2=directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/wizards/NewProjectWizardInformationPage.java&p1=directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/wizards/NewProjectWizardPage.java&r1=567593&r2=568154&rev=568154&view=diff ============================================================================== --- directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/wizards/NewProjectWizardPage.java (original) +++ directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/wizards/NewProjectWizardInformationPage.java Tue Aug 21 07:59:52 2007 @@ -39,14 +39,14 @@ /** - * This class represents the WizardPage of the NewProjectWizard. + * This class represents the Information Page of the NewProjectWizard. *

* It is used to let the user create a new Project * * @author Apache Directory Project * @version $Rev$, $Date$ */ -public class NewProjectWizardPage extends WizardPage +public class NewProjectWizardInformationPage extends WizardPage { /** The ProjectsHandler */ private ProjectsHandler projectsHandler; @@ -58,11 +58,11 @@ /** - * Creates a new instance of NewProjectWizardPage. + * Creates a new instance of NewProjectWizardInformationPage. */ - protected NewProjectWizardPage() + protected NewProjectWizardInformationPage() { - super( "NewProjectWizardPage" ); + super( "NewProjectWizardInformationPage" ); setTitle( "Create a Schema project." ); setDescription( "Please specify a name and a type to create a new Schema project." ); setImageDescriptor( AbstractUIPlugin.imageDescriptorFromPlugin( Activator.PLUGIN_ID, @@ -188,4 +188,6 @@ return ProjectType.OFFLINE; } } + + } Added: directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/wizards/NewProjectWizardSchemasSelectionPage.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/wizards/NewProjectWizardSchemasSelectionPage.java?rev=568154&view=auto ============================================================================== --- directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/wizards/NewProjectWizardSchemasSelectionPage.java (added) +++ directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/wizards/NewProjectWizardSchemasSelectionPage.java Tue Aug 21 07:59:52 2007 @@ -0,0 +1,118 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * + */ +package org.apache.directory.studio.apacheds.schemaeditor.view.wizards; + + +import org.apache.directory.studio.apacheds.schemaeditor.Activator; +import org.apache.directory.studio.apacheds.schemaeditor.PluginConstants; +import org.apache.directory.studio.apacheds.schemaeditor.model.Schema; +import org.eclipse.jface.viewers.ArrayContentProvider; +import org.eclipse.jface.viewers.CheckboxTableViewer; +import org.eclipse.jface.viewers.LabelProvider; +import org.eclipse.jface.wizard.WizardPage; +import org.eclipse.swt.SWT; +import org.eclipse.swt.graphics.Image; +import org.eclipse.swt.layout.GridData; +import org.eclipse.swt.layout.GridLayout; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Label; +import org.eclipse.swt.widgets.Table; +import org.eclipse.ui.plugin.AbstractUIPlugin; + + +/** + * This class represents the Information Page of the NewProjectWizard. + *

+ * It is used to let the user create a new Project + * + * @author Apache Directory Project + * @version $Rev$, $Date$ + */ +public class NewProjectWizardSchemasSelectionPage extends WizardPage +{ + // UI Fields + private CheckboxTableViewer coreSchemasTableViewer; + + + /** + * Creates a new instance of NewProjectWizardSchemasSelectionPage. + */ + protected NewProjectWizardSchemasSelectionPage() + { + super( "NewProjectWizardSchemasSelectionPage" ); + setTitle( "Create a Schema project." ); + setDescription( "Please select the core schemas to include." ); + setImageDescriptor( AbstractUIPlugin.imageDescriptorFromPlugin( Activator.PLUGIN_ID, + PluginConstants.IMG_PROJECT_NEW_WIZARD ) ); + } + + + /* (non-Javadoc) + * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite) + */ + public void createControl( Composite parent ) + { + Composite composite = new Composite( parent, SWT.NONE ); + composite.setLayout( new GridLayout() ); + + // Core Schemas TableViewer + Label label = new Label( composite, SWT.NONE ); + label.setText( "Choose the 'core' schemas to include in the project:" ); + label.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false ) ); + coreSchemasTableViewer = new CheckboxTableViewer( new Table( composite, SWT.BORDER | SWT.CHECK + | SWT.FULL_SELECTION ) ); + coreSchemasTableViewer.getTable().setLayoutData( new GridData( SWT.FILL, SWT.FILL, true, true ) ); + coreSchemasTableViewer.setContentProvider( new ArrayContentProvider() ); + coreSchemasTableViewer.setLabelProvider( new LabelProvider() + { + public Image getImage( Object element ) + { + return AbstractUIPlugin.imageDescriptorFromPlugin( Activator.PLUGIN_ID, PluginConstants.IMG_SCHEMA ) + .createImage(); + } + } ); + + initFields(); + + setControl( composite ); + } + + + /** + * Initializes the UI Fields. + */ + private void initFields() + { + coreSchemasTableViewer.setInput( new String[] + { "core", "mozilla", "system" } ); + } + + + /** + * Gets the schemas selected by the User. + * + * @return + * the selected schemas + */ + public String[] getSelectedSchemas() + { + return ( String[] ) coreSchemasTableViewer.getCheckedElements(); + } +} Modified: directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/wizards/NewSchemaWizardPage.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/wizards/NewSchemaWizardPage.java?rev=568154&r1=568153&r2=568154&view=diff ============================================================================== --- directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/wizards/NewSchemaWizardPage.java (original) +++ directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/wizards/NewSchemaWizardPage.java Tue Aug 21 07:59:52 2007 @@ -53,7 +53,7 @@ /** - * Creates a new instance of NewProjectWizardPage. + * Creates a new instance of NewSchemaWizardPage. */ protected NewSchemaWizardPage() {