Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 94588 invoked from network); 27 Nov 2008 21:36:29 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 27 Nov 2008 21:36:29 -0000 Received: (qmail 14640 invoked by uid 500); 27 Nov 2008 21:36:40 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 14610 invoked by uid 500); 27 Nov 2008 21:36:40 -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 14601 invoked by uid 99); 27 Nov 2008 21:36:40 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 27 Nov 2008 13:36:40 -0800 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 27 Nov 2008 21:35:20 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 08A99238889B; Thu, 27 Nov 2008 13:35:37 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r721282 [1/2] - in /directory/studio/trunk/ldapbrowser-ui/src/main: java/org/apache/directory/studio/ldapbrowser/ui/wizards/ resources/org/apache/directory/studio/ldapbrowser/ui/wizards/ Date: Thu, 27 Nov 2008 21:35:35 -0000 To: commits@directory.apache.org From: felixk@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20081127213537.08A99238889B@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: felixk Date: Thu Nov 27 13:35:34 2008 New Revision: 721282 URL: http://svn.apache.org/viewvc?rev=721282&view=rev Log: Externalize Strings Added: directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/Messages.java (with props) directory/studio/trunk/ldapbrowser-ui/src/main/resources/org/apache/directory/studio/ldapbrowser/ui/wizards/ directory/studio/trunk/ldapbrowser-ui/src/main/resources/org/apache/directory/studio/ldapbrowser/ui/wizards/messages.properties (with props) Modified: directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/BatchOperationApplyOnWizardPage.java directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/BatchOperationFinishWizardPage.java directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/BatchOperationLdifWizardPage.java directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/BatchOperationModifyWizardPage.java directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/BatchOperationTypeWizardPage.java directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/BatchOperationWizard.java directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportBaseFromWizardPage.java directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportBaseToPage.java directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportConnectionsWizard.java directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportConnectionsWizardPage.java directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportCsvToWizardPage.java directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportCsvWizard.java directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportDsmlToWizardPage.java directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportDsmlWizard.java directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportExcelToWizardPage.java directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportExcelWizard.java directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportLdifToWizardPage.java directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportLdifWizard.java directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportLogsToWizardPage.java directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportModificationLogsWizard.java directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportSearchLogsWizard.java directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ImportConnectionsWizard.java directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ImportConnectionsWizardPage.java directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ImportDsmlMainWizardPage.java directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ImportDsmlWizard.java directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ImportLdifMainWizardPage.java directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/NewBookmarkMainWizardPage.java directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/NewBookmarkWizard.java Modified: directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/BatchOperationApplyOnWizardPage.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/BatchOperationApplyOnWizardPage.java?rev=721282&r1=721281&r2=721282&view=diff ============================================================================== --- directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/BatchOperationApplyOnWizardPage.java (original) +++ directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/BatchOperationApplyOnWizardPage.java Thu Nov 27 13:35:34 2008 @@ -43,6 +43,7 @@ import org.apache.directory.studio.ldapbrowser.core.model.IValue; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.wizard.WizardPage; +import org.eclipse.osgi.util.NLS; import org.eclipse.swt.SWT; import org.eclipse.swt.events.ModifyEvent; import org.eclipse.swt.events.ModifyListener; @@ -77,8 +78,8 @@ public BatchOperationApplyOnWizardPage( String pageName, BatchOperationWizard wizard ) { super( pageName ); - super.setTitle( "Select Application Entries" ); - super.setDescription( "Please select the entries where the batch operation should be applied to." ); + super.setTitle( Messages.getString( "BatchOperationApplyOnWizardPage.SelectApplicationEntries" ) ); //$NON-NLS-1$ + super.setDescription( Messages.getString( "BatchOperationApplyOnWizardPage.PleaseSelectEntries" ) ); //$NON-NLS-1$ super.setPageComplete( false ); this.prepareCurrentSelection(); @@ -103,7 +104,8 @@ Composite applyOnGroup = composite; - this.currentSelectionButton = BaseWidgetUtils.createRadiobutton( applyOnGroup, "Current Selection:", 1 ); + this.currentSelectionButton = BaseWidgetUtils.createRadiobutton( applyOnGroup, Messages + .getString( "BatchOperationApplyOnWizardPage.CurrentSelection" ), 1 ); //$NON-NLS-1$ this.currentSelectionButton.addSelectionListener( new SelectionAdapter() { public void widgetSelected( SelectionEvent e ) @@ -128,7 +130,8 @@ BaseWidgetUtils.createSpacer( applyOnGroup, 1 ); BaseWidgetUtils.createSpacer( applyOnGroup, 1 ); - this.searchButton = BaseWidgetUtils.createRadiobutton( applyOnGroup, "Results of following Search:", 1 ); + this.searchButton = BaseWidgetUtils.createRadiobutton( applyOnGroup, Messages + .getString( "BatchOperationApplyOnWizardPage.ResultsOfSearch" ), 1 ); //$NON-NLS-1$ this.searchButton.addSelectionListener( new SelectionAdapter() { public void widgetSelected( SelectionEvent e ) @@ -271,7 +274,10 @@ if ( !internalDnSet.isEmpty() ) { dnsList.add( internalDnSet.toArray( new LdapDN[internalDnSet.size()] ) ); - textList.add( "DNs of selected Attributes (" + internalDnSet.size() + " Entries)" ); + textList + .add( NLS + .bind( + Messages.getString( "BatchOperationApplyOnWizardPage.DNsOfSelectedAttributes" ), new int[] { internalDnSet.size() } ) ); //$NON-NLS-1$ } } if ( searches.length == 1 && searches[0].getSearchResults() != null ) @@ -284,8 +290,10 @@ } dnsList.add( internalDnSet.toArray( new LdapDN[internalDnSet.size()] ) ); - textList.add( "Search Results of '" + searches[0].getName() + "' (" + searches[0].getSearchResults().length - + " Entries)" ); + textList + .add( NLS + .bind( + Messages.getString( "BatchOperationApplyOnWizardPage.SearchResultOf" ), new Object[] { searches[0].getName(), searches[0].getSearchResults().length } ) ); //$NON-NLS-1$ } if ( entries.length + searchResults.length + bookmarks.length > 0 ) { @@ -304,7 +312,10 @@ } dnsList.add( internalDnSet.toArray( new LdapDN[internalDnSet.size()] ) ); - textList.add( "Selected Entries (" + internalDnSet.size() + " Entries)" ); + textList + .add( NLS + .bind( + Messages.getString( "BatchOperationApplyOnWizardPage.SelectedEntries" ), new int[] { internalDnSet.size() } ) ); //$NON-NLS-1$ } this.initCurrentSelectionTexts = textList.toArray( new String[textList.size()] ); Modified: directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/BatchOperationFinishWizardPage.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/BatchOperationFinishWizardPage.java?rev=721282&r1=721281&r2=721282&view=diff ============================================================================== --- directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/BatchOperationFinishWizardPage.java (original) +++ directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/BatchOperationFinishWizardPage.java Thu Nov 27 13:35:34 2008 @@ -49,9 +49,8 @@ public BatchOperationFinishWizardPage( String pageName, BatchOperationWizard wizard ) { super( pageName ); - super.setTitle( "Select Execution Method" ); - super - .setDescription( "Please select if the batch operation should be executed online or a LDIF should be generated." ); + super.setTitle( Messages.getString( "BatchOperationFinishWizardPage.SelectExecutionMethod" ) ); //$NON-NLS-1$ + super.setDescription( Messages.getString( "BatchOperationFinishWizardPage.PleaseSelectBatchOperation" ) ); //$NON-NLS-1$ super.setPageComplete( false ); } @@ -70,7 +69,8 @@ composite.setLayout( gl ); composite.setLayoutData( new GridData( GridData.FILL_BOTH ) ); - generateLdifButton = BaseWidgetUtils.createRadiobutton( composite, "Generate LDIF", 1 ); + generateLdifButton = BaseWidgetUtils.createRadiobutton( composite, Messages + .getString( "BatchOperationFinishWizardPage.GenerateLDIF" ), 1 ); //$NON-NLS-1$ generateLdifButton.setSelection( true ); generateLdifButton.addSelectionListener( new SelectionAdapter() { @@ -80,7 +80,8 @@ } } ); - executeOnlineButton = BaseWidgetUtils.createRadiobutton( composite, "Excecute online", 1 ); + executeOnlineButton = BaseWidgetUtils.createRadiobutton( composite, Messages + .getString( "BatchOperationFinishWizardPage.ExecuteOnline" ), 1 ); //$NON-NLS-1$ executeOnlineButton.setEnabled( false ); executeOnlineButton.addSelectionListener( new SelectionAdapter() { Modified: directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/BatchOperationLdifWizardPage.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/BatchOperationLdifWizardPage.java?rev=721282&r1=721281&r2=721282&view=diff ============================================================================== --- directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/BatchOperationLdifWizardPage.java (original) +++ directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/BatchOperationLdifWizardPage.java Thu Nov 27 13:35:34 2008 @@ -40,9 +40,9 @@ public class BatchOperationLdifWizardPage extends WizardPage implements WidgetModifyListener { - private static final String LDIF_DN_PREFIX = "dn: cn=dummy" + BrowserCoreConstants.LINE_SEPARATOR; + private static final String LDIF_DN_PREFIX = "dn: cn=dummy" + BrowserCoreConstants.LINE_SEPARATOR; //$NON-NLS-1$ - private static final String LDIF_INITIAL = "changetype: modify" + BrowserCoreConstants.LINE_SEPARATOR; + private static final String LDIF_INITIAL = "changetype: modify" + BrowserCoreConstants.LINE_SEPARATOR; //$NON-NLS-1$ private BatchOperationWizard wizard; @@ -52,8 +52,8 @@ public BatchOperationLdifWizardPage( String pageName, BatchOperationWizard wizard ) { super( pageName ); - super.setTitle( "LDIF Fragment" ); - super.setDescription( "Please enter the LDIF fragment that should be executed on each entry." ); + super.setTitle( Messages.getString( "BatchOperationLdifWizardPage.LDIFFragment" ) ); //$NON-NLS-1$ + super.setDescription( Messages.getString( "BatchOperationLdifWizardPage.PleaseEnterLDIFFragment" ) ); //$NON-NLS-1$ // super.setImageDescriptor(BrowserUIPlugin.getDefault().getImageDescriptor(BrowserUIConstants.IMG_ENTRY_WIZARD)); super.setPageComplete( false ); @@ -135,7 +135,7 @@ public String getLdifFragment() { - return ldifEditorWidget.getLdifModel().toRawString().replaceAll( LDIF_DN_PREFIX, "" ); + return ldifEditorWidget.getLdifModel().toRawString().replaceAll( LDIF_DN_PREFIX, "" ); //$NON-NLS-1$ } Modified: directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/BatchOperationModifyWizardPage.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/BatchOperationModifyWizardPage.java?rev=721282&r1=721281&r2=721282&view=diff ============================================================================== --- directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/BatchOperationModifyWizardPage.java (original) +++ directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/BatchOperationModifyWizardPage.java Thu Nov 27 13:35:34 2008 @@ -47,8 +47,8 @@ public BatchOperationModifyWizardPage( String pageName, BatchOperationWizard wizard ) { super( pageName ); - super.setTitle( "Define Modification" ); - super.setDescription( "Please define the modifcations." ); + super.setTitle( Messages.getString( "BatchOperationModifyWizardPage.DefineModification" ) ); //$NON-NLS-1$ + super.setDescription( Messages.getString( "BatchOperationModifyWizardPage.PleaseDefineModifications" ) ); //$NON-NLS-1$ // super.setImageDescriptor(BrowserUIPlugin.getDefault().getImageDescriptor(BrowserUIConstants.IMG_ENTRY_WIZARD)); super.setPageComplete( false ); @@ -59,7 +59,7 @@ private void validate() { - String dummyLdif = "dn: cn=dummy" + BrowserCoreConstants.LINE_SEPARATOR + modWidget.getLdifFragment(); + String dummyLdif = "dn: cn=dummy" + BrowserCoreConstants.LINE_SEPARATOR + modWidget.getLdifFragment(); //$NON-NLS-1$ LdifFile model = new LdifParser().parse( dummyLdif ); LdifContainer[] containers = model.getContainers(); if ( containers.length == 0 ) @@ -106,6 +106,7 @@ return modWidget.getLdifFragment(); } + public void widgetModified( WidgetModifyEvent event ) { validate(); Modified: directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/BatchOperationTypeWizardPage.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/BatchOperationTypeWizardPage.java?rev=721282&r1=721281&r2=721282&view=diff ============================================================================== --- directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/BatchOperationTypeWizardPage.java (original) +++ directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/BatchOperationTypeWizardPage.java Thu Nov 27 13:35:34 2008 @@ -44,7 +44,8 @@ public final static int OPERATION_TYPE_CREATE_LDIF = 2; private final static String[] OPERATION_TYPES = - { "Modify entries", "Delete entries", "Execute LDIF changetype fragment on each entry" }; + { + Messages.getString( "BatchOperationTypeWizardPage.ModifyEntries" ), Messages.getString( "BatchOperationTypeWizardPage.DeleteEntries" ), Messages.getString( "BatchOperationTypeWizardPage.ExecuteLDIFChangetype" ) }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ private Button[] operationTypeButtons; @@ -52,8 +53,8 @@ public BatchOperationTypeWizardPage( String pageName, BatchOperationWizard wizard ) { super( pageName ); - super.setTitle( "Select Operation Type" ); - super.setDescription( "Please select the batch operation type." ); + super.setTitle( Messages.getString( "BatchOperationTypeWizardPage.SelectOperationType" ) ); //$NON-NLS-1$ + super.setDescription( Messages.getString( "BatchOperationTypeWizardPage.PleaseSelectBatch" ) ); //$NON-NLS-1$ super.setPageComplete( false ); } Modified: directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/BatchOperationWizard.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/BatchOperationWizard.java?rev=721282&r1=721281&r2=721282&view=diff ============================================================================== --- directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/BatchOperationWizard.java (original) +++ directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/BatchOperationWizard.java Thu Nov 27 13:35:34 2008 @@ -77,7 +77,7 @@ public BatchOperationWizard() { - super.setWindowTitle( "Batch Operation" ); + super.setWindowTitle( Messages.getString( "BatchOperationWizard.BatchOperation" ) ); //$NON-NLS-1$ super.setNeedsProgressMonitor( true ); } @@ -148,29 +148,28 @@ public void createPageControls( Composite pageContainer ) { super.createPageControls( pageContainer ); - + // set help context ID PlatformUI.getWorkbench().getHelpSystem().setHelp( applyOnPage.getControl(), - BrowserUIConstants.PLUGIN_ID + "." + "tools_batchoperation_wizard" ); + BrowserUIConstants.PLUGIN_ID + "." + "tools_batchoperation_wizard" ); //$NON-NLS-1$ //$NON-NLS-2$ PlatformUI.getWorkbench().getHelpSystem().setHelp( typePage.getControl(), - BrowserUIConstants.PLUGIN_ID + "." + "tools_batchoperation_wizard" ); + BrowserUIConstants.PLUGIN_ID + "." + "tools_batchoperation_wizard" ); //$NON-NLS-1$ //$NON-NLS-2$ PlatformUI.getWorkbench().getHelpSystem().setHelp( ldifPage.getControl(), - BrowserUIConstants.PLUGIN_ID + "." + "tools_batchoperation_wizard" ); + BrowserUIConstants.PLUGIN_ID + "." + "tools_batchoperation_wizard" ); //$NON-NLS-1$ //$NON-NLS-2$ PlatformUI.getWorkbench().getHelpSystem().setHelp( modifyPage.getControl(), - BrowserUIConstants.PLUGIN_ID + "." + "tools_batchoperation_wizard" ); + BrowserUIConstants.PLUGIN_ID + "." + "tools_batchoperation_wizard" ); //$NON-NLS-1$ //$NON-NLS-2$ PlatformUI.getWorkbench().getHelpSystem().setHelp( finishPage.getControl(), - BrowserUIConstants.PLUGIN_ID + "." + "tools_batchoperation_wizard" ); + BrowserUIConstants.PLUGIN_ID + "." + "tools_batchoperation_wizard" ); //$NON-NLS-1$ //$NON-NLS-2$ } - class DummyWizardPage extends WizardPage { protected DummyWizardPage() { - super( "" ); - super.setTitle( "No connection selected or connection is closed" ); - super.setDescription( "In order to use the batch operation wizard please select a opened connection." ); + super( "" ); //$NON-NLS-1$ + super.setTitle( Messages.getString( "BatchOperationWizard.NoConnectionSelected" ) ); //$NON-NLS-1$ + super.setDescription( Messages.getString( "BatchOperationWizard.SelectOPenCollection" ) ); //$NON-NLS-1$ // super.setImageDescriptor(BrowserUIPlugin.getDefault().getImageDescriptor(BrowserUIConstants.IMG_ENTRY_WIZARD)); super.setPageComplete( true ); } @@ -279,7 +278,7 @@ this.applyOnPage.saveDialogSettings(); // get LDIF - String ldifFragment = ""; + String ldifFragment = ""; //$NON-NLS-1$ if ( typePage.getOperationType() == BatchOperationTypeWizardPage.OPERATION_TYPE_CREATE_LDIF ) { ldifFragment = this.ldifPage.getLdifFragment(); @@ -290,7 +289,7 @@ } if ( typePage.getOperationType() == BatchOperationTypeWizardPage.OPERATION_TYPE_DELETE ) { - ldifFragment = "changetype: delete" + BrowserCoreConstants.LINE_SEPARATOR; + ldifFragment = "changetype: delete" + BrowserCoreConstants.LINE_SEPARATOR; //$NON-NLS-1$ } // get DNs @@ -324,13 +323,13 @@ StringBuffer ldif = new StringBuffer(); for ( int i = 0; i < dns.length; i++ ) { - ldif.append( "dn: " ); + ldif.append( "dn: " ); //$NON-NLS-1$ ldif.append( dns[i].getUpName() ); ldif.append( BrowserCoreConstants.LINE_SEPARATOR ); ldif.append( ldifFragment ); ldif.append( BrowserCoreConstants.LINE_SEPARATOR ); } - + if ( finishPage.getExecutionMethod() == BatchOperationFinishWizardPage.EXECUTION_METHOD_LDIF ) { Modified: directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportBaseFromWizardPage.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportBaseFromWizardPage.java?rev=721282&r1=721281&r2=721282&view=diff ============================================================================== --- directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportBaseFromWizardPage.java (original) +++ directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportBaseFromWizardPage.java Thu Nov 27 13:35:34 2008 @@ -55,8 +55,8 @@ public ExportBaseFromWizardPage( String pageName, ExportBaseWizard wizard, SearchPageWrapper spw ) { super( pageName ); - setTitle( "Data to Export" ); - setDescription( "Please define search parameters for the export." ); + setTitle( Messages.getString( "ExportBaseFromWizardPage.DataToExport" ) ); //$NON-NLS-1$ + setDescription( Messages.getString( "ExportBaseFromWizardPage.PleaseDefineSearchParameters" ) ); //$NON-NLS-1$ setPageComplete( true ); this.wizard = wizard; Modified: directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportBaseToPage.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportBaseToPage.java?rev=721282&r1=721281&r2=721282&view=diff ============================================================================== --- directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportBaseToPage.java (original) +++ directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportBaseToPage.java Thu Nov 27 13:35:34 2008 @@ -28,6 +28,7 @@ import org.apache.directory.studio.ldapbrowser.common.widgets.WidgetModifyEvent; import org.apache.directory.studio.ldapbrowser.common.widgets.WidgetModifyListener; import org.eclipse.jface.wizard.WizardPage; +import org.eclipse.osgi.util.NLS; import org.eclipse.swt.events.SelectionAdapter; import org.eclipse.swt.events.SelectionEvent; import org.eclipse.swt.widgets.Button; @@ -63,8 +64,9 @@ { super( pageName ); setPageComplete( false ); - setTitle( getFileType() + " File" ); - setDescription( "Please enter the target " + getFileType() + " file." ); + setTitle( getFileType() + Messages.getString( "ExportBaseToPage.FileType" ) ); //$NON-NLS-1$ + setDescription( NLS.bind( + Messages.getString( "ExportBaseToPage.PleaseEnterTargetFile" ), new String[] { getFileType() } ) ); //$NON-NLS-1$ this.wizard = wizard; } @@ -79,35 +81,40 @@ boolean ok = true; File file = new File( fileBrowserWidget.getFilename() ); File fileDirectory = file.getParentFile(); - if ( "".equals( fileBrowserWidget.getFilename() ) ) + if ( "".equals( fileBrowserWidget.getFilename() ) ) //$NON-NLS-1$ { setErrorMessage( null ); ok = false; } else if ( file.isDirectory() ) { - setErrorMessage( "Selected " + getFileType() + " is no file." ); + setErrorMessage( NLS.bind( + Messages.getString( "ExportBaseToPage.ErrorNotAFile" ), new String[] { getFileType() } ) ); //$NON-NLS-1$ ok = false; } else if ( file.exists() && !overwriteFileButton.getSelection() ) { - setErrorMessage( "Selected " + getFileType() + " file already exists. Select option 'Overwrite existing " - + getFileType() + " file' if you want to overwrite the " + getFileType() + " file." ); + setErrorMessage( NLS + .bind( + Messages.getString( "ExportBaseToPage.ErrorFileExists" ), new String[] { getFileType(), getFileType(), getFileType() } ) ); //$NON-NLS-1$ ok = false; } else if ( file.exists() && !file.canWrite() ) { - setErrorMessage( "Selected " + getFileType() + " file is not writeable." ); + setErrorMessage( NLS.bind( + Messages.getString( "ExportBaseToPage.ErrorFileNotWritable" ), new String[] { getFileType() } ) ); //$NON-NLS-1$ ok = false; } else if ( file.getParentFile() == null ) { - setErrorMessage( "Selected " + getFileType() + " file directory is not writeable." ); + setErrorMessage( NLS.bind( + Messages.getString( "ExportBaseToPage.ErrorDirectoryNotWritable" ), new String[] { getFileType() } ) ); //$NON-NLS-1$ ok = false; } else if ( !file.exists() && ( fileDirectory == null || !fileDirectory.canWrite() ) ) { - setErrorMessage( "Selected " + getFileType() + " file directory is not writeable." ); + setErrorMessage( NLS.bind( + Messages.getString( "ExportBaseToPage.ErrorDirectoryNotWritable" ), new String[] { getFileType() } ) ); //$NON-NLS-1$ ok = false; } @@ -116,7 +123,7 @@ setErrorMessage( null ); } - setPageComplete( ok && wizard.getExportFilename() != null && !"".equals( wizard.getExportFilename() ) ); + setPageComplete( ok && wizard.getExportFilename() != null && !"".equals( wizard.getExportFilename() ) ); //$NON-NLS-1$ } @@ -126,8 +133,9 @@ public void createControl( Composite composite ) { // Export file - BaseWidgetUtils.createLabel( composite, getFileType() + " File:", 1 ); - fileBrowserWidget = new FileBrowserWidget( "Select " + getFileType() + " File", getExtensions(), + BaseWidgetUtils.createLabel( composite, getFileType() + Messages.getString( "ExportBaseToPage.File" ), 1 ); //$NON-NLS-1$ + fileBrowserWidget = new FileBrowserWidget( NLS.bind( + Messages.getString( "ExportBaseToPage.SelectFileType" ), new String[] { getFileType() } ), getExtensions(), //$NON-NLS-1$ FileBrowserWidget.TYPE_SAVE ); fileBrowserWidget.createWidget( composite ); fileBrowserWidget.addWidgetModifyListener( new WidgetModifyListener() @@ -139,8 +147,8 @@ } } ); BaseWidgetUtils.createRadioIndent( composite, 1 ); - overwriteFileButton = BaseWidgetUtils.createCheckbox( composite, "O&verwrite existing " + getFileType() - + " file", 2 ); + overwriteFileButton = BaseWidgetUtils.createCheckbox( composite, NLS.bind( Messages + .getString( "ExportBaseToPage.OverwriteExistingFile" ), new String[] { getFileType() } ), 2 ); //$NON-NLS-1$ overwriteFileButton.addSelectionListener( new SelectionAdapter() { public void widgetSelected( SelectionEvent event ) Modified: directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportConnectionsWizard.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportConnectionsWizard.java?rev=721282&r1=721281&r2=721282&view=diff ============================================================================== --- directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportConnectionsWizard.java (original) +++ directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportConnectionsWizard.java Thu Nov 27 13:35:34 2008 @@ -61,7 +61,7 @@ */ public ExportConnectionsWizard() { - super( "Connections Export" ); + super( Messages.getString( "ExportConnectionsWizard.ConnectionsExport" ) ); //$NON-NLS-1$ } @@ -114,7 +114,7 @@ // Creating the ZipOutputStream ZipOutputStream zos = new ZipOutputStream( new FileOutputStream( new File( exportFileName ) ) ); // Writing the Connections file. - zos.putNextEntry( new ZipEntry( "connections.xml" ) ); + zos.putNextEntry( new ZipEntry( Messages.getString( "ExportConnectionsWizard.1" ) ) ); //$NON-NLS-1$ Connection[] connections = ConnectionCorePlugin.getDefault().getConnectionManager().getConnections(); Set connectionParameters = new HashSet(); for ( Connection connection : connections ) @@ -124,7 +124,7 @@ ConnectionIO.save( connectionParameters, zos ); zos.closeEntry(); // Writing the Connection Folders file. - zos.putNextEntry( new ZipEntry( "connectionFolders.xml" ) ); + zos.putNextEntry( new ZipEntry( Messages.getString( "ExportConnectionsWizard.2" ) ) ); //$NON-NLS-1$ ConnectionFolder[] connectionFolders = ConnectionCorePlugin.getDefault().getConnectionFolderManager() .getConnectionFolders(); Set connectionFoldersSet = new HashSet(); @@ -135,7 +135,7 @@ ConnectionIO.saveConnectionFolders( connectionFoldersSet, zos ); zos.closeEntry(); // Writing the Browser Connections file. - zos.putNextEntry( new ZipEntry( "browserconnections.xml" ) ); + zos.putNextEntry( new ZipEntry( Messages.getString( "ExportConnectionsWizard.3" ) ) ); //$NON-NLS-1$ IBrowserConnection[] browserConnections = BrowserCorePlugin.getDefault().getConnectionManager() .getBrowserConnections(); Map browserConnectionsMap = new HashMap(); Modified: directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportConnectionsWizardPage.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportConnectionsWizardPage.java?rev=721282&r1=721281&r2=721282&view=diff ============================================================================== --- directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportConnectionsWizardPage.java (original) +++ directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportConnectionsWizardPage.java Thu Nov 27 13:35:34 2008 @@ -45,8 +45,8 @@ public class ExportConnectionsWizardPage extends WizardPage { // UI widgets -// private CheckboxTreeViewer connectionsTreeViewer; -// private ConnectionContentProvider contentProvider; + // private CheckboxTreeViewer connectionsTreeViewer; + // private ConnectionContentProvider contentProvider; private FileBrowserWidget fileBrowserWidget; private Button overwriteFileButton; @@ -57,8 +57,8 @@ protected ExportConnectionsWizardPage() { super( ExportConnectionsWizardPage.class.getName() ); - setTitle( "Export Connections" ); - setDescription( "Define where connections should be exported." ); + setTitle( Messages.getString( "ExportConnectionsWizardPage.ExportConnections" ) ); //$NON-NLS-1$ + setDescription( Messages.getString( "ExportConnectionsWizardPage.DefineConnectionsExport" ) ); //$NON-NLS-1$ setImageDescriptor( BrowserUIPlugin.getDefault().getImageDescriptor( BrowserUIConstants.IMG_EXPORT_CONNECTIONS_WIZARD ) ); setPageComplete( false ); @@ -73,70 +73,71 @@ // Main Composite Composite composite = BaseWidgetUtils.createColumnContainer( parent, 3, 1 ); -// // Connections Group -// Group connectionsGroup = BaseWidgetUtils.createGroup( composite, "Connections", 1 ); -// Composite connectionsGroupComposite = BaseWidgetUtils.createColumnContainer( connectionsGroup, 2, 1 ); -// -// // Connections Label -// BaseWidgetUtils.createLabel( connectionsGroupComposite, "Select the connections to export: ", 1 ); -// BaseWidgetUtils.createSpacer( connectionsGroupComposite, 1 ); -// -// // Connections TreeViewer -// connectionsTreeViewer = new CheckboxTreeViewer( new Tree( connectionsGroupComposite, SWT.BORDER | SWT.CHECK -// | SWT.FULL_SELECTION ) ); -// GridData connectionsTableViewerGridData = new GridData( SWT.FILL, SWT.NONE, true, false, 1, 2 ); -// connectionsTableViewerGridData.heightHint = 125; -// connectionsTreeViewer.getTree().setLayoutData( connectionsTableViewerGridData ); -// contentProvider = new ConnectionContentProvider(); -// connectionsTreeViewer.setContentProvider( contentProvider ); -// connectionsTreeViewer.setLabelProvider( new ConnectionLabelProvider() ); -// connectionsTreeViewer.setInput( ConnectionCorePlugin.getDefault().getConnectionFolderManager() ); -// connectionsTreeViewer.addCheckStateListener( new ICheckStateListener() -// { -// public void checkStateChanged( CheckStateChangedEvent event ) -// { -// Object checkedElement = event.getElement(); -// Object[] children = contentProvider.getChildren( checkedElement ); -// if ( ( children != null ) && ( children.length > 0 ) ) -// { -// for ( Object child : children ) -// { -// connectionsTreeViewer.setChecked( child, event.getChecked() ); -// } -// } -// } -// } ); -// -// // Selection Buttons -// Button selectAllButton = BaseWidgetUtils.createButton( connectionsGroupComposite, "Select All", 1 ); -// selectAllButton.setLayoutData( new GridData( SWT.FILL, SWT.BEGINNING, false, false ) ); -// selectAllButton.addSelectionListener( new SelectionAdapter() -// { -// public void widgetSelected( SelectionEvent e ) -// { -// connectionsTreeViewer.setAllChecked( true ); -// validate(); -// } -// } ); -// Button deselectAllButton = BaseWidgetUtils.createButton( connectionsGroupComposite, "Deselect All", 1 ); -// deselectAllButton.setLayoutData( new GridData( SWT.FILL, SWT.BEGINNING, false, false ) ); -// deselectAllButton.addSelectionListener( new SelectionAdapter() -// { -// public void widgetSelected( SelectionEvent e ) -// { -// connectionsTreeViewer.setAllChecked( false ); -// validate(); -// } -// } ); + // // Connections Group + // Group connectionsGroup = BaseWidgetUtils.createGroup( composite, "Connections", 1 ); + // Composite connectionsGroupComposite = BaseWidgetUtils.createColumnContainer( connectionsGroup, 2, 1 ); + // + // // Connections Label + // BaseWidgetUtils.createLabel( connectionsGroupComposite, "Select the connections to export: ", 1 ); + // BaseWidgetUtils.createSpacer( connectionsGroupComposite, 1 ); + // + // // Connections TreeViewer + // connectionsTreeViewer = new CheckboxTreeViewer( new Tree( connectionsGroupComposite, SWT.BORDER | SWT.CHECK + // | SWT.FULL_SELECTION ) ); + // GridData connectionsTableViewerGridData = new GridData( SWT.FILL, SWT.NONE, true, false, 1, 2 ); + // connectionsTableViewerGridData.heightHint = 125; + // connectionsTreeViewer.getTree().setLayoutData( connectionsTableViewerGridData ); + // contentProvider = new ConnectionContentProvider(); + // connectionsTreeViewer.setContentProvider( contentProvider ); + // connectionsTreeViewer.setLabelProvider( new ConnectionLabelProvider() ); + // connectionsTreeViewer.setInput( ConnectionCorePlugin.getDefault().getConnectionFolderManager() ); + // connectionsTreeViewer.addCheckStateListener( new ICheckStateListener() + // { + // public void checkStateChanged( CheckStateChangedEvent event ) + // { + // Object checkedElement = event.getElement(); + // Object[] children = contentProvider.getChildren( checkedElement ); + // if ( ( children != null ) && ( children.length > 0 ) ) + // { + // for ( Object child : children ) + // { + // connectionsTreeViewer.setChecked( child, event.getChecked() ); + // } + // } + // } + // } ); + // + // // Selection Buttons + // Button selectAllButton = BaseWidgetUtils.createButton( connectionsGroupComposite, "Select All", 1 ); + // selectAllButton.setLayoutData( new GridData( SWT.FILL, SWT.BEGINNING, false, false ) ); + // selectAllButton.addSelectionListener( new SelectionAdapter() + // { + // public void widgetSelected( SelectionEvent e ) + // { + // connectionsTreeViewer.setAllChecked( true ); + // validate(); + // } + // } ); + // Button deselectAllButton = BaseWidgetUtils.createButton( connectionsGroupComposite, "Deselect All", 1 ); + // deselectAllButton.setLayoutData( new GridData( SWT.FILL, SWT.BEGINNING, false, false ) ); + // deselectAllButton.addSelectionListener( new SelectionAdapter() + // { + // public void widgetSelected( SelectionEvent e ) + // { + // connectionsTreeViewer.setAllChecked( false ); + // validate(); + // } + // } ); // Destination Group -// Group destinationGroup = BaseWidgetUtils.createGroup( composite, "Destination", 1 ); -// Composite destinationGroupComposite = BaseWidgetUtils.createColumnContainer( destinationGroup, 3, 1 ); + // Group destinationGroup = BaseWidgetUtils.createGroup( composite, "Destination", 1 ); + // Composite destinationGroupComposite = BaseWidgetUtils.createColumnContainer( destinationGroup, 3, 1 ); // Destination File - BaseWidgetUtils.createLabel( composite, "To file:", 1 ); - fileBrowserWidget = new FileBrowserWidget( "Choose a file", new String[] - { "lbc" }, FileBrowserWidget.TYPE_SAVE ); + BaseWidgetUtils.createLabel( composite, Messages.getString( "ExportConnectionsWizardPage.ToFile" ), 1 ); //$NON-NLS-1$ + fileBrowserWidget = new FileBrowserWidget( + Messages.getString( "ExportConnectionsWizardPage.ChooseFile" ), new String[] //$NON-NLS-1$ + { "lbc" }, FileBrowserWidget.TYPE_SAVE ); //$NON-NLS-1$ fileBrowserWidget.createWidget( composite ); fileBrowserWidget.addWidgetModifyListener( new WidgetModifyListener() { @@ -147,7 +148,8 @@ } ); BaseWidgetUtils.createRadioIndent( composite, 1 ); - overwriteFileButton = BaseWidgetUtils.createCheckbox( composite, "O&verwrite existing file", 2 ); + overwriteFileButton = BaseWidgetUtils.createCheckbox( composite, Messages + .getString( "ExportConnectionsWizardPage.OverwriteExistingFile" ), 2 ); //$NON-NLS-1$ overwriteFileButton.addSelectionListener( new SelectionAdapter() { public void widgetSelected( SelectionEvent event ) @@ -169,34 +171,34 @@ boolean ok = true; File file = new File( fileBrowserWidget.getFilename() ); File fileDirectory = file.getParentFile(); - if ( "".equals( fileBrowserWidget.getFilename() ) ) + if ( "".equals( fileBrowserWidget.getFilename() ) ) //$NON-NLS-1$ { setErrorMessage( null ); ok = false; } else if ( file.isDirectory() ) { - setErrorMessage( "Selected file is not a file." ); + setErrorMessage( Messages.getString( "ExportConnectionsWizardPage.ErrorFileNotAFile" ) ); //$NON-NLS-1$ ok = false; } else if ( file.exists() && !overwriteFileButton.getSelection() ) { - setErrorMessage( "Selected file already exists. Select option 'Overwrite existing file' if you want to overwrite the file." ); + setErrorMessage( Messages.getString( "ExportConnectionsWizardPage.ErrorFileAlreadyExists" ) ); //$NON-NLS-1$ ok = false; } else if ( file.exists() && !file.canWrite() ) { - setErrorMessage( "Selected file is not writeable." ); + setErrorMessage( Messages.getString( "ExportConnectionsWizardPage.ErrorFileNotWritable" ) ); //$NON-NLS-1$ ok = false; } else if ( file.getParentFile() == null ) { - setErrorMessage( "Selected file directory is not writeable." ); + setErrorMessage( Messages.getString( "ExportConnectionsWizardPage.ErrorFileDirectoryNotWritable" ) ); //$NON-NLS-1$ ok = false; } else if ( !file.exists() && ( fileDirectory == null || !fileDirectory.canWrite() ) ) { - setErrorMessage( "Selected file directory is not writeable." ); + setErrorMessage( Messages.getString( "ExportConnectionsWizardPage.ErrorFileDirectoryNotWritable" ) ); //$NON-NLS-1$ ok = false; } Modified: directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportCsvToWizardPage.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportCsvToWizardPage.java?rev=721282&r1=721281&r2=721282&view=diff ============================================================================== --- directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportCsvToWizardPage.java (original) +++ directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportCsvToWizardPage.java Thu Nov 27 13:35:34 2008 @@ -43,7 +43,8 @@ /** The extensions used by CSV files */ private static final String[] EXTENSIONS = new String[] - { "*.csv", "*.txt", "*.*" }; + { + Messages.getString( "ExportCsvToWizardPage.0" ), Messages.getString( "ExportCsvToWizardPage.1" ), Messages.getString( "ExportCsvToWizardPage.2" ) }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ /** @@ -70,7 +71,7 @@ BaseWidgetUtils.createSpacer( composite, 3 ); BaseWidgetUtils.createSpacer( composite, 1 ); - String text = "See Text Formats for CSV file format preferences."; + String text = Messages.getString( "ExportCsvToWizardPage.SeeTextFormats" ); //$NON-NLS-1$ Link link = BaseWidgetUtils.createLink( composite, text, 2 ); link.addSelectionListener( new SelectionAdapter() { @@ -97,7 +98,7 @@ */ protected String getFileType() { - return "CSV"; + return Messages.getString( "ExportCsvToWizardPage.CVS" ); //$NON-NLS-1$ } } Modified: directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportCsvWizard.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportCsvWizard.java?rev=721282&r1=721281&r2=721282&view=diff ============================================================================== --- directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportCsvWizard.java (original) +++ directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportCsvWizard.java Thu Nov 27 13:35:34 2008 @@ -48,7 +48,7 @@ */ public ExportCsvWizard() { - super( "CSV Export" ); + super( Messages.getString( "ExportCsvWizard.CSVExport" ) ); //$NON-NLS-1$ } @@ -84,9 +84,9 @@ // set help context ID PlatformUI.getWorkbench().getHelpSystem().setHelp( fromPage.getControl(), - BrowserUIConstants.PLUGIN_ID + "." + "tools_csvexport_wizard" ); + BrowserUIConstants.PLUGIN_ID + "." + "tools_csvexport_wizard" ); //$NON-NLS-1$ //$NON-NLS-2$ PlatformUI.getWorkbench().getHelpSystem().setHelp( toPage.getControl(), - BrowserUIConstants.PLUGIN_ID + "." + "tools_csvexport_wizard" ); + BrowserUIConstants.PLUGIN_ID + "." + "tools_csvexport_wizard" ); //$NON-NLS-1$ //$NON-NLS-2$ } @@ -99,8 +99,8 @@ toPage.saveDialogSettings(); boolean exportDn = this.fromPage.isExportDn(); - ExportCsvJob ecj = new ExportCsvJob( exportFilename, search.getBrowserConnection(), search.getSearchParameter(), - exportDn ); + ExportCsvJob ecj = new ExportCsvJob( exportFilename, search.getBrowserConnection(), + search.getSearchParameter(), exportDn ); ecj.execute(); return true; Modified: directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportDsmlToWizardPage.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportDsmlToWizardPage.java?rev=721282&r1=721281&r2=721282&view=diff ============================================================================== --- directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportDsmlToWizardPage.java (original) +++ directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportDsmlToWizardPage.java Thu Nov 27 13:35:34 2008 @@ -45,7 +45,7 @@ /** The extensions used by DSML files*/ private static final String[] EXTENSIONS = new String[] - { "*.xml", "*.*" }; + { "*.xml", "*.*" }; //$NON-NLS-1$ //$NON-NLS-2$ /** @@ -74,10 +74,12 @@ super.createControl( composite ); Composite saveAsOuterComposite = BaseWidgetUtils.createColumnContainer( composite, 1, 3 ); - Group saveAsGroup = BaseWidgetUtils.createGroup( saveAsOuterComposite, "Save As", 1 ); + Group saveAsGroup = BaseWidgetUtils.createGroup( saveAsOuterComposite, Messages + .getString( "ExportDsmlToWizardPage.SaveAs" ), 1 ); //$NON-NLS-1$ Composite saveAsComposite = BaseWidgetUtils.createColumnContainer( saveAsGroup, 2, 1 ); - Button saveAsDsmlResponseButton = BaseWidgetUtils.createRadiobutton( saveAsComposite, "DSML Response", 2 ); + Button saveAsDsmlResponseButton = BaseWidgetUtils.createRadiobutton( saveAsComposite, Messages + .getString( "ExportDsmlToWizardPage.DSMLResponse" ), 2 ); //$NON-NLS-1$ saveAsDsmlResponseButton.setSelection( true ); wizard.setSaveAsType( ExportDsmlWizardSaveAsType.RESPONSE ); saveAsDsmlResponseButton.addSelectionListener( new SelectionAdapter() @@ -88,10 +90,11 @@ } } ); BaseWidgetUtils.createRadioIndent( saveAsComposite, 1 ); - BaseWidgetUtils.createWrappedLabel( saveAsComposite, - "The search will be saved as a response to a DSML search request.", 1 ); + BaseWidgetUtils.createWrappedLabel( saveAsComposite, Messages + .getString( "ExportDsmlToWizardPage.SearchSaveAsResponse" ), 1 ); //$NON-NLS-1$ - Button saveAsDsmlRequestButton = BaseWidgetUtils.createRadiobutton( saveAsComposite, "DSML Request", 2 ); + Button saveAsDsmlRequestButton = BaseWidgetUtils.createRadiobutton( saveAsComposite, Messages + .getString( "ExportDsmlToWizardPage.DSMLRequest" ), 2 ); //$NON-NLS-1$ saveAsDsmlRequestButton.addSelectionListener( new SelectionAdapter() { public void widgetSelected( SelectionEvent e ) @@ -100,8 +103,8 @@ } } ); BaseWidgetUtils.createRadioIndent( saveAsComposite, 1 ); - BaseWidgetUtils.createWrappedLabel( saveAsComposite, - "The search will be saved as a DSML request containing an add request for each entry.", 1 ); + BaseWidgetUtils.createWrappedLabel( saveAsComposite, Messages + .getString( "ExportDsmlToWizardPage.SearchSaveAsRequest" ), 1 ); //$NON-NLS-1$ } @@ -119,6 +122,6 @@ */ protected String getFileType() { - return "DSML"; + return Messages.getString( "ExportDsmlToWizardPage.DSML" ); //$NON-NLS-1$ } } Modified: directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportDsmlWizard.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportDsmlWizard.java?rev=721282&r1=721281&r2=721282&view=diff ============================================================================== --- directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportDsmlWizard.java (original) +++ directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportDsmlWizard.java Thu Nov 27 13:35:34 2008 @@ -38,7 +38,7 @@ { /** The title. */ - public static final String WIZARD_TITLE = "DSML Export"; + public static final String WIZARD_TITLE = Messages.getString( "ExportDsmlWizard.DSMLExport" ); //$NON-NLS-1$ /** The from page, used to select the exported data. */ private ExportDsmlFromWizardPage fromPage; @@ -100,9 +100,9 @@ // set help context ID PlatformUI.getWorkbench().getHelpSystem().setHelp( fromPage.getControl(), - BrowserUIConstants.PLUGIN_ID + "." + "tools_dsmlexport_wizard" ); + BrowserUIConstants.PLUGIN_ID + "." + "tools_dsmlexport_wizard" ); //$NON-NLS-1$ //$NON-NLS-2$ PlatformUI.getWorkbench().getHelpSystem().setHelp( toPage.getControl(), - BrowserUIConstants.PLUGIN_ID + "." + "tools_dsmlexport_wizard" ); + BrowserUIConstants.PLUGIN_ID + "." + "tools_dsmlexport_wizard" ); //$NON-NLS-1$ //$NON-NLS-2$ } Modified: directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportExcelToWizardPage.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportExcelToWizardPage.java?rev=721282&r1=721281&r2=721282&view=diff ============================================================================== --- directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportExcelToWizardPage.java (original) +++ directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportExcelToWizardPage.java Thu Nov 27 13:35:34 2008 @@ -43,7 +43,7 @@ /** The extensions used by Excel files */ private static final String[] EXTENSIONS = new String[] - { "*.xls", "*.*" }; + { "*.xls", "*.*" }; //$NON-NLS-1$ //$NON-NLS-2$ /** @@ -70,21 +70,20 @@ BaseWidgetUtils.createSpacer( composite, 3 ); BaseWidgetUtils.createSpacer( composite, 1 ); - String text = "See Text Formats for Excel file format preferences."; + String text = Messages.getString( "ExportExcelToWizardPage.SeeTextFormats" ); //$NON-NLS-1$ Link link = BaseWidgetUtils.createLink( composite, text, 2 ); link.addSelectionListener( new SelectionAdapter() { public void widgetSelected( SelectionEvent e ) { - PreferencesUtil.createPreferenceDialogOn( getShell(), BrowserUIConstants.PREFERENCEPAGEID_TEXTFORMATS, null, - TextFormatsPreferencePage.XLS_TAB ).open(); + PreferencesUtil.createPreferenceDialogOn( getShell(), BrowserUIConstants.PREFERENCEPAGEID_TEXTFORMATS, + null, TextFormatsPreferencePage.XLS_TAB ).open(); } } ); BaseWidgetUtils.createSpacer( composite, 3 ); BaseWidgetUtils.createSpacer( composite, 1 ); - BaseWidgetUtils.createWrappedLabel( composite, - "Warning: Excel export is memory intensive! Maximum number of exportable entries is limited to 65000!", 2 ); + BaseWidgetUtils.createWrappedLabel( composite, Messages.getString( "ExportExcelToWizardPage.WarningExcel" ), 2 ); //$NON-NLS-1$ } @@ -102,7 +101,7 @@ */ protected String getFileType() { - return "Excel"; + return Messages.getString( "ExportExcelToWizardPage.Excel" ); //$NON-NLS-1$ } } Modified: directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportExcelWizard.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportExcelWizard.java?rev=721282&r1=721281&r2=721282&view=diff ============================================================================== --- directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportExcelWizard.java (original) +++ directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportExcelWizard.java Thu Nov 27 13:35:34 2008 @@ -48,7 +48,7 @@ */ public ExportExcelWizard() { - super( "Excel Export" ); + super( Messages.getString( "ExportExcelWizard.ExcelExport" ) ); //$NON-NLS-1$ } @@ -84,9 +84,9 @@ // set help context ID PlatformUI.getWorkbench().getHelpSystem().setHelp( fromPage.getControl(), - BrowserUIConstants.PLUGIN_ID + "." + "tools_excelexport_wizard" ); + BrowserUIConstants.PLUGIN_ID + "." + "tools_excelexport_wizard" ); //$NON-NLS-1$ //$NON-NLS-2$ PlatformUI.getWorkbench().getHelpSystem().setHelp( toPage.getControl(), - BrowserUIConstants.PLUGIN_ID + "." + "tools_excelexport_wizard" ); + BrowserUIConstants.PLUGIN_ID + "." + "tools_excelexport_wizard" ); //$NON-NLS-1$ //$NON-NLS-2$ } @@ -99,8 +99,8 @@ toPage.saveDialogSettings(); boolean exportDn = this.fromPage.isExportDn(); - ExportXlsJob eej = new ExportXlsJob( exportFilename, search.getBrowserConnection(), search.getSearchParameter(), - exportDn ); + ExportXlsJob eej = new ExportXlsJob( exportFilename, search.getBrowserConnection(), + search.getSearchParameter(), exportDn ); eej.execute(); return true; Modified: directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportLdifToWizardPage.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportLdifToWizardPage.java?rev=721282&r1=721281&r2=721282&view=diff ============================================================================== --- directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportLdifToWizardPage.java (original) +++ directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportLdifToWizardPage.java Thu Nov 27 13:35:34 2008 @@ -43,7 +43,7 @@ /** The extensions used by LDIF files */ private static final String[] EXTENSIONS = new String[] - { "*.ldif", "*.*" }; + { "*.ldif", "*.*" }; //$NON-NLS-1$ //$NON-NLS-2$ /** @@ -55,8 +55,7 @@ public ExportLdifToWizardPage( String pageName, ExportBaseWizard wizard ) { super( pageName, wizard ); - setImageDescriptor( BrowserUIPlugin.getDefault().getImageDescriptor( - BrowserUIConstants.IMG_EXPORT_LDIF_WIZARD ) ); + setImageDescriptor( BrowserUIPlugin.getDefault().getImageDescriptor( BrowserUIConstants.IMG_EXPORT_LDIF_WIZARD ) ); } @@ -71,14 +70,14 @@ BaseWidgetUtils.createSpacer( composite, 3 ); BaseWidgetUtils.createSpacer( composite, 1 ); - String text = "See Text Formats for LDIF file format preferences."; + String text = Messages.getString( "ExportLdifToWizardPage.SeeTextFormats" ); //$NON-NLS-1$ Link link = BaseWidgetUtils.createLink( composite, text, 2 ); link.addSelectionListener( new SelectionAdapter() { public void widgetSelected( SelectionEvent e ) { - PreferencesUtil.createPreferenceDialogOn( getShell(), BrowserUIConstants.PREFERENCEPAGEID_TEXTFORMATS, null, - TextFormatsPreferencePage.LDIF_TAB ).open(); + PreferencesUtil.createPreferenceDialogOn( getShell(), BrowserUIConstants.PREFERENCEPAGEID_TEXTFORMATS, + null, TextFormatsPreferencePage.LDIF_TAB ).open(); } } ); } @@ -98,7 +97,7 @@ */ protected String getFileType() { - return "LDIF"; + return Messages.getString( "ExportLdifToWizardPage.LDIF" ); //$NON-NLS-1$ } } Modified: directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportLdifWizard.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportLdifWizard.java?rev=721282&r1=721281&r2=721282&view=diff ============================================================================== --- directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportLdifWizard.java (original) +++ directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportLdifWizard.java Thu Nov 27 13:35:34 2008 @@ -48,7 +48,7 @@ */ public ExportLdifWizard() { - super( "LDIF Export" ); + super( Messages.getString( "ExportLdifWizard.LDIFExport" ) ); //$NON-NLS-1$ } @@ -84,9 +84,9 @@ // set help context ID PlatformUI.getWorkbench().getHelpSystem().setHelp( fromPage.getControl(), - BrowserUIConstants.PLUGIN_ID + "." + "tools_ldifexport_wizard" ); + BrowserUIConstants.PLUGIN_ID + "." + "tools_ldifexport_wizard" ); //$NON-NLS-1$ //$NON-NLS-2$ PlatformUI.getWorkbench().getHelpSystem().setHelp( toPage.getControl(), - BrowserUIConstants.PLUGIN_ID + "." + "tools_ldifexport_wizard" ); + BrowserUIConstants.PLUGIN_ID + "." + "tools_ldifexport_wizard" ); //$NON-NLS-1$ //$NON-NLS-2$ } @@ -98,7 +98,8 @@ fromPage.saveDialogSettings(); toPage.saveDialogSettings(); - ExportLdifJob elj = new ExportLdifJob( exportFilename, search.getBrowserConnection(), search.getSearchParameter() ); + ExportLdifJob elj = new ExportLdifJob( exportFilename, search.getBrowserConnection(), search + .getSearchParameter() ); elj.execute(); return true; Modified: directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportLogsToWizardPage.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportLogsToWizardPage.java?rev=721282&r1=721281&r2=721282&view=diff ============================================================================== --- directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportLogsToWizardPage.java (original) +++ directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportLogsToWizardPage.java Thu Nov 27 13:35:34 2008 @@ -38,7 +38,7 @@ /** The extensions used by LDIF files */ private static final String[] EXTENSIONS = new String[] - { "*.ldif", "*.*" }; + { "*.ldif", "*.*" }; //$NON-NLS-1$ //$NON-NLS-2$ /** @@ -78,7 +78,7 @@ */ protected String getFileType() { - return "Log"; + return Messages.getString( "ExportLogsToWizardPage.Log" ); //$NON-NLS-1$ } } Modified: directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportModificationLogsWizard.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportModificationLogsWizard.java?rev=721282&r1=721281&r2=721282&view=diff ============================================================================== --- directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportModificationLogsWizard.java (original) +++ directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportModificationLogsWizard.java Thu Nov 27 13:35:34 2008 @@ -54,7 +54,7 @@ */ public ExportModificationLogsWizard() { - super( "Export Modification Logs" ); + super( Messages.getString( "ExportModificationLogsWizard.ExportModificationLogs" ) ); //$NON-NLS-1$ } @@ -101,8 +101,8 @@ catch ( IOException e ) { ConnectionUIPlugin.getDefault().getExceptionHandler().handleException( - new Status( IStatus.ERROR, BrowserCommonConstants.PLUGIN_ID, IStatus.ERROR, - "Can't export modification logs", e ) ); + new Status( IStatus.ERROR, BrowserCommonConstants.PLUGIN_ID, IStatus.ERROR, Messages + .getString( "ExportModificationLogsWizard.CantExportModificationLogs" ), e ) ); //$NON-NLS-1$ } } Modified: directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportSearchLogsWizard.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportSearchLogsWizard.java?rev=721282&r1=721281&r2=721282&view=diff ============================================================================== --- directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportSearchLogsWizard.java (original) +++ directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportSearchLogsWizard.java Thu Nov 27 13:35:34 2008 @@ -54,7 +54,7 @@ */ public ExportSearchLogsWizard() { - super( "Export Search Logs" ); + super( Messages.getString( "ExportSearchLogsWizard.ExportSearchLogs" ) ); //$NON-NLS-1$ } @@ -100,8 +100,8 @@ catch ( IOException e ) { ConnectionUIPlugin.getDefault().getExceptionHandler().handleException( - new Status( IStatus.ERROR, BrowserCommonConstants.PLUGIN_ID, IStatus.ERROR, - "Can't export search logs", e ) ); + new Status( IStatus.ERROR, BrowserCommonConstants.PLUGIN_ID, IStatus.ERROR, Messages + .getString( "ExportSearchLogsWizard.CantExportSearchLogs" ), e ) ); //$NON-NLS-1$ } } Modified: directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ImportConnectionsWizard.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ImportConnectionsWizard.java?rev=721282&r1=721281&r2=721282&view=diff ============================================================================== --- directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ImportConnectionsWizard.java (original) +++ directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ImportConnectionsWizard.java Thu Nov 27 13:35:34 2008 @@ -64,7 +64,7 @@ */ public ImportConnectionsWizard() { - super( "Connections Export" ); + super( Messages.getString( "ImportConnectionsWizard.ConnectionsExport" ) ); //$NON-NLS-1$ } @@ -117,7 +117,7 @@ ZipFile importFile = new ZipFile( new File( importFileName ) ); // Loading the Connections - ZipEntry connectionsEntry = importFile.getEntry( "connections.xml" ); + ZipEntry connectionsEntry = importFile.getEntry( "connections.xml" ); //$NON-NLS-1$ if ( connectionsEntry != null ) { InputStream connectionsInputStream = importFile.getInputStream( connectionsEntry ); @@ -130,7 +130,7 @@ } // Loading the ConnectionFolders - ZipEntry connectionFoldersEntry = importFile.getEntry( "connectionFolders.xml" ); + ZipEntry connectionFoldersEntry = importFile.getEntry( "connectionFolders.xml" ); //$NON-NLS-1$ ConnectionFolder rootConnectionFolder = null; if ( connectionFoldersEntry != null ) { @@ -141,7 +141,7 @@ .loadConnectionFolders( connectionFoldersInputStream ); for ( ConnectionFolder connectionFolder : connectionFoldersSet ) { - if ( !"0".equals( connectionFolder.getId() ) ) + if ( !"0".equals( connectionFolder.getId() ) ) //$NON-NLS-1$ { connectionFolderManager.addConnectionFolder( connectionFolder ); } @@ -178,7 +178,7 @@ } // Loading the BrowserConnections - ZipEntry browserConnectionsEntry = importFile.getEntry( "browserconnections.xml" ); + ZipEntry browserConnectionsEntry = importFile.getEntry( "browserconnections.xml" ); //$NON-NLS-1$ if ( browserConnectionsEntry != null ) { InputStream browserConnectionsInputStream = importFile.getInputStream( browserConnectionsEntry ); Modified: directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ImportConnectionsWizardPage.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ImportConnectionsWizardPage.java?rev=721282&r1=721281&r2=721282&view=diff ============================================================================== --- directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ImportConnectionsWizardPage.java (original) +++ directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ImportConnectionsWizardPage.java Thu Nov 27 13:35:34 2008 @@ -47,8 +47,8 @@ protected ImportConnectionsWizardPage() { super( ImportConnectionsWizardPage.class.getName() ); - setTitle( "Import Connections" ); - setDescription( "Import connections from local file system." ); + setTitle( Messages.getString( "ImportConnectionsWizardPage.ImportConnections" ) ); //$NON-NLS-1$ + setDescription( Messages.getString( "ImportConnectionsWizardPage.ImportConnectionsFromFilesystem" ) ); //$NON-NLS-1$ setImageDescriptor( BrowserUIPlugin.getDefault().getImageDescriptor( BrowserUIConstants.IMG_IMPORT_CONNECTIONS_WIZARD ) ); setPageComplete( false ); @@ -61,9 +61,10 @@ Composite composite = BaseWidgetUtils.createColumnContainer( parent, 3, 1 ); // From File - BaseWidgetUtils.createLabel( composite, "From file:", 1 ); - fileBrowserWidget = new FileBrowserWidget( "Choose a file", new String[] - { "lbc" }, FileBrowserWidget.TYPE_OPEN ); + BaseWidgetUtils.createLabel( composite, Messages.getString( "ImportConnectionsWizardPage.FromFile" ), 1 ); //$NON-NLS-1$ + fileBrowserWidget = new FileBrowserWidget( + Messages.getString( "ImportConnectionsWizardPage.ChooseFile" ), new String[] //$NON-NLS-1$ + { "lbc" }, FileBrowserWidget.TYPE_OPEN ); //$NON-NLS-1$ fileBrowserWidget.createWidget( composite ); fileBrowserWidget.addWidgetModifyListener( new WidgetModifyListener() { @@ -85,24 +86,24 @@ { boolean ok = true; File file = new File( fileBrowserWidget.getFilename() ); - if ( "".equals( fileBrowserWidget.getFilename() ) ) + if ( "".equals( fileBrowserWidget.getFilename() ) ) //$NON-NLS-1$ { setErrorMessage( null ); ok = false; } else if ( !file.exists() ) { - setErrorMessage( "Selected file does not exist." ); + setErrorMessage( Messages.getString( "ImportConnectionsWizardPage.ErrorFileNotExists" ) ); //$NON-NLS-1$ ok = false; } else if ( file.isDirectory() ) { - setErrorMessage( "Selected file is not a file." ); + setErrorMessage( Messages.getString( "ImportConnectionsWizardPage.ErrorFileNotFile" ) ); //$NON-NLS-1$ ok = false; } else if ( file.exists() && !file.canRead() ) { - setErrorMessage( "Selected file is not readable." ); + setErrorMessage( Messages.getString( "ImportConnectionsWizardPage.ErrorFileNotReadable" ) ); //$NON-NLS-1$ ok = false; } Modified: directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ImportDsmlMainWizardPage.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ImportDsmlMainWizardPage.java?rev=721282&r1=721281&r2=721282&view=diff ============================================================================== --- directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ImportDsmlMainWizardPage.java (original) +++ directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ImportDsmlMainWizardPage.java Thu Nov 27 13:35:34 2008 @@ -51,7 +51,7 @@ /** The extensions used by DSML files*/ private static final String[] EXTENSIONS = new String[] - { "*.xml", "*.*" }; + { "*.xml", "*.*" }; //$NON-NLS-1$ //$NON-NLS-2$ /** The dsml file browser widget. */ private FileBrowserWidget dsmlFileBrowserWidget; @@ -90,7 +90,7 @@ { super( pageName ); setTitle( ImportDsmlWizard.WIZARD_TITLE ); - setDescription( "Please select a connection and the DSML file to import" ); + setDescription( Messages.getString( "ImportDsmlMainWizardPage.SelectConnectionAndDSMLFile" ) ); //$NON-NLS-1$ setImageDescriptor( BrowserUIPlugin.getDefault().getImageDescriptor( BrowserUIConstants.IMG_IMPORT_DSML_WIZARD ) ); setPageComplete( false ); this.wizard = wizard; @@ -105,8 +105,9 @@ Composite composite = BaseWidgetUtils.createColumnContainer( parent, 3, 1 ); // DSML file - BaseWidgetUtils.createLabel( composite, "DSML File:", 1 ); - dsmlFileBrowserWidget = new FileBrowserWidget( "Select a DSML File", EXTENSIONS, FileBrowserWidget.TYPE_OPEN ); + BaseWidgetUtils.createLabel( composite, Messages.getString( "ImportDsmlMainWizardPage.DSMLFile" ), 1 ); //$NON-NLS-1$ + dsmlFileBrowserWidget = new FileBrowserWidget( + Messages.getString( "ImportDsmlMainWizardPage.SelectDSMLFile" ), EXTENSIONS, FileBrowserWidget.TYPE_OPEN ); //$NON-NLS-1$ dsmlFileBrowserWidget.createWidget( composite ); dsmlFileBrowserWidget.addWidgetModifyListener( new WidgetModifyListener() { @@ -115,14 +116,14 @@ wizard.setDsmlFilename( dsmlFileBrowserWidget.getFilename() ); if ( useDefaultResponseFileButton.getSelection() ) { - responseFileBrowserWidget.setFilename( dsmlFileBrowserWidget.getFilename() + ".response.xml" ); + responseFileBrowserWidget.setFilename( dsmlFileBrowserWidget.getFilename() + ".response.xml" ); //$NON-NLS-1$ } validate(); } } ); // Connection - BaseWidgetUtils.createLabel( composite, "Import into:", 1 ); + BaseWidgetUtils.createLabel( composite, Messages.getString( "ImportDsmlMainWizardPage.ImportTo" ), 1 ); //$NON-NLS-1$ browserConnectionWidget = new BrowserConnectionWidget( wizard.getImportConnection() ); browserConnectionWidget.createWidget( composite ); browserConnectionWidget.addWidgetModifyListener( new WidgetModifyListener() @@ -136,10 +137,12 @@ // Save Response Composite responseOuterComposite = BaseWidgetUtils.createColumnContainer( composite, 1, 3 ); - Group responseGroup = BaseWidgetUtils.createGroup( responseOuterComposite, "Response", 1 ); + Group responseGroup = BaseWidgetUtils.createGroup( responseOuterComposite, Messages + .getString( "ImportDsmlMainWizardPage.Response" ), 1 ); //$NON-NLS-1$ Composite responseContainer = BaseWidgetUtils.createColumnContainer( responseGroup, 3, 1 ); - saveResponseButton = BaseWidgetUtils.createCheckbox( responseContainer, "Save response", 3 ); + saveResponseButton = BaseWidgetUtils.createCheckbox( responseContainer, Messages + .getString( "ImportDsmlMainWizardPage.SaveResponse" ), 3 ); //$NON-NLS-1$ saveResponseButton.setSelection( true ); wizard.setSaveResponse( saveResponseButton.getSelection() ); saveResponseButton.addSelectionListener( new SelectionAdapter() @@ -157,15 +160,15 @@ } ); BaseWidgetUtils.createRadioIndent( responseContainer, 1 ); - useDefaultResponseFileButton = BaseWidgetUtils.createRadiobutton( responseContainer, - "Use default response file", 2 ); + useDefaultResponseFileButton = BaseWidgetUtils.createRadiobutton( responseContainer, Messages + .getString( "ImportDsmlMainWizardPage.UseDefaultResponse" ), 2 ); //$NON-NLS-1$ useDefaultResponseFileButton.setSelection( true ); useDefaultResponseFileButton.addSelectionListener( new SelectionAdapter() { public void widgetSelected( SelectionEvent event ) { String temp = customResponseFileName; - responseFileBrowserWidget.setFilename( dsmlFileBrowserWidget.getFilename() + ".response.xml" ); + responseFileBrowserWidget.setFilename( dsmlFileBrowserWidget.getFilename() + ".response.xml" ); //$NON-NLS-1$ responseFileBrowserWidget.setEnabled( false ); customResponseFileName = temp; validate(); @@ -173,21 +176,23 @@ } ); BaseWidgetUtils.createRadioIndent( responseContainer, 1 ); - useCustomResponseFileButton = BaseWidgetUtils.createRadiobutton( responseContainer, "Use custom response file", + useCustomResponseFileButton = BaseWidgetUtils.createRadiobutton( responseContainer, Messages + .getString( "ImportDsmlMainWizardPage.UseCustomResponse" ), //$NON-NLS-1$ 2 ); useCustomResponseFileButton.setSelection( false ); useCustomResponseFileButton.addSelectionListener( new SelectionAdapter() { public void widgetSelected( SelectionEvent event ) { - responseFileBrowserWidget.setFilename( customResponseFileName != null ? customResponseFileName : "" ); + responseFileBrowserWidget.setFilename( customResponseFileName != null ? customResponseFileName : "" ); //$NON-NLS-1$ responseFileBrowserWidget.setEnabled( true ); validate(); } } ); BaseWidgetUtils.createRadioIndent( responseContainer, 1 ); - responseFileBrowserWidget = new FileBrowserWidget( "Select save file", null, FileBrowserWidget.TYPE_SAVE ); + responseFileBrowserWidget = new FileBrowserWidget( Messages + .getString( "ImportDsmlMainWizardPage.SelectSaveFile" ), null, FileBrowserWidget.TYPE_SAVE ); //$NON-NLS-1$ responseFileBrowserWidget.createWidget( responseContainer ); responseFileBrowserWidget.addWidgetModifyListener( new WidgetModifyListener() { @@ -201,8 +206,8 @@ responseFileBrowserWidget.setEnabled( false ); BaseWidgetUtils.createRadioIndent( responseContainer, 1 ); - overwriteResponseFileButton = BaseWidgetUtils.createCheckbox( responseContainer, - "Overwrite existing response file", 2 ); + overwriteResponseFileButton = BaseWidgetUtils.createCheckbox( responseContainer, Messages + .getString( "ImportDsmlMainWizardPage.OverwriteExistingResponseFile" ), 2 ); //$NON-NLS-1$ overwriteResponseFileButton.addSelectionListener( new SelectionAdapter() { public void widgetSelected( SelectionEvent event ) @@ -223,19 +228,19 @@ boolean ok = true; File dsmlFile = new File( dsmlFileBrowserWidget.getFilename() ); - if ( "".equals( dsmlFileBrowserWidget.getFilename() ) ) + if ( "".equals( dsmlFileBrowserWidget.getFilename() ) ) //$NON-NLS-1$ { setErrorMessage( null ); ok = false; } else if ( !dsmlFile.isFile() || !dsmlFile.exists() ) { - setErrorMessage( "Selected DSML file doesn't exist." ); + setErrorMessage( Messages.getString( "ImportDsmlMainWizardPage.ErrorSelectedDSMLNotExist" ) ); //$NON-NLS-1$ ok = false; } else if ( !dsmlFile.canRead() ) { - setErrorMessage( "Selected DSML file is not readable." ); + setErrorMessage( Messages.getString( "ImportDsmlMainWizardPage.ErrorSelectedDSMLNotReadable" ) ); //$NON-NLS-1$ ok = false; } else if ( saveResponseButton.getSelection() ) @@ -245,39 +250,41 @@ if ( responseFile.equals( dsmlFile ) ) { - setErrorMessage( "DSML file and response file must not be equal." ); + setErrorMessage( Messages.getString( "ImportDsmlMainWizardPage.ErrorDSMLFileAndResponseFileEqual" ) ); //$NON-NLS-1$ ok = false; } else if ( responseFile.isDirectory() ) { - setErrorMessage( "Selected response file is not a file." ); + setErrorMessage( Messages.getString( "ImportDsmlMainWizardPage.ErrorSelectedResponseFileNotFile" ) ); //$NON-NLS-1$ ok = false; } else if ( responseFile.exists() && !overwriteResponseFileButton.getSelection() ) { - setErrorMessage( "Selected response file already exists. Select option 'Overwrite existing response file' if you want to overwrite the response file." ); + setErrorMessage( Messages.getString( "ImportDsmlMainWizardPage.ErrorSelecedResponseFileExist" ) ); //$NON-NLS-1$ ok = false; } else if ( responseFile.exists() && !responseFile.canWrite() ) { - setErrorMessage( "Selected response file is not writeable." ); + setErrorMessage( Messages.getString( "ImportDsmlMainWizardPage.ErrorSelectedResponseFileNotWritable" ) ); //$NON-NLS-1$ ok = false; } else if ( responseFile.getParentFile() == null ) { - setErrorMessage( "Selected response file directory is not writeable." ); + setErrorMessage( Messages + .getString( "ImportDsmlMainWizardPage.ErrorSelectedResponseFileDirectoryNotWritable" ) ); //$NON-NLS-1$ ok = false; } else if ( !responseFile.exists() && ( responseFileDirectory == null || !responseFileDirectory.canWrite() ) ) { - setErrorMessage( "Selected response file directory is not writeable." ); + setErrorMessage( Messages + .getString( "ImportDsmlMainWizardPage.ErrorSelectedResponseFileDirectoryNotWritable" ) ); //$NON-NLS-1$ ok = false; } } if ( ( wizard.getImportConnection() == null ) || ( browserConnectionWidget.getBrowserConnection() == null ) ) { - setErrorMessage( "Please select a Connection." ); + setErrorMessage( Messages.getString( "ImportDsmlMainWizardPage.PleaseSelectConnection" ) ); //$NON-NLS-1$ ok = false; } Modified: directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ImportDsmlWizard.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ImportDsmlWizard.java?rev=721282&r1=721281&r2=721282&view=diff ============================================================================== --- directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ImportDsmlWizard.java (original) +++ directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ImportDsmlWizard.java Thu Nov 27 13:35:34 2008 @@ -47,9 +47,6 @@ */ public class ImportDsmlWizard extends Wizard implements IImportWizard { - /** Page Title */ - public static final String WIZARD_TITLE = "DSML Import"; - /** The connection attached to the import */ private IBrowserConnection importConnection; @@ -72,7 +69,7 @@ public ImportDsmlWizard() { super(); - setWindowTitle( WIZARD_TITLE ); + setWindowTitle( Messages.getString( "ImportDsmlWizard.DSMLImport" ) ); //$NON-NLS-1$ } @@ -83,7 +80,7 @@ */ public ImportDsmlWizard( IBrowserConnection selectedConnection ) { - setWindowTitle( WIZARD_TITLE ); + setWindowTitle( Messages.getString( "ImportDsmlWizard.DSMLImport" ) ); //$NON-NLS-1$ this.importConnection = selectedConnection; } @@ -105,7 +102,7 @@ { mainPage.saveDialogSettings(); - if ( dsmlFilename != null && !"".equals( dsmlFilename ) ) + if ( dsmlFilename != null && !"".equals( dsmlFilename ) ) //$NON-NLS-1$ { File dsmlFile = new File( dsmlFilename ); @@ -181,7 +178,7 @@ // set help context ID PlatformUI.getWorkbench().getHelpSystem().setHelp( mainPage.getControl(), - BrowserUIConstants.PLUGIN_ID + "." + "tools_dsmlimport_wizard" ); + BrowserUIConstants.PLUGIN_ID + "." + "tools_dsmlimport_wizard" ); //$NON-NLS-1$ //$NON-NLS-2$ }