db-ojb-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From arm...@apache.org
Subject cvs commit: db-ojb/src/java/org/apache/ojb/broker/accesslayer BasePrefetcher.java
Date Thu, 13 Jan 2005 19:20:04 GMT
arminw      2005/01/13 11:20:03

  Modified:    src/java/org/apache/ojb/broker/metadata Tag: OJB_1_0_RELEASE
                        DeleteProcedureDescriptor.java
                        RepositoryXmlHandler.java
               src/java/org/apache/ojb/broker/query Tag: OJB_1_0_RELEASE
                        SelectionCriteria.java Criteria.java
                        ValueCriteria.java Query.java
                        AbstractQueryImpl.java
               src/java/org/apache/ojb/broker/accesslayer/sql Tag:
                        OJB_1_0_RELEASE SqlGeneratorDefaultImpl.java
                        SqlQueryStatement.java
               src/java/org/apache/ojb/broker/accesslayer Tag:
                        OJB_1_0_RELEASE BasePrefetcher.java
  Log:
  patch by Vadim Gritsenko
  fix javadoc
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.7.2.2   +2 -2      db-ojb/src/java/org/apache/ojb/broker/metadata/DeleteProcedureDescriptor.java
  
  Index: DeleteProcedureDescriptor.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/metadata/DeleteProcedureDescriptor.java,v
  retrieving revision 1.7.2.1
  retrieving revision 1.7.2.2
  diff -u -r1.7.2.1 -r1.7.2.2
  --- DeleteProcedureDescriptor.java	10 Dec 2004 18:22:20 -0000	1.7.2.1
  +++ DeleteProcedureDescriptor.java	13 Jan 2005 19:20:03 -0000	1.7.2.2
  @@ -22,7 +22,7 @@
   
   /**
    * An DeleteProcedureDescriptor contains information that is related to the
  - * procedure/function that is used to handle the updating of existing records.
  + * procedure/function that is used to handle the deleting of existing records.
    * <br>
    * Note: Be careful when use DeleteProcedureDescriptor variables or caching
    * DeleteProcedureDescriptor instances, because instances could become invalid
  
  
  
  1.58.2.4  +2 -3      db-ojb/src/java/org/apache/ojb/broker/metadata/RepositoryXmlHandler.java
  
  Index: RepositoryXmlHandler.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/metadata/RepositoryXmlHandler.java,v
  retrieving revision 1.58.2.3
  retrieving revision 1.58.2.4
  diff -u -r1.58.2.3 -r1.58.2.4
  --- RepositoryXmlHandler.java	11 Nov 2004 13:26:28 -0000	1.58.2.3
  +++ RepositoryXmlHandler.java	13 Jan 2005 19:20:03 -0000	1.58.2.4
  @@ -22,7 +22,6 @@
   import org.apache.ojb.broker.util.ClassHelper;
   import org.apache.ojb.broker.util.logging.Logger;
   import org.apache.ojb.broker.util.logging.LoggerFactory;
  -import org.apache.commons.lang.StringUtils;
   import org.xml.sax.Attributes;
   import org.xml.sax.SAXException;
   import org.xml.sax.SAXParseException;
  @@ -868,7 +867,7 @@
                       }
                   case DELETE_PROCEDURE:
                       {
  -                        if (isDebug) logger.debug("    > " + tags.getTagById(UPDATE_PROCEDURE));
  +                        if (isDebug) logger.debug("    > " + tags.getTagById(DELETE_PROCEDURE));
   
                           // Get the proc name and the 'include all fields' setting
                           String procName = atts.getValue(tags.getTagById(NAME));
  
  
  
  No                   revision
  No                   revision
  1.17.2.1  +4 -9      db-ojb/src/java/org/apache/ojb/broker/query/SelectionCriteria.java
  
  Index: SelectionCriteria.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/query/SelectionCriteria.java,v
  retrieving revision 1.17
  retrieving revision 1.17.2.1
  diff -u -r1.17 -r1.17.2.1
  --- SelectionCriteria.java	22 May 2004 08:37:23 -0000	1.17
  +++ SelectionCriteria.java	13 Jan 2005 19:20:03 -0000	1.17.2.1
  @@ -93,18 +93,15 @@
   	 *
   	 * @param anAttribute  column- or fieldName or a Query
   	 * @param aValue  the value to compare with
  -	 * @param negative  criteria is negated (ie NOT LIKE instead of LIKE)
  -	 * @param userAlias  userAlias to link anAttribute to
  -	 * @param dummy used so that subclass constructors calling with null
  -	 * parameters have an unambiguous signature
  +	 * @param aUserAlias  userAlias to link anAttribute to
   	 */
   	SelectionCriteria(Object anAttribute, Object aValue, UserAlias aUserAlias)
   	{
   		if (!(anAttribute instanceof String || anAttribute instanceof Query))
   		{
   			throw new IllegalArgumentException("An attribute must be a String or a Query !");
  -		}    
  -            
  +		}
  +
   		m_attribute = anAttribute;
   		m_value = aValue;
   		this.m_bound = !isBindable();
  @@ -307,12 +304,10 @@
   	 *
   	 * @param aPath the path segment ie: allArticlesInGroup
   	 * @return a List o Class objects to be used in SqlStatment
  -	 * @see #addPathClass
   	 * @see org.apache.ojb.broker.QueryTest#testInversePathExpression()
   	 */
   	public List getClassesForPath(String aPath)
   	{
   		return getCriteria().getClassesForPath(aPath);
   	}
  -    
   }
  
  
  
  1.45.2.2  +4 -4      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.1
  retrieving revision 1.45.2.2
  diff -u -r1.45.2.1 -r1.45.2.2
  --- Criteria.java	7 Aug 2004 13:12:40 -0000	1.45.2.1
  +++ Criteria.java	13 Jan 2005 19:20:03 -0000	1.45.2.2
  @@ -1047,12 +1047,12 @@
   	{
   		return m_userAlias;
   	}
  -	
  +
   	// PAW
   	/**
   	 * Retrieves or if necessary, creates a user alias to be used
  -	 * by a child criteria 
  -	 * @param userAlias The alias to set
  +	 * by a child criteria
  +	 * @param attribute The alias to set
   	 */
   	private UserAlias getUserAlias(Object attribute)
   	{
  
  
  
  1.8.2.2   +4 -4      db-ojb/src/java/org/apache/ojb/broker/query/ValueCriteria.java
  
  Index: ValueCriteria.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/query/ValueCriteria.java,v
  retrieving revision 1.8.2.1
  retrieving revision 1.8.2.2
  diff -u -r1.8.2.1 -r1.8.2.2
  --- ValueCriteria.java	13 Oct 2004 17:28:18 -0000	1.8.2.1
  +++ ValueCriteria.java	13 Jan 2005 19:20:03 -0000	1.8.2.2
  @@ -166,21 +166,21 @@
   		super(anAttribute, aValue, anAlias);
   		m_clause = aClause;
   	}
  -    
  +
   	/**
   	 * Constructor declaration
   	 *
   	 * @param anAttribute  column- or fieldName
   	 * @param aValue  the value to compare with
   	 * @param aClause the SQL compare clause (ie LIKE, = , IS NULL)
  -	 * @param aUserAliass userAlias to link anAttribute to
  +	 * @param aUserAlias userAlias to link anAttribute to
   	 */
   	ValueCriteria(Object anAttribute, Object aValue, String aClause, UserAlias aUserAlias)
   	{
   		super(anAttribute, aValue, aUserAlias);
   		m_clause = aClause;
   	}
  -    
  +
       /**
        * @see org.apache.ojb.broker.query.SelectionCriteria#getClause()
        */
  
  
  
  1.17.2.1  +4 -2      db-ojb/src/java/org/apache/ojb/broker/query/Query.java
  
  Index: Query.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/query/Query.java,v
  retrieving revision 1.17
  retrieving revision 1.17.2.1
  diff -u -r1.17 -r1.17.2.1
  --- Query.java	4 Apr 2004 23:53:36 -0000	1.17
  +++ Query.java	13 Jan 2005 19:20:03 -0000	1.17.2.1
  @@ -44,7 +44,9 @@
    */
   public interface Query extends java.io.Serializable
   {
  -	static final long serialVersionUID = 7616997212439931319L;    public static final int
NO_START_AT_INDEX = 0;
  +	static final long serialVersionUID = 7616997212439931319L;
  +    
  +    public static final int NO_START_AT_INDEX = 0;
       public static final int NO_END_AT_INDEX = 0;
       public static final boolean SCROLLABLE = true;
       public static final boolean NOT_SCROLLABLE = false;
  
  
  
  1.14.2.1  +4 -2      db-ojb/src/java/org/apache/ojb/broker/query/AbstractQueryImpl.java
  
  Index: AbstractQueryImpl.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/query/AbstractQueryImpl.java,v
  retrieving revision 1.14
  retrieving revision 1.14.2.1
  diff -u -r1.14 -r1.14.2.1
  --- AbstractQueryImpl.java	4 Apr 2004 23:53:36 -0000	1.14
  +++ AbstractQueryImpl.java	13 Jan 2005 19:20:03 -0000	1.14.2.1
  @@ -26,7 +26,9 @@
    */
   public abstract class AbstractQueryImpl implements Query, Serializable
   {
  -	static final long serialVersionUID = -6265085604410295816L;    private int m_startAtIndex
= Query.NO_START_AT_INDEX;
  +	static final long serialVersionUID = -6265085604410295816L;
  +    
  +    private int m_startAtIndex = Query.NO_START_AT_INDEX;
       private int m_endAtIndex = Query.NO_END_AT_INDEX;
       private int m_fullSize = 0;
       protected Class m_searchClass;
  
  
  
  No                   revision
  No                   revision
  1.23.2.1  +2 -2      db-ojb/src/java/org/apache/ojb/broker/accesslayer/sql/SqlGeneratorDefaultImpl.java
  
  Index: SqlGeneratorDefaultImpl.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/accesslayer/sql/SqlGeneratorDefaultImpl.java,v
  retrieving revision 1.23
  retrieving revision 1.23.2.1
  diff -u -r1.23 -r1.23.2.1
  --- SqlGeneratorDefaultImpl.java	4 Apr 2004 23:53:32 -0000	1.23
  +++ SqlGeneratorDefaultImpl.java	13 Jan 2005 19:20:03 -0000	1.23.2.1
  @@ -292,7 +292,7 @@
       }
   
       /**
  -     * @param criteria Selection criteria
  +     * @param crit Selection criteria
        *
        * 26/06/99 Change statement to a StringBuffer for efficiency
        */
  
  
  
  1.75.2.4  +2 -2      db-ojb/src/java/org/apache/ojb/broker/accesslayer/sql/SqlQueryStatement.java
  
  Index: SqlQueryStatement.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/accesslayer/sql/SqlQueryStatement.java,v
  retrieving revision 1.75.2.3
  retrieving revision 1.75.2.4
  diff -u -r1.75.2.3 -r1.75.2.4
  --- SqlQueryStatement.java	4 Sep 2004 17:01:36 -0000	1.75.2.3
  +++ SqlQueryStatement.java	13 Jan 2005 19:20:03 -0000	1.75.2.4
  @@ -281,7 +281,7 @@
        *
        * @param aTableAlias
        * @param aPathInfo
  -     * @param translate, flag to indicate translation of pathInfo
  +     * @param translate flag to indicate translation of pathInfo
        * @param buf
        * @return true if appended
        */
  
  
  
  No                   revision
  No                   revision
  1.10.2.1  +3 -3      db-ojb/src/java/org/apache/ojb/broker/accesslayer/BasePrefetcher.java
  
  Index: BasePrefetcher.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/accesslayer/BasePrefetcher.java,v
  retrieving revision 1.10
  retrieving revision 1.10.2.1
  diff -u -r1.10 -r1.10.2.1
  --- BasePrefetcher.java	11 Jun 2004 18:49:09 -0000	1.10
  +++ BasePrefetcher.java	13 Jan 2005 19:20:03 -0000	1.10.2.1
  @@ -156,7 +156,7 @@
       /**
        * Build the Criteria using IN(...) for single keys
        * @param ids collection of identities
  -     * @param pkField
  +     * @param field
        * @return Criteria
        */
       private Criteria buildPrefetchCriteriaSingleKey(Collection ids, FieldDescriptor field)
  @@ -191,7 +191,7 @@
       /**
        * Build the Criteria using multiple ORs
        * @param ids collection of identities
  -     * @param pkFields
  +     * @param fields
        * @return Criteria
        */
       private Criteria buildPrefetchCriteriaMultipleKeys(Collection ids, FieldDescriptor
fields[])
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: ojb-dev-unsubscribe@db.apache.org
For additional commands, e-mail: ojb-dev-help@db.apache.org


Mime
View raw message