X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=support%2Fgeneral%2Fsrc%2Fmain%2Fjava%2Forg%2Fwamblee%2Fconditions%2FPropertyRegexCondition.java;h=3b9cfef4da5b7f3aba74c3d7fb8a2169e4f19111;hb=f6a4f6efd56cf78323bd3b6caef026e0dc25ac02;hp=2ce7a0e9700196116f1c74fc56c0a7fefdb361e9;hpb=32a62ca2c752e33a7873ac868a7a1f289caedcd4;p=utils

diff --git a/support/general/src/main/java/org/wamblee/conditions/PropertyRegexCondition.java b/support/general/src/main/java/org/wamblee/conditions/PropertyRegexCondition.java
index 2ce7a0e9..3b9cfef4 100644
--- a/support/general/src/main/java/org/wamblee/conditions/PropertyRegexCondition.java
+++ b/support/general/src/main/java/org/wamblee/conditions/PropertyRegexCondition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2005 the original author or authors.
+ * Copyright 2005-2010 the original author or authors.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,67 +13,79 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */ 
-
 package org.wamblee.conditions;
 
 import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import org.apache.commons.beanutils.PropertyUtils;
-
 /**
- * Condition to check whether a given property value matches a certain 
- * regular expression.
- *
+ * Condition to check whether a given property of an object matches a certain regular
+ * expression. The method name to use of the object passed in to 
+ * {@link #matches(Object)} is obtained using the Javabean conventions. 
+ * 
  * @author Erik Brakkee
+ * 
  */
 public class PropertyRegexCondition<T> implements Condition<T> {
-    
     /**
-     * Property name. 
+     * Property name.
      */
-    private String _property;
-    
+    private String property;
+
     /**
-     * Regular expression. 
+     * Regular expression.
      */
-    private Pattern _regex;
-    
+    private Pattern regex;
+
     /**
-     * Whether or not to convert the value to lowercase before matching. 
+     * Whether or not to convert the value to lowercase before matching.
      */
-    private boolean _tolower; 
-    
+    private boolean tolower;
+
     /**
-     * Constructs the condition. 
-     * @param aProperty Name of the property to examine. 
-     * @param aRegex Regular expression to use. 
-     * @param aTolower Whether or not to convert the value to lowercase before matching. 
+     * Constructs the condition.
+     * 
+     * @param aProperty
+     *            Name of the property to examine.
+     * @param aRegex
+     *            Regular expression to use.
+     * @param aTolower
+     *            Whether or not to convert the value to lowercase before
+     *            matching.
      */
-    public PropertyRegexCondition(String aProperty, String aRegex, boolean aTolower) {
-        _property = aProperty;
-        _regex = Pattern.compile(aRegex);
-        _tolower = aTolower;
+    public PropertyRegexCondition(String aProperty, String aRegex,
+        boolean aTolower) {
+        property = aProperty;
+        regex = Pattern.compile(aRegex);
+        tolower = aTolower;
     }
 
-    /* (non-Javadoc)
+    /*
+     * (non-Javadoc)
+     * 
      * @see org.wamblee.conditions.Condition#matches(T)
      */
     public boolean matches(T aObject) {
         try {
-            String value = PropertyUtils.getProperty(aObject, _property) + "";
-            if ( _tolower ) { 
-                value = value.toLowerCase(); 
+            String readerName = "get" + property.substring(0, 1).toUpperCase() + property.substring(1);
+            Method reader = aObject.getClass().getMethod(readerName);
+            String value = reader.invoke(aObject) + "";
+
+            if (tolower) {
+                value = value.toLowerCase();
             }
-            Matcher matcher = _regex.matcher(value); 
-            return matcher.matches(); 
+
+            Matcher matcher = regex.matcher(value);
+
+            return matcher.matches();
+        } catch (NoSuchMethodException e) {
+            throw new RuntimeException(e.getMessage(), e);
         } catch (IllegalAccessException e) {
             throw new RuntimeException(e.getMessage(), e);
         } catch (InvocationTargetException e) {
             throw new RuntimeException(e.getMessage(), e);
-        } catch (NoSuchMethodException e) {
-            throw new RuntimeException(e.getMessage(), e);
-        }
+        } 
     }
 }