You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2017/08/22 16:39:05 UTC
svn commit: r1805794 -
/directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/dialogs/overlays/
Author: elecharny
Date: Tue Aug 22 16:39:04 2017
New Revision: 1805794
URL: http://svn.apache.org/viewvc?rev=1805794&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/dialogs/overlays/AccessLogOverlayConfigurationBlock.java
directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/dialogs/overlays/AuditLogOverlayConfigurationBlock.java
directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/dialogs/overlays/MemberOfOverlayConfigurationBlock.java
directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/dialogs/overlays/PasswordPolicyOverlayConfigurationBlock.java
directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/dialogs/overlays/ReferentialIntegrityOverlayConfigurationBlock.java
directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/dialogs/overlays/RewriteRemapOverlayConfigurationBlock.java
directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/dialogs/overlays/SyncProvOverlayConfigurationBlock.java
directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/dialogs/overlays/ValueSortingOverlayConfigurationBlock.java
Modified: directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/dialogs/overlays/AccessLogOverlayConfigurationBlock.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/dialogs/overlays/AccessLogOverlayConfigurationBlock.java?rev=1805794&r1=1805793&r2=1805794&view=diff
==============================================================================
--- directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/dialogs/overlays/AccessLogOverlayConfigurationBlock.java (original)
+++ directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/dialogs/overlays/AccessLogOverlayConfigurationBlock.java Tue Aug 22 16:39:04 2017
@@ -31,7 +31,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;
@@ -65,7 +64,7 @@ import org.apache.directory.studio.openl
public class AccessLogOverlayConfigurationBlock extends AbstractOverlayDialogConfigurationBlock<OlcAccessLogConfig>
{
/** The attributes list */
- private List<String> attributes = new ArrayList<String>();
+ private List<String> attributes = new ArrayList<>();
// UI widgets
private EntryWidget databaseEntryWidget;
@@ -85,15 +84,12 @@ public class AccessLogOverlayConfigurati
private Spinner purgeIntervalSecondsSpinner;
// Listeners
- private ISelectionChangedListener attributesTableViewerSelectionChangedListener = new ISelectionChangedListener()
- {
- public void selectionChanged( SelectionChangedEvent event )
- {
+ private ISelectionChangedListener attributesTableViewerSelectionChangedListener = event ->
deleteAttributeButton.setEnabled( !attributesTableViewer.getSelection().isEmpty() );
- }
- };
- private SelectionListener addAttributeButtonSelectionListener = new SelectionAdapter()
+
+ private SelectionListener addAttributeButtonSelectionListener = new SelectionAdapter()
{
+ @Override
public void widgetSelected( SelectionEvent e )
{
AttributeDialog dialog = new AttributeDialog( addAttributeButton.getShell(), browserConnection );
@@ -112,6 +108,7 @@ public class AccessLogOverlayConfigurati
};
private SelectionListener deleteAttributeButtonSelectionListener = new SelectionAdapter()
{
+ @Override
public void widgetSelected( SelectionEvent e )
{
StructuredSelection selection = ( StructuredSelection ) attributesTableViewer.getSelection();
@@ -154,10 +151,12 @@ public class AccessLogOverlayConfigurati
if ( overlay == null )
{
- overlay = new OlcAccessLogConfig();
+ setOverlay( new OlcAccessLogConfig() );
+ }
+ else
+ {
+ setOverlay( overlay );
}
-
- setOverlay( overlay );
}
@@ -199,7 +198,7 @@ public class AccessLogOverlayConfigurati
logOperationsWidget = new LogOperationsWidget();
logOperationsWidget.create( logOperationsGroup );
logOperationsWidget.getControl().setLayoutData( new GridData( SWT.BEGINNING, SWT.CENTER, false, false, 2, 1 ) );
- List<LogOperationEnum> logOperations = new ArrayList<LogOperationEnum>();
+ List<LogOperationEnum> logOperations = new ArrayList<>();
logOperations.add( LogOperationEnum.ADD );
logOperations.add( LogOperationEnum.ABANDON );
logOperations.add( LogOperationEnum.SESSION );
@@ -229,6 +228,7 @@ public class AccessLogOverlayConfigurati
attributesTableViewer.setContentProvider( new ArrayContentProvider() );
attributesTableViewer.setLabelProvider( new LabelProvider()
{
+ @Override
public Image getImage( Object element )
{
return OpenLdapConfigurationPlugin.getDefault().getImage(
@@ -369,7 +369,7 @@ public class AccessLogOverlayConfigurati
//
List<String> logOperationsValues = overlay.getOlcAccessLogOps();
- if ( ( logOperationsValues != null ) && ( logOperationsValues.size() > 0 ) )
+ if ( ( logOperationsValues != null ) && !logOperationsValues.isEmpty() )
{
logOperationsWidget.setInput( getAccessLogOperations( logOperationsValues ) );
}
@@ -383,7 +383,7 @@ public class AccessLogOverlayConfigurati
//
List<String> attributeValues = overlay.getOlcAccessLogOldAttr();
- if ( ( attributeValues != null ) && ( attributeValues.size() > 0 ) )
+ if ( ( attributeValues != null ) && !attributeValues.isEmpty() )
{
for ( String attribute : attributeValues )
{
@@ -487,7 +487,7 @@ public class AccessLogOverlayConfigurati
*/
private List<String> getAccessLogOperationsValues()
{
- List<String> accessLogOperations = new ArrayList<String>();
+ List<String> accessLogOperations = new ArrayList<>();
List<LogOperationEnum> logOperations = logOperationsWidget.getSelectedOperationsList();
for ( LogOperationEnum logOperation : logOperations )
@@ -507,7 +507,7 @@ public class AccessLogOverlayConfigurati
*/
private List<LogOperationEnum> getAccessLogOperations( List<String> logOperationsValues )
{
- List<LogOperationEnum> logOperations = new ArrayList<LogOperationEnum>();
+ List<LogOperationEnum> logOperations = new ArrayList<>();
for ( String logOperationValue : logOperationsValues )
{
Modified: directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/dialogs/overlays/AuditLogOverlayConfigurationBlock.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/dialogs/overlays/AuditLogOverlayConfigurationBlock.java?rev=1805794&r1=1805793&r2=1805794&view=diff
==============================================================================
--- directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/dialogs/overlays/AuditLogOverlayConfigurationBlock.java (original)
+++ directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/dialogs/overlays/AuditLogOverlayConfigurationBlock.java Tue Aug 22 16:39:04 2017
@@ -52,12 +52,15 @@ public class AuditLogOverlayConfiguratio
public AuditLogOverlayConfigurationBlock( OverlayDialog dialog, OlcAuditlogConfig overlay )
{
super( dialog );
+
if ( overlay == null )
{
- overlay = new OlcAuditlogConfig();
+ setOverlay( new OlcAuditlogConfig() );
+ }
+ else
+ {
+ setOverlay( overlay );
}
-
- setOverlay( overlay );
}
@@ -85,7 +88,7 @@ public class AuditLogOverlayConfiguratio
{
List<String> auditLogFilesList = overlay.getOlcAuditlogFile();
- if ( auditLogFilesList != null && auditLogFilesList.size() > 0 )
+ if ( auditLogFilesList != null && !auditLogFilesList.isEmpty() )
{
fileBrowserWidget.setFilename( auditLogFilesList.get( 0 ) );
}
Modified: directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/dialogs/overlays/MemberOfOverlayConfigurationBlock.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/dialogs/overlays/MemberOfOverlayConfigurationBlock.java?rev=1805794&r1=1805793&r2=1805794&view=diff
==============================================================================
--- directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/dialogs/overlays/MemberOfOverlayConfigurationBlock.java (original)
+++ directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/dialogs/overlays/MemberOfOverlayConfigurationBlock.java Tue Aug 22 16:39:04 2017
@@ -104,10 +104,12 @@ public class MemberOfOverlayConfiguratio
if ( overlay == null )
{
- overlay = new OlcMemberOf();
+ setOverlay( new OlcMemberOf() );
+ }
+ else
+ {
+ setOverlay( overlay );
}
-
- setOverlay( overlay );
init();
}
@@ -128,8 +130,8 @@ public class MemberOfOverlayConfiguratio
*/
private void initAttributeTypesAndObjectClassesLists()
{
- connectionAttributeTypes = new ArrayList<String>();
- connectionObjectClasses = new ArrayList<String>();
+ connectionAttributeTypes = new ArrayList<>();
+ connectionObjectClasses = new ArrayList<>();
if ( browserConnection != null )
{
@@ -156,13 +158,7 @@ public class MemberOfOverlayConfiguratio
}
// Creating a case insensitive comparator
- Comparator<String> ignoreCaseComparator = new Comparator<String>()
- {
- public int compare( String o1, String o2 )
- {
- return o1.compareToIgnoreCase( o2 );
- }
- };
+ Comparator<String> ignoreCaseComparator = ( o1, o2 ) -> o1.compareToIgnoreCase( o2 );
// Sorting the lists
Collections.sort( connectionAttributeTypes, ignoreCaseComparator );
@@ -177,7 +173,7 @@ public class MemberOfOverlayConfiguratio
private void initResultCodesList()
{
// Initializing the list
- resultCodes = new ArrayList<ResultCodeEnum>();
+ resultCodes = new ArrayList<>();
// Adding all result codes to the list
resultCodes.add( ResultCodeEnum.SUCCESS );
@@ -227,13 +223,7 @@ public class MemberOfOverlayConfiguratio
resultCodes.add( ResultCodeEnum.UNKNOWN );
// Sorting the list
- Collections.sort( resultCodes, new Comparator<ResultCodeEnum>()
- {
- public int compare( ResultCodeEnum o1, ResultCodeEnum o2 )
- {
- return Integer.compare( o1.getResultCode(), o2.getResultCode() );
- }
- } );
+ Collections.sort( resultCodes, ( o1, o2 ) -> Integer.compare( o1.getResultCode(), o2.getResultCode() ) );
}
@@ -281,6 +271,7 @@ public class MemberOfOverlayConfiguratio
danglingReferenceBehaviorComboViewer.setContentProvider( new ArrayContentProvider() );
danglingReferenceBehaviorComboViewer.setLabelProvider( new LabelProvider()
{
+ @Override
public String getText( Object element )
{
if ( element instanceof OlcMemberOfDanglingReferenceBehaviorEnum )
@@ -299,7 +290,7 @@ public class MemberOfOverlayConfiguratio
}
return super.getText( element );
- };
+ }
} );
danglingReferenceBehaviorComboViewer.setInput( new OlcMemberOfDanglingReferenceBehaviorEnum[]
{
@@ -316,6 +307,7 @@ public class MemberOfOverlayConfiguratio
danglingReferenceErrorCodeComboViewer.setContentProvider( new ArrayContentProvider() );
danglingReferenceErrorCodeComboViewer.setLabelProvider( new LabelProvider()
{
+ @Override
public String getText( Object element )
{
if ( element instanceof ResultCodeEnum )
@@ -327,7 +319,7 @@ public class MemberOfOverlayConfiguratio
}
return super.getText( element );
- };
+ }
} );
danglingReferenceErrorCodeComboViewer.setInput( resultCodes );
@@ -506,7 +498,7 @@ public class MemberOfOverlayConfiguratio
if ( ( danglingReferenceErrorCode != null )
&& ( !ResultCodeEnum.CONSTRAINT_VIOLATION.equals( danglingReferenceErrorCode ) ) )
{
- overlay.setOlcMemberOfDanglingError( danglingReferenceErrorCode.getResultCode() + "" );
+ overlay.setOlcMemberOfDanglingError( Integer.toString( danglingReferenceErrorCode.getResultCode() ) );
}
else
{
Modified: directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/dialogs/overlays/PasswordPolicyOverlayConfigurationBlock.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/dialogs/overlays/PasswordPolicyOverlayConfigurationBlock.java?rev=1805794&r1=1805793&r2=1805794&view=diff
==============================================================================
--- directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/dialogs/overlays/PasswordPolicyOverlayConfigurationBlock.java (original)
+++ directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/dialogs/overlays/PasswordPolicyOverlayConfigurationBlock.java Tue Aug 22 16:39:04 2017
@@ -61,10 +61,12 @@ public class PasswordPolicyOverlayConfig
if ( overlay == null )
{
- overlay = new OlcPPolicyConfig();
+ setOverlay( new OlcPPolicyConfig() );
+ }
+ else
+ {
+ setOverlay( overlay );
}
-
- setOverlay( overlay );
}
Modified: directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/dialogs/overlays/ReferentialIntegrityOverlayConfigurationBlock.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/dialogs/overlays/ReferentialIntegrityOverlayConfigurationBlock.java?rev=1805794&r1=1805793&r2=1805794&view=diff
==============================================================================
--- directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/dialogs/overlays/ReferentialIntegrityOverlayConfigurationBlock.java (original)
+++ directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/dialogs/overlays/ReferentialIntegrityOverlayConfigurationBlock.java Tue Aug 22 16:39:04 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;
@@ -62,7 +61,7 @@ public class ReferentialIntegrityOverlay
private static final String DEFAULT_MODIFIER_NAME = "cn=Referential Integrity Overlay";
/** The attributes list */
- private List<String> attributes = new ArrayList<String>();
+ private List<String> attributes = new ArrayList<>();
// UI widgets
private TableViewer attributesTableViewer;
@@ -72,15 +71,12 @@ public class ReferentialIntegrityOverlay
private EntryWidget modifierNameEntryWidget;
// Listeners
- private ISelectionChangedListener attributesTableViewerSelectionChangedListener = new ISelectionChangedListener()
- {
- public void selectionChanged( SelectionChangedEvent event )
- {
- deleteAttributeButton.setEnabled( !attributesTableViewer.getSelection().isEmpty() );
- }
- };
+ private ISelectionChangedListener attributesTableViewerSelectionChangedListener = event ->
+ deleteAttributeButton.setEnabled( !attributesTableViewer.getSelection().isEmpty() );
+
private SelectionListener addAttributeButtonSelectionListener = new SelectionAdapter()
{
+ @Override
public void widgetSelected( SelectionEvent e )
{
AttributeDialog dialog = new AttributeDialog( addAttributeButton.getShell(), browserConnection );
@@ -99,6 +95,7 @@ public class ReferentialIntegrityOverlay
};
private SelectionListener deleteAttributeButtonSelectionListener = new SelectionAdapter()
{
+ @Override
public void widgetSelected( SelectionEvent e )
{
StructuredSelection selection = ( StructuredSelection ) attributesTableViewer.getSelection();
@@ -125,12 +122,15 @@ public class ReferentialIntegrityOverlay
OlcRefintConfig overlay )
{
super( dialog, connection );
+
if ( overlay == null )
{
- overlay = new OlcRefintConfig();
+ setOverlay( new OlcRefintConfig() );
+ }
+ else
+ {
+ setOverlay( overlay );
}
-
- setOverlay( overlay );
}
@@ -154,6 +154,7 @@ public class ReferentialIntegrityOverlay
attributesTableViewer.setContentProvider( new ArrayContentProvider() );
attributesTableViewer.setLabelProvider( new LabelProvider()
{
+ @Override
public Image getImage( Object element )
{
return OpenLdapConfigurationPlugin.getDefault().getImage(
@@ -198,7 +199,7 @@ public class ReferentialIntegrityOverlay
// Attributes
List<String> attributeValues = overlay.getOlcRefintAttribute();
- if ( ( attributeValues != null ) && ( attributeValues.size() > 0 ) )
+ if ( ( attributeValues != null ) && attributeValues.isEmpty() )
{
for ( String attribute : attributeValues )
{
Modified: directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/dialogs/overlays/RewriteRemapOverlayConfigurationBlock.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/dialogs/overlays/RewriteRemapOverlayConfigurationBlock.java?rev=1805794&r1=1805793&r2=1805794&view=diff
==============================================================================
--- directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/dialogs/overlays/RewriteRemapOverlayConfigurationBlock.java (original)
+++ directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/dialogs/overlays/RewriteRemapOverlayConfigurationBlock.java Tue Aug 22 16:39:04 2017
@@ -26,10 +26,8 @@ import java.util.List;
import org.apache.directory.studio.common.ui.widgets.BaseWidgetUtils;
import org.apache.directory.studio.ldapbrowser.core.model.IBrowserConnection;
import org.eclipse.jface.viewers.ArrayContentProvider;
-import org.eclipse.jface.viewers.DoubleClickEvent;
import org.eclipse.jface.viewers.IDoubleClickListener;
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.swt.SWT;
@@ -54,7 +52,7 @@ import org.apache.directory.studio.openl
public class RewriteRemapOverlayConfigurationBlock extends AbstractOverlayDialogConfigurationBlock<OlcRwmConfig>
{
/** The mappings list */
- private List<String> mappings = new ArrayList<String>();
+ private List<String> mappings = new ArrayList<>();
// UI widgets
private TableViewer mappingsTableViewer;
@@ -63,22 +61,14 @@ public class RewriteRemapOverlayConfigur
private Button deleteMappingButton;
// Listeners
- private ISelectionChangedListener mappingsTableViewerSelectionChangedListener = new ISelectionChangedListener()
- {
- public void selectionChanged( SelectionChangedEvent event )
- {
+ private ISelectionChangedListener mappingsTableViewerSelectionChangedListener = event ->
deleteMappingButton.setEnabled( !mappingsTableViewer.getSelection().isEmpty() );
- }
- };
- private IDoubleClickListener mappingsTableViewerDoubleClickListener = new IDoubleClickListener()
- {
- public void doubleClick( DoubleClickEvent event )
- {
- editMappingButtonAction();
- }
- };
+
+ private IDoubleClickListener mappingsTableViewerDoubleClickListener = event -> editMappingButtonAction();
+
private SelectionListener addMappingButtonSelectionListener = new SelectionAdapter()
{
+ @Override
public void widgetSelected( SelectionEvent e )
{
RwmMappingDialog dialog = new RwmMappingDialog( addMappingButton.getShell(), browserConnection, "" );
@@ -94,6 +84,7 @@ public class RewriteRemapOverlayConfigur
};
private SelectionListener editMappingButtonSelectionListener = new SelectionAdapter()
{
+ @Override
public void widgetSelected( SelectionEvent e )
{
editMappingButtonAction();
@@ -101,6 +92,7 @@ public class RewriteRemapOverlayConfigur
};
private SelectionListener deleteMappingButtonSelectionListener = new SelectionAdapter()
{
+ @Override
public void widgetSelected( SelectionEvent e )
{
StructuredSelection selection = ( StructuredSelection ) mappingsTableViewer.getSelection();
@@ -127,12 +119,15 @@ public class RewriteRemapOverlayConfigur
OlcRwmConfig overlay )
{
super( dialog, connection );
+
if ( overlay == null )
{
- overlay = new OlcRwmConfig();
+ setOverlay( new OlcRwmConfig() );
+ }
+ else
+ {
+ setOverlay( overlay );
}
-
- setOverlay( overlay );
}
Modified: directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/dialogs/overlays/SyncProvOverlayConfigurationBlock.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/dialogs/overlays/SyncProvOverlayConfigurationBlock.java?rev=1805794&r1=1805793&r2=1805794&view=diff
==============================================================================
--- directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/dialogs/overlays/SyncProvOverlayConfigurationBlock.java (original)
+++ directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/dialogs/overlays/SyncProvOverlayConfigurationBlock.java Tue Aug 22 16:39:04 2017
@@ -21,8 +21,6 @@ package org.apache.directory.studio.open
import org.apache.directory.studio.common.ui.widgets.BaseWidgetUtils;
-import org.eclipse.swt.events.VerifyEvent;
-import org.eclipse.swt.events.VerifyListener;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Composite;
@@ -57,12 +55,15 @@ public class SyncProvOverlayConfiguratio
public SyncProvOverlayConfigurationBlock( OverlayDialog dialog, OlcSyncProvConfig overlay )
{
super( dialog );
+
if ( overlay == null )
{
- overlay = new OlcSyncProvConfig();
+ setOverlay( new OlcSyncProvConfig() );
+ }
+ else
+ {
+ setOverlay( overlay );
}
-
- setOverlay( overlay );
}
@@ -107,16 +108,13 @@ public class SyncProvOverlayConfiguratio
{
Text integerText = BaseWidgetUtils.createText( parent, text, span );
- integerText.addVerifyListener( new VerifyListener()
- {
- public void verifyText( VerifyEvent e )
+ integerText.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;
}
- }
- } );
+ } );
GridData gd = new GridData();
gd.widthHint = 40;
@@ -147,7 +145,7 @@ public class SyncProvOverlayConfiguratio
{
int checkpointOperations = Integer.parseInt( checkpointConfigurationElements[0] );
- checkpointOperationsText.setText( "" + checkpointOperations );
+ checkpointOperationsText.setText( Integer.toString( checkpointOperations ) );
}
catch ( NumberFormatException e )
{
@@ -160,7 +158,7 @@ public class SyncProvOverlayConfiguratio
{
int checkpointMinutes = Integer.parseInt( checkpointConfigurationElements[1] );
- checkpointMinutesText.setText( "" + checkpointMinutes );
+ checkpointMinutesText.setText( Integer.toString( checkpointMinutes ) );
}
catch ( NumberFormatException e )
{
Modified: directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/dialogs/overlays/ValueSortingOverlayConfigurationBlock.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/dialogs/overlays/ValueSortingOverlayConfigurationBlock.java?rev=1805794&r1=1805793&r2=1805794&view=diff
==============================================================================
--- directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/dialogs/overlays/ValueSortingOverlayConfigurationBlock.java (original)
+++ directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/dialogs/overlays/ValueSortingOverlayConfigurationBlock.java Tue Aug 22 16:39:04 2017
@@ -26,10 +26,8 @@ import java.util.List;
import org.apache.directory.studio.common.ui.widgets.BaseWidgetUtils;
import org.apache.directory.studio.ldapbrowser.core.model.IBrowserConnection;
import org.eclipse.jface.viewers.ArrayContentProvider;
-import org.eclipse.jface.viewers.DoubleClickEvent;
import org.eclipse.jface.viewers.IDoubleClickListener;
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.swt.SWT;
@@ -55,7 +53,7 @@ public class ValueSortingOverlayConfigur
AbstractOverlayDialogConfigurationBlock<OlcValSortConfig>
{
/** The value sorts list */
- private List<String> valueSorts = new ArrayList<String>();
+ private List<String> valueSorts = new ArrayList<>();
// UI widgets
private TableViewer valueSortsTableViewer;
@@ -64,22 +62,14 @@ public class ValueSortingOverlayConfigur
private Button deleteValueSortButton;
// Listeners
- private ISelectionChangedListener valueSortsTableViewerSelectionChangedListener = new ISelectionChangedListener()
- {
- public void selectionChanged( SelectionChangedEvent event )
- {
- deleteValueSortButton.setEnabled( !valueSortsTableViewer.getSelection().isEmpty() );
- }
- };
- private IDoubleClickListener valueSortsTableViewerDoubleClickListener = new IDoubleClickListener()
- {
- public void doubleClick( DoubleClickEvent event )
- {
- editValueSortButtonAction();
- }
- };
+ private ISelectionChangedListener valueSortsTableViewerSelectionChangedListener = event ->
+ deleteValueSortButton.setEnabled( !valueSortsTableViewer.getSelection().isEmpty() );
+
+ private IDoubleClickListener valueSortsTableViewerDoubleClickListener = event -> editValueSortButtonAction();
+
private SelectionListener addValueSortButtonSelectionListener = new SelectionAdapter()
{
+ @Override
public void widgetSelected( SelectionEvent e )
{
ValueSortingValueDialog dialog = new ValueSortingValueDialog( addValueSortButton.getShell(),
@@ -96,6 +86,7 @@ public class ValueSortingOverlayConfigur
};
private SelectionListener editValueSortButtonSelectionListener = new SelectionAdapter()
{
+ @Override
public void widgetSelected( SelectionEvent e )
{
editValueSortButtonAction();
@@ -103,6 +94,7 @@ public class ValueSortingOverlayConfigur
};
private SelectionListener deleteValueSortButtonSelectionListener = new SelectionAdapter()
{
+ @Override
public void widgetSelected( SelectionEvent e )
{
StructuredSelection selection = ( StructuredSelection ) valueSortsTableViewer.getSelection();
@@ -129,12 +121,15 @@ public class ValueSortingOverlayConfigur
OlcValSortConfig overlay )
{
super( dialog, connection );
+
if ( overlay == null )
{
- overlay = new OlcValSortConfig();
+ setOverlay( new OlcValSortConfig() );
+ }
+ else
+ {
+ setOverlay( overlay );
}
-
- setOverlay( overlay );
}