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/27 19:15:12 UTC

svn commit: r1692914 - in /directory/studio/trunk/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui: dnd/ConnectionTransfer.java widgets/ConnectionContentProvider.java

Author: elecharny
Date: Mon Jul 27 17:15:12 2015
New Revision: 1692914

URL: http://svn.apache.org/r1692914
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/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/dnd/ConnectionTransfer.java
    directory/studio/trunk/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/widgets/ConnectionContentProvider.java

Modified: directory/studio/trunk/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/dnd/ConnectionTransfer.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/dnd/ConnectionTransfer.java?rev=1692914&r1=1692913&r2=1692914&view=diff
==============================================================================
--- directory/studio/trunk/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/dnd/ConnectionTransfer.java (original)
+++ directory/studio/trunk/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/dnd/ConnectionTransfer.java Mon Jul 27 17:15:12 2015
@@ -88,7 +88,7 @@ public class ConnectionTransfer extends
      */
     public void javaToNative( Object object, TransferData transferData )
     {
-        if ( object == null || !( object instanceof Object[] ) )
+        if ( !( object instanceof Object[] ) )
         {
             return;
         }

Modified: directory/studio/trunk/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/widgets/ConnectionContentProvider.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/widgets/ConnectionContentProvider.java?rev=1692914&r1=1692913&r2=1692914&view=diff
==============================================================================
--- directory/studio/trunk/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/widgets/ConnectionContentProvider.java (original)
+++ directory/studio/trunk/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/widgets/ConnectionContentProvider.java Mon Jul 27 17:15:12 2015
@@ -63,7 +63,7 @@ public class ConnectionContentProvider i
      */
     public Object[] getElements( Object inputElement )
     {
-        if ( inputElement != null && inputElement instanceof ConnectionFolderManager )
+        if ( inputElement instanceof ConnectionFolderManager )
         {
             ConnectionFolderManager cfm = ( ConnectionFolderManager ) inputElement;
             ConnectionFolder rootConnectionFolder = cfm.getRootConnectionFolder();
@@ -82,7 +82,7 @@ public class ConnectionContentProvider i
      */
     public Object[] getChildren( Object parentElement )
     {
-        if ( parentElement != null && parentElement instanceof ConnectionFolder )
+        if ( parentElement instanceof ConnectionFolder )
         {
             List<Object> children = new ArrayList<Object>();