X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=source%2Fmircoders%2Fabuse%2FRegularExpressionFilterType.java;h=8eceafa4edbd058eed05dddf93e486c1323f6845;hb=42680c1f9fe3250bcbd0f9ed5d9dee6188333b15;hp=c19b3f8eca8339b4d04d98d2466c89e98e6e3117;hpb=88455349028d7ecd46fe04ff8662b584c54c6143;p=mir.git diff --git a/source/mircoders/abuse/RegularExpressionFilterType.java b/source/mircoders/abuse/RegularExpressionFilterType.java index c19b3f8e..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 @@ -66,10 +64,12 @@ import java.util.List; caseSensitive = aCaseSensitive; exactMatch = anExactMatch; - if (aSelectedFields==null) + if (aSelectedFields==null) { selectedFields = null; - else + } + else { selectedFields = Arrays.asList(aSelectedFields); + } } @@ -114,10 +114,12 @@ import java.util.List; } 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());