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 2015/07/28 00:58:28 UTC
svn commit: r1692970 - in
/directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio:
ldapbrowser/common/actions/ ldapbrowser/common/dnd/
ldapbrowser/common/filtereditor/ ldapbrowser/common/widgets/browser/
ldapbrowser...
Author: elecharny
Date: Mon Jul 27 22:58:28 2015
New Revision: 1692970
URL: http://svn.apache.org/r1692970
Log:
o Removed useless checked on x != null when && ( x instanceof X )
o Same for check of x == null when && !( x instanceof X )
Modified:
directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/BrowserSelectionUtils.java
directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/FetchOperationalAttributesAction.java
directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/NewAttributeAction.java
directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/RefreshAction.java
directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/SelectAllAction.java
directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dnd/EntryTransfer.java
directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dnd/SearchTransfer.java
directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dnd/ValuesTransfer.java
directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/filtereditor/FilterAutoEditStrategy.java
directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/filtereditor/FilterContentAssistProcessor.java
directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserQuickSearchWidget.java
directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/EntryEditorPasteAction.java
directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/EntryEditorWidgetCellModifier.java
directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/EntryEditorWidgetContentProvider.java
directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/EntryEditorWidgetLabelProvider.java
directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/valueeditors/AbstractDialogBinaryValueEditor.java
directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/valueeditors/AbstractDialogStringValueEditor.java
directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/valueeditors/AbstractDialogValueEditor.java
directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/valueeditors/AbstractInPlaceStringValueEditor.java
directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/valueeditors/TextValueEditor.java
Modified: directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/BrowserSelectionUtils.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/BrowserSelectionUtils.java?rev=1692970&r1=1692969&r2=1692970&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/BrowserSelectionUtils.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/BrowserSelectionUtils.java Mon Jul 27 22:58:28 2015
@@ -84,7 +84,7 @@ public abstract class BrowserSelectionUt
exampleSearch.getSearchParameter().setName( null );
exampleSearch.setScope( SearchScope.SUBTREE );
- if ( selection != null && !selection.isEmpty() && selection instanceof StructuredSelection )
+ if ( ( selection instanceof StructuredSelection ) && !selection.isEmpty() )
{
Object[] objects = ( ( IStructuredSelection ) selection ).toArray();
Comparator<Object> comparator = new Comparator<Object>()
Modified: directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/FetchOperationalAttributesAction.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/FetchOperationalAttributesAction.java?rev=1692970&r1=1692969&r2=1692970&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/FetchOperationalAttributesAction.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/FetchOperationalAttributesAction.java Mon Jul 27 22:58:28 2015
@@ -139,7 +139,7 @@ public class FetchOperationalAttributesA
{
entriesList.add( bm.getEntry() );
}
- if ( getInput() != null && getInput() instanceof IEntry )
+ if ( getInput() instanceof IEntry )
{
// the entry input is usually a cloned entry, lookup the real entry from connection
IEntry input = ( IEntry ) getInput();
Modified: directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/NewAttributeAction.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/NewAttributeAction.java?rev=1692970&r1=1692969&r2=1692970&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/NewAttributeAction.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/NewAttributeAction.java Mon Jul 27 22:58:28 2015
@@ -63,7 +63,7 @@ public class NewAttributeAction extends
{
IEntry entry = null;
- if ( getInput() != null && getInput() instanceof IEntry )
+ if ( getInput() instanceof IEntry )
{
entry = ( IEntry ) getInput();
}
@@ -144,7 +144,7 @@ public class NewAttributeAction extends
return false;
}
- return ( ( getInput() != null && getInput() instanceof IEntry ) || getSelectedEntries().length == 1
+ return ( ( getInput() instanceof IEntry ) || getSelectedEntries().length == 1
|| getSelectedAttributes().length > 0 || getSelectedValues().length > 0 );
}
}
Modified: directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/RefreshAction.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/RefreshAction.java?rev=1692970&r1=1692969&r2=1692970&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/RefreshAction.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/RefreshAction.java Mon Jul 27 22:58:28 2015
@@ -240,7 +240,7 @@ public class RefreshAction extends Brows
*/
private IEntry getEntryInput()
{
- if ( getInput() != null && getInput() instanceof IEntry )
+ if ( getInput() instanceof IEntry )
{
return ( IEntry ) getInput();
}
@@ -259,7 +259,7 @@ public class RefreshAction extends Brows
*/
private ISearch getSearchInput()
{
- if ( getInput() != null && getInput() instanceof ISearch )
+ if ( getInput() instanceof ISearch )
{
return ( ISearch ) getInput();
}
Modified: directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/SelectAllAction.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/SelectAllAction.java?rev=1692970&r1=1692969&r2=1692970&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/SelectAllAction.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/SelectAllAction.java Mon Jul 27 22:58:28 2015
@@ -98,7 +98,7 @@ public class SelectAllAction extends Bro
*/
public void run()
{
- if ( getInput() != null && getInput() instanceof IEntry )
+ if ( getInput() instanceof IEntry )
{
List selectionList = new ArrayList();
IAttribute[] attributes = ( ( IEntry ) getInput() ).getAttributes();
@@ -113,7 +113,7 @@ public class SelectAllAction extends Bro
StructuredSelection selection = new StructuredSelection( selectionList );
this.viewer.setSelection( selection );
}
- else if ( getInput() != null && getInput() instanceof ConnectionManager )
+ else if ( getInput() instanceof ConnectionManager )
{
StructuredSelection selection = new StructuredSelection( ( ( ConnectionManager ) getInput() )
.getConnections() );
Modified: directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dnd/EntryTransfer.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dnd/EntryTransfer.java?rev=1692970&r1=1692969&r2=1692970&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dnd/EntryTransfer.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dnd/EntryTransfer.java Mon Jul 27 22:58:28 2015
@@ -88,7 +88,7 @@ public class EntryTransfer extends ByteA
*/
public void javaToNative( Object object, TransferData transferData )
{
- if ( object == null || !( object instanceof IEntry[] ) )
+ if ( !( object instanceof IEntry[] ) )
{
return;
}
Modified: directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dnd/SearchTransfer.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dnd/SearchTransfer.java?rev=1692970&r1=1692969&r2=1692970&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dnd/SearchTransfer.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dnd/SearchTransfer.java Mon Jul 27 22:58:28 2015
@@ -87,7 +87,7 @@ public class SearchTransfer extends Byte
*/
public void javaToNative( Object object, TransferData transferData )
{
- if ( object == null || !( object instanceof ISearch[] ) )
+ if ( !( object instanceof ISearch[] ) )
{
return;
}
Modified: directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dnd/ValuesTransfer.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dnd/ValuesTransfer.java?rev=1692970&r1=1692969&r2=1692970&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dnd/ValuesTransfer.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dnd/ValuesTransfer.java Mon Jul 27 22:58:28 2015
@@ -88,7 +88,7 @@ public class ValuesTransfer extends Byte
*/
public void javaToNative( Object object, TransferData transferData )
{
- if ( object == null || !( object instanceof IValue[] ) )
+ if ( !( object instanceof IValue[] ) )
{
return;
}
Modified: directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/filtereditor/FilterAutoEditStrategy.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/filtereditor/FilterAutoEditStrategy.java?rev=1692970&r1=1692969&r2=1692970&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/filtereditor/FilterAutoEditStrategy.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/filtereditor/FilterAutoEditStrategy.java Mon Jul 27 22:58:28 2015
@@ -149,7 +149,6 @@ public class FilterAutoEditStrategy exte
// isSurroundNested
if ( filter.getStartToken() != null
- && filter.getFilterComponent() != null
&& ( filter.getFilterComponent() instanceof LdapAndFilterComponent
|| filter.getFilterComponent() instanceof LdapOrFilterComponent || filter.getFilterComponent() instanceof LdapNotFilterComponent ) )
{
Modified: directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/filtereditor/FilterContentAssistProcessor.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/filtereditor/FilterContentAssistProcessor.java?rev=1692970&r1=1692969&r2=1692970&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/filtereditor/FilterContentAssistProcessor.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/filtereditor/FilterContentAssistProcessor.java Mon Jul 27 22:58:28 2015
@@ -316,7 +316,7 @@ public class FilterContentAssistProcesso
}
// case A: simple filter
- if ( filter.getFilterComponent() != null && filter.getFilterComponent() instanceof LdapFilterItemComponent )
+ if ( filter.getFilterComponent() instanceof LdapFilterItemComponent )
{
LdapFilterItemComponent fc = ( LdapFilterItemComponent ) filter.getFilterComponent();
@@ -364,8 +364,7 @@ public class FilterContentAssistProcesso
}
// case B: extensible filter
- if ( filter.getFilterComponent() != null
- && filter.getFilterComponent() instanceof LdapFilterExtensibleComponent )
+ if ( filter.getFilterComponent() instanceof LdapFilterExtensibleComponent )
{
LdapFilterExtensibleComponent fc = ( LdapFilterExtensibleComponent ) filter.getFilterComponent();
Modified: directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserQuickSearchWidget.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserQuickSearchWidget.java?rev=1692970&r1=1692969&r2=1692970&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserQuickSearchWidget.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserQuickSearchWidget.java Mon Jul 27 22:58:28 2015
@@ -456,11 +456,11 @@ public class BrowserQuickSearchWidget
{
create();
Object input = browserWidget.getViewer().getInput();
- if ( input != null && input instanceof IBrowserConnection )
+ if ( input instanceof IBrowserConnection )
{
setInput( ( IBrowserConnection ) input );
}
- else if ( input != null && input instanceof IEntry[] )
+ else if ( input instanceof IEntry[] )
{
setInput( ( ( IEntry[] ) input )[0].getBrowserConnection() );
}
Modified: directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/EntryEditorPasteAction.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/EntryEditorPasteAction.java?rev=1692970&r1=1692969&r2=1692970&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/EntryEditorPasteAction.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/EntryEditorPasteAction.java Mon Jul 27 22:58:28 2015
@@ -115,7 +115,7 @@ public class EntryEditorPasteAction exte
if ( getInput() instanceof IEntry || getInput() instanceof AttributeHierarchy )
{
Object content = this.getFromClipboard( ValuesTransfer.getInstance() );
- if ( content != null && content instanceof IValue[] )
+ if ( content instanceof IValue[] )
{
IValue[] values = ( IValue[] ) content;
return values;
Modified: directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/EntryEditorWidgetCellModifier.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/EntryEditorWidgetCellModifier.java?rev=1692970&r1=1692969&r2=1692970&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/EntryEditorWidgetCellModifier.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/EntryEditorWidgetCellModifier.java Mon Jul 27 22:58:28 2015
@@ -66,7 +66,7 @@ public class EntryEditorWidgetCellModifi
*/
public boolean canModify( Object element, String property )
{
- if ( ( element != null ) && ( element instanceof IValue ) && ( valueEditorManager != null ) )
+ if ( ( element instanceof IValue ) && ( valueEditorManager != null ) )
{
IValue attributeValue = ( IValue ) element;
@@ -90,7 +90,7 @@ public class EntryEditorWidgetCellModifi
*/
public Object getValue( Object element, String property )
{
- if ( element != null && element instanceof IValue && valueEditorManager != null )
+ if ( ( element instanceof IValue ) && ( valueEditorManager != null ) )
{
IValue attributeValue = ( IValue ) element;
Object returnValue;
@@ -121,12 +121,12 @@ public class EntryEditorWidgetCellModifi
*/
public void modify( Object element, String property, Object newRawValue )
{
- if ( element != null && element instanceof Item )
+ if ( element instanceof Item )
{
element = ( ( Item ) element ).getData();
}
- if ( newRawValue != null && element != null && element instanceof IValue && valueEditorManager != null )
+ if ( ( newRawValue != null ) && ( element instanceof IValue ) && ( valueEditorManager != null ) )
{
IValue oldValue = ( IValue ) element;
Modified: directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/EntryEditorWidgetContentProvider.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/EntryEditorWidgetContentProvider.java?rev=1692970&r1=1692969&r2=1692970&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/EntryEditorWidgetContentProvider.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/EntryEditorWidgetContentProvider.java Mon Jul 27 22:58:28 2015
@@ -76,12 +76,12 @@ public class EntryEditorWidgetContentPro
String dn = ""; //$NON-NLS-1$
boolean enabled = true;
- if ( ( newInput != null ) && ( newInput instanceof IEntry ) )
+ if ( newInput instanceof IEntry )
{
IEntry entry = ( IEntry ) newInput;
dn = Messages.getString( "EntryEditorWidgetContentProvider.DNLabel" ) + entry.getDn().getName(); //$NON-NLS-1$
}
- else if ( ( newInput != null ) && ( newInput instanceof AttributeHierarchy ) )
+ else if ( newInput instanceof AttributeHierarchy )
{
AttributeHierarchy ah = ( AttributeHierarchy ) newInput;
dn = Messages.getString( "EntryEditorWidgetContentProvider.DNLabel" ) + ah.getAttribute().getEntry().getDn().getName(); //$NON-NLS-1$
@@ -125,7 +125,7 @@ public class EntryEditorWidgetContentPro
*/
public Object[] getElements( Object inputElement )
{
- if ( ( inputElement != null ) && ( inputElement instanceof IEntry ) )
+ if ( inputElement instanceof IEntry )
{
IEntry entry = ( IEntry ) inputElement;
@@ -145,7 +145,7 @@ public class EntryEditorWidgetContentPro
return values;
}
}
- else if ( ( inputElement != null ) && ( inputElement instanceof AttributeHierarchy ) )
+ else if ( inputElement instanceof AttributeHierarchy )
{
AttributeHierarchy ah = ( AttributeHierarchy ) inputElement;
IAttribute[] attributes = ah.getAttributes();
Modified: directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/EntryEditorWidgetLabelProvider.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/EntryEditorWidgetLabelProvider.java?rev=1692970&r1=1692969&r2=1692970&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/EntryEditorWidgetLabelProvider.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/EntryEditorWidgetLabelProvider.java Mon Jul 27 22:58:28 2015
@@ -93,7 +93,7 @@ public class EntryEditorWidgetLabelProvi
*/
public final String getColumnText( Object obj, int index )
{
- if ( obj != null && obj instanceof IValue )
+ if ( obj instanceof IValue )
{
IValue value = ( IValue ) obj;
switch ( index )
@@ -108,7 +108,7 @@ public class EntryEditorWidgetLabelProvi
return ""; //$NON-NLS-1$
}
}
- else if ( obj != null && obj instanceof IAttribute )
+ else if ( obj instanceof IAttribute )
{
IAttribute attribute = ( IAttribute ) obj;
if ( index == EntryEditorWidgetTableMetadata.KEY_COLUMN_INDEX )
Modified: directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/valueeditors/AbstractDialogBinaryValueEditor.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/valueeditors/AbstractDialogBinaryValueEditor.java?rev=1692970&r1=1692969&r2=1692970&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/valueeditors/AbstractDialogBinaryValueEditor.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/valueeditors/AbstractDialogBinaryValueEditor.java Mon Jul 27 22:58:28 2015
@@ -168,11 +168,7 @@ public abstract class AbstractDialogBina
*/
public Object getStringOrBinaryValue( Object rawValue )
{
- if ( rawValue == null )
- {
- return null;
- }
- else if ( rawValue instanceof byte[] )
+ if ( rawValue instanceof byte[] )
{
return rawValue;
}
Modified: directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/valueeditors/AbstractDialogStringValueEditor.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/valueeditors/AbstractDialogStringValueEditor.java?rev=1692970&r1=1692969&r2=1692970&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/valueeditors/AbstractDialogStringValueEditor.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/valueeditors/AbstractDialogStringValueEditor.java Mon Jul 27 22:58:28 2015
@@ -139,11 +139,7 @@ public abstract class AbstractDialogStri
*/
public Object getStringOrBinaryValue( Object rawValue )
{
- if ( rawValue == null )
- {
- return null;
- }
- else if ( rawValue instanceof String )
+ if ( rawValue instanceof String )
{
return rawValue;
}
Modified: directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/valueeditors/AbstractDialogValueEditor.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/valueeditors/AbstractDialogValueEditor.java?rev=1692970&r1=1692969&r2=1692970&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/valueeditors/AbstractDialogValueEditor.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/valueeditors/AbstractDialogValueEditor.java Mon Jul 27 22:58:28 2015
@@ -133,9 +133,10 @@ public abstract class AbstractDialogValu
*/
protected final void doSetValue( Object value )
{
- if ( value != null && value instanceof IValue.EmptyValue )
+ if ( value instanceof IValue.EmptyValue )
{
IValue.EmptyValue emptyValue = ( IValue.EmptyValue ) value;
+
if ( emptyValue.isBinary() )
{
value = emptyValue.getBinaryValue();
@@ -145,6 +146,7 @@ public abstract class AbstractDialogValu
value = emptyValue.getStringValue();
}
}
+
this.value = value;
}
Modified: directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/valueeditors/AbstractInPlaceStringValueEditor.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/valueeditors/AbstractInPlaceStringValueEditor.java?rev=1692970&r1=1692969&r2=1692970&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/valueeditors/AbstractInPlaceStringValueEditor.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/valueeditors/AbstractInPlaceStringValueEditor.java Mon Jul 27 22:58:28 2015
@@ -230,11 +230,7 @@ public abstract class AbstractInPlaceStr
*/
public Object getStringOrBinaryValue( Object rawValue )
{
- if ( rawValue == null )
- {
- return null;
- }
- else if ( rawValue instanceof String )
+ if ( rawValue instanceof String )
{
return rawValue;
}
Modified: directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/valueeditors/TextValueEditor.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/valueeditors/TextValueEditor.java?rev=1692970&r1=1692969&r2=1692970&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/valueeditors/TextValueEditor.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/valueeditors/TextValueEditor.java Mon Jul 27 22:58:28 2015
@@ -41,7 +41,7 @@ public class TextValueEditor extends Abs
public boolean openDialog( Shell shell )
{
Object value = getValue();
- if ( value != null && value instanceof String )
+ if ( value instanceof String )
{
TextDialog dialog = new TextDialog( shell, ( String ) value );
if ( dialog.open() == TextDialog.OK && !"".equals( dialog.getText() ) ) //$NON-NLS-1$