You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by se...@apache.org on 2016/12/25 18:36:32 UTC
svn commit: r1776025 - in
/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/filter:
LdapAndFilterComponent.java LdapFilterComponent.java
LdapNotFilterComponent.java LdapOrFilterComponent.java
Author: seelmann
Date: Sun Dec 25 18:36:32 2016
New Revision: 1776025
URL: http://svn.apache.org/viewvc?rev=1776025&view=rev
Log:
* DIRSTUDIO-1133: Remove unnecessary null check, filterList is never null
* Use for-each loop
Modified:
directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/filter/LdapAndFilterComponent.java
directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/filter/LdapFilterComponent.java
directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/filter/LdapNotFilterComponent.java
directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/filter/LdapOrFilterComponent.java
Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/filter/LdapAndFilterComponent.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/filter/LdapAndFilterComponent.java?rev=1776025&r1=1776024&r2=1776025&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/filter/LdapAndFilterComponent.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/filter/LdapAndFilterComponent.java Sun Dec 25 18:36:32 2016
@@ -68,7 +68,7 @@ public class LdapAndFilterComponent exte
{
return Messages.LdapAndFilterComponent_MissingAndCharacter;
}
- else if ( filterList == null || filterList.isEmpty() )
+ else if ( filterList.isEmpty() )
{
return Messages.LdapAndFilterComponent_MissingFilters;
}
Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/filter/LdapFilterComponent.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/filter/LdapFilterComponent.java?rev=1776025&r1=1776024&r2=1776025&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/filter/LdapFilterComponent.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/filter/LdapFilterComponent.java Sun Dec 25 18:36:32 2016
@@ -23,7 +23,6 @@ package org.apache.directory.studio.ldap
import java.util.ArrayList;
import java.util.Arrays;
-import java.util.Iterator;
import java.util.List;
import org.apache.directory.studio.ldapbrowser.core.model.filter.parser.LdapFilterToken;
@@ -44,7 +43,7 @@ public abstract class LdapFilterComponen
protected LdapFilterToken startToken;
/** The filter list. */
- protected List<LdapFilter> filterList;
+ protected final List<LdapFilter> filterList;
/**
@@ -162,9 +161,8 @@ public abstract class LdapFilterComponen
return false;
}
- for ( Iterator<LdapFilter> it = filterList.iterator(); it.hasNext(); )
+ for ( LdapFilter filter : filterList )
{
- LdapFilter filter = it.next();
if ( filter == null || !filter.isValid() )
{
return false;
@@ -200,9 +198,8 @@ public abstract class LdapFilterComponen
else
{
List<LdapFilter> invalidFilterList = new ArrayList<LdapFilter>();
- for ( Iterator<LdapFilter> it = filterList.iterator(); it.hasNext(); )
+ for ( LdapFilter filter : filterList )
{
- LdapFilter filter = it.next();
if ( filter != null )
{
invalidFilterList.addAll( Arrays.asList( filter.getInvalidFilters() ) );
@@ -226,9 +223,8 @@ public abstract class LdapFilterComponen
{
tokenList.add( startToken );
}
- for ( Iterator<LdapFilter> it = filterList.iterator(); it.hasNext(); )
+ for ( LdapFilter filter : filterList )
{
- LdapFilter filter = it.next();
if ( filter != null )
{
tokenList.addAll( Arrays.asList( filter.getTokens() ) );
@@ -259,11 +255,10 @@ public abstract class LdapFilterComponen
{
return parent;
}
- else if ( filterList != null || !filterList.isEmpty() )
+ else if ( !filterList.isEmpty() )
{
- for ( Iterator<LdapFilter> it = filterList.iterator(); it.hasNext(); )
+ for ( LdapFilter filter : filterList )
{
- LdapFilter filter = it.next();
if ( filter != null && filter.getFilter( offset ) != null )
{
return filter.getFilter( offset );
Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/filter/LdapNotFilterComponent.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/filter/LdapNotFilterComponent.java?rev=1776025&r1=1776024&r2=1776025&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/filter/LdapNotFilterComponent.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/filter/LdapNotFilterComponent.java Sun Dec 25 18:36:32 2016
@@ -86,7 +86,7 @@ public class LdapNotFilterComponent exte
{
return Messages.LdapNotFilterComponent_MissingNotCharacter;
}
- else if ( filterList == null || filterList.isEmpty() )
+ else if ( filterList.isEmpty() )
{
return Messages.LdapNotFilterComponent_MissingFilterExpression;
}
Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/filter/LdapOrFilterComponent.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/filter/LdapOrFilterComponent.java?rev=1776025&r1=1776024&r2=1776025&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/filter/LdapOrFilterComponent.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/filter/LdapOrFilterComponent.java Sun Dec 25 18:36:32 2016
@@ -68,7 +68,7 @@ public class LdapOrFilterComponent exten
{
return Messages.LdapOrFilterComponent_MissingOrCharacter;
}
- else if ( filterList == null || filterList.isEmpty() )
+ else if ( filterList.isEmpty() )
{
return Messages.LdapOrFilterComponent_MissingFilters;
}