Return-Path: Delivered-To: apmail-db-derby-commits-archive@www.apache.org Received: (qmail 47740 invoked from network); 1 Feb 2006 22:49:48 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 1 Feb 2006 22:49:48 -0000 Received: (qmail 93064 invoked by uid 500); 1 Feb 2006 22:49:47 -0000 Delivered-To: apmail-db-derby-commits-archive@db.apache.org Received: (qmail 92972 invoked by uid 500); 1 Feb 2006 22:49:46 -0000 Mailing-List: contact derby-commits-help@db.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: "Derby Development" List-Id: Delivered-To: mailing list derby-commits@db.apache.org Received: (qmail 92870 invoked by uid 99); 1 Feb 2006 22:49:45 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Feb 2006 14:49:45 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Wed, 01 Feb 2006 14:49:38 -0800 Received: (qmail 47411 invoked by uid 65534); 1 Feb 2006 22:49:17 -0000 Message-ID: <20060201224917.47406.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r374198 [2/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 -0000 To: derby-commits@db.apache.org From: davidvc@apache.org X-Mailer: svnmailer-1.0.5 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/ColumnDescriptorList.java URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/ColumnDescriptorList.java?rev=374198&r1=374197&r2=374198&view=diff ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/ColumnDescriptorList.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/ColumnDescriptorList.java Wed Feb 1 14:46:09 2006 @@ -40,7 +40,7 @@ /** * Add the column. Currently, the table id is ignored. * - * @param tableId the table id (ignored) + * @param tableID the table id (ignored) * @param column the column to add */ public void add(UUID tableID, ColumnDescriptor column) @@ -60,7 +60,7 @@ /** * Get the column descriptor * - * @param tableId the table id (ignored) + * @param tableID the table id (ignored) * @param columnName the column get * * @return the column descriptor if found @@ -88,8 +88,8 @@ /** * Get the column descriptor * - * @param tableId the table id (ignored) - * @param columnId the column id + * @param tableID the table id (ignored) + * @param columnID the column id * * @return the column descriptor if found */ Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/ConglomerateDescriptor.java URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/ConglomerateDescriptor.java?rev=374198&r1=374197&r2=374198&view=diff ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/ConglomerateDescriptor.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/ConglomerateDescriptor.java Wed Feb 1 14:46:09 2006 @@ -70,7 +70,7 @@ * @param name The name of the conglomerate, if any * @param indexable TRUE means the conglomerate is indexable, * FALSE means it isn't - * @param indexDescriptor The descriptor of the index if it's not a + * @param indexRowGenerator The descriptor of the index if it's not a * heap * @param forConstraint TRUE means the conglomerate is an index backing up * a constraint, FALSE means it isn't @@ -120,8 +120,6 @@ * This is useful when swapping conglomerates, like for bulkInsert. * * @param conglomerateNumber The new conglomerate number. - * - * @return Nothing. */ public void setConglomerateNumber(long conglomerateNumber) { @@ -215,8 +213,6 @@ * This is useful for tracing the optimizer. * * @param columnNames 0-based array of column names. - * - * @return Nothing. */ public void setColumnNames(String[] columnNames) { Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/ConglomerateDescriptorList.java URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/ConglomerateDescriptorList.java?rev=374198&r1=374197&r2=374198&view=diff ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/ConglomerateDescriptorList.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/ConglomerateDescriptorList.java Wed Feb 1 14:46:09 2006 @@ -191,7 +191,7 @@ * conglomerate descriptor list. If the descriptor * is not found, no errors are issued. * - * @param tableId table uuid, ignored + * @param tableID table uuid, ignored * @param cgDesc the conglomerate * * @exception StandardException thrown on failure @@ -217,8 +217,7 @@ * conglomerate descriptor list. If the descriptor * is not found, no errors are issued. * - * @param tableId table uuid, ignored - * @param cgDesc the conglomerate + * @param conglomerateID table uuid, ignored * * @exception StandardException thrown on failure */ Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/ConstraintDescriptor.java URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/ConstraintDescriptor.java?rev=374198&r1=374197&r2=374198&view=diff ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/ConstraintDescriptor.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/ConstraintDescriptor.java Wed Feb 1 14:46:09 2006 @@ -81,7 +81,6 @@ * @param deferrable If the constraint can be deferred. * @param initiallyDeferred If the constraint starts life deferred. * @param referencedColumns columns that the constraint references - * @param checkConstraint the expression for a check constraint. * @param constraintId UUID of constraint * @param schemaDesc SchemaDescriptor */ @@ -125,7 +124,6 @@ * Sets the UUID of the constraint. * * @param constraintId The constraint Id. - * @return Nothing. */ public void setConstraintId(UUID constraintId) { @@ -306,7 +304,7 @@ * Does this constraint need to fire on this type of * DML? * - * @param dmlType the type of DML + * @param stmtType the type of DML * (StatementType.INSERT|StatementType.UPDATE|StatementType.DELETE) * @param modifiedCols the columns modified, or null for all * @@ -403,7 +401,7 @@ /** * Does a column intersect with our referenced columns - * @param int ColumnNumber + * @param columnArray columns to check * * Note-- this is not a static method. */ @@ -420,7 +418,7 @@ * @param otherColumns the columns to compare. If * null, asssumed to mean all columns * - * @param the columns referenced by the caller + * @param referencedColumns the columns referenced by the caller * * @return true/false */ Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/ConstraintDescriptorList.java URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/ConstraintDescriptorList.java?rev=374198&r1=374197&r2=374198&view=diff ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/ConstraintDescriptorList.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/ConstraintDescriptorList.java Wed Feb 1 14:46:09 2006 @@ -51,8 +51,6 @@ * when we need to scan the table. * * @param scanned Whether or not the underlying system table has been scanned. - * - * @return Nothing. */ public void setScanned(boolean scanned) { @@ -188,9 +186,6 @@ /** * Get the ConstraintDescriptor with the matching constraint name. - * - * @param sd The constraint schema descriptor. - * @param name The constraint name. * * @return The matching ConstraintDescriptor. */ Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/DataDescriptorGenerator.java URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/DataDescriptorGenerator.java?rev=374198&r1=374197&r2=374198&view=diff ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/DataDescriptorGenerator.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/DataDescriptorGenerator.java Wed Feb 1 14:46:09 2006 @@ -302,7 +302,7 @@ /** * Create a conglomerate descriptor for the given conglomerate id. * - * @param conglomerateID The identifier for the conglomerate + * @param conglomerateId The identifier for the conglomerate * we're interested in * @param name The name of the conglomerate, if any * @param indexable TRUE means the conglomerate is indexable, @@ -345,7 +345,7 @@ * Create a new trigger descriptor. * * @param sd the schema descriptor for this trigger - * @param id the trigger id + * @param uuid the trigger id * @param name the trigger name * @param eventMask TriggerDescriptor.TRIGGER_EVENT_XXXX * @param isBefore is this a before (as opposed to after) trigger Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/DataDictionary.java URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/DataDictionary.java?rev=374198&r1=374197&r2=374198&view=diff ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/DataDictionary.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/DataDictionary.java Wed Feb 1 14:46:09 2006 @@ -400,7 +400,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 schema descriptor * * @return true/false * @@ -450,15 +450,12 @@ /** * 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, @@ -473,8 +470,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, @@ -603,7 +598,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 * @@ -655,7 +650,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. @@ -671,7 +666,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. @@ -688,7 +683,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 @@ -738,8 +733,6 @@ * @param descriptor The descriptor to add * @param tc The transaction controller * - * @return Nothing - * * @exception StandardException Thrown on error */ public void addConstraintDescriptor( @@ -793,7 +786,6 @@ * 1 based. May be null (all cols). * @param tc The TransactionController to use * - * @return Nothing. * * @exception StandardException Thrown on failure */ @@ -882,8 +874,6 @@ * @param tc The transaction controller * @param wait To wait for lock or not * - * @return Nothing - * * @exception StandardException Thrown on error */ public void addSPSDescriptor @@ -897,7 +887,7 @@ * 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 recompile whether to recompile or invalidate * @param updateSYSCOLUMNS indicate whether syscolumns needs to be updated @@ -907,8 +897,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( @@ -985,7 +973,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 * @@ -1006,8 +994,6 @@ * 1 based. May be null (all cols). * @param tc The TransactionController to use * - * @return Nothing. - * * @exception StandardException Thrown on failure */ public void updateTriggerDescriptor @@ -1171,7 +1157,7 @@ /** * Drops all conglomerates associated with a table. * - * @param table The TableDescriptor of the table + * @param td The TableDescriptor of the table * @param tc TransactionController for the transaction * * @exception StandardException Thrown on failure @@ -1194,8 +1180,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, @@ -1213,8 +1197,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, @@ -1239,7 +1221,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 @@ -1268,8 +1250,6 @@ * @param dd The DependencyDescriptor. * @param tc TransactionController for the transaction * - * @return Nothing. - * * @exception StandardException Thrown on failure */ public void dropStoredDependency(DependencyDescriptor dd, @@ -1283,8 +1263,6 @@ * @param dependentsUUID Dependent's uuid * @param tc TransactionController for the transaction * - * @return Nothing. - * * @exception StandardException Thrown on failure */ public void dropDependentsStoredDependencies(UUID dependentsUUID, @@ -1315,7 +1293,7 @@ * Get a AliasDescriptor by alias name and name space. * NOTE: caller responsible for handling no match. * - @param schemaId schema identifier + @param schemaID schema identifier * @param aliasName The alias name. * @param nameSpace The alias name space. * @@ -1338,8 +1316,6 @@ * @param ad The AliasDescriptor to drop * @param tc The TransactionController * - * @return Nothing. - * * @exception StandardException Thrown on failure */ @@ -1352,8 +1328,6 @@ * * @param coreNum The index into coreInfo[]. * - * @return Nothing. - * * @exception StandardException Thrown on error */ public TabInfo getCoreCatalog(int coreNum) @@ -1375,8 +1349,8 @@ * Get a FileInfoDescriptor given its SQL name and * schema name. * - * @param SQLName the FileInfoDescriptor SQLname. * @param sd the schema that holds the FileInfoDescriptor. + * @param name SQL name of file. * * @exception StandardException Thrown on failure */ @@ -1442,7 +1416,7 @@ * autoincrement column. * * @param tc Transaction Controller to use. - * @param td Table Descriptor + * @param tableUUID Table Descriptor * @param columnName Name of the column. * @param aiValue Value to write to SYSCOLUMNS. * @param incrementNeeded Whether we should increment the value passed in by Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/DefaultDescriptor.java URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/DefaultDescriptor.java?rev=374198&r1=374197&r2=374198&view=diff ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/DefaultDescriptor.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/DefaultDescriptor.java Wed Feb 1 14:46:09 2006 @@ -93,8 +93,6 @@ * Set the UUID of the default. * * @param defaultUUID The new UUID for the default. - * - * @return Nothing. */ public void setDefaultUUID(UUID defaultUUID) { Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/ForeignKeyConstraintDescriptor.java URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/ForeignKeyConstraintDescriptor.java?rev=374198&r1=374197&r2=374198&view=diff ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/ForeignKeyConstraintDescriptor.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/ForeignKeyConstraintDescriptor.java Wed Feb 1 14:46:09 2006 @@ -235,7 +235,7 @@ * Does this constraint need to fire on this type of * DML? True if insert or update and columns intersect * - * @param dmlType the type of DML + * @param stmtType the type of DML * (StatementType.INSERT|StatementType.UPDATE|StatementType.DELETE) * @param modifiedCols the columns modified, or null for all * Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/GenericDescriptorList.java URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/GenericDescriptorList.java?rev=374198&r1=374197&r2=374198&view=diff ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/GenericDescriptorList.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/GenericDescriptorList.java Wed Feb 1 14:46:09 2006 @@ -49,8 +49,6 @@ * when we need to scan the table. * * @param scanned Whether or not the underlying system table has been scanned. - * - * @return Nothing. */ public void setScanned(boolean scanned) { Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/IndexRowGenerator.java URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/IndexRowGenerator.java?rev=374198&r1=374197&r2=374198&view=diff ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/IndexRowGenerator.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/IndexRowGenerator.java Wed Feb 1 14:46:09 2006 @@ -131,9 +131,6 @@ * the partial row to the complete base row. WARNING: * ONE based!!! * - * @return An index row conforming to this index description containing - * the column values from the base row and the given row location. - * * @exception StandardException Thrown on error */ public void getIndexRow(ExecRow baseRow, @@ -196,7 +193,7 @@ * Get a NULL Index Row for this index. This is useful to create objects * that need to be passed to ScanController. * - * @param columnrList ColumnDescriptors describing the base table. + * @param columnList ColumnDescriptors describing the base table. * @param rowLocation empty row location. * * @exception StandardException thrown on error. Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/PermissionsCatalogRowFactory.java URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/PermissionsCatalogRowFactory.java?rev=374198&r1=374197&r2=374198&view=diff ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/PermissionsCatalogRowFactory.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/PermissionsCatalogRowFactory.java Wed Feb 1 14:46:09 2006 @@ -78,7 +78,6 @@ * * @param indexNumber * @param perm a permission descriptor of the appropriate class for this PermissionsCatalogRowFactory class. - * @param rowLocation * * @exception StandardException standard error policy */ Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/ReferencedKeyConstraintDescriptor.java URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/ReferencedKeyConstraintDescriptor.java?rev=374198&r1=374197&r2=374198&view=diff ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/ReferencedKeyConstraintDescriptor.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/ReferencedKeyConstraintDescriptor.java Wed Feb 1 14:46:09 2006 @@ -304,7 +304,7 @@ * a fk, and stmt is delete or bulk insert replace, * or stmt is update and columns intersect. * - * @param dmlType the type of DML + * @param stmtType the type of DML * (StatementType.INSERT|StatementType.UPDATE|StatementType.DELETE) * @param modifiedCols the columns modified, or null for all * Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/SPSDescriptor.java URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/SPSDescriptor.java?rev=374198&r1=374197&r2=374198&view=diff ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/SPSDescriptor.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/SPSDescriptor.java Wed Feb 1 14:46:09 2006 @@ -170,7 +170,7 @@ * @param uuid the UUID * @param suuid the schema UUID * @param compSchemaUUID the schema UUID at compilation time - * @param char type + * @param type type * @param valid is the sps valid * @param text the text for this statement * @param usingText the text for the USING clause supplied to @@ -209,7 +209,7 @@ * @param uuid the UUID * @param suuid the schema UUID * @param compSchemaUUID the schema UUID at compilation time - * @param char type + * @param type type * @param valid is the sps valid * @param text the text for this statement * @param usingText the text for the USING clause supplied to @@ -619,7 +619,7 @@ /** * Set the parameter defaults for this statement. * - * @param params the parameter defaults + * @param values the parameter defaults */ public final synchronized void setParameterDefaults(Object[] values) { @@ -1138,7 +1138,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/iapi/sql/dictionary/SchemaDescriptor.java URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/SchemaDescriptor.java?rev=374198&r1=374197&r2=374198&view=diff ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/SchemaDescriptor.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/SchemaDescriptor.java Wed Feb 1 14:46:09 2006 @@ -61,7 +61,7 @@ * databases the name will use the same case as the source database * identifiers. * - * @see org.apache.derby.impl.sql.conn.GenericLanguageConnectionContext#getSystemSchemaName + * See org.apache.derby.impl.sql.conn.GenericLanguageConnectionContext#getSystemSchemaName */ public static final String STD_SYSTEM_SCHEMA_NAME = "SYS"; @@ -103,7 +103,7 @@ * target databases the name will use the same case as the source database * identifiers. * - * @see org.apache.derby.impl.sql.conn.GenericLanguageConnectionContext#getDefaultSchemaName + * See org.apache.derby.impl.sql.conn.GenericLanguageConnectionContext#getDefaultSchemaName */ public static final String STD_DEFAULT_SCHEMA_NAME = Property.DEFAULT_USER_NAME; Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/SubCheckConstraintDescriptor.java URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/SubCheckConstraintDescriptor.java?rev=374198&r1=374197&r2=374198&view=diff ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/SubCheckConstraintDescriptor.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/SubCheckConstraintDescriptor.java Wed Feb 1 14:46:09 2006 @@ -51,7 +51,7 @@ /** * Constructor for a SubCheckConstraintDescriptor * - * @param constraintID The UUID of the constraint. + * @param constraintId The UUID of the constraint. * @param constraintText The text of the constraint definition. * @param referencedColumns The columns referenced by the check constraint */ Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/SubConstraintDescriptor.java URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/SubConstraintDescriptor.java?rev=374198&r1=374197&r2=374198&view=diff ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/SubConstraintDescriptor.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/SubConstraintDescriptor.java Wed Feb 1 14:46:09 2006 @@ -55,7 +55,7 @@ /** * Constructor for a SubConstraintDescriptorImpl * - * @param constraintID The UUID of the constraint. + * @param constraintId The UUID of the constraint. */ SubConstraintDescriptor(UUID constraintId) @@ -67,7 +67,6 @@ * Sets the UUID of the constraint. * * @param constraintId The constraint Id. - * @return Nothing. */ public void setConstraintId(UUID constraintId) { @@ -96,7 +95,6 @@ * table that the constraint is on. * * @param td The TableDescriptor. - * @return Nothing. */ public void setTableDescriptor(TableDescriptor td) { Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/SubKeyConstraintDescriptor.java URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/SubKeyConstraintDescriptor.java?rev=374198&r1=374197&r2=374198&view=diff ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/SubKeyConstraintDescriptor.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/SubKeyConstraintDescriptor.java Wed Feb 1 14:46:09 2006 @@ -54,7 +54,7 @@ /** * Constructor for a SubConstraintDescriptorImpl * - * @param constraintID The UUID of the constraint. + * @param constraintId The UUID of the constraint. * @param indexId The UUID of the backing index. */ public SubKeyConstraintDescriptor(UUID constraintId, UUID indexId) @@ -66,7 +66,7 @@ /** * Constructor for a SubConstraintDescriptor * - * @param constraintID The UUID of the constraint. + * @param constraintId The UUID of the constraint. * @param indexId The UUID of the backing index. * @param keyConstraintId The UUID of the referenced constraint (fks) */ @@ -80,7 +80,7 @@ /** * Constructor for a SubConstraintDescriptor * - * @param constraintID The UUID of the constraint. + * @param constraintId The UUID of the constraint. * @param indexId The UUID of the backing index. * @param keyConstraintId The UUID of the referenced constraint (fks) * @param raDeleteRule The referential action for delete Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/TabInfo.java URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/TabInfo.java?rev=374198&r1=374197&r2=374198&view=diff ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/TabInfo.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/TabInfo.java Wed Feb 1 14:46:09 2006 @@ -59,8 +59,6 @@ * Set the heap conglomerate for the TabInfo. * * @param heapConglomerate The new heap conglomerate. - * - * @return Nothing. */ public void setHeapConglomerate(long heapConglomerate); @@ -76,8 +74,6 @@ * * @param index Index number for index for table * @param indexConglomerate The conglomerate for that index - * - * @return Nothing */ public void setIndexConglomerate(int index, long indexConglomerate); @@ -86,8 +82,6 @@ * * @param cd The ConglomerateDescriptor for one of the index * for this table. - * - * @return Nothing */ public void setIndexConglomerate(ConglomerateDescriptor cd); @@ -153,8 +147,6 @@ * * @param indexNumber The index number. * @param irg The IndexRowGenerator for the specified index number. - * - * @return Nothing. */ public void setIndexRowGenerator(int indexNumber, IndexRowGenerator irg); @@ -184,9 +176,8 @@ * * @param indexNumber The index number * @param colNumber The column number within the index - * @param baseColPos The base column position for the column. + * @param baseColumnPosition The base column position for the column. * - * @return Nothing. */ public void setBaseColumnPosition(int indexNumber, int colNumber, int baseColumnPosition); @@ -235,7 +226,7 @@ * Inserts a base row into a catalog and inserts all the corresponding * index rows. * - * @param row row to insert + * @param r row to insert * @param tc transaction controller * @return The row location for the inserted row. * @exception StandardException Thrown on failure Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/TableDescriptor.java URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/TableDescriptor.java?rev=374198&r1=374197&r2=374198&view=diff ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/TableDescriptor.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/TableDescriptor.java Wed Feb 1 14:46:09 2006 @@ -381,8 +381,6 @@ * * @param referencedColumnMap FormatableBitSet of referenced columns. * - * @return void. - * */ public void setReferencedColumnMap(FormatableBitSet referencedColumnMap) { @@ -416,8 +414,6 @@ * Sets the UUID of the table * * @param oid The UUID of the table to be set in the descriptor - * - * @return Nothing */ public void setUUID(UUID oid) { @@ -530,8 +526,6 @@ * Set (cache) the view descriptor for this TableDescriptor * * @param viewDescriptor The view descriptor to cache. - * - * @return Nothing. */ public void setViewDescriptor(ViewDescriptor viewDescriptor) { @@ -601,8 +595,6 @@ * @param changedColumnIds array of changed columns * @param relevantTriggers IN/OUT. Passed in as an empty list. Filled in as we go. * - * @return list of relevant triggers - * * @exception StandardException Thrown on error */ public void getAllRelevantTriggers @@ -869,8 +861,6 @@ /** * Empty the constraint descriptor list * - * @return Nothing. - * * @exception StandardException Thrown on failure */ public void emptyConstraintDescriptorList() @@ -921,8 +911,6 @@ /** * Empty the trigger descriptor list * - * @return Nothing. - * * @exception StandardException Thrown on failure */ public void emptyTriggerDescriptorList() @@ -961,7 +949,7 @@ /** * Remove this descriptor * - * @param The conglomerate descriptor + * @param cd The conglomerate descriptor * * @exception StandardException on error */ @@ -975,7 +963,7 @@ * Remove this descriptor. Warning, removes by using object * reference, not uuid. * - * @param The constraint descriptor + * @param cd constraint descriptor * * @exception StandardException on error */ Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/TriggerDescriptor.java URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/TriggerDescriptor.java?rev=374198&r1=374197&r2=374198&view=diff ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/TriggerDescriptor.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/TriggerDescriptor.java Wed Feb 1 14:46:09 2006 @@ -429,7 +429,7 @@ * Does this trigger need to fire on this type of * DML? * - * @param dmlType the type of DML + * @param stmtType the type of DML * (StatementType.INSERT|StatementType.UPDATE|StatementType.DELETE) * @param modifiedCols the columns modified, or null for all * Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/ViewDescriptor.java URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/ViewDescriptor.java?rev=374198&r1=374197&r2=374198&view=diff ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/ViewDescriptor.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/ViewDescriptor.java Wed Feb 1 14:46:09 2006 @@ -117,8 +117,6 @@ * Sets the UUID of the view. * * @param uuid The UUID of the view. - * - * @return Nothing. */ public void setUUID(UUID uuid) { @@ -140,8 +138,6 @@ * Sets the name of the view. * * @param name The name of the view. - * - * @return Nothing. */ public void setViewName(String name) { Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/ExecIndexRow.java URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/ExecIndexRow.java?rev=374198&r1=374197&r2=374198&view=diff ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/ExecIndexRow.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/ExecIndexRow.java Wed Feb 1 14:46:09 2006 @@ -59,8 +59,6 @@ /** * Turn the ExecRow into an ExecIndexRow. - * - * @return Nothing. */ public void execRowToExecIndexRow(ExecRow valueRow); } Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/ExecRow.java URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/ExecRow.java?rev=374198&r1=374197&r2=374198&view=diff ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/ExecRow.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/ExecRow.java Wed Feb 1 14:46:09 2006 @@ -67,7 +67,7 @@ /** * Get a clone of a DataValueDescriptor from an ExecRow. * - * @param int columnPosition (1 based) + * @param columnPosition (1 based) */ DataValueDescriptor cloneColumn(int columnPosition); Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/ExecutionFactory.java URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/ExecutionFactory.java?rev=374198&r1=374197&r2=374198&view=diff ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/ExecutionFactory.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/ExecutionFactory.java Wed Feb 1 14:46:09 2006 @@ -134,7 +134,7 @@ * @param unknownRV The value to return if the comparison between * the column and the Orderable value returns the * unknown truth value - * @param negate True means to negate the result of the comparison. + * @param negateCompareResult True means to negate the result of the comparison. * So, for example, to do a > comparison, you would * pass ORDER_OP_LESSOREQUALS and set negate to true. * @param variantType The variantType for the qualifier's orderable. @@ -213,7 +213,7 @@ read (1 based) @param baseRowReadMap baseRowReadMap[heapColId]->readRowColId (0 based) - @param streamStorableHeapColIds Column ids of stream storable + @param streamStorableColIds Column ids of stream storable columns. (0 based, Only needed for sync. null if none or not needed). @param activation The Activation. Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/NoPutResultSet.java URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/NoPutResultSet.java?rev=374198&r1=374197&r2=374198&view=diff ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/NoPutResultSet.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/NoPutResultSet.java Wed Feb 1 14:46:09 2006 @@ -50,8 +50,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(); @@ -121,18 +119,12 @@ * TargetResultSet. This is useful when doing bulk insert. * * @param trs The TargetResultSet. - * - * @return Nothing. */ public void setTargetResultSet(TargetResultSet trs); /** * 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); Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/ResultSetFactory.java URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/ResultSetFactory.java?rev=374198&r1=374197&r2=374198&view=diff ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/ResultSetFactory.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/ResultSetFactory.java Wed Feb 1 14:46:09 2006 @@ -208,7 +208,6 @@ /** * @param source the result set from which to take rows to be * updated in the target table. - * @param vtiRS the updateable result set for the VTI * @return the update operation as a result set. * @exception StandardException thrown on error */ @@ -303,7 +302,7 @@ GeneratedMethod projection, int resultSetNumber, GeneratedMethod constantRestriction, int mapArrayItem, - boolean resuseResult, + boolean reuseResult, boolean doesProjection, double optimizerEstimatedRowCount, double optimizerEstimatedCost, @@ -330,7 +329,7 @@ ExecRow projection() throws StandardException; @param resultSetNumber The resultSetNumber for the ResultSet - @param mapArrayItem Item # for mapping of source to target columns + @param mapRefItem Item # for mapping of source to target columns @param reuseResult Whether or not to reuse the result row. @param keyColItem Item for hash key column array @param removeDuplicates Whether or not to remove duplicates when building the hash table @@ -446,7 +445,7 @@ filtered by this operation. @param isInSortedOrder true if the source result set is in sorted order @param aggregateItem entry in preparedStatement's savedObjects for aggregates - @param orderItem entry in preparedStatement's savedObjects for order + @param orderingItem entry in preparedStatement's savedObjects for order @param rowAllocator a reference to a method in the activation that generates rows of the right size and shape for the source @param rowSize the size of the row that is allocated by rowAllocator. @@ -517,7 +516,7 @@ filtered by this operation. @param isInSortedOrder true if the source result set is in sorted order @param aggregateItem entry in preparedStatement's savedObjects for aggregates - @param orderItem entry in preparedStatement's savedObjects for order + @param orderingItem entry in preparedStatement's savedObjects for order @param rowAllocator a reference to a method in the activation that generates rows of the right size and shape for the source @param rowSize the size of the row that is allocated by rowAllocator. @@ -1019,7 +1018,7 @@

@param conglomId Conglomerate # for the heap. - @param scociItem The saved item for the static conglomerate info. + @param scoci The saved item for the static conglomerate info. @param source the source result set, which is expected to provide rows from an index conglomerate @param resultRowAllocator a reference to a method in the activation @@ -1355,8 +1354,6 @@ * @param source1 The first ResultSet whose rows go into the union * @param source2 The second ResultSet whose rows go into the * union - * @param activation the activation for this result set, - * which provides the context for normalization. * @param resultSetNumber The resultSetNumber for the ResultSet * @param closeCleanup any cleanup the activation needs to do on close. * @param optimizerEstimatedRowCount Estimated total # of rows by Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/RowChanger.java URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/RowChanger.java?rev=374198&r1=374197&r2=374198&view=diff ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/RowChanger.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/RowChanger.java Wed Feb 1 14:46:09 2006 @@ -89,8 +89,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) Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/TargetResultSet.java URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/TargetResultSet.java?rev=374198&r1=374197&r2=374198&view=diff ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/TargetResultSet.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/TargetResultSet.java Wed Feb 1 14:46:09 2006 @@ -45,8 +45,6 @@ * @param execRow The changed row. * @param rowLocation The row location of the row. * - * @return Nothing. - * * @exception StandardException thrown if cursor finished. */ public void changedRow(ExecRow execRow, RowLocation rowLocation) throws StandardException; Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/TemporaryRowHolder.java URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/TemporaryRowHolder.java?rev=374198&r1=374197&r2=374198&view=diff ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/TemporaryRowHolder.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/TemporaryRowHolder.java Wed Feb 1 14:46:09 2006 @@ -40,7 +40,7 @@ /** * Insert a row * - * @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/iapi/sql/execute/TupleFilter.java URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/TupleFilter.java?rev=374198&r1=374197&r2=374198&view=diff ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/TupleFilter.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/TupleFilter.java Wed Feb 1 14:46:09 2006 @@ -44,7 +44,7 @@ /** * Pump a row through the Filter. * - * @param row Column values to plug into restriction + * @param currentRow Column values to plug into restriction * * @return True if the row qualifies. False otherwise. * Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/KeyHasher.java URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/KeyHasher.java?rev=374198&r1=374197&r2=374198&view=diff ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/KeyHasher.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/KeyHasher.java Wed Feb 1 14:46:09 2006 @@ -40,8 +40,6 @@ * * @param index The specified index * @param object The specified object. - * - * @return Nothing. */ public void setObject(int index, Object object) { Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/RowCountable.java URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/RowCountable.java?rev=374198&r1=374197&r2=374198&view=diff ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/RowCountable.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/RowCountable.java Wed Feb 1 14:46:09 2006 @@ -75,8 +75,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/iapi/store/access/XATransactionController.java URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/XATransactionController.java?rev=374198&r1=374197&r2=374198&view=diff ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/XATransactionController.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/XATransactionController.java Wed Feb 1 14:46:09 2006 @@ -68,8 +68,6 @@ * than destroy will throw exceptions. *

* - * @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/iapi/store/access/conglomerate/ScanManager.java URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/conglomerate/ScanManager.java?rev=374198&r1=374197&r2=374198&view=diff ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/conglomerate/ScanManager.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/conglomerate/ScanManager.java Wed Feb 1 14:46:09 2006 @@ -154,10 +154,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/iapi/store/access/xa/XAResourceManager.java URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/xa/XAResourceManager.java?rev=374198&r1=374197&r2=374198&view=diff ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/xa/XAResourceManager.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/xa/XAResourceManager.java Wed Feb 1 14:46:09 2006 @@ -60,8 +60,6 @@ * RESOLVE - how do we map to the "right" XAExceptions. *

* - * @return The identifier to be used to open the conglomerate later. - * * @param cm The ContextManager returned from the find() call. * @param xid A global transaction identifier. * @param onePhase If true, the resource manager should use a one-phase Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/Transaction.java URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/Transaction.java?rev=374198&r1=374197&r2=374198&view=diff ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/Transaction.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/Transaction.java Wed Feb 1 14:46:09 2006 @@ -126,9 +126,6 @@ @param policy The lock policy to use, if null then then a no locking policy will be installed as the default. - - @return true if a new locking policy was installed as the default, false - of a matching policy could not be found. */ public void setDefaultLockingPolicy(LockingPolicy policy); @@ -562,7 +559,6 @@ * RESOLVE - how do we map to the "right" XAExceptions. *

* - * @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 Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/data/DataFactory.java URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/data/DataFactory.java?rev=374198&r1=374197&r2=374198&view=diff ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/data/DataFactory.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/data/DataFactory.java Wed Feb 1 14:46:09 2006 @@ -76,7 +76,6 @@ @param containerId the container's identity @param locking the locking policy @param mode see the different mode in @see ContainerHandle - @param droppedOK if true, then the container may be dropped. If false, then will return a null handle if the container is dropped. @return the handle to the opened container @@ -110,7 +109,7 @@ @param mode whether or not to LOGGED or not. The effect of this mode is only for this addContainer call, not persisently stored throughout the lifetime of the container - @param tablePropertes properties of the container that is persistently + @param tableProperties properties of the container that is persistently stored throughout the lifetime of the container @return the containerId of the newly created container @@ -132,7 +131,7 @@ @param t the transaction that is creating the container @param segmentId the segment where the container is to go - @param tablePropertes properties of the container that is persistently + @param tableProperties properties of the container that is persistently stored throughout the lifetime of the container @param rowSource the data to load the container with Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/log/LogFactory.java URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/log/LogFactory.java?rev=374198&r1=374197&r2=374198&view=diff ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/log/LogFactory.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/log/LogFactory.java Wed Feb 1 14:46:09 2006 @@ -145,7 +145,7 @@ @return the LogScan. @exception StandardException StandardCloudscape error policy */ - ScanHandle openFlushedScan(DatabaseInstant start, int groupsIWant) + ScanHandle openFlushedScan(DatabaseInstant startAt, int groupsIWant) throws StandardException; /** @@ -248,7 +248,7 @@ * redoing a checkpoint during rollforward recovery @param cinstant The LogInstant of the checkpoint @param redoLWM Redo Low Water Mark in the check point record - @param dataFactory - the data factory + @param df - the data factory @exception StandardException - encounter exception during checkpoint */ public void checkpointInRFR(LogInstant cinstant, long redoLWM, Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/xact/RawTransaction.java URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/xact/RawTransaction.java?rev=374198&r1=374197&r2=374198&view=diff ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/xact/RawTransaction.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/xact/RawTransaction.java Wed Feb 1 14:46:09 2006 @@ -110,7 +110,6 @@ @param undoInstant the LogInstant of the Loggable Operation this compensation operation is going to roll back @param in optional data for the rollback operation - @param dataLengt optional data length @see Compensation Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/BooleanDataValue.java URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/BooleanDataValue.java?rev=374198&r1=374197&r2=374198&view=diff ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/BooleanDataValue.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/BooleanDataValue.java Wed Feb 1 14:46:09 2006 @@ -112,9 +112,6 @@ * * @param theValue Contains the boolean value to set this BooleanDataValue * to. Null means set this BooleanDataValue to null. - * - * @return This BooleanDataValue - * */ public void setValue(Boolean theValue); Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/DataType.java URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/DataType.java?rev=374198&r1=374197&r2=374198&view=diff ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/DataType.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/DataType.java Wed Feb 1 14:46:09 2006 @@ -267,9 +267,6 @@ * At DataType level just throws an error lower classes will override * * @param theValue The Time value to set this DataValueDescriptor to - * - * @return This DataValueDescriptor - * */ public void setValue(Time theValue) throws StandardException { @@ -282,9 +279,6 @@ * * @param theValue The Time value to set this DataValueDescriptor to * @param cal The time zone from the calendar is used to construct the database time value - * - * @return This DataValueDescriptor - * */ public void setValue(Time theValue, Calendar cal) throws StandardException { @@ -296,9 +290,6 @@ * At DataType level just throws an error lower classes will override * * @param theValue The Timestamp value to set this DataValueDescriptor to - * - * @return This DataValueDescriptor - * */ public void setValue(Timestamp theValue) throws StandardException { @@ -311,9 +302,6 @@ * * @param theValue The Timestamp value to set this DataValueDescriptor to * @param cal The time zone from the calendar is used to construct the database timestamp value - * - * @return This DataValueDescriptor - * */ public void setValue(Timestamp theValue, Calendar cal) throws StandardException { @@ -325,9 +313,6 @@ * At DataType level just throws an error lower classes will override * * @param theValue The Date value to set this DataValueDescriptor to - * - * @return This DataValueDescriptor - * */ public void setValue(Date theValue) throws StandardException { @@ -340,9 +325,6 @@ * * @param theValue The Date value to set this DataValueDescriptor to * @param cal The time zone from the calendar is used to construct the database date value - * - * @return This DataValueDescriptor - * */ public void setValue(Date theValue, Calendar cal) throws StandardException { @@ -354,9 +336,6 @@ * At DataType level just throws an error lower classes will override * * @param theValue The BigDecimal value to set this DataValueDescriptor to - * - * @return This DataValueDescriptor - * */ public void setValue(String theValue) throws StandardException { @@ -370,8 +349,6 @@ * * @param theValue The value to set this DataValueDescriptor to * - * @return This DataValueDescriptor - * * @exception StandardException Thrown on error */ public void setValue(int theValue) throws StandardException @@ -385,8 +362,6 @@ * * @param theValue The value to set this DataValueDescriptor to * - * @return This DataValueDescriptor - * * @exception StandardException Thrown on error */ public void setValue(double theValue) throws StandardException @@ -400,8 +375,6 @@ * * @param theValue The value to set this DataValueDescriptor to * - * @return This DataValueDescriptor - * * @exception StandardException Thrown on error */ public void setValue(float theValue) throws StandardException @@ -415,8 +388,6 @@ * * @param theValue The value to set this DataValueDescriptor to * - * @return This DataValueDescriptor - * * @exception StandardException Thrown on error */ public void setValue(short theValue) throws StandardException @@ -429,8 +400,6 @@ * * @param theValue The value to set this DataValueDescriptor to * - * @return This DataValueDescriptor - * * @exception StandardException Thrown on error */ public void setValue(long theValue) throws StandardException @@ -444,8 +413,6 @@ * * @param theValue The value to set this DataValueDescriptor to * - * @return This DataValueDescriptor - * * @exception StandardException Thrown on error */ public void setValue(byte theValue) throws StandardException @@ -459,8 +426,6 @@ * * @param theValue Contains the boolean value to set this to * - * @return This value - * */ public void setValue(boolean theValue) throws StandardException { @@ -473,8 +438,6 @@ * * @param theValue The byte value to set this DataValueDescriptor to * - * @return This DataValueDescriptor - * */ public void setValue(byte[] theValue) throws StandardException { @@ -533,7 +496,6 @@ * @exception StandardException * thrown on failure * - * @return me */ public void setObjectForCast(Object theValue, boolean instanceOfResultType, String resultTypeClassName) throws StandardException { @@ -572,7 +534,6 @@ * Get the type name of this value, possibly overriding * with the passed in class name (for user/java types). * @param className - * @return */ String getTypeName(String className) { Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/DataTypeDescriptor.java URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/DataTypeDescriptor.java?rev=374198&r1=374197&r2=374198&view=diff ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/DataTypeDescriptor.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/DataTypeDescriptor.java Wed Feb 1 14:46:09 2006 @@ -155,7 +155,7 @@ /** * Get a DataTypeServices that corresponds to a builtin SQL type * - * @param javaTypeName The name of the Java type for which to get + * @param sqlTypeName The name of the type for which to get * a corresponding SQL DataTypeDescriptor * * @return A new DataTypeDescriptor that corresponds to the Java type. @@ -171,7 +171,7 @@ /** * Get a DataTypeServices that corresponds to a builtin SQL type * - * @param javaTypeName The name of the Java type for which to get + * @param sqlTypeName The name of the type for which to get * a corresponding SQL DataTypeDescriptor * * @return A new DataTypeDescriptor that corresponds to the Java type. @@ -794,8 +794,6 @@ * * @param nullable TRUE means set nullability to TRUE, FALSE * means set it to FALSE - * - * @return Nothing */ public void setNullability(boolean nullable) { @@ -804,7 +802,7 @@ /** Compare if two TypeDescriptors are exactly the same - @param typeDescriptor the typeDescriptor to compare to. + @param aTypeDescriptor the typeDescriptor to compare to. */ public boolean equals(Object aTypeDescriptor) { @@ -915,7 +913,7 @@ * equivalent * * @param existingType JDBC type id of Cloudscape data type - * @param jdbcTypeIdB JDBC type id passed in from application. + * @param jdbcTypeId JDBC type id passed in from application. * * @return boolean true if types are equivalent, false if not */ Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/DataValueDescriptor.java URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/DataValueDescriptor.java?rev=374198&r1=374197&r2=374198&view=diff ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/DataValueDescriptor.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/DataValueDescriptor.java Wed Feb 1 14:46:09 2006 @@ -295,8 +295,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 */ @@ -330,8 +328,6 @@ * * @param theValue The value to set this DataValueDescriptor to * - * @return This DataValueDescriptor - * * @exception StandardException Thrown on error */ public void setValue(int theValue) throws StandardException; @@ -342,8 +338,6 @@ * * @param theValue The value to set this DataValueDescriptor to * - * @return This DataValueDescriptor - * * @exception StandardException Thrown on error */ public void setValue(double theValue) throws StandardException; @@ -355,8 +349,6 @@ * DataValueDescriptor to. Null means set the value * to SQL null. * - * @return This DataValueDescriptor - * * @exception StandardException Thrown on error */ @@ -367,8 +359,6 @@ * * @param theValue The value to set this DataValueDescriptor to * - * @return This DataValueDescriptor - * * @exception StandardException Thrown on error */ public void setValue(short theValue) throws StandardException; @@ -378,8 +368,6 @@ * * @param theValue The value to set this DataValueDescriptor to * - * @return This DataValueDescriptor - * * @exception StandardException Thrown on error */ public void setValue(long theValue) throws StandardException; @@ -389,8 +377,6 @@ * * @param theValue The value to set this DataValueDescriptor to * - * @return This DataValueDescriptor - * */ public void setValue(byte theValue) throws StandardException; @@ -400,27 +386,14 @@ * * @param theValue Contains the boolean value to set this to * - * @return This value - * */ public void setValue(boolean theValue) throws StandardException; /** - * Set the value. - * - * @param theValue Contains the boolean value to set this to - * - * @return This value - * - */ - - /** * Set the value of this DataValueDescriptor. * * @param theValue The byte value to set this DataValueDescriptor to * - * @return This DataValueDescriptor - * */ public void setValue(byte[] theValue) throws StandardException; @@ -442,8 +415,6 @@ * * @param theValue The String value to set this DataValueDescriptor to * - * @return This DataValueDescriptor - * */ public void setValue(String theValue) throws StandardException; @@ -452,8 +423,6 @@ * * @param theValue The Time value to set this DataValueDescriptor to * - * @return This DataValueDescriptor - * */ public void setValue(Time theValue) throws StandardException; @@ -463,8 +432,6 @@ * @param theValue The Time value to set this DataValueDescriptor to * @param cal The time zone from the calendar is used to construct the database time value * - * @return This DataValueDescriptor - * */ public void setValue(Time theValue, Calendar cal) throws StandardException; @@ -473,8 +440,6 @@ * * @param theValue The Timestamp value to set this DataValueDescriptor to * - * @return This DataValueDescriptor - * */ public void setValue(Timestamp theValue) throws StandardException; @@ -484,8 +449,6 @@ * @param theValue The Timestamp value to set this DataValueDescriptor to * @param cal The time zone from the calendar is used to construct the database timestamp value * - * @return This DataValueDescriptor - * */ public void setValue(Timestamp theValue, Calendar cal) throws StandardException; @@ -494,8 +457,6 @@ * * @param theValue The Date value to set this DataValueDescriptor to * - * @return This DataValueDescriptor - * */ public void setValue(Date theValue) throws StandardException; @@ -505,8 +466,6 @@ * @param theValue The Date value to set this DataValueDescriptor to * @param cal The time zone from the calendar is used to construct the database date value * - * @return This DataValueDescriptor - * */ public void setValue(Date theValue, Calendar cal) throws StandardException; @@ -514,8 +473,6 @@ * Set the value of this DataValueDescriptor from another. * * @param theValue The Date value to set this DataValueDescriptor to - * - * @return This DataValueDescriptor * */ public void setValue(DataValueDescriptor theValue) throws StandardException; Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/DataValueFactory.java URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/DataValueFactory.java?rev=374198&r1=374197&r2=374198&view=diff ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/DataValueFactory.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/DataValueFactory.java Wed Feb 1 14:46:09 2006 @@ -443,7 +443,7 @@ public DateTimeDataValue getTimeValue( String timeStr, boolean isJdbcEscape) throws StandardException; /** - * @param timeStr A time in string format. + * @param timestampStr A time in string format. * @param isJdbcEscape If true then the time must be in the JDBC time escape format, otherwise it must * be in the DB2 time format. * @return An internal timestamp Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/DateTimeParser.java URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/DateTimeParser.java?rev=374198&r1=374197&r2=374198&view=diff ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/DateTimeParser.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/DateTimeParser.java Wed Feb 1 14:46:09 2006 @@ -49,8 +49,6 @@ * exactly ndigits long. * @param separator The separator at the end of the integer. If zero then the integer must be at the end of the string * but may be followed by spaces. - * @param separatorRequired If true then the integer must be followed by the separator. If false then the integer - * may terminate the string or be followed by the separator * @param isFraction If true then the returned integer will be multiplied by 10**(maxDigits - actualDigitCount) * * @return the integer. Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/JSQLType.java URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/JSQLType.java?rev=374198&r1=374197&r2=374198&view=diff ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/JSQLType.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/JSQLType.java Wed Feb 1 14:46:09 2006 @@ -316,7 +316,7 @@ /** * Gets the name of the java wrapper class corresponding to a primitive. * - * @param BOOLEAN, INT, ... etc. + * @param primitive BOOLEAN, INT, ... etc. * * @return name of the java wrapper class corresponding to the primitive */ Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/NumberDataValue.java URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/NumberDataValue.java?rev=374198&r1=374197&r2=374198&view=diff ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/NumberDataValue.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/NumberDataValue.java Wed Feb 1 14:46:09 2006 @@ -190,8 +190,6 @@ * NumberDataValue to. Null means set the value * to SQL null. * - * @return This NumberDataValue - * */ public void setValue(Number theValue) throws StandardException; Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/RefDataValue.java URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/RefDataValue.java?rev=374198&r1=374197&r2=374198&view=diff ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/RefDataValue.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/RefDataValue.java Wed Feb 1 14:46:09 2006 @@ -31,9 +31,6 @@ * * @param theValue Contains the boolean value to set this RefDataValue * to. Null means set this RefDataValue to null. - * - * @return This RefDataValue - * */ public void setValue(RowLocation theValue); } Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLBinary.java URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLBinary.java?rev=374198&r1=374197&r2=374198&view=diff ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLBinary.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLBinary.java Wed Feb 1 14:46:09 2006 @@ -643,10 +643,6 @@ * * @param left The value on the left side of the < * @param right The value on the right side of the < - * @param result The result of a previous call to this method, null - * if not called yet. NOTE: This is unused in this - * method, because comparison operators always return - * pre-allocated values. * * @return A SQL boolean value telling whether the first operand is * less than the second operand Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLBit.java URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLBit.java?rev=374198&r1=374197&r2=374198&view=diff ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLBit.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLBit.java Wed Feb 1 14:46:09 2006 @@ -184,7 +184,6 @@ * @param desiredWidth the desired length * @param desiredScale the desired scale (ignored) * @param errorOnTrunc throw error on truncation - * @return this with the target width * * @exception StandardException Thrown on non-zero truncation * if errorOnTrunc is true Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLBoolean.java URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLBoolean.java?rev=374198&r1=374197&r2=374198&view=diff ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLBoolean.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLBoolean.java Wed Feb 1 14:46:09 2006 @@ -507,8 +507,6 @@ * Set the value of this BooleanDataValue to the given byte array value * * @param theValue The value to set this BooleanDataValue to - * - * @return This BooleanDataValue */ public void setValue(byte[] theValue) { @@ -551,8 +549,6 @@ * * @param theValue The value to set this BooleanDataValue to * - * @return This BooleanDataValue - * * @exception StandardException Thrown on error */ public void setValue(String theValue) @@ -888,7 +884,7 @@ * Throw an exception with the given SQLState if this BooleanDataValue * is false. This method is useful for evaluating constraints. * - * @param SQLState The SQLState of the exception to throw if + * @param sqlState The SQLState of the exception to throw if * this SQLBoolean is false. * @param tableName The name of the table to include in the exception * message. Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLChar.java URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLChar.java?rev=374198&r1=374197&r2=374198&view=diff ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLChar.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLChar.java Wed Feb 1 14:46:09 2006 @@ -510,7 +510,6 @@ not the length of the string. Following the length, each character of the string is output, in sequence, using the UTF-8 encoding for the character. - @param str a string to be written. @exception IOException if an I/O error occurs. @since JDK1.0 @@ -616,7 +615,6 @@ * stream is detected, or an exception is thrown. * * @param in a data input stream. - * @return a Unicode string. * @exception EOFException if the input stream reaches the end * before all the bytes. * @exception IOException if an I/O error occurs. @@ -1202,8 +1200,6 @@ * * @exception StandardException * thrown on failure - * - * @return me */ public void setObjectForCast(Object theValue, boolean instanceOfResultType, String resultTypeClassName) throws StandardException { @@ -1232,10 +1228,7 @@ * * @param desiredType The type to normalize the source column to * @param source The value to normalize - * @param cachedDest DataValueDescriptor, if non-null, to hold result - * (Reuse if normalizing multiple rows) * - * @return The normalized SQLChar * * @exception StandardException Thrown for null into * non-nullable column, and for @@ -1340,7 +1333,6 @@ * @param desiredWidth the desired length * @param desiredScale the desired scale (ignored) * @param errorOnTrunc throw an error on truncation - * @return this with the new width * * @exception StandardException Thrown when errorOnTrunc * is true and when a shrink will truncate non-white @@ -1668,7 +1660,6 @@ /** * This method implements the like function for char (with no escape value). * - * @param value The value to evaluate * @param pattern The pattern to use * * @return A SQL boolean value telling whether the first operand is Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLDate.java URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLDate.java?rev=374198&r1=374197&r2=374198&view=diff ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLDate.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLDate.java Wed Feb 1 14:46:09 2006 @@ -403,8 +403,6 @@ * @param isJdbcEscape if true then only the JDBC date escape syntax is allowed * @param localeFinder * - * @return the internal DataValueDescriptor for the value - * * @exception Standard exception if the syntax is invalid or the value is out of range. */ public SQLDate( String dateStr, boolean isJdbcEscape, LocaleFinder localeFinder) @@ -426,8 +424,6 @@ * @param isJdbcEscape if true then only the JDBC date escape syntax is allowed * @param localeFinder * - * @return the internal DataValueDescriptor for the value - * * @exception Standard exception if the syntax is invalid or the value is out of range. */ public SQLDate( String dateStr, boolean isJdbcEscape, LocaleFinder localeFinder, Calendar cal) @@ -783,7 +779,7 @@ * year << 16 + month << 8 + date * Use this function will help to remember to add 1 to month * which is 0 based in the Calendar class - * @param value the Calendar + * @param cal the Calendar * @return the encodedDate * * @exception StandardException if the value is out of the DB2 date range Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLDecimal.java URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLDecimal.java?rev=374198&r1=374197&r2=374198&view=diff ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLDecimal.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLDecimal.java Wed Feb 1 14:46:09 2006 @@ -1046,7 +1046,6 @@ * @param errorOnTrunc throw error on truncation (ignored -- * always thrown if we truncate the non-decimal part of * the value) - * @return this with the target width * * @exception StandardException Thrown on non-zero truncation * if errorOnTrunc is true Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLNationalChar.java URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLNationalChar.java?rev=374198&r1=374197&r2=374198&view=diff ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLNationalChar.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLNationalChar.java Wed Feb 1 14:46:09 2006 @@ -255,10 +255,6 @@ * * @param desiredType The type to normalize the source column to * @param source The value to normalize - * @param cachedDest DataValueDescriptor, if non-null, to hold result - * (Reuse if normalizing multiple rows) - * - * @return The normalized SQLChar * * @exception StandardException Thrown for null into * non-nullable column, and for Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLTime.java URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLTime.java?rev=374198&r1=374197&r2=374198&view=diff ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLTime.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLTime.java Wed Feb 1 14:46:09 2006 @@ -410,11 +410,6 @@ *

  • JIS & current ISO: hh:mm[:ss] * * - * @param dateStr - * @param localFinder - * - * @return the internal DataValueDescriptor for the value - * * @exception Standard exception if the syntax is invalid or the value is out of range. */ public SQLTime( String timeStr, boolean isJdbcEscape, LocaleFinder localeFinder) @@ -431,11 +426,6 @@ *
  • JIS & current ISO: hh:mm[:ss] * * - * @param dateStr - * @param localFinder - * - * @return the internal DataValueDescriptor for the value - * * @exception Standard exception if the syntax is invalid or the value is out of range. */ public SQLTime( String timeStr, boolean isJdbcEscape, LocaleFinder localeFinder, Calendar cal) @@ -857,7 +847,7 @@ * encoded time is hour << 16 + min << 8 + sec * this function is also used by SQLTimestamp * - * @param calendar with time set + * @param cal calendar with time set * @return encoded time * * @exception StandardException if the time is not in the DB2 range Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLTimestamp.java URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLTimestamp.java?rev=374198&r1=374197&r2=374198&view=diff ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLTimestamp.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLTimestamp.java Wed Feb 1 14:46:09 2006 @@ -558,7 +558,7 @@ * Parse a localized timestamp. * * @param str the timestamp string, with trailing blanks removed. - * @param localFinder + * @param localeFinder * * @return a {encodedDate, encodedTime} array. * @@ -1047,7 +1047,7 @@ * * @param intervalType One of FRAC_SECOND_INTERVAL, SECOND_INTERVAL, MINUTE_INTERVAL, HOUR_INTERVAL, * DAY_INTERVAL, WEEK_INTERVAL, MONTH_INTERVAL, QUARTER_INTERVAL, or YEAR_INTERVAL - * @param intervalCount The number of intervals to add + * @param count The number of intervals to add * @param currentDate Used to convert time to timestamp * @param resultHolder If non-null a DateTimeDataValue that can be used to hold the result. If null then * generate a new holder @@ -1325,7 +1325,6 @@ /** * Promotes a DateTimeDataValue to a timestamp. * - * @param datetime * * @return the corresponding timestamp, using the current date if datetime is a time, * or time 00:00:00 if datetime is a date. Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLVarbit.java URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLVarbit.java?rev=374198&r1=374197&r2=374198&view=diff ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLVarbit.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLVarbit.java Wed Feb 1 14:46:09 2006 @@ -113,7 +113,6 @@ * @param desiredWidth the desired length * @param desiredScale the desired scale (ignored) * @param errorOnTrunc throw error on truncation - * @return this with the target width * * @exception StandardException Thrown on non-zero truncation * if errorOnTrunc is true Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/UserDataValue.java URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/UserDataValue.java?rev=374198&r1=374197&r2=374198&view=diff ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/UserDataValue.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/UserDataValue.java Wed Feb 1 14:46:09 2006 @@ -28,9 +28,6 @@ * Set the value of this UserDataValue to the given Object * * @param theValue The value to set this UserDataValue to - * - * @return This UserDataValue - * */ public void setValue(Object theValue) throws StandardException; } Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/UserType.java URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/UserType.java?rev=374198&r1=374197&r2=374198&view=diff ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/UserType.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/UserType.java Wed Feb 1 14:46:09 2006 @@ -254,8 +254,6 @@ /** * Get the type name of this value, overriding * with the passed in class name (for user/java types). - * @param className - * @return */ String getTypeName(String className) { Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/XML.java URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/XML.java?rev=374198&r1=374197&r2=374198&view=diff ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/XML.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/XML.java Wed Feb 1 14:46:09 2006 @@ -26,6 +26,8 @@ import org.apache.derby.iapi.services.io.ArrayInputStream; import org.apache.derby.iapi.services.io.StoredFormatIds; import org.apache.derby.iapi.services.io.StreamStorable; +import org.apache.derby.iapi.services.io.Storable; +import org.apache.derby.iapi.services.io.TypedFormat; import org.apache.derby.iapi.services.sanity.SanityManager; import org.apache.derby.iapi.types.DataValueDescriptor; @@ -231,7 +233,6 @@ } /** - * @see DataValueDescriptor#setFrom */ protected void setFrom(DataValueDescriptor theValue) throws StandardException @@ -430,12 +431,12 @@ /** * Method to parse an XML string and, if it's valid, * store the _parsed_ version for subsequent use. + * 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 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 text, boolean preserveWS)