X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=support%2Fgeneral%2Fsrc%2Fmain%2Fjava%2Forg%2Fwamblee%2Fconditions%2FAndCondition.java;h=0964b941c233de344f5f83d9f69a82260aeda92d;hb=96c8961955a306314dfe0cf9ca192252de39fc1c;hp=50898739d53da345c2b8143e8f98fbf8a2aa28b2;hpb=a503959a4290a415cfe6f668a301e44b4dcde445;p=utils

diff --git a/support/general/src/main/java/org/wamblee/conditions/AndCondition.java b/support/general/src/main/java/org/wamblee/conditions/AndCondition.java
index 50898739..0964b941 100644
--- a/support/general/src/main/java/org/wamblee/conditions/AndCondition.java
+++ b/support/general/src/main/java/org/wamblee/conditions/AndCondition.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.
@@ -12,8 +12,7 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- */
-
+ */ 
 package org.wamblee.conditions;
 
 import java.util.ArrayList;
@@ -21,12 +20,12 @@ import java.util.List;
 
 /**
  * Represents a logical and of different boolean conditions.
- *
+ * 
  * @author Erik Brakkee
+ * 
  */
 public class AndCondition<T> implements Condition<T> {
-
-    private List<Condition<T>> _conditions;
+    private List<Condition<T>> conditions;
 
     /**
      * Constructs the condition.
@@ -37,9 +36,9 @@ public class AndCondition<T> implements Condition<T> {
      *            Second condition.
      */
     public AndCondition(Condition<T> aCondition1, Condition<T> aCondition2) {
-        _conditions = new ArrayList<Condition<T>>();
-        _conditions.add(aCondition1);
-        _conditions.add(aCondition2);
+        conditions = new ArrayList<Condition<T>>();
+        conditions.add(aCondition1);
+        conditions.add(aCondition2);
     }
 
     /**
@@ -49,21 +48,23 @@ public class AndCondition<T> implements Condition<T> {
      *            List of conditions to use in the logical and.
      */
     public AndCondition(List<Condition<T>> aConditions) {
-        _conditions = aConditions;
+        conditions = aConditions;
     }
 
     /*
      * (non-Javadoc)
      * 
-     * @see org.wamblee.crawler.kiss.ProgramMatcher#matches(org.wamblee.crawler.kiss.Program)
+     * @see
+     * org.wamblee.crawler.kiss.ProgramMatcher#matches(org.wamblee.crawler.kiss
+     * .Program)
      */
     public boolean matches(T aObject) {
-        for (Condition<T> condition : _conditions) {
+        for (Condition<T> condition : conditions) {
             if (!condition.matches(aObject)) {
                 return false;
             }
         }
+
         return true;
     }
-
 }