Changeset 1998

Timestamp:

06/21/09 23:13:55 (3 years ago)

Author:

mswertz

Message:

bugfix: equals() didn't include nested rules
feature: added new QueryRule?(List<QueryRule?>) constructor for nested rules

File:

• molgenis3_3/src/org/molgenis/framework/data/QueryRule.java (modified) (3 diffs)

molgenis3_3/src/org/molgenis/framework/data/QueryRule.java

@@ -12 +12 @@
 
 import java.util.Arrays;
+import java.util.List;
 
 /**
@@ -220 +221 @@
         }
 
+        public QueryRule(List<QueryRule> rules)
+        {
+                this(rules.toArray(new QueryRule[rules.size()]));
+        }
+
         /**
          * Returns the field-name set for this rule.
@@ -328 +334 @@
                                                         .getOperator())
                                         // value
-                                        && (r.getValue() != null && r.getValue().equals(this.getValue()) || r.getValue() == this.getValue()))
+                                        && (r.getValue() != null && r.getValue().equals(this.getValue()) || r.getValue() == this.getValue())
+                                        // nested rules
+                                        && (r.getNestedRules() != null && r.getNestedRules().equals(this.getNestedRules()) || r.getNestedRules() == this.getNestedRules()))
                         {
                                 return true;