db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davi...@apache.org
Subject svn commit: r374198 [3/7] - in /db/derby/code/trunk/java: client/org/apache/derby/client/net/ drda/org/apache/derby/impl/drda/ engine/org/apache/derby/catalog/ engine/org/apache/derby/catalog/types/ engine/org/apache/derby/database/ engine/org/apache/d...
Date Wed, 01 Feb 2006 22:48:11 GMT
Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/XMLDataValue.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/XMLDataValue.java?rev=374198&r1=374197&r2=374198&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/XMLDataValue.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/XMLDataValue.java Wed Feb  1 14:46:09 2006
@@ -43,14 +43,13 @@
     /**
      * Parse the received string value as XML.  If the
      * parse succeeds, store the string value as the
-     * contents of this XML value.
+     * contents of this XML value. If 'text' constitutes a valid XML document,
+     *  it has been stored in this XML value and nothing
+     *  is returned; otherwise, an exception is thrown.
      *
-     * @param text The string value to check.
+     * @param xmlText The string value to check.
      * @param preserveWS Whether or not to preserve
      *  ignorable whitespace.
-     * @return  If 'text' constitutes a valid XML document,
-     *  it has been stored in this XML value and nothing
-     *  is returned; otherwise, an exception is thrown.
      * @exception StandardException Thrown on parse error.
      */
     public void parseAndLoadXML(String xmlText, boolean preserveWS)

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/util/IdUtil.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/iapi/util/IdUtil.java?rev=374198&r1=374197&r2=374198&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/util/IdUtil.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/util/IdUtil.java Wed Feb  1 14:46:09 2006
@@ -183,7 +183,7 @@
 	  Read an id from the StringReader provided.
 
 
-	  @parm nomrlaize true means return ids in nomral form, false means
+	  @param normalize true means return ids in nomral form, false means
 	        return them as they were entered.
 
 	  <P>
@@ -389,7 +389,7 @@
 	/**
 	  Parse an idList. 
 
-	  @parm nomralize true means return ids in nomral form, false means
+	  @param normalize true means return ids in nomral form, false means
 	        return them as they were entered.
 
 	  @exception StandardException Oops
@@ -557,7 +557,7 @@
 	/**
 	  Return true if the id provided is on the list provided.
 	  @param id an id in normal form
-	  @list a list of ids in external form.
+	  @param	list a list of ids in external form.
 	  @exception StandardException oops.
 	  */
 	public static boolean idOnList(String id, String list)

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/util/JBitSet.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/iapi/util/JBitSet.java?rev=374198&r1=374197&r2=374198&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/util/JBitSet.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/util/JBitSet.java Wed Feb  1 14:46:09 2006
@@ -74,8 +74,6 @@
 	 * Set the BitSet to have the exact same bits set as the parameter's BitSet.
 	 *
 	 * @param sourceBitSet	The JBitSet to copy.
