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 01:11:28 UTC
svn commit: r1692971 - in
/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core:
model/impl/ utils/
Author: elecharny
Date: Mon Jul 27 23:11:28 2015
New Revision: 1692971
URL: http://svn.apache.org/r1692971
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.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/AbstractEntry.java
directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/Attribute.java
directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/BookmarkEntry.java
directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/ContinuedSearchResultEntry.java
directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/DummyEntry.java
directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/Search.java
directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/SearchResult.java
directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/Value.java
directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/utils/CompoundModification.java
Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/AbstractEntry.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/AbstractEntry.java?rev=1692971&r1=1692970&r2=1692971&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/AbstractEntry.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/AbstractEntry.java Mon Jul 27 23:11:28 2015
@@ -879,15 +879,23 @@ public abstract class AbstractEntry impl
public boolean equals( Object o )
{
// check argument
- if ( o == null || !( o instanceof ICompareableEntry ) )
+ if ( !( o instanceof ICompareableEntry ) )
{
return false;
}
+
ICompareableEntry e = ( ICompareableEntry ) o;
// compare dn and connection
- return getDn() == null ? e.getDn() == null : ( getDn().equals( e.getDn() ) && getBrowserConnection().equals(
- e.getBrowserConnection() ) );
+ if ( getDn() == null )
+ {
+ return e.getDn() == null;
+ }
+ else
+ {
+ return getDn().equals( e.getDn() ) &&
+ getBrowserConnection().equals( e.getBrowserConnection() );
+ }
}
Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/Attribute.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/Attribute.java?rev=1692971&r1=1692970&r2=1692971&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/Attribute.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/Attribute.java Mon Jul 27 23:11:28 2015
@@ -355,7 +355,7 @@ public class Attribute implements IAttri
public boolean equals( Object o )
{
// check argument
- if ( o == null || !( o instanceof IAttribute ) )
+ if ( !( o instanceof IAttribute ) )
{
return false;
}
Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/BookmarkEntry.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/BookmarkEntry.java?rev=1692971&r1=1692970&r2=1692971&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/BookmarkEntry.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/BookmarkEntry.java Mon Jul 27 23:11:28 2015
@@ -69,7 +69,7 @@ public class BookmarkEntry extends Deleg
public boolean equals( Object o )
{
// check argument
- if ( o == null || !( o instanceof ICompareableEntry ) )
+ if (!( o instanceof ICompareableEntry ) )
{
return false;
}
Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/ContinuedSearchResultEntry.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/ContinuedSearchResultEntry.java?rev=1692971&r1=1692970&r2=1692971&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/ContinuedSearchResultEntry.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/ContinuedSearchResultEntry.java Mon Jul 27 23:11:28 2015
@@ -182,7 +182,7 @@ public class ContinuedSearchResultEntry
public boolean equals( Object o )
{
// check argument
- if ( o == null || !( o instanceof ContinuedSearchResultEntry ) )
+ if ( !( o instanceof ContinuedSearchResultEntry ) )
{
return false;
}
Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/DummyEntry.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/DummyEntry.java?rev=1692971&r1=1692970&r2=1692971&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/DummyEntry.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/DummyEntry.java Mon Jul 27 23:11:28 2015
@@ -558,7 +558,7 @@ public class DummyEntry implements IEntr
public boolean equals( Object o )
{
// check argument
- if ( o == null || !( o instanceof ICompareableEntry ) )
+ if ( !( o instanceof ICompareableEntry ) )
{
return false;
}
Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/Search.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/Search.java?rev=1692971&r1=1692970&r2=1692971&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/Search.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/Search.java Mon Jul 27 23:11:28 2015
@@ -610,10 +610,7 @@ public class Search implements ISearch
{
return true;
}
- if ( obj == null )
- {
- return false;
- }
+
if ( !( obj instanceof Search ) )
{
return false;
Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/SearchResult.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/SearchResult.java?rev=1692971&r1=1692970&r2=1692971&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/SearchResult.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/SearchResult.java Mon Jul 27 23:11:28 2015
@@ -186,10 +186,7 @@ public class SearchResult implements ISe
{
return true;
}
- if ( obj == null )
- {
- return false;
- }
+
if ( !( obj instanceof SearchResult ) )
{
return false;
Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/Value.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/Value.java?rev=1692971&r1=1692970&r2=1692971&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/Value.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/Value.java Mon Jul 27 23:11:28 2015
@@ -215,7 +215,7 @@ public class Value implements IValue
public boolean equals( Object o )
{
// check argument
- if ( o == null || !( o instanceof IValue ) )
+ if ( !( o instanceof IValue ) )
{
return false;
}
Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/utils/CompoundModification.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/utils/CompoundModification.java?rev=1692971&r1=1692970&r2=1692971&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/utils/CompoundModification.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/utils/CompoundModification.java Mon Jul 27 23:11:28 2015
@@ -181,7 +181,7 @@ public class CompoundModification
IAttribute attribute = oldValue.getAttribute();
boolean modify = false;
- if ( oldValue != null && newRawValue != null && newRawValue instanceof byte[] )
+ if ( oldValue != null && newRawValue instanceof byte[] )
{
byte[] newValue = ( byte[] ) newRawValue;
if ( !Utils.equals( oldValue.getBinaryValue(), newValue ) )
@@ -189,7 +189,7 @@ public class CompoundModification
modify = true;
}
}
- else if ( oldValue != null && newRawValue != null && newRawValue instanceof String )
+ else if ( oldValue != null && newRawValue instanceof String )
{
String newValue = ( String ) newRawValue;