You are viewing a plain text version of this content. The canonical link for it is here.
Posted to derby-commits@db.apache.org by fu...@apache.org on 2005/01/24 04:24:29 UTC
svn commit: r126257 - in incubator/derby/code/trunk/java: drda/org/apache/derby/drda drda/org/apache/derby/impl/drda engine/org/apache/derby/jdbc tools/org/apache/derby/impl/tools/ij tools/org/apache/derby/impl/tools/sysinfo
Author: fuzzylogic
Date: Sun Jan 23 19:24:27 2005
New Revision: 126257
URL: http://svn.apache.org/viewcvs?view=rev&rev=126257
Log:
Fix javadoc errors in drda, tools, and publishedapi.
Modified:
incubator/derby/code/trunk/java/drda/org/apache/derby/drda/NetServlet.java
incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DB2jServerImpl.java
incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DDMReader.java
incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DDMWriter.java
incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAConnThread.java
incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAResultSet.java
incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAStatement.java
incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAXAProtocol.java
incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/Database.java
incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DecryptionManager.java
incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/XADatabase.java
incubator/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbeddedConnectionPoolDataSource.java
incubator/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbeddedDataSource.java
incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/util.java
incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/utilMain14.java
incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/sysinfo/Main.java
Modified: incubator/derby/code/trunk/java/drda/org/apache/derby/drda/NetServlet.java
Url: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/drda/org/apache/derby/drda/NetServlet.java?view=diff&rev=126257&p1=incubator/derby/code/trunk/java/drda/org/apache/derby/drda/NetServlet.java&r1=126256&p2=incubator/derby/code/trunk/java/drda/org/apache/derby/drda/NetServlet.java&r2=126257
==============================================================================
--- incubator/derby/code/trunk/java/drda/org/apache/derby/drda/NetServlet.java (original)
+++ incubator/derby/code/trunk/java/drda/org/apache/derby/drda/NetServlet.java Sun Jan 23 19:24:27 2005
@@ -518,7 +518,7 @@
* Start the network server and attempt to connect to it before
* returning
*
- * @param localAppUI AppUI to use to translate messages
+ * @param localUtil LocalizedResource to use to translate messages
* @param request HttpServetRequest for error forms
* @param returnMessage localized continue message for continue button on error form
* @exception ServletException throws an exception if error in starting the
@@ -595,7 +595,7 @@
/**
* Display an error form
*
- * @param appUI AppUI to use to translate messages
+ * @param localUtil LocalizedResource to use to translate messages
* @param request HttpServetRequest for error forms
* @param e Exception to be displayed
* @param returnMessage localized continue message for continue button on error form
@@ -612,7 +612,7 @@
/**
* Display an error form
*
- * @param appUI AppUI to use to translate messages
+ * @param localUtil LocalizedResource to use to translate messages
* @param request HttpServetRequest for error forms
* @param msg String to be displayed
* @param returnMessage localized continue message for continue button on error form
@@ -630,7 +630,7 @@
* Display the current Network server status
*
* @param request HttpServetRequest for forms
- * @param appUI appUI to use for localizing messages
+ * @param localUtil LocalizedResource to use for localizing messages
* @param returnMessage localized continue message for continue button on error form
*/
private void displayCurrentStatus(HttpServletRequest request,
@@ -680,7 +680,7 @@
/**
* Shutdown the network server
*
- * @param appUI AppUI to use to translate messages
+ * @param localUtil LocalizedResource to use to translate messages
* @param request HttpServetRequest for forms
* @param returnMessage localized continue message for continue button on error form
* @return true if succeeded; false; otherwise
@@ -701,7 +701,7 @@
/**
* Turn logging of connections on
*
- * @param appUI AppUI to use to translate messages
+ * @param localUtil LocalizedResource to use to translate messages
* @param request HttpServetRequest for forms
* @param returnMessage localized continue message for continue button on error form
* @return true if succeeded; false; otherwise
@@ -722,7 +722,7 @@
/**
* Change tracing for all sessions
*
- * @param appUI AppUI to use to translate messages
+ * @param localUtil LocalizedResource to use to translate messages
* @param val if true, turn tracing on, if false turn it off
* @param request HttpServetRequest for forms
* @param returnMessage localized continue message for continue button on error form
@@ -744,7 +744,7 @@
/**
* Change tracing for a given session
*
- * @param appUI AppUI to use to translate messages
+ * @param localUtil LocalizedResource to use to translate messages
* @param val if true, turn tracing on, if false turn it off
* @param session session to trace
* @param request HttpServetRequest for forms
@@ -768,7 +768,7 @@
/**
* Set trace directory
*
- * @param appUI AppUI to use to translate messages
+ * @param localUtil LocalizedResource to use to translate messages
* @param traceDirectory directory for trace files
* @param request HttpServetRequest for forms
* @param returnMessage localized continue message for continue
@@ -801,7 +801,7 @@
/**
* Set Network server parameters
*
- * @param appUI AppUI to use to translate messages
+ * @param localUtil LocalizedResource to use to translate messages
* @param max maximum number of threads
* @param slice time slice for each connection
* @param request HttpServetRequest for forms
@@ -840,7 +840,7 @@
* @param request HttpServetRequest for forms
* @param name parameter name
* @param fieldKey Key for the name of the field we're reading.
- * @param appUI appUI to use in localizing messages
+ * @param localUtil LocalizedResource to use in localizing messages
* @param returnMessage localized continue message for continue
* button on error form
*/
Modified: incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DB2jServerImpl.java
Url: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DB2jServerImpl.java?view=diff&rev=126257&p1=incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DB2jServerImpl.java&r1=126256&p2=incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DB2jServerImpl.java&r2=126257
==============================================================================
--- incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DB2jServerImpl.java (original)
+++ incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DB2jServerImpl.java Sun Jan 23 19:24:27 2005
@@ -310,10 +310,9 @@
/**
* Internal constructor for NetworkServerControl API.
- * @ param address - InetAddress to listen on, May not be null.
- * Throws NPE if null
- * @ portNumber - portNumber to listen on, -1 use propert or default.
- * @ throw Exception on error
+ * @param address - InetAddress to listen on, May not be null. Throws NPE if null
+ * @param portNumber - portNumber to listen on, -1 use propert or default.
+ * @exception throw Exception on error
* @see NetworkServerControl
*/
public DB2jServerImpl(InetAddress address, int portNumber) throws Exception
@@ -402,7 +401,7 @@
* Set the output stream for console messages
* If this is set to null, no messages will be written to the console
*
- * @param outStream output stream for console messages
+ * @param outWriter output stream for console messages
*/
public void setLogWriter(PrintWriter outWriter)
{
@@ -733,10 +732,6 @@
/**
* Shutdown a network server
*
- * @param host machine network server is running on, if null, localhost is used
- * @param portNumber port number server is to use, if <= 0, default port number
- * is used
- *
* @exception Exception throws an exception if an error occurs
*/
public void shutdown()
@@ -821,9 +816,6 @@
* Turn tracing on or off for all sessions
*
* @param on true to turn tracing on, false to turn tracing off
- * @param host machine network server is running on, if null, localhost is used
- * @param portNumber port number server is to use, if <= 0, default port number
- * is used
*
* @exception Exception throws an exception if an error occurs
*/
@@ -879,9 +871,6 @@
* written to DB2j.log each time a connection connects or disconnects.
*
* @param on true to turn on, false to turn off
- * @param host machine network server is running on, if null, localhost is used
- * @param portNumber port number server is to use, if <= 0, default port number
- * is used
*
* @exception Exception throws an exception if an error occurs
*/
@@ -1433,7 +1422,7 @@
/**
* Get the server manager level for a given manager
*
- * @param manger codepoint for manager
+ * @param manager codepoint for manager
* @return manager level
*/
protected int getManagerLevel(int manager)
@@ -1448,7 +1437,7 @@
/**
* Check whether a CCSID code page is supported
*
- * @param CCSID to check
+ * @param ccsid CCSID to check
* @return true if supported; false otherwise
*/
protected boolean supportsCCSID(int ccsid)
@@ -2047,7 +2036,7 @@
/**
* Is string "on" or "off"
*
- * @param string string to check
+ * @param arg string to check
*
* @return true if string is "on", false if string is "off"
*
@@ -2792,7 +2781,7 @@
* Localize a message given a particular AppUI
*
* @param msgProp message key
- * @param localAppUI AppUI to use to localize message
+ * @param localLangUtil LocalizedResource to use to localize message
* @param args arguments to message
*
*/
@@ -3322,7 +3311,7 @@
/**
* Add To Session Table - for use by ClientThread, add a new Session to the sessionTable.
*
- * @param num Connection number to register
+ * @param i Connection number to register
* @param s Session to add to the sessionTable
*/
protected void addToSessionTable(Integer i, Session s)
Modified: incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DDMReader.java
Url: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DDMReader.java?view=diff&rev=126257&p1=incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DDMReader.java&r1=126256&p2=incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DDMReader.java&r2=126257
==============================================================================
--- incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DDMReader.java (original)
+++ incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DDMReader.java Sun Jan 23 19:24:27 2005
@@ -1071,10 +1071,10 @@
/**
* Convert a range of packed nybbles (up to 9 digits without overflow) to an int.
* Note that for performance purpose, it does not do array-out-of-bound checking.
- * @param buffer to read from
- * @param offset in the buffer
- * @param start nybble
- * @param number of nybbles
+ * @param buffer buffer to read from
+ * @param offset offset in the buffer
+ * @param startNybble start nybble
+ * @param numberOfNybbles number of nybbles
* @return an int value
*/
private int packedNybblesToInt (byte[] buffer,
@@ -1108,10 +1108,10 @@
/**
* Convert a range of packed nybbles (up to 18 digits without overflow) to a long.
* Note that for performance purpose, it does not do array-out-of-bound checking.
- * @param buffer to read from
- * @param offset in the buffer
- * @param start nybble
- * @param number of nybbles
+ * @param buffer buffer to read from
+ * @param offset offset in the buffer
+ * @param startNybble start nybble
+ * @param numberOfNybbles number of nybbles
* @return an long value
*/
private long packedNybblesToLong (byte[] buffer,
@@ -1184,7 +1184,7 @@
/**
* Read encrypted string
* @param decryptM decryption manager
- * @param security mechanism
+ * @param securityMechanism security mechanism
* @param initVector initialization vector for cipher
* @param sourcePublicKey public key (as in Deffie-Hellman algorithm)
* from source (encryptor)
Modified: incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DDMWriter.java
Url: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DDMWriter.java?view=diff&rev=126257&p1=incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DDMWriter.java&r1=126256&p2=incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DDMWriter.java&r2=126257
==============================================================================
--- incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DDMWriter.java (original)
+++ incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DDMWriter.java Sun Jan 23 19:24:27 2005
@@ -888,7 +888,6 @@
*
* @param codePoint - code point to write
* @param dataLength - length of object data
- * @param length - number of bytes to write
*/
protected void writeScalarHeader (int codePoint, int dataLength)
{
@@ -1123,7 +1122,7 @@
*
* @param v value to write
* @param precision Precison of decimal or numeric type
- * @param declared scale
+ * @param scale declared scale
* @exception SQLException thrown if number of digits > 31
*/
protected void writeBigDecimal (java.math.BigDecimal v, int precision, int scale)
Modified: incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAConnThread.java
Url: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAConnThread.java?view=diff&rev=126257&p1=incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAConnThread.java&r1=126256&p2=incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAConnThread.java&r2=126257
==============================================================================
--- incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAConnThread.java (original)
+++ incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAConnThread.java Sun Jan 23 19:24:27 2005
@@ -901,7 +901,7 @@
* a set of chained commands or received separately. The chaining was originally
* defined as a way to save network costs.
*
- * @param the SQLException raised
+ * @param e the SQLException raised
* @exception DRDAProtocolException
*/
private void errorInChain(SQLException e) throws DRDAProtocolException
@@ -2364,7 +2364,7 @@
* Write ENDQRYRM - query process has terminated in such a manner that the
* query or result set is now closed. It cannot be resumed with the CNTQRY
* command or closed with the CLSQRY command
- * @param srvCod Severity code - WARNING or ERROR
+ * @param svrCod Severity code - WARNING or ERROR
* @exception DRDAProtocolException
*/
private void writeENDQRYRM(int svrCod) throws DRDAProtocolException
@@ -3612,7 +3612,7 @@
* the values sent in the ACCRDB are used.
* Objects may follow in one DSS or in several DSS chained together.
*
- * @param the DRDAStatement to execute
+ * @param stmt the DRDAStatement to execute
* @exception DRDAProtocolException, SQLException
*/
private void parseEXCSQLSTTobjects(DRDAStatement stmt) throws DRDAProtocolException, SQLException
@@ -3753,7 +3753,7 @@
/**
* Parse SQLDTA - SQL program variable data
* and handle exception.
- * @see parseSQLDTA_work
+ * @see #parseSQLDTA_work
*/
private void parseSQLDTA(DRDAStatement stmt) throws DRDAProtocolException,SQLException
@@ -4139,7 +4139,7 @@
/**
* Read different types of input parameters and set them in PreparedStatement
* @param i index of the parameter
- * @param ps associated ps
+ * @param stmt associated ps
* @param drdaType drda type of the parameter
*
* @exception DRDAProtocolException, SQLException
@@ -5184,8 +5184,8 @@
* SQLRDBNAME; DRDA TYPE VCS; ENVLID 0x32; Length Override 255
* SQLERRMSG_m; DRDA TYPE VCM; ENVLID 0x3E; Length Override 70
* SQLERRMSG_s; DRDA TYPE VCS; ENVLID 0x32; Length Override 70
- * @param e SQLException encountered
- * @param sqlcode sqlcode
+ * @param nextException SQLException encountered
+ * @param sqlerrmc sqlcode
*
* @exception DRDAProtocolException
*/
@@ -5432,7 +5432,7 @@
* SQLDHROW; ROW LID 0xE0; ELEMENT TAKEN 0(all); REP FACTOR 1
* SQLNUMROW; ROW LID 0x68; ELEMENT TAKEN 0(all); REP FACTOR 1
*
- * @param ps prepared statement
+ * @param stmt prepared statement
*
* @exception DRDAProtocolException, SQLException
*/
@@ -5472,7 +5472,7 @@
/**
* Write QRYDSC - Query Answer Set Description
*
- * @param stmt associated statement
+ * @param stmt DRDAStatement we are working on
* @param FDODSConly simply the FDODSC, without the wrap
*
* Instance Variables
@@ -5482,7 +5482,7 @@
* they must be sent in subsequent QRYDSC.
* If the QRYDSC will not fit into the current block, as many columns as can
* fit are sent and then the remaining are sent in the following blocks.
- * @param stmt DRDAStatement we are working on
+ *
* @exception DRDAProtocolException, SQLException
*/
private void writeQRYDSC(DRDAStatement stmt, boolean FDODSConly)
@@ -6712,7 +6712,7 @@
/**
* Database name given under code point doesn't match previous database names
*
- * @param codepoint codepoint where the mismatch occurred
+ * @param codePoint codepoint where the mismatch occurred
*
* @exception DRDAProtocolException
*/
Modified: incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAResultSet.java
Url: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAResultSet.java?view=diff&rev=126257&p1=incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAResultSet.java&r1=126256&p2=incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAResultSet.java&r2=126257
==============================================================================
--- incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAResultSet.java (original)
+++ incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAResultSet.java Sun Jan 23 19:24:27 2005
@@ -150,7 +150,7 @@
/**
* Set ResultSet DRDA DataTypes
- * @param drddaTypes for columns.
+ * @param value drdaTypes for columns.
**/
protected void setRsDRDATypes(int [] value)
{
Modified: incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAStatement.java
Url: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAStatement.java?view=diff&rev=126257&p1=incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAStatement.java&r1=126256&p2=incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAStatement.java&r2=126257
==============================================================================
--- incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAStatement.java (original)
+++ incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAStatement.java Sun Jan 23 19:24:27 2005
@@ -531,7 +531,7 @@
* resultSet and then calling getResultSet() or the other access
* methods to get resultset data.
*
- * @ return true if the execution has resultSets
+ * @return true if the execution has resultSets
*/
protected boolean execute() throws SQLException
{
@@ -691,7 +691,7 @@
* Just get the resultset. Don't set it to current
* Assumes resultSet rsnum exists.
*
- * @param rsnum - resultSetNumber starting with 0
+ * @param rsNum resultSetNumber starting with 0
* @return The result set in the order it was retrieved
*
* with getMoreResults()
@@ -738,7 +738,7 @@
/**
* Set currentDrdaResultSet
*
- * @String pkgnamcsn The pkgid section number and unique resultset
+ * @param pkgnamcsn The pkgid section number and unique resultset
* consistency token
*
*/
@@ -866,7 +866,7 @@
/**
* Set ResultSet DRDA DataTypes
- * @param drddaTypes for columns.
+ * @param value drdaTypes for columns.
**/
protected void setRsDRDATypes(int [] value)
{
@@ -886,7 +886,7 @@
/**
* Set ResultSet DRDA DataTypes Lengths
- * @param drddaTypes for columns.
+ * @param value drdaTypes for columns.
**/
protected void setRsLens(int [] value)
{
@@ -1182,7 +1182,7 @@
/**
* set resultset column data length
* @param index starting with 1
- * @value length
+ * @param value length
*/
protected void setRsLen(int index, int value)
{
@@ -1483,7 +1483,7 @@
* BrokeredConnection prepareStatement() method.
* @param sqlStmt - SQL statement text
* @param scrollType - scroll type
- * @param concurtype - concurrency type
+ * @param concurType - concurrency type
* @param withHoldCursor - holdability
*
* @throws SQLException
@@ -1550,7 +1550,7 @@
* @param current - flag to pass to Statement.getMoreResults(current)
* @return true if there are more results.
* @throws SQLException
- * @see java.sql.Statemen#getMoreResults
+ * @see java.sql.Statement#getMoreResults
*
*/
protected boolean getMoreResults(int current) throws SQLException
Modified: incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAXAProtocol.java
Url: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAXAProtocol.java?view=diff&rev=126257&p1=incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAXAProtocol.java&r1=126256&p2=incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAXAProtocol.java&r2=126257
==============================================================================
--- incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAXAProtocol.java (original)
+++ incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAXAProtocol.java Sun Jan 23 19:24:27 2005
@@ -594,8 +594,8 @@
/**
* printable xaflags
- * @param - xaflags
- * @return - printable xaflags for debug output
+ * @param xaflags
+ * @return printable xaflags for debug output
*/
private String xaflagsToString(int xaflags)
{
Modified: incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/Database.java
Url: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/Database.java?view=diff&rev=126257&p1=incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/Database.java&r1=126256&p2=incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/Database.java&r2=126257
==============================================================================
--- incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/Database.java (original)
+++ incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/Database.java Sun Jan 23 19:24:27 2005
@@ -368,7 +368,7 @@
/**
* Set the internal isolation level to use for preparing statements.
* Subsequent prepares will use this isoalation level
- * @param internal isolation level
+ * @param level internal isolation level
*
* @throws SQLException
* @see EmbedConnection#setPrepareIsolation
Modified: incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DecryptionManager.java
Url: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DecryptionManager.java?view=diff&rev=126257&p1=incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DecryptionManager.java&r1=126256&p2=incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DecryptionManager.java&r2=126257
==============================================================================
--- incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DecryptionManager.java (original)
+++ incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DecryptionManager.java Sun Jan 23 19:24:27 2005
@@ -196,8 +196,8 @@
* EUSRIDPWD - The middle 8 bytes of the server's connection key is used as
* the token. Decryption needs to use exactly the same token as encryption.
*
- * @param int securityMechanism
- * @param byte[] userid or server(this side)'s connection key
+ * @param securityMechanism security mechanism
+ * @param initVector userid or server(this side)'s connection key
* @return byte[] the decryption token
*/
private byte[] calculateDecryptionToken (int securityMechanism, byte[] initVector)
@@ -234,7 +234,7 @@
* decrypted data in a byte array.
*
* @param cipherText The byte array form userid/password to decrypt.
- * @param security mechanism
+ * @param securityMechanism security mechanism
* @param initVector The byte array which is used to calculate the
* decryption token for initializing the cipher
* @param sourcePublicKey application requester (encrypter)'s public key.
Modified: incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/XADatabase.java
Url: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/XADatabase.java?view=diff&rev=126257&p1=incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/XADatabase.java&r1=126256&p2=incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/XADatabase.java&r2=126257
==============================================================================
--- incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/XADatabase.java (original)
+++ incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/XADatabase.java Sun Jan 23 19:24:27 2005
@@ -92,7 +92,7 @@
}
/** Set DRDA id for this connection
- * @param drdaId
+ * @param drdaID
*/
protected void setDrdaID(String drdaID)
{
Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbeddedConnectionPoolDataSource.java
Url: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbeddedConnectionPoolDataSource.java?view=diff&rev=126257&p1=incubator/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbeddedConnectionPoolDataSource.java&r1=126256&p2=incubator/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbeddedConnectionPoolDataSource.java&r2=126257
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbeddedConnectionPoolDataSource.java (original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbeddedConnectionPoolDataSource.java Sun Jan 23 19:24:27 2005
@@ -77,7 +77,7 @@
/**
Attempt to establish a database connection.
- @param user the database user on whose behalf the Connection is being made
+ @param username the database user on whose behalf the Connection is being made
@param password the user's password
@return a Connection to the database
Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbeddedDataSource.java
Url: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbeddedDataSource.java?view=diff&rev=126257&p1=incubator/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbeddedDataSource.java&r1=126256&p2=incubator/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbeddedDataSource.java&r2=126257
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbeddedDataSource.java (original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbeddedDataSource.java Sun Jan 23 19:24:27 2005
@@ -418,7 +418,7 @@
connection attributes with the same format as the connectionAttributes property.
*
- * @param user the database user on whose behalf the Connection is
+ * @param username the database user on whose behalf the Connection is
* being made
* @param password the user's password
* @return a Connection to the database
Modified: incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/util.java
Url: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/util.java?view=diff&rev=126257&p1=incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/util.java&r1=126256&p2=incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/util.java&r2=126257
==============================================================================
--- incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/util.java (original)
+++ incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/util.java Sun Jan 23 19:24:27 2005
@@ -195,7 +195,7 @@
resourceName is not absolute (does not begin with a "/") this qualifies
the name with the "ij.defaultResourcePackage" name.
- @param String the name of the resource
+ @param resourceName the name of the resource
@return a buffered stream for the resource if it exists and null otherwise.
*/
static public InputStream getResourceAsStream(String resourceName)
@@ -662,9 +662,9 @@
* remaining characters on the line become part of the associated
* element string."
*
- * @param iStr: An input stream from which the new properties are to be
+ * @param iStr An input stream from which the new properties are to be
* loaded (should already be initialized).
- * @param prop: A set of properties to which the properties from
+ * @param prop A set of properties to which the properties from
* iStr will be added (should already be initialized).
* @return A final properties set consisting of 'prop' plus all
* properties loaded from 'iStr' (with the extra whitespace (if any)
@@ -745,7 +745,7 @@
* frameworks. So, ulitmately this function will look at the driver
* rather than the framework.
*
- * @ return true if the framework contains Net or JCC.
+ * @return true if the framework contains Net or JCC.
*/
private static boolean isNetFramework()
{
Modified: incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/utilMain14.java
Url: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/utilMain14.java?view=diff&rev=126257&p1=incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/utilMain14.java&r1=126256&p2=incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/utilMain14.java&r2=126257
==============================================================================
--- incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/utilMain14.java (original)
+++ incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/utilMain14.java Sun Jan 23 19:24:27 2005
@@ -44,7 +44,6 @@
*
* @param numConnections The number of connections/users to test.
*
- * @return Nothing.
*/
public utilMain14(int numConnections, LocalizedOutput out)
throws ijFatalException
@@ -64,7 +63,6 @@
* thrown. ignoreErrors is used for stress
* tests.
*
- * @return Nothing.
*/
public utilMain14(int numConnections, LocalizedOutput out, Hashtable ignoreErrors)
throws ijFatalException
Modified: incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/sysinfo/Main.java
Url: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/sysinfo/Main.java?view=diff&rev=126257&p1=incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/sysinfo/Main.java&r1=126256&p2=incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/sysinfo/Main.java&r2=126257
==============================================================================
--- incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/sysinfo/Main.java (original)
+++ incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/sysinfo/Main.java Sun Jan 23 19:24:27 2005
@@ -181,7 +181,7 @@
/**
prints out the jbms info to the specified AppStreamWriter.
- @param aw the AppStreamWriter to use. If null, System.out is
+ @param localAW the AppStreamWriter to use. If null, System.out is
used
*/
@@ -222,7 +222,7 @@
Writes out the relevant info about the Java environment to
the specified AppStreamWriter.
- @param aw The AppStreamWriter to write info out to. If this is
+ @param localAW The AppStreamWriter to write info out to. If this is
null, the info is written to System.out
*/
@@ -325,7 +325,7 @@
Writes out information about the locales with the
product.
- @param aw the AppStreamWriter to which the info is written. If this
+ @param localAW the AppStreamWriter to which the info is written. If this
value is null, the info is written to System.out
*/