-	 *
-	 * @return Nothing.
 	 */
 	public void setTo(JBitSet sourceBitSet)
 	{
@@ -180,8 +178,6 @@
 
 	/**
 	 * Clear all of the bits in this JBitSet
-	 *
-	 * @return Nothing.
 	 */
 	public void clearAll()
 	{

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/util/PropertyUtil.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/iapi/util/PropertyUtil.java?rev=374198&r1=374197&r2=374198&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/util/PropertyUtil.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/util/PropertyUtil.java Wed Feb  1 14:46:09 2006
@@ -133,8 +133,6 @@
      * Copy a set of properties from one Property to another.
      * <p>
      *
-	 * @return The identifier to be used to open the conglomerate later.
-     *
      * @param src_prop  Source set of properties to copy from.
      * @param dest_prop Dest Properties to copy into.
      *
@@ -167,11 +165,10 @@
 	 * remaining characters on the line become part of the associated
 	 * element string."
 	 *
-	 * @iStr: An input stream from which the new properties are to be
+	 * @param	iStr An input stream from which the new properties are to be
 	 *  loaded (should already be initialized).
-	 * @param prop: A set of properties to which the properties from
+	 * @param prop A set of properties to which the properties from
 	 *  iStr will be added (should already be initialized).
-	 * @return A final properties set consisting of 'prop' plus all
 	 * properties loaded from 'iStr' (with the extra whitespace (if any)
 	 *  removed from all values), will be returned via the parameter.
 	 *

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/io/BaseStorageFactory.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/io/BaseStorageFactory.java?rev=374198&r1=374197&r2=374198&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/io/BaseStorageFactory.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/io/BaseStorageFactory.java Wed Feb  1 14:46:09 2006
@@ -66,7 +66,6 @@
      * @param databaseName The name of the database (directory). All relative pathnames are relative to this directory.
      *                     If null then the storage factory will only be used to deal with the directory containing
      *                     the databases.
-     * @param create If true then the database is being created.
      * @param tempDirName The name of the temporary file directory set in properties. If null then a default
      *                    directory should be used. Each database should get a separate temporary file
      *                    directory within this one to avoid collisions.
@@ -174,7 +173,7 @@
     /**
      * Construct a persistent StorageFile from a directory and path name.
      *
-     * @param directory The path name of the directory. Guaranteed not to be in the temporary file directory.
+     * @param directoryName The path name of the directory. Guaranteed not to be in the temporary file directory.
      *                  Guaranteed not to be null
      * @param fileName The name of the file within the directory. Guaranteed not to be null.
      *
@@ -185,7 +184,7 @@
     /**
      * Construct a persistent StorageFile from a directory and path name.
      *
-     * @param directory The path name of the directory. Guaranteed not to be to be null. Guaranteed to be
+     * @param directoryName The path name of the directory. Guaranteed not to be to be null. Guaranteed to be
      *                  created by a call to one of the newPersistentFile methods.
      * @param fileName The name of the file within the directory. Guaranteed not to be null.
      *

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/io/DirFile.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/io/DirFile.java?rev=374198&r1=374197&r2=374198&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/io/DirFile.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/io/DirFile.java Wed Feb  1 14:46:09 2006
@@ -54,7 +54,7 @@
     /**
      * Construct a DirFile from a directory name and a file name.
      *
-     * @param directory The directory part of the path name.
+     * @param directoryName The directory part of the path name.
      * @param fileName The name of the file within the directory.
      */
     DirFile( String directoryName, String fileName)
@@ -65,7 +65,7 @@
     /**
      * Construct a DirFile from a directory name and a file name.
      *
-     * @param directory The directory part of the path name.
+     * @param directoryName The directory part of the path name.
      * @param fileName The name of the file within the directory.
      */
     DirFile( DirFile directoryName, String fileName)
@@ -104,8 +104,6 @@
     /**
      * Creates an output stream from a file name.
      *
-     * @param name The file name.
-     *
      * @return an output stream suitable for writing to the file.
      *
      * @exception FileNotFoundException if the file exists but is a directory
@@ -138,8 +136,6 @@
     /**
      * Creates an input stream from a file name.
      *
-     * @param name The file name.
-     *
      * @return an input stream suitable for reading from the file.
      *
      * @exception FileNotFoundException if the file is not found.
@@ -153,8 +149,6 @@
      * Get an exclusive lock. This is used to ensure that two or more JVMs do not open the same database
      * at the same time.
      *
-     * @param lockFile The name of the lock. In a file system implementation it will be the name of a
-     *                 lock file.
      *
      * @return EXCLUSIVE_FILE_LOCK_NOT_AVAILABLE if the lock cannot be acquired because it is already held.<br>
      *    EXCLUSIVE_FILE_LOCK if the lock was successfully acquired.<br>
@@ -188,8 +182,6 @@
 	/**
      * Release the resource associated with an earlier acquired exclusive lock
      *
-     * @param lockFile the name of the lock file
-     *
      * @see #getExclusiveFileLock
      */
 	public synchronized void releaseExclusiveFileLock()
@@ -203,7 +195,6 @@
     /**
      * Get a random access (read/write) file.
      *
-     * @param name The name of the file.
      * @param mode "r", "rw", "rws", or "rwd". The "rws" and "rwd" modes specify
      *             that the data is to be written to persistent store, consistent with the
      *             java.io.RandomAccessFile class ("synchronized" with the persistent

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/io/DirFile4.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/io/DirFile4.java?rev=374198&r1=374197&r2=374198&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/io/DirFile4.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/io/DirFile4.java Wed Feb  1 14:46:09 2006
@@ -60,7 +60,7 @@
     /**
      * Construct a DirFile from a directory name and a file name.
      *
-     * @param directory The directory part of the path name.
+     * @param directoryName The directory part of the path name.
      * @param fileName The name of the file within the directory.
      */
     DirFile4( String directoryName, String fileName, boolean rwsOK)
@@ -72,7 +72,7 @@
     /**
      * Construct a DirFile from a directory name and a file name.
      *
-     * @param directory The directory part of the path name.
+     * @param directoryName The directory part of the path name.
      * @param fileName The name of the file within the directory.
      */
     DirFile4( DirFile directoryName, String fileName, boolean rwsOK)
@@ -224,7 +224,6 @@
     /**
      * Get a random access (read/write) file.
      *
-     * @param name The name of the file.
      * @param mode "r", "rw", "rws", or "rwd". The "rws" and "rwd" modes specify
      *             that the data is to be written to persistent store, consistent with the
      *             java.io.RandomAccessFile class ("synchronized" with the persistent

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/io/DirStorageFactory.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/io/DirStorageFactory.java?rev=374198&r1=374197&r2=374198&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/io/DirStorageFactory.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/io/DirStorageFactory.java Wed Feb  1 14:46:09 2006
@@ -100,7 +100,7 @@
     /**
      * Construct a persistent StorageFile from a directory and path name.
      *
-     * @param directory The path name of the directory. Guaranteed not to be in the temporary file directory.
+     * @param directoryName The path name of the directory. Guaranteed not to be in the temporary file directory.
      *                  Guaranteed not to be null
      * @param fileName The name of the file within the directory. Guaranteed not to be null.
      *
@@ -114,7 +114,7 @@
     /**
      * Construct a persistent StorageFile from a directory and path name.
      *
-     * @param directory The path name of the directory. Guaranteed not to be to be null. Guaranteed to be
+     * @param directoryName The path name of the directory. Guaranteed not to be to be null. Guaranteed to be
      *                  created by a call to one of the newPersistentFile methods.
      * @param fileName The name of the file within the directory. Guaranteed not to be null.
      *

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/io/DirStorageFactory4.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/io/DirStorageFactory4.java?rev=374198&r1=374197&r2=374198&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/io/DirStorageFactory4.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/io/DirStorageFactory4.java Wed Feb  1 14:46:09 2006
@@ -60,7 +60,7 @@
     /**
      * Construct a persistent StorageFile from a directory and path name.
      *
-     * @param directory The path name of the directory. Guaranteed not to be in the temporary file directory.
+     * @param directoryName The path name of the directory. Guaranteed not to be in the temporary file directory.
      *                  Guaranteed not to be null
      * @param fileName The name of the file within the directory. Guaranteed not to be null.
      *
@@ -74,7 +74,7 @@
     /**
      * Construct a persistent StorageFile from a directory and path name.
      *
-     * @param directory The path name of the directory. Guaranteed not to be to be null. Guaranteed to be
+     * @param directoryName The path name of the directory. Guaranteed not to be to be null. Guaranteed to be
      *                  created by a call to one of the newPersistentFile methods.
      * @param fileName The name of the file within the directory. Guaranteed not to be null.
      *

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/io/InputStreamFile.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/io/InputStreamFile.java?rev=374198&r1=374197&r2=374198&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/io/InputStreamFile.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/io/InputStreamFile.java Wed Feb  1 14:46:09 2006
@@ -382,7 +382,6 @@
     /**
      * Get a random access file.
      *
-     * @param name The name of the file.
      * @param mode "r", "rw", "rws", or "rwd". The "rws" and "rwd" modes specify
      *             that the data is to be written to persistent store, consistent with the
      *             java.io.RandomAccessFile class ("synchronized" with the persistent

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedBlob.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedBlob.java?rev=374198&r1=374197&r2=374198&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedBlob.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedBlob.java Wed Feb  1 14:46:09 2006
@@ -248,7 +248,7 @@
    * value that this <code>Blob</code> object designates.  The byte
    * array contains up to <code>length</code> consecutive bytes
    * starting at position <code>pos</code>.
-   * @param pos the ordinal position of the first byte in the
+   * @param startPos the ordinal position of the first byte in the
    * <code>BLOB</code> value to be extracted; the first byte is at
    * position 1
    * @param length is the number of consecutive bytes to be copied

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedClob.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedClob.java?rev=374198&r1=374197&r2=374198&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedClob.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedClob.java Wed Feb  1 14:46:09 2006
@@ -333,7 +333,7 @@
    * Determines the character position at which the specified substring
    * <code>searchstr</code> appears in the <code>CLOB</code>.  The search
    * begins at position <code>start</code>.
-   * @param searchstr the substring for which to search
+   * @param searchStr the substring for which to search
    * @param start the position at which to begin searching; the first position
    *              is 1
    * @return the position at which the substring appears, else -1; the first
@@ -571,7 +571,7 @@
    * <code>Clob</code> object <code>searchstr</code> appears in this
    * <code>Clob</code> object.  The search begins at position
    * <code>start</code>.
-   * @param searchstr the <code>Clob</code> object for which to search
+   * @param searchClob the <code>Clob</code> object for which to search
    * @param start the position at which to begin searching; the first
    *              position is 1
    * @return the position at which the <code>Clob</code> object appears,
@@ -704,7 +704,6 @@
     *
     * @param pos - the position at which to start writing to the CLOB value that
     * this Clob object represents
-    * @param str - the string to be written to the CLOB value that this Clob designates
     * @return the number of characters written 
     * @exception SQLException Feature not implemented for now.
 	*/

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedConnection.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedConnection.java?rev=374198&r1=374197&r2=374198&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedConnection.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedConnection.java Wed Feb  1 14:46:09 2006
@@ -272,7 +272,7 @@
       using the version backup and any active and archived log files.
 	  </OL>
 
-	  @param a the attribute set.
+	  @param p the attribute set.
 
 	  @exception SQLException Ooops.
 	  */

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedDatabaseMetaData.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedDatabaseMetaData.java?rev=374198&r1=374197&r2=374198&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedDatabaseMetaData.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedDatabaseMetaData.java Wed Feb  1 14:46:09 2006
@@ -2647,7 +2647,7 @@
      *
      * Determine whether a result set's own changes visible.
      *
-     * @param result set type, i.e. ResultSet.TYPE_XXX
+     * @param type result set type, i.e. ResultSet.TYPE_XXX
      * @return true if changes are visible for the result set type
      */
     public boolean ownUpdatesAreVisible(int type)   {
@@ -2665,7 +2665,7 @@
      *
      * Determine whether changes made by others are visible.
      *
-     * @param result set type, i.e. ResultSet.TYPE_XXX
+     * @param type result set type, i.e. ResultSet.TYPE_XXX
      * @return true if changes are visible for the result set type
      */
     //Since Derby materializes a forward only ResultSet incrementally, it is possible to see changes
@@ -2696,7 +2696,7 @@
      * Determine whether or not a visible row update can be detected by 
      * calling ResultSet.rowUpdated().
      *
-     * @param result set type, i.e. ResultSet.TYPE_XXX
+     * @param type result set type, i.e. ResultSet.TYPE_XXX
      * @return true if changes are detected by the resultset type
      */
     //updatable resultsets are supported for forward only resultset types only. And for forward only
@@ -2712,7 +2712,7 @@
      * calling ResultSet.rowDeleted().  If deletesAreDetected()
      * returns false, then deleted rows are removed from the result set.
      *
-     * @param result set type, i.e. ResultSet.TYPE_XXX
+     * @param type result set type, i.e. ResultSet.TYPE_XXX
      * @return true if changes are detected by the resultset type
      */
     //updatable resultsets are supported for forward only resultset types only. And for forward only
@@ -2727,7 +2727,7 @@
      * Determine whether or not a visible row insert can be detected
      * by calling ResultSet.rowInserted().
      *
-     * @param result set type, i.e. ResultSet.TYPE_XXX
+     * @param type result set type, i.e. ResultSet.TYPE_XXX
      * @return true if changes are detected by the resultset type
      */
     public boolean insertsAreDetected(int type) {

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedResultSet20.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedResultSet20.java?rev=374198&r1=374197&r2=374198&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedResultSet20.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedResultSet20.java Wed Feb  1 14:46:09 2006
@@ -230,7 +230,7 @@
      * param map to determine the class from which to construct data of 
      * SQL structured and distinct types.
      *
-     * @param i the first column is 1, the second is 2, ...
+     * @param columnIndex the first column is 1, the second is 2, ...
      * @param map the mapping from SQL type names to Java classes
      * @return an object representing the SQL value
          * @exception SQLException Feature not implemented for now.

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/load/ColumnInfo.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/load/ColumnInfo.java?rev=374198&r1=374197&r2=374198&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/load/ColumnInfo.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/load/ColumnInfo.java Wed Feb  1 14:46:09 2006
@@ -61,8 +61,8 @@
 	 * @param conn  - connection to use for metadata queries
 	 * @param sName - table's schema
 	 * @param tName - table Name
-	 * @param columnList - comma seperared insert statement column list 
-	 * @param  vtiColumnIndex - Indexes in the file
+	 * @param insertColumnList - comma seperared insert statement column list 
+	 * @param  vtiColumnIndexes - Indexes in the file
 	 * @param  vtiColumnPrefix - Prefix to use to generate column names to select from VTI
 	 * @exception Exception on error 
 	 */

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/load/Export.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/load/Export.java?rev=374198&r1=374197&r2=374198&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/load/Export.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/load/Export.java Wed Feb  1 14:46:09 2006
@@ -83,8 +83,8 @@
 	 * @param schemaName	schema name of the table data is being exported from
 	 * @param tableName     Name of the Table from which  data has to be exported.
 	 * @param outputFileName Name of the file to  which data has to be exported.
-	 * @param colDelimiter  Delimiter that seperates columns in the output file
-	 * @param characterDelimiter  Delimiter that is used to quoate non-numeric types
+	 * @param columnDelimeter  Delimiter that seperates columns in the output file
+	 * @param characterDelimeter  Delimiter that is used to quoate non-numeric types
 	 * @param codeset           Codeset that should be used to write  the data to  the file
  	 * @exception SQL Exception on errors
 	 */
@@ -109,8 +109,8 @@
 	 * @param con	 The Cloudscape database connection URL for the database containing the table
 	 * @param selectStatement    select query that is used to export the data
 	 * @param outputFileName Name of the file to  which data has to be exported.
-	 * @param colDelimiter  Delimiter that seperates columns in the output file
-	 * @param characterDelimiter  Delimiter that is used to quiote non-numeric types
+	 * @param columnDelimeter  Delimiter that seperates columns in the output file
+	 * @param characterDelimeter  Delimiter that is used to quiote non-numeric types
 	 * @param codeset           Codeset that should be used to write  the data to  the file
  	 * @exception SQL Exception on errors
 	 */

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/load/Import.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/load/Import.java?rev=374198&r1=374197&r2=374198&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/load/Import.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/load/Import.java Wed Feb  1 14:46:09 2006
@@ -78,11 +78,11 @@
 	/**
 	 * SYSCS_IMPORT_TABLE  system Procedure from ij or from a Java application
 	 * invokes  this method to perform import to a table from a file.
-	 * @param con	 The Cloudscape database connection URL for the database containing the table
+	 * @param connection	 The Cloudscape database connection URL for the database containing the table
 	 * @param schemaName	The name of the schema where table to import exists 
 	 * @param tableName     Name of the Table the data has to be imported to.
 	 * @param inputFileName Name of the file from which data has to be imported.
-	 * @param colDelimiter  Delimiter that seperates columns in the file
+	 * @param columnDelimiter  Delimiter that seperates columns in the file
 	 * @param characterDelimiter  Delimiter that is used to quiote non-numeric types
 	 * @param codeset           Codeset of the data in the file
 	 * @param replace          Indicates whether the data in table has to be replaced or
@@ -109,7 +109,7 @@
 	/**
 	 * SYSCS_IMPORT_DATA  system Procedure from ij or from a Java application
 	 * invokes  this method to perform import to a table from a file.
-	 * @param con	 The Cloudscape database connection URL for the database containing the table
+	 * @param connection	 The Cloudscape database connection URL for the database containing the table
 	 * @param schemaName	The name of the schema where table to import exists 
 	 * @param tableName     Name of the Table the data has to be imported to.
 	 * @param insertColumnList  Comma Seperated column name list to which data
@@ -117,7 +117,7 @@
 	 * @param columnIndexes     Comma sepearted Lit Index of the columns in the file(first column
 	                             starts at 1). eg: '3 ,4 , 5'
 	 * @param inputFileName Name of the file from which data has to be imported.
-	 * @param colDelimiter  Delimiter that seperates columns in the file
+	 * @param columnDelimiter  Delimiter that seperates columns in the file
 	 * @param characterDelimiter  Delimiter that is used to quiote non-numeric types
 	 * @param codeset           Codeset of the data in the file
 	 * @param replace          Indicates whether the data in table has to be replaced or

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/BCClass.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/BCClass.java?rev=374198&r1=374197&r2=374198&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/BCClass.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/BCClass.java Wed Feb  1 14:46:09 2006
@@ -73,7 +73,6 @@
  * Generators to give them code.  Most typically, they may have
  * a stream to which the Generator writes the code that is of
  * the type to satisfy what the Generator is writing.
- * @see Generator#giveCode
  * <p>
  * BCClass is a ClassBuilder implementation for generating java bytecode
  * directly.
@@ -189,7 +188,7 @@
 	 * This is used to start a constructor as well; pass in
 	 * null for the returnType when used in that manner.
 	 *
-	 * @see java.lang.reflect..Modifiers
+	 * See java.lang.reflect.Modifiers
 	 * @param modifiers the | of the Modifiers
 	 *	constants representing the visibility and control of this
 	 *	method.
@@ -222,7 +221,7 @@
 	 * This is used to start a constructor as well; pass in
 	 * null for the returnType when used in that manner.
 	 *
-	 * @see java.lang.reflect..Modifiers
+	 * See java.lang.reflect.Modifiers
 	 * @param modifiers the | of the Modifiers
 	 *	constants representing the visibility and control of this
 	 *	method.
@@ -268,7 +267,7 @@
 	 * This is used to start a constructor as well; pass in
 	 * null for the returnType when used in that manner.
 	 *
-	 * @see Modifiers
+	 * See Modifiers
 	 * @param modifiers the | of the Modifiers
 	 *	constants representing the visibility and control of this
 	 *	method.

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/BCJava.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/BCJava.java?rev=374198&r1=374197&r2=374198&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/BCJava.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/BCJava.java Wed Feb  1 14:46:09 2006
@@ -200,7 +200,7 @@
 	  		// the modifiers such as static, public, etc.
 	   </verbatim>
 	 *
-	 * @see java.lang.reflect.Modifiers
+	 * See java.lang.reflect.Modifiers
 	 * @param packageName the name of the package the class is in.
 	 *	null if it is in the default package.
 	 * @param modifiers the | of the Modifiers

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/services/cache/Clock.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/services/cache/Clock.java?rev=374198&r1=374197&r2=374198&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/services/cache/Clock.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/services/cache/Clock.java Wed Feb  1 14:46:09 2006
@@ -135,10 +135,8 @@
 
 		<P>MT - not needed for constructor.
 
-		@param holderClass the cacheable object class
+		@param holderFactory the cacheable object class
 		@param name the name of the cache
-		@param initParam parameter to call the cacheable object the first time
-		it is being initialized.
 		@param initialSize the initial number of cachable object this cache
 		holds.
 		@param maximumSize the maximum size of the cache.  The cache may grow
@@ -369,7 +367,7 @@
      * Mark a set of  entries as having been used. Normally this is done as a side effect
      * of find() or findCached. Entries that are no longer in the cache are ignored.
      *
-     * @param key the key of the used entry.
+     * @param keys the key of the used entry.
      */
     public void setUsed( Object[] keys)
     {

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/services/daemon/BasicDaemon.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/services/daemon/BasicDaemon.java?rev=374198&r1=374197&r2=374198&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/services/daemon/BasicDaemon.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/services/daemon/BasicDaemon.java Wed Feb  1 14:46:09 2006
@@ -122,9 +122,6 @@
 
 	/**
 		make a BasicDaemon
-
-		@param priority the priority of the daemon thread
-		@param delay the number of milliseconds between servcies to its clients
 	*/
 	public BasicDaemon(ContextService contextService)
 	{

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/services/jce/JCECipherFactory.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/services/jce/JCECipherFactory.java?rev=374198&r1=374197&r2=374198&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/services/jce/JCECipherFactory.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/services/jce/JCECipherFactory.java Wed Feb  1 14:46:09 2006
@@ -808,7 +808,7 @@
 	    Please note, this process of verifying the key  does not provide any added security but only is 
 	    intended to allow to fail gracefully if a wrong encryption key is used
 
-	    @return StandardException is thrown if there are any problems during the process of verification
+	    StandardException is thrown if there are any problems during the process of verification
 	    		of the encryption key or if there is any mismatch of the encryption key.
 
 	 */

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/services/monitor/BaseMonitor.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/services/monitor/BaseMonitor.java?rev=374198&r1=374197&r2=374198&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/services/monitor/BaseMonitor.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/services/monitor/BaseMonitor.java Wed Feb  1 14:46:09 2006
@@ -1264,7 +1264,6 @@
 	 * files. This must be executed in a privileged block otherwise
 	 * when running in a security manager environment no properties will
 	 * be returned.
-	 * @return
 	 */
 	Properties getDefaultModuleProperties()
 	{
@@ -1920,7 +1919,7 @@
 	/**
 	Return the UUID factory for this system.  Returns null
 	if there isn't one.
-	@see com.ibm.db2j.system.System
+	See com.ibm.db2j.system.System
 	*/
 	public UUIDFactory getUUIDFactory()	{
 

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/GenericLanguageFactory.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/GenericLanguageFactory.java?rev=374198&r1=374197&r2=374198&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/GenericLanguageFactory.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/GenericLanguageFactory.java Wed Feb  1 14:46:09 2006
@@ -79,8 +79,6 @@
 
 	/**
 	 * Stop this module.  In this case, nothing needs to be done.
-	 *
-	 * @return	Nothing
 	 */
 
 	public void stop() {

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/GenericParameterValueSet.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/GenericParameterValueSet.java?rev=374198&r1=374197&r2=374198&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/GenericParameterValueSet.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/GenericParameterValueSet.java Wed Feb  1 14:46:09 2006
@@ -303,8 +303,6 @@
 	 *
 	 * @param position	The position number to check
 	 *
-	 * @return	Nothing
-	 *
 	 * @exception StandardException	Thrown if position number is
 	 *											out of range.
 	 */

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/GenericStatement.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/GenericStatement.java?rev=374198&r1=374197&r2=374198&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/GenericStatement.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/GenericStatement.java Wed Feb  1 14:46:09 2006
@@ -83,7 +83,7 @@
 
 	/**
 	 * Constructor for a Statement given the text of the statement in a String
-	 * @param compliationSchema schema
+	 * @param compilationSchema schema
 	 * @param statementText	The text of the statement
 	 * @param isForReadOnly if the statement is opened with level CONCUR_READ_ONLY
 	 */
@@ -565,7 +565,6 @@
 	 * Generates an execution plan given a set of named parameters.
 	 * Does so for a storable prepared statement.
 	 *
-	 * @param 	compilationSchema	the schema to compile against
 	 * @param	paramDefaults		Parameter defaults
 	 *
 	 * @return A PreparedStatement that allows execution of the execution

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/GenericStorablePreparedStatement.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/GenericStorablePreparedStatement.java?rev=374198&r1=374197&r2=374198&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/GenericStorablePreparedStatement.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/GenericStorablePreparedStatement.java Wed Feb  1 14:46:09 2006
@@ -146,9 +146,6 @@
 	/**
 	 * Load up the class from the saved bytes.
 	 *
-	 * @return the generated class, or null if we
-	 *	 don't have the byte code
-	 *
 	 * @exception StandardException on error
 	 */
 	public void loadGeneratedClass()

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DDColumnDependableFinder.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DDColumnDependableFinder.java?rev=374198&r1=374197&r2=374198&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DDColumnDependableFinder.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DDColumnDependableFinder.java Wed Feb  1 14:46:09 2006
@@ -86,7 +86,6 @@
 	 * Get the byte array encoding the bitmap of referenced columns in
 	 * a table.
 	 *
-	 * @param		none
 	 * @return		byte array as in a FormatableBitSet encoding column bit map
 	 */
 	public 	byte[]	getColumnBitMap()
@@ -98,8 +97,7 @@
 	 * Set the byte array encoding the bitmap of referenced columns in
 	 * a table.
 	 *
-	 * @param		byte array as in a FormatableBitSet encoding column bit map
-	 * @return		none
+	 * @param	columnBitMap	byte array as in a FormatableBitSet encoding column bit map
 	 */
 	public	void	setColumnBitMap(byte[] columnBitMap)
 	{
@@ -110,8 +108,8 @@
 	 * Get a dependable object, which is essentially a table descriptor with
 	 * referencedColumnMap field set.
 	 *
-	 * @param	data dictionary
-	 * @param	dependable object ID (table UUID)
+	 * @param	dd data dictionary
+	 * @param	dependableObjectID dependable object ID (table UUID)
 	 * @return	a dependable, a table descriptor with referencedColumnMap
 	 *			field set
 	 */

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DD_Version.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DD_Version.java?rev=374198&r1=374197&r2=374198&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DD_Version.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DD_Version.java Wed Feb  1 14:46:09 2006
@@ -453,7 +453,6 @@
 	/**
  	 * Make a catalog.
 	 *	@param	tc	TransactionController
-	 *  @param  crf CatalogRowFactory for the catalog to drop.
 	 *	@exception StandardException  Standard Cloudscape error policy.
 	 */
 	protected void makeSystemCatalog(TransactionController tc,
@@ -701,7 +700,7 @@
 		Check to see if a database has been upgraded to the required
 		level in order to use a language feature.
 
-		@param majorVersion Data Dictionary major version
+		@param requiredMajorVersion Data Dictionary major version
 		@param feature Non-null to throw an error, null to return the state of the version match.
 
 		@return True if the database has been upgraded to the required level, false otherwise.

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DDdependableFinder.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DDdependableFinder.java?rev=374198&r1=374197&r2=374198&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DDdependableFinder.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DDdependableFinder.java Wed Feb  1 14:46:09 2006
@@ -168,7 +168,7 @@
 	/**
 	  *	Gets the AliasDescriptor associated with the passed-in object ID.
 	  *
-	  *	@param	the object ID of an Alias. Used to locate its AliasDescriptor
+	  *	@param	dependableObjectID	the object ID of an Alias. Used to locate its AliasDescriptor
 	  *
 	  *	@return	the associated AliasDescriptor
 	  * @exception java.sql.SQLException		thrown on error
@@ -282,7 +282,7 @@
 	/**
 	 * Get the UUID for the given string
 	 *
-	 * @param the string
+	 * @param idString the string
 	 *
 	 * @return the UUID
 	 */

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DataDictionaryImpl.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DataDictionaryImpl.java?rev=374198&r1=374197&r2=374198&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DataDictionaryImpl.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DataDictionaryImpl.java Wed Feb  1 14:46:09 2006
@@ -416,8 +416,6 @@
 	 *
 	 * @param startParams	The start-up parameters
 	 *
-	 * @return	Nothing
-	 *
 	 *	@exception StandardException	Thrown if the module fails to start
 	 */
 	public void boot(boolean create, Properties startParams) 
@@ -703,8 +701,6 @@
 
 	/**
 	 * Stop this module.  In this case, nothing needs to be done.
-	 *
-	 * @return	Nothing
 	 */
 
 	public void stop()
@@ -1635,8 +1631,6 @@
 	 * @param schemaName	The name of the schema to drop
 	 * @param tc			TransactionController for the transaction
 	 *
-	 * @return	Nothing
-	 *
 	 * @exception StandardException		Thrown on error
 	 */
 	public void	dropSchemaDescriptor(String schemaName,
@@ -1926,7 +1920,7 @@
 	 * the schema, on the assumption that there cannot
 	 * be any other objects in a schema w/o a table.
 	 *
-	 * @param schema descriptor
+	 * @param sd descriptor
 	 *
 	 * @return true/false
 	 *
@@ -2067,15 +2061,13 @@
 	/**
 	 * Drop the table descriptor.
 	 *
-	 * @param descriptor	The table descriptor to drop
+	 * @param td	The table descriptor to drop
 	 * @param schema		A descriptor for the schema the table
 	 *						is a part of.  If this parameter is
 	 *						NULL, then the table is part of the
 	 *						current (default) schema
 	 * @param tc			TransactionController for the transaction
 	 *
-	 * @return	Nothing
-	 *
 	 * @exception StandardException		Thrown on error
 	 */
 	public void	dropTableDescriptor(TableDescriptor td, SchemaDescriptor schema,
@@ -2110,8 +2102,6 @@
 	 * @param lockGranularity	The new lockGranularity
 	 * @param tc				The TransactionController to use.
 	 *
-	 * @return Nothing.
-	 *
 	 * @exception StandardException		Thrown on error
 	 */
 	public void updateLockGranularity(TableDescriptor td, SchemaDescriptor schema,
@@ -2212,8 +2202,6 @@
 	 *
 	 * @param td				The TableDescriptor.
 	 *
-	 * @return Nothing.
-	 *
 	 * @exception StandardException		Thrown on failure
 	 */
 	private void getColumnDescriptorsScan(TableDescriptor td)
@@ -2232,11 +2220,9 @@
 	 * on the CDL in the given TD.
 	 *
 	 * @param uuid				The referencing UUID
-	 * @param cdlist			The column descriptor list
+	 * @param cdl			The column descriptor list
 	 * @param td				The parent tuple descriptor
 	 *
-	 * @return Nothing.
-	 *
 	 * @exception StandardException		Thrown on failure
 	 */
 	 private void getColumnDescriptorsScan(
@@ -2293,8 +2279,6 @@
 	 * @param columnName	The name of the column to drop
 	 * @param tc		TransactionController for the transaction
 	 *
-	 * @return	Nothing
-	 *
 	 * @exception StandardException		Thrown on error
 	 */
 	public void	dropColumnDescriptor(UUID tableID,
@@ -2326,8 +2310,6 @@
 	 *			all the column descriptors
 	 * @param tc		TransactionController for the transaction
 	 *
-	 * @return	Nothing
-	 *
 	 * @exception StandardException		Thrown on error
 	 */
 	public void	dropAllColumnDescriptors(UUID tableID, TransactionController tc)
@@ -2352,8 +2334,6 @@
 	 * @param tc			The TransactionController
 	 * @param keyRow		Start/stop position.
 	 *
-	 * @return Nothing.
-	 *
 	 * @exception StandardException		Thrown on failure
 	 */
 	private void dropColumnDescriptorCore(
@@ -2384,8 +2364,6 @@
 	 * when we using a nested user xaction - we want to timeout right away if the parent
 	 * holds the lock.  (bug 4821)
 	 *
-	 * @return Nothing.
-	 *
 	 * @exception StandardException		Thrown on failure
 	 */
 	private void updateColumnDescriptor(ColumnDescriptor cd,
@@ -2564,8 +2542,6 @@
 	 * @param vd		A descriptor for the view to be dropped
 	 * @param tc		TransactionController to use
 	 *
-	 * @return	Nothing
-	 *
 	 * @exception StandardException		Thrown on error
 	 */
 	public void	dropViewDescriptor(ViewDescriptor vd,
@@ -2961,8 +2937,6 @@
 	 * @param descriptor	The descriptor to add
 	 * @param tc			The transaction controller
 	 *
-	 * @return	Nothing
-	 *
 	 * @exception StandardException		Thrown on error
 	 */
 	public void	addSPSDescriptor
@@ -3084,10 +3058,8 @@
 	 * Updates SYS.SYSSTATEMENTS with the info from the
 	 * SPSD. 
 	 *
-	 * @param descriptor	The descriptor to add
+	 * @param spsd	The descriptor to add
 	 * @param tc			The transaction controller
-	 * @param updCols		Int array of columns that are to be updated 
-	 *						(1 based).  Not null.
 	 * @param updateParamDescriptors If true, will update the
 	 *						parameter descriptors in SYS.SYSCOLUMNS.
 	 * @param wait		If true, then the caller wants to wait for locks. False will be
@@ -3097,8 +3069,6 @@
 	 * when we using a nested user xaction - we want to timeout right away if the parent
 	 * holds the lock.  (bug 4821)
 	 *
-	 * @return	Nothing
-	 *
 	 * @exception StandardException		Thrown on error
 	 */
 	public void	updateSPS(
@@ -3506,7 +3476,7 @@
 	 * is already loaded up, it is retuned without further
 	 * ado.
 	 *
-	 * @param table			The table descriptor.
+	 * @param td			The table descriptor.
 	 *
 	 * @return The ConstraintDescriptorList for the table
 	 *
@@ -3550,8 +3520,6 @@
 	 * @param td				The TableDescriptor.
 	 * @param forUpdate			Whether or not to open scan for update
 	 *
-	 * @return Nothing.
-	 *
 	 * @exception StandardException		Thrown on failure
 	 */
 	 private void getTriggerDescriptorsScan(TableDescriptor td, boolean forUpdate)
@@ -3619,8 +3587,6 @@
 	 *								1 based.  May be null (all cols).
 	 * @param tc					The TransactionController to use
 	 *
-	 * @return Nothing.
-	 *
 	 * @exception StandardException		Thrown on failure
 	 */
 	public void updateTriggerDescriptor
@@ -3815,7 +3781,7 @@
 	 * duplicates of constraint descriptors that are hung
 	 * off of the table descriptor cache.
 	 *
-	 * @param table			The table descriptor.  If null,
+	 * @param td			The table descriptor.  If null,
 	 *						all constraint descriptors are returned.
 	 *
 	 *
@@ -3901,7 +3867,7 @@
 	 * Get the constraint descriptor given a table and the UUID String
 	 * of the backing index.
 	 *
-	 * @param table			The table descriptor.
+	 * @param td			The table descriptor.
 	 * @param uuid			the UUID for the backing index.
 	 *
 	 * @return The ConstraintDescriptor for the constraint.
@@ -3920,7 +3886,7 @@
 	 * Get the constraint descriptor given a table and the UUID String
 	 * of the constraint
 	 *
-	 * @param table			The table descriptor.
+	 * @param td			The table descriptor.
 	 * @param uuid			The UUID for the constraint
 	 *
 	 * @return The ConstraintDescriptor for the constraint.
@@ -3940,7 +3906,7 @@
 	/** 
 	 * Get the constraint descriptor given a TableDescriptor and the constraint name.
 	 *
-	 * @param table				The table descriptor.
+	 * @param td				The table descriptor.
 	 * @param sd				The schema descriptor for the constraint
 	 * @param constraintName	The constraint name.
 	 * @param forUpdate			Whether or not access is for update
@@ -3973,8 +3939,6 @@
 	 * @param td				The TableDescriptor.
 	 * @param forUpdate			Whether or not to open scan for update
 	 *
-	 * @return Nothing.
-	 *
 	 * @exception StandardException		Thrown on failure
 	 */
 	 private void getConstraintDescriptorsScan(TableDescriptor td, boolean forUpdate)
@@ -4155,7 +4119,7 @@
 	 * @param scanQualifiers			qualifiers
 	 * @param ti						The TabInfo to use
 	 * @param parentTupleDescriptor		The parentDescriptor, if applicable.
-	 * @param dList						The list to build, if supplied.  
+	 * @param list						The list to build, if supplied.  
 	 *									If null, then caller expects a single descriptor
 	 *
 	 * @return	The last matching descriptor
@@ -4337,7 +4301,7 @@
 	 * the indexed criteria.  If nothing matches, returns an
 	 * empty List (never returns null).
 	 *
-	 * @param constraintId	The id of the constraint
+	 * @param uuid	The id of the constraint
 	 * @param indexId		The index id in SYS.SYSCONSTRAINTS
 	 * @param columnNum		The column to retrieve
 	 *
@@ -4462,8 +4426,6 @@
 	 * @param descriptor	The descriptor to add
 	 * @param tc			The transaction controller
 	 *
-	 * @return	Nothing
-	 *
 	 * @exception StandardException		Thrown on error
 	 */
 	public void	addConstraintDescriptor(
@@ -4539,8 +4501,6 @@
 	 *								1 based.  May be null (all cols).
 	 * @param tc					The TransactionController to use
 	 *
-	 * @return Nothing.
-	 *
 	 * @exception StandardException		Thrown on failure
 	 */
 	public void updateConstraintDescriptor(ConstraintDescriptor cd,
@@ -4631,8 +4591,6 @@
 	 * @param descriptor	The descriptor to drop
 	 * @param tc			The TransactionController
 	 *
-	 * @return	Nothing
-	 *
 	 * @exception StandardException		Thrown on error
 	 */
 	public void	dropConstraintDescriptor(TableDescriptor table,
@@ -4684,8 +4642,6 @@
 	 *			constraint descriptors
 	 * @param tc	The TransactionController
 	 *
-	 * @return	Nothing
-	 *
 	 * @exception StandardException		Thrown on error
 	 */
 	public void	dropAllConstraintDescriptors(TableDescriptor table, 
@@ -4767,8 +4723,6 @@
 	 * @param descriptor	The KeyConstraintDescriptor for the constraint.
 	 * @param tc			The TransactionController
 	 *
-	 * @return Nothing.
-	 *
 	 * @exception StandardException		Thrown on failure
 	 */
 	private void addSubKeyConstraint(KeyConstraintDescriptor descriptor,
@@ -4839,8 +4793,6 @@
 	 * @param constraint	the constraint
 	 * @param tc			The TransactionController
 	 *
-	 * @return Nothing.
-	 *
 	 * @exception StandardException		Thrown on failure
 	 */
 	private void dropSubKeyConstraint(ConstraintDescriptor constraint, TransactionController tc)
@@ -4948,8 +4900,6 @@
 	 * @param constraintId	The constraint id.
 	 * @param tc			The TransactionController
 	 *
-	 * @return Nothing.
-	 *
 	 * @exception StandardException		Thrown on failure
 	 */
 	private void dropSubCheckConstraint(UUID constraintId, TransactionController tc)
@@ -5229,8 +5179,6 @@
 	 *
 	 * @param td			The TableDescriptor.
 	 *
-	 * @return Nothing.
-	 *
 	 * @exception StandardException		Thrown on failure
 	 */
 	private void getConglomerateDescriptorsScan(TableDescriptor td)
@@ -5310,8 +5258,6 @@
 	 * @param conglomerate	The ConglomerateDescriptor for the conglomerate
 	 * @param tc		TransactionController for the transaction
 	 *
-	 * @return	Nothing.
-	 *
 	 * @exception StandardException		Thrown on failure
 	 */
 	public void dropConglomerateDescriptor(
@@ -5342,8 +5288,6 @@
 	 * @param td		The TableDescriptor of the table 
 	 * @param tc		TransactionController for the transaction
 	 *
-	 * @return	Nothing.
-	 *
 	 * @exception StandardException		Thrown on failure
 	 */
 
@@ -5379,8 +5323,6 @@
 	 * @param conglomerateNumber	The new conglomerate number
 	 * @param tc					The TransactionController to use
 	 *
-	 * @return Nothing.
-	 *
 	 * @exception StandardException		Thrown on failure
 	 */
 	public void updateConglomerateDescriptor(ConglomerateDescriptor cd,
@@ -5405,8 +5347,6 @@
 	 * @param conglomerateNumber	The new conglomerate number
 	 * @param tc					The TransactionController to use
 	 *
-	 * @return Nothing.
-	 *
 	 * @exception StandardException		Thrown on failure
 	 */
 	public void updateConglomerateDescriptor(ConglomerateDescriptor[] cds,
@@ -5490,7 +5430,7 @@
 	/**
 	 * Gets a list of the dependency descriptors for the given provider's id.
 	 *
-	 * @param dependentID		The ID of the provider we're interested in
+	 * @param providerID		The ID of the provider we're interested in
 	 *
 	 * @return	List			Returns a list of DependencyDescriptors. 
 	 *							Returns an empty List if no stored dependencies for the
@@ -5588,8 +5528,6 @@
 	 * @param dd	The DependencyDescriptor.
 	 * @param tc	TransactionController for the transaction
 	 *
-	 * @return Nothing.
-	 *
 	 * @exception StandardException		Thrown on failure
 	 */
 	public void dropStoredDependency(DependencyDescriptor dd,
@@ -5630,8 +5568,6 @@
 	 * @param dependentsUUID	Dependent's uuid
 	 * @param tc				TransactionController for the transaction
 	 *
-	 * @return Nothing.
-	 *
 	 * @exception StandardException		Thrown on failure
 	 */
 	public void dropDependentsStoredDependencies(UUID dependentsUUID,
@@ -5754,7 +5690,6 @@
 		If the schema is SYSFUN then do not use the system catalogs,
 		but instead look up the routines from the in-meomry table driven
 		by the contents of SYSFUN_FUNCTIONS.
-		@see SYSFUN_FUNCTIONS
 	 */
 	public java.util.List getRoutineList(String schemaID, String routineName, char nameSpace)
 		throws StandardException {
@@ -5818,8 +5753,6 @@
 	 * @param ad	The AliasDescriptor to drop
 	 * @param tc	The TransactionController
 	 *
-	 * @return	Nothing.
-	 *
 	 * @exception StandardException		Thrown on failure
 	 */
 
@@ -6886,8 +6819,6 @@
 	/**
 	 * Clear all of the DataDictionary caches.
 	 *
-	 * @return Nothing.
-	 *
 	 * @exception StandardException Standard Cloudscape error policy
 	 */
 	public void clearCaches() throws StandardException
@@ -7216,7 +7147,7 @@
 	 * @param keyRow	The supplied ExecIndexRow for search
 	 * @param ti		The TabInfo to use
 	 * @param parentTupleDescriptor		The parentDescriptor, if applicable.
-	 * @param dList		The list to build, if supplied.  If null, then caller expects
+	 * @param list		The list to build, if supplied.  If null, then caller expects
 	 *					a single descriptor
 	 * @param forUpdate	Whether or not to open the index for update.
 	 *
@@ -7427,7 +7358,7 @@
 	 * @param scanQualifiers			qualifiers
 	 * @param ti						The TabInfo to use
 	 * @param parentTupleDescriptor		The parentDescriptor, if applicable.
-	 * @param dList						The list to build, if supplied.  
+	 * @param list						The list to build, if supplied.  
 	 *									If null, then caller expects a single descriptor
 	 *
 	 * @return	The last matching descriptor
@@ -7493,9 +7424,7 @@
 	 * Get a TabInfo for a non-core table.
 	 * (We fault in information about non-core tables as needed.)
 	 *
-	 * @param nonCoreNum	The index into noncoreTable[].
-	 *
-	 * @return Nothing.
+	 * @param catalogNumber	The index into noncoreTable[].
 	 *
 	 * @exception StandardException		Thrown on error
 	 */
@@ -7650,8 +7579,6 @@
 	 *
 	 * @param coreNum	The index into coreInfo[].
 	 *
-	 * @return Nothing.
-	 *
 	 * @exception StandardException		Thrown on error
 	 */
 	public TabInfo getCoreCatalog(int coreNum)
@@ -7949,7 +7876,6 @@
 	 * autoincrement column.
 	 * 
 	 * @param tc		 Transaction Controller to use.
-	 * @param td		 Table Descriptor
 	 * @param columnName Name of the column.
 	 * @param aiValue	 Value to write to SYSCOLUMNS.
 	 * @param incrementNeeded whether to increment the value passed in by the
@@ -8156,7 +8082,7 @@
 		Check to see if a database has been upgraded to the required
 		level in order to use a language feature. 
 
-		@param majorVersion Data Dictionary major version
+		@param requiredMajorVersion Data Dictionary major version
 		@param feature Non-null to throw an error, null to return the state of the version match.
 
 		@return True if the database has been upgraded to the required level, false otherwise.
@@ -8224,8 +8150,6 @@
      *
      * Assumes all arguments are "IN" type.
      *
-	 * @return The identifier to be used to open the conglomerate later.
-     *
      * @param routine_name  name of the routine in java and the SQL 
      *                      procedure name.
      *
@@ -9769,10 +9693,7 @@
      * Get a table permissions descriptor from the system tables, without going through the cache.
      * This method is called to fill the permissions cache.
      *
-     * @param grantee
-     * @param tableUUID
-     *
-     * @returns a TablePermsDescriptor that describes the table permissions granted to the grantee, null
+     * @return a TablePermsDescriptor that describes the table permissions granted to the grantee, null
      *          if no table-level permissions have been granted to him on the table.
      *
      * @exception StandardException
@@ -9791,11 +9712,8 @@
      * Get a column permissions descriptor from the system tables, without going through the cache.
      * This method is called to fill the permissions cache.
      *
-     * @param grantee
-     * @param tableUUID
-     * @param privType "s", "u", "r", "S", "U", or "R"
      *
-     * @returns a ColPermsDescriptor that describes the column permissions granted to the grantee, null
+     * @return a ColPermsDescriptor that describes the column permissions granted to the grantee, null
      *          if no column permissions have been granted to him on the table.
      *
      * @exception StandardException
@@ -9832,10 +9750,7 @@
      * Get a routine permissions descriptor from the system tables, without going through the cache.
      * This method is called to fill the permissions cache.
      *
-     * @param grantee
-     * @param routineUUID
-     *
-     * @returns a RoutinePermsDescriptor that describes the table permissions granted to the grantee, null
+     * @return a RoutinePermsDescriptor that describes the table permissions granted to the grantee, null
      *          if no table-level permissions have been granted to him on the table.
      *
      * @exception StandardException

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DropDependencyFilter.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DropDependencyFilter.java?rev=374198&r1=374197&r2=374198&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DropDependencyFilter.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DropDependencyFilter.java Wed Feb  1 14:46:09 2006
@@ -112,7 +112,7 @@
 	  *	Pump a SYSDEPENDS row through the Filter. If the providerID of the
 	  * row matches our providerID, we return true. Otherwise we return false.
 	  *
-	  *	@param	row		SYSDEPENDS row
+	  *	@param	currentRow		SYSDEPENDS row
 	  *
 	  *	@return	True if the row has our providerID. False otherwise.
 	  *

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/IndexInfoImpl.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/IndexInfoImpl.java?rev=374198&r1=374197&r2=374198&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/IndexInfoImpl.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/IndexInfoImpl.java Wed Feb  1 14:46:09 2006
@@ -80,8 +80,6 @@
 	 * Set the conglomerate number for the index.
 	 *
 	 * @param conglomerateNumber	The conglomerateNumber for the index.
-	 *
-	 * @return	Nothing.
 	 */
 	public void setConglomerateNumber(long conglomerateNumber)
 	{
@@ -102,8 +100,6 @@
 	 * Set the name for the index.
 	 *
 	 * @param indexName		The name for the index.
-	 *
-	 * @return	Nothing.
 	 */
 	public void setIndexName(String indexName)
 	{
@@ -134,8 +130,6 @@
 	 * Set the IndexRowGenerator for this index.
 	 *
 	 * @param irg			The IndexRowGenerator for this index.
-	 *
-	 * @return Nothing.
 	 */
 	public void setIndexRowGenerator(IndexRowGenerator irg)
 	{
@@ -160,9 +154,7 @@
 	 * given the (0-based) column number for the column within the index.
 	 *
 	 * @param colNumber		The column number within the index
-	 * @param baseColPos	The base column position for the column.
-	 *
-	 * @return Nothing.
+	 * @param baseColumnPosition	The base column position for the column.
 	 */
 	public void setBaseColumnPosition(int colNumber,
 									 int baseColumnPosition)

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSALIASESRowFactory.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSALIASESRowFactory.java?rev=374198&r1=374197&r2=374198&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSALIASESRowFactory.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSALIASESRowFactory.java Wed Feb  1 14:46:09 2006
@@ -145,9 +145,6 @@
   /**
 	 * Make a SYSALIASES row
 	 *
-	 * @param emptyRow		Make an empty row if this parameter is true
-	 * @param ad			Alias descriptor
-	 * @param dvf			A DataValueFactory
 	 *
 	 * @return	Row suitable for inserting into SYSALIASES.
 	 *

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSCOLUMNSRowFactory.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSCOLUMNSRowFactory.java?rev=374198&r1=374197&r2=374198&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSCOLUMNSRowFactory.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSCOLUMNSRowFactory.java Wed Feb  1 14:46:09 2006
@@ -178,10 +178,6 @@
   /**
 	 * Make a SYSCOLUMNS row
 	 *
-	 * @param emptyRow	Make an empty row if this parameter is true
-	 * @param tableID	Table that the column is in
-	 * @param column	Column descriptor
-	 *
 	 * @return	Row suitable for inserting into SYSCOLUMNS.
 	 *
 	 * @exception   StandardException thrown on failure

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSCONGLOMERATESRowFactory.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSCONGLOMERATESRowFactory.java?rev=374198&r1=374197&r2=374198&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSCONGLOMERATESRowFactory.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSCONGLOMERATESRowFactory.java Wed Feb  1 14:46:09 2006
@@ -119,10 +119,6 @@
   /**
 	 * Make a SYSCONGLOMERATES row
 	 *
-	 * @param emptyRow	Make an empty row if this parameter is true
-	 * @param sd		Schema Descriptor
-	 * @param conglomerate	conglomerate descriptor
-	 *
 	 * @return	Row suitable for inserting into SYSCONGLOMERATES.
 	 *
 	 * @exception   StandardException thrown on failure

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSCONSTRAINTSRowFactory.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSCONSTRAINTSRowFactory.java?rev=374198&r1=374197&r2=374198&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSCONSTRAINTSRowFactory.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSCONSTRAINTSRowFactory.java Wed Feb  1 14:46:09 2006
@@ -132,9 +132,6 @@
   /**
 	 * Make a SYSCONTRAINTS row
 	 *
-	 * @param emptyRow	Make an empty row if this parameter is true
-	 * @param constraint	constraint descriptor
-	 *
 	 * @return	Row suitable for inserting into SYSCONTRAINTS.
 	 *
 	 * @exception   StandardException thrown on failure

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSDUMMY1RowFactory.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSDUMMY1RowFactory.java?rev=374198&r1=374197&r2=374198&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSDUMMY1RowFactory.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSDUMMY1RowFactory.java Wed Feb  1 14:46:09 2006
@@ -85,9 +85,6 @@
   /**
 	 * Make a SYSDUMMY1 row
 	 *
-	 * @param emptyRow	Make an empty row if this parameter is true
-	 * @param statDescriptor Descriptor from which to create the
-	 * statistic. 
 	 *
 	 * @return	Row suitable for inserting into SYSSTATISTICS.
 	 *

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSFILESRowFactory.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSFILESRowFactory.java?rev=374198&r1=374197&r2=374198&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSFILESRowFactory.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSFILESRowFactory.java Wed Feb  1 14:46:09 2006
@@ -123,9 +123,6 @@
 	/**
 	 * Make a SYSFILES row
 	 *
-	 * @param emptyRow Make an empty row if this parameter is true
-	 * @param descriptor A descriptor
-	 *
 	 * @return	Row suitable for inserting into SYSFILES
 	 *
 	 * @exception   StandardException thrown on failure

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSFOREIGNKEYSRowFactory.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSFOREIGNKEYSRowFactory.java?rev=374198&r1=374197&r2=374198&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSFOREIGNKEYSRowFactory.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSFOREIGNKEYSRowFactory.java Wed Feb  1 14:46:09 2006
@@ -128,9 +128,6 @@
   /**
 	 * Make a SYSFOREIGNKEYS row
 	 *
-	 * @param emptyRow		Make an empty row if this parameter is true
-	 * @param cd			Constraint descriptor
-	 *
 	 * @return	Row suitable for inserting into SYSFOREIGNKEYS.
 	 *
 	 * @exception   StandardException thrown on failure

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSKEYSRowFactory.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSKEYSRowFactory.java?rev=374198&r1=374197&r2=374198&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSKEYSRowFactory.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSKEYSRowFactory.java Wed Feb  1 14:46:09 2006
@@ -111,9 +111,6 @@
   /**
 	 * Make a SYSKEYS row
 	 *
-	 * @param emptyRow	Make an empty row if this parameter is true
-	 * @param constraint	key constraint descriptor
-	 *
 	 * @return	Row suitable for inserting into SYSKEYS.
 	 *
 	 * @exception   StandardException thrown on failure

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSSCHEMASRowFactory.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSSCHEMASRowFactory.java?rev=374198&r1=374197&r2=374198&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSSCHEMASRowFactory.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSSCHEMASRowFactory.java Wed Feb  1 14:46:09 2006
@@ -116,9 +116,6 @@
   /**
 	 * Make a SYSSCHEMAS row
 	 *
-	 * @param emptyRow			Make an empty row if this parameter is true
-	 * @param schemaDescriptor	In-memory tuple to be converted to a disk row.
-	 *
 	 * @return	Row suitable for inserting into SYSSCHEMAS.
 	 *
 	 * @exception   StandardException thrown on failure

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSSTATEMENTSRowFactory.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSSTATEMENTSRowFactory.java?rev=374198&r1=374197&r2=374198&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSSTATEMENTSRowFactory.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSSTATEMENTSRowFactory.java Wed Feb  1 14:46:09 2006
@@ -147,7 +147,6 @@
 	 * 
 	 * @param compileMe			passed into SPSDescriptorImpl.getPreparedStatement().
 	 *							if true, we (re)compile the stmt
-	 * @param emptyRow			Make an empty row if this parameter is true
 	 * @param spsDescriptor		In-memory tuple to be converted to a disk row.
 	 *
 	 * @return	Row suitable for inserting into SYSSTATEMENTS.

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSSTATISTICSRowFactory.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSSTATISTICSRowFactory.java?rev=374198&r1=374197&r2=374198&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSSTATISTICSRowFactory.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSSTATISTICSRowFactory.java Wed Feb  1 14:46:09 2006
@@ -135,9 +135,6 @@
   /**
 	 * Make a SYSSTATISTICS row
 	 *
-	 * @param emptyRow	Make an empty row if this parameter is true
-	 * @param statDescriptor Descriptor from which to create the
-	 * statistic. 
 	 *
 	 * @return	Row suitable for inserting into SYSSTATISTICS.
 	 *

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSTABLESRowFactory.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSTABLESRowFactory.java?rev=374198&r1=374197&r2=374198&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSTABLESRowFactory.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSTABLESRowFactory.java Wed Feb  1 14:46:09 2006
@@ -117,10 +117,6 @@
 	/**
 	 * Make a SYSTABLES row
 	 *
-	 * @param emptyRow	Make an empty row if this parameter is true
-	 * @param descriptor	Table descriptor
-	 * @param schema	Schema descriptor
-	 *
 	 * @return	Row suitable for inserting into SYSTABLES.
 	 *
 	 * @exception   StandardException thrown on failure

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSTRIGGERSRowFactory.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSTRIGGERSRowFactory.java?rev=374198&r1=374197&r2=374198&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSTRIGGERSRowFactory.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSTRIGGERSRowFactory.java Wed Feb  1 14:46:09 2006
@@ -139,9 +139,6 @@
 	/**
 	 * Make a SYSTRIGGERS row. 
 	 * 
-	 * @param emptyRow			Make an empty row if this parameter is true
-	 * @param triggerDescriptor	In-memory tuple to be converted to a disk row.
-	 *
 	 * @return	Row suitable for inserting into SYSTRIGGERS.
 	 *
 	 * @exception   StandardException thrown on failure

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSVIEWSRowFactory.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSVIEWSRowFactory.java?rev=374198&r1=374197&r2=374198&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSVIEWSRowFactory.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSVIEWSRowFactory.java Wed Feb  1 14:46:09 2006
@@ -116,9 +116,6 @@
   /**
 	 * Make a SYSVIEWS row
 	 *
-	 * @param emptyRow		Make an empty row if this parameter is true
-	 * @param vd			View descriptor
-	 *
 	 * @return	Row suitable for inserting into SYSVIEWS.
 	 *
 	 * @exception   StandardException thrown on failure

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SystemColumnImpl.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SystemColumnImpl.java?rev=374198&r1=374197&r2=374198&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SystemColumnImpl.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SystemColumnImpl.java Wed Feb  1 14:46:09 2006
@@ -48,13 +48,13 @@
 	/**
 	 * Constructor to create a description of a column in a system table.
 	 *
-	 *	@param	Name of column.
-	 *	@param	Id of column.
-	 *	@param	Precision of data in column.
-	 *	@param	Scale of data in column.
-	 *	@param	Whether or not column accepts nulls.
-	 *	@param	Datatype of column.
-	 *	@param	Maximum length of data in column.
+	 *	@param	name of column.
+	 *	@param	id of column.
+	 *	@param	precision of data in column.
+	 *	@param	scale of data in column.
+	 *	@param	nullability Whether or not column accepts nulls.
+	 *	@param	dataType Datatype of column.
+	 *	@param	maxLength Maximum length of data in column.
 	 */
 	public	SystemColumnImpl(	String	name,
 								int		id,
@@ -79,9 +79,9 @@
 	 * Constructor to create a description of a column in a system table.
 	 * This constructor is used for SQL Identifiers (varchar 128).
 	 *
-	 *	@param	Name of column.
-	 *	@param	Id of column.
-	 *	@param	Whether or not column accepts nulls.
+	 *	@param	name of column.
+	 *	@param	id of column.
+	 *	@param	nullability Whether or not column accepts nulls.
 	 */
 	public	SystemColumnImpl(	String	name,
 								int		id,

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/TabInfoImpl.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/TabInfoImpl.java?rev=374198&r1=374197&r2=374198&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/TabInfoImpl.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/TabInfoImpl.java Wed Feb  1 14:46:09 2006
@@ -75,7 +75,6 @@
 	 * Constructor
 	 *
 	 * @param crf				the associated CatalogRowFactory
-	 * @param executionFactory	execution factory of the database
 	 */
 	public TabInfoImpl(CatalogRowFactory crf)
 	{

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/TableKey.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/TableKey.java?rev=374198&r1=374197&r2=374198&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/TableKey.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/TableKey.java Wed Feb  1 14:46:09 2006
@@ -38,7 +38,7 @@
 	/**
 	 * Constructor for when you have both the table and schema names.
 	 *
-	 * @param schemaId		The UUID of the schema being referecned
+	 * @param schemaUUID		The UUID of the schema being referecned
 	 * @param tableName		The name of the table being referenced	 
 	 */
 	TableKey(UUID schemaUUID, String tableName)

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ActivationClassBuilder.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ActivationClassBuilder.java?rev=374198&r1=374197&r2=374198&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ActivationClassBuilder.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ActivationClassBuilder.java Wed Feb  1 14:46:09 2006
@@ -161,9 +161,6 @@
 	/**
 	 * Generate the assignment for numSubqueries = x
 	 *
-	 * @param numSubqueries		The number of subqueries in the query.
-	 *
-	 * @return Nothing.
 	 * @exception StandardException thrown on failure
 	 */
 	public	 void	setNumSubqueries()

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/AggregateNode.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/AggregateNode.java?rev=374198&r1=374197&r2=374198&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/AggregateNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/AggregateNode.java Wed Feb  1 14:46:09 2006
@@ -137,7 +137,7 @@
 	 * that case it is called <B> after </B> bind time, so we need to create
 	 * the column differently.
 	 *
-	 * @param childRCL	The RCL to append to.
+	 * @param rcl	The RCL to append to.
 	 * @param tableNumber	The tableNumber for the new ColumnReference
 	 *
 	 * @return ValueNode	The (potentially) modified tree.
@@ -533,7 +533,7 @@
 	 * Get the result column that has a new aggregator.
 	 * This aggregator will be fed into the sorter.
 	 *
-	 * @param the data dictionary
+	 * @param dd	the data dictionary
 	 *
 	 * @return the result column.  WARNING: it still needs to be bound
 	 *
@@ -575,7 +575,7 @@
 	 * Get the aggregate expression in a new result
 	 * column.
 	 *
-	 * @param the data dictionary
+	 * @param dd the data dictionary
 	 *
 	 * @return the result column.  WARNING: it still needs to be bound
 	 *
@@ -628,8 +628,6 @@
 	 *
 	 * @param acb	The ExpressionClassBuilder for the class we're generating
 	 * @param mb	The method the code to place the code
-	 *
-	 * @return	An expression to evaluate this operator
 	 *
 	 * @exception StandardException		Thrown on error
 	 */

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/AllResultColumn.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/AllResultColumn.java?rev=374198&r1=374197&r2=374198&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/AllResultColumn.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/AllResultColumn.java Wed Feb  1 14:46:09 2006
@@ -42,8 +42,6 @@
 	 * This initializer is for use in the parser for a "*".
 	 * 
 	 * @param tableName	Dot expression qualifying "*"
-	 *
-	 * @return	The newly constructed AllResultColumn
 	 */
 	public void init(Object tableName)
 	{

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/AlterTableNode.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/AlterTableNode.java?rev=374198&r1=374197&r2=374198&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/AlterTableNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/AlterTableNode.java Wed Feb  1 14:46:09 2006
@@ -375,8 +375,6 @@
 	  
 	/**
 	  *	Generate the ColumnInfo argument for the constant action. Return the number of constraints.
-	  *
-	  *	@return	number of constraints
 	  */
 	public	void	genColumnInfo()
 	{

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/AndNode.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/AndNode.java?rev=374198&r1=374197&r2=374198&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/AndNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/AndNode.java Wed Feb  1 14:46:09 2006
@@ -343,8 +343,6 @@
 	 * Do bind() by hand for an AndNode that was generated after bind(),
 	 * eg by putAndsOnTop(). (Set the data type and nullability info.)
 	 *
-	 * @return	None.
-	 *
 	 * @exception StandardException		Thrown on error
 	 */
 	void postBindFixup()

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BaseTypeCompiler.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BaseTypeCompiler.java?rev=374198&r1=374197&r2=374198&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BaseTypeCompiler.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BaseTypeCompiler.java Wed Feb  1 14:46:09 2006
@@ -163,7 +163,6 @@
 	 *
 	 * @param thisType	The TypeId of the value to be stored
 	 * @param otherType	The TypeId of the value to be stored in
-	 * @param cm		Current ContextManager
 	 *
 	 * @return	true if thisType is storable in otherType
 	 */

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BetweenOperatorNode.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BetweenOperatorNode.java?rev=374198&r1=374197&r2=374198&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BetweenOperatorNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BetweenOperatorNode.java Wed Feb  1 14:46:09 2006
@@ -158,7 +158,6 @@
 	 * subquery flattening.
 	 * NOTE: This is done before the outer ResultSetNode is preprocessed.
 	 *
-	 * @param	dataDictionary		DataDictionary to use.
 	 * @param	numTables			Number of tables in the DML Statement
 	 * @param	outerFromList		FromList from outer query block
 	 * @param	outerSubqueryList	SubqueryList from outer query block

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BinaryComparisonOperatorNode.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BinaryComparisonOperatorNode.java?rev=374198&r1=374197&r2=374198&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BinaryComparisonOperatorNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BinaryComparisonOperatorNode.java Wed Feb  1 14:46:09 2006
@@ -76,8 +76,6 @@
 	 * This node was generated as part of a query rewrite. Bypass the
 	 * normal comparability checks.
 	 * @param val  true if this was for a query rewrite
-	 *
-	 * @return Nothing
 	 */
 	public void setForQueryRewrite(boolean val)
 	{
@@ -96,8 +94,6 @@
 
 	/**
 	 * Use between selectivity when calculating the selectivity.
-	 *
-	 * @return Nothing.
 	 */
 	void setBetweenSelectivity()
 	{
@@ -224,11 +220,6 @@
 	 * Test the type compatability of the operands and set the type info
 	 * for this node.  This method is useful both during binding and
 	 * when we generate nodes within the language module outside of the parser.
-	 *
-	 * @param fromQueryRewrite  If true this call came from a query that was
-	 * rewritten by the optimizer.  The normal isComparable check will be 
-	 * bypassed to allow > < and the like with longvarchar.  
-	 * @return	Nothing
 	 *
 	 * @exception StandardException		Thrown on error
 	 */

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BinaryListOperatorNode.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BinaryListOperatorNode.java?rev=374198&r1=374197&r2=374198&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BinaryListOperatorNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BinaryListOperatorNode.java Wed Feb  1 14:46:09 2006
@@ -103,8 +103,6 @@
 	 * how tree printing is supposed to work.
 	 *
 	 * @param depth		The depth of this node in the tree
-	 *
-	 * @return	Nothing
 	 */
 
 	public void printSubNodes(int depth)
@@ -131,8 +129,6 @@
 	 * Set the clause that this node appears in.
 	 *
 	 * @param clause	The clause that this node appears in.
-	 *
-	 * @return Nothing.
 	 */
 	public void setClause(int clause)
 	{
@@ -212,8 +208,6 @@
 	 * for this node.  This method is useful both during binding and
 	 * when we generate nodes within the language module outside of the parser.
 	 *
-	 * @return	Nothing
-	 *
 	 * @exception StandardException		Thrown on error
 	 */
 	public void bindComparisonOperator()
@@ -271,8 +265,6 @@
 	 * Set the leftOperand to the specified ValueNode
 	 *
 	 * @param newLeftOperand	The new leftOperand
-	 *
-	 * @return None.
 	 */
 	public void setLeftOperand(ValueNode newLeftOperand)
 	{
@@ -294,7 +286,6 @@
 	 *
 	 * @param newRightOperandList	The new rightOperandList
 	 *
-	 * @return None.
 	 */
 	public void setRightOperandList(ValueNodeList newRightOperandList)
 	{

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BinaryLogicalOperatorNode.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BinaryLogicalOperatorNode.java?rev=374198&r1=374197&r2=374198&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BinaryLogicalOperatorNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BinaryLogicalOperatorNode.java Wed Feb  1 14:46:09 2006
@@ -52,8 +52,6 @@
 	 *
 	 * @param leftOperand	The left operand of the comparison
 	 * @param rightOperand	The right operand of the comparison
-	 * @param shortCircuitValue	The value which, if found on the left, means
-	 *							we don't have to evaluate the right.
 	 * @param methodName	The name of the method to call in the generated
 	 *						class.  In this case, it's actually an operator
 	 *						name.



Mime
View raw message