Changeset: 9aef2f4be678 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9aef2f4be678
Modified Files:
java/src/main/java/nl/cwi/monetdb/jdbc/MonetBlob.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/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/net/MapiSocket.java
java/src/main/java/nl/cwi/monetdb/mcl/parser/MCLParser.java
java/src/main/java/nl/cwi/monetdb/merovingian/Control.java
java/src/main/java/nl/cwi/monetdb/merovingian/MerovingianException.java
java/src/main/java/nl/cwi/monetdb/merovingian/SabaothDB.java
Branch: Jul2015
Log Message:
Replace <br> in javadoc with newlines
diffs (truncated from 1038 to 300 lines):
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
@@ -43,7 +43,7 @@ public class MonetBlob implements Blob {
/**
* This method frees the Blob object and releases the resources that
* it holds. The object is invalid once the free method is called.
- * <br /><br />
+ *
* After free has been called, any attempt to invoke a method other
* than free will result in a SQLException being thrown. If free is
* called multiple times, the subsequent calls to free are treated
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
@@ -53,12 +53,12 @@ import nl.cwi.monetdb.mcl.parser.StartOf
/**
* A {@link Connection} suitable for the MonetDB database.
- * <br /><br />
+ *
* This connection represents a connection (session) to a MonetDB
* database. SQL statements are executed and results are returned within
* the context of a connection. This Connection object holds a physical
* connection to the MonetDB database.
- * <br /><br />
+ *
* 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
@@ -68,7 +68,7 @@ import nl.cwi.monetdb.mcl.parser.StartOf
* statement. If auto-commit mode has been disabled, the method commit
* must be called explicitly in order to commit changes; otherwise,
* database changes will not be saved.
- * <br /><br />
+ *
* The current state of this connection is that it nearly implements the
* whole Connection interface.<br />
*
@@ -312,7 +312,7 @@ public class MonetConnection extends Mon
* immediately instead of waiting for them to be automatically
* released. All Statements created from this Connection will be
* closed when this method is called.
- * <br /><br />
+ *
* Calling the method close on a Connection object that is already
* closed is a no-op.
*/
@@ -368,12 +368,12 @@ public class MonetConnection extends Mon
/**
* Factory method for creating Array objects.
- * <br /><br />
+ *
* Note: When createArrayOf is used to create an array object that
* maps to a primitive data type, then it is implementation-defined
* whether the Array object is an array of that primitive data type
* or an array of Object.
- * <br /><br />
+ *
* Note: The JDBC driver is responsible for mapping the elements
* Object array to the default JDBC SQL type defined in
* java.sql.Types for the given class of Object. The default mapping
@@ -409,7 +409,7 @@ public class MonetConnection extends Mon
* executed using Statement objects. If the same SQL statement is
* executed many times, it may be more efficient to use a
* PreparedStatement object.
- * <br /><br />
+ *
* Result sets created using the returned Statement object will by
* default be type TYPE_FORWARD_ONLY and have a concurrency level of
* CONCUR_READ_ONLY.
@@ -692,10 +692,10 @@ public class MonetConnection extends Mon
* will be chained to the first one and can be retrieved by calling
* the method SQLWarning.getNextWarning on the warning that was
* retrieved previously.
- * <br /><br />
+ *
* This method may not be called on a closed connection; doing so
* will cause an SQLException to be thrown.
- * <br /><br />
+ *
* Note: Subsequent warnings will be chained to this SQLWarning.
*
* @return the first SQLWarning object or null if there are none
@@ -717,7 +717,7 @@ public class MonetConnection extends Mon
* if certain fatal errors have occurred. This method is guaranteed
* to return true only when it is called after the method
* Connection.close has been called.
- * <br /><br />
+ *
* This method generally cannot be called to determine whether a
* connection to a database is valid or invalid. A typical client
* can determine that a connection is invalid by catching any
@@ -747,7 +747,7 @@ public class MonetConnection extends Mon
* valid. The driver shall submit a query on the connection or use
* some other mechanism that positively verifies the connection is
* still valid when this method is called.
- * <br /><br />
+ *
* The query submitted by the driver to validate the connection
* shall be executed in the context of the current transaction.
*
@@ -786,11 +786,11 @@ public class MonetConnection extends Mon
/**
* Creates a PreparedStatement object for sending parameterized SQL
* statements to the database.
- * <br /><br />
+ *
* A SQL statement with or without IN parameters can be pre-compiled
* and stored in a PreparedStatement object. This object can then be
* used to efficiently execute this statement multiple times.
- * <br /><br />
+ *
* Note: This method is optimized for handling parametric SQL
* statements that benefit from precompilation. If the driver
* supports precompilation, the method prepareStatement will send
@@ -799,7 +799,7 @@ public class MonetConnection extends Mon
* not be sent to the database until the PreparedStatement object is
* executed. This has no direct effect on users; however, it does
* affect which methods throw certain SQLException objects.
- * <br /><br />
+ *
* Result sets created using the returned PreparedStatement object
* will by default be type TYPE_FORWARD_ONLY and have a concurrency
* level of CONCUR_READ_ONLY.
@@ -856,7 +856,7 @@ public class MonetConnection extends Mon
/**
* Creates a PreparedStatement object that will generate ResultSet
* objects with the given type, concurrency, and holdability.
- * <br /><br />
+ *
* This method is the same as the prepareStatement method above, but
* it allows the default result set type, concurrency, and
* holdability to be overridden.
@@ -910,7 +910,7 @@ public class MonetConnection extends Mon
* tells the driver whether it should make auto-generated keys
* available for retrieval. This parameter is ignored if the SQL
* statement is not an INSERT statement.
- * <br /><br />
+ *
* Note: This method is optimized for handling parametric SQL
* statements that benefit from precompilation. If the driver
* supports precompilation, the method prepareStatement will send
@@ -919,7 +919,7 @@ public class MonetConnection extends Mon
* not be sent to the database until the PreparedStatement object is
* executed. This has no direct effect on users; however, it does
* affect which methods throw certain SQLExceptions.
- * <br /><br />
+ *
* Result sets created using the returned PreparedStatement object
* will by default be type TYPE_FORWARD_ONLY and have a concurrency
* level of CONCUR_READ_ONLY.
@@ -1023,7 +1023,7 @@ public class MonetConnection extends Mon
/**
* Undoes all changes made after the given Savepoint object was set.
- * <br /><br />
+ *
* This method should be used only when auto-commit has been
* disabled.
*
@@ -1064,7 +1064,7 @@ public class MonetConnection extends Mon
* are terminated by a call to either the method commit or the
* method rollback. By default, new connections are in auto-commit
* mode.
- * <br /><br />
+ *
* The commit occurs when the statement completes or the next
* execute occurs, whichever comes first. In the case of statements
* returning a ResultSet object, the statement completes when the
@@ -1073,7 +1073,7 @@ public class MonetConnection extends Mon
* statement may return multiple results as well as output parameter
* values. In these cases, the commit occurs when all results and
* output parameter values have been retrieved.
- * <br /><br />
+ *
* NOTE: If this method is called during a transaction, the
* transaction is committed.
*
@@ -1947,7 +1947,7 @@ public class MonetConnection extends Mon
* by brackets ("[" and "]"). A DataBlockResponse object holds the
* raw data as read from the server, in a parsed manner, ready for
* easy retrieval.
- * <br /><br />
+ *
* This object is not intended to be queried by multiple threads
* synchronously. It is designed to work for one thread retrieving
* rows from it. When multiple threads will retrieve rows from this
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
@@ -16,13 +16,13 @@ import java.util.logging.Logger;
/**
* A DataSource suitable for the MonetDB database.
- * <br /><br />
+ *
* This DataSource allows retrieval of a Connection using the JNDI bean like
* framework. A DataSource has numerous advantages over using the
DriverManager
* to retrieve a Connection object. Using the DataSource interface enables a
* more transparent application where the location or database can be changed
* without changing any application code.
- * <br /><br />
+ *
* Additionally, pooled connections can be used when using a DataSource.
*
* @author Fabian Groffen <fabian.grof...@cwi.nl>
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
@@ -13,7 +13,7 @@ import java.util.*;
/**
* A DatabaseMetaData object suitable for the MonetDB database.
- * <br /><br />
+ *
*
* @author Fabian Groffen <fabian.grof...@cwi.nl>
* @version 0.5
@@ -352,7 +352,7 @@ public class MonetDatabaseMetaData exten
/**
* Get a comma separated list of all a database's SQL keywords that
* are NOT also SQL:2003 keywords.
- * <br /><br />
+ *
*
* @return a comma separated list of MonetDB keywords
*/
diff --git a/java/src/main/java/nl/cwi/monetdb/jdbc/MonetDriver.java.in
b/java/src/main/java/nl/cwi/monetdb/jdbc/MonetDriver.java.in
--- a/java/src/main/java/nl/cwi/monetdb/jdbc/MonetDriver.java.in
+++ b/java/src/main/java/nl/cwi/monetdb/jdbc/MonetDriver.java.in
@@ -25,15 +25,15 @@ import java.util.logging.Logger;
/**
* A Driver suitable for the MonetDB database.
- * <br /><br />
+ *
* This driver will be used by the DriverManager to determine if an URL
* is to be handled by this driver, and if it does, then this driver
* will supply a Connection suitable for MonetDB.
- * <br /><br />
+ *
* This class has no explicit constructor, the default constructor
* generated by the Java compiler will be sufficient since nothing has
* to be set in order to use this driver.
- * <br /><br />
+ *
* This Driver supports MonetDB database URLs. MonetDB URLs are defined
* as:<br />
* <tt>jdbc:monetdb://<host>[:<port>]/<database></tt>
@@ -93,10 +93,10 @@ final public class MonetDriver implement
* connect to the given URL. This will be common, as when the JDBC
driver
* manager is asked to connect to a given URL it passes the URL to each
* loaded driver in turn.
- * <br /><br />
+ *
* The driver should throw an SQLException if it is the right driver to
* connect to the given URL but has trouble connecting to the database.
- * <br /><br />
+ *
* The java.util.Properties argument can be used to pass arbitrary
string
* tag/value pairs as connection arguments. Normally at least "user" and
* "password" properties should be included in the Properties object.
@@ -180,7 +180,7 @@ final public class MonetDriver implement
/**
* Gets information about the possible properties for this driver.
- * <br /><br />
+ *
* The getPropertyInfo method is intended to allow a generic GUI tool to
* discover what properties it should prompt a human for in order to get
* enough information to connect to a database. Note that depending on
the
@@ -254,11 +254,11 @@ final public class MonetDriver implement
* Reports whether this driver is a genuine JDBC Compliant&tm; driver. A
* driver may only report true here if it passes the JDBC compliance
tests;
* otherwise it is required to return false.
- * <br /><br />
+ *
* JDBC compliance requires full support for the JDBC API and full
support
* for SQL 92 Entry Level. It is expected that JDBC compliant drivers
will
* be available for all the major commercial databases.
- * <br /><br />
+ *
* This method is not intended to encourage the development of non-JDBC
* compliant drivers, but is a recognition of the fact that some
vendors are
* interested in using the JDBC API and framework for lightweight
databases
diff --git a/java/src/main/java/nl/cwi/monetdb/jdbc/MonetPreparedStatement.java
b/java/src/main/java/nl/cwi/monetdb/jdbc/MonetPreparedStatement.java
--- a/java/src/main/java/nl/cwi/monetdb/jdbc/MonetPreparedStatement.java
+++ b/java/src/main/java/nl/cwi/monetdb/jdbc/MonetPreparedStatement.java
@@ -18,12 +18,12 @@ import java.text.SimpleDateFormat;
/**
* A {@link PreparedStatement} suitable for the MonetDB database.
- * <br /><br />
+ *
* This implementation of the PreparedStatement interface uses the
* capabilities of the MonetDB/SQL backend to prepare and execute
* queries. The backend takes care of finding the '?'s in the input and
* returns the types it expects for them.
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
