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 ED95DEDF3 for ; Tue, 8 Jan 2013 16:10:03 +0000 (UTC) Received: (qmail 26445 invoked by uid 500); 8 Jan 2013 16:10:03 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 26410 invoked by uid 500); 8 Jan 2013 16:10:03 -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 26403 invoked by uid 99); 8 Jan 2013 16:10:03 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 08 Jan 2013 16:10:03 +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; Tue, 08 Jan 2013 16:09:53 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id A825D2388847; Tue, 8 Jan 2013 16:09:31 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1430352 [1/3] - in /directory/studio/trunk/plugins: aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/ aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/model/ aciitemeditor/src/main/java/org/apache/... Date: Tue, 08 Jan 2013 16:09:26 -0000 To: commits@directory.apache.org From: pamarcelot@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130108160931.A825D2388847@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: pamarcelot Date: Tue Jan 8 16:09:24 2013 New Revision: 1430352 URL: http://svn.apache.org/viewvc?rev=1430352&view=rev Log: Applied Apache Directory code formatter. Modified: directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/ACIITemConstants.java directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/model/ProtectedItemWrapperFactory.java directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/model/UserClassWrapperFactory.java directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/widgets/ACIItemUserPermissionsComposite.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/editor/AttributeValueObject.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/PartitionDetailsPage.java directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/jobs/EntryBasedConfigurationPartition.java directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/ApacheDSConfigurationPluginConstants.java directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v150/ExtendedOperationsPage.java directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v151/InterceptorsMasterDetailsBlock.java directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v151/dialogs/AttributeValueDialog.java directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v151/dialogs/AttributeValueObject.java directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v152/PartitionsMasterDetailsBlock.java directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v153/dialogs/AttributeValueObject.java directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v152/ServerXmlIOV152.java directory/studio/trunk/plugins/common.core/src/main/java/org/apache/directory/studio/common/core/jobs/CommonCoreConstants.java directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/ConnectionCoreConstants.java directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/ConnectionManager.java directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/ConnectionServerType.java directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/DetectedConnectionProperties.java directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/DnUtils.java directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/Utils.java directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/ConnectionIO.java directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/api/CursorStudioNamingEnumeration.java directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/jndi/JndiStudioNamingEnumeration.java directory/studio/trunk/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/ConnectionUIReferralHandler.java directory/studio/trunk/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/actions/CopyAction.java directory/studio/trunk/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/preferences/ConnectionsPreferencePage.java directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/AttributeDialog.java directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/ValueEditorsPreferencePage.java directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserContentProvider.java directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserSorter.java directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserUniversalListener.java directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/connection/BrowserParameterPage.java directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/EntryEditorWidgetFilter.java directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/valueeditors/ValueEditorManager.java directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/BrowserCoreConstants.java directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportDsmlRunnable.java directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ImportDsmlRunnable.java directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/MoveEntriesRunnable.java directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ReloadSchemaRunnable.java directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/IBrowserConnection.java directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/ISearch.java directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/Password.java directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/BrowserConnection.java directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/DummyConnection.java directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/Entry.java directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/schema/SchemaUtils.java directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/utils/UnixCrypt.java directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/utils/Utils.java directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/BrowserUIConstants.java directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/BrowserPasteAction.java directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/LocateDnInDitAction.java directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/EntryEditor.java directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/EntryEditorActionGroup.java directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/SearchResultEditorSorter.java directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/browser/BrowserView.java directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/BatchOperationApplyOnWizardPage.java directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportConnectionsWizardPage.java directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportDsmlWizard.java directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ImportConnectionsWizardPage.java directory/studio/trunk/plugins/ldapservers.apacheds.v155/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v155/ApacheDS155LdapServerAdapter.java directory/studio/trunk/plugins/ldapservers.apacheds.v200/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v200/ApacheDS200LdapServerAdapter.java directory/studio/trunk/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/LdapServerAdapterExtensionsManager.java directory/studio/trunk/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/LdapServersPluginConstants.java directory/studio/trunk/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/actions/CreateConnectionActionHelper.java directory/studio/trunk/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/model/AbstractLdapServerAdapterConfigurationPage.java directory/studio/trunk/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/model/LdapServerActionFilterAdapter.java directory/studio/trunk/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/model/LdapServerAdapterExtension.java directory/studio/trunk/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/model/LdapServerListener.java directory/studio/trunk/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/wizards/NewServerWizard.java directory/studio/trunk/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/wizards/NewServerWizardSelectionPage.java directory/studio/trunk/plugins/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/LdifEditorConstants.java directory/studio/trunk/plugins/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/ExecuteLdifAction.java directory/studio/trunk/plugins/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/actions/AbstractOpenValueEditorAction.java directory/studio/trunk/plugins/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/text/LdifCompletionProcessor.java directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/lines/LdifDnLine.java directory/studio/trunk/plugins/rcp/src/main/java/org/apache/directory/studio/ApplicationActionBarAdvisor.java directory/studio/trunk/plugins/rcp/src/main/java/org/apache/directory/studio/PluginConstants.java directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/HierarchyViewController.java directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/LinkWithEditorHierarchyViewAction.java directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/LinkWithEditorSchemaViewAction.java directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/OpenElementAction.java directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/RenameSchemaElementAction.java directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/ApacheDsSchemaConnector.java directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/GenericSchemaConnector.java directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATESyntaxComboLabelProvider.java directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditor.java directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/schema/SchemaEditorOverviewPage.java directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/schema/SchemaEditorSourceCodePage.java directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/search/SearchPage.java directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/widget/CoreSchemasSelectionWidget.java directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ExportSchemasForADSWizard.java directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewObjectClassWizard.java directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wrappers/SchemaWarningWrapper.java directory/studio/trunk/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/ValueEditorsConstants.java directory/studio/trunk/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/msad/InPlaceMsAdObjectSidValueEditor.java directory/studio/trunk/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/password/PasswordDialog.java directory/studio/trunk/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/time/GeneralizedTimeValueDialog.java directory/studio/trunk/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/uuid/InPlaceUuidValueEditor.java directory/studio/trunk/plugins/valueeditors/src/test/java/org/apache/directory/studio/valueeditors/msad/InPlaceMsAdObjectGuidValueEditorTest.java directory/studio/trunk/plugins/valueeditors/src/test/java/org/apache/directory/studio/valueeditors/msad/InPlaceMsAdObjectSidValueEditorTest.java directory/studio/trunk/plugins/valueeditors/src/test/java/org/apache/directory/studio/valueeditors/uuid/InPlaceUuidValueEditorTest.java Modified: directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/ACIITemConstants.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/ACIITemConstants.java?rev=1430352&r1=1430351&r2=1430352&view=diff ============================================================================== --- directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/ACIITemConstants.java (original) +++ directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/ACIITemConstants.java Tue Jan 8 16:09:24 2013 @@ -31,6 +31,6 @@ public interface ACIITemConstants public static final String PLUGIN_ID = Activator.getDefault().getPluginProperties().getString( "Plugin_id" ); //$NON-NLS-1$ /** The ID for ACI Item Template */ - public static final String ACI_ITEM_TEMPLATE_ID = Activator.getDefault().getPluginProperties().getString( - "CtxType_AciItem_Template_id" ); //$NON-NLS-1$ + public static final String ACI_ITEM_TEMPLATE_ID = Activator.getDefault().getPluginProperties() + .getString( "CtxType_AciItem_Template_id" ); //$NON-NLS-1$ } Modified: directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/model/ProtectedItemWrapperFactory.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/model/ProtectedItemWrapperFactory.java?rev=1430352&r1=1430351&r2=1430352&view=diff ============================================================================== --- directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/model/ProtectedItemWrapperFactory.java (original) +++ directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/model/ProtectedItemWrapperFactory.java Tue Jan 8 16:09:24 2013 @@ -59,7 +59,7 @@ public class ProtectedItemWrapperFactory { ProtectedItemWrapper[] protectedItemWrappers = new ProtectedItemWrapper[] { - // entry + // entry new ProtectedItemWrapper( EntryItem.class, false, "", //$NON-NLS-1$ "", //$NON-NLS-1$ null ), @@ -120,7 +120,7 @@ public class ProtectedItemWrapperFactory new TextValueEditor() // TODO: RefinementValueEditor ), - }; + }; return protectedItemWrappers; } Modified: directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/model/UserClassWrapperFactory.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/model/UserClassWrapperFactory.java?rev=1430352&r1=1430351&r2=1430352&view=diff ============================================================================== --- directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/model/UserClassWrapperFactory.java (original) +++ directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/model/UserClassWrapperFactory.java Tue Jan 8 16:09:24 2013 @@ -43,7 +43,7 @@ public class UserClassWrapperFactory { UserClassWrapper[] userClassWrappers = new UserClassWrapper[] { - // allUsers + // allUsers new UserClassWrapper( UserClass.AllUsers.class, "", //$NON-NLS-1$ "", //$NON-NLS-1$ null ), Modified: directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/widgets/ACIItemUserPermissionsComposite.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/widgets/ACIItemUserPermissionsComposite.java?rev=1430352&r1=1430351&r2=1430352&view=diff ============================================================================== --- directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/widgets/ACIItemUserPermissionsComposite.java (original) +++ directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/widgets/ACIItemUserPermissionsComposite.java Tue Jan 8 16:09:24 2013 @@ -125,7 +125,7 @@ public class ACIItemUserPermissionsCompo else { StringBuffer buffer = new StringBuffer(); - if ( ( userPermission.getPrecedence() != null ) && ( userPermission.getPrecedence() > -1 )) + if ( ( userPermission.getPrecedence() != null ) && ( userPermission.getPrecedence() > -1 ) ) { buffer.append( '(' ); buffer.append( userPermission.getPrecedence() ); 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=1430352&r1=1430351&r2=1430352&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 Tue Jan 8 16:09:24 2013 @@ -82,7 +82,7 @@ public class EditorExportConfigurationAc try { ServerConfigurationEditorUtils.saveAs( new NullProgressMonitor(), editor.getSite() - .getShell(), editor.getEditorInput(), editor.getConfigWriter() ); + .getShell(), editor.getEditorInput(), editor.getConfigWriter() ); } catch ( Exception e ) { Modified: directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/AttributeValueObject.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/AttributeValueObject.java?rev=1430352&r1=1430351&r2=1430352&view=diff ============================================================================== --- directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/AttributeValueObject.java (original) +++ directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/AttributeValueObject.java Tue Jan 8 16:09:24 2013 @@ -96,6 +96,7 @@ public class AttributeValueObject this.value = value; } + /** * {@inheritDoc} */ 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=1430352&r1=1430351&r2=1430352&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 Tue Jan 8 16:09:24 2013 @@ -331,8 +331,7 @@ public class KerberosServerPage extends toolkit.createLabel( composite, "Primary KDC Realm:" ); primaryKdcRealmText = toolkit.createText( composite, "" ); //$NON-NLS-1$ setGridDataWithDefaultWidth( primaryKdcRealmText, new GridData( SWT.FILL, SWT.NONE, true, false ) ); - Label defaultSaslPrincipalLabel = createDefaultValueLabel( toolkit, composite, - "EXAMPLE.COM" ); //$NON-NLS-1$ + Label defaultSaslPrincipalLabel = createDefaultValueLabel( toolkit, composite, "EXAMPLE.COM" ); //$NON-NLS-1$ defaultSaslPrincipalLabel.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false, 2, 1 ) ); // Search Base Dn Text 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=1430352&r1=1430351&r2=1430352&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 Tue Jan 8 16:09:24 2013 @@ -850,7 +850,6 @@ public class PartitionDetailsPage implem } - /** * Auto generates the context entry. */ @@ -871,6 +870,7 @@ public class PartitionDetailsPage implem } } + /** * Resizes the columns to fit the size of the cells. */ Modified: directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/jobs/EntryBasedConfigurationPartition.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/jobs/EntryBasedConfigurationPartition.java?rev=1430352&r1=1430351&r2=1430352&view=diff ============================================================================== --- directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/jobs/EntryBasedConfigurationPartition.java (original) +++ directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/jobs/EntryBasedConfigurationPartition.java Tue Jan 8 16:09:24 2013 @@ -61,7 +61,7 @@ public class EntryBasedConfigurationPart { setId( "config" ); //$NON-NLS-1$ setSuffixDn( new Dn( "ou=config" ) ); //$NON-NLS-1$ - + super.doInit(); } Modified: directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/ApacheDSConfigurationPluginConstants.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/ApacheDSConfigurationPluginConstants.java?rev=1430352&r1=1430351&r2=1430352&view=diff ============================================================================== --- directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/ApacheDSConfigurationPluginConstants.java (original) +++ directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/ApacheDSConfigurationPluginConstants.java Tue Jan 8 16:09:24 2013 @@ -38,8 +38,8 @@ public final class ApacheDSConfiguration } /** The plug-in ID */ - public static final String PLUGIN_ID = ApacheDSConfigurationPlugin.getDefault().getPluginProperties().getString( - "Plugin_id" ); //$NON-NLS-1$ + public static final String PLUGIN_ID = ApacheDSConfigurationPlugin.getDefault().getPluginProperties() + .getString( "Plugin_id" ); //$NON-NLS-1$ // ------ // IMAGES Modified: directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v150/ExtendedOperationsPage.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v150/ExtendedOperationsPage.java?rev=1430352&r1=1430351&r2=1430352&view=diff ============================================================================== --- directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v150/ExtendedOperationsPage.java (original) +++ directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v150/ExtendedOperationsPage.java Tue Jan 8 16:09:24 2013 @@ -58,6 +58,7 @@ public class ExtendedOperationsPage exte super( editor, ID, TITLE ); } + /** * {@inheritDoc} */ Modified: directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v151/InterceptorsMasterDetailsBlock.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v151/InterceptorsMasterDetailsBlock.java?rev=1430352&r1=1430351&r2=1430352&view=diff ============================================================================== --- directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v151/InterceptorsMasterDetailsBlock.java (original) +++ directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v151/InterceptorsMasterDetailsBlock.java Tue Jan 8 16:09:24 2013 @@ -326,6 +326,7 @@ public class InterceptorsMasterDetailsBl } } + /** * {@inheritDoc} */ @@ -363,6 +364,7 @@ public class InterceptorsMasterDetailsBl form.getToolBarManager().add( verticalAction ); } + /** * {@inheritDoc} */ Modified: directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v151/dialogs/AttributeValueDialog.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v151/dialogs/AttributeValueDialog.java?rev=1430352&r1=1430351&r2=1430352&view=diff ============================================================================== --- directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v151/dialogs/AttributeValueDialog.java (original) +++ directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v151/dialogs/AttributeValueDialog.java Tue Jan 8 16:09:24 2013 @@ -61,6 +61,7 @@ public class AttributeValueDialog extend this.attributeValueObject = attributeValueObject; } + /** * {@inheritDoc} */ @@ -70,6 +71,7 @@ public class AttributeValueDialog extend newShell.setText( "Attribute Value Dialog" ); } + /** * {@inheritDoc} */ @@ -134,6 +136,7 @@ public class AttributeValueDialog extend } ); } + /** * {@inheritDoc} */ Modified: directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v151/dialogs/AttributeValueObject.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v151/dialogs/AttributeValueObject.java?rev=1430352&r1=1430351&r2=1430352&view=diff ============================================================================== --- directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v151/dialogs/AttributeValueObject.java (original) +++ directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v151/dialogs/AttributeValueObject.java Tue Jan 8 16:09:24 2013 @@ -96,6 +96,7 @@ public class AttributeValueObject this.value = value; } + /** * {@inheritDoc} */ Modified: directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v152/PartitionsMasterDetailsBlock.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v152/PartitionsMasterDetailsBlock.java?rev=1430352&r1=1430351&r2=1430352&view=diff ============================================================================== --- directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v152/PartitionsMasterDetailsBlock.java (original) +++ directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v152/PartitionsMasterDetailsBlock.java Tue Jan 8 16:09:24 2013 @@ -96,6 +96,7 @@ public class PartitionsMasterDetailsBloc partitions = serverConfiguration.getPartitions(); } + /** * {@inheritDoc} */ @@ -275,6 +276,8 @@ public class PartitionsMasterDetailsBloc return name; } + + /** * {@inheritDoc} */ @@ -312,6 +315,7 @@ public class PartitionsMasterDetailsBloc form.getToolBarManager().add( verticalAction ); } + /** * {@inheritDoc} */ Modified: directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v153/dialogs/AttributeValueObject.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v153/dialogs/AttributeValueObject.java?rev=1430352&r1=1430351&r2=1430352&view=diff ============================================================================== --- directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v153/dialogs/AttributeValueObject.java (original) +++ directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v153/dialogs/AttributeValueObject.java Tue Jan 8 16:09:24 2013 @@ -96,6 +96,7 @@ public class AttributeValueObject this.value = value; } + /** * {@inheritDoc} */ Modified: directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v152/ServerXmlIOV152.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v152/ServerXmlIOV152.java?rev=1430352&r1=1430351&r2=1430352&view=diff ============================================================================== --- directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v152/ServerXmlIOV152.java (original) +++ directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v152/ServerXmlIOV152.java Tue Jan 8 16:09:24 2013 @@ -1113,7 +1113,8 @@ public class ServerXmlIOV152 extends Abs { // If the 'allowAnonymousAccess' attribute does not exists, // we throw an exception - throw new ServerXmlIOException( Messages.getString( "ServerXmlIOV152.ErrorAllowAnonymousAccess" ) ); //$NON-NLS-1$ + throw new ServerXmlIOException( + Messages.getString( "ServerXmlIOV152.ErrorAllowAnonymousAccess" ) ); //$NON-NLS-1$ } else { Modified: directory/studio/trunk/plugins/common.core/src/main/java/org/apache/directory/studio/common/core/jobs/CommonCoreConstants.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/common.core/src/main/java/org/apache/directory/studio/common/core/jobs/CommonCoreConstants.java?rev=1430352&r1=1430351&r2=1430352&view=diff ============================================================================== --- directory/studio/trunk/plugins/common.core/src/main/java/org/apache/directory/studio/common/core/jobs/CommonCoreConstants.java (original) +++ directory/studio/trunk/plugins/common.core/src/main/java/org/apache/directory/studio/common/core/jobs/CommonCoreConstants.java Tue Jan 8 16:09:24 2013 @@ -40,7 +40,7 @@ public final class CommonCoreConstants /** The plug-in ID */ public static final String PLUGIN_ID = "org.apache.directory.studio.common.core"; //$NON-NLS-1$ - + /** The Job family ID */ public static final String JOB_FAMILY_ID = "org.apache.directory.studio.common.core.jobs.family"; //$NON-NLS-1$ } Modified: directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/ConnectionCoreConstants.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/ConnectionCoreConstants.java?rev=1430352&r1=1430351&r2=1430352&view=diff ============================================================================== --- directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/ConnectionCoreConstants.java (original) +++ directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/ConnectionCoreConstants.java Tue Jan 8 16:09:24 2013 @@ -19,6 +19,7 @@ */ package org.apache.directory.studio.connection.core; + import java.util.TimeZone; @@ -40,8 +41,8 @@ public final class ConnectionCoreConstan } /** The plug-in ID */ - public static final String PLUGIN_ID = ConnectionCorePlugin.getDefault().getPluginProperties().getString( - "Plugin_id" ); //$NON-NLS-1$ + public static final String PLUGIN_ID = ConnectionCorePlugin.getDefault().getPluginProperties() + .getString( "Plugin_id" ); //$NON-NLS-1$ /** The line separator. */ public static final String LINE_SEPARATOR = System.getProperty( "line.separator" ); //$NON-NLS-1$ Modified: directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/ConnectionManager.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/ConnectionManager.java?rev=1430352&r1=1430351&r2=1430352&view=diff ============================================================================== --- directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/ConnectionManager.java (original) +++ directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/ConnectionManager.java Tue Jan 8 16:09:24 2013 @@ -93,8 +93,8 @@ public class ConnectionManager implement } IExtensionPoint extensionPoint = Platform.getExtensionRegistry().getExtensionPoint( - ConnectionCorePlugin.getDefault().getPluginProperties().getString( - "ExtensionPoint_ConnectionInitializer_id" ) ); //$NON-NLS-1$ + ConnectionCorePlugin.getDefault().getPluginProperties() + .getString( "ExtensionPoint_ConnectionInitializer_id" ) ); //$NON-NLS-1$ IConfigurationElement[] configurationElements = extensionPoint.getConfigurationElements(); for ( IConfigurationElement configurationElement : configurationElements ) Modified: directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/ConnectionServerType.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/ConnectionServerType.java?rev=1430352&r1=1430351&r2=1430352&view=diff ============================================================================== --- directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/ConnectionServerType.java (original) +++ directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/ConnectionServerType.java Tue Jan 8 16:09:24 2013 @@ -27,21 +27,21 @@ package org.apache.directory.studio.conn */ public enum ConnectionServerType { - APACHEDS, - IBM_DIRECTORY_SERVER, - IBM_SECUREWAY_DIRECTORY, - IBM_TIVOLI_DIRECTORY_SERVER, - MICROSOFT_ACTIVE_DIRECTORY_2000, - MICROSOFT_ACTIVE_DIRECTORY_2003, - NETSCAPE, - NOVELL, - OPENLDAP, - OPENLDAP_2_0, - OPENLDAP_2_1, - OPENLDAP_2_2, - OPENLDAP_2_3, - OPENLDAP_2_4, - SIEMENS_DIRX, - SUN_DIRECTORY_SERVER, - UNKNOWN; + APACHEDS, + IBM_DIRECTORY_SERVER, + IBM_SECUREWAY_DIRECTORY, + IBM_TIVOLI_DIRECTORY_SERVER, + MICROSOFT_ACTIVE_DIRECTORY_2000, + MICROSOFT_ACTIVE_DIRECTORY_2003, + NETSCAPE, + NOVELL, + OPENLDAP, + OPENLDAP_2_0, + OPENLDAP_2_1, + OPENLDAP_2_2, + OPENLDAP_2_3, + OPENLDAP_2_4, + SIEMENS_DIRX, + SUN_DIRECTORY_SERVER, + UNKNOWN; } \ No newline at end of file Modified: directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/DetectedConnectionProperties.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/DetectedConnectionProperties.java?rev=1430352&r1=1430351&r2=1430352&view=diff ============================================================================== --- directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/DetectedConnectionProperties.java (original) +++ directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/DetectedConnectionProperties.java Tue Jan 8 16:09:24 2013 @@ -80,8 +80,9 @@ public class DetectedConnectionPropertie { try { - String serverType = connection.getConnectionParameter().getExtendedProperty( CONNECTION_PARAMETER_SERVER_TYPE ); - + String serverType = connection.getConnectionParameter().getExtendedProperty( + CONNECTION_PARAMETER_SERVER_TYPE ); + if ( serverType != null ) { return ConnectionServerType.valueOf( serverType ); Modified: directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/DnUtils.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/DnUtils.java?rev=1430352&r1=1430351&r2=1430352&view=diff ============================================================================== --- directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/DnUtils.java (original) +++ directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/DnUtils.java Tue Jan 8 16:09:24 2013 @@ -42,7 +42,7 @@ public class DnUtils * * @return the prefix */ - public static Dn getPrefixName( Dn dn, Dn suffix ) + public static Dn getPrefixName( Dn dn, Dn suffix ) { if ( suffix.size() < 1 ) { @@ -53,7 +53,7 @@ public class DnUtils try { Dn prefix = dn.getDescendantOf( suffix ); - + return prefix; } catch ( LdapInvalidDnException lide ) @@ -86,13 +86,13 @@ public class DnUtils sb.append( rdnTypes[i] ); sb.append( '=' ); - sb.append( Rdn.escapeValue(rdnValues[i]) ); + sb.append( Rdn.escapeValue( rdnValues[i] ) ); } String s = sb.toString(); try { - if ( Dn.isValid(s) ) + if ( Dn.isValid( s ) ) { Rdn rdn = new Rdn( sb.toString() ); return rdn; Modified: directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/Utils.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/Utils.java?rev=1430352&r1=1430351&r2=1430352&view=diff ============================================================================== --- directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/Utils.java (original) +++ directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/Utils.java Tue Jan 8 16:09:24 2013 @@ -255,7 +255,8 @@ public class Utils */ public static String getSimpleNormalizedUrl( LdapUrl url ) { - return url.getScheme() + ( url.getHost() != null ? Strings.toLowerCase( url.getHost() ) : "" ) + ":" + url.getPort(); //$NON-NLS-1$ //$NON-NLS-2$ + return url.getScheme() + + ( url.getHost() != null ? Strings.toLowerCase( url.getHost() ) : "" ) + ":" + url.getPort(); //$NON-NLS-1$ //$NON-NLS-2$ } Modified: directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/ConnectionIO.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/ConnectionIO.java?rev=1430352&r1=1430351&r2=1430352&view=diff ============================================================================== --- directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/ConnectionIO.java (original) +++ directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/ConnectionIO.java Tue Jan 8 16:09:24 2013 @@ -286,7 +286,8 @@ public class ConnectionIO { try { - connection.setSaslSecurityStrength( SaslSecurityStrength.valueOf( saslSecStrengthAttribute.getValue() ) ); + connection + .setSaslSecurityStrength( SaslSecurityStrength.valueOf( saslSecStrengthAttribute.getValue() ) ); } catch ( IllegalArgumentException e ) { @@ -367,8 +368,9 @@ public class ConnectionIO } catch ( NumberFormatException e ) { - throw new ConnectionIOException( "Unable to parse 'KRB5 KDC Port' of connection '" + connection.getName() //$NON-NLS-1$ - + "' as int value. KRB5 KDC Port value :" + krb5KdcPort.getValue() ); //$NON-NLS-1$ + throw new ConnectionIOException( + "Unable to parse 'KRB5 KDC Port' of connection '" + connection.getName() //$NON-NLS-1$ + + "' as int value. KRB5 KDC Port value :" + krb5KdcPort.getValue() ); //$NON-NLS-1$ } } Modified: directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/api/CursorStudioNamingEnumeration.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/api/CursorStudioNamingEnumeration.java?rev=1430352&r1=1430351&r2=1430352&view=diff ============================================================================== --- directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/api/CursorStudioNamingEnumeration.java (original) +++ directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/api/CursorStudioNamingEnumeration.java Tue Jan 8 16:09:24 2013 @@ -74,7 +74,7 @@ public class CursorStudioNamingEnumerati // @TODO: By Alex: temporary fix until things are in order (needs to be fixed) private LdapApiService codec = LdapApiServiceFactory.getSingleton(); - + /** * Creates a new instance of ReferralNamingEnumeration. @@ -157,7 +157,7 @@ public class CursorStudioNamingEnumerati if ( referralsHandlingMethod != ReferralHandlingMethod.IGNORE ) { // Storing the referral for later use - referralsList.add( ( (SearchResultReference) currentResponse ).getReferral() ); + referralsList.add( ( ( SearchResultReference ) currentResponse ).getReferral() ); } } } @@ -269,7 +269,7 @@ public class CursorStudioNamingEnumerati { resultEntryCounter++; SearchResult sr = new SearchResult( currentSearchResultEntry.getObjectName().toString(), null, - AttributeUtils.toAttributes(currentSearchResultEntry.getEntry()) ); + AttributeUtils.toAttributes( currentSearchResultEntry.getEntry() ) ); sr.setNameInNamespace( currentSearchResultEntry.getObjectName().toString() ); // Converting the SearchResult to a StudioSearchResult @@ -376,7 +376,7 @@ public class CursorStudioNamingEnumerati if ( control instanceof CodecControl ) { - wrapped = (org.apache.directory.api.ldap.codec.api.CodecControl ) control; + wrapped = ( org.apache.directory.api.ldap.codec.api.CodecControl ) control; } else { Modified: directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/jndi/JndiStudioNamingEnumeration.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/jndi/JndiStudioNamingEnumeration.java?rev=1430352&r1=1430351&r2=1430352&view=diff ============================================================================== --- directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/jndi/JndiStudioNamingEnumeration.java (original) +++ directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/jndi/JndiStudioNamingEnumeration.java Tue Jan 8 16:09:24 2013 @@ -285,59 +285,59 @@ public class JndiStudioNamingEnumeration List urls = new ArrayList(); { while ( referralsInfo.hasMoreReferrals() ) - { - Referral referral = referralsInfo.getNextReferral(); - for ( IJndiLogger logger : ConnectionCorePlugin.getDefault().getJndiLoggers() ) { - logger.logSearchResultReference( connection, referral, referralsInfo, requestNum, null ); + Referral referral = referralsInfo.getNextReferral(); + for ( IJndiLogger logger : ConnectionCorePlugin.getDefault().getJndiLoggers() ) + { + logger.logSearchResultReference( connection, referral, referralsInfo, requestNum, null ); + } + urls.addAll( referral.getLdapUrls() ); } - urls.addAll( referral.getLdapUrls() ); } - } public SearchResult nextElement() - { - throw new UnsupportedOperationException( "Call next() instead of nextElement() !" ); //$NON-NLS-1$ - } + { + throw new UnsupportedOperationException( "Call next() instead of nextElement() !" ); //$NON-NLS-1$ + } public boolean hasMoreElements() - { - throw new UnsupportedOperationException( "Call hasMore() instead of hasMoreElements() !" ); //$NON-NLS-1$ - } + { + throw new UnsupportedOperationException( "Call hasMore() instead of hasMoreElements() !" ); //$NON-NLS-1$ + } public SearchResult next() throws NamingException - { - try - { - LdapUrl url = new LdapUrl( urls.remove( 0 ) ); - SearchResult searchResult = new SearchResult( url.getDn().getName(), null, - new BasicAttributes(), - false ); - searchResult.setNameInNamespace( url.getDn().getName() ); - StudioSearchResult ssr = new StudioSearchResult( searchResult, null, false, url ); - return ssr; - } - catch ( LdapURLEncodingException e ) { - throw new NamingException( e.getMessage() ); + try + { + LdapUrl url = new LdapUrl( urls.remove( 0 ) ); + SearchResult searchResult = new SearchResult( url.getDn().getName(), null, + new BasicAttributes(), + false ); + searchResult.setNameInNamespace( url.getDn().getName() ); + StudioSearchResult ssr = new StudioSearchResult( searchResult, null, false, url ); + return ssr; + } + catch ( LdapURLEncodingException e ) + { + throw new NamingException( e.getMessage() ); + } } - } public boolean hasMore() throws NamingException - { - return !urls.isEmpty(); - } + { + return !urls.isEmpty(); + } public void close() throws NamingException - { - urls.clear(); - referralsInfo = null; - } + { + urls.clear(); + referralsInfo = null; + } }; } else if ( referralsHandlingMethod == ReferralHandlingMethod.FOLLOW ) Modified: directory/studio/trunk/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/ConnectionUIReferralHandler.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/ConnectionUIReferralHandler.java?rev=1430352&r1=1430351&r2=1430352&view=diff ============================================================================== --- directory/studio/trunk/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/ConnectionUIReferralHandler.java (original) +++ directory/studio/trunk/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/ConnectionUIReferralHandler.java Tue Jan 8 16:09:24 2013 @@ -99,15 +99,16 @@ public class ConnectionUIReferralHandler PlatformUI.getWorkbench().getDisplay().syncExec( new Runnable() { public void run() - { - SelectReferralConnectionDialog dialog = new SelectReferralConnectionDialog( PlatformUI.getWorkbench() - .getDisplay().getActiveShell(), referralUrls ); - if ( dialog.open() == SelectReferralConnectionDialog.OK ) { - Connection connection = dialog.getReferralConnection(); - referralConnections[0] = connection; + SelectReferralConnectionDialog dialog = new SelectReferralConnectionDialog( PlatformUI + .getWorkbench() + .getDisplay().getActiveShell(), referralUrls ); + if ( dialog.open() == SelectReferralConnectionDialog.OK ) + { + Connection connection = dialog.getReferralConnection(); + referralConnections[0] = connection; + } } - } } ); // put to cache Modified: directory/studio/trunk/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/actions/CopyAction.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/actions/CopyAction.java?rev=1430352&r1=1430351&r2=1430352&view=diff ============================================================================== --- directory/studio/trunk/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/actions/CopyAction.java (original) +++ directory/studio/trunk/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/actions/CopyAction.java Tue Jan 8 16:09:24 2013 @@ -195,7 +195,7 @@ public class CopyAction extends StudioAc { ConnectionParameter parameter = connection.getConnectionParameter(); LdapUrl ldapUrl = new LdapUrl(); - ldapUrl.setDn( Dn.EMPTY_DN); + ldapUrl.setDn( Dn.EMPTY_DN ); for ( ConnectionParameterPage connectionParameterPage : connectionParameterPages ) { connectionParameterPage.mergeParametersToLdapURL( parameter, ldapUrl ); Modified: directory/studio/trunk/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/preferences/ConnectionsPreferencePage.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/preferences/ConnectionsPreferencePage.java?rev=1430352&r1=1430351&r2=1430352&view=diff ============================================================================== --- directory/studio/trunk/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/preferences/ConnectionsPreferencePage.java (original) +++ directory/studio/trunk/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/preferences/ConnectionsPreferencePage.java Tue Jan 8 16:09:24 2013 @@ -162,7 +162,7 @@ public class ConnectionsPreferencePage e .getDefaultInt( ConnectionCoreConstants.PREFERENCE_DEFAULT_NETWORK_PROVIDER ) ); networkProviderCombo.select( defaultdDefaultNetworkProvider == NetworkProvider.APACHE_DIRECTORY_LDAP_API ? 0 : 1 ); - + ldapContextFactoryText.setText( ConnectionCorePlugin.getDefault().getPluginPreferences().getDefaultString( ConnectionCoreConstants.PREFERENCE_LDAP_CONTEXT_FACTORY ) ); krb5LoginModuleText.setText( ConnectionCorePlugin.getDefault().getPluginPreferences().getDefaultString( @@ -189,7 +189,7 @@ public class ConnectionsPreferencePage e ConnectionCorePlugin.getDefault().getPluginPreferences() .setValue( ConnectionCoreConstants.PREFERENCE_USE_KRB5_SYSTEM_PROPERTIES, useKrb5SystemPropertiesButton.getSelection() ); - + ConnectionCorePlugin.getDefault().savePluginPreferences(); return true; Modified: directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/AttributeDialog.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/AttributeDialog.java?rev=1430352&r1=1430351&r2=1430352&view=diff ============================================================================== --- directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/AttributeDialog.java (original) +++ directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/AttributeDialog.java Tue Jan 8 16:09:24 2013 @@ -81,7 +81,8 @@ public class AttributeDialog extends Dia super.configureShell( newShell ); newShell.setText( Messages.getString( "AttributeDialog.SelectAttributeTypeOrOID" ) ); //$NON-NLS-1$ } - + + /** * {@inheritDoc} */ @@ -89,7 +90,7 @@ public class AttributeDialog extends Dia { okButton = createButton( parent, IDialogConstants.OK_ID, IDialogConstants.OK_LABEL, true ); createButton( parent, IDialogConstants.CANCEL_ID, IDialogConstants.CANCEL_LABEL, false ); - + validate(); } Modified: directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/ValueEditorsPreferencePage.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/ValueEditorsPreferencePage.java?rev=1430352&r1=1430351&r2=1430352&view=diff ============================================================================== --- directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/ValueEditorsPreferencePage.java (original) +++ directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/ValueEditorsPreferencePage.java Tue Jan 8 16:09:24 2013 @@ -318,7 +318,7 @@ public class ValueEditorsPreferencePage editAttribute(); } } ); - + attributeViewer.addSelectionChangedListener( new ISelectionChangedListener() { public void selectionChanged( SelectionChangedEvent event ) Modified: directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserContentProvider.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserContentProvider.java?rev=1430352&r1=1430351&r2=1430352&view=diff ============================================================================== --- directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserContentProvider.java (original) +++ directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserContentProvider.java Tue Jan 8 16:09:24 2013 @@ -415,9 +415,9 @@ public class BrowserContentProvider impl { objects.add( widget.getQuickSearch() ); } - + objects.addAll( Arrays.asList( entryPages ) ); - + return objects.toArray(); } } Modified: directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserSorter.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserSorter.java?rev=1430352&r1=1430351&r2=1430352&view=diff ============================================================================== --- directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserSorter.java (original) +++ directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserSorter.java Tue Jan 8 16:09:24 2013 @@ -228,7 +228,7 @@ public class BrowserSorter extends Viewe { return greaterThanEntries(); } - + // special case for quick search else if ( o1 instanceof IQuickSearch || o2 instanceof IQuickSearch ) { @@ -245,7 +245,7 @@ public class BrowserSorter extends Viewe return equal(); } } - + // o1 and o2 are entries else if ( o1 instanceof IEntry || o2 instanceof IEntry ) { Modified: directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserUniversalListener.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserUniversalListener.java?rev=1430352&r1=1430351&r2=1430352&view=diff ============================================================================== --- directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserUniversalListener.java (original) +++ directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserUniversalListener.java Tue Jan 8 16:09:24 2013 @@ -274,7 +274,7 @@ public class BrowserUniversalListener im public void searchUpdated( SearchUpdateEvent searchUpdateEvent ) { ISearch search = searchUpdateEvent.getSearch(); - + if ( ( search instanceof IQuickSearch ) && ( searchUpdateEvent.getDetail() == EventDetail.SEARCH_REMOVED ) ) { if ( widget.getQuickSearch() == search ) @@ -282,7 +282,7 @@ public class BrowserUniversalListener im widget.setQuickSearch( null ); } } - + viewer.refresh(); if ( ( search instanceof IQuickSearch ) && ( searchUpdateEvent.getDetail() != EventDetail.SEARCH_REMOVED ) ) Modified: directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/connection/BrowserParameterPage.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/connection/BrowserParameterPage.java?rev=1430352&r1=1430351&r2=1430352&view=diff ============================================================================== --- directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/connection/BrowserParameterPage.java (original) +++ directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/connection/BrowserParameterPage.java Tue Jan 8 16:09:24 2013 @@ -448,7 +448,7 @@ public class BrowserParameterPage extend errorMessage = null; if ( !isAutoFetchBaseDns() ) { - if ( !Dn.isValid(getBaseDN()) ) + if ( !Dn.isValid( getBaseDN() ) ) { message = Messages.getString( "BrowserParameterPage.EnterValidBaseDN" ); //$NON-NLS-1$ } Modified: directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/EntryEditorWidgetFilter.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/EntryEditorWidgetFilter.java?rev=1430352&r1=1430351&r2=1430352&view=diff ============================================================================== --- directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/EntryEditorWidgetFilter.java (original) +++ directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/EntryEditorWidgetFilter.java Tue Jan 8 16:09:24 2013 @@ -177,8 +177,8 @@ public class EntryEditorWidgetFilter ext { String oldValue = this.quickFilterAttribute; this.quickFilterAttribute = quickFilterAttribute; - BrowserCommonActivator.getDefault().getPreferenceStore().firePropertyChangeEvent( - "QuickFilterAttributeChanged", oldValue, quickFilterAttribute ); //$NON-NLS-1$ + BrowserCommonActivator.getDefault().getPreferenceStore() + .firePropertyChangeEvent( "QuickFilterAttributeChanged", oldValue, quickFilterAttribute ); //$NON-NLS-1$ } } @@ -205,8 +205,8 @@ public class EntryEditorWidgetFilter ext { String oldValue = this.quickFilterValue; this.quickFilterValue = quickFilterValue; - BrowserCommonActivator.getDefault().getPreferenceStore().firePropertyChangeEvent( - "QuickFilterValueChanged", oldValue, quickFilterAttribute ); //$NON-NLS-1$ + BrowserCommonActivator.getDefault().getPreferenceStore() + .firePropertyChangeEvent( "QuickFilterValueChanged", oldValue, quickFilterAttribute ); //$NON-NLS-1$ } } Modified: directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/valueeditors/ValueEditorManager.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/valueeditors/ValueEditorManager.java?rev=1430352&r1=1430351&r2=1430352&view=diff ============================================================================== --- directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/valueeditors/ValueEditorManager.java (original) +++ directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/valueeditors/ValueEditorManager.java Tue Jan 8 16:09:24 2013 @@ -248,15 +248,17 @@ public class ValueEditorManager .getAttributeValueEditorMap(); if ( atd.getOid() != null && attributeValueEditorMap.containsKey( Strings.toLowerCase( atd.getOid() ) ) ) { - return ( IValueEditor ) class2ValueEditors.get( attributeValueEditorMap.get( Strings.toLowerCase( atd.getOid() - ) ) ); + return ( IValueEditor ) class2ValueEditors.get( attributeValueEditorMap.get( Strings.toLowerCase( atd + .getOid() + ) ) ); } List names = atd.getNames(); for ( String name : names ) { if ( attributeValueEditorMap.containsKey( Strings.toLowerCase( name ) ) ) { - return ( IValueEditor ) class2ValueEditors.get( attributeValueEditorMap.get( Strings.toLowerCase( name ) ) ); + return ( IValueEditor ) class2ValueEditors + .get( attributeValueEditorMap.get( Strings.toLowerCase( name ) ) ); } } @@ -266,7 +268,8 @@ public class ValueEditorManager .getSyntaxValueEditorMap(); if ( syntaxNumericOid != null && syntaxValueEditorMap.containsKey( Strings.toLowerCase( syntaxNumericOid ) ) ) { - return ( IValueEditor ) class2ValueEditors.get( syntaxValueEditorMap.get( Strings.toLowerCase( syntaxNumericOid ) ) ); + return ( IValueEditor ) class2ValueEditors.get( syntaxValueEditorMap.get( Strings + .toLowerCase( syntaxNumericOid ) ) ); } // return default Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/BrowserCoreConstants.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/BrowserCoreConstants.java?rev=1430352&r1=1430351&r2=1430352&view=diff ============================================================================== --- directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/BrowserCoreConstants.java (original) +++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/BrowserCoreConstants.java Tue Jan 8 16:09:24 2013 @@ -84,7 +84,7 @@ public final class BrowserCoreConstants public static final String PREFERENCE_LDIF_LINE_SEPARATOR = "ldifLineSeparator"; //$NON-NLS-1$ public static final String PREFERENCE_LDIF_SPACE_AFTER_COLON = "ldifSpaceAfterColon"; //$NON-NLS-1$ - + public static final String PREFERENCE_LDIF_INCLUDE_VERSION_LINE = "ldifIncludeVersionLine"; //$NON-NLS-1$ public static final int BINARYENCODING_IGNORE = 0; @@ -109,6 +109,6 @@ public final class BrowserCoreConstants public static final int SORT_ORDER_DESCENDING = 2; - public static final String LDAP_SEARCH_PAGE_ID = BrowserCorePlugin.getDefault().getPluginProperties().getString( - "SearchPage_LdapSearch_id" ); //$NON-NLS-1$ + public static final String LDAP_SEARCH_PAGE_ID = BrowserCorePlugin.getDefault().getPluginProperties() + .getString( "SearchPage_LdapSearch_id" ); //$NON-NLS-1$ } Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportDsmlRunnable.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportDsmlRunnable.java?rev=1430352&r1=1430351&r2=1430352&view=diff ============================================================================== --- directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportDsmlRunnable.java (original) +++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportDsmlRunnable.java Tue Jan 8 16:09:24 2013 @@ -95,14 +95,13 @@ public class ExportDsmlRunnable implemen /** The type of the export */ private ExportDsmlJobType type = ExportDsmlJobType.RESPONSE; - + /** * The LDAP Codec - for now need by the DSML Parser * @TODO - this should be removed - no reason why the DSML parser needs it * @TODO - hate to make it static like this but methods are static */ private static LdapApiService codec = LdapApiServiceFactory.getSingleton(); - /** * This enum contains the two possible export types. @@ -296,7 +295,7 @@ public class ExportDsmlRunnable implemen count++; monitor.reportProgress( BrowserCoreMessages.bind( BrowserCoreMessages.jobs__export_progress, new String[] - { Integer.toString( count ) } ) ); + { Integer.toString( count ) } ) ); } } } @@ -347,11 +346,12 @@ public class ExportDsmlRunnable implemen * the associated search result entry DSML * @throws org.apache.directory.api.ldap.model.exception.LdapException */ - private static DsmlDecorator convertSearchResultToDsml( SearchResult searchResult, SearchParameter searchParameter ) + private static DsmlDecorator convertSearchResultToDsml( SearchResult searchResult, + SearchParameter searchParameter ) throws LdapException, LdapURLEncodingException { - Entry entry = AttributeUtils.toEntry(searchResult.getAttributes(), - new Dn(searchResult.getNameInNamespace())); + Entry entry = AttributeUtils.toEntry( searchResult.getAttributes(), + new Dn( searchResult.getNameInNamespace() ) ); if ( isReferral( entry ) ) { @@ -456,7 +456,7 @@ public class ExportDsmlRunnable implemen count++; monitor.reportProgress( BrowserCoreMessages.bind( BrowserCoreMessages.jobs__export_progress, new String[] - { Integer.toString( count ) } ) ); + { Integer.toString( count ) } ) ); } } } Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ImportDsmlRunnable.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ImportDsmlRunnable.java?rev=1430352&r1=1430351&r2=1430352&view=diff ============================================================================== --- directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ImportDsmlRunnable.java (original) +++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ImportDsmlRunnable.java Tue Jan 8 16:09:24 2013 @@ -100,7 +100,7 @@ public class ImportDsmlRunnable implemen /** The Save file to use */ private File responseFile; - + /** * LDAP Codec used by DSML parser * @TODO by Alex - this should be removed completely @@ -280,16 +280,17 @@ public class ImportDsmlRunnable implemen * @throws org.apache.directory.api.ldap.model.exception.LdapURLEncodingException * @throws LdapException */ - private void processRequest( DsmlDecorator request, BatchResponseDsml batchResponseDsml, StudioProgressMonitor monitor ) + private void processRequest( DsmlDecorator request, BatchResponseDsml batchResponseDsml, + StudioProgressMonitor monitor ) throws NamingException, LdapURLEncodingException, LdapException { - switch( request.getDecorated().getType() ) + switch ( request.getDecorated().getType() ) { case BIND_REQUEST: processBindRequest( ( BindRequest ) request, batchResponseDsml, monitor ); break; case ADD_REQUEST: - processAddRequest( (AddRequest) request, batchResponseDsml, monitor ); + processAddRequest( ( AddRequest ) request, batchResponseDsml, monitor ); break; case COMPARE_REQUEST: processCompareRequest( ( CompareRequest ) request, batchResponseDsml, monitor ); @@ -310,9 +311,9 @@ public class ImportDsmlRunnable implemen processSearchRequest( ( SearchRequest ) request, batchResponseDsml, monitor ); break; default: - throw new IllegalArgumentException( - "Should not be encountering a request type of: " - + request.getDecorated().getType() ); + throw new IllegalArgumentException( + "Should not be encountering a request type of: " + + request.getDecorated().getType() ); } } @@ -359,7 +360,7 @@ public class ImportDsmlRunnable implemen browserConnection .getConnection() .getConnectionWrapper() - .createEntry( entry.getDn().getName(), AttributeUtils.toAttributes(entry), getControls( request ), + .createEntry( entry.getDn().getName(), AttributeUtils.toAttributes( entry ), getControls( request ), monitor, null ); // Creating the response Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/MoveEntriesRunnable.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/MoveEntriesRunnable.java?rev=1430352&r1=1430351&r2=1430352&view=diff ============================================================================== --- directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/MoveEntriesRunnable.java (original) +++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/MoveEntriesRunnable.java Tue Jan 8 16:09:24 2013 @@ -162,9 +162,9 @@ public class MoveEntriesRunnable impleme IEntry oldEntry = oldEntries[i]; Dn oldDn = oldEntry.getDn(); - + Dn newDn = null; - + try { newDn = parentDn.add( oldDn.getRdn() ); @@ -195,7 +195,8 @@ public class MoveEntriesRunnable impleme // do simulated rename operation dummyMonitor.reset(); - numAdd = CopyEntriesRunnable.copyEntry( oldEntry, newParent, null, SearchControls.SUBTREE_SCOPE, + numAdd = CopyEntriesRunnable.copyEntry( oldEntry, newParent, null, + SearchControls.SUBTREE_SCOPE, numAdd, null, dummyMonitor, monitor ); if ( !dummyMonitor.errorsReported() ) Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ReloadSchemaRunnable.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ReloadSchemaRunnable.java?rev=1430352&r1=1430351&r2=1430352&view=diff ============================================================================== --- directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ReloadSchemaRunnable.java (original) +++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ReloadSchemaRunnable.java Tue Jan 8 16:09:24 2013 @@ -272,7 +272,7 @@ public class ReloadSchemaRunnable implem if ( attribute.getID().equalsIgnoreCase( SchemaConstants.SUBSCHEMA_SUBENTRY_AT ) ) { String value = ( String ) attribute.get(); - if ( Dn.isValid(value) ) + if ( Dn.isValid( value ) ) { Dn dn = new Dn( value ); return dn; Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/IBrowserConnection.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/IBrowserConnection.java?rev=1430352&r1=1430351&r2=1430352&view=diff ============================================================================== --- directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/IBrowserConnection.java (original) +++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/IBrowserConnection.java Tue Jan 8 16:09:24 2013 @@ -246,7 +246,7 @@ public interface IBrowserConnection exte * * @param baseDn the new base Dn */ - public abstract void setBaseDN( Dn baseDn); + public abstract void setBaseDN( Dn baseDn ); /** Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/ISearch.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/ISearch.java?rev=1430352&r1=1430351&r2=1430352&view=diff ============================================================================== --- directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/ISearch.java (original) +++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/ISearch.java Tue Jan 8 16:09:24 2013 @@ -69,6 +69,7 @@ public interface ISearch extends Seriali /** Filter for fetching aliases and referrals (|(objectClass=alias)(objectClass=referral)) */ public static final String FILTER_ALIAS_OR_REFERRAL = "(|(objectClass=alias)(objectClass=referral))"; //$NON-NLS-1$ + /** * Gets the LDAP URL of this search. * Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/Password.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/Password.java?rev=1430352&r1=1430351&r2=1430352&view=diff ============================================================================== --- directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/Password.java (original) +++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/Password.java Tue Jan 8 16:09:24 2013 @@ -178,7 +178,7 @@ public class Password if ( !( hashMethod == null || HASH_METHOD_NO.equalsIgnoreCase( hashMethod ) || HASH_METHOD_SHA.equalsIgnoreCase( hashMethod ) || HASH_METHOD_SSHA.equalsIgnoreCase( hashMethod ) || HASH_METHOD_MD5.equalsIgnoreCase( hashMethod ) || HASH_METHOD_SMD5.equalsIgnoreCase( hashMethod ) || HASH_METHOD_CRYPT - .equalsIgnoreCase( hashMethod ) ) ) + .equalsIgnoreCase( hashMethod ) ) ) { throw new IllegalArgumentException( BrowserCoreMessages.model__unsupported_hash ); } Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/BrowserConnection.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/BrowserConnection.java?rev=1430352&r1=1430351&r2=1430352&view=diff ============================================================================== --- directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/BrowserConnection.java (original) +++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/BrowserConnection.java Tue Jan 8 16:09:24 2013 @@ -154,7 +154,7 @@ public class BrowserConnection implement entryToAttributeInfoMap.clear(); entryToChildrenInfoMap.clear(); entryToChildrenFilterMap.clear(); -// searchManager.setQuickSearch( null ); TODO + // searchManager.setQuickSearch( null ); TODO rootDSE = new RootDSE( this ); cacheEntry( rootDSE ); @@ -222,7 +222,7 @@ public class BrowserConnection implement /** * {@inheritDoc} */ - public void setBaseDN( Dn baseDn) + public void setBaseDN( Dn baseDn ) { connection.getConnectionParameter().setExtendedProperty( CONNECTION_PARAMETER_BASE_DN, baseDn.toString() ); ConnectionEventRegistry.fireConnectionUpdated( connection, this ); Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/DummyConnection.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/DummyConnection.java?rev=1430352&r1=1430351&r2=1430352&view=diff ============================================================================== --- directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/DummyConnection.java (original) +++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/DummyConnection.java Tue Jan 8 16:09:24 2013 @@ -151,7 +151,7 @@ public class DummyConnection implements /** * {@inheritDoc} */ - public void setBaseDN( Dn baseDn) + public void setBaseDN( Dn baseDn ) { } Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/Entry.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/Entry.java?rev=1430352&r1=1430351&r2=1430352&view=diff ============================================================================== --- directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/Entry.java (original) +++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/Entry.java Tue Jan 8 16:09:24 2013 @@ -85,7 +85,7 @@ public class Entry extends AbstractEntry try { Dn dn = parent.getDn().add( rdn ); - + return dn; } catch ( LdapInvalidDnException lide )