Changeset: c8d5e6853f0c for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c8d5e6853f0c
Modified Files:
java/example/MJDBCTest.java
java/example/PreparedExample.java
java/example/SQLImport.java
java/example/SQLcopyinto.java
java/src/main/java/nl/cwi/monetdb/client/JMonetDB.java
java/src/main/java/nl/cwi/monetdb/client/JdbcClient.java
java/src/main/java/nl/cwi/monetdb/jdbc/MonetBlob.java
java/src/main/java/nl/cwi/monetdb/jdbc/MonetClob.java
java/src/main/java/nl/cwi/monetdb/jdbc/MonetConnection.java
java/src/main/java/nl/cwi/monetdb/jdbc/MonetDataSource.java
java/src/main/java/nl/cwi/monetdb/jdbc/MonetDatabaseMetaData.java
java/src/main/java/nl/cwi/monetdb/jdbc/MonetDriver.java.in
java/src/main/java/nl/cwi/monetdb/jdbc/MonetPreparedStatement.java
java/src/main/java/nl/cwi/monetdb/jdbc/MonetResultSet.java
java/src/main/java/nl/cwi/monetdb/jdbc/MonetSavepoint.java
java/src/main/java/nl/cwi/monetdb/jdbc/MonetStatement.java
java/src/main/java/nl/cwi/monetdb/jdbc/MonetWrapper.java
java/src/main/java/nl/cwi/monetdb/mcl/io/BufferedMCLReader.java
java/src/main/java/nl/cwi/monetdb/mcl/io/BufferedMCLWriter.java
java/src/main/java/nl/cwi/monetdb/mcl/net/MapiSocket.java
java/src/main/java/nl/cwi/monetdb/mcl/parser/MCLParser.java
java/src/main/java/nl/cwi/monetdb/mcl/parser/StartOfHeaderParser.java
java/src/main/java/nl/cwi/monetdb/merovingian/Control.java
java/src/main/java/nl/cwi/monetdb/merovingian/MerovingianException.java
Branch: Jul2015
Log Message:
Remove some javadoc warnings
diffs (truncated from 522 to 300 lines):
diff --git a/java/example/MJDBCTest.java b/java/example/MJDBCTest.java
--- a/java/example/MJDBCTest.java
+++ b/java/example/MJDBCTest.java
@@ -13,7 +13,7 @@ import java.sql.*;
* On these tables some queries are executed and the JDBC driver is tested
* on it's accuracy and robustness against 'users'.
*
- * @author Fabian Groffen <fabian.grof...@cwi.nl>
+ * @author Fabian Groffen
*/
public class MJDBCTest {
public static void main(String[] args) throws Exception {
diff --git a/java/example/PreparedExample.java
b/java/example/PreparedExample.java
--- a/java/example/PreparedExample.java
+++ b/java/example/PreparedExample.java
@@ -11,7 +11,7 @@ import java.sql.*;
/**
* This example shows the use of the PreparedStatement
*
- * @author Fabian Groffen <fabian.grof...@cwi.nl>
+ * @author Fabian Groffen
*/
public class PreparedExample {
public static void main(String[] args) throws Exception {
diff --git a/java/example/SQLImport.java b/java/example/SQLImport.java
--- a/java/example/SQLImport.java
+++ b/java/example/SQLImport.java
@@ -24,7 +24,7 @@ import java.io.*;
* JDBC driver and Mserver is reported. The log file is put in the current
* working directory and names like monet_[unix timestamp].log
*
- * @author Fabian Groffen <fabian.grof...@cwi.nl>
+ * @author Fabian Groffen
*/
public class SQLImport {
diff --git a/java/example/SQLcopyinto.java b/java/example/SQLcopyinto.java
--- a/java/example/SQLcopyinto.java
+++ b/java/example/SQLcopyinto.java
@@ -17,7 +17,7 @@ import nl.cwi.monetdb.mcl.io.*;
* in performing COPY INTO sequences. This is mainly meant to show how
* a quick load can be performed from Java.
*
- * @author Fabian Groffen <fabian.grof...@cwi.nl>
+ * @author Fabian Groffen
*/
public class SQLcopyinto {
diff --git a/java/src/main/java/nl/cwi/monetdb/client/JMonetDB.java
b/java/src/main/java/nl/cwi/monetdb/client/JMonetDB.java
--- a/java/src/main/java/nl/cwi/monetdb/client/JMonetDB.java
+++ b/java/src/main/java/nl/cwi/monetdb/client/JMonetDB.java
@@ -17,7 +17,7 @@ import java.util.*;
* This program mimics the monetdb tool. It is meant as demonstration
* and test of the MeroControl library.
*
- * @author Fabian Groffen <fabian.grof...@cwi.nl>
+ * @author Fabian Groffen
* @version 1.0
*/
diff --git a/java/src/main/java/nl/cwi/monetdb/client/JdbcClient.java
b/java/src/main/java/nl/cwi/monetdb/client/JdbcClient.java
--- a/java/src/main/java/nl/cwi/monetdb/client/JdbcClient.java
+++ b/java/src/main/java/nl/cwi/monetdb/client/JdbcClient.java
@@ -22,7 +22,7 @@ import java.net.*;
* it demonstrates the power of the JDBC interface since it built on top
* of JDBC only.
*
- * @author Fabian Groffen <fabian.grof...@cwi.nl>
+ * @author Fabian Groffen
* @version 1.2
*/
diff --git a/java/src/main/java/nl/cwi/monetdb/jdbc/MonetBlob.java
b/java/src/main/java/nl/cwi/monetdb/jdbc/MonetBlob.java
--- a/java/src/main/java/nl/cwi/monetdb/jdbc/MonetBlob.java
+++ b/java/src/main/java/nl/cwi/monetdb/jdbc/MonetBlob.java
@@ -20,7 +20,7 @@ import java.io.*;
* that it is a real resource expensive workaround that contradicts the
* benefits for a Blob: avoidance of huge resource consumption.
*
- * @author Fabian Groffen <fabian.grof...@cwi.nl>
+ * @author Fabian Groffen
*/
public class MonetBlob implements Blob {
private byte[] buf;
diff --git a/java/src/main/java/nl/cwi/monetdb/jdbc/MonetClob.java
b/java/src/main/java/nl/cwi/monetdb/jdbc/MonetClob.java
--- a/java/src/main/java/nl/cwi/monetdb/jdbc/MonetClob.java
+++ b/java/src/main/java/nl/cwi/monetdb/jdbc/MonetClob.java
@@ -20,7 +20,7 @@ import java.io.*;
* sole reason for a Clob: avoidance of huge resource consumption.
* <b>Use of this class is highly discouraged.</b>
*
- * @author Fabian Groffen <fabian.grof...@cwi.nl>
+ * @author Fabian Groffen
*/
public class MonetClob implements Clob {
diff --git a/java/src/main/java/nl/cwi/monetdb/jdbc/MonetConnection.java
b/java/src/main/java/nl/cwi/monetdb/jdbc/MonetConnection.java
--- a/java/src/main/java/nl/cwi/monetdb/jdbc/MonetConnection.java
+++ b/java/src/main/java/nl/cwi/monetdb/jdbc/MonetConnection.java
@@ -62,7 +62,8 @@ import nl.cwi.monetdb.mcl.parser.StartOf
* A Connection object's database should able to provide information
* describing its tables, its supported SQL grammar, its stored
* procedures, the capabilities of this connection, and so on. This
- * information is obtained with the getMetaData method.<br />
+ * information is obtained with the getMetaData method.
+ *
* Note: By default a Connection object is in auto-commit mode, which
* means that it automatically commits changes after executing each
* statement. If auto-commit mode has been disabled, the method commit
@@ -70,9 +71,9 @@ import nl.cwi.monetdb.mcl.parser.StartOf
* database changes will not be saved.
*
* The current state of this connection is that it nearly implements the
- * whole Connection interface.<br />
+ * whole Connection interface.
*
- * @author Fabian Groffen <fabian.grof...@cwi.nl>
+ * @author Fabian Groffen
* @version 1.2
*/
public class MonetConnection extends MonetWrapper implements Connection {
@@ -638,7 +639,6 @@ public class MonetConnection extends Mon
* @return the holdability, one of
* ResultSet.HOLD_CURSORS_OVER_COMMIT or
* ResultSet.CLOSE_CURSORS_AT_COMMIT
- * @throws SQLException is a database access error occors
*/
public int getHoldability() {
// TODO: perhaps it is better to have the server implement
@@ -1112,7 +1112,7 @@ public class MonetConnection extends Mon
/**
* Not implemented by MonetDB's JDBC driver.
*
- * @param properties the list of client info properties to set
+ * @param props The list of client info properties to set
*/
public void setClientInfo(Properties props) {
for (Entry<Object, Object> entry : props.entrySet()) {
@@ -1327,13 +1327,11 @@ public class MonetConnection extends Mon
*
* @param executor The Executor implementation which will be used by
* setNetworkTimeout
- * @param milliseconds The time in milliseconds to wait for the
+ * @param millis The time in milliseconds to wait for the
* database operation to complete
* @throws SQLException if a database access error occurs, this
* method is called on a closed connection, the executor is
* null, or the value specified for seconds is less than 0.
- * @throws SQLException if a database access error occurs or
- * this method is called on a closed Connection
*/
public void setNetworkTimeout(Executor executor, int millis)
throws SQLException
diff --git a/java/src/main/java/nl/cwi/monetdb/jdbc/MonetDataSource.java
b/java/src/main/java/nl/cwi/monetdb/jdbc/MonetDataSource.java
--- a/java/src/main/java/nl/cwi/monetdb/jdbc/MonetDataSource.java
+++ b/java/src/main/java/nl/cwi/monetdb/jdbc/MonetDataSource.java
@@ -25,7 +25,7 @@ import java.util.logging.Logger;
*
* Additionally, pooled connections can be used when using a DataSource.
*
- * @author Fabian Groffen <fabian.grof...@cwi.nl>
+ * @author Fabian Groffen
* @version 0.1
*/
public class MonetDataSource extends MonetWrapper implements DataSource {
diff --git a/java/src/main/java/nl/cwi/monetdb/jdbc/MonetDatabaseMetaData.java
b/java/src/main/java/nl/cwi/monetdb/jdbc/MonetDatabaseMetaData.java
--- a/java/src/main/java/nl/cwi/monetdb/jdbc/MonetDatabaseMetaData.java
+++ b/java/src/main/java/nl/cwi/monetdb/jdbc/MonetDatabaseMetaData.java
@@ -15,7 +15,7 @@ import java.util.*;
* A DatabaseMetaData object suitable for the MonetDB database.
*
*
- * @author Fabian Groffen <fabian.grof...@cwi.nl>
+ * @author Fabian Groffen
* @version 0.5
*/
public class MonetDatabaseMetaData extends MonetWrapper implements
DatabaseMetaData {
@@ -508,7 +508,6 @@ public class MonetDatabaseMetaData exten
* Is "ALTER TABLE" with a drop column supported?
*
* @return true if so
- * @exception SQLException if a database access error occurs
*/
public boolean supportsAlterTableWithDropColumn() {
return true;
@@ -530,7 +529,6 @@ public class MonetDatabaseMetaData exten
* should return a column named as C_COUNT instead of count(C)
*
* @return true if so
- * @throws SQLException if a database access error occurs
*/
public boolean supportsColumnAliasing() {
return true;
@@ -541,7 +539,6 @@ public class MonetDatabaseMetaData exten
* JDBC Compliant driver always returns true
*
* @return true if so
- * @throws SQLException if a database access error occurs
*/
public boolean nullPlusNonNullIsNull() {
return true;
@@ -578,7 +575,7 @@ public class MonetDatabaseMetaData exten
/**
* Are expressions in "ORDER BY" lists supported?
*
- * <br>e.g. select * from t order by a + b;
+ * e.g. select * from t order by a + b;
*
* MonetDB does not support this (yet?)
*
@@ -602,7 +599,6 @@ public class MonetDatabaseMetaData exten
* Is some form of "GROUP BY" clause supported?
*
* @return true since MonetDB supports it
- * @exception SQLException if a database access error occurs
*/
public boolean supportsGroupBy() {
return true;
@@ -612,7 +608,6 @@ public class MonetDatabaseMetaData exten
* Can a "GROUP BY" clause use columns not in the SELECT?
*
* @return true since that also is supported
- * @exception SQLException if a database access error occurs
*/
public boolean supportsGroupByUnrelated() {
return true;
@@ -656,7 +651,6 @@ public class MonetDatabaseMetaData exten
* This is the main idea behind the Connection, is it?
*
* @return true if so
- * @exception SQLException if a database access error occurs
*/
public boolean supportsMultipleTransactions() {
return true;
@@ -733,7 +727,6 @@ public class MonetDatabaseMetaData exten
* Would be good if it was like that
*
* @return true if so
- * @exception SQLException if a database access error occurs
*/
public boolean supportsANSI92FullSQL() {
return false;
@@ -753,7 +746,6 @@ public class MonetDatabaseMetaData exten
* Is some form of outer join supported?
*
* @return true if so
- * @exception SQLException if a database access error occurs
*/
public boolean supportsOuterJoins(){
return true;
@@ -763,7 +755,6 @@ public class MonetDatabaseMetaData exten
* Are full nexted outer joins supported?
*
* @return true if so
- * @exception SQLException if a database access error occurs
*/
public boolean supportsFullOuterJoins() {
return true;
@@ -773,7 +764,6 @@ public class MonetDatabaseMetaData exten
* Is there limited support for outer joins?
*
* @return true if so
- * @exception SQLException if a database access error occurs
*/
public boolean supportsLimitedOuterJoins() {
return false;
@@ -1293,7 +1283,6 @@ public class MonetDatabaseMetaData exten
* What is the maximum length of a user name
*
* @return the max name length in bytes
- * @exception SQLException if a database access error occurs
*/
public int getMaxUserNameLength() {
return 512;
@@ -1368,7 +1357,7 @@ public class MonetDatabaseMetaData exten
* CREATE TABLE X (A INT);
* SELECT A FROM T INTO X;
* COMMIT;
- * </pre><p>
+ * </pre></p>
*
* does the CREATE TABLE call cause a commit? The answer is no.
*
@@ -1382,7 +1371,6 @@ public class MonetDatabaseMetaData exten
* Is a data definition statement within a transaction ignored?
*
* @return true if so
- * @exception SQLException if a database access error occurs
*/
public boolean dataDefinitionIgnoredInTransactions() {
return false;
@@ -1477,8 +1465,8 @@ public class MonetDatabaseMetaData exten
* <li>procedureNullableUnknown - nullability unknown
* <li><b>REMARKS</b> String => comment describing parameter/column
* </ol>
- * @param catalog
- * @param schemaPattern
+ * @param catalog not used
+ * @param schemaPattern not used
* @param procedureNamePattern a procedure name pattern
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
