Return-Path: X-Original-To: apmail-directory-commits-archive@www.apache.org Delivered-To: apmail-directory-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 9EC62F5BC for ; Thu, 11 Apr 2013 17:03:43 +0000 (UTC) Received: (qmail 49165 invoked by uid 500); 11 Apr 2013 17:03:43 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 49123 invoked by uid 500); 11 Apr 2013 17:03:43 -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 49116 invoked by uid 99); 11 Apr 2013 17:03:43 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 11 Apr 2013 17:03:43 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.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, 11 Apr 2013 17:03:40 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 8643423888FD; Thu, 11 Apr 2013 17:03:19 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1466969 - in /directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2: ./ actions/ dialogs/ editor/ Date: Thu, 11 Apr 2013 17:03:18 -0000 To: commits@directory.apache.org From: pamarcelot@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130411170319.8643423888FD@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: pamarcelot Date: Thu Apr 11 17:03:17 2013 New Revision: 1466969 URL: http://svn.apache.org/r1466969 Log: Applied formatter. Modified: directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/ApacheDS2ConfigurationPlugin.java directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/actions/EditorExportConfigurationAction.java directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/actions/EditorImportConfigurationAction.java directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/dialogs/AttributeValueDialog.java directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/ConnectionServerConfigurationInput.java directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/ErrorPage.java directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/KerberosServerPage.java directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/LdapLdapsServersPage.java directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/LoadingPage.java directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/NewServerConfigurationInput.java directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/PartitionDetailsPage.java directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/PartitionsMasterDetailsBlock.java directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/PartitionsPage.java directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/PasswordPolicyPage.java directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/ReplicationPage.java directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/ServerConfigurationEditor.java directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/ServerConfigurationEditorPage.java directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/ServerConfigurationEditorUtils.java Modified: directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/ApacheDS2ConfigurationPlugin.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/ApacheDS2ConfigurationPlugin.java?rev=1466969&r1=1466968&r2=1466969&view=diff ============================================================================== --- directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/ApacheDS2ConfigurationPlugin.java (original) +++ directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/ApacheDS2ConfigurationPlugin.java Thu Apr 11 17:03:17 2013 @@ -104,7 +104,7 @@ public class ApacheDS2ConfigurationPlugi // Checking if no error occurred when loading the schemas if ( schemaManager.getErrors().size() != 0 ) { - throw new Exception( Messages.getString("ApacheDS2ConfigurationPlugin.CouldNotLoadSchemaCorrectly") ); //$NON-NLS-1$ + throw new Exception( Messages.getString( "ApacheDS2ConfigurationPlugin.CouldNotLoadSchemaCorrectly" ) ); //$NON-NLS-1$ } } Modified: directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/actions/EditorExportConfigurationAction.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/actions/EditorExportConfigurationAction.java?rev=1466969&r1=1466968&r2=1466969&view=diff ============================================================================== --- directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/actions/EditorExportConfigurationAction.java (original) +++ directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/actions/EditorExportConfigurationAction.java Thu Apr 11 17:03:17 2013 @@ -70,7 +70,7 @@ public class EditorExportConfigurationAc */ public String getText() { - return Messages.getString("EditorExportConfigurationAction.ExportConfiguration"); //$NON-NLS-1$ + return Messages.getString( "EditorExportConfigurationAction.ExportConfiguration" ); //$NON-NLS-1$ } @@ -86,8 +86,12 @@ public class EditorExportConfigurationAc } catch ( Exception e ) { - MessageDialog.openError( editor.getSite().getShell(), Messages.getString("EditorExportConfigurationAction.ErrorExportingConfigurationFile"), //$NON-NLS-1$ - NLS.bind( Messages.getString("EditorExportConfigurationAction.AnErrorOccurredWhenExportingTheSelectedFile"), e.getMessage() ) ); //$NON-NLS-1$ + MessageDialog + .openError( editor.getSite().getShell(), + Messages.getString( "EditorExportConfigurationAction.ErrorExportingConfigurationFile" ), //$NON-NLS-1$ + NLS.bind( + Messages + .getString( "EditorExportConfigurationAction.AnErrorOccurredWhenExportingTheSelectedFile" ), e.getMessage() ) ); //$NON-NLS-1$ } } } Modified: directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/actions/EditorImportConfigurationAction.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/actions/EditorImportConfigurationAction.java?rev=1466969&r1=1466968&r2=1466969&view=diff ============================================================================== --- directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/actions/EditorImportConfigurationAction.java (original) +++ directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/actions/EditorImportConfigurationAction.java Thu Apr 11 17:03:17 2013 @@ -55,7 +55,8 @@ import org.eclipse.ui.model.WorkbenchLab */ public class EditorImportConfigurationAction extends Action { - private static final String DIALOG_TITLE = Messages.getString("EditorImportConfigurationAction.SelectConfigurationFile"); //$NON-NLS-1$ + private static final String DIALOG_TITLE = Messages + .getString( "EditorImportConfigurationAction.SelectConfigurationFile" ); //$NON-NLS-1$ /** The associated editor */ private ServerConfigurationEditor editor; @@ -88,7 +89,7 @@ public class EditorImportConfigurationAc */ public String getText() { - return Messages.getString("EditorImportConfigurationAction.ImportConfiguration"); //$NON-NLS-1$ + return Messages.getString( "EditorImportConfigurationAction.ImportConfiguration" ); //$NON-NLS-1$ } @@ -106,8 +107,9 @@ public class EditorImportConfigurationAc if ( !MessageDialog .openConfirm( editor.getSite().getShell(), - Messages.getString("EditorImportConfigurationAction.UnsavedModifications"), //$NON-NLS-1$ - Messages.getString("EditorImportConfigurationAction.ConfigurationHasUnsavedModificationsSureToContinue") ) ) //$NON-NLS-1$ + Messages.getString( "EditorImportConfigurationAction.UnsavedModifications" ), //$NON-NLS-1$ + Messages + .getString( "EditorImportConfigurationAction.ConfigurationHasUnsavedModificationsSureToContinue" ) ) ) //$NON-NLS-1$ { return; } @@ -172,8 +174,9 @@ public class EditorImportConfigurationAc if ( !MessageDialog .openConfirm( editor.getSite().getShell(), - Messages.getString("EditorImportConfigurationAction.OverwriteExistingConfiguration"), //$NON-NLS-1$ - Messages.getString("EditorImportConfigurationAction.AreYouSureYouWantToOverwriteTheExistingConfiguration") ) ) //$NON-NLS-1$ + Messages.getString( "EditorImportConfigurationAction.OverwriteExistingConfiguration" ), //$NON-NLS-1$ + Messages + .getString( "EditorImportConfigurationAction.AreYouSureYouWantToOverwriteTheExistingConfiguration" ) ) ) //$NON-NLS-1$ { return; } @@ -189,9 +192,10 @@ public class EditorImportConfigurationAc MessageDialog .openError( editor.getSite().getShell(), - Messages.getString("EditorImportConfigurationAction.ErrorImportingConfigurationFile"), //$NON-NLS-1$ + Messages.getString( "EditorImportConfigurationAction.ErrorImportingConfigurationFile" ), //$NON-NLS-1$ NLS.bind( - Messages.getString("EditorImportConfigurationAction.AnErrorOccurredWhenImportingTheSelectedFile"), //$NON-NLS-1$ + Messages + .getString( "EditorImportConfigurationAction.AnErrorOccurredWhenImportingTheSelectedFile" ), //$NON-NLS-1$ e.getMessage() ) ); } } @@ -208,7 +212,7 @@ public class EditorImportConfigurationAc ElementTreeSelectionDialog dialog = new ElementTreeSelectionDialog( editor.getSite().getShell(), new WorkbenchLabelProvider(), new WorkbenchContentProvider() ); dialog.setInput( ResourcesPlugin.getWorkspace().getRoot() ); - dialog.setMessage( Messages.getString("EditorImportConfigurationAction.SelectConfigurationFileToImport") ); //$NON-NLS-1$ + dialog.setMessage( Messages.getString( "EditorImportConfigurationAction.SelectConfigurationFileToImport" ) ); //$NON-NLS-1$ dialog.setTitle( DIALOG_TITLE ); dialog.setAllowMultiple( false ); dialog.setStatusLineAboveButtons( false ); Modified: directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/dialogs/AttributeValueDialog.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/dialogs/AttributeValueDialog.java?rev=1466969&r1=1466968&r2=1466969&view=diff ============================================================================== --- directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/dialogs/AttributeValueDialog.java (original) +++ directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/dialogs/AttributeValueDialog.java Thu Apr 11 17:03:17 2013 @@ -69,7 +69,7 @@ public class AttributeValueDialog extend protected void configureShell( Shell newShell ) { super.configureShell( newShell ); - newShell.setText( Messages.getString("AttributeValueDialog.AttributeValueDialog") ); //$NON-NLS-1$ + newShell.setText( Messages.getString( "AttributeValueDialog.AttributeValueDialog" ) ); //$NON-NLS-1$ } @@ -84,13 +84,13 @@ public class AttributeValueDialog extend composite.setLayoutData( new GridData( GridData.FILL, GridData.FILL, true, true ) ); Label attributeLabel = new Label( composite, SWT.NONE ); - attributeLabel.setText( Messages.getString("AttributeValueDialog.Attribute") ); //$NON-NLS-1$ + attributeLabel.setText( Messages.getString( "AttributeValueDialog.Attribute" ) ); //$NON-NLS-1$ attributeText = new Text( composite, SWT.BORDER ); attributeText.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false ) ); Label valueLabel = new Label( composite, SWT.NONE ); - valueLabel.setText( Messages.getString("AttributeValueDialog.Value") ); //$NON-NLS-1$ + valueLabel.setText( Messages.getString( "AttributeValueDialog.Value" ) ); //$NON-NLS-1$ valueText = new Text( composite, SWT.BORDER ); valueText.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false ) ); Modified: directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/ConnectionServerConfigurationInput.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/ConnectionServerConfigurationInput.java?rev=1466969&r1=1466968&r2=1466969&view=diff ============================================================================== --- directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/ConnectionServerConfigurationInput.java (original) +++ directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/ConnectionServerConfigurationInput.java Thu Apr 11 17:03:17 2013 @@ -95,7 +95,8 @@ public class ConnectionServerConfigurati */ public String getToolTipText() { - return NLS.bind( Messages.getString("ConnectionServerConfigurationInput.ConnectionConfiguration"), connection.getName() ); //$NON-NLS-1$ + return NLS.bind( + Messages.getString( "ConnectionServerConfigurationInput.ConnectionConfiguration" ), connection.getName() ); //$NON-NLS-1$ } @@ -104,7 +105,8 @@ public class ConnectionServerConfigurati */ public String getName() { - return NLS.bind( Messages.getString("ConnectionServerConfigurationInput.ConnectionConfiguration"), connection.getName() ); //$NON-NLS-1$ + return NLS.bind( + Messages.getString( "ConnectionServerConfigurationInput.ConnectionConfiguration" ), connection.getName() ); //$NON-NLS-1$ } Modified: directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/ErrorPage.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/ErrorPage.java?rev=1466969&r1=1466968&r2=1466969&view=diff ============================================================================== --- directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/ErrorPage.java (original) +++ directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/ErrorPage.java Thu Apr 11 17:03:17 2013 @@ -52,10 +52,10 @@ public class ErrorPage extends FormPage public static final String ID = ErrorPage.class.getName(); /** The Page Title */ - private static final String TITLE = Messages.getString("ErrorPage.ErrorOpeningEditor"); //$NON-NLS-1$ + private static final String TITLE = Messages.getString( "ErrorPage.ErrorOpeningEditor" ); //$NON-NLS-1$ - private static final String DETAILS_CLOSED = NLS.bind( "{0} >>", Messages.getString("ErrorPage.Details") ); //$NON-NLS-1$ //$NON-NLS-2$ - private static final String DETAILS_OPEN = NLS.bind( "<< {0}", Messages.getString("ErrorPage.Details") ); //$NON-NLS-1$ //$NON-NLS-2$ + private static final String DETAILS_CLOSED = NLS.bind( "{0} >>", Messages.getString( "ErrorPage.Details" ) ); //$NON-NLS-1$ //$NON-NLS-2$ + private static final String DETAILS_OPEN = NLS.bind( "<< {0}", Messages.getString( "ErrorPage.Details" ) ); //$NON-NLS-1$ //$NON-NLS-2$ /** The exception */ private Exception exception; @@ -90,7 +90,7 @@ public class ErrorPage extends FormPage protected void createFormContent( IManagedForm managedForm ) { ScrolledForm form = managedForm.getForm(); - form.setText( Messages.getString("ErrorPage.ErrorOpeningEditor") ); //$NON-NLS-1$ + form.setText( Messages.getString( "ErrorPage.ErrorOpeningEditor" ) ); //$NON-NLS-1$ form.setImage( Display.getCurrent().getSystemImage( SWT.ICON_ERROR ) ); parent = form.getBody(); @@ -122,7 +122,7 @@ public class ErrorPage extends FormPage // Initializing with the exception if ( exception == null ) { - errorLabel.setText( Messages.getString("ErrorPage.CouldNotOpenEditor") ); //$NON-NLS-1$ + errorLabel.setText( Messages.getString( "ErrorPage.CouldNotOpenEditor" ) ); //$NON-NLS-1$ detailsButton.setVisible( false ); } else Modified: directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/KerberosServerPage.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/KerberosServerPage.java?rev=1466969&r1=1466968&r2=1466969&view=diff ============================================================================== --- directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/KerberosServerPage.java (original) +++ directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/KerberosServerPage.java Thu Apr 11 17:03:17 2013 @@ -161,7 +161,8 @@ public class KerberosServerPage extends if ( ( getKdcServerBean().getKrbEncryptionTypes().size() == 1 ) && ( event.getChecked() == false ) ) { // Displaying an error to the user - CommonUIUtils.openErrorDialog( Messages.getString( "KerberosServerPage.AtLeastOneEncryptionTypeMustBeSelected" ) ); //$NON-NLS-1$ + CommonUIUtils.openErrorDialog( Messages + .getString( "KerberosServerPage.AtLeastOneEncryptionTypeMustBeSelected" ) ); //$NON-NLS-1$ // Reverting the current checked state encryptionTypesTableViewer.setChecked( event.getElement(), !event.getChecked() ); Modified: directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/LdapLdapsServersPage.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/LdapLdapsServersPage.java?rev=1466969&r1=1466968&r2=1466969&view=diff ============================================================================== --- directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/LdapLdapsServersPage.java (original) +++ directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/LdapLdapsServersPage.java Thu Apr 11 17:03:17 2013 @@ -90,7 +90,7 @@ public class LdapLdapsServersPage extend public static final String ID = LdapLdapsServersPage.class.getName(); //$NON-NLS-1$ /** The Page Title */ - private static final String TITLE = Messages.getString("LdapLdapsServersPage.LdapLdapsServers"); //$NON-NLS-1$ + private static final String TITLE = Messages.getString( "LdapLdapsServersPage.LdapLdapsServers" ); //$NON-NLS-1$ // UI Controls private Button enableLdapCheckbox; @@ -425,7 +425,7 @@ public class LdapLdapsServersPage extend { // Creation of the section Section section = toolkit.createSection( parent, Section.TITLE_BAR ); - section.setText( Messages.getString("LdapLdapsServersPage.LdapLdapsServers") ); //$NON-NLS-1$ + section.setText( Messages.getString( "LdapLdapsServersPage.LdapLdapsServers" ) ); //$NON-NLS-1$ section.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false ) ); Composite composite = toolkit.createComposite( section ); toolkit.paintBordersFor( composite ); @@ -435,22 +435,24 @@ public class LdapLdapsServersPage extend section.setClient( composite ); // Enable LDAP Server Checkbox - enableLdapCheckbox = toolkit.createButton( composite, Messages.getString("LdapLdapsServersPage.EnableLdapServer"), SWT.CHECK ); //$NON-NLS-1$ + enableLdapCheckbox = toolkit.createButton( composite, + Messages.getString( "LdapLdapsServersPage.EnableLdapServer" ), SWT.CHECK ); //$NON-NLS-1$ enableLdapCheckbox.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false, gridLayout.numColumns, 1 ) ); // LDAP Server Port Text toolkit.createLabel( composite, TABULATION ); - toolkit.createLabel( composite, Messages.getString("LdapLdapsServersPage.Port") ); //$NON-NLS-1$ + toolkit.createLabel( composite, Messages.getString( "LdapLdapsServersPage.Port" ) ); //$NON-NLS-1$ ldapPortText = createPortText( toolkit, composite ); createDefaultValueLabel( toolkit, composite, "10389" ); //$NON-NLS-1$ // Enable LDAPS Server Checkbox - enableLdapsCheckbox = toolkit.createButton( composite, Messages.getString("LdapLdapsServersPage.EnableLdapsServer"), SWT.CHECK ); //$NON-NLS-1$ + enableLdapsCheckbox = toolkit.createButton( composite, + Messages.getString( "LdapLdapsServersPage.EnableLdapsServer" ), SWT.CHECK ); //$NON-NLS-1$ enableLdapsCheckbox.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false, gridLayout.numColumns, 1 ) ); // LDAPS Server Port Text toolkit.createLabel( composite, TABULATION ); - toolkit.createLabel( composite, Messages.getString("LdapLdapsServersPage.Port") ); //$NON-NLS-1$ + toolkit.createLabel( composite, Messages.getString( "LdapLdapsServersPage.Port" ) ); //$NON-NLS-1$ ldapsPortText = createPortText( toolkit, composite ); createDefaultValueLabel( toolkit, composite, "10636" ); //$NON-NLS-1$ } @@ -468,7 +470,7 @@ public class LdapLdapsServersPage extend { // Creation of the section Section section = toolkit.createSection( parent, Section.TITLE_BAR ); - section.setText( Messages.getString("LdapLdapsServersPage.Limits") ); //$NON-NLS-1$ + section.setText( Messages.getString( "LdapLdapsServersPage.Limits" ) ); //$NON-NLS-1$ section.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false ) ); Composite composite = toolkit.createComposite( section ); toolkit.paintBordersFor( composite ); @@ -477,12 +479,12 @@ public class LdapLdapsServersPage extend section.setClient( composite ); // Max. Time Limit Text - toolkit.createLabel( composite, Messages.getString("LdapLdapsServersPage.MaxTimeLimit") ); //$NON-NLS-1$ + toolkit.createLabel( composite, Messages.getString( "LdapLdapsServersPage.MaxTimeLimit" ) ); //$NON-NLS-1$ maxTimeLimitText = createIntegerText( toolkit, composite ); maxTimeLimitText.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false ) ); // Max. Size Limit Text - toolkit.createLabel( composite, Messages.getString("LdapLdapsServersPage.MaxSizeLimit") ); //$NON-NLS-1$ + toolkit.createLabel( composite, Messages.getString( "LdapLdapsServersPage.MaxSizeLimit" ) ); //$NON-NLS-1$ maxSizeLimitText = createIntegerText( toolkit, composite ); maxSizeLimitText.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false ) ); } @@ -500,7 +502,7 @@ public class LdapLdapsServersPage extend { // Creation of the section Section section = toolkit.createSection( parent, Section.TITLE_BAR | Section.TWISTIE | Section.COMPACT ); - section.setText( Messages.getString("LdapLdapsServersPage.Advanced") ); //$NON-NLS-1$ + section.setText( Messages.getString( "LdapLdapsServersPage.Advanced" ) ); //$NON-NLS-1$ section.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false ) ); Composite composite = toolkit.createComposite( section ); toolkit.paintBordersFor( composite ); @@ -509,18 +511,19 @@ public class LdapLdapsServersPage extend section.setClient( composite ); // Enable TLS Checkbox - enableTlsCheckbox = toolkit.createButton( composite, Messages.getString("LdapLdapsServersPage.EnableTls"), SWT.CHECK ); //$NON-NLS-1$ + enableTlsCheckbox = toolkit.createButton( composite, + Messages.getString( "LdapLdapsServersPage.EnableTls" ), SWT.CHECK ); //$NON-NLS-1$ enableTlsCheckbox.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false, 3, 1 ) ); // Enable Server-side Password Hashing Checkbox enableServerSidePasswordHashingCheckbox = toolkit.createButton( composite, - Messages.getString("LdapLdapsServersPage.EnableServerSidePasswordHashing"), //$NON-NLS-1$ + Messages.getString( "LdapLdapsServersPage.EnableServerSidePasswordHashing" ), //$NON-NLS-1$ SWT.CHECK ); enableServerSidePasswordHashingCheckbox.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false, 3, 1 ) ); // Server-side Password Hashing Combo toolkit.createLabel( composite, " " ); //$NON-NLS-1$ - toolkit.createLabel( composite, Messages.getString("LdapLdapsServersPage.HashingMethod") ); //$NON-NLS-1$ + toolkit.createLabel( composite, Messages.getString( "LdapLdapsServersPage.HashingMethod" ) ); //$NON-NLS-1$ Combo hashingMethodCombo = new Combo( composite, SWT.READ_ONLY | SWT.SINGLE ); hashingMethodCombo.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false ) ); toolkit.adapt( hashingMethodCombo ); @@ -598,7 +601,7 @@ public class LdapLdapsServersPage extend { // Creation of the section Section section = toolkit.createSection( parent, Section.TITLE_BAR ); - section.setText( Messages.getString("LdapLdapsServersPage.SupportedAuthenticationMechanisms") ); //$NON-NLS-1$ + section.setText( Messages.getString( "LdapLdapsServersPage.SupportedAuthenticationMechanisms" ) ); //$NON-NLS-1$ section.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false ) ); Composite composite = toolkit.createComposite( section ); composite.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false ) ); @@ -629,7 +632,7 @@ public class LdapLdapsServersPage extend Composite authMechNtlmComposite = toolkit.createComposite( composite ); authMechNtlmComposite.setLayout( new GridLayout( 3, false ) ); toolkit.createLabel( authMechNtlmComposite, " " ); //$NON-NLS-1$ - toolkit.createLabel( authMechNtlmComposite, Messages.getString("LdapLdapsServersPage.Provider") ); //$NON-NLS-1$ + toolkit.createLabel( authMechNtlmComposite, Messages.getString( "LdapLdapsServersPage.Provider" ) ); //$NON-NLS-1$ authMechNtlmText = toolkit.createText( authMechNtlmComposite, "" ); //$NON-NLS-1$ authMechNtlmText.setLayoutData( new GridData( SWT.FILL, SWT.CENTER, true, false ) ); authMechNtlmComposite.setLayoutData( new GridData( SWT.FILL, SWT.CENTER, false, false, 2, 1 ) ); @@ -641,7 +644,7 @@ public class LdapLdapsServersPage extend Composite authMechGssSpnegoComposite = toolkit.createComposite( composite ); authMechGssSpnegoComposite.setLayout( new GridLayout( 3, false ) ); toolkit.createLabel( authMechGssSpnegoComposite, " " ); //$NON-NLS-1$ - toolkit.createLabel( authMechGssSpnegoComposite, Messages.getString("LdapLdapsServersPage.Provider") ); //$NON-NLS-1$ + toolkit.createLabel( authMechGssSpnegoComposite, Messages.getString( "LdapLdapsServersPage.Provider" ) ); //$NON-NLS-1$ authMechGssSpnegoText = toolkit.createText( authMechGssSpnegoComposite, "" ); //$NON-NLS-1$ authMechGssSpnegoText.setLayoutData( new GridData( SWT.FILL, SWT.CENTER, true, false ) ); authMechGssSpnegoComposite.setLayoutData( new GridData( SWT.FILL, SWT.CENTER, true, false, 2, 1 ) ); @@ -660,7 +663,7 @@ public class LdapLdapsServersPage extend { // Creation of the section Section section = toolkit.createSection( parent, Section.TITLE_BAR ); - section.setText( Messages.getString("LdapLdapsServersPage.SslStartTlsKeystore") ); //$NON-NLS-1$ + section.setText( Messages.getString( "LdapLdapsServersPage.SslStartTlsKeystore" ) ); //$NON-NLS-1$ section.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false ) ); Composite composite = toolkit.createComposite( section ); toolkit.paintBordersFor( composite ); @@ -669,20 +672,22 @@ public class LdapLdapsServersPage extend section.setClient( composite ); // Keystore File Text - toolkit.createLabel( composite, Messages.getString("LdapLdapsServersPage.Keystore") ); //$NON-NLS-1$ + toolkit.createLabel( composite, Messages.getString( "LdapLdapsServersPage.Keystore" ) ); //$NON-NLS-1$ keystoreFileText = toolkit.createText( composite, "" ); //$NON-NLS-1$ setGridDataWithDefaultWidth( keystoreFileText, new GridData( SWT.FILL, SWT.CENTER, true, false ) ); - keystoreFileBrowseButton = toolkit.createButton( composite, Messages.getString("LdapLdapsServersPage.Browse"), SWT.PUSH ); //$NON-NLS-1$ + keystoreFileBrowseButton = toolkit.createButton( composite, + Messages.getString( "LdapLdapsServersPage.Browse" ), SWT.PUSH ); //$NON-NLS-1$ // Password Text - toolkit.createLabel( composite, Messages.getString("LdapLdapsServersPage.Password") ); //$NON-NLS-1$ + toolkit.createLabel( composite, Messages.getString( "LdapLdapsServersPage.Password" ) ); //$NON-NLS-1$ keystorePasswordText = toolkit.createText( composite, "" ); //$NON-NLS-1$ keystorePasswordText.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false, 2, 1 ) ); keystorePasswordText.setEchoChar( '\u2022' ); // Show Password Checkbox toolkit.createLabel( composite, "" ); //$NON-NLS-1$ - showPasswordCheckbox = toolkit.createButton( composite, Messages.getString("LdapLdapsServersPage.ShowPassword"), SWT.CHECK ); //$NON-NLS-1$ + showPasswordCheckbox = toolkit.createButton( composite, + Messages.getString( "LdapLdapsServersPage.ShowPassword" ), SWT.CHECK ); //$NON-NLS-1$ showPasswordCheckbox.setLayoutData( new GridData( SWT.FILL, SWT.CENTER, true, false ) ); showPasswordCheckbox.setSelection( false ); } @@ -700,7 +705,7 @@ public class LdapLdapsServersPage extend { // Creation of the section Section section = toolkit.createSection( parent, Section.TITLE_BAR ); - section.setText( Messages.getString("LdapLdapsServersPage.SaslSettings") ); //$NON-NLS-1$ + section.setText( Messages.getString( "LdapLdapsServersPage.SaslSettings" ) ); //$NON-NLS-1$ section.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false ) ); Composite composite = toolkit.createComposite( section ); toolkit.paintBordersFor( composite ); @@ -709,14 +714,14 @@ public class LdapLdapsServersPage extend section.setClient( composite ); // SASL Host Text - toolkit.createLabel( composite, Messages.getString("LdapLdapsServersPage.SaslHost") ); //$NON-NLS-1$ + toolkit.createLabel( composite, Messages.getString( "LdapLdapsServersPage.SaslHost" ) ); //$NON-NLS-1$ saslHostText = toolkit.createText( composite, "" ); //$NON-NLS-1$ setGridDataWithDefaultWidth( saslHostText, new GridData( SWT.FILL, SWT.NONE, true, false ) ); Label defaultSaslHostLabel = createDefaultValueLabel( toolkit, composite, "ldap.example.com" ); //$NON-NLS-1$ defaultSaslHostLabel.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false, 2, 1 ) ); // SASL Principal Text - toolkit.createLabel( composite, Messages.getString("LdapLdapsServersPage.SaslPrincipal") ); //$NON-NLS-1$ + toolkit.createLabel( composite, Messages.getString( "LdapLdapsServersPage.SaslPrincipal" ) ); //$NON-NLS-1$ saslPrincipalText = toolkit.createText( composite, "" ); //$NON-NLS-1$ setGridDataWithDefaultWidth( saslPrincipalText, new GridData( SWT.FILL, SWT.NONE, true, false ) ); Label defaultSaslPrincipalLabel = createDefaultValueLabel( toolkit, composite, @@ -724,7 +729,7 @@ public class LdapLdapsServersPage extend defaultSaslPrincipalLabel.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false, 2, 1 ) ); // Search Base Dn Text - toolkit.createLabel( composite, Messages.getString("LdapLdapsServersPage.SearchBaseDn") ); //$NON-NLS-1$ + toolkit.createLabel( composite, Messages.getString( "LdapLdapsServersPage.SearchBaseDn" ) ); //$NON-NLS-1$ saslSearchBaseDnText = toolkit.createText( composite, "" ); //$NON-NLS-1$ setGridDataWithDefaultWidth( saslSearchBaseDnText, new GridData( SWT.FILL, SWT.NONE, true, false ) ); Label defaultSaslSearchBaseDnLabel = createDefaultValueLabel( toolkit, composite, "ou=users,dc=example,dc=com" ); //$NON-NLS-1$ Modified: directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/LoadingPage.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/LoadingPage.java?rev=1466969&r1=1466968&r2=1466969&view=diff ============================================================================== --- directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/LoadingPage.java (original) +++ directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/LoadingPage.java Thu Apr 11 17:03:17 2013 @@ -44,7 +44,7 @@ public class LoadingPage extends FormPag public static final String ID = LoadingPage.class.getName(); //$NON-NLS-1$ /** The Page Title */ - private static final String TITLE = Messages.getString("LoadingPage.LoadingConfiguration"); //$NON-NLS-1$ + private static final String TITLE = Messages.getString( "LoadingPage.LoadingConfiguration" ); //$NON-NLS-1$ /** @@ -65,7 +65,7 @@ public class LoadingPage extends FormPag protected void createFormContent( IManagedForm managedForm ) { ScrolledForm form = managedForm.getForm(); - form.setText( Messages.getString("LoadingPage.LoadingConfigurationEllipsis") ); //$NON-NLS-1$ + form.setText( Messages.getString( "LoadingPage.LoadingConfigurationEllipsis" ) ); //$NON-NLS-1$ Composite parent = form.getBody(); parent.setLayout( new GridLayout() ); @@ -80,7 +80,8 @@ public class LoadingPage extends FormPag ProgressBar progressBar = new ProgressBar( composite, SWT.INDETERMINATE ); progressBar.setLayoutData( new GridData( SWT.CENTER, SWT.NONE, false, false ) ); - Label label = toolkit.createLabel( composite, Messages.getString("LoadingPage.LoadingTheConfigurationPleaseWait") ); //$NON-NLS-1$ + Label label = toolkit.createLabel( composite, + Messages.getString( "LoadingPage.LoadingTheConfigurationPleaseWait" ) ); //$NON-NLS-1$ label.setLayoutData( new GridData( SWT.CENTER, SWT.NONE, false, false ) ); } } Modified: directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/NewServerConfigurationInput.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/NewServerConfigurationInput.java?rev=1466969&r1=1466968&r2=1466969&view=diff ============================================================================== --- directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/NewServerConfigurationInput.java (original) +++ directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/NewServerConfigurationInput.java Thu Apr 11 17:03:17 2013 @@ -37,7 +37,7 @@ public class NewServerConfigurationInput */ public String getToolTipText() { - return Messages.getString("NewServerConfigurationInput.NewApacheDS20ConfigurationFile"); //$NON-NLS-1$ + return Messages.getString( "NewServerConfigurationInput.NewApacheDS20ConfigurationFile" ); //$NON-NLS-1$ } @@ -46,7 +46,7 @@ public class NewServerConfigurationInput */ public String getName() { - return Messages.getString("NewServerConfigurationInput.NewApacheDS20ConfigurationFile"); //$NON-NLS-1$ + return Messages.getString( "NewServerConfigurationInput.NewApacheDS20ConfigurationFile" ); //$NON-NLS-1$ } Modified: directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/PartitionDetailsPage.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/PartitionDetailsPage.java?rev=1466969&r1=1466968&r2=1466969&view=diff ============================================================================== --- directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/PartitionDetailsPage.java (original) +++ directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/PartitionDetailsPage.java Thu Apr 11 17:03:17 2013 @@ -346,8 +346,8 @@ public class PartitionDetailsPage implem { Section section = toolkit.createSection( parent, Section.DESCRIPTION | Section.TITLE_BAR ); section.marginWidth = 10; - section.setText( Messages.getString("PartitionDetailsPage.PartitionsDetails") ); //$NON-NLS-1$ - section.setDescription( Messages.getString("PartitionDetailsPage.SetPropertiesOfPartition") ); //$NON-NLS-1$ + section.setText( Messages.getString( "PartitionDetailsPage.PartitionsDetails" ) ); //$NON-NLS-1$ + section.setDescription( Messages.getString( "PartitionDetailsPage.SetPropertiesOfPartition" ) ); //$NON-NLS-1$ TableWrapData td = new TableWrapData( TableWrapData.FILL, TableWrapData.TOP ); td.grabHorizontal = true; section.setLayoutData( td ); @@ -358,12 +358,12 @@ public class PartitionDetailsPage implem section.setClient( client ); // ID - toolkit.createLabel( client, Messages.getString("PartitionDetailsPage.Id") ); //$NON-NLS-1$ + toolkit.createLabel( client, Messages.getString( "PartitionDetailsPage.Id" ) ); //$NON-NLS-1$ idText = toolkit.createText( client, "" ); //$NON-NLS-1$ idText.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false, 2, 1 ) ); // Cache Size - toolkit.createLabel( client, Messages.getString("PartitionDetailsPage.CacheSize") ); //$NON-NLS-1$ + toolkit.createLabel( client, Messages.getString( "PartitionDetailsPage.CacheSize" ) ); //$NON-NLS-1$ cacheSizeText = toolkit.createText( client, "" ); //$NON-NLS-1$ cacheSizeText.addVerifyListener( new VerifyListener() { @@ -383,11 +383,13 @@ public class PartitionDetailsPage implem suffixText.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false, 2, 1 ) ); // Enable Optimizer - enableOptimizerCheckbox = toolkit.createButton( client, Messages.getString("PartitionDetailsPage.EnableOptimzer"), SWT.CHECK ); //$NON-NLS-1$ + enableOptimizerCheckbox = toolkit.createButton( client, + Messages.getString( "PartitionDetailsPage.EnableOptimzer" ), SWT.CHECK ); //$NON-NLS-1$ enableOptimizerCheckbox.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false, 3, 1 ) ); // Synchronisation On Write - synchOnWriteCheckbox = toolkit.createButton( client, Messages.getString("PartitionDetailsPage.SynchronizationOnWrite"), SWT.CHECK ); //$NON-NLS-1$ + synchOnWriteCheckbox = toolkit.createButton( client, + Messages.getString( "PartitionDetailsPage.SynchronizationOnWrite" ), SWT.CHECK ); //$NON-NLS-1$ synchOnWriteCheckbox.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false, 3, 1 ) ); } @@ -413,7 +415,8 @@ public class PartitionDetailsPage implem section.setClient( client ); // Auto Generate Context Entry Checkbox - autoGenerateContextEntryCheckbox = toolkit.createButton( client, Messages.getString("PartitionDetailsPage.AutoGenerateContextEntryFromSuffixDn"), //$NON-NLS-1$ + autoGenerateContextEntryCheckbox = toolkit.createButton( client, + Messages.getString( "PartitionDetailsPage.AutoGenerateContextEntryFromSuffixDn" ), //$NON-NLS-1$ SWT.CHECK ); autoGenerateContextEntryCheckbox.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false, 3, 1 ) ); @@ -424,10 +427,10 @@ public class PartitionDetailsPage implem gd.widthHint = 50; contextEntryTable.setLayoutData( gd ); TableColumn idColumn = new TableColumn( contextEntryTable, SWT.LEFT, 0 ); - idColumn.setText( Messages.getString("PartitionDetailsPage.Attribute") ); //$NON-NLS-1$ + idColumn.setText( Messages.getString( "PartitionDetailsPage.Attribute" ) ); //$NON-NLS-1$ idColumn.setWidth( 100 ); TableColumn valueColumn = new TableColumn( contextEntryTable, SWT.LEFT, 1 ); - valueColumn.setText( Messages.getString("PartitionDetailsPage.Value") ); //$NON-NLS-1$ + valueColumn.setText( Messages.getString( "PartitionDetailsPage.Value" ) ); //$NON-NLS-1$ valueColumn.setWidth( 100 ); contextEntryTable.setHeaderVisible( true ); contextEntryTableViewer = new TableViewer( contextEntryTable ); @@ -516,16 +519,19 @@ public class PartitionDetailsPage implem buttonsGD.widthHint = IDialogConstants.BUTTON_WIDTH; // Context Entry Add Button - contextEntryAddButton = toolkit.createButton( client, Messages.getString("PartitionDetailsPage.Add"), SWT.PUSH ); //$NON-NLS-1$ + contextEntryAddButton = toolkit.createButton( client, + Messages.getString( "PartitionDetailsPage.Add" ), SWT.PUSH ); //$NON-NLS-1$ contextEntryAddButton.setLayoutData( buttonsGD ); // Context Entry Edit Button - contextEntryEditButton = toolkit.createButton( client, Messages.getString("PartitionDetailsPage.Edit"), SWT.PUSH ); //$NON-NLS-1$ + contextEntryEditButton = toolkit.createButton( client, + Messages.getString( "PartitionDetailsPage.Edit" ), SWT.PUSH ); //$NON-NLS-1$ contextEntryEditButton.setEnabled( false ); contextEntryEditButton.setLayoutData( buttonsGD ); // Context Entry Delete Button - contextEntryDeleteButton = toolkit.createButton( client, Messages.getString("PartitionDetailsPage.Delete"), SWT.PUSH ); //$NON-NLS-1$ + contextEntryDeleteButton = toolkit.createButton( client, + Messages.getString( "PartitionDetailsPage.Delete" ), SWT.PUSH ); //$NON-NLS-1$ contextEntryDeleteButton.setEnabled( false ); contextEntryDeleteButton.setLayoutData( buttonsGD ); } @@ -558,8 +564,9 @@ public class PartitionDetailsPage implem // Section Section indexedAttributesSection = toolkit.createSection( parent, Section.DESCRIPTION | Section.TITLE_BAR ); indexedAttributesSection.marginWidth = 10; - indexedAttributesSection.setText( Messages.getString("PartitionDetailsPage.IndexedAttributes") ); //$NON-NLS-1$ - indexedAttributesSection.setDescription( Messages.getString("PartitionDetailsPage.SetIndexedAttributesOfPartition") ); //$NON-NLS-1$ + indexedAttributesSection.setText( Messages.getString( "PartitionDetailsPage.IndexedAttributes" ) ); //$NON-NLS-1$ + indexedAttributesSection.setDescription( Messages + .getString( "PartitionDetailsPage.SetIndexedAttributesOfPartition" ) ); //$NON-NLS-1$ indexedAttributesSection.setLayoutData( new TableWrapData( TableWrapData.FILL ) ); Composite indexedAttributesClient = toolkit.createComposite( indexedAttributesSection ); toolkit.paintBordersFor( indexedAttributesClient ); @@ -581,7 +588,8 @@ public class PartitionDetailsPage implem { JdbmIndexBean jdbmIndexBean = ( JdbmIndexBean ) element; - return NLS.bind( Messages.getString("PartitionDetailsPage.IndexAttributeIdAndCacheSize"), jdbmIndexBean.getIndexAttributeId(), //$NON-NLS-1$ + return NLS.bind( + Messages.getString( "PartitionDetailsPage.IndexAttributeIdAndCacheSize" ), jdbmIndexBean.getIndexAttributeId(), //$NON-NLS-1$ jdbmIndexBean.getIndexCacheSize() ); } @@ -602,16 +610,19 @@ public class PartitionDetailsPage implem } ); // Add button - indexesAddButton = toolkit.createButton( indexedAttributesClient, Messages.getString("PartitionDetailsPage.Add"), SWT.PUSH ); //$NON-NLS-1$ + indexesAddButton = toolkit.createButton( indexedAttributesClient, + Messages.getString( "PartitionDetailsPage.Add" ), SWT.PUSH ); //$NON-NLS-1$ indexesAddButton.setLayoutData( createNewButtonGridData() ); // Edit button - indexesEditButton = toolkit.createButton( indexedAttributesClient, Messages.getString("PartitionDetailsPage.Edit"), SWT.PUSH ); //$NON-NLS-1$ + indexesEditButton = toolkit.createButton( indexedAttributesClient, + Messages.getString( "PartitionDetailsPage.Edit" ), SWT.PUSH ); //$NON-NLS-1$ indexesEditButton.setEnabled( false ); indexesEditButton.setLayoutData( createNewButtonGridData() ); // Delete button - indexesDeleteButton = toolkit.createButton( indexedAttributesClient, Messages.getString("PartitionDetailsPage.Delete"), SWT.PUSH ); //$NON-NLS-1$ + indexesDeleteButton = toolkit.createButton( indexedAttributesClient, + Messages.getString( "PartitionDetailsPage.Delete" ), SWT.PUSH ); //$NON-NLS-1$ indexesDeleteButton.setEnabled( false ); indexesDeleteButton.setLayoutData( createNewButtonGridData() ); } @@ -954,8 +965,11 @@ public class PartitionDetailsPage implem { JdbmIndexBean selectedIndex = ( JdbmIndexBean ) selection.getFirstElement(); - if ( MessageDialog.openConfirm( mform.getForm().getShell(), Messages.getString("PartitionDetailsPage.ConfirmDelete"), //$NON-NLS-1$ - NLS.bind( Messages.getString("PartitionDetailsPage.AreYouSureDeleteIndex"), selectedIndex.getIndexAttributeId() ) ) ) //$NON-NLS-1$ + if ( MessageDialog + .openConfirm( mform.getForm().getShell(), + Messages.getString( "PartitionDetailsPage.ConfirmDelete" ), //$NON-NLS-1$ + NLS.bind( + Messages.getString( "PartitionDetailsPage.AreYouSureDeleteIndex" ), selectedIndex.getIndexAttributeId() ) ) ) //$NON-NLS-1$ { indexesList.remove( selectedIndex ); indexesTableViewer.refresh(); Modified: directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/PartitionsMasterDetailsBlock.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/PartitionsMasterDetailsBlock.java?rev=1466969&r1=1466968&r2=1466969&view=diff ============================================================================== --- directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/PartitionsMasterDetailsBlock.java (original) +++ directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/PartitionsMasterDetailsBlock.java Thu Apr 11 17:03:17 2013 @@ -64,7 +64,7 @@ import org.eclipse.ui.forms.widgets.Sect */ public class PartitionsMasterDetailsBlock extends MasterDetailsBlock { - private static final String NEW_ID = Messages.getString("PartitionsMasterDetailsBlock.PartitionNewId"); //$NON-NLS-1$ + private static final String NEW_ID = Messages.getString( "PartitionsMasterDetailsBlock.PartitionNewId" ); //$NON-NLS-1$ /** The associated page */ private PartitionsPage page; @@ -99,7 +99,7 @@ public class PartitionsMasterDetailsBloc // Creating the Section Section section = toolkit.createSection( parent, Section.TITLE_BAR ); - section.setText( Messages.getString("PartitionsMasterDetailsBlock.AllPartitions") ); //$NON-NLS-1$ + section.setText( Messages.getString( "PartitionsMasterDetailsBlock.AllPartitions" ) ); //$NON-NLS-1$ section.marginWidth = 10; section.marginHeight = 5; Composite client = toolkit.createComposite( section, SWT.WRAP ); @@ -133,10 +133,11 @@ public class PartitionsMasterDetailsBloc viewer.setComparator( PartitionsPage.PARTITIONS_COMPARATOR ); // Creating the button(s) - addButton = toolkit.createButton( client, Messages.getString("PartitionsMasterDetailsBlock.Add"), SWT.PUSH ); //$NON-NLS-1$ + addButton = toolkit.createButton( client, Messages.getString( "PartitionsMasterDetailsBlock.Add" ), SWT.PUSH ); //$NON-NLS-1$ addButton.setLayoutData( new GridData( SWT.FILL, SWT.BEGINNING, false, false ) ); - deleteButton = toolkit.createButton( client, Messages.getString("PartitionsMasterDetailsBlock.Delete"), SWT.PUSH ); //$NON-NLS-1$ + deleteButton = toolkit.createButton( client, + Messages.getString( "PartitionsMasterDetailsBlock.Delete" ), SWT.PUSH ); //$NON-NLS-1$ deleteButton.setEnabled( false ); deleteButton.setLayoutData( new GridData( SWT.FILL, SWT.BEGINNING, false, false ) ); @@ -326,11 +327,13 @@ public class PartitionsMasterDetailsBloc JdbmPartitionBean partition = ( JdbmPartitionBean ) selection.getFirstElement(); if ( !PartitionsPage.isSystemPartition( partition ) ) { - if ( MessageDialog.openConfirm( - page.getManagedForm().getForm().getShell(), - Messages.getString("PartitionsMasterDetailsBlock.ConfirmDelete"), //$NON-NLS-1$ - NLS.bind( Messages.getString("PartitionsMasterDetailsBlock.AreYouSureDeletePartition"), partition.getPartitionId(), //$NON-NLS-1$ - partition.getPartitionSuffix() ) ) ) + if ( MessageDialog + .openConfirm( + page.getManagedForm().getForm().getShell(), + Messages.getString( "PartitionsMasterDetailsBlock.ConfirmDelete" ), //$NON-NLS-1$ + NLS.bind( + Messages.getString( "PartitionsMasterDetailsBlock.AreYouSureDeletePartition" ), partition.getPartitionId(), //$NON-NLS-1$ + partition.getPartitionSuffix() ) ) ) { page.getConfigBean().getDirectoryServiceBean().getPartitions().remove( partition ); setEditorDirty(); Modified: directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/PartitionsPage.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/PartitionsPage.java?rev=1466969&r1=1466968&r2=1466969&view=diff ============================================================================== --- directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/PartitionsPage.java (original) +++ directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/PartitionsPage.java Thu Apr 11 17:03:17 2013 @@ -43,7 +43,7 @@ public class PartitionsPage extends Serv public static final String ID = PartitionsPage.class.getName(); //$NON-NLS-1$ /** The Page Title */ - private static final String TITLE = Messages.getString("PartitionsPage.Partitions"); //$NON-NLS-1$ + private static final String TITLE = Messages.getString( "PartitionsPage.Partitions" ); //$NON-NLS-1$ /** The label provider for partition table viewers */ public static LabelProvider PARTITIONS_LABEL_PROVIDER = new LabelProvider() Modified: directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/PasswordPolicyPage.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/PasswordPolicyPage.java?rev=1466969&r1=1466968&r2=1466969&view=diff ============================================================================== --- directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/PasswordPolicyPage.java (original) +++ directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/PasswordPolicyPage.java Thu Apr 11 17:03:17 2013 @@ -40,7 +40,7 @@ public class PasswordPolicyPage extends public static final String ID = PasswordPolicyPage.class.getName(); //$NON-NLS-1$ /** The Page Title */ - private static final String TITLE = Messages.getString("PasswordPolicyPage.PasswordPolicy"); //$NON-NLS-1$ + private static final String TITLE = Messages.getString( "PasswordPolicyPage.PasswordPolicy" ); //$NON-NLS-1$ /** @@ -61,7 +61,7 @@ public class PasswordPolicyPage extends protected void createFormContent( IManagedForm managedForm ) { ScrolledForm form = managedForm.getForm(); - form.setText( Messages.getString("PasswordPolicyPage.PasswordPolicy") ); //$NON-NLS-1$ + form.setText( Messages.getString( "PasswordPolicyPage.PasswordPolicy" ) ); //$NON-NLS-1$ Composite parent = form.getBody(); parent.setLayout( new GridLayout() ); Modified: directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/ReplicationPage.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/ReplicationPage.java?rev=1466969&r1=1466968&r2=1466969&view=diff ============================================================================== --- directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/ReplicationPage.java (original) +++ directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/ReplicationPage.java Thu Apr 11 17:03:17 2013 @@ -35,7 +35,7 @@ public class ReplicationPage extends Ser public static final String ID = ReplicationPage.class.getName(); /** The Page Title */ - private static final String TITLE = Messages.getString("ReplicationPage.Replication"); //$NON-NLS-1$ + private static final String TITLE = Messages.getString( "ReplicationPage.Replication" ); //$NON-NLS-1$ /** Modified: directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/ServerConfigurationEditor.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/ServerConfigurationEditor.java?rev=1466969&r1=1466968&r2=1466969&view=diff ============================================================================== --- directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/ServerConfigurationEditor.java (original) +++ directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/ServerConfigurationEditor.java Thu Apr 11 17:03:17 2013 @@ -181,7 +181,8 @@ public class ServerConfigurationEditor e { try { - monitor.beginTask( Messages.getString("ServerConfigurationEditor.SavingServerConfiguration"), IProgressMonitor.UNKNOWN ); //$NON-NLS-1$ + monitor.beginTask( + Messages.getString( "ServerConfigurationEditor.SavingServerConfiguration" ), IProgressMonitor.UNKNOWN ); //$NON-NLS-1$ doSaveAs( monitor ); monitor.done(); } Modified: directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/ServerConfigurationEditorPage.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/ServerConfigurationEditorPage.java?rev=1466969&r1=1466968&r2=1466969&view=diff ============================================================================== --- directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/ServerConfigurationEditorPage.java (original) +++ directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/ServerConfigurationEditorPage.java Thu Apr 11 17:03:17 2013 @@ -298,7 +298,8 @@ public abstract class ServerConfiguratio */ protected Label createDefaultValueLabel( FormToolkit toolkit, Composite parent, String text ) { - Label label = toolkit.createLabel( parent, NLS.bind( Messages.getString("ServerConfigurationEditorPage.DefaultWithValue"), text ), SWT.WRAP ); //$NON-NLS-1$ + Label label = toolkit.createLabel( parent, + NLS.bind( Messages.getString( "ServerConfigurationEditorPage.DefaultWithValue" ), text ), SWT.WRAP ); //$NON-NLS-1$ label.setForeground( GRAY_COLOR ); return label; Modified: directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/ServerConfigurationEditorUtils.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/ServerConfigurationEditorUtils.java?rev=1466969&r1=1466968&r2=1466969&view=diff ============================================================================== --- directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/ServerConfigurationEditorUtils.java (original) +++ directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/ServerConfigurationEditorUtils.java Thu Apr 11 17:03:17 2013 @@ -163,8 +163,9 @@ public class ServerConfigurationEditorUt if ( externalFile.exists() ) { String question = NLS.bind( - Messages.getString("ServerConfigurationEditorUtils.TheFileAlreadyExistsWantToReplace"), path ); //$NON-NLS-1$ - MessageDialog overwriteDialog = new MessageDialog( shell, Messages.getString("ServerConfigurationEditorUtils.Question"), null, question, //$NON-NLS-1$ + Messages.getString( "ServerConfigurationEditorUtils.TheFileAlreadyExistsWantToReplace" ), path ); //$NON-NLS-1$ + MessageDialog overwriteDialog = new MessageDialog( shell, + Messages.getString( "ServerConfigurationEditorUtils.Question" ), null, question, //$NON-NLS-1$ MessageDialog.QUESTION, new String[] { IDialogConstants.YES_LABEL, IDialogConstants.NO_LABEL, IDialogConstants.CANCEL_LABEL }, 0 ); int overwrite = openDialogInUIThread( overwriteDialog ); @@ -370,7 +371,8 @@ public class ServerConfigurationEditorUt // Checking if there were errors during the execution of the LDIF if ( studioProgressMonitor.errorsReported() ) { - throw new Exception( Messages.getString("ServerConfigurationEditorUtils.ChangesCouldNotBeSavedToConnection") ); //$NON-NLS-1$ + throw new Exception( + Messages.getString( "ServerConfigurationEditorUtils.ChangesCouldNotBeSavedToConnection" ) ); //$NON-NLS-1$ } else {