X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=support%2Fgeneral%2Fsrc%2Fmain%2Fjava%2Forg%2Fwamblee%2Fconditions%2FAndCondition.java;h=6618c659da0cf25019e04a06bd8c160b0ecb7b7d;hb=4a575582a5c2999bd816b197d9cf274b4b3ddcd7;hp=8ef909b539e55a20bca9e8f2a580825097eca9d6;hpb=ddd261f331280640c5b53c7128230b629ebcd268;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 8ef909b5..6618c659 100644
--- a/support/general/src/main/java/org/wamblee/conditions/AndCondition.java
+++ b/support/general/src/main/java/org/wamblee/conditions/AndCondition.java
@@ -1,12 +1,12 @@
 /*
- * 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.
  * You may obtain a copy of the License at
- *
+ * 
  *      http://www.apache.org/licenses/LICENSE-2.0
- *
+ * 
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,23 +18,18 @@ package org.wamblee.conditions;
 import java.util.ArrayList;
 import java.util.List;
 
-
 /**
  * Represents a logical and of different boolean conditions.
- *
+ * 
  * @author Erik Brakkee
- *
- * @param <T> DOCUMENT ME!
+ * 
  */
 public class AndCondition<T> implements Condition<T> {
-    /**
-     * DOCUMENT ME!
-     */
     private List<Condition<T>> conditions;
 
-/**
+    /**
      * Constructs the condition.
-     *
+     * 
      * @param aCondition1
      *            First condition.
      * @param aCondition2
@@ -46,9 +41,9 @@ public class AndCondition<T> implements Condition<T> {
         conditions.add(aCondition2);
     }
 
-/**
+    /**
      * Constructs the and condition.
-     *
+     * 
      * @param aConditions
      *            List of conditions to use in the logical and.
      */
@@ -58,15 +53,10 @@ public class AndCondition<T> implements Condition<T> {
 
     /*
      * (non-Javadoc)
-     *
-     * @see org.wamblee.crawler.kiss.ProgramMatcher#matches(org.wamblee.crawler.kiss.Program)
-     */
-    /**
-     * DOCUMENT ME!
-     *
-     * @param aObject DOCUMENT ME!
-     *
-     * @return DOCUMENT ME!
+     * 
+     * @see
+     * org.wamblee.crawler.kiss.ProgramMatcher#matches(org.wamblee.crawler.kiss
+     * .Program)
      */
     public boolean matches(T aObject) {
         for (Condition<T> condition : conditions) {