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 06:52:00 UTC

svn commit: r1692992 - in /directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio: entryeditors/ ldapbrowser/ui/actions/ ldapbrowser/ui/editors/entry/ ldapbrowser/ui/editors/schemabrowser/ ldapbrowser/ui/editors/searchr...

Author: elecharny
Date: Tue Jul 28 04:51:59 2015
New Revision: 1692992

URL: http://svn.apache.org/r1692992
Log:
o Removed useless checked on x != null when && ( x instanceof X )

Modified:
    directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/entryeditors/EntryEditorManager.java
    directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/BrowserPasteAction.java
    directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/CopyEntryAsCsvAction.java
    directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/GotoDnAction.java
    directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/GotoDnNavigateMenuAction.java
    directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/ImportExportAction.java
    directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/LocateInDitAction.java
    directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/OpenSearchResultAction.java
    directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/EntryEditorNavigationLocation.java
    directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/EntryEditorOutlinePage.java
    directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/LdifEntryEditorNavigationLocation.java
    directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/LocateEntryInLdapBrowserAction.java
    directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/SchemaBrowserNavigationLocation.java
    directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/SearchResultEditorCellModifier.java
    directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/SearchResultEditorContentProvider.java
    directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/SearchResultEditorLabelProvider.java
    directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/SearchResultEditorNavigationLocation.java
    directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/SearchResultEditorPasteAction.java
    directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/browser/BrowserViewUniversalListener.java
    directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/browser/LinkWithEditorAction.java
    directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/connection/LinkWithEditorAction.java
    directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/modificationlogs/ClearAction.java
    directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/modificationlogs/ExportAction.java
    directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/modificationlogs/NewerAction.java
    directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/modificationlogs/OlderAction.java
    directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/modificationlogs/RefreshAction.java
    directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/searchlogs/ClearAction.java
    directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/searchlogs/ExportAction.java
    directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/searchlogs/NewerAction.java
    directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/searchlogs/OlderAction.java
    directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/searchlogs/RefreshAction.java

