arminw      2005/12/06 07:15:30

  Modified:    src/java/org/apache/ojb/broker/query Tag: OJB_1_0_RELEASE
                        Criteria.java
  Log:
  fix javadoc, minor improvement
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.45.2.4  +12 -14    db-ojb/src/java/org/apache/ojb/broker/query/Criteria.java
  
  Index: Criteria.java
  ===================================================================
  RCS file: 
/home/cvs/db-ojb/src/java/org/apache/ojb/broker/query/Criteria.java,v
  retrieving revision 1.45.2.3
  retrieving revision 1.45.2.4
  diff -u -r1.45.2.3 -r1.45.2.4
  --- Criteria.java     4 Dec 2005 02:26:41 -0000       1.45.2.3
  +++ Criteria.java     6 Dec 2005 15:15:04 -0000       1.45.2.4
  @@ -78,7 +78,7 @@
   
        // holds the path segment(s) to which the alias applies
        private UserAlias m_userAlias = null;
  -     
  +
        /** the max. number of parameters in a IN-statement */
       protected static final int IN_LIMIT = getSqlInLimit();
   
  @@ -181,7 +181,7 @@
        * @param values
        * @param negative
        * @param inLimit the maximum number of values for IN (-1 for no limit)
  -     * @return
  +     * @return List of InCriteria
        */
       protected List splitInCriteria(Object attribute, Collection values, 
boolean negative, int inLimit)
       {
  @@ -478,7 +478,7 @@
        */
       public void addNotLike(String attribute, Object value)
       {
  -             // PAW 
  +             // PAW
                // 
addSelectionCriteria(ValueCriteria.buildNotLikeCriteria(attribute, value, 
getAlias()));
                
addSelectionCriteria(ValueCriteria.buildNotLikeCriteria(attribute, value, 
getUserAlias(attribute)));
       }
  @@ -812,7 +812,7 @@
   
           addAndCriteria(allInCritaria);
       }
  -    
  +
       /**
        * Adds NOT IN criteria,
        * customer_id not in(1,10,33,44)
  @@ -825,10 +825,8 @@
       public void addNotIn(String attribute, Collection values)
       {
           List list = splitInCriteria(attribute, values, true, IN_LIMIT);
  -        int index = 0;
           InCriteria inCrit;
  -
  -        for (index = 0; index < list.size(); index++)
  +        for (int index = 0; index < list.size(); index++)
           {
               inCrit = (InCriteria) list.get(index);
               addSelectionCriteria(inCrit);
  @@ -1061,7 +1059,7 @@
                        return m_userAlias;
                }
                if (!(attribute instanceof String))
  -             {       
  +             {
                        return null;
                }
                if (m_alias == null)
  @@ -1132,7 +1130,7 @@
   
        // PAW
        /**
  -      * Sets the alias using a userAlias object. 
  +      * Sets the alias using a userAlias object.
         * @param userAlias The alias to set
         */
        public void setAlias(UserAlias userAlias)
  @@ -1222,7 +1220,7 @@
           m_negative = negative;
       }
   
  -     // PAW    
  +     // PAW
        /**
         * Add a hint Class for a path. Used for relationships to extents.<br>
         * SqlStatment will use these hint classes when resolving the path.
  @@ -1278,11 +1276,11 @@
        {
                return (List)getPathClasses().get(aPath);
        }
  -     
  +
        /**
         * Gets the pathClasses.
         * A Map containing hints about what Class to be used for what path 
segment
  -      * If local instance not set, try parent Criteria's instance.  If this 
is 
  +      * If local instance not set, try parent Criteria's instance.  If this 
is
         * the top-level Criteria, try the m_query's instance
         * @return Returns a Map
         */
  @@ -1312,6 +1310,6 @@
                }
        }
   
  -     
   
  -}
  +
  +}
  \ No newline at end of file
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to