[Japi-cvs] SF.net SVN: japi: [49] trunk/src/app/net/sf/japi/util/filter

[<chr...@us...>]

Revision: 49
Author:   christianhujer
Date:     2006-04-11 16:01:40 -0700 (Tue, 11 Apr 2006)
ViewCVS:  http://svn.sourceforge.net/japi/?rev=49&view=rev

Log Message:
-----------
Several cosmetic changes to filters.

Modified Paths:
--------------
    trunk/src/app/net/sf/japi/util/filter/AndFilterForArray.java
    trunk/src/app/net/sf/japi/util/filter/Filter.java
    trunk/src/app/net/sf/japi/util/filter/NotFilter.java
    trunk/src/app/net/sf/japi/util/filter/OrFilterForArray.java
    trunk/src/app/net/sf/japi/util/filter/OrFilterForIterable.java
    trunk/src/app/net/sf/japi/util/filter/file/AbstractFileFilter.java
    trunk/src/app/net/sf/japi/util/filter/file/Factory.java
    trunk/src/app/net/sf/japi/util/filter/file/FileFilter.java
    trunk/src/app/net/sf/japi/util/filter/file/FilenameFileFilter.java
Modified: trunk/src/app/net/sf/japi/util/filter/AndFilterForArray.java
===================================================================
--- trunk/src/app/net/sf/japi/util/filter/AndFilterForArray.java	2006-04-11 23:00:57 UTC (rev 48)
+++ trunk/src/app/net/sf/japi/util/filter/AndFilterForArray.java	2006-04-11 23:01:40 UTC (rev 49)
@@ -32,7 +32,7 @@
      * @param filters Filters to AND
      */
     AndFilterForArray(final Filter<T>[] filters) {
-        this.filters = filters;
+        this.filters = filters.clone();
     }
 
     /** {@inheritDoc} */

Modified: trunk/src/app/net/sf/japi/util/filter/Filter.java
===================================================================
--- trunk/src/app/net/sf/japi/util/filter/Filter.java	2006-04-11 23:00:57 UTC (rev 48)
+++ trunk/src/app/net/sf/japi/util/filter/Filter.java	2006-04-11 23:01:40 UTC (rev 49)
@@ -21,9 +21,6 @@
 package net.sf.japi.util.filter;
 
 import java.util.Collection;
-import net.sf.japi.util.filter.AndFilterForArray;
-import net.sf.japi.util.filter.AndFilterForIterable;
-import net.sf.japi.util.filter.CollectionFilter;
 
 /** This interface servers as a common interface for filters.
  * @author <a href="mailto:Chr...@it...">Christian Hujer</a>
@@ -39,6 +36,7 @@
     /** Factory for useful filters.
      * @author <a href="mailto:ch...@it...">Christian Hujer</a>
      */
