[Japi-cvs] SF.net SVN: japi:[1272] libs/util/trunk/src/prj/net/sf/japi/util/filter/ file/EndingFileFilter.java

[<aki...@us...>]

Revision: 1272
          http://japi.svn.sourceforge.net/japi/?rev=1272&view=rev
Author:   akirschbaum
Date:     2009-04-04 19:26:46 +0000 (Sat, 04 Apr 2009)

Log Message:
-----------
Simplify code.

Modified Paths:
--------------
    libs/util/trunk/src/prj/net/sf/japi/util/filter/file/EndingFileFilter.java

Modified: libs/util/trunk/src/prj/net/sf/japi/util/filter/file/EndingFileFilter.java
===================================================================
--- libs/util/trunk/src/prj/net/sf/japi/util/filter/file/EndingFileFilter.java	2009-04-04 19:20:27 UTC (rev 1271)
+++ libs/util/trunk/src/prj/net/sf/japi/util/filter/file/EndingFileFilter.java	2009-04-04 19:26:46 UTC (rev 1272)
@@ -73,25 +73,16 @@
 
     /** {@inheritDoc} */
     @Override public boolean accept(final File pathname) {
+        if (pathname.isDirectory()) {
+            return acceptDirectories;
+        }
         final String fileName = pathname.getName();
-        boolean ret;
-        if (negate) {
-            ret = true;
-            for (final String ending : endings) {
-                ret &= !fileName.endsWith(ending);
+        for (final String ending : endings) {
+            if (fileName.endsWith(ending)) {
+                return !negate;
             }
-        } else {
-            ret = false;
-            for (final String ending : endings) {
-                ret |= fileName.endsWith(ending);
-            }
         }
-        if (acceptDirectories) {
-            ret |= pathname.isDirectory();
-        } else {
-            ret &= !pathname.isDirectory();
-        }
-        return ret;
+        return negate;
     }
 
 } // class DFileFilter


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