Modified: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/entryeditors/EntryEditorManager.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/entryeditors/EntryEditorManager.java?rev=1692992&r1=1692991&r2=1692992&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/entryeditors/EntryEditorManager.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/entryeditors/EntryEditorManager.java Tue Jul 28 04:51:59 2015
@@ -873,7 +873,7 @@ public class EntryEditorManager
     {
         IWorkbenchPart part = partRef.getPart( false );
         
-        if ( ( part != null ) && ( part instanceof IEntryEditor ) )
+        if ( part instanceof IEntryEditor )
         {
             IEntryEditor entryEditor = ( IEntryEditor ) part;
             

Modified: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/BrowserPasteAction.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/BrowserPasteAction.java?rev=1692992&r1=1692991&r2=1692992&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/BrowserPasteAction.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/BrowserPasteAction.java Tue Jul 28 04:51:59 2015
@@ -291,7 +291,7 @@ public class BrowserPasteAction extends
         {
 
             Object content = this.getFromClipboard( EntryTransfer.getInstance() );
-            if ( content != null && content instanceof IEntry[] )
+            if ( content instanceof IEntry[] )
             {
                 IEntry[] entries = ( IEntry[] ) content;
                 return entries;
@@ -316,7 +316,7 @@ public class BrowserPasteAction extends
             && ( getSelectedSearches().length + getSelectedBrowserViewCategories().length > 0 ) )
         {
             Object content = this.getFromClipboard( SearchTransfer.getInstance() );
-            if ( content != null && content instanceof ISearch[] )
+            if ( content instanceof ISearch[] )
             {
                 ISearch[] searches = ( ISearch[] ) content;
                 return searches;
@@ -344,7 +344,7 @@ public class BrowserPasteAction extends
                 + getSelectedBookmarks().length + getSelectedSearches().length + getSelectedConnections().length == 0 && ( getSelectedSearchResults().length == 1 ) ) )
         {
             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.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/CopyEntryAsCsvAction.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/CopyEntryAsCsvAction.java?rev=1692992&r1=1692991&r2=1692992&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/CopyEntryAsCsvAction.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/CopyEntryAsCsvAction.java Tue Jul 28 04:51:59 2015
@@ -121,7 +121,7 @@ public class CopyEntryAsCsvAction extend
     {
         if ( this.mode == MODE_TABLE )
         {
-            return getInput() != null && getInput() instanceof ISearch
+            return getInput() instanceof ISearch
                 && ( ( ISearch ) getInput() ).getSearchResults() != null
                 && ( ( ISearch ) getInput() ).getSearchResults().length > 0;
         }
@@ -138,7 +138,7 @@ public class CopyEntryAsCsvAction extend
 
         if ( this.mode == MODE_TABLE )
         {
-            if ( getInput() != null && getInput() instanceof ISearch
+            if ( getInput() instanceof ISearch
                 && ( ( ISearch ) getInput() ).getSearchResults() != null
                 && ( ( ISearch ) getInput() ).getSearchResults().length > 0 )
             {

Modified: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/GotoDnAction.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/GotoDnAction.java?rev=1692992&r1=1692991&r2=1692992&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/GotoDnAction.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/GotoDnAction.java Tue Jul 28 04:51:59 2015
@@ -118,7 +118,7 @@ public class GotoDnAction extends Locate
         {
             clipboard = new Clipboard( Display.getCurrent() );
             Object contents = clipboard.getContents( TextTransfer.getInstance() );
-            if ( contents != null && contents instanceof String )
+            if ( contents instanceof String )
             {
                 return ( String ) contents;
             }

Modified: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/GotoDnNavigateMenuAction.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/GotoDnNavigateMenuAction.java?rev=1692992&r1=1692991&r2=1692992&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/GotoDnNavigateMenuAction.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/GotoDnNavigateMenuAction.java Tue Jul 28 04:51:59 2015
@@ -150,7 +150,7 @@ public class GotoDnNavigateMenuAction ex
         {
             clipboard = new Clipboard( Display.getCurrent() );
             Object contents = clipboard.getContents( TextTransfer.getInstance() );
-            if ( contents != null && contents instanceof String )
+            if ( contents instanceof String )
             {
                 return ( String ) contents;
             }

Modified: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/ImportExportAction.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/ImportExportAction.java?rev=1692992&r1=1692991&r2=1692992&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/ImportExportAction.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/ImportExportAction.java Tue Jul 28 04:51:59 2015
@@ -345,8 +345,7 @@ public class ImportExportAction extends
      */
     protected IBrowserConnection getConnectionInput()
     {
-
-        if ( getInput() != null && ( getInput() instanceof IBrowserConnection ) )
+        if ( getInput() instanceof IBrowserConnection )
         {
             return ( IBrowserConnection ) getInput();
         }

Modified: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/LocateInDitAction.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/LocateInDitAction.java?rev=1692992&r1=1692991&r2=1692992&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/LocateInDitAction.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/LocateInDitAction.java Tue Jul 28 04:51:59 2015
@@ -77,7 +77,7 @@ public abstract class LocateInDitAction
                     {
                     }
                 }
-                if ( targetView != null && targetView instanceof BrowserView )
+                if ( targetView instanceof BrowserView )
                 {
                     ( ( BrowserView ) targetView ).select( entry );
                     PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().activate( targetView );

Modified: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/OpenSearchResultAction.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/OpenSearchResultAction.java?rev=1692992&r1=1692991&r2=1692992&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/OpenSearchResultAction.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/OpenSearchResultAction.java Tue Jul 28 04:51:59 2015
@@ -69,7 +69,7 @@ public class OpenSearchResultAction exte
                 {
                 }
             }
-            if ( targetView != null && targetView instanceof BrowserView )
+            if ( targetView instanceof BrowserView )
             {
                 ( ( BrowserView ) targetView ).select( getSelectedSearchResults()[0] );
                 PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().activate( targetView );

Modified: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/EntryEditorNavigationLocation.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/EntryEditorNavigationLocation.java?rev=1692992&r1=1692991&r2=1692992&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/EntryEditorNavigationLocation.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/EntryEditorNavigationLocation.java Tue Jul 28 04:51:59 2015
@@ -212,7 +212,7 @@ public class EntryEditorNavigationLocati
     private EntryEditorInput getEntryEditorInput()
     {
         Object editorInput = getInput();
-        if ( editorInput != null && editorInput instanceof EntryEditorInput )
+        if ( editorInput instanceof EntryEditorInput )
         {
             EntryEditorInput entryEditorInput = ( EntryEditorInput ) editorInput;
             return entryEditorInput;

Modified: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/EntryEditorOutlinePage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/EntryEditorOutlinePage.java?rev=1692992&r1=1692991&r2=1692992&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/EntryEditorOutlinePage.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/EntryEditorOutlinePage.java Tue Jul 28 04:51:59 2015
@@ -563,7 +563,7 @@ public class EntryEditorOutlinePage exte
         if ( viewer != null )
         {
             Object o = viewer.getInput();
-            if ( ( o != null ) && ( o instanceof IEntry ) )
+            if (  o instanceof IEntry )
             {
                 return ( IEntry ) o;
             }

Modified: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/LdifEntryEditorNavigationLocation.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/LdifEntryEditorNavigationLocation.java?rev=1692992&r1=1692991&r2=1692992&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/LdifEntryEditorNavigationLocation.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/LdifEntryEditorNavigationLocation.java Tue Jul 28 04:51:59 2015
@@ -89,7 +89,7 @@ public class LdifEntryEditorNavigationLo
     private EntryEditorInput getEntryEditorInput()
     {
         Object editorInput = getInput();
-        if ( editorInput != null && editorInput instanceof EntryEditorInput )
+        if ( editorInput instanceof EntryEditorInput )
         {
             EntryEditorInput entryEditorInput = ( EntryEditorInput ) editorInput;
             return entryEditorInput;

Modified: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/LocateEntryInLdapBrowserAction.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/LocateEntryInLdapBrowserAction.java?rev=1692992&r1=1692991&r2=1692992&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/LocateEntryInLdapBrowserAction.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/LocateEntryInLdapBrowserAction.java Tue Jul 28 04:51:59 2015
@@ -107,7 +107,7 @@ public class LocateEntryInLdapBrowserAct
             }
         }
 
-        if ( targetView != null && targetView instanceof BrowserView )
+        if ( targetView instanceof BrowserView )
         {
             ( ( BrowserView ) targetView ).select( o );
             PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().activate( targetView );

Modified: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/SchemaBrowserNavigationLocation.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/SchemaBrowserNavigationLocation.java?rev=1692992&r1=1692991&r2=1692992&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/SchemaBrowserNavigationLocation.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/SchemaBrowserNavigationLocation.java Tue Jul 28 04:51:59 2015
@@ -150,13 +150,16 @@ public class SchemaBrowserNavigationLoca
     public void restoreLocation()
     {
         IEditorPart editorPart = getEditorPart();
-        if ( editorPart != null && editorPart instanceof SchemaBrowser )
+        
+        if ( editorPart instanceof SchemaBrowser )
         {
             SchemaBrowser schemaBrowser = ( SchemaBrowser ) editorPart;
             Object input = getInput();
-            if ( input != null && input instanceof SchemaBrowserInput )
+            
+            if ( input instanceof SchemaBrowserInput )
             {
                 SchemaBrowserInput sbi = ( SchemaBrowserInput ) input;
+                
                 if ( sbi.getConnection() != null && sbi.getSchemaElement() != null )
                 {
                     schemaBrowser.setInput( sbi );
@@ -215,12 +218,13 @@ public class SchemaBrowserNavigationLoca
      */
     private AbstractSchemaObject getSchemaElement()
     {
-
         Object editorInput = getInput();
-        if ( editorInput != null && editorInput instanceof SchemaBrowserInput )
+        
+        if ( editorInput instanceof SchemaBrowserInput )
         {
             SchemaBrowserInput schemaBrowserInput = ( SchemaBrowserInput ) editorInput;
             AbstractSchemaObject schemaElement = schemaBrowserInput.getSchemaElement();
+            
             if ( schemaElement != null )
             {
                 return schemaElement;
@@ -238,11 +242,12 @@ public class SchemaBrowserNavigationLoca
      */
     private IBrowserConnection getConnection()
     {
-
         Object editorInput = getInput();
-        if ( editorInput != null && editorInput instanceof SchemaBrowserInput )
+        
+        if ( editorInput instanceof SchemaBrowserInput )
         {
             SchemaBrowserInput schemaBrowserInput = ( SchemaBrowserInput ) editorInput;
+            
             return schemaBrowserInput.getConnection();
         }
 

Modified: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/SearchResultEditorCellModifier.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/SearchResultEditorCellModifier.java?rev=1692992&r1=1692991&r2=1692992&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/SearchResultEditorCellModifier.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/SearchResultEditorCellModifier.java Tue Jul 28 04:51:59 2015
@@ -79,7 +79,7 @@ public class SearchResultEditorCellModif
      */
     public boolean canModify( Object element, String property )
     {
-        if ( element != null && element instanceof ISearchResult && property != null )
+        if ( element instanceof ISearchResult && property != null )
         {
             ISearchResult result = ( ISearchResult ) element;
             AttributeHierarchy ah = result.getAttributeWithSubtypes( property );
@@ -112,7 +112,7 @@ public class SearchResultEditorCellModif
      */
     public Object getValue( Object element, String property )
     {
-        if ( element != null && element instanceof ISearchResult && property != null )
+        if ( element instanceof ISearchResult && property != null )
         {
             // perform modifications on the clone
             ISearchResult result = cursor.getSelectedSearchResult();
@@ -143,12 +143,12 @@ public class SearchResultEditorCellModif
      */
     public void modify( Object element, String property, Object newRawValue )
     {
-        if ( element != null && element instanceof Item )
+        if ( element instanceof Item )
         {
             element = ( ( Item ) element ).getData();
         }
 
-        if ( element != null && element instanceof ISearchResult && property != null )
+        if ( element instanceof ISearchResult && property != null )
         {
             // perform modifications on the clone
             ISearchResult result = cursor.getSelectedSearchResult();

Modified: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/SearchResultEditorContentProvider.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/SearchResultEditorContentProvider.java?rev=1692992&r1=1692991&r2=1692992&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/SearchResultEditorContentProvider.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/SearchResultEditorContentProvider.java Tue Jul 28 04:51:59 2015
@@ -22,6 +22,7 @@ package org.apache.directory.studio.ldap
 
 
 import org.apache.directory.studio.ldapbrowser.core.model.ISearch;
+import org.apache.directory.studio.ldapbrowser.core.model.ISearchResult;
 import org.apache.directory.studio.ldapbrowser.ui.BrowserUIConstants;
 import org.apache.directory.studio.ldapbrowser.ui.BrowserUIPlugin;
 import org.eclipse.jface.viewers.ILazyContentProvider;
@@ -126,7 +127,8 @@ public class SearchResultEditorContentPr
         // update state
         String url = ""; //$NON-NLS-1$
         boolean enabled = true;
-        if ( input != null && input instanceof ISearch )
+        
+        if ( input instanceof ISearch )
         {
             ISearch search = ( ISearch ) input;
 
@@ -202,16 +204,19 @@ public class SearchResultEditorContentPr
      */
     public Object[] getElements( Object inputElement )
     {
-        if ( inputElement != null && inputElement instanceof ISearch )
+        if ( inputElement instanceof ISearch )
         {
             ISearch search = ( ISearch ) inputElement;
-            return search.getSearchResults() != null ? search.getSearchResults() : new Object[0];
-        }
-        else
-        {
-            return new Object[]
-                {};
+            
+            ISearchResult[] results = search.getSearchResults();
+            
+            if ( results != null )
+            {
+                return results;
+            }
         }
+
+        return new Object[0];
     }
 
 

Modified: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/SearchResultEditorLabelProvider.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/SearchResultEditorLabelProvider.java?rev=1692992&r1=1692991&r2=1692992&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/SearchResultEditorLabelProvider.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/SearchResultEditorLabelProvider.java Tue Jul 28 04:51:59 2015
@@ -90,7 +90,7 @@ public class SearchResultEditorLabelProv
      */
     public final String getColumnText( Object obj, int index )
     {
-        if ( obj != null && obj instanceof ISearchResult )
+        if ( obj instanceof ISearchResult )
         {
             String property;
             try

Modified: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/SearchResultEditorNavigationLocation.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/SearchResultEditorNavigationLocation.java?rev=1692992&r1=1692991&r2=1692992&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/SearchResultEditorNavigationLocation.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/SearchResultEditorNavigationLocation.java Tue Jul 28 04:51:59 2015
@@ -100,7 +100,7 @@ public class SearchResultEditorNavigatio
     public void restoreLocation()
     {
         IEditorPart editorPart = getEditorPart();
-        if ( editorPart != null && editorPart instanceof SearchResultEditor )
+        if ( editorPart instanceof SearchResultEditor )
         {
             SearchResultEditor searchResultEditor = ( SearchResultEditor ) editorPart;
             searchResultEditor.setInput( ( SearchResultEditorInput ) getInput() );
@@ -158,7 +158,7 @@ public class SearchResultEditorNavigatio
     private ISearch getSearch()
     {
         Object editorInput = getInput();
-        if ( editorInput != null && editorInput instanceof SearchResultEditorInput )
+        if ( editorInput instanceof SearchResultEditorInput )
         {
             SearchResultEditorInput searchResultEditorInput = ( SearchResultEditorInput ) editorInput;
             ISearch search = searchResultEditorInput.getSearch();

Modified: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/SearchResultEditorPasteAction.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/SearchResultEditorPasteAction.java?rev=1692992&r1=1692991&r2=1692992&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/SearchResultEditorPasteAction.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/SearchResultEditorPasteAction.java Tue Jul 28 04:51:59 2015
@@ -117,7 +117,7 @@ public class SearchResultEditorPasteActi
         {
 
             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.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/browser/BrowserViewUniversalListener.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/browser/BrowserViewUniversalListener.java?rev=1692992&r1=1692991&r2=1692992&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/browser/BrowserViewUniversalListener.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/browser/BrowserViewUniversalListener.java Tue Jul 28 04:51:59 2015
@@ -378,7 +378,7 @@ public class BrowserViewUniversalListene
         for ( IEditorReference ref : activePage.getEditorReferences() )
         {
             IWorkbenchPart part = ref.getPart( false );
-            if ( part != null && part instanceof IEntryEditor )
+            if ( part instanceof IEntryEditor )
             {
                 IEntryEditor editor = ( IEntryEditor ) part;
                 if ( ( editor != null ) && ( editor.getEntryEditorInput() != null )

Modified: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/browser/LinkWithEditorAction.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/browser/LinkWithEditorAction.java?rev=1692992&r1=1692991&r2=1692992&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/browser/LinkWithEditorAction.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/browser/LinkWithEditorAction.java Tue Jul 28 04:51:59 2015
@@ -179,12 +179,12 @@ public class LinkWithEditorAction extend
             {
                 IEditorPart editor = ( IEditorPart ) part;
                 IEditorInput input = editor.getEditorInput();
-                if ( input != null && input instanceof EntryEditorInput )
+                if ( input instanceof EntryEditorInput )
                 {
                     EntryEditorInput eei = ( EntryEditorInput ) input;
                     objectToSelect = eei.getInput();
                 }
-                else if ( input != null && input instanceof SearchResultEditorInput )
+                else if ( input instanceof SearchResultEditorInput )
                 {
                     SearchResultEditorInput srei = ( SearchResultEditorInput ) input;
                     objectToSelect = srei.getSearch();

Modified: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/connection/LinkWithEditorAction.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/connection/LinkWithEditorAction.java?rev=1692992&r1=1692991&r2=1692992&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/connection/LinkWithEditorAction.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/connection/LinkWithEditorAction.java Tue Jul 28 04:51:59 2015
@@ -205,7 +205,7 @@ public class LinkWithEditorAction extend
             {
                 IEditorPart editor = ( IEditorPart ) part;
                 IEditorInput input = editor.getEditorInput();
-                if ( input != null && input instanceof EntryEditorInput )
+                if ( input instanceof EntryEditorInput )
                 {
                     EntryEditorInput eei = ( EntryEditorInput ) input;
                     IEntry entry = eei.getResolvedEntry();
@@ -214,7 +214,7 @@ public class LinkWithEditorAction extend
                         objectToSelect = entry.getBrowserConnection().getConnection();
                     }
                 }
-                else if ( input != null && input instanceof SearchResultEditorInput )
+                else if ( input instanceof SearchResultEditorInput )
                 {
                     SearchResultEditorInput srei = ( SearchResultEditorInput ) input;
                     ISearch search = srei.getSearch();

Modified: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/modificationlogs/ClearAction.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/modificationlogs/ClearAction.java?rev=1692992&r1=1692991&r2=1692992&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/modificationlogs/ClearAction.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/modificationlogs/ClearAction.java Tue Jul 28 04:51:59 2015
@@ -83,7 +83,7 @@ public class ClearAction extends Browser
      */
     public boolean isEnabled()
     {
-        return getInput() != null && ( getInput() instanceof ModificationLogsViewInput );
+        return getInput() instanceof ModificationLogsViewInput;
     }
 
 

Modified: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/modificationlogs/ExportAction.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/modificationlogs/ExportAction.java?rev=1692992&r1=1692991&r2=1692992&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/modificationlogs/ExportAction.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/modificationlogs/ExportAction.java Tue Jul 28 04:51:59 2015
@@ -77,7 +77,7 @@ public class ExportAction extends Browse
      */
     public boolean isEnabled()
     {
-        return getInput() != null && ( getInput() instanceof ModificationLogsViewInput )
+        return ( getInput() instanceof ModificationLogsViewInput )
             && ( ( ModificationLogsViewInput ) getInput() ).getBrowserConnection().getConnection() != null;
     }
 

Modified: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/modificationlogs/NewerAction.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/modificationlogs/NewerAction.java?rev=1692992&r1=1692991&r2=1692992&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/modificationlogs/NewerAction.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/modificationlogs/NewerAction.java Tue Jul 28 04:51:59 2015
@@ -107,7 +107,7 @@ public class NewerAction extends Browser
      */
     public boolean isEnabled()
     {
-        return getInput() != null && ( getInput() instanceof ModificationLogsViewInput )
+        return ( getInput() instanceof ModificationLogsViewInput )
             && ( ( ModificationLogsViewInput ) getInput() ).getIndex() > 0;
     }
 

Modified: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/modificationlogs/OlderAction.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/modificationlogs/OlderAction.java?rev=1692992&r1=1692991&r2=1692992&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/modificationlogs/OlderAction.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/modificationlogs/OlderAction.java Tue Jul 28 04:51:59 2015
@@ -108,7 +108,7 @@ public class OlderAction extends Browser
      */
     public boolean isEnabled()
     {
-        if ( getInput() != null && ( getInput() instanceof ModificationLogsViewInput ) )
+        if ( ( getInput() instanceof ModificationLogsViewInput ) )
         {
             ModificationLogsViewInput input = ( ModificationLogsViewInput ) getInput();
             if ( input.getBrowserConnection().getConnection() != null )

Modified: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/modificationlogs/RefreshAction.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/modificationlogs/RefreshAction.java?rev=1692992&r1=1692991&r2=1692992&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/modificationlogs/RefreshAction.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/modificationlogs/RefreshAction.java Tue Jul 28 04:51:59 2015
@@ -103,7 +103,6 @@ public class RefreshAction extends Brows
      */
     public boolean isEnabled()
     {
-        return getInput() != null && ( getInput() instanceof ModificationLogsViewInput );
+        return getInput() instanceof ModificationLogsViewInput;
     }
-
 }

Modified: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/searchlogs/ClearAction.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/searchlogs/ClearAction.java?rev=1692992&r1=1692991&r2=1692992&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/searchlogs/ClearAction.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/searchlogs/ClearAction.java Tue Jul 28 04:51:59 2015
@@ -84,7 +84,7 @@ public class ClearAction extends Browser
      */
     public boolean isEnabled()
     {
-        return getInput() != null && ( getInput() instanceof SearchLogsViewInput );
+        return getInput() instanceof SearchLogsViewInput;
     }
 
 

Modified: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/searchlogs/ExportAction.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/searchlogs/ExportAction.java?rev=1692992&r1=1692991&r2=1692992&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/searchlogs/ExportAction.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/searchlogs/ExportAction.java Tue Jul 28 04:51:59 2015
@@ -77,7 +77,7 @@ public class ExportAction extends Browse
      */
     public boolean isEnabled()
     {
-        return getInput() != null && ( getInput() instanceof SearchLogsViewInput )
+        return ( getInput() instanceof SearchLogsViewInput )
             && ( ( SearchLogsViewInput ) getInput() ).getBrowserConnection().getConnection() != null;
     }
 

Modified: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/searchlogs/NewerAction.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/searchlogs/NewerAction.java?rev=1692992&r1=1692991&r2=1692992&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/searchlogs/NewerAction.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/searchlogs/NewerAction.java Tue Jul 28 04:51:59 2015
@@ -107,7 +107,7 @@ public class NewerAction extends Browser
      */
     public boolean isEnabled()
     {
-        return getInput() != null && ( getInput() instanceof SearchLogsViewInput )
+        return ( getInput() instanceof SearchLogsViewInput )
             && ( ( SearchLogsViewInput ) getInput() ).getIndex() > 0;
     }
 

Modified: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/searchlogs/OlderAction.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/searchlogs/OlderAction.java?rev=1692992&r1=1692991&r2=1692992&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/searchlogs/OlderAction.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/searchlogs/OlderAction.java Tue Jul 28 04:51:59 2015
@@ -108,7 +108,7 @@ public class OlderAction extends Browser
      */
     public boolean isEnabled()
     {
-        if ( getInput() != null && ( getInput() instanceof SearchLogsViewInput ) )
+        if ( ( getInput() instanceof SearchLogsViewInput ) )
         {
             SearchLogsViewInput input = ( SearchLogsViewInput ) getInput();
             if ( input.getBrowserConnection().getConnection() != null )

Modified: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/searchlogs/RefreshAction.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/searchlogs/RefreshAction.java?rev=1692992&r1=1692991&r2=1692992&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/searchlogs/RefreshAction.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/searchlogs/RefreshAction.java Tue Jul 28 04:51:59 2015
@@ -103,7 +103,6 @@ public class RefreshAction extends Brows
      */
     public boolean isEnabled()
     {
-        return getInput() != null && ( getInput() instanceof SearchLogsViewInput );
+        return getInput() instanceof SearchLogsViewInput;
     }
-
 }