+    @SuppressWarnings({"StaticMethodNamingConvention", "UtilityClass", "InnerClassOfInterface"})
     final class Factory {
 
         /** Utility class, must not be instantiated. */

Modified: trunk/src/app/net/sf/japi/util/filter/NotFilter.java
===================================================================
--- trunk/src/app/net/sf/japi/util/filter/NotFilter.java	2006-04-11 23:00:57 UTC (rev 48)
+++ trunk/src/app/net/sf/japi/util/filter/NotFilter.java	2006-04-11 23:01:40 UTC (rev 49)
@@ -20,8 +20,6 @@
 
 package net.sf.japi.util.filter;
 
-import net.sf.japi.util.filter.Filter;
-
 /** A Filter that is the negation of another filter.
  * @author <a href="mailto:Chr...@it...">Christian Hujer</a>
  */

Modified: trunk/src/app/net/sf/japi/util/filter/OrFilterForArray.java
===================================================================
--- trunk/src/app/net/sf/japi/util/filter/OrFilterForArray.java	2006-04-11 23:00:57 UTC (rev 48)
+++ trunk/src/app/net/sf/japi/util/filter/OrFilterForArray.java	2006-04-11 23:01:40 UTC (rev 49)
@@ -20,8 +20,6 @@
 
 package net.sf.japi.util.filter;
 
-import net.sf.japi.util.filter.Filter;
-
 /** A Filter used to OR-combine other filters given as array.
  * @author <a href="mailto:Chr...@it...">Christian Hujer</a>
  */
@@ -34,7 +32,7 @@
      * @param filters Filters to OR
      */
     OrFilterForArray(final Filter<T>[] filters) {
-        this.filters = filters;
+        this.filters = filters.clone();
     }
 
     /** {@inheritDoc} */

Modified: trunk/src/app/net/sf/japi/util/filter/OrFilterForIterable.java
===================================================================
--- trunk/src/app/net/sf/japi/util/filter/OrFilterForIterable.java	2006-04-11 23:00:57 UTC (rev 48)
+++ trunk/src/app/net/sf/japi/util/filter/OrFilterForIterable.java	2006-04-11 23:01:40 UTC (rev 49)
@@ -20,8 +20,6 @@
 
 package net.sf.japi.util.filter;
 
-import net.sf.japi.util.filter.Filter;
-
 /** A Filter used to OR-combine other filters given as {@link Iterable}.
  * @author <a href="mailto:Chr...@it...">Christian Hujer</a>
  */

Modified: trunk/src/app/net/sf/japi/util/filter/file/AbstractFileFilter.java
===================================================================
--- trunk/src/app/net/sf/japi/util/filter/file/AbstractFileFilter.java	2006-04-11 23:00:57 UTC (rev 48)
+++ trunk/src/app/net/sf/japi/util/filter/file/AbstractFileFilter.java	2006-04-11 23:01:40 UTC (rev 49)
@@ -23,6 +23,7 @@
 /** A FileFilter that combines several File filtering classes and interfaces.
  * @author <a href="mailto:ch...@it...">Christian Hujer</a>
  */
-public abstract class AbstractFileFilter extends javax.swing.filechooser.FileFilter implements net.sf.japi.util.filter.file.FileFilter {
+@SuppressWarnings({"EmptyClass"})
+public abstract class AbstractFileFilter extends javax.swing.filechooser.FileFilter implements FileFilter {
 
 } // class FileFilter

Modified: trunk/src/app/net/sf/japi/util/filter/file/Factory.java
===================================================================
--- trunk/src/app/net/sf/japi/util/filter/file/Factory.java	2006-04-11 23:00:57 UTC (rev 48)
+++ trunk/src/app/net/sf/japi/util/filter/file/Factory.java	2006-04-11 23:01:40 UTC (rev 49)
@@ -18,16 +18,23 @@
  * 02111-1307, USA.
  */
 
-
 package net.sf.japi.util.filter.file;
 
 import java.io.File;
+import net.sf.japi.util.filter.Filter;
 
 /** A factory for filters.
  * @author <a href="mailto:ch...@it...">Christian Hujer</a>
+ * @todo check whether this class is complete
+ * @todo check whether this class is required or instead {@link Filter.Factory} should be used
  */
+@SuppressWarnings({"UtilityClass", "StaticMethodNamingConvention"})
 public class Factory {
 
+    /** Private Utility Class Constructor. */
+    private Factory() {
+    }
+
     /** Creates a FileFilter which returns the opposite of the supplied filter.
      * @param filter Filter to invert
      * @return inverted filter
@@ -51,7 +58,7 @@
 
         /** {@inheritDoc} */
         @Override public boolean accept(final File pathname) {
-            return !((java.io.FileFilter)filter).accept(pathname);
+            return !filter.accept(pathname);
         }
 
         /** {@inheritDoc} */

Modified: trunk/src/app/net/sf/japi/util/filter/file/FileFilter.java
===================================================================
--- trunk/src/app/net/sf/japi/util/filter/file/FileFilter.java	2006-04-11 23:00:57 UTC (rev 48)
+++ trunk/src/app/net/sf/japi/util/filter/file/FileFilter.java	2006-04-11 23:01:40 UTC (rev 49)
@@ -27,6 +27,8 @@
 /** An interface that joins {@link java.io.FileFilter} with {@link Filter}.
  * @author <a href="mailto:ch...@it...">Christian Hujer</a>
  */
+// This class is intentionally named like one of its superclasses
+@SuppressWarnings({"ClassNameSameAsAncestorName"})
 public interface FileFilter extends java.io.FileFilter, Filter<File> {
 
 } // interface FileFilter

Modified: trunk/src/app/net/sf/japi/util/filter/file/FilenameFileFilter.java
===================================================================
--- trunk/src/app/net/sf/japi/util/filter/file/FilenameFileFilter.java	2006-04-11 23:00:57 UTC (rev 48)
+++ trunk/src/app/net/sf/japi/util/filter/file/FilenameFileFilter.java	2006-04-11 23:01:40 UTC (rev 49)
@@ -21,13 +21,12 @@
 package net.sf.japi.util.filter.file;
 
 import java.io.File;
-import javax.swing.filechooser.FileFilter;
 
 /** Swing FileFilter implementation that filters files with specified names.
  * @author <a href="mailto:Chr...@it...">Christian Hujer</a>
  * @todo find a convenient way for i18n/l10n of this class
  */
-public final class FilenameFileFilter extends FileFilter {
+public final class FilenameFileFilter extends AbstractFileFilter {
 
     /** Wether to accept directories. */
     private final boolean acceptDirectories;
@@ -62,7 +61,7 @@
         this.acceptDirectories = acceptDirectories;
         this.negate            = negate;
         this.description       = description;
-        this.names             = names;
+        this.names             = names.clone();
     }
 
     /** {@inheritDoc} */
@@ -71,17 +70,17 @@
     }
 
     /** {@inheritDoc} */
-    @Override public boolean accept(final File file) {
-        final String fileName = file.getName();
+    @Override public boolean accept(final File pathname) {
+        final String fileName = pathname.getName();
         boolean ret;
         if (negate) {
             ret = true;
             for (final String name : names) {
                 ret &= !fileName.equals(name);
             }
-            ret |= acceptDirectories && file.isDirectory();
+            ret |= acceptDirectories && pathname.isDirectory();
         } else {
-            ret = acceptDirectories && file.isDirectory();
+            ret = acceptDirectories && pathname.isDirectory();
             for (final String name : names) {
                 ret |= fileName.equals(name);
             }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.