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 2007/11/16 21:45:05 UTC
svn commit: r595815 - in
/directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/filter:
LdapAndFilterComponent.java LdapOrFilterComponent.java
parser/LdapFilterToken.java
Author: seelmann
Date: Fri Nov 16 12:45:04 2007
New Revision: 595815
URL: http://svn.apache.org/viewvc?rev=595815&view=rev
Log:
Fixed some warnings.
Modified:
directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/filter/LdapAndFilterComponent.java
directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/filter/LdapOrFilterComponent.java
directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/filter/parser/LdapFilterToken.java
Modified: directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/filter/LdapAndFilterComponent.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/filter/LdapAndFilterComponent.java?rev=595815&r1=595814&r2=595815&view=diff
==============================================================================
--- directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/filter/LdapAndFilterComponent.java (original)
+++ directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/filter/LdapAndFilterComponent.java Fri Nov 16 12:45:04 2007
@@ -21,8 +21,6 @@
package org.apache.directory.studio.ldapbrowser.core.model.filter;
-import java.util.Iterator;
-
import org.apache.directory.studio.ldapbrowser.core.model.filter.parser.LdapFilterToken;
@@ -88,9 +86,8 @@
public String toString()
{
String s = startToken != null ? "&" : "";
- for ( Iterator it = filterList.iterator(); it.hasNext(); )
+ for ( LdapFilter filter : filterList )
{
- LdapFilter filter = ( LdapFilter ) it.next();
if ( filter != null )
{
s += filter.toString();
Modified: directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/filter/LdapOrFilterComponent.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/filter/LdapOrFilterComponent.java?rev=595815&r1=595814&r2=595815&view=diff
==============================================================================
--- directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/filter/LdapOrFilterComponent.java (original)
+++ directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/filter/LdapOrFilterComponent.java Fri Nov 16 12:45:04 2007
@@ -21,8 +21,6 @@
package org.apache.directory.studio.ldapbrowser.core.model.filter;
-import java.util.Iterator;
-
import org.apache.directory.studio.ldapbrowser.core.model.filter.parser.LdapFilterToken;
@@ -88,9 +86,8 @@
public String toString()
{
String s = startToken != null ? "|" : "";
- for ( Iterator it = filterList.iterator(); it.hasNext(); )
+ for ( LdapFilter filter : filterList )
{
- LdapFilter filter = ( LdapFilter ) it.next();
if ( filter != null )
{
s += filter.toString();
Modified: directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/filter/parser/LdapFilterToken.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/filter/parser/LdapFilterToken.java?rev=595815&r1=595814&r2=595815&view=diff
==============================================================================
--- directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/filter/parser/LdapFilterToken.java (original)
+++ directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/filter/parser/LdapFilterToken.java Fri Nov 16 12:45:04 2007
@@ -27,7 +27,7 @@
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @version $Rev$, $Date$
*/
-public class LdapFilterToken implements Comparable
+public class LdapFilterToken implements Comparable<LdapFilterToken>
{
/** The token identifier for a new filter */
@@ -183,7 +183,7 @@
/**
* @see java.lang.Comparable#compareTo(java.lang.Object)
*/
- public int compareTo( Object o )
+ public int compareTo( LdapFilterToken o )
{
if ( o instanceof LdapFilterToken )
{