Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 6E275200CFF for ; Tue, 22 Aug 2017 22:37:29 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 6ABED167906; Tue, 22 Aug 2017 20:37:29 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id E6B60167901 for ; Tue, 22 Aug 2017 22:37:26 +0200 (CEST) Received: (qmail 69139 invoked by uid 500); 22 Aug 2017 20:37:25 -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 69129 invoked by uid 99); 22 Aug 2017 20:37:25 -0000 Received: from Unknown (HELO svn01-us-west.apache.org) (209.188.14.144) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 22 Aug 2017 20:37:25 +0000 Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id 2F3DD3A0024 for ; Tue, 22 Aug 2017 20:37:23 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1805825 [1/2] - in /directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config: editor/ editor/databases/ editor/overlays/ editor/pages/ jobs/ Date: Tue, 22 Aug 2017 20:37:20 -0000 To: commits@directory.apache.org From: elecharny@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20170822203724.2F3DD3A0024@svn01-us-west.apache.org> archived-at: Tue, 22 Aug 2017 20:37:29 -0000 Author: elecharny Date: Tue Aug 22 20:37:20 2017 New Revision: 1805825 URL: http://svn.apache.org/viewvc?rev=1805825&view=rev Log: Fixed many Sonar lint warnings Modified: directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/ConnectionServerConfigurationInput.java directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/DirectoryServerConfigurationInput.java directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/Messages.java directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/OpenLDAPServerConfigurationEditor.java directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/OpenLDAPServerConfigurationEditorUtils.java directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/databases/AbstractDatabaseSpecificDetailsBlock.java directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/databases/BerkeleyDbDatabaseSpecificDetailsBlock.java directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/databases/ConfigPage.java directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/databases/DatabasesDetailsPage.java directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/databases/DatabasesMasterDetailsBlock.java directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/databases/FrontendDatabaseSpecificDetailsBlock.java directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/databases/FrontendPage.java directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/databases/MdbDatabaseSpecificDetailsBlock.java directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/databases/Messages.java directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/overlays/ModuleWrapperLabelProvider.java directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/overlays/ModuleWrapperViewerSorter.java directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/overlays/OverlaysMasterDetailsBlock.java directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/pages/DatabasesPage.java directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/pages/ErrorPage.java directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/pages/LoadingPage.java directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/pages/Messages.java directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/pages/OpenLDAPServerConfigurationEditorPage.java directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/pages/OptionsPage.java directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/pages/OverlaysPage.java directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/pages/OverviewPage.java directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/pages/SecurityPage.java directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/pages/TuningPage.java directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/jobs/EntryBasedConfigurationPartition.java directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/jobs/LoadConfigurationRunnable.java directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/jobs/PartitionsDiffComputer.java Modified: directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/ConnectionServerConfigurationInput.java URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/ConnectionServerConfigurationInput.java?rev=1805825&r1=1805824&r2=1805825&view=diff ============================================================================== --- directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/ConnectionServerConfigurationInput.java (original) +++ directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/ConnectionServerConfigurationInput.java Tue Aug 22 20:37:20 2017 @@ -61,6 +61,7 @@ public class ConnectionServerConfigurati /** * {@inheritDoc} */ + @Override public String getToolTipText() { return NLS.bind( "{0} - Configuration", connection.getName() ); @@ -70,6 +71,7 @@ public class ConnectionServerConfigurati /** * {@inheritDoc} */ + @Override public String getName() { return NLS.bind( "{0} - Configuration", connection.getName() ); @@ -79,6 +81,7 @@ public class ConnectionServerConfigurati /** * {@inheritDoc} */ + @Override public boolean exists() { return connection != null; @@ -103,7 +106,7 @@ public class ConnectionServerConfigurati { Connection inputConnection = input.getConnection(); - if ( ( inputConnection != null ) && ( inputConnection != null ) ) + if ( inputConnection != null ) { return inputConnection.equals( connection ); } Modified: directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/DirectoryServerConfigurationInput.java URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/DirectoryServerConfigurationInput.java?rev=1805825&r1=1805824&r2=1805825&view=diff ============================================================================== --- directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/DirectoryServerConfigurationInput.java (original) +++ directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/DirectoryServerConfigurationInput.java Tue Aug 22 20:37:20 2017 @@ -65,6 +65,7 @@ public class DirectoryServerConfiguratio /** * {@inheritDoc} */ + @Override public String getToolTipText() { if ( directory != null ) @@ -79,6 +80,7 @@ public class DirectoryServerConfiguratio /** * {@inheritDoc} */ + @Override public String getName() { if ( directory != null ) @@ -93,6 +95,7 @@ public class DirectoryServerConfiguratio /** * {@inheritDoc} */ + @Override public boolean exists() { return directory != null; @@ -102,6 +105,7 @@ public class DirectoryServerConfiguratio /** * {@inheritDoc} */ + @Override public ImageDescriptor getImageDescriptor() { return OpenLdapConfigurationPlugin.getDefault().getImageDescriptor( Modified: directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/Messages.java URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/Messages.java?rev=1805825&r1=1805824&r2=1805825&view=diff ============================================================================== --- directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/Messages.java (original) +++ directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/Messages.java Tue Aug 22 20:37:20 2017 @@ -31,6 +31,12 @@ import java.util.ResourceBundle; */ public class Messages { + private Messages() + { + // Do nothing + } + + /** The resource name */ private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle( Messages.class.getPackage().getName() + ".messages" ); Modified: directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/OpenLDAPServerConfigurationEditor.java URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/OpenLDAPServerConfigurationEditor.java?rev=1805825&r1=1805824&r2=1805825&view=diff ============================================================================== --- directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/OpenLDAPServerConfigurationEditor.java (original) +++ directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/OpenLDAPServerConfigurationEditor.java Tue Aug 22 20:37:20 2017 @@ -97,6 +97,7 @@ public class OpenLDAPServerConfiguration /** * {@inheritDoc} */ + @Override public void init( IEditorSite site, IEditorInput input ) throws PartInitException { super.init( site, input ); @@ -114,7 +115,7 @@ public class OpenLDAPServerConfiguration private void readConfiguration() { // Creating and scheduling the job to load the configuration - StudioJob job = new StudioJob( + StudioJob job = new StudioJob<>( new LoadConfigurationRunnable( this ) ); job.schedule(); } @@ -189,7 +190,7 @@ public class OpenLDAPServerConfiguration doSavePages( monitor ); // Saving the configuration using a job - StudioJob job = new StudioJob( + StudioJob job = new StudioJob<>( new SaveConfigurationRunnable( this ) ); job.schedule(); } @@ -251,13 +252,7 @@ public class OpenLDAPServerConfiguration setDirty( false ); // Updating the title and tooltip texts - Display.getDefault().syncExec( new Runnable() - { - public void run() - { - setPartName( getEditorInput().getName() ); - } - } ); + Display.getDefault().syncExec( () -> setPartName( getEditorInput().getName() ) ); } } @@ -308,6 +303,7 @@ public class OpenLDAPServerConfiguration /** * {@inheritDoc} */ + @Override public boolean isDirty() { return dirty; @@ -323,13 +319,7 @@ public class OpenLDAPServerConfiguration { this.dirty = dirty; - Display.getDefault().asyncExec( new Runnable() - { - public void run() - { - firePropertyChange( PROP_DIRTY ); - } - } ); + Display.getDefault().asyncExec( () -> firePropertyChange( PROP_DIRTY ) ); } Modified: directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/OpenLDAPServerConfigurationEditorUtils.java URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/OpenLDAPServerConfigurationEditorUtils.java?rev=1805825&r1=1805824&r2=1805825&view=diff ============================================================================== --- directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/OpenLDAPServerConfigurationEditorUtils.java (original) +++ directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/OpenLDAPServerConfigurationEditorUtils.java Tue Aug 22 20:37:20 2017 @@ -71,6 +71,12 @@ import org.apache.directory.studio.openl */ public class OpenLDAPServerConfigurationEditorUtils { + private OpenLDAPServerConfigurationEditorUtils() + { + // Do nothing + } + + /** * Performs the "Save as..." action. * Modified: directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/databases/AbstractDatabaseSpecificDetailsBlock.java URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/databases/AbstractDatabaseSpecificDetailsBlock.java?rev=1805825&r1=1805824&r2=1805825&view=diff ============================================================================== --- directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/databases/AbstractDatabaseSpecificDetailsBlock.java (original) +++ directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/databases/AbstractDatabaseSpecificDetailsBlock.java Tue Aug 22 20:37:20 2017 @@ -20,11 +20,9 @@ package org.apache.directory.studio.openldap.config.editor.databases; -import org.apache.directory.studio.common.ui.widgets.WidgetModifyEvent; import org.apache.directory.studio.common.ui.widgets.WidgetModifyListener; import org.apache.directory.studio.ldapbrowser.core.model.IBrowserConnection; import org.apache.directory.studio.openldap.config.model.database.OlcDatabaseConfig; -import org.eclipse.swt.events.ModifyEvent; import org.eclipse.swt.events.ModifyListener; import org.eclipse.swt.events.SelectionAdapter; import org.eclipse.swt.events.SelectionEvent; @@ -49,24 +47,13 @@ public abstract class AbstractDatabaseSp protected IBrowserConnection browserConnection; // Listeners - protected ModifyListener dirtyModifyListener = new ModifyListener() - { - public void modifyText( ModifyEvent e ) - { - detailsPage.setEditorDirty(); - } - }; + protected ModifyListener dirtyModifyListener = event -> detailsPage.setEditorDirty(); - protected WidgetModifyListener dirtyWidgetModifyListener = new WidgetModifyListener() - { - public void widgetModified( WidgetModifyEvent event ) - { - detailsPage.setEditorDirty(); - } - }; + protected WidgetModifyListener dirtyWidgetModifyListener = event -> detailsPage.setEditorDirty(); protected SelectionListener dirtySelectionListener = new SelectionAdapter() { + @Override public void widgetSelected( SelectionEvent e ) { detailsPage.setEditorDirty(); Modified: directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/databases/BerkeleyDbDatabaseSpecificDetailsBlock.java URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/databases/BerkeleyDbDatabaseSpecificDetailsBlock.java?rev=1805825&r1=1805824&r2=1805825&view=diff ============================================================================== --- directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/databases/BerkeleyDbDatabaseSpecificDetailsBlock.java (original) +++ directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/databases/BerkeleyDbDatabaseSpecificDetailsBlock.java Tue Aug 22 20:37:20 2017 @@ -80,6 +80,7 @@ public class BerkeleyDbDatabaseSpecificD // Listeners private SelectionListener editConfigurationButtonSelectionListener = new SelectionAdapter() { + @Override public void widgetSelected( SelectionEvent e ) { DbConfigurationDialog dialog = new DbConfigurationDialog( editConfigurationButton.getShell(), @@ -87,7 +88,7 @@ public class BerkeleyDbDatabaseSpecificD if ( dialog.open() == DbConfigurationDialog.OK ) { - List newConfiguration = new ArrayList(); + List newConfiguration = new ArrayList<>(); String[] configurationFromDialog = dialog.getConfiguration(); Modified: directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/databases/ConfigPage.java URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/databases/ConfigPage.java?rev=1805825&r1=1805824&r2=1805825&view=diff ============================================================================== --- directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/databases/ConfigPage.java (original) +++ directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/databases/ConfigPage.java Tue Aug 22 20:37:20 2017 @@ -58,6 +58,7 @@ public class ConfigPage extends FormPage /** * {@inheritDoc} */ + @Override public void doSave( IProgressMonitor monitor ) { } Modified: directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/databases/DatabasesDetailsPage.java URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/databases/DatabasesDetailsPage.java?rev=1805825&r1=1805824&r2=1805825&view=diff ============================================================================== --- directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/databases/DatabasesDetailsPage.java (original) +++ directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/databases/DatabasesDetailsPage.java Tue Aug 22 20:37:20 2017 @@ -29,7 +29,6 @@ import org.apache.directory.studio.commo import org.apache.directory.studio.common.ui.widgets.AbstractWidget; import org.apache.directory.studio.common.ui.widgets.BaseWidgetUtils; import org.apache.directory.studio.common.ui.widgets.TableWidget; -import org.apache.directory.studio.common.ui.widgets.WidgetModifyEvent; import org.apache.directory.studio.common.ui.widgets.WidgetModifyListener; import org.apache.directory.studio.common.ui.wrappers.StringValueWrapper; import org.apache.directory.studio.ldapbrowser.core.BrowserCorePlugin; @@ -72,20 +71,16 @@ import org.apache.directory.studio.openl import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.fieldassist.ControlDecoration; import org.eclipse.jface.viewers.ArrayContentProvider; -import org.eclipse.jface.viewers.ComboViewer; -import org.eclipse.jface.viewers.DoubleClickEvent; import org.eclipse.jface.viewers.IDoubleClickListener; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.ISelectionChangedListener; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.LabelProvider; -import org.eclipse.jface.viewers.SelectionChangedEvent; import org.eclipse.jface.viewers.StructuredSelection; import org.eclipse.jface.viewers.TableViewer; import org.eclipse.jface.viewers.Viewer; import org.eclipse.osgi.util.NLS; import org.eclipse.swt.SWT; -import org.eclipse.swt.events.ModifyEvent; import org.eclipse.swt.events.ModifyListener; import org.eclipse.swt.events.SelectionAdapter; import org.eclipse.swt.events.SelectionEvent; @@ -296,13 +291,13 @@ import org.eclipse.ui.forms.widgets.Sect public class DatabasesDetailsPage implements IDetailsPage { /** The frontend database type array */ - private static DatabaseTypeEnum[] FRONTEND_DATABASE_TYPES = new DatabaseTypeEnum[] - { - DatabaseTypeEnum.FRONTEND + private static final DatabaseTypeEnum[] FRONTEND_DATABASE_TYPES = new DatabaseTypeEnum[] + { + DatabaseTypeEnum.FRONTEND }; /** The frontend database type array */ - private static DatabaseTypeEnum[] CONFIG_DATABASE_TYPES = new DatabaseTypeEnum[] + private static final DatabaseTypeEnum[] CONFIG_DATABASE_TYPES = new DatabaseTypeEnum[] { DatabaseTypeEnum.CONFIG }; @@ -438,6 +433,7 @@ public class DatabasesDetailsPage implem */ private SelectionListener sizeLimitEditSelectionListener = new SelectionAdapter() { + @Override public void widgetSelected( SelectionEvent e ) { SizeLimitDialog dialog = new SizeLimitDialog( sizeLimitText.getShell(), sizeLimitText.getText() ); @@ -458,30 +454,19 @@ public class DatabasesDetailsPage implem /** * A listener for changes on the Overlay table */ - private ISelectionChangedListener overlaysTableViewerSelectionChangedListener = new ISelectionChangedListener() - { - public void selectionChanged( SelectionChangedEvent event ) - { - updateOverlaysTableButtonsState(); - } - }; + private ISelectionChangedListener overlaysTableViewerSelectionChangedListener = event -> updateOverlaysTableButtonsState(); /** * A listener for selections on the Overlay table */ - private IDoubleClickListener overlaysTableViewerDoubleClickListener = new IDoubleClickListener() - { - public void doubleClick( DoubleClickEvent event ) - { - editOverlayButtonAction(); - } - }; + private IDoubleClickListener overlaysTableViewerDoubleClickListener = event -> editOverlayButtonAction(); /** * A listener for the Overlay table Add button */ private SelectionListener addOverlayButtonListener = new SelectionAdapter() { + @Override public void widgetSelected( SelectionEvent e ) { addOverlayButtonAction(); @@ -493,6 +478,7 @@ public class DatabasesDetailsPage implem */ private SelectionListener editOverlayButtonListener = new SelectionAdapter() { + @Override public void widgetSelected( SelectionEvent e ) { editOverlayButtonAction(); @@ -504,6 +490,7 @@ public class DatabasesDetailsPage implem */ private SelectionListener deleteOverlayButtonListener = new SelectionAdapter() { + @Override public void widgetSelected( SelectionEvent e ) { deleteOverlayButtonAction(); @@ -513,30 +500,21 @@ public class DatabasesDetailsPage implem /** * A listener for changes on the Replication Consumers table */ - private ISelectionChangedListener replicationConsumersTableViewerSelectionChangedListener = new ISelectionChangedListener() - { - public void selectionChanged( SelectionChangedEvent event ) - { + private ISelectionChangedListener replicationConsumersTableViewerSelectionChangedListener = event -> updateReplicationConsumersTableButtonsState(); - } - }; /** * A listener for selections on the Replication Consumers table */ - private IDoubleClickListener replicationConsumersTableViewerDoubleClickListener = new IDoubleClickListener() - { - public void doubleClick( DoubleClickEvent event ) - { + private IDoubleClickListener replicationConsumersTableViewerDoubleClickListener = event -> editReplicationConsumerButtonAction(); - } - }; /** * A listener for the Replication Consumers table Add button */ private SelectionListener addReplicationConsumerButtonListener = new SelectionAdapter() { + @Override public void widgetSelected( SelectionEvent e ) { addReplicationConsumerButtonAction(); @@ -548,6 +526,7 @@ public class DatabasesDetailsPage implem */ private SelectionListener editReplicationConsumerButtonListener = new SelectionAdapter() { + @Override public void widgetSelected( SelectionEvent e ) { editReplicationConsumerButtonAction(); @@ -559,6 +538,7 @@ public class DatabasesDetailsPage implem */ private SelectionListener deleteReplicationConsumerButtonListener = new SelectionAdapter() { + @Override public void widgetSelected( SelectionEvent e ) { deleteReplicationConsumerButtonAction(); @@ -659,13 +639,7 @@ public class DatabasesDetailsPage implem /** * The modify listener which set the editor dirty **/ - private WidgetModifyListener dirtyWidgetModifyListener = new WidgetModifyListener() - { - public void widgetModified( WidgetModifyEvent event ) - { - setEditorDirty(); - } - }; + private WidgetModifyListener dirtyWidgetModifyListener = event -> setEditorDirty(); /** @@ -691,13 +665,7 @@ public class DatabasesDetailsPage implem /** * A modify listener for text zones when they have been modified */ - protected ModifyListener dirtyModifyListener = new ModifyListener() - { - public void modifyText( ModifyEvent e ) - { - setEditorDirty(); - } - }; + protected ModifyListener dirtyModifyListener = event -> setEditorDirty(); /** @@ -705,6 +673,7 @@ public class DatabasesDetailsPage implem */ private SelectionListener hiddenButtonSelectionListener = new SelectionAdapter() { + @Override public void widgetSelected( SelectionEvent e ) { setEditorDirty(); @@ -717,6 +686,7 @@ public class DatabasesDetailsPage implem */ private SelectionListener readOnlyButtonSelectionListener = new SelectionAdapter() { + @Override public void widgetSelected( SelectionEvent e ) { setEditorDirty(); @@ -727,11 +697,9 @@ public class DatabasesDetailsPage implem /** * The olcRequires listener */ - private WidgetModifyListener requireConditionListener = new WidgetModifyListener() - { - public void widgetModified( WidgetModifyEvent e ) + private WidgetModifyListener requireConditionListener = event -> { - List requires = new ArrayList(); + List requires = new ArrayList<>(); for ( RequireConditionEnum requireCondition : requireConditionTableWidget.getElements() ) { @@ -739,18 +707,15 @@ public class DatabasesDetailsPage implem } //getConfiguration().getGlobal().setOlcRequires( requires ); - } - }; + }; /** * The olcRestrict listener */ - private WidgetModifyListener restrictOperationListener = new WidgetModifyListener() - { - public void widgetModified( WidgetModifyEvent e ) + private WidgetModifyListener restrictOperationListener = event -> { - List restricts = new ArrayList(); + List restricts = new ArrayList<>(); for ( RestrictOperationEnum restrictOperation : restrictOperationTableWidget.getElements() ) { @@ -758,18 +723,15 @@ public class DatabasesDetailsPage implem } //getConfiguration().getGlobal().setOlcRestrict( restricts ); - } - }; + }; /** * The olcSecurity listener */ - private WidgetModifyListener securityListener = new WidgetModifyListener() - { - public void widgetModified( WidgetModifyEvent e ) + private WidgetModifyListener securityListener = event -> { - List ssfWrappers = new ArrayList(); + List ssfWrappers = new ArrayList<>(); for ( SsfWrapper ssfWrapper : securityTableWidget.getElements() ) { @@ -777,8 +739,7 @@ public class DatabasesDetailsPage implem } //getConfiguration().getGlobal().setOlcSecurity( ssfWrappers ); - } - }; + }; /** @@ -919,7 +880,7 @@ public class DatabasesDetailsPage implem // Suffix DN. We may have more than one toolkit.createLabel( composite, "Suffix:" ); - suffixDnTableWidget = new TableWidget( new DnDecorator( composite.getShell() ) ); + suffixDnTableWidget = new TableWidget<>( new DnDecorator( composite.getShell() ) ); suffixDnTableWidget.createWidgetWithEdit( composite, toolkit ); suffixDnTableWidget.getControl().setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false, 2, 1 ) ); @@ -1081,7 +1042,7 @@ public class DatabasesDetailsPage implem Messages.getString( "OpenLDAPMasterDetail.TimeLimit" ) ); //$NON-NLS-1$ timeLimitLabel.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false, 5, 1 ) ); - timeLimitTableWidget = new TableWidget( + timeLimitTableWidget = new TableWidget<>( new TimeLimitDecorator( composite.getShell() ) ); timeLimitTableWidget.createWidgetWithEdit( composite, toolkit ); @@ -1093,7 +1054,7 @@ public class DatabasesDetailsPage implem Messages.getString( "OpenLDAPMasterDetail.Limits" ) ); //$NON-NLS-1$ limitsLabel.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false, 5, 1 ) ); - limitsTableWidget = new TableWidget( + limitsTableWidget = new TableWidget<>( new LimitsDecorator( composite.getShell(), "Limits" ) ); limitsTableWidget.createOrderedWidgetWithEdit( composite, toolkit ); @@ -1175,7 +1136,7 @@ public class DatabasesDetailsPage implem restrictOperationLabel.setLayoutData( new GridData( SWT.FILL, SWT.FILL, false, false, 2, 1 ) ); // The olcRequires parameter table - requireConditionTableWidget = new TableWidget( + requireConditionTableWidget = new TableWidget<>( new RequireConditionDecorator( securityComposite.getShell() ) ); requireConditionTableWidget.createWidgetNoEdit( securityComposite, toolkit ); @@ -1183,7 +1144,7 @@ public class DatabasesDetailsPage implem addModifyListener( requireConditionTableWidget, requireConditionListener ); // The olcRestrict parameter table - restrictOperationTableWidget = new TableWidget( + restrictOperationTableWidget = new TableWidget<>( new RestrictOperationDecorator( securityComposite.getShell() ) ); restrictOperationTableWidget.createWidgetNoEdit( securityComposite, toolkit ); @@ -1194,7 +1155,7 @@ public class DatabasesDetailsPage implem Label securityLabel = toolkit.createLabel( securityComposite, Messages.getString( "OpenLDAPMasterDetail.Security" ) ); //$NON-NLS-1$ securityLabel.setLayoutData( new GridData( SWT.FILL, SWT.FILL, false, false, 4, 1 ) ); - securityTableWidget = new TableWidget( new SsfDecorator( securityComposite.getShell() ) ); + securityTableWidget = new TableWidget<>( new SsfDecorator( securityComposite.getShell() ) ); securityTableWidget.createWidgetWithEdit( securityComposite, toolkit ); securityTableWidget.getControl().setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false, 4, 1 ) ); @@ -1290,6 +1251,7 @@ public class DatabasesDetailsPage implem overlaysTableViewer.setContentProvider( new ArrayContentProvider() ); overlaysTableViewer.setLabelProvider( new LabelProvider() { + @Override public String getText( Object element ) { if ( element instanceof OlcOverlayConfig ) @@ -1298,7 +1260,7 @@ public class DatabasesDetailsPage implem } return super.getText( element ); - }; + } } ); // Creating the buttons @@ -1382,6 +1344,7 @@ public class DatabasesDetailsPage implem replicationConsumersTableViewer.setContentProvider( new ArrayContentProvider() ); replicationConsumersTableViewer.setLabelProvider( new LabelProvider() { + @Override public String getText( Object element ) { if ( element instanceof String ) @@ -1390,7 +1353,7 @@ public class DatabasesDetailsPage implem } return super.getText( element ); - }; + } } ); // Creating the buttons @@ -1703,7 +1666,7 @@ public class DatabasesDetailsPage implem suffixDnTableWidget.getElements().clear(); List suffixesDnList = database.getOlcSuffix(); - List dnWrappers = new ArrayList(); + List dnWrappers = new ArrayList<>(); for ( Dn dn : suffixesDnList ) { @@ -2383,11 +2346,9 @@ public class DatabasesDetailsPage implem /** * The olcTimeLimit listener */ - private WidgetModifyListener timeLimitListener = new WidgetModifyListener() - { - public void widgetModified( WidgetModifyEvent e ) + private WidgetModifyListener timeLimitListener = event -> { - List timeLimits = new ArrayList(); + List timeLimits = new ArrayList<>(); for ( TimeLimitWrapper timeLimitWrapper : timeLimitTableWidget.getElements() ) { @@ -2397,18 +2358,15 @@ public class DatabasesDetailsPage implem OlcDatabaseConfig databaseConfig = databaseWrapper.getDatabase(); databaseConfig.setOlcTimeLimit( timeLimits ); - } - }; + }; /** * The olcLimits listener */ - private WidgetModifyListener limitsListener = new WidgetModifyListener() - { - public void widgetModified( WidgetModifyEvent e ) + private WidgetModifyListener limitsListener = event -> { - List limits = new ArrayList(); + List limits = new ArrayList<>(); for ( LimitsWrapper limitWrapper : limitsTableWidget.getElements() ) { @@ -2418,8 +2376,7 @@ public class DatabasesDetailsPage implem OlcDatabaseConfig databaseConfig = databaseWrapper.getDatabase(); databaseConfig.setOlcLimits( limits ); - } - }; + }; /** Modified: directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/databases/DatabasesMasterDetailsBlock.java URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/databases/DatabasesMasterDetailsBlock.java?rev=1805825&r1=1805824&r2=1805825&view=diff ============================================================================== --- directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/databases/DatabasesMasterDetailsBlock.java (original) +++ directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/databases/DatabasesMasterDetailsBlock.java Tue Aug 22 20:37:20 2017 @@ -33,7 +33,7 @@ import org.apache.directory.studio.openl import org.apache.directory.studio.openldap.config.editor.pages.DatabasesPage; import org.apache.directory.studio.openldap.config.editor.wrappers.DatabaseWrapper; import org.apache.directory.studio.openldap.config.editor.wrappers.DatabaseWrapperLabelProvider; -import org.apache.directory.studio.openldap.config.editor.wrappers.DatabaseWrapperViewerSorter; +import org.apache.directory.studio.openldap.config.editor.wrappers.DatabaseWrapperViewerComparator; import org.apache.directory.studio.openldap.config.model.database.OlcBdbConfig; import org.apache.directory.studio.openldap.config.model.database.OlcDatabaseConfig; import org.apache.directory.studio.openldap.config.model.database.OlcDbPerlConfig; @@ -55,7 +55,6 @@ import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.viewers.ArrayContentProvider; import org.eclipse.jface.viewers.ISelectionChangedListener; -import org.eclipse.jface.viewers.SelectionChangedEvent; import org.eclipse.jface.viewers.StructuredSelection; import org.eclipse.jface.viewers.TableViewer; import org.eclipse.osgi.util.NLS; @@ -113,7 +112,7 @@ public class DatabasesMasterDetailsBlock private DatabasesDetailsPage detailsPage; /** The database wrappers */ - private List databaseWrappers = new ArrayList(); + private List databaseWrappers = new ArrayList<>(); /** The currently selected object */ private Object currentSelection; @@ -140,9 +139,7 @@ public class DatabasesMasterDetailsBlock * A listener called when the Database table content has changed. It will enable * or disabled button accordingly to the changes. */ - private ISelectionChangedListener viewerSelectionChangedListener = new ISelectionChangedListener() - { - public void selectionChanged( SelectionChangedEvent event ) + private ISelectionChangedListener viewerSelectionChangedListener = event -> { if ( !event.getSelection().isEmpty() ) { @@ -173,8 +170,7 @@ public class DatabasesMasterDetailsBlock refreshButtonStates(); } } - } - }; + }; /** @@ -182,6 +178,7 @@ public class DatabasesMasterDetailsBlock */ private SelectionAdapter addButtonSelectionListener = new SelectionAdapter() { + @Override public void widgetSelected( SelectionEvent e ) { addNewDatabase(); @@ -193,6 +190,7 @@ public class DatabasesMasterDetailsBlock */ private SelectionAdapter deleteButtonSelectionListener = new SelectionAdapter() { + @Override public void widgetSelected( SelectionEvent e ) { deleteSelectedDatabase(); @@ -204,6 +202,7 @@ public class DatabasesMasterDetailsBlock */ private SelectionAdapter upButtonSelectionListener = new SelectionAdapter() { + @Override public void widgetSelected( SelectionEvent e ) { moveSelectedDatabaseUp(); @@ -215,6 +214,7 @@ public class DatabasesMasterDetailsBlock */ private SelectionAdapter downButtonSelectionListener = new SelectionAdapter() { + @Override public void widgetSelected( SelectionEvent e ) { moveSelectedDatabaseDown(); @@ -237,6 +237,7 @@ public class DatabasesMasterDetailsBlock /** * {@inheritDoc} */ + @Override public void createContent( IManagedForm managedForm ) { super.createContent( managedForm ); @@ -295,7 +296,7 @@ public class DatabasesMasterDetailsBlock databaseTableViewer.setContentProvider( new ArrayContentProvider() ); databaseTableViewer.setLabelProvider( new DatabaseWrapperLabelProvider() ); - databaseTableViewer.setSorter( new DatabaseWrapperViewerSorter() ); + databaseTableViewer.setComparator( new DatabaseWrapperViewerComparator() ); // Add a contextual menu to enable/disable a Database. This is a 2.5 feature. // TODO : check with the schemaManager Modified: directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/databases/FrontendDatabaseSpecificDetailsBlock.java URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/databases/FrontendDatabaseSpecificDetailsBlock.java?rev=1805825&r1=1805824&r2=1805825&view=diff ============================================================================== --- directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/databases/FrontendDatabaseSpecificDetailsBlock.java (original) +++ directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/databases/FrontendDatabaseSpecificDetailsBlock.java Tue Aug 22 20:37:20 2017 @@ -30,7 +30,6 @@ import org.apache.directory.studio.ldapb import org.eclipse.jface.viewers.ArrayContentProvider; import org.eclipse.jface.viewers.ISelectionChangedListener; import org.eclipse.jface.viewers.LabelProvider; -import org.eclipse.jface.viewers.SelectionChangedEvent; import org.eclipse.jface.viewers.StructuredSelection; import org.eclipse.jface.viewers.TableViewer; import org.eclipse.swt.SWT; @@ -69,7 +68,7 @@ public class FrontendDatabaseSpecificDet private static final String CLEARTEXT = "{CLEARTEXT}"; /** The list of sorted attributes values */ - private List sortedValuesAttributesList = new ArrayList(); + private List sortedValuesAttributesList = new ArrayList<>(); // UI Fields private EntryWidget defaultSearchBaseEntryWidget; @@ -85,16 +84,12 @@ public class FrontendDatabaseSpecificDet private Button deleteSortedValueButton; // Listeners - private ISelectionChangedListener sortedValuesTableViewerSelectionChangedListener = new ISelectionChangedListener() - { - public void selectionChanged( SelectionChangedEvent event ) - { - deleteSortedValueButton.setEnabled( !sortedValuesTableViewer.getSelection().isEmpty() ); - } - }; + private ISelectionChangedListener sortedValuesTableViewerSelectionChangedListener = event -> + deleteSortedValueButton.setEnabled( !sortedValuesTableViewer.getSelection().isEmpty() ); + private SelectionListener addSortedValueButtonSelectionListener = new SelectionAdapter() { - + @Override public void widgetSelected( SelectionEvent e ) { AttributeDialog dialog = new AttributeDialog( addSortedValueButton.getShell(), browserConnection ); @@ -113,9 +108,10 @@ public class FrontendDatabaseSpecificDet } } }; + private SelectionListener deleteSortedValueButtonSelectionListener = new SelectionAdapter() { - + @Override public void widgetSelected( SelectionEvent e ) { StructuredSelection selection = ( StructuredSelection ) sortedValuesTableViewer.getSelection(); @@ -243,6 +239,7 @@ public class FrontendDatabaseSpecificDet sortedValuesTableViewer.setContentProvider( new ArrayContentProvider() ); sortedValuesTableViewer.setLabelProvider( new LabelProvider() { + @Override public Image getImage( Object element ) { return OpenLdapConfigurationPlugin.getDefault().getImage( @@ -314,7 +311,7 @@ public class FrontendDatabaseSpecificDet // Password Hash List passwordHashList = frontendConfig.getOlcPasswordHash(); - if ( ( passwordHashList != null ) && ( passwordHashList.size() > 0 ) ) + if ( ( passwordHashList != null ) && !passwordHashList.isEmpty() ) { shaCheckbox.setSelection( passwordHashList.contains( SHA ) ); sshaCheckbox.setSelection( passwordHashList.contains( SSHA ) ); @@ -392,7 +389,7 @@ public class FrontendDatabaseSpecificDet { List auxiliaryObjectClassesList = database.getAuxiliaryObjectClasses(); - if ( ( auxiliaryObjectClassesList != null ) && ( auxiliaryObjectClassesList.size() > 0 ) ) + if ( ( auxiliaryObjectClassesList != null ) && !auxiliaryObjectClassesList.isEmpty() ) { for ( AuxiliaryObjectClass auxiliaryObjectClass : auxiliaryObjectClassesList ) { Modified: directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/databases/FrontendPage.java URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/databases/FrontendPage.java?rev=1805825&r1=1805824&r2=1805825&view=diff ============================================================================== --- directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/databases/FrontendPage.java (original) +++ directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/databases/FrontendPage.java Tue Aug 22 20:37:20 2017 @@ -58,6 +58,7 @@ public class FrontendPage extends FormPa /** * {@inheritDoc} */ + @Override public void doSave( IProgressMonitor monitor ) { } Modified: directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/databases/MdbDatabaseSpecificDetailsBlock.java URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/databases/MdbDatabaseSpecificDetailsBlock.java?rev=1805825&r1=1805824&r2=1805825&view=diff ============================================================================== --- directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/databases/MdbDatabaseSpecificDetailsBlock.java (original) +++ directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/databases/MdbDatabaseSpecificDetailsBlock.java Tue Aug 22 20:37:20 2017 @@ -27,7 +27,6 @@ import org.apache.directory.api.util.Str import org.apache.directory.studio.common.ui.CommonUIConstants; import org.apache.directory.studio.common.ui.widgets.BaseWidgetUtils; import org.apache.directory.studio.common.ui.widgets.TableWidget; -import org.apache.directory.studio.common.ui.widgets.WidgetModifyEvent; import org.apache.directory.studio.common.ui.widgets.WidgetModifyListener; import org.apache.directory.studio.ldapbrowser.core.model.IBrowserConnection; import org.apache.directory.studio.openldap.config.editor.wrappers.DbIndexDecorator; @@ -127,11 +126,9 @@ public class MdbDatabaseSpecificDetailsB /** * The olcAllows listener */ - private WidgetModifyListener indexesListener = new WidgetModifyListener() - { - public void widgetModified( WidgetModifyEvent e ) + private WidgetModifyListener indexesListener = event -> { - List indices = new ArrayList(); + List indices = new ArrayList<>(); for ( DbIndexWrapper dbIndex : indicesWidget.getElements() ) { @@ -139,8 +136,7 @@ public class MdbDatabaseSpecificDetailsB } database.setOlcDbIndex( indices ); - } - }; + }; /** * Creates a new instance of MdbDatabaseSpecificDetailsBlock. @@ -254,7 +250,7 @@ public class MdbDatabaseSpecificDetailsB databaseIndexesSection.setClient( databaseIndexesComposite ); // Indices Widget - indicesWidget = new TableWidget( new DbIndexDecorator( null, browserConnection ) ); + indicesWidget = new TableWidget<>( new DbIndexDecorator( null, browserConnection ) ); indicesWidget.createWidgetWithEdit( databaseIndexesComposite, toolkit ); indicesWidget.getControl().setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false, 2, 1 ) ); @@ -368,7 +364,7 @@ public class MdbDatabaseSpecificDetailsB modeUnixPermissionsWidget.setValue( mode ); // Indices Text - List dbIndexWrappers = new ArrayList(); + List dbIndexWrappers = new ArrayList<>(); for ( String index : database.getOlcDbIndex() ) { Modified: directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/databases/Messages.java URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/databases/Messages.java?rev=1805825&r1=1805824&r2=1805825&view=diff ============================================================================== --- directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/databases/Messages.java (original) +++ directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/databases/Messages.java Tue Aug 22 20:37:20 2017 @@ -31,6 +31,12 @@ import java.util.ResourceBundle; */ public class Messages { + private Messages() + { + // Nothing to do + } + + /** The resource name */ private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle( Messages.class.getPackage().getName() + ".messages" ); Modified: directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/overlays/ModuleWrapperLabelProvider.java URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/overlays/ModuleWrapperLabelProvider.java?rev=1805825&r1=1805824&r2=1805825&view=diff ============================================================================== --- directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/overlays/ModuleWrapperLabelProvider.java (original) +++ directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/overlays/ModuleWrapperLabelProvider.java Tue Aug 22 20:37:20 2017 @@ -34,6 +34,7 @@ public class ModuleWrapperLabelProvider /** * Construct the label for a ModuleList. It's the type, followed by the suffixDN. */ + @Override public String getText( Object element ) { if ( element instanceof ModuleWrapper ) @@ -42,12 +43,13 @@ public class ModuleWrapperLabelProvider } return super.getText( element ); - }; + } /** * Get the ModuleList image, if it's a ModuleList */ + @Override public Image getImage( Object element ) { if ( element instanceof ModuleWrapper ) @@ -57,5 +59,5 @@ public class ModuleWrapperLabelProvider } return super.getImage( element ); - }; + } } Modified: directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/overlays/ModuleWrapperViewerSorter.java URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/overlays/ModuleWrapperViewerSorter.java?rev=1805825&r1=1805824&r2=1805825&view=diff ============================================================================== --- directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/overlays/ModuleWrapperViewerSorter.java (original) +++ directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/overlays/ModuleWrapperViewerSorter.java Tue Aug 22 20:37:20 2017 @@ -20,15 +20,16 @@ package org.apache.directory.studio.openldap.config.editor.overlays; import org.eclipse.jface.viewers.Viewer; -import org.eclipse.jface.viewers.ViewerSorter; +import org.eclipse.jface.viewers.ViewerComparator; /** * This class defines a sorter for a ModuleList wrapper viewer. * * @author Apache Directory Project */ -public class ModuleWrapperViewerSorter extends ViewerSorter +public class ModuleWrapperViewerSorter extends ViewerComparator { + @Override public int compare( Viewer viewer, Object e1, Object e2 ) { if ( ( e1 instanceof ModuleWrapper ) && ( e2 instanceof ModuleWrapper ) ) Modified: directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/overlays/OverlaysMasterDetailsBlock.java URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/overlays/OverlaysMasterDetailsBlock.java?rev=1805825&r1=1805824&r2=1805825&view=diff ============================================================================== --- directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/overlays/OverlaysMasterDetailsBlock.java (original) +++ directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/overlays/OverlaysMasterDetailsBlock.java Tue Aug 22 20:37:20 2017 @@ -24,9 +24,7 @@ import java.util.ArrayList; import java.util.List; import org.eclipse.jface.viewers.ArrayContentProvider; -import org.eclipse.jface.viewers.ISelectionChangedListener; import org.eclipse.jface.viewers.LabelProvider; -import org.eclipse.jface.viewers.SelectionChangedEvent; import org.eclipse.jface.viewers.TableViewer; import org.eclipse.swt.SWT; import org.eclipse.swt.graphics.Image; @@ -86,6 +84,7 @@ public class OverlaysMasterDetailsBlock /** * {@inheritDoc} */ + @Override public void createContent( IManagedForm managedForm ) { super.createContent( managedForm ); @@ -128,18 +127,14 @@ public class OverlaysMasterDetailsBlock managedForm.addPart( sectionPart ); overlaysTableViewer = new TableViewer( overlaysTable ); - overlaysTableViewer.addSelectionChangedListener( new ISelectionChangedListener() - { - public void selectionChanged( SelectionChangedEvent event ) - { - managedForm.fireSelectionChanged( sectionPart, event.getSelection() ); - } - } ); + overlaysTableViewer.addSelectionChangedListener( event -> + managedForm.fireSelectionChanged( sectionPart, event.getSelection() ) ); overlaysTableViewer.setContentProvider( new ArrayContentProvider() ); overlaysTableViewer.setLabelProvider( new LabelProvider() { + @Override public String getText( Object element ) { if ( element instanceof OlcOverlayConfig ) @@ -150,9 +145,10 @@ public class OverlaysMasterDetailsBlock } return super.getText( element ); - }; + } + @Override public Image getImage( Object element ) { if ( element instanceof OlcOverlayConfig ) @@ -162,7 +158,7 @@ public class OverlaysMasterDetailsBlock } return super.getImage( element ); - }; + } } ); // Creating the button(s) @@ -185,7 +181,7 @@ public class OverlaysMasterDetailsBlock OpenLdapConfiguration configuration = page.getConfiguration(); List configurationElements = configuration.getConfigurationElements(); - List overlayConfigurationElements = new ArrayList(); + List overlayConfigurationElements = new ArrayList<>(); for ( OlcConfig configurationElement : configurationElements ) { Modified: directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/pages/DatabasesPage.java URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/pages/DatabasesPage.java?rev=1805825&r1=1805824&r2=1805825&view=diff ============================================================================== --- directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/pages/DatabasesPage.java (original) +++ directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/pages/DatabasesPage.java Tue Aug 22 20:37:20 2017 @@ -83,6 +83,7 @@ public class DatabasesPage extends OpenL /** * {@inheritDoc} */ + @Override public void doSave( IProgressMonitor monitor ) { if ( masterDetailsBlock != null ) Modified: directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/pages/ErrorPage.java URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/pages/ErrorPage.java?rev=1805825&r1=1805824&r2=1805825&view=diff ============================================================================== --- directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/pages/ErrorPage.java (original) +++ directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/pages/ErrorPage.java Tue Aug 22 20:37:20 2017 @@ -87,6 +87,7 @@ public class ErrorPage extends FormPage /** * {@inheritDoc} */ + @Override protected void createFormContent( IManagedForm managedForm ) { ScrolledForm form = managedForm.getForm(); @@ -113,6 +114,7 @@ public class ErrorPage extends FormPage detailsButton.setLayoutData( new GridData( SWT.RIGHT, SWT.NONE, false, false ) ); detailsButton.addSelectionListener( new SelectionAdapter() { + @Override public void widgetSelected( SelectionEvent e ) { showOrHideDetailsView(); Modified: directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/pages/LoadingPage.java URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/pages/LoadingPage.java?rev=1805825&r1=1805824&r2=1805825&view=diff ============================================================================== --- directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/pages/LoadingPage.java (original) +++ directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/pages/LoadingPage.java Tue Aug 22 20:37:20 2017 @@ -78,6 +78,7 @@ public class LoadingPage extends FormPag /** * {@inheritDoc} */ + @Override protected void createFormContent( IManagedForm managedForm ) { ScrolledForm form = managedForm.getForm(); Modified: directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/pages/Messages.java URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/pages/Messages.java?rev=1805825&r1=1805824&r2=1805825&view=diff ============================================================================== --- directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/pages/Messages.java (original) +++ directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/pages/Messages.java Tue Aug 22 20:37:20 2017 @@ -31,6 +31,12 @@ import java.util.ResourceBundle; */ public class Messages { + private Messages() + { + //Nothing to do + } + + /** The resource name */ private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle( Messages.class.getPackage().getName() + ".messages" ); Modified: directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/pages/OpenLDAPServerConfigurationEditorPage.java URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/pages/OpenLDAPServerConfigurationEditorPage.java?rev=1805825&r1=1805824&r2=1805825&view=diff ============================================================================== --- directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/pages/OpenLDAPServerConfigurationEditorPage.java (original) +++ directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/pages/OpenLDAPServerConfigurationEditorPage.java Tue Aug 22 20:37:20 2017 @@ -22,7 +22,6 @@ package org.apache.directory.studio.open import org.apache.directory.studio.common.ui.CommonUIConstants; import org.apache.directory.studio.common.ui.widgets.TableWidget; -import org.apache.directory.studio.common.ui.widgets.WidgetModifyEvent; import org.apache.directory.studio.common.ui.widgets.WidgetModifyListener; import org.apache.directory.studio.openldap.config.actions.EditorExportConfigurationAction; import org.apache.directory.studio.openldap.config.actions.EditorImportConfigurationAction; @@ -33,13 +32,10 @@ import org.eclipse.jface.action.IToolBar import org.eclipse.jface.action.Separator; import org.eclipse.osgi.util.NLS; import org.eclipse.swt.SWT; -import org.eclipse.swt.events.ModifyEvent; import org.eclipse.swt.events.ModifyListener; import org.eclipse.swt.events.SelectionAdapter; import org.eclipse.swt.events.SelectionEvent; import org.eclipse.swt.events.SelectionListener; -import org.eclipse.swt.events.VerifyEvent; -import org.eclipse.swt.events.VerifyListener; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Button; @@ -70,19 +66,14 @@ public abstract class OpenLDAPServerConf /** * A listener used to set the dirty flag when a Text is updated */ - protected ModifyListener dirtyModifyListener = new ModifyListener() - { - public void modifyText( ModifyEvent e ) - { - setEditorDirty(); - } - }; + protected ModifyListener dirtyModifyListener = event -> setEditorDirty(); /** * A listener used to set the dirty flag when a widget is selected */ private SelectionListener dirtySelectionListener = new SelectionAdapter() { + @Override public void widgetSelected( SelectionEvent e ) { setEditorDirty(); @@ -92,13 +83,7 @@ public abstract class OpenLDAPServerConf /** * A listener used to set the dirty flag when a widget is updated */ - protected WidgetModifyListener dirtyWidgetModifyListener = new WidgetModifyListener() - { - public void widgetModified( WidgetModifyEvent event ) - { - setEditorDirty(); - } - }; + protected WidgetModifyListener dirtyWidgetModifyListener = event -> setEditorDirty(); /** @@ -154,6 +139,7 @@ public abstract class OpenLDAPServerConf /** * {@inheritDoc} */ + @Override protected void createFormContent( IManagedForm managedForm ) { ScrolledForm form = managedForm.getForm(); @@ -221,16 +207,13 @@ public abstract class OpenLDAPServerConf gd.widthHint = 42; portText.setLayoutData( gd ); - portText.addVerifyListener( new VerifyListener() - { - public void verifyText( VerifyEvent e ) + portText.addVerifyListener( event -> { - if ( !e.text.matches( "[0-9]*" ) ) //$NON-NLS-1$ + if ( !event.text.matches( "[0-9]*" ) ) //$NON-NLS-1$ { - e.doit = false; - } - } - } ); + event.doit = false; + } + } ); portText.setTextLimit( 5 ); Modified: directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/pages/OptionsPage.java URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/pages/OptionsPage.java?rev=1805825&r1=1805824&r2=1805825&view=diff ============================================================================== --- directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/pages/OptionsPage.java (original) +++ directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/pages/OptionsPage.java Tue Aug 22 20:37:20 2017 @@ -29,7 +29,6 @@ import java.util.Map; import org.apache.directory.studio.common.ui.CommonUIUtils; import org.apache.directory.studio.common.ui.widgets.BaseWidgetUtils; import org.apache.directory.studio.common.ui.widgets.TableWidget; -import org.apache.directory.studio.common.ui.widgets.WidgetModifyEvent; import org.apache.directory.studio.common.ui.widgets.WidgetModifyListener; import org.apache.directory.studio.common.ui.wrappers.StringValueWrapper; import org.apache.directory.studio.openldap.common.ui.model.AllowFeatureEnum; @@ -48,7 +47,6 @@ import org.apache.directory.studio.openl import org.apache.directory.studio.openldap.config.editor.wrappers.StringValueDecorator; import org.apache.directory.studio.openldap.config.model.OlcGlobal; import org.eclipse.swt.SWT; -import org.eclipse.swt.events.ModifyEvent; import org.eclipse.swt.events.ModifyListener; import org.eclipse.swt.events.SelectionAdapter; import org.eclipse.swt.events.SelectionEvent; @@ -210,11 +208,9 @@ public class OptionsPage extends OpenLDA /** * The olcAllows listener */ - private WidgetModifyListener allowFeatureListener = new WidgetModifyListener() - { - public void widgetModified( WidgetModifyEvent e ) + private WidgetModifyListener allowFeatureListener = event -> { - List allowFeatures = new ArrayList(); + List allowFeatures = new ArrayList<>(); for ( AllowFeatureEnum allowFeature : allowFeatureTableWidget.getElements() ) { @@ -222,18 +218,15 @@ public class OptionsPage extends OpenLDA } getConfiguration().getGlobal().setOlcAllows( allowFeatures ); - } - }; + }; /** * The olcDisallows listener */ - private WidgetModifyListener disallowFeatureListener = new WidgetModifyListener() - { - public void widgetModified( WidgetModifyEvent e ) + private WidgetModifyListener disallowFeatureListener = event -> { - List disallowFeatures = new ArrayList(); + List disallowFeatures = new ArrayList<>(); for ( DisallowFeatureEnum disallowFeature : disallowFeatureTableWidget.getElements() ) { @@ -241,18 +234,15 @@ public class OptionsPage extends OpenLDA } getConfiguration().getGlobal().setOlcDisallows( disallowFeatures ); - } - }; + }; /** * The olcRequires listener */ - private WidgetModifyListener requireConditionListener = new WidgetModifyListener() - { - public void widgetModified( WidgetModifyEvent e ) + private WidgetModifyListener requireConditionListener = event -> { - List requires = new ArrayList(); + List requires = new ArrayList<>(); for ( RequireConditionEnum requireCondition : requireConditionTableWidget.getElements() ) { @@ -260,18 +250,15 @@ public class OptionsPage extends OpenLDA } getConfiguration().getGlobal().setOlcRequires( requires ); - } - }; + }; /** * The olcRestrict listener */ - private WidgetModifyListener restrictOperationListener = new WidgetModifyListener() - { - public void widgetModified( WidgetModifyEvent e ) + private WidgetModifyListener restrictOperationListener = event -> { - List restricts = new ArrayList(); + List restricts = new ArrayList<>(); for ( RestrictOperationEnum restrictOperation : restrictOperationTableWidget.getElements() ) { @@ -279,18 +266,15 @@ public class OptionsPage extends OpenLDA } getConfiguration().getGlobal().setOlcRestrict( restricts ); - } - }; + }; /** * The olcAuthIdRewrite listener */ - private WidgetModifyListener authIdRewriteListener = new WidgetModifyListener() - { - public void widgetModified( WidgetModifyEvent e ) + private WidgetModifyListener authIdRewriteListener = event -> { - List authIdRewrites = new ArrayList(); + List authIdRewrites = new ArrayList<>(); for ( OrderedStringValueWrapper authIdRewrite : authIdRewriteTableWidget.getElements() ) { @@ -298,18 +282,15 @@ public class OptionsPage extends OpenLDA } getConfiguration().getGlobal().setOlcAuthIDRewrite( authIdRewrites ); - } - }; + }; /** * The olcAuthzRegexp listener */ - private WidgetModifyListener authzRegexpListener = new WidgetModifyListener() - { - public void widgetModified( WidgetModifyEvent e ) + private WidgetModifyListener authzRegexpListener = event -> { - List authzRegexps = new ArrayList(); + List authzRegexps = new ArrayList<>(); for ( OrderedStringValueWrapper authzRegexp : authzRegexpTableWidget.getElements() ) { @@ -317,54 +298,36 @@ public class OptionsPage extends OpenLDA } getConfiguration().getGlobal().setOlcAuthzRegexp( authzRegexps ); - } - }; + }; /** * The olcArgsFile listener */ - private ModifyListener argsFileTextListener = new ModifyListener() - { - public void modifyText( ModifyEvent e ) - { - getConfiguration().getGlobal().setOlcArgsFile( argsFileText.getText() ); - } - }; + private ModifyListener argsFileTextListener = event -> + getConfiguration().getGlobal().setOlcArgsFile( argsFileText.getText() ); /** * The olcPluginFileLog listener */ - private ModifyListener pluginLogFileTextListener = new ModifyListener() - { - public void modifyText( ModifyEvent e ) - { - getConfiguration().getGlobal().setOlcPluginLogFile( pluginLogFileText.getText() ); - } - }; + private ModifyListener pluginLogFileTextListener = event -> + getConfiguration().getGlobal().setOlcPluginLogFile( pluginLogFileText.getText() ); /** * The olcReferral listener */ - private ModifyListener referralTextListener = new ModifyListener() - { - public void modifyText( ModifyEvent e ) - { - getConfiguration().getGlobal().setOlcReferral( referralText.getText() ); - } - }; + private ModifyListener referralTextListener = event -> + getConfiguration().getGlobal().setOlcReferral( referralText.getText() ); /** * The olcRootDSE listener */ - private WidgetModifyListener rootDseTableListener = new WidgetModifyListener() - { - public void widgetModified( WidgetModifyEvent e ) + private WidgetModifyListener rootDseTableListener = event -> { - List rootDses = new ArrayList(); + List rootDses = new ArrayList<>(); for ( StringValueWrapper rootDse : rootDseTableWidget.getElements() ) { @@ -372,8 +335,7 @@ public class OptionsPage extends OpenLDA } getConfiguration().getGlobal().setOlcRootDSE( rootDses ); - } - }; + }; /** @@ -381,6 +343,7 @@ public class OptionsPage extends OpenLDA */ private SelectionListener authzPolicyComboListener = new SelectionAdapter() { + @Override public void widgetSelected( SelectionEvent e ) { getConfiguration().getGlobal().setOlcAuthzPolicy( authzPolicyCombo.getText() ); @@ -393,6 +356,7 @@ public class OptionsPage extends OpenLDA */ private SelectionListener gentleHupCheckboxSelectionListener = new SelectionAdapter() { + @Override public void widgetSelected( SelectionEvent e ) { getConfiguration().getGlobal().setOlcGentleHUP( gentleHupCheckbox.getSelection() ); @@ -405,6 +369,7 @@ public class OptionsPage extends OpenLDA */ private SelectionListener readOnlyCheckboxSelectionListener = new SelectionAdapter() { + @Override public void widgetSelected( SelectionEvent e ) { getConfiguration().getGlobal().setOlcReadOnly( readOnlyCheckbox.getSelection() ); @@ -417,6 +382,7 @@ public class OptionsPage extends OpenLDA */ private SelectionListener reverseLookupCheckboxSelectionListener = new SelectionAdapter() { + @Override public void widgetSelected( SelectionEvent e ) { getConfiguration().getGlobal().setOlcReverseLookup( reverseLookupCheckbox.getSelection() ); @@ -543,7 +509,7 @@ public class OptionsPage extends OpenLDA allowFeatureLabel.setLayoutData( new GridData( SWT.FILL, SWT.FILL, false, false, 2, 1 ) ); // The olcAllows parameter table - allowFeatureTableWidget = new TableWidget( new AllowFeatureDecorator( composite.getShell() ) ); + allowFeatureTableWidget = new TableWidget<>( new AllowFeatureDecorator( composite.getShell() ) ); allowFeatureTableWidget.createWidgetNoEdit( composite, toolkit ); allowFeatureTableWidget.getControl().setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false, 2, 1 ) ); @@ -555,7 +521,7 @@ public class OptionsPage extends OpenLDA disallowFeatureLabel.setLayoutData( new GridData( SWT.FILL, SWT.FILL, false, false, 2, 1 ) ); // The olcDisallows parameter table - disallowFeatureTableWidget = new TableWidget( new DisallowFeatureDecorator( composite.getShell() ) ); + disallowFeatureTableWidget = new TableWidget<>( new DisallowFeatureDecorator( composite.getShell() ) ); disallowFeatureTableWidget.createWidgetNoEdit( composite, toolkit ); disallowFeatureTableWidget.getControl().setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false, 2, 1 ) ); @@ -601,7 +567,7 @@ public class OptionsPage extends OpenLDA requireConditionLabel.setLayoutData( new GridData( SWT.FILL, SWT.FILL, false, false, 2, 1 ) ); // The olcRequires parameter table - requireConditionTableWidget = new TableWidget( new RequireConditionDecorator( composite.getShell() ) ); + requireConditionTableWidget = new TableWidget<>( new RequireConditionDecorator( composite.getShell() ) ); requireConditionTableWidget.createWidgetNoEdit( composite, toolkit ); requireConditionTableWidget.getControl().setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false, 2, 1 ) ); @@ -613,7 +579,7 @@ public class OptionsPage extends OpenLDA restrictOperationLabel.setLayoutData( new GridData( SWT.FILL, SWT.FILL, false, false, 2, 1 ) ); // The olcRestrict parameter table - restrictOperationTableWidget = new TableWidget( new RestrictOperationDecorator( composite.getShell() ) ); + restrictOperationTableWidget = new TableWidget<>( new RestrictOperationDecorator( composite.getShell() ) ); restrictOperationTableWidget.createWidgetNoEdit( composite, toolkit ); restrictOperationTableWidget.getControl().setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false, 2, 1 ) ); @@ -646,7 +612,7 @@ public class OptionsPage extends OpenLDA Composite composite = createSectionComposite( toolkit, section, 2, false ); // The olcAuthIdRewrite parameter table - authIdRewriteTableWidget = new TableWidget( + authIdRewriteTableWidget = new TableWidget<>( new OrderedStringValueDecorator( composite.getShell() , "authIdRewrite") ); authIdRewriteTableWidget.createOrderedWidgetWithEdit( composite, toolkit ); @@ -680,7 +646,7 @@ public class OptionsPage extends OpenLDA Composite composite = createSectionComposite( toolkit, section, 2, false ); // The olcAuthzRegexp parameter table - authzRegexpTableWidget = new TableWidget( + authzRegexpTableWidget = new TableWidget<>( new OrderedStringValueDecorator( composite.getShell(), "AuthzRegexp" ) ); authzRegexpTableWidget.createOrderedWidgetWithEdit( composite, toolkit ); @@ -746,7 +712,7 @@ public class OptionsPage extends OpenLDA toolkit.createLabel( composite, "" ); // The olcRootDSE parameter. - rootDseTableWidget = new TableWidget( + rootDseTableWidget = new TableWidget<>( new StringValueDecorator( composite.getShell(), Messages.getString( "OpenLDAPOptionsPage.RootDSE" ) ) ); rootDseTableWidget.createWidgetWithEdit( composite, toolkit ); @@ -825,7 +791,7 @@ public class OptionsPage extends OpenLDA private void refreshAllowFeatures( OlcGlobal global ) { List allowedFeatures = global.getOlcAllows(); - List alloweds = new ArrayList(); + List alloweds = new ArrayList<>(); if ( allowedFeatures != null ) { @@ -842,7 +808,7 @@ public class OptionsPage extends OpenLDA private void refreshDisllowFeatures( OlcGlobal global ) { List disallowedFeatures = global.getOlcDisallows(); - List disalloweds = new ArrayList(); + List disalloweds = new ArrayList<>(); if ( disallowedFeatures != null ) { @@ -859,7 +825,7 @@ public class OptionsPage extends OpenLDA private void refreshRequireConditions( OlcGlobal global ) { List requireConditions = global.getOlcRequires(); - List requires = new ArrayList(); + List requires = new ArrayList<>(); if ( requireConditions != null ) { @@ -876,7 +842,7 @@ public class OptionsPage extends OpenLDA private void refreshRestrictOperations( OlcGlobal global ) { List restrictOperations = global.getOlcRestrict(); - List restricts = new ArrayList(); + List restricts = new ArrayList<>(); if ( restrictOperations != null ) { @@ -900,9 +866,9 @@ public class OptionsPage extends OpenLDA if ( authIdRewrites != null ) { int nbElements = authIdRewrites.size(); - List rewrites = new ArrayList( nbElements ); + List rewrites = new ArrayList<>( nbElements ); int[] valuePrefixes = new int[nbElements]; - Map values = new HashMap(nbElements); + Map values = new HashMap<>(nbElements); int pos = 0; // First gather the values @@ -930,7 +896,7 @@ public class OptionsPage extends OpenLDA else { // Store an empty list - List rewrites = new ArrayList(); + List rewrites = new ArrayList<>(); authIdRewriteTableWidget.setElements( rewrites ); } @@ -944,9 +910,9 @@ public class OptionsPage extends OpenLDA if ( authzRegexps != null ) { int nbElements = authzRegexps.size(); - List regexps = new ArrayList( nbElements ); + List regexps = new ArrayList<>( nbElements ); int[] valuePrefixes = new int[nbElements]; - Map values = new HashMap(nbElements); + Map values = new HashMap<>(nbElements); int pos = 0; // First gather the values @@ -974,7 +940,7 @@ public class OptionsPage extends OpenLDA else { // Store an empty list - List regexps = new ArrayList(); + List regexps = new ArrayList<>(); authzRegexpTableWidget.setElements( regexps ); } @@ -985,7 +951,7 @@ public class OptionsPage extends OpenLDA private void refreshRootDseFiles( OlcGlobal global ) { List rootDses = global.getOlcRootDSE(); - List roots = new ArrayList(); + List roots = new ArrayList<>(); if ( rootDses != null ) { Modified: directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/pages/OverlaysPage.java URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/pages/OverlaysPage.java?rev=1805825&r1=1805824&r2=1805825&view=diff ============================================================================== --- directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/pages/OverlaysPage.java (original) +++ directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/pages/OverlaysPage.java Tue Aug 22 20:37:20 2017 @@ -69,5 +69,6 @@ public class OverlaysPage extends OpenLD */ public void refreshUI() { + // Nothing to do } }