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/query AbstractQueryImpl.java Criteria.java SelectionCriteria.java
Date Thu, 13 Jan 2005 19:49:56 GMT
arminw      2005/01/13 11:49:56

  Modified:    src/java/org/apache/ojb/broker/accesslayer/sql
                        SqlQueryStatement.java
               src/java/org/apache/ojb/broker/accesslayer
                        BasePrefetcher.java
               src/java/org/apache/ojb/broker/query AbstractQueryImpl.java
                        Criteria.java SelectionCriteria.java
  Log:
  fix javadoc
  
  Revision  Changes    Path
  1.94      +2 -4      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.93
  retrieving revision 1.94
  diff -u -r1.93 -r1.94
  --- SqlQueryStatement.java	10 Dec 2004 22:40:43 -0000	1.93
  +++ SqlQueryStatement.java	13 Jan 2005 19:49:56 -0000	1.94
  @@ -261,7 +261,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
        */
  @@ -589,7 +589,6 @@
       /**
        * create SQL-String based on SelectionCriteria
        * @param crit
  -     * @return
        */
       private void asSQLStatement(SelectionCriteria crit, StringBuffer buf)
       {
  @@ -606,7 +605,6 @@
       /**
        * create SQL-String based on Selection
        * @param crit
  -     * @return
        */
       private void asSQLStatement(Criteria crit, StringBuffer buf)
       {
  
  
  
  1.13      +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.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- BasePrefetcher.java	10 Dec 2004 22:40:42 -0000	1.12
  +++ BasePrefetcher.java	13 Jan 2005 19:49:56 -0000	1.13
  @@ -143,7 +143,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)
  @@ -178,7 +178,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[])
  
  
  
  1.19      +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.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- AbstractQueryImpl.java	1 Dec 2004 20:08:27 -0000	1.18
  +++ AbstractQueryImpl.java	13 Jan 2005 19:49:56 -0000	1.19
  @@ -28,7 +28,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;
       private Class m_searchClass;
  
  
  
  1.57      +8 -9      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.56
  retrieving revision 1.57
  diff -u -r1.56 -r1.57
  --- Criteria.java	2 Dec 2004 21:37:46 -0000	1.56
  +++ Criteria.java	13 Jan 2005 19:49:56 -0000	1.57
  @@ -111,7 +111,6 @@
        * @param includeGroupBy if true (groupBy is deprecated)
        * @param includeOrderBy if ture (orderBy is deprecated)
        * @param includePrefetchedRelationships if true (prefectchedRel. is deprecated)
  -     * @return a copy of the criteria
        */
       public Criteria(Criteria aCriteria, boolean includeGroupBy, boolean includeOrderBy,
boolean includePrefetchedRelationships)
       {
  @@ -959,7 +958,7 @@
   	
   	/**
   	 * Sets the alias. Empty String is regarded as null.
  -	 * @param alias The alias to set
  +	 * @param ua The alias to set
   	 */
   	private void setImplicitAlias(ImplicitUserAlias ua)
   	{
  @@ -1087,10 +1086,10 @@
   	 * SqlStatment will use these hint classes when resolving the path.
   	 * Without these hints SqlStatment will use the base class the
   	 * relationship points to ie: Article instead of CdArticle.
  -	 *
  +	 * Usage see in OJB test-suite QueryTest#testInversePathExpression()QueryTest#testInversePathExpression().
  +     *
   	 * @param aPath the path segment ie: allArticlesInGroup
   	 * @param aClass the Class ie: CdArticle
  -	 * @see org.apache.ojb.broker.QueryTest#testInversePathExpression()
   	 */
   	public Criteria addPathClass(String aPath, Class aClass)
   	{
  @@ -1114,10 +1113,10 @@
   	 * Without this hint SqlStatment will use the base class the
   	 * relationship points to ie: Article instead of CdArticle.
   	 * Using this method is the same as adding just one hint
  -	 *
  +	 * Usage see in OJB test-suite QueryTest#testInversePathExpression().
  +     *
   	 * @param aPath the path segment ie: allArticlesInGroup
   	 * @param aClass the Class ie: CdArticle
  -	 * @see org.apache.ojb.broker.QueryTest#testInversePathExpression()
   	 * @see #addPathClass
   	 */
   	public Criteria setPathClass(String aPath, Class aClass)
  @@ -1130,11 +1129,11 @@
   
   	/**
   	 * Get the a List of Class objects used as hints for a path
  -	 *
  +	 * Usage see in OJB test-suite QueryTest#testInversePathExpression()
  +     *
   	 * @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)
   	{
  
  
  
  1.22      +2 -2      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.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- SelectionCriteria.java	24 Sep 2004 19:36:13 -0000	1.21
  +++ SelectionCriteria.java	13 Jan 2005 19:49:56 -0000	1.22
  @@ -229,7 +229,7 @@
   	 *
   	 * @param aPath the path segment ie: allArticlesInGroup
   	 * @return a List o Class objects to be used in SqlStatment
  -	 * @see org.apache.ojb.broker.QueryTest#testInversePathExpression()
  +	 * Usage see in OJB test-suite QueryTest#testInversePathExpression()
   	 */
   	public List getClassesForPath(String aPath)
   	{
  
  
  

---------------------------------------------------------------------
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