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 [6/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/impl/sql/compile/VirtualColumnNode.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/VirtualColumnNode.java?rev=374198&r1=374197&r2=374198&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/VirtualColumnNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/VirtualColumnNode.java Wed Feb  1 14:46:09 2006
@@ -84,8 +84,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)
@@ -176,8 +174,6 @@
 	/**
 	 * Mark this VCN as a reference to a correlated column.
 	 * (It's source resultSet is an outer ResultSet.
-	 *
-	 * @return Nothing.
 	 */
 	void setCorrelated()
 	{

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/XMLConstantNode.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/XMLConstantNode.java?rev=374198&r1=374197&r2=374198&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/XMLConstantNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/XMLConstantNode.java Wed Feb  1 14:46:09 2006
@@ -85,8 +85,6 @@
      * @param acb The ExpressionClassBuilder for the class being built
      * @param mb The method the code to place the code
      *
-     * @return The compiled Expression, 
-     *
      * @exception StandardException        Thrown on error
      */
     void generateConstant(ExpressionClassBuilder acb, MethodBuilder mb)

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/XMLTypeCompiler.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/XMLTypeCompiler.java?rev=374198&r1=374197&r2=374198&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/XMLTypeCompiler.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/XMLTypeCompiler.java Wed Feb  1 14:46:09 2006
@@ -23,6 +23,7 @@
 import org.apache.derby.iapi.services.loader.ClassFactory;
 import org.apache.derby.iapi.services.sanity.SanityManager;
 import org.apache.derby.iapi.services.io.StoredFormatIds;
+import org.apache.derby.iapi.sql.compile.TypeCompiler;
 
 import org.apache.derby.iapi.error.StandardException;
 
@@ -144,7 +145,7 @@
     }
 
     /**
-     * @see TypeCompiler#nullMethodName
+     * @see BaseTypeCompiler#nullMethodName
      */
     protected String nullMethodName()
     {
@@ -161,7 +162,7 @@
     }
 
     /**
-     * @see TypeCompiler#dataValueMethodName
+     * @see BaseTypeCompiler#dataValueMethodName
      */
     protected String dataValueMethodName()
     {

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/sqlgrammar.jj
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/sqlgrammar.jj?rev=374198&r1=374197&r2=374198&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/sqlgrammar.jj (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/sqlgrammar.jj Wed Feb  1 14:46:09 2006
@@ -309,7 +309,7 @@
 		Typically used for CREATE statements at the parser level. Called usually just
 		before the node is created, or can be called in just a partial syntax fragment
 		
-		@param majorVersion Data Dictionary major version (DataDictionary.DD_ constant)
+		@param version Data Dictionary major version (DataDictionary.DD_ constant)
 		@param feature SQL Feature name, for error text.
 	*/
 	private void checkVersion(int version, String feature) throws StandardException
@@ -592,7 +592,6 @@
 	 * Set all the ParameterNodes to point to the array of
 	 * parameter descriptors.
 	 * 
-	 * @return Nothing
 	 *	@exception	StandardException
 	 */
 	 private void setUpAndLinkParameters()
@@ -1370,8 +1369,6 @@
 	/**
 	 * Determine whether the next sequence of tokens is a class name
 	 *
-	 * @param startToken	Token to look for class name at
-	 *
 	 * @return	TRUE iff the next set of tokens is the java class name
 	 */
 	boolean javaClassFollows()
@@ -1697,7 +1694,7 @@
         to a procedure or function defintion.
         
         @param required int array of require clauses
-        @param the array of declared clauses.
+        @param  clauses the array of declared clauses.
     */
     void checkRequiredRoutineClause(int[] required, Object[] clauses)
         throws StandardException

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/conn/GenericLanguageConnectionContext.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/conn/GenericLanguageConnectionContext.java?rev=374198&r1=374197&r2=374198&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/conn/GenericLanguageConnectionContext.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/conn/GenericLanguageConnectionContext.java Wed Feb  1 14:46:09 2006
@@ -1902,7 +1902,7 @@
 	 * Push a StatementContext on the context stack.
 	 *
 	 * @param isAtomic whether this statement is atomic or not
-	 * @param isForReadonly whether this statement is for a read only resultset
+	 * @param isForReadOnly whether this statement is for a read only resultset
 	 * @param stmtText the text of the statement.  Needed for any language
 	 * 	statement (currently, for any statement that can cause a trigger
 	 * 	to fire).  Please set this unless you are some funky jdbc setXXX

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/conn/GenericLanguageConnectionFactory.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/conn/GenericLanguageConnectionFactory.java?rev=374198&r1=374197&r2=374198&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/conn/GenericLanguageConnectionFactory.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/conn/GenericLanguageConnectionFactory.java Wed Feb  1 14:46:09 2006
@@ -370,8 +370,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/depend/BasicDependencyManager.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/depend/BasicDependencyManager.java?rev=374198&r1=374197&r2=374198&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/depend/BasicDependencyManager.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/depend/BasicDependencyManager.java Wed Feb  1 14:46:09 2006
@@ -239,8 +239,6 @@
 	 * @param action	The action causing the invalidate
 	 * @param lcc		Language connection context
 	 *
-	 * @return		array of locked dependents (to be unlocked by caller later)
-	 *
 	 * @exception StandardException		Thrown on error.
 	 */
 	private void coreInvalidateFor(Provider p, int action, LanguageConnectionContext lcc)
@@ -419,7 +417,6 @@
 		stored; the delete is finalized at the next commit.
 
 		@param d the dependent
-		@param p the provider
 	 *
 	 * @exception StandardException		Thrown on failure
 	 */
@@ -674,7 +671,6 @@
 	 * @see DependencyManager#clearColumnInfoInProviders
 	 *
 	 * @param pl		provider list
-	 * @return void
 	 *
 	 * @exception StandardException		Thrown on error
 	 */
@@ -729,7 +725,7 @@
 	 * need to internationalize, which is causing the invokation
 	 * of the Dependency Manager.
 	 *
-	 * @param int		The action
+	 * @param action		The action
 	 *
 	 * @return String	The String representation
 	 */

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/AddJarConstantAction.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/AddJarConstantAction.java?rev=374198&r1=374197&r2=374198&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/AddJarConstantAction.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/AddJarConstantAction.java Wed Feb  1 14:46:09 2006
@@ -48,11 +48,9 @@
 	/**
 	 *	Make the ConstantAction to add a jar file to database.
 	 *
-	 *	@param	id					The id for the jar file -
-	 *                              (null means create one)
 	 *	@param	schemaName			The SchemaName for the jar file.
 	 *	@param	sqlName			    The sqlName for the jar file.
-	 *  @param  fileName            The name of the file that holds the jar.
+	 *  @param  externalPath            The name of the file that holds the jar.
 	 */
 	AddJarConstantAction(UUID id,
 								 String schemaName,

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/AlterTableConstantAction.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/AlterTableConstantAction.java?rev=374198&r1=374197&r2=374198&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/AlterTableConstantAction.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/AlterTableConstantAction.java Wed Feb  1 14:46:09 2006
@@ -300,7 +300,6 @@
 	  * RepAlterTableConstantAction
 	  *	could enjoy the benefits of the startWriting() method above.
 	  *
-	  *	@param	dd			the data dictionary
 	  *
 	  * @exception StandardException		Thrown on failure
 	  */
@@ -559,7 +558,6 @@
 	/**
 	 * Workhorse for adding a new column to a table.
 	 *
-	 * @param 	dd 			the data dictionary.
 	 * @param   ix 			the index of the column specfication in the ALTER 
 	 *						statement-- currently we allow only one.
 	 * @exception StandardException 	thrown on failure.
@@ -655,7 +653,6 @@
 	/**
 	 * Workhorse for dropping a column from a table.
 	 *
-	 * @param 	dd 			the data dictionary.
 	 * @param   ix 			the index of the column specfication in the ALTER 
 	 *						statement-- currently we allow only one.
 	 * @exception StandardException 	thrown on failure.

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/BaseActivation.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/BaseActivation.java?rev=374198&r1=374197&r2=374198&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/BaseActivation.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/BaseActivation.java Wed Feb  1 14:46:09 2006
@@ -712,8 +712,6 @@
 	 * @param columnPositions	The array of column positions
 	 * @param positionToSet		The place to put the column position
 	 * @param column			The column position
-	 *
-	 * @return	Nothing
 	 */
 	public static void setColumnPosition(
 							int[] columnPositions,
@@ -749,7 +747,7 @@
 	 * @param qualifiers	The array of Qualifiers
 	 * @param qualifier		The Qualifier
 	 * @param position_1    The Nth array index into qualifiers[N][M]
-	 * @param position_1    The Nth array index into qualifiers[N][M]
+	 * @param position_2    The Nth array index into qualifiers[N][M]
 	 */
 	public static void setQualifier(
     Qualifier[][]   qualifiers,
@@ -1227,7 +1225,6 @@
 	 * This method can help reduce the amount of generated code by changing
 	 * instances of this.pvs.getParameter(position) to this.getParameter(position) 
 	 * @param position
-	 * @return
 	 * @throws StandardException
 	 */
 	protected final DataValueDescriptor getParameter(int position) throws StandardException { 
@@ -1307,8 +1304,6 @@
 
 	/**
 	 	Throw an exception if any parameters are uninitialized.
-
-		@return		Nothing
 
 		@exception StandardException	Thrown if any parameters
 												are unitialized

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/CreateIndexConstantAction.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/CreateIndexConstantAction.java?rev=374198&r1=374197&r2=374198&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/CreateIndexConstantAction.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/CreateIndexConstantAction.java Wed Feb  1 14:46:09 2006
@@ -103,7 +103,7 @@
 	 *
 	 *  @param unique		True means it will be a unique index
 	 *  @param indexType	The type of index (BTREE, for example)
-	 *  @param sd			the schema that table (and index) lives in.
+	 *  @param schemaName	the schema that table (and index) lives in.
 	 *  @param indexName	Name of the index
 	 *  @param tableName	Name of table the index will be on
 	 *  @param tableId		UUID of table
@@ -692,8 +692,6 @@
 	 *
 	 * @param scan				ScanController for the heap
 	 * @param indexController	ConglomerateController for the index
-	 *
-	 * @return Nothing.
 	 */
 	private void statementExceptionCleanup(
 					ScanController scan, 

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/CreateSchemaConstantAction.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/CreateSchemaConstantAction.java?rev=374198&r1=374197&r2=374198&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/CreateSchemaConstantAction.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/CreateSchemaConstantAction.java Wed Feb  1 14:46:09 2006
@@ -63,9 +63,6 @@
 	 *
 	 *  @param schemaName	Name of table.
 	 *  @param aid			Authorizaton id
-	 *  @param schemaId		ID of table. If null, we allocate one.
-	 *	@param setToDefault	if true, set the default schema to
-	 *			the new schema once it is created.
 	 */
 	CreateSchemaConstantAction(
 								String			schemaName,

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/CreateViewConstantAction.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/CreateViewConstantAction.java?rev=374198&r1=374197&r2=374198&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/CreateViewConstantAction.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/CreateViewConstantAction.java Wed Feb  1 14:46:09 2006
@@ -77,7 +77,7 @@
 	 *  @param checkOption	Check option type
 	 *  @param columnInfo	Information on all the columns in the table.
 	 *  @param providerInfo Information on all the Providers
-	 *  @param compSchemId 	Compilation Schema Id
+	 *  @param compSchemaId 	Compilation Schema Id
 	 *		 (REMIND tableDescriptor ignored)
 	 */
 	CreateViewConstantAction(

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DDLConstantAction.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DDLConstantAction.java?rev=374198&r1=374197&r2=374198&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DDLConstantAction.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DDLConstantAction.java Wed Feb  1 14:46:09 2006
@@ -164,8 +164,6 @@
 	 * @param heapConglomerateNumber	The conglomerate number for the heap.
 	 * @param exclusiveMode				Whether or not to lock the table in exclusive mode.
 	 *
-	 * @return Nothing.
-	 *
 	 * @exception StandardException if schema is system schema
 	 */
 	final void lockTableForDDL(TransactionController tc,

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DMLWriteResultSet.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DMLWriteResultSet.java?rev=374198&r1=374197&r2=374198&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DMLWriteResultSet.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DMLWriteResultSet.java Wed Feb  1 14:46:09 2006
@@ -57,7 +57,6 @@
 	 * Constructor
 	 *
  	 * @param activation		an activation
-	 * @param constantAction	a write constant action
 	 *
  	 * @exception StandardException on error
 	 */

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DistinctScalarAggregateResultSet.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DistinctScalarAggregateResultSet.java?rev=374198&r1=374197&r2=374198&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DistinctScalarAggregateResultSet.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DistinctScalarAggregateResultSet.java Wed Feb  1 14:46:09 2006
@@ -258,7 +258,8 @@
 	}
 
         /**
-         * @inheritDoc
+         * If the result set has been opened,
+		 * close the open scan.
          */
         public void close() throws StandardException
         {

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DropTableConstantAction.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DropTableConstantAction.java?rev=374198&r1=374197&r2=374198&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DropTableConstantAction.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DropTableConstantAction.java Wed Feb  1 14:46:09 2006
@@ -78,7 +78,7 @@
 	 *	@param	fullTableName		Fully qualified table name
 	 *	@param	tableName			Table name.
 	 *	@param	sd					Schema that table lives in.
-	 *  @param  conglomerateNubmer	Conglomerate number for heap
+	 *  @param  conglomerateNumber	Conglomerate number for heap
 	 *  @param  tableId				UUID for table
 	 *  @param  behavior			drop behavior: RESTRICT, CASCADE or default
 	 *

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/FKInfo.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/FKInfo.java?rev=374198&r1=374197&r2=374198&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/FKInfo.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/FKInfo.java Wed Feb  1 14:46:09 2006
@@ -98,17 +98,17 @@
 	 *
 	 * @param fkConstraintNames the foreign key constraint names
 	 * @param tableName	the name of the table being modified
-	 * @param statementType	the type of the statement: e.g. StatementType.INSERT
+	 * @param stmtType	the type of the statement: e.g. StatementType.INSERT
 	 * @param type either FKInfo.REFERENCED_KEY or FKInfo.FOREIGN_KEY
 	 * @param refUUID UUID of the referenced constraint
-	 * @param refConglomMnubmer congomerate number of the referenced key
+	 * @param refConglomNumber congomerate number of the referenced key
 	 * @param fkUUIDs an array of fkUUIDs of backing indexes.  if
 	 *			FOREIGN_KEY, then just one element, the backing
 	 *			index of the referrenced keys.  if REFERENCED_KEY,
 	 *			then all the foreign keys
 	 * @param fkConglomNumbers array of conglomerate numbers, corresponds
 	 *			to fkUUIDs
-	 * @param fkIsSelfRefernecing array of conglomerate booleans indicating
+	 * @param fkIsSelfReferencing array of conglomerate booleans indicating
 	 *			whether the fk references a key in the same table
 	 * @param colArray map of columns to the base row that DML
 	 * 			is changing.  1 based.  Note that this maps the

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/ForeignKeyRIChecker.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/ForeignKeyRIChecker.java?rev=374198&r1=374197&r2=374198&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/ForeignKeyRIChecker.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/ForeignKeyRIChecker.java Wed Feb  1 14:46:09 2006
@@ -41,7 +41,7 @@
 {
 	/**
 	 * @param tc		the xact controller
-	 * @param fkInfo	the foreign key information 
+	 * @param fkinfo	the foreign key information 
 	 *
 	 * @exception StandardException		Thrown on failure
 	 */

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/GenericAggregateResultSet.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/GenericAggregateResultSet.java?rev=374198&r1=374197&r2=374198&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/GenericAggregateResultSet.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/GenericAggregateResultSet.java Wed Feb  1 14:46:09 2006
@@ -172,7 +172,7 @@
 	 * invoked to create a new row.  That row is then
 	 * initialized and used for the output of the aggregation.
 	 *
-	 * @param 	the row to finish aggregation
+	 * @param 	row	the row to finish aggregation
 	 *
 	 * @return	the result row.  If the input row != null, then
 	 *	the result row == input row

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/GenericAggregator.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/GenericAggregator.java?rev=374198&r1=374197&r2=374198&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/GenericAggregator.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/GenericAggregator.java Wed Feb  1 14:46:09 2006
@@ -70,8 +70,6 @@
 	 * Constructor:
 	 *
 	 * @param aggInfo 	information about the user aggregate
-	 * @param jdbcFactory 	the jdbc factory, may be null if
-	 *		this is a system aggregate
 	 * @param cf		the class factory. 
 	 */
 	GenericAggregator

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/GenericConstantActionFactory.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/GenericConstantActionFactory.java?rev=374198&r1=374197&r2=374198&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/GenericConstantActionFactory.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/GenericConstantActionFactory.java Wed Feb  1 14:46:09 2006
@@ -127,7 +127,6 @@
 	 *	@param compressTable	Whether or not this is a compress table
 	 *	@param behavior			drop behavior of dropping column
 	 *	@param sequential	If compress table/drop column, whether or not sequential
-	 *	@param compressTable	Whether or not this is a truncate table
 	 */
 	public	ConstantAction	getAlterTableConstantAction
 	(
@@ -163,12 +162,9 @@
 	 *  @param columnNames		String[] for column names
 	 *  @param indexAction		IndexConstantAction for constraint (if necessary)
 	 *  @param constraintText	Text for check constraint
-	 *  RESOLVE - the next parameter should go away once we use UUIDs
-	 *			  (Generated constraint names will be based off of uuids)
-	 *	@param constraintId		UUID of constraint. null => we should generate one.
 	 *	@param enabled			Should the constraint be created as enabled 
 	 *							(enabled == true), or disabled (enabled == false).
-	 *	@param ConstraintInfo	The referenced constraint, if a foreign key constraint
+	 *	@param otherConstraint	The referenced constraint, if a foreign key constraint
 	 *  @param providerInfo Information on all the Providers
 	 */
 	public	CreateConstraintConstantAction	getCreateConstraintConstantAction
@@ -238,9 +234,6 @@
 	 *  @param aliasName		Name of alias.
 	 *  @param schemaName		Alias's schema. 
 	 *  @param javaClassName	Name of java class.
-	 *  @param methodName		Name of method.
-	 *  @param targetClassName	Name of java class at Target database.
-	 *  @param targetMethodName	Name of method at Target database.
 	 *  @param aliasType		The alias type
 	 */
 	public	ConstantAction	getCreateAliasConstantAction
@@ -260,9 +253,6 @@
 	 *
 	 *  @param schemaName	Name of table.
 	 *  @param aid			Authorizaton id
-	 *  @param schemaId		ID of table. If null, we allocate one.
-	 *	@param setToDefault	if true, set the default schema to
-	 *			the new schema once it is created.
 	 */
 	public	ConstantAction	getCreateSchemaConstantAction
 	(
@@ -321,7 +311,7 @@
 	/**
 	 *	Make the ConstantAction for a CREATE VIEW statement.
 	 *
-	 *  @param sd			descriptor for the schema that table lives in.
+	 *  @param schemaName	Name of the schema that table lives in.
 	 *  @param tableName	Name of table.
 	 *  @param tableType	Type of table (e.g., BASE).
 	 *	@param viewText		Text of query expression for view definition
@@ -365,9 +355,6 @@
 	 *  @param tableID				table id
 	 *	@param lockMode				The lock mode to use
 	 *								  (row or table, see TransactionController)
-	 *  @param deleteUndoable   	undoable for the delete
-	 *  @param endRowsUndoable  	undoable for the end rows token
-	 *  @param endStatementUndoable undoable for the end statement token
 	 *  @param keySignature     	signature for the key(null for source)
 	 *  @param keyPositions     	positions of primary key columns in base row
 	 *  @param keyConglomId  		conglomerate id for the key
@@ -534,7 +521,7 @@
 	 *	@param	fullTableName		Fully qualified table name
 	 *	@param	tableName			Table name.
 	 *	@param	sd					Schema that table lives in.
-	 *  @param  conglomerateNubmer	Conglomerate number for heap
+	 *  @param  conglomerateNumber	Conglomerate number for heap
 	 *  @param  tableId				UUID for table
 	 *  @param  behavior			drop behavior, CASCADE, RESTRICT or DEFAULT
 	 *
@@ -605,7 +592,6 @@
 	 *	Make the ConstantAction for a Replicated INSERT statement.
 	 *
 	 *  @param conglomId		Conglomerate ID.
-	 *  @param tableType		type of this table
 	 *  @param heapSCOCI		StaticCompiledOpenConglomInfo for target heap.
 	 *  @param irgs				Index descriptors
 	 *  @param indexCIDS		Conglomerate IDs of indices
@@ -619,7 +605,6 @@
 	 *	@param fkInfo			Array of structures containing foreign key info, 
 	 *							if any (may be null)
 	 *	@param triggerInfo		Array of structures containing trigger info, 
-	 *  @param baseRowReadList      Map of columns read in.  1 based.
      *  @param streamStorableHeapColIds Null for non rep. (0 based)
 	 *							if any (may be null)
 	 *  @param indexedCols		boolean[] of which (0-based) columns are indexed.
@@ -763,15 +748,10 @@
 	 *  @param tableIsPublished		true if table is published, false otherwise
 	 *	@param changedColumnIds		Array of ids of changes columns
 	 *  @param keyPositions     	positions of primary key columns in base row
-	 *  @param updateUndoable		an update token
-	 *  @param endRowsUndoable		an end rows token
-	 *  @param endStatementUndoable an end statement token
 	 *	@param fkInfo				Array of structures containing foreign key info, 
 	 *								if any (may be null)
 	 *	@param triggerInfo			Array of structures containing trigger info, 
 	 *  @param baseRowReadList      Map of columns read in.  1 based.
-     *  @param streamStorableHeapColIds Null for non rep. (0 based)
-	 *								if any (may be null)
 	 *  @param baseRowReadMap		map of columns to be selected from the base row
 	 *								(partial row). 1 based.
      *  @param streamStorableHeapColIds Null for non rep. (0 based)
@@ -838,7 +818,7 @@
 	 *                              (null means create one)
 	 *	@param	schemaName			The SchemaName for the jar file.
 	 *	@param	sqlName			    The sqlName for the jar file.
-	 *  @param  fileName            The name of the file that holds the jar.
+	 *  @param  externalPath            The name of the file that holds the jar.
 	 *  @exception StandardException Ooops
 	 */
 	public	ConstantAction getAddJarConstantAction(UUID id,
@@ -857,7 +837,7 @@
 	 *                              (Ignored if null)
 	 *	@param	schemaName			The SchemaName for the jar file.
 	 *	@param	sqlName			    The sqlName for the jar file.
-	 *  @param  fileName            The name of the file that holds the new jar.
+	 *  @param  externalPath            The name of the file that holds the new jar.
 	 *  @exception StandardException Ooops
 	 */
 	public	ConstantAction getReplaceJarConstantAction(UUID id,
@@ -897,7 +877,7 @@
 	/**
 	 *	Make the ConstantAction for a CREATE TRIGGER statement.
 	 *
-	 * @param triggerSd		descriptor for the schema that trigger lives in.
+	 * @param triggerSchemaName		Name of the schema that trigger lives in.
 	 * @param triggerName	Name of trigger
 	 * @param eventMask		TriggerDescriptor.TRIGGER_EVENT_XXXX
 	 * @param isBefore		is this a before (as opposed to after) trigger 
@@ -1022,7 +1002,6 @@
 	 *
 	 * @param privileges The list of privileges to be granted
 	 * @param grantees The list of grantees
-	 * @param withGrantOption true if WITH GRANT OPTION, false if not.
 	 */
 	public ConstantAction getGrantConstantAction( PrivilegeInfo privileges,
 								List grantees)
@@ -1035,7 +1014,6 @@
 	 * 
 	 * @param privileges The list of privileges to be revokeed
 	 * @param grantees The list of grantees
-	 * @param withGrantOption true if WITH GRANT OPTION, false if not.
 	 */
 	public ConstantAction getRevokeConstantAction( PrivilegeInfo privileges,
 								List grantees)

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/GenericRIChecker.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/GenericRIChecker.java?rev=374198&r1=374197&r2=374198&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/GenericRIChecker.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/GenericRIChecker.java Wed Feb  1 14:46:09 2006
@@ -59,7 +59,7 @@
 
 	/**
 	 * @param tc		the xact controller
-	 * @param fkInfo	the foreign key information 
+	 * @param fkinfo	the foreign key information 
 	 *
 	 * @exception StandardException		Thrown on failure
 	 */

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/GrantRevokeConstantAction.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/GrantRevokeConstantAction.java?rev=374198&r1=374197&r2=374198&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/GrantRevokeConstantAction.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/GrantRevokeConstantAction.java Wed Feb  1 14:46:09 2006
@@ -51,7 +51,7 @@
 	/**
 	 *	This is the guts of the Execution-time logic for GRANT/REVOKE
 	 *
-	 *	@see ConstantAction#executeConstantAction
+	 *	See ConstantAction#executeConstantAction
 	 *
 	 * @exception StandardException		Thrown on failure
 	 */

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/IndexChanger.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/IndexChanger.java?rev=374198&r1=374197&r2=374198&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/IndexChanger.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/IndexChanger.java Wed Feb  1 14:46:09 2006
@@ -168,8 +168,6 @@
 	 * this index changer.
 	 *
 	 * @param baseCC	The heap's ConglomerateController.
-	 *
-	 * @return Nothing.
 	 */
 	public void setBaseCC(ConglomerateController baseCC)
 	{
@@ -571,7 +569,6 @@
 	/**
 	  Perform index maintenance to support an update of a base table row.
 
-	  @param ef	                ExecutionFactory to use in case of cloning
 	  @param oldBaseRow         the old image of the base table row.
 	  @param newBaseRow         the new image of the base table row.
 	  @param baseRowLocation    the base table row's location.
@@ -602,7 +599,7 @@
 	/**
 	  Perform index maintenance to support an insert of a base table row.
 
-	  @param baseRow            the base table row.
+	  @param newRow            the base table row.
 	  @param baseRowLocation    the base table row's location.
 
 	  @exception StandardException		Thrown on error
@@ -622,8 +619,7 @@
 	  because this is the only operation that requires deferred inserts,
 	  and we only want to create the conglomerate if necessary.
 
-	  @param ef		            ExecutionFactory to use in case of cloning
-	  @param baseRow            the base table row.
+	  @param newRow            the base table row.
 	  @param baseRowLocation    the base table row's location.
 
 	  @exception StandardException		Thrown on error

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/IndexConstantAction.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/IndexConstantAction.java?rev=374198&r1=374197&r2=374198&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/IndexConstantAction.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/IndexConstantAction.java Wed Feb  1 14:46:09 2006
@@ -60,7 +60,7 @@
 	 *	@param	tableId				The table uuid
 	 *	@param	indexName			Index name.
 	 *	@param	tableName			The table name
-	 *	@param	sd					Schema that index lives in.
+	 *	@param	schemaName					Schema that index lives in.
 	 *
 	 */
 	protected	IndexConstantAction(
@@ -94,8 +94,6 @@
 	 * Useful for unnamed constraints which have a backing index.
 	 *
 	 * @param indexName		The (generated) index name.
-	 *
-	 * @return Nothing.
 	 */
 	public void setIndexName(String indexName)
 	{

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/IndexRow.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/IndexRow.java?rev=374198&r1=374197&r2=374198&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/IndexRow.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/IndexRow.java Wed Feb  1 14:46:09 2006
@@ -100,8 +100,6 @@
 
 	/**
 	 * Turn the ExecRow into an ExecIndexRow.
-	 *
-	 * @return Nothing.
 	 */
 	public void execRowToExecIndexRow(ExecRow valueRow)
 	{

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/IndexSetChanger.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/IndexSetChanger.java?rev=374198&r1=374197&r2=374198&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/IndexSetChanger.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/IndexSetChanger.java Wed Feb  1 14:46:09 2006
@@ -295,8 +295,6 @@
 	 * all of the underlying index changers.
 	 *
 	 * @param baseCC	The heap's ConglomerateController.
-	 *
-	 * @return Nothing.
 	 */
 	public void setBaseCC(ConglomerateController baseCC)
 	{

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/IndexValueRow.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/IndexValueRow.java?rev=374198&r1=374197&r2=374198&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/IndexValueRow.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/IndexValueRow.java Wed Feb  1 14:46:09 2006
@@ -141,8 +141,6 @@
 
 	/**
 	 * Turn the ExecRow into an ExecIndexRow.
-	 *
-	 * @return Nothing.
 	 */
 	public void execRowToExecIndexRow(ExecRow valueRow)
 	{

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/InsertConstantAction.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/InsertConstantAction.java?rev=374198&r1=374197&r2=374198&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/InsertConstantAction.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/InsertConstantAction.java Wed Feb  1 14:46:09 2006
@@ -120,10 +120,6 @@
 	 *  @param singleRowSource		Whether or not source is a single row source
 	 *  @param autoincRowLocation Array of rowlocations of autoincrement values
 	 * 							  in SYSCOLUMNS for each ai column.
-	 *  @param schemaName	schema of target table.
-	 *  @param tableName    name of target table.
-	 *  @param columnNames  array of columnnames of the target table.
-	 *  @param autoincIncrement array of increment values for ai columns.
 	 */
 	public	InsertConstantAction(TableDescriptor tableDescriptor,
 								long				conglomId,

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/InsertResultSet.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/InsertResultSet.java?rev=374198&r1=374197&r2=374198&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/InsertResultSet.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/InsertResultSet.java Wed Feb  1 14:46:09 2006
@@ -312,7 +312,6 @@
 	  *	Run the check constraints against the current row. Raise an error if
 	  * a check constraint is violated.
 	  *
-	  * @return Nothing.
 	  * @exception StandardException thrown on error
 	  */
 	private	void	evaluateCheckConstraints()
@@ -665,8 +664,6 @@
 	 * Save that column positions array in activation. We do this to simplify the
 	 * rest of the logic(it only has to deal with column positions here after).
 	 *
-	 * @return Nothing.
-	 *
 	 * @exception StandardException		Thrown on error if invalid column
    * name in the list.
 	 */
@@ -2054,8 +2051,6 @@
 	 *
 	 * @param heapConglom	Conglomerate number for the heap
 	 *
-	 * @return Nothing
-	 *
 	 * @exception StandardException		Thrown on failure
 	 */
 	private void setEstimatedRowCount(long heapConglom)
@@ -2090,8 +2085,6 @@
 	 * as we populated the table.  Doing a 0 row replace into a
 	 * table with indexes is a degenerate case, hence we allow
 	 * ugly and unoptimized code.
-	 *
-	 * @return Nothing.
 	 *
 	 * @exception StandardException		Thrown on failure
 	 */

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/InternalTriggerExecutionContext.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/InternalTriggerExecutionContext.java?rev=374198&r1=374197&r2=374198&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/InternalTriggerExecutionContext.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/InternalTriggerExecutionContext.java Wed Feb  1 14:46:09 2006
@@ -123,7 +123,6 @@
 	 * you are.
 	 *
 	 * @param lcc	the lcc
-	 * @param jdbcFactory	the jdbc factory
 	 * @param statementText	the text of the statement that caused the
 	 *		trigger to fire.  may be null if we are replicating
 	 * @param changedColIds	the list of columns that changed.  Null

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/JoinResultSet.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/JoinResultSet.java?rev=374198&r1=374197&r2=374198&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/JoinResultSet.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/JoinResultSet.java Wed Feb  1 14:46:09 2006
@@ -264,8 +264,6 @@
 	 * open the rightResultSet.  If already open,
 	 * just reopen.
 	 *
-	 * @return Nothing
-	 *
 	 * @exception StandardException		Thrown on error
 	 */
 	protected void openRight() throws StandardException
@@ -284,9 +282,6 @@
 	/**
 	 * close the rightResultSet
 	 *
-	 * @return Nothing
-	 *
-	 * @exception StandardException thrown on error
 	 */
 	protected void closeRight() throws StandardException
 	{

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/LockTableConstantAction.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/LockTableConstantAction.java?rev=374198&r1=374197&r2=374198&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/LockTableConstantAction.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/LockTableConstantAction.java Wed Feb  1 14:46:09 2006
@@ -55,7 +55,7 @@
 	/**
 	 * Make the ConstantAction for a LOCK TABLE statement.
 	 *
-	 *  @param fulltableName		Full name of the table.
+	 *  @param fullTableName		Full name of the table.
 	 *  @param conglomerateNumber	Conglomerate number for the heap
 	 *  @param exclusiveMode		Whether or not to get an exclusive lock.
 	 */

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/NoPutResultSetImpl.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/NoPutResultSetImpl.java?rev=374198&r1=374197&r2=374198&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/NoPutResultSetImpl.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/NoPutResultSetImpl.java Wed Feb  1 14:46:09 2006
@@ -292,8 +292,6 @@
 	 * qualifiers is reopened.)
 	 *
 	 * @param qualifiers	The Qualifiers to clear
-	 *
-	 * @return Nothing.
 	 */
 	protected void clearOrderableCache(Qualifier[][] qualifiers) throws StandardException
 	{
@@ -326,8 +324,6 @@
 	 * Set the GeneratedMethod for enforcing check constraints
 	 * 
 	 * @param checkGM	The GeneratedMethod for enforcing any check constraints.
-	 *
-	 * @return Nothing.
 	 */
 	protected void setCheckConstraints(GeneratedMethod checkGM)
 	{
@@ -338,8 +334,6 @@
 	 * Set the heap conglomerate number (used in enforcing check constraints)
 	 * 
 	 * @param heapConglomerate	The heap conglomerate number.
-	 *
-	 * @return Nothing.
 	 */
 	protected void setHeapConglomerate(long heapConglomerate)
 	{

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/NoRowsResultSetImpl.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/NoRowsResultSetImpl.java?rev=374198&r1=374197&r2=374198&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/NoRowsResultSetImpl.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/NoRowsResultSetImpl.java Wed Feb  1 14:46:09 2006
@@ -560,7 +560,7 @@
 	  *	@param	checkGM			Generated code to run the check constraint.
 	  * @param	checkName		Name of the constraint to check.
 	  *	@param	heapConglom		Number of heap conglomerate.
-	  *	@param	Activation		Class in which checkGM lives.
+	  *	@param	activation		Class in which checkGM lives.
 	  *
 	  * @exception StandardException thrown on error
 	  */
@@ -608,7 +608,7 @@
 	  * a check constraint is violated.
 	  *
 	  *	@param	checkGM			Generated code to run the check constraint.
-	  *	@param	Activation		Class in which checkGM lives.
+	  *	@param	activation		Class in which checkGM lives.
 	  *
 	  * @exception StandardException thrown on error
 	  */

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/PrivilegeInfo.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/PrivilegeInfo.java?rev=374198&r1=374197&r2=374198&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/PrivilegeInfo.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/PrivilegeInfo.java Wed Feb  1 14:46:09 2006
@@ -55,8 +55,6 @@
 	 * @param objectDescriptor
 	 * @param sd
 	 *
-	 * @return true iff the user is the owner of the schema
-	 *
 	 * @exception StandardException if user does not own the object
 	 */
 	protected void checkOwnership( String user,

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/RIBulkChecker.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/RIBulkChecker.java?rev=374198&r1=374197&r2=374198&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/RIBulkChecker.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/RIBulkChecker.java Wed Feb  1 14:46:09 2006
@@ -91,7 +91,7 @@
 	 *								Will be cloned when it is used.
 	 *								Must be a full index row.
 	 * @param quitOnFirstFailure	quit on first unreferenced key
-	 * @param unreferencedKeysCC	put unreferenced keys here
+	 * @param unreferencedCC	put unreferenced keys here
 	 * @param firstRowToFail		the first row that fails the constraint
 	 *								is copied to this, if non-null
      */

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/RISetChecker.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/RISetChecker.java?rev=374198&r1=374197&r2=374198&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/RISetChecker.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/RISetChecker.java Wed Feb  1 14:46:09 2006
@@ -38,7 +38,7 @@
 
 	/**
 	 * @param tc		the xact controller
-	 * @param fkInfo[]	the foreign key information 
+	 * @param fkInfo	the foreign key information 
 	 *
 	 * @exception StandardException		Thrown on failure
 	 */
@@ -125,7 +125,7 @@
 	/**
 	 * Execute the specific RI check on the passed in row.
 	 *
-	 * @param fkIndex	index into fkInfo
+	 * @param index	index into fkInfo
 	 * @param row		the row to check
 	 *
 	 * @exception StandardException on unexpected error, or

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/ReferencedKeyRIChecker.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/ReferencedKeyRIChecker.java?rev=374198&r1=374197&r2=374198&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/ReferencedKeyRIChecker.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/ReferencedKeyRIChecker.java Wed Feb  1 14:46:09 2006
@@ -43,7 +43,7 @@
 {
 	/**
 	 * @param tc		the xact controller
-	 * @param fkInfo	the foreign key information 
+	 * @param fkinfo	the foreign key information 
 	 *
 	 * @exception StandardException		Thrown on failure
 	 */

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/ReplaceJarConstantAction.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/ReplaceJarConstantAction.java?rev=374198&r1=374197&r2=374198&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/ReplaceJarConstantAction.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/ReplaceJarConstantAction.java Wed Feb  1 14:46:09 2006
@@ -50,7 +50,7 @@
 	 *	@param	id					The id for the jar file
 	 *	@param	schemaName			The SchemaName for the jar file.
 	 *	@param	sqlName			    The sqlName for the jar file.
-	 *  @param  fileName            The name of the file that holds the jar.
+	 *  @param  externalPath            The name of the file that holds the jar.
 	 */
 	ReplaceJarConstantAction(UUID id,
 									String schemaName,

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/RoutinePrivilegeInfo.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/RoutinePrivilegeInfo.java?rev=374198&r1=374197&r2=374198&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/RoutinePrivilegeInfo.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/RoutinePrivilegeInfo.java Wed Feb  1 14:46:09 2006
@@ -49,7 +49,6 @@
 	 * @param activation
 	 * @param grant true if grant, false if revoke
 	 * @param grantees a list of authorization ids (strings)
-	 * @param withGrantOption true if grant with grant option, false if not. always false if !grant
 	 *
 	 * @exception StandardException		Thrown on failure
 	 */

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/RowChangerImpl.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/RowChangerImpl.java?rev=374198&r1=374197&r2=374198&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/RowChangerImpl.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/RowChangerImpl.java Wed Feb  1 14:46:09 2006
@@ -422,8 +422,6 @@
 	  Insert a row into the table and perform associated index maintenance.
 
 	  @param baseRow the row.
-	  @param baseRowLocation the row's base conglomerate
-	     location
 	  @exception StandardException		Thrown on error
 	  */
 	public void insertRow(ExecRow baseRow)
@@ -473,7 +471,6 @@
 	/**
 	  Update a row in the table and perform associated index maintenance.
 
-	  @param ef	ExecutionFactory to use for cloning
 	  @param oldBaseRow the old image of the row.
 	  @param newBaseRow the new image of the row.
 	  @param baseRowLocation the row's base conglomerate

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/RowUtil.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/RowUtil.java?rev=374198&r1=374197&r2=374198&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/RowUtil.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/RowUtil.java Wed Feb  1 14:46:09 2006
@@ -201,7 +201,6 @@
 	  <P>This is useful to remove dangling references to a column.
 
 	  @param setMe Set columns in this storable to be empty.
-	  @param count Number of columns to empty.
 	  */
 	public static void copyRefColumns(ExecRow setMe)
 		throws StandardException
@@ -361,7 +360,7 @@
 	/**
 	 * intArrayToString
 	 *
-	 * @param objs 			the int array
+	 * @param colMap 			the int array
 	 *
 	 * @return the string
 	 */

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/SavepointConstantAction.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/SavepointConstantAction.java?rev=374198&r1=374197&r2=374198&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/SavepointConstantAction.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/SavepointConstantAction.java Wed Feb  1 14:46:09 2006
@@ -46,7 +46,7 @@
 	 *	Make the ConstantAction for a set savepoint, rollback or release statement.
 	 *
 	 *  @param savepointName	Name of the savepoint.
-	 *  @param statementType	set savepoint, rollback savepoint or release savepoint
+	 *  @param savepointStatementType	set savepoint, rollback savepoint or release savepoint
 	 */
 	SavepointConstantAction(
 								String			savepointName,

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/ScalarAggregateResultSet.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/ScalarAggregateResultSet.java?rev=374198&r1=374197&r2=374198&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/ScalarAggregateResultSet.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/ScalarAggregateResultSet.java Wed Feb  1 14:46:09 2006
@@ -432,9 +432,8 @@
 	 * distinct aggregates will be accumulated here.
 	 * Otherwise, all aggregates will be accumulated here.
 	 *
-	 * @param	the input row
-	 * @param	the row with the accumulator (may be the same as
-	 *			the input row.
+	 * @param	inputRow	the input row
+	 * @param	accumulateRow	the row with the accumulator (may be the same as the input row.
 	 * @param	hasDistinctAggregates does this scan have distinct
 	 *			aggregates.  Used to figure out whether to merge
 	 *			or accumulate nondistinct aggregates.

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/ScrollInsensitiveResultSet.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/ScrollInsensitiveResultSet.java?rev=374198&r1=374197&r2=374198&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/ScrollInsensitiveResultSet.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/ScrollInsensitiveResultSet.java Wed Feb  1 14:46:09 2006
@@ -865,8 +865,6 @@
 	 * keyed on positionInSource.
 	 *
 	 * @param sourceRow	The row to add.
-	 *
-	 * @return Nothing.
 	 */
 	private void addRowToHashTable(ExecRow sourceRow)
 		throws StandardException

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/SumAggregator.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/SumAggregator.java?rev=374198&r1=374197&r2=374198&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/SumAggregator.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/SumAggregator.java Wed Feb  1 14:46:09 2006
@@ -41,7 +41,6 @@
 	 * Accumulate
  	 *
 	 * @param addend	value to be added in
-	 * @param ga		the generic aggregator that is calling me
 	 *
 	 * @exception StandardException on error
 	 *

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/TablePrivilegeInfo.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/TablePrivilegeInfo.java?rev=374198&r1=374197&r2=374198&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/TablePrivilegeInfo.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/TablePrivilegeInfo.java Wed Feb  1 14:46:09 2006
@@ -60,8 +60,6 @@
 	
 	/**
 	 * @param actionAllowed actionAllowed[action] is true if action is in the privilege set.
-	 * @param columnNames columnNames[action] is the list of columns associated with the action, null if
-	 *					the privilege applies to all columns.
 	 */
 	public TablePrivilegeInfo( TableDescriptor td,
 							   boolean[] actionAllowed,

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/TemporaryRowHolderImpl.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/TemporaryRowHolderImpl.java?rev=374198&r1=374197&r2=374198&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/TemporaryRowHolderImpl.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/TemporaryRowHolderImpl.java Wed Feb  1 14:46:09 2006
@@ -101,7 +101,7 @@
 	 * @param tc the xact controller
 	 * @param properties the properties of the original table.  Used
 	 *		to help the store use optimal page size, etc.
-	 * @param the result description.  Relevant for the getResultDescription
+	 * @param resultDescription the result description.  Relevant for the getResultDescription
 	 * 		call on the result set returned by getResultSet.  May be null
 	 */
 	public TemporaryRowHolderImpl
@@ -121,7 +121,7 @@
 	 * @param tc the xact controller
 	 * @param properties the properties of the original table.  Used
 	 *		to help the store use optimal page size, etc.
-	 * @param the result description.  Relevant for the getResultDescription
+	 * @param resultDescription the result description.  Relevant for the getResultDescription
 	 * 		call on the result set returned by getResultSet.  May be null
 	 * @param isUniqueStream - true , if it has to be temporary row holder unique stream
 	 */
@@ -143,9 +143,9 @@
 	 * @param tc the xact controller
 	 * @param properties the properties of the original table.  Used
 	 *		to help the store use optimal page size, etc.
-	 * @param the result description.  Relevant for the getResultDescription
+	 * @param resultDescription the result description.  Relevant for the getResultDescription
 	 * 		call on the result set returned by getResultSet.  May be null
-	 * @param spillToConglomSize on an attempt to insert
+	 * @param overflowToConglomThreshold on an attempt to insert
 	 * 		this number of rows, the rows will be put
  	 *		into a temporary conglomerate.
 	 */
@@ -213,8 +213,7 @@
 	/**
 	 * Insert a row
 	 *
-	 * @param ef	ExecutionFactory to use for cloning.
-	 * @param row the row to insert 
+	 * @param inputRow the row to insert 
 	 *
 	 * @exception StandardException on error
  	 */

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/TemporaryRowHolderResultSet.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/TemporaryRowHolderResultSet.java?rev=374198&r1=374197&r2=374198&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/TemporaryRowHolderResultSet.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/TemporaryRowHolderResultSet.java Wed Feb  1 14:46:09 2006
@@ -83,8 +83,6 @@
 	 *
 	 * @param tc the xact controller
 	 * @param rowArray the row array
-	 * @param lastArraySlot the last array slot in use 
-	 * @param conglomId	0 if no conglom used
 	 * @param resultDescription value returned by getResultDescription()
 	 */
 	public TemporaryRowHolderResultSet
@@ -107,8 +105,6 @@
 	 *
 	 * @param tc the xact controller
 	 * @param rowArray the row array
-	 * @param lastArraySlot the last array slot in use 
-	 * @param conglomId	0 if no conglom used
 	 * @param resultDescription value returned by getResultDescription()
 	 * @param isAppendable true,if we can insert rows after this result is created
 	 * @param positionIndexConglomId conglomId of the index which has order rows
@@ -211,8 +207,6 @@
 	/**
 	 * Mark the ResultSet as the topmost one in the ResultSet tree.
 	 * Useful for closing down the ResultSet on an error.
-	 *
-	 * @return Nothing.
 	 */
 	public void markAsTopResultSet()
 	{ }
@@ -481,8 +475,6 @@
 	 * TargetResultSet.  This is useful when doing bulk insert.
 	 *
 	 * @param trs	The TargetResultSet.
-	 *
-	 * @return Nothing.
 	 */
 	public void setTargetResultSet(TargetResultSet trs)
 	{
@@ -492,9 +484,6 @@
 	 * Set whether or not the NPRS need the row location when acting
 	 * as a row source.  (The target result set determines this.)
 	 * 
-	 * @param boolean needsRowLocation
-	 *
-	 * @return Nothing.
 	 */
 	public void setNeedsRowLocation(boolean needsRowLocation)
 	{
@@ -630,8 +619,6 @@
 	/**
 	 * Tells the system that there will be calls to getNextRow().
 	 *
-	 * @return	Nothing
-	 *
 	 * @exception StandardException		Thrown on failure
 	 */
 	public void open() throws StandardException
@@ -841,8 +828,6 @@
 	/**
 	 * Tells the system to clean up on an error.
 	 *
-	 * @return	Nothing
-	 *
 	 * @exception StandardException		Thrown on error.
 	 */
 	public void	cleanUp() throws StandardException
@@ -868,7 +853,6 @@
 	 * in particular, no more calls to open().
 	 * Will close the result set if it is not already closed.
 	 *
-	 * @return	Nothing
 	 * @exception StandardException	on error
 	 */
 	public void finish() throws StandardException

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/UpdateResultSet.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/UpdateResultSet.java?rev=374198&r1=374197&r2=374198&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/UpdateResultSet.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/UpdateResultSet.java Wed Feb  1 14:46:09 2006
@@ -129,7 +129,6 @@
     /**
 	 * @param source update rows come from source
 	 * @param checkGM	Generated method for enforcing check constraints
-	 * @param compiledConstants constantAction for the update
 	 * @exception StandardException thrown on error
      */
     UpdateResultSet(NoPutResultSet source,
@@ -175,7 +174,6 @@
     /**
 	 * @param source update rows come from source
 	 * @param checkGM	Generated method for enforcing check constraints
-	 * @param compiledConstants constantAction for the update
 	 * @exception StandardException thrown on error
      */
     UpdateResultSet(NoPutResultSet source,

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/WriteCursorConstantAction.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/WriteCursorConstantAction.java?rev=374198&r1=374197&r2=374198&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/WriteCursorConstantAction.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/WriteCursorConstantAction.java Wed Feb  1 14:46:09 2006
@@ -125,7 +125,6 @@
 	 *  @param emptyHeapRow	an empty heap row
 	 *  @param baseRowReadMap	BaseRowReadMap[heapColId]->ReadRowColumnId. (0 based)
      *  @param streamStorableHeapColIds Null for non rep. (0 based)
-	 *  @param numColumns	Number of columns to read.
 	 *  @param singleRowSource		Whether or not source is a single row source
 	 */
 	public	WriteCursorConstantAction(

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/RAMAccessManager.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/RAMAccessManager.java?rev=374198&r1=374197&r2=374198&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/RAMAccessManager.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/RAMAccessManager.java Wed Feb  1 14:46:09 2006
@@ -261,8 +261,6 @@
      * getSystemLockLevel().
      * <p>
      *
-	 * @return The identifier to be used to open the conglomerate later.
-     *
 	 * @exception  StandardException  Standard exception policy.
      **/
     abstract protected void bootLookupSystemLockLevel(

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/RAMTransaction.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/RAMTransaction.java?rev=374198&r1=374197&r2=374198&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/RAMTransaction.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/RAMTransaction.java Wed Feb  1 14:46:09 2006
@@ -2059,8 +2059,6 @@
      * RESOLVE - how do we map to the "right" XAExceptions.
      * <p>
      *
-	 * @return The identifier to be used to open the conglomerate later.
-     *
      * @param onePhase If true, the resource manager should use a one-phase
      *                 commit protocol to commit the work done on behalf of 
      *                 current xid.

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/RllRAMAccessManager.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/RllRAMAccessManager.java?rev=374198&r1=374197&r2=374198&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/RllRAMAccessManager.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/RllRAMAccessManager.java Wed Feb  1 14:46:09 2006
@@ -95,8 +95,6 @@
      * getSystemLockLevel().
      * <p>
      *
-	 * @return The identifier to be used to open the conglomerate later.
-     *
 	 * @exception  StandardException  Standard exception policy.
      **/
     protected void bootLookupSystemLockLevel(

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/StorableFormatId.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/StorableFormatId.java?rev=374198&r1=374197&r2=374198&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/StorableFormatId.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/StorableFormatId.java Wed Feb  1 14:46:09 2006
@@ -229,8 +229,6 @@
 	 * @param isNullable	Whether or not the column is nullable
 	 *						(No need to call wasNull() if not)
 	 * 
-	 * @return Nothing.
-	 *
 	 * @exception StandardException		Thrown on error
 	 * @exception SQLException		Error accessing the result set
      *
@@ -250,8 +248,6 @@
 	 * Set the value of this DataValueDescriptor from another.
 	 *
 	 * @param theValue	The Date value to set this DataValueDescriptor to
-	 *
-	 * @return	This DataValueDescriptor
 	 *
      * @see org.apache.derby.iapi.types.DataValueDescriptor#setValue
 	 */

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BTreeCostController.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BTreeCostController.java?rev=374198&r1=374197&r2=374198&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BTreeCostController.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BTreeCostController.java Wed Feb  1 14:46:09 2006
@@ -182,8 +182,6 @@
      * Save initialize parameters away, and open the underlying container.
      * <p>
      *
-	 * @return The identifier to be used to open the conglomerate later.
-     *
      * @param xact_manager access manager transaction.
      * @param rawtran      Raw store transaction.
      *

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BTreeMaxScan.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BTreeMaxScan.java?rev=374198&r1=374197&r2=374198&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BTreeMaxScan.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BTreeMaxScan.java Wed Feb  1 14:46:09 2006
@@ -270,9 +270,6 @@
      * to return.
      * <p>
      *
-	 * @return The leaf page containing the start position, or null if no
-     *         start position is found.
-     *
 	 * @exception  StandardException  Standard exception policy.
      **/
     protected void positionAtStartPosition(

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BTreeScan.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BTreeScan.java?rev=374198&r1=374197&r2=374198&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BTreeScan.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BTreeScan.java Wed Feb  1 14:46:09 2006
@@ -336,8 +336,6 @@
      * sets "current_slot" to the slot number.
      * <p>
      *
-	 * @return The leaf on which scan is positioned.
-     *
 	 * @exception  StandardException  Standard exception policy.
      **/
     protected void positionAtStartForForwardScan(
@@ -502,9 +500,6 @@
      * to return.
      * <p>
      *
-	 * @return The leaf page containing the start position, or null if no
-     *         start position is found.
-     *
 	 * @exception  StandardException  Standard exception policy.
      **/
     protected void positionAtStartForBackwardScan(
@@ -664,8 +659,6 @@
      * once it has successfully gotten both the latch on the next page and
      * the scan lock on the next page.
      *
-	 * @return The next leaf page, null if scan is done.
-     *
      * @param pos           current row position of the scan.
      *
 	 * @exception  StandardException  Standard exception policy.
@@ -1946,10 +1939,6 @@
      *           Maybe this is solved by work to be done on the sort 
      *           interface.
      *
-     *
-	 * @return boolean indicating that the fetch set succeeded.  If it failed
-     *                 Hashtable.clear() will be called leaving an empty 
-     *                 table.
      *
      * @param max_rowcnt        The maximum number of rows to insert into the 
      *                          Hash table.  Pass in -1 if there is no maximum.

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BranchControlRow.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BranchControlRow.java?rev=374198&r1=374197&r2=374198&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BranchControlRow.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BranchControlRow.java Wed Feb  1 14:46:09 2006
@@ -147,9 +147,6 @@
     /**
      * Perform page specific initialization.
      * <p>
-     *
-	 * @return The identifier to be used to open the conglomerate later.
-     *
      **/
     protected final void ControlRowInit()
     {

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/ControlRow.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/ControlRow.java?rev=374198&r1=374197&r2=374198&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/ControlRow.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/ControlRow.java Wed Feb  1 14:46:09 2006
@@ -1849,8 +1849,6 @@
      * Perform page specific initialization.
      * <p>
      *
-	 * @return The identifier to be used to open the conglomerate later.
-     *
      **/
     protected abstract void ControlRowInit();
 

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/LeafControlRow.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/LeafControlRow.java?rev=374198&r1=374197&r2=374198&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/LeafControlRow.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/LeafControlRow.java Wed Feb  1 14:46:09 2006
@@ -199,9 +199,6 @@
     /**
      * Perform page specific initialization.
      * <p>
-     *
-	 * @return The identifier to be used to open the conglomerate later.
-     *
      **/
     protected final void ControlRowInit()
     {

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/OpenBTree.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/OpenBTree.java?rev=374198&r1=374197&r2=374198&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/OpenBTree.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/OpenBTree.java Wed Feb  1 14:46:09 2006
@@ -247,8 +247,6 @@
      *
      * @param count the estimated number of rows in the container.
      *
-	 * @return The total estimated number of rows in the conglomerate.
-     *
 	 * @exception  StandardException  Standard exception policy.
      **/
     public void setEstimatedRowCount(long count)
@@ -340,8 +338,6 @@
      * passed in.  The container is always opened with no locking, it is up
      * to the caller to make the appropriate container locking call.
      * <p>
-     *
-	 * @return The identifier to be used to open the conglomerate later.
      *
      * @param open_user_scans The user transaction which opened this btree.
      * @param xact_manager    The current transaction, usually the same as

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/conglomerate/BinaryOrderableWrapper.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/conglomerate/BinaryOrderableWrapper.java?rev=374198&r1=374197&r2=374198&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/conglomerate/BinaryOrderableWrapper.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/conglomerate/BinaryOrderableWrapper.java Wed Feb  1 14:46:09 2006
@@ -63,8 +63,6 @@
      * Longer descrption of routine.
      * <p>
      *
-	 * @return The identifier to be used to open the conglomerate later.
-     *
      * @param ref_object    The object that this object is wrapping (ie. being
      *                      read from disk)
      * @param other_object  The object to compare ref_object to.

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/conglomerate/GenericConglomerate.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/conglomerate/GenericConglomerate.java?rev=374198&r1=374197&r2=374198&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/conglomerate/GenericConglomerate.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/conglomerate/GenericConglomerate.java Wed Feb  1 14:46:09 2006
@@ -152,8 +152,6 @@
 	 * @param isNullable	Whether or not the column is nullable
 	 *						(No need to call wasNull() if not)
 	 * 
-	 * @return Nothing.
-	 *
 	 * @exception StandardException		Thrown on error
 	 * @exception SQLException		Error accessing the result set
      *
@@ -174,8 +172,6 @@
 	 * Set the value of this DataValueDescriptor from another.
 	 *
 	 * @param theValue	The Date value to set this DataValueDescriptor to
-	 *
-	 * @return	This DataValueDescriptor
 	 *
      * @see org.apache.derby.iapi.types.DataValueDescriptor#setValue
 	 */

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/conglomerate/GenericController.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/conglomerate/GenericController.java?rev=374198&r1=374197&r2=374198&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/conglomerate/GenericController.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/conglomerate/GenericController.java Wed Feb  1 14:46:09 2006
@@ -224,8 +224,6 @@
      *
      * @param count the estimated number of rows in the container.
      *
-	 * @return The total estimated number of rows in the conglomerate.
-     *
 	 * @exception  StandardException  Standard exception policy.
      **/
     public void setEstimatedRowCount(long count)

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/conglomerate/GenericScanController.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/conglomerate/GenericScanController.java?rev=374198&r1=374197&r2=374198&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/conglomerate/GenericScanController.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/conglomerate/GenericScanController.java Wed Feb  1 14:46:09 2006
@@ -1199,10 +1199,6 @@
      *           interface.
      *
      *
-	 * @return boolean indicating that the fetch set succeeded.  If it failed
-     *                 Hashtable.clear() will be called leaving an empty 
-     *                 table.
-     *
      * @param max_rowcnt        The maximum number of rows to insert into the 
      *                          Hash table.  Pass in -1 if there is no maximum.
      * @param key_column_numbers The column numbers of the columns in the

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/sort/Scan.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/sort/Scan.java?rev=374198&r1=374197&r2=374198&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/sort/Scan.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/sort/Scan.java Wed Feb  1 14:46:09 2006
@@ -207,8 +207,6 @@
      *
      * @param count the estimated number of rows in the container.
      *
-	 * @return The total estimated number of rows in the conglomerate.
-     *
 	 * @exception  StandardException  Standard exception policy.
      **/
     public void setEstimatedRowCount(long count)

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/AllocExtent.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/AllocExtent.java?rev=374198&r1=374197&r2=374198&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/AllocExtent.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/AllocExtent.java Wed Feb  1 14:46:09 2006
@@ -603,11 +603,6 @@
      *    the abort took place.  W
      * 2) 
      *
-	 * @return The identifier to be used to open the conglomerate later.
-     *
-     * @param param1 param1 does this.
-     * @param param2 param2 does this.
-     *
 	 * @exception  StandardException  Standard exception policy.
      **/
     protected void undoCompressPages(

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/AllocationActions.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/AllocationActions.java?rev=374198&r1=374197&r2=374198&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/AllocationActions.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/AllocationActions.java Wed Feb  1 14:46:09 2006
@@ -75,7 +75,6 @@
      *
      * @param t				        The transaction
      * @param allocPage		        the allocation page to do compress on.
-     * @param instant               log address for this operation.
      * @param new_highest_page      The new highest page on this allocation 
      *                              page.  The number is the offset of the page
      *                              in the array of pages maintained by this 

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/BasePage.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/BasePage.java?rev=374198&r1=374197&r2=374198&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/BasePage.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/BasePage.java Wed Feb  1 14:46:09 2006
@@ -2102,7 +2102,6 @@
 		Copy num_rows from srcPage, src_slot into this page starting at dest_slot.
 		This is destination page of the the copy half of copy and Purge.
 
-		@return An array of the new record identifiers.
 		@see Page#copyAndPurge
 	 */
 	private void copyInto(BasePage srcPage, int src_slot, int num_rows, 

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/CachedPage.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/CachedPage.java?rev=374198&r1=374197&r2=374198&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/CachedPage.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/CachedPage.java Wed Feb  1 14:46:09 2006
@@ -538,8 +538,6 @@
      *      while the I/O was taking place.  
      *
      *
-	 * @return The identifier to be used to open the conglomerate later.
-     *
 	 * @exception  StandardException  Error writing the page.
      *
      * @see Cacheable#clean
@@ -734,7 +732,7 @@
      * write the page from this CachedPage object to disk.
      * <p>
      *
-     * @param newIdentity indentity (ie. page number) of the page to read
+     * @param identity indentity (ie. page number) of the page to read
      * @param syncMe      does the write of this single page have to be sync'd?
      *
 	 * @exception  StandardException  Standard exception policy.

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/D_StoredPage.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/D_StoredPage.java?rev=374198&r1=374197&r2=374198&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/D_StoredPage.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/D_StoredPage.java Wed Feb  1 14:46:09 2006
@@ -100,8 +100,6 @@
      *   Page.DIAG_BYTES_RESERVED - # of reserved bytes on the page.
      * <p>
      *
-	 * @return string dump of the StoredPage
-     *
 	 * @exception  StandardException  Standard exception policy.
      **/
     public void diag_detail(Properties prop) 

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/StoredPage.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/StoredPage.java?rev=374198&r1=374197&r2=374198&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/StoredPage.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/StoredPage.java Wed Feb  1 14:46:09 2006
@@ -616,8 +616,6 @@
      * Initialize the object, ie. perform work normally perfomed in constructor.
      * Called by setIdentity() and createIdentity() - the Cacheable interfaces
      * which are used to move a page in/out of cache.
-     *
-	 * @return void
      **/
 	protected void initialize()
 	{
@@ -642,8 +640,6 @@
      * never modified during their lifetime in the cache.
      * <p>
      *
-	 * @return void
-     *
 	 * @exception  StandardException  Standard exception policy.
      **/
 	private void createOutStreams()
@@ -984,8 +980,6 @@
      * variables into encoded version on the page in page header and checksum.
      * <p>
      *
-	 * @return void.
-     *
      * @param identity  The key of this page.
      *
 	 * @exception  StandardException  Standard exception policy.
@@ -3375,8 +3369,6 @@
      * As part of moving rows, updating rows, purging rows compact the space
      * left between rows.
      * <p>
-     *
-	 * @return The identifier to be used to open the conglomerate later.
      *
      * @param startByte compress out space starting at startByte offset
      * @param endByte   compress out space ending   at endByte   offset

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/Xact.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/Xact.java?rev=374198&r1=374197&r2=374198&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/Xact.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/Xact.java Wed Feb  1 14:46:09 2006
@@ -1609,8 +1609,6 @@
      * to take on the identity of in-doubt prepared transactions found during
      * redo.  Need to assume the globalId.
      *
-	 * @return The identifier to be used to open the conglomerate later.
-     *
      * @param ent The original entry we are assuming the identity of.
      *
      **/
@@ -2498,8 +2496,6 @@
      * <p>
      * RESOLVE - how do we map to the "right" XAExceptions.
      * <p>
-     *
-	 * @return The identifier to be used to open the conglomerate later.
      *
      * @param onePhase If true, the resource manager should use a one-phase
      *                 commit protocol to commit the work done on behalf of 



Mime
View raw message