[Xdoclet-devel] CVS: xdoclet2/src/java/xdoclet/util/predicates And.java,1.2,1.3 CompositePredicate.java,1.2,1.3 Not.java,1.4,1.5 Or.java,1.4,1.5

[Aslak Helles?y]

Update of /cvsroot/xdoclet/xdoclet2/src/java/xdoclet/util/predicates
In directory sc8-pr-cvs1:/tmp/cvs-serv30662/src/java/xdoclet/util/predicates

Modified Files:
        And.java CompositePredicate.java Not.java Or.java 
Log Message:
Fixed CCE in TreeModel. Made beans out of predicates and accept

Index: And.java
===================================================================
RCS file: /cvsroot/xdoclet/xdoclet2/src/java/xdoclet/util/predicates/And.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** And.java    5 Mar 2003 22:27:11 -0000       1.2
--- And.java    17 Mar 2003 00:22:46 -0000      1.3
***************
*** 17,21 ****
  public class And extends CompositePredicate {
      public boolean evaluate(Object o) {
!         for (Iterator children = getChildren(); children.hasNext();) {
              Predicate child = (Predicate) children.next();
  
--- 17,21 ----
  public class And extends CompositePredicate {
      public boolean evaluate(Object o) {
!         for (Iterator children = iterator(); children.hasNext();) {
              Predicate child = (Predicate) children.next();
  

Index: CompositePredicate.java
===================================================================
RCS file: 
/cvsroot/xdoclet/xdoclet2/src/java/xdoclet/util/predicates/CompositePredicate.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** CompositePredicate.java     5 Mar 2003 22:27:11 -0000       1.2
--- CompositePredicate.java     17 Mar 2003 00:22:46 -0000      1.3
***************
*** 11,14 ****
--- 11,16 ----
  import java.util.LinkedList;
  
+ import xdoclet.BeanContextSupportEx;
+ 
  /**
   * Baseclass for filters that contain other filters.
***************
*** 17,43 ****
   * @version   $Revision$
   */
! public abstract class CompositePredicate implements Predicate {
      private static final PredicateFactory _predicateFactory = new 
SimplePredicateFactory();
-     private Collection _children;
- 
-     public void add(Predicate predicate) {
-         if (_children == null) {
-             _children = new LinkedList();
-         }
- 
-         _children.add(predicate);
-     }
- 
-     protected Iterator getChildren() {
-         if (_children == null) {
-             _children = new LinkedList();
-         }
- 
-         return _children.iterator();
-     }
  
!     public Predicate createElement(String name)
!         throws PredicateException {
!         return _predicateFactory.createPredicate(name);
      }
  }
--- 19,29 ----
   * @version   $Revision$
   */
! public abstract class CompositePredicate extends BeanContextSupportEx implements 
Predicate {
      private static final PredicateFactory _predicateFactory = new 
SimplePredicateFactory();
  
!     public Predicate createElement(String name) throws PredicateException {
!         Predicate predicate = _predicateFactory.createPredicate(name);
!         add( predicate );
!         return predicate;
      }
  }

Index: Not.java
===================================================================
RCS file: /cvsroot/xdoclet/xdoclet2/src/java/xdoclet/util/predicates/Not.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** Not.java    16 Mar 2003 17:06:58 -0000      1.4
--- Not.java    17 Mar 2003 00:22:46 -0000      1.5
***************
*** 16,20 ****
  public class Not extends CompositePredicate {
      public void add(Predicate predicate) {
!         if (getChildren().hasNext()) {
              throw new IllegalStateException("Only one sub-predicate allowed for 
not");
          }
--- 16,20 ----
  public class Not extends CompositePredicate {
      public void add(Predicate predicate) {
!         if (size() >= 1 ) {
              throw new IllegalStateException("Only one sub-predicate allowed for 
not");
          }
***************
*** 24,32 ****
  
      public boolean evaluate(Object o) {
!         if (!getChildren().hasNext()) {
              throw new IllegalStateException("Not requires one sub-predicate");
          }
  
!         return !((Predicate) getChildren().next()).evaluate(o);
      }
  }
--- 24,32 ----
  
      public boolean evaluate(Object o) {
!         if (size() != 1) {
              throw new IllegalStateException("Not requires one sub-predicate");
          }
  
!         return !((Predicate) iterator().next()).evaluate(o);
      }
  }

Index: Or.java
===================================================================
RCS file: /cvsroot/xdoclet/xdoclet2/src/java/xdoclet/util/predicates/Or.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** Or.java     16 Mar 2003 17:06:58 -0000      1.4
--- Or.java     17 Mar 2003 00:22:46 -0000      1.5
***************
*** 18,22 ****
  public class Or extends CompositePredicate {
      public boolean evaluate(Object o) {
!         for (Iterator children = getChildren(); children.hasNext();) {
              Predicate child = (Predicate) children.next();
  
--- 18,22 ----
  public class Or extends CompositePredicate {
      public boolean evaluate(Object o) {
!         for (Iterator children = iterator(); children.hasNext();) {
              Predicate child = (Predicate) children.next();
  



-------------------------------------------------------
This SF.net email is sponsored by:Crypto Challenge is now open! 
Get cracking and register here for some mind boggling fun and 
the chance of winning an Apple iPod:
http://ads.sourceforge.net/cgi-bin/redirect.pl?thaw0031en
_______________________________________________
xdoclet-devel mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/xdoclet-devel