[jBoss-Dev] CVS update: spyderMQ/src/java/org/spyderMQ/selectorsOperator.java Selector.java

[jBoss CVS Development]

  User: norbert 
  Date: 00/05/19 19:34:01

  Modified:    src/java/org/spyderMQ/selectors Operator.java Selector.java
  Log:
  Implementation for the "selected" TopicSubscribers
  
  Revision  Changes    Path
  1.4       +7 -7      spyderMQ/src/java/org/spyderMQ/selectors/Operator.java
  
  Index: Operator.java
  ===================================================================
  RCS file: 
/products/cvs/ejboss/spyderMQ/src/java/org/spyderMQ/selectors/Operator.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- Operator.java     2000/05/20 02:12:18     1.3
  +++ Operator.java     2000/05/20 02:34:01     1.4
  @@ -7,11 +7,11 @@
   package org.spydermq.selectors;
   
   /**
  - * An operator implementation for the selector system
  + * An operator for the selector system
    *      
    *   @author Norbert Lataille ([EMAIL PROTECTED])
    * 
  - *   @version $Revision: 1.3 $
  + *   @version $Revision: 1.4 $
    */
   public class Operator
   {
  @@ -20,10 +20,10 @@
        Object oper2;
        Object oper3;
        
  -     public final static int EQUAL = 0;
  -     public final static int NOT = 1;
  -     public final static int AND = 2;
  -     public final static int OR = 3;
  +     public final static int EQUAL = 0; //Done for strings
  +     public final static int NOT = 1; 
  +     public final static int AND = 2;//Done
  +     public final static int OR = 3;//Done
        public final static int GT = 4;
        public final static int GE = 5;
        public final static int LT = 6;
  @@ -127,7 +127,7 @@
                        return new Boolean(arg1.equals(arg2));
                }
                
  -             throw new Exception("EQUAL:Bad object type");
  +             throw new Exception("EQUAL: Bad object type");
        }
   
        Object computeArgument(Object arg) throws Exception
  
  
  
  1.4       +5 -6      spyderMQ/src/java/org/spyderMQ/selectors/Selector.java
  
  Index: Selector.java
  ===================================================================
  RCS file: 
/products/cvs/ejboss/spyderMQ/src/java/org/spyderMQ/selectors/Selector.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- Selector.java     2000/05/19 19:28:26     1.3
  +++ Selector.java     2000/05/20 02:34:01     1.4
  @@ -17,7 +17,7 @@
    *      
    *   @author Norbert Lataille ([EMAIL PROTECTED])
    * 
  - *   @version $Revision: 1.3 $
  + *   @version $Revision: 1.4 $
    */
   public class Selector
   {
  @@ -25,18 +25,17 @@
        public HashMap identifiers; // HashMap of Identifiers
        public Object result; 
   
  -     public Selector(String sel)
  +     public Selector(String sel) throws JMSException
        {
                parser bob=new parser();
                identifiers=new HashMap();
                
                try {
  -                     Log.log("PARSER: Start with \""+sel+"\"");
                        result=bob.parse(sel,identifiers);
                } catch (Exception e) {
  -                     Log.error("Parsing failed");
  -                     Log.error(e);
  -                     return;
  +                     JMSException exception=new JMSException(e.getMessage());
  +                     exception.setLinkedException(e);
  +                     throw exception;
                }
                
                Log.log(result.toString());