X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=source%2Fmircoders%2Fabuse%2FRegularExpressionFilterType.java;h=8eceafa4edbd058eed05dddf93e486c1323f6845;hb=d06e23e638f2538f263af76bd32da6b140f20ac6;hp=fe0e6bbfb19c9676cb424a404bc8018da5435eaf;hpb=e44404fac09c8da04b5ef7874160cb91f8fc98a9;p=mir.git

diff --git a/source/mircoders/abuse/RegularExpressionFilterType.java b/source/mircoders/abuse/RegularExpressionFilterType.java
index fe0e6bbf..8eceafa4 100755
--- a/source/mircoders/abuse/RegularExpressionFilterType.java
+++ b/source/mircoders/abuse/RegularExpressionFilterType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2001, 2002 The Mir-coders group
+ * Copyright (C) 2001-2006 The Mir-coders group
  *
  * This file is part of Mir.
  *
@@ -19,8 +19,6 @@
  *
  * In addition, as a special exception, The Mir-coders gives permission to link
  * the code of this program with  any library licensed under the Apache Software License,
- * The Sun (tm) Java Advanced Imaging library (JAI), The Sun JIMI library
- * (or with modified versions of the above that use the same license as the above),
  * and distribute linked combinations including the two.  You must obey the
  * GNU General Public License in all respects for all of the code used other than
  * the above mentioned libraries.  If you modify this file, you may extend this
@@ -31,17 +29,16 @@
 package mircoders.abuse;
 
 import gnu.regexp.RE;
+import mir.entity.Entity;
+import mir.session.Request;
 
 import java.util.Arrays;
 import java.util.Iterator;
 import java.util.List;
 
-import mir.entity.Entity;
-import mir.session.Request;
-
 
 /**
-  * A regular expression filter.
+  * A description of a regular expression filter.
   */
  public class RegularExpressionFilterType extends AbstractFilterType {
     private boolean exactMatch;
@@ -67,10 +64,12 @@ import mir.session.Request;
 
       caseSensitive = aCaseSensitive;
       exactMatch = anExactMatch;
-      if (aSelectedFields==null)
+      if (aSelectedFields==null) {
         selectedFields = null;
-      else
+      }
+      else {
         selectedFields = Arrays.asList(aSelectedFields);
+      }
     }
 
 
@@ -115,10 +114,12 @@ import mir.session.Request;
                 }
                 break;
               case ENTITY_FIELDS:
-                if (selectedFields != null)
+                if (selectedFields != null) {
                   j = selectedFields.iterator();
-                else
+                }
+                else {
                   j = anEntity.getFieldNames().iterator();
+                }
 
                 while (j.hasNext()) {
                   String field = anEntity.getFieldValue( (String) j.next());