Update of /var/cvs/src/org/mmbase/module/database
In directory james.mmbase.org:/tmp/cvs-serv17652/src/org/mmbase/module/database
Modified Files:
MultiConnectionImplementation.java JDBCInterface.java
ConnectionWrapper.java MultiConnection.java
Log Message:
Fixes un javadoc
See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/module/database
Index: MultiConnectionImplementation.java
===================================================================
RCS file:
/var/cvs/src/org/mmbase/module/database/MultiConnectionImplementation.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- MultiConnectionImplementation.java 6 Dec 2007 08:05:51 -0000 1.2
+++ MultiConnectionImplementation.java 25 Mar 2008 21:00:24 -0000 1.3
@@ -17,19 +17,19 @@
/**
* MultiConnection is a replacement class for Connection it provides you a
- * multiplexed and reuseable connections from the connection pool.
+ * multiplexed and reusable connections from the connection pool.
* The main function of this class is to 'log' (keep) the last sql statement
passed to it.
* Another function is to keep state (i.e. notifying that it is busy),
- * and to make itself available again to teh connectionpool once it is
finished (closed).
+ * and to make itself available again to the connection pool once it is
finished (closed).
*
* @sql It would possibly be better to pass the logging of the sql query
- * to the code that calls the conenction, rather than place it in
- * the conenction itself, as it's implementation leads to conflicts
+ * to the code that calls the connection, rather than place it in
+ * the connection itself, as it's implementation leads to conflicts
* between various JDBC versions.
* This also goes for freeing the connection once it is 'closed'.
* @author vpro
* @author Pierre van Rooden
- * @version $Id: MultiConnectionImplementation.java,v 1.2 2007/12/06 08:05:51
michiel Exp $
+ * @version $Id: MultiConnectionImplementation.java,v 1.3 2008/03/25 21:00:24
nklasens Exp $
* @since MMBase-1.9 (as 'MultiConnection' in < 1.9)
*/
public class MultiConnectionImplementation extends ConnectionWrapper
implements MultiConnection {
@@ -309,7 +309,7 @@
* after it's own connections. This method is public only for the reason
that specific database
* implementations need access to this connection in order to safely clear
them before they
* can be put back in the connection pool.
- * @deprecated Use [EMAIL PROTECTED] #unwrap(Connection.class)} (a java
1.6 method from 'Wrapper')
+ * @deprecated Use [EMAIL PROTECTED] #unwrap(Class)} (a java 1.6 method
from 'Wrapper')
*/
public Connection getRealConnection() {
return con;
Index: JDBCInterface.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/module/database/JDBCInterface.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- JDBCInterface.java 7 Oct 2004 17:22:35 -0000 1.7
+++ JDBCInterface.java 25 Mar 2008 21:00:24 -0000 1.8
@@ -13,13 +13,13 @@
/**
* JDBCInterface is _only_ the module JDBC interface who setup the connections
- * it has nothing tofo with the JDBC interface.
+ * it has nothing to do with the JDBC interface.
*
* @duplicate Not really needed. Remove and reference JDBC directly. Note that
direct
* references to JDBC will be removed from most of the core (only
the storagemanagerfactory
* will reference the JDBC module directly)
* @author vpro
- * @version $Id: JDBCInterface.java,v 1.7 2004/10/07 17:22:35 pierre Exp $
+ * @version $Id: JDBCInterface.java,v 1.8 2008/03/25 21:00:24 nklasens Exp $
*/
public interface JDBCInterface {
Index: ConnectionWrapper.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/module/database/ConnectionWrapper.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- ConnectionWrapper.java 11 Jun 2007 12:29:03 -0000 1.3
+++ ConnectionWrapper.java 25 Mar 2008 21:00:24 -0000 1.4
@@ -16,7 +16,7 @@
* Wraps a java.sql.Connection object. Extending this makes it possible to
intercept calls.
*
* @author Michiel Meeuwissen
- * @version $Id: ConnectionWrapper.java,v 1.3 2007/06/11 12:29:03 michiel Exp $
+ * @version $Id: ConnectionWrapper.java,v 1.4 2008/03/25 21:00:24 nklasens Exp
$
* @since MMBase-1.8
*/
public abstract class ConnectionWrapper { //implements Connection {
@@ -35,32 +35,32 @@
protected void setLastSQL(String sql) {
}
/**
- * [EMAIL PROTECTED]
+ * @see java.sql.Connection#createStatement()
*/
public Statement createStatement() throws SQLException {
return con.createStatement();
}
/**
- * [EMAIL PROTECTED]
+ * @see java.sql.Connection#createStatement(int, int)
*/
public Statement createStatement(int resultSetType, int
resultSetConcurrency) throws SQLException {
return con.createStatement(resultSetType, resultSetConcurrency);
}
/**
- * [EMAIL PROTECTED]
+ * @see java.sql.Connection#createStatement(int, int, int)
*/
public Statement createStatement(int type, int concurrency, int
holdability) throws SQLException {
return con.createStatement(type, concurrency, holdability);
}
/**
- * [EMAIL PROTECTED]
+ * @see java.sql.Connection#prepareStatement(String)
*/
public PreparedStatement prepareStatement(String sql) throws SQLException {
setLastSQL(sql);
return con.prepareStatement(sql);
}
/**
- * [EMAIL PROTECTED]
+ * @see java.sql.Connection#prepareStatement(String, int)
*/
public PreparedStatement prepareStatement(String sql, int
autoGeneratedKeys) throws SQLException {
setLastSQL(sql);
@@ -68,7 +68,7 @@
}
/**
- * [EMAIL PROTECTED]
+ * @see java.sql.Connection#prepareStatement(String, int[])
*/
public PreparedStatement prepareStatement(String sql, int[] columnIndexes)
throws SQLException {
setLastSQL(sql);
@@ -76,14 +76,14 @@
}
/**
- * [EMAIL PROTECTED]
+ * @see java.sql.Connection#prepareStatement(String, String[])
*/
public PreparedStatement prepareStatement(String sql, String[]
columnNames) throws SQLException {
setLastSQL(sql);
return con.prepareStatement(sql, columnNames);
}
/**
- * [EMAIL PROTECTED]
+ * @see java.sql.Connection#prepareStatement(String, int, int, int)
*/
public PreparedStatement prepareStatement(String sql, int type, int
concurrency, int holdability) throws SQLException {
setLastSQL(sql);
@@ -91,53 +91,53 @@
}
/**
- * [EMAIL PROTECTED]
+ * @see java.sql.Connection#prepareCall(String)
*/
public CallableStatement prepareCall(String sql) throws SQLException {
setLastSQL(sql);
return con.prepareCall(sql);
}
/**
- * [EMAIL PROTECTED]
+ * @see java.sql.Connection#nativeSQL(String)
*/
public String nativeSQL(String query) throws SQLException {
setLastSQL(query);
return con.nativeSQL(query);
}
/**
- * [EMAIL PROTECTED]
+ * @see java.sql.Connection#setAutoCommit(boolean)
*/
public void setAutoCommit(boolean enableAutoCommit) throws SQLException {
con.setAutoCommit(enableAutoCommit);
}
/**
- * [EMAIL PROTECTED]
+ * @see java.sql.Connection#getAutoCommit()
*/
public boolean getAutoCommit() throws SQLException {
return con.getAutoCommit();
}
/**
- * [EMAIL PROTECTED]
+ * @see java.sql.Connection#commit()
*/
public void commit() throws SQLException {
con.commit();
}
/**
- * [EMAIL PROTECTED]
+ * @see java.sql.Connection#rollback()
*/
public void rollback() throws SQLException {
con.rollback();
}
/**
- * [EMAIL PROTECTED]
+ * @see java.sql.Connection#close()
*/
public void close() throws SQLException {
con.close();
}
/**
- * [EMAIL PROTECTED]
+ * @see java.sql.Connection#isClosed()
*/
public boolean isClosed() throws SQLException {
return con.isClosed();
@@ -145,7 +145,7 @@
/**
- * [EMAIL PROTECTED]
+ * @see java.sql.Connection#getMetaData()
*/
public DatabaseMetaData getMetaData() throws SQLException {
return con.getMetaData();
@@ -153,48 +153,48 @@
/**
- * [EMAIL PROTECTED]
+ * @see java.sql.Connection#setReadOnly(boolean)
*/
public void setReadOnly(boolean readOnly) throws SQLException {
con.setReadOnly(readOnly);
}
/**
- * [EMAIL PROTECTED]
+ * @see java.sql.Connection#isReadOnly()
*/
public boolean isReadOnly() throws SQLException {
return con.isReadOnly();
}
/**
- * [EMAIL PROTECTED]
+ * @see java.sql.Connection#setCatalog(String)
*/
public void setCatalog(String catalog) throws SQLException {
con.setCatalog(catalog);
}
/**
- * [EMAIL PROTECTED]
+ * @see java.sql.Connection#getCatalog()
*/
public String getCatalog() throws SQLException {
return con.getCatalog();
}
/**
- * [EMAIL PROTECTED]
+ * @see java.sql.Connection#setTransactionIsolation(int)
*/
public void setTransactionIsolation(int level) throws SQLException {
con.setTransactionIsolation(level);
}
/**
- * [EMAIL PROTECTED]
+ * @see java.sql.Connection#getTransactionIsolation()
*/
public int getTransactionIsolation() throws SQLException {
return con.getTransactionIsolation();
}
/**
- * [EMAIL PROTECTED]
+ * @see java.sql.Connection#getWarnings()
*/
public SQLWarning getWarnings() throws SQLException {
return con.getWarnings();
@@ -202,16 +202,14 @@
/**
* clear Warnings
- */
- /**
- * [EMAIL PROTECTED]
+ * @see java.sql.Connection#clearWarnings()
*/
public void clearWarnings() throws SQLException {
con.clearWarnings();
}
/**
- * [EMAIL PROTECTED]
+ * @see java.sql.Connection#prepareCall(String, int, int)
*/
public CallableStatement prepareCall(String sql, int i, int y) throws
SQLException {
setLastSQL(sql);
@@ -219,22 +217,22 @@
}
/**
- * [EMAIL PROTECTED]
+ * @see java.sql.Connection#setTypeMap(Map)
*/
- public void setTypeMap(Map mp) throws SQLException {
+ public void setTypeMap(Map<String,Class<?>> mp) throws SQLException {
con.setTypeMap(mp);
}
/**
- * [EMAIL PROTECTED]
+ * @see java.sql.Connection#getTypeMap()
*/
- public Map getTypeMap() throws SQLException {
+ public Map<String,Class<?>> getTypeMap() throws SQLException {
return con.getTypeMap();
}
/**
- * [EMAIL PROTECTED]
+ * @see java.sql.Connection#prepareStatement(String, int, int)
*/
public PreparedStatement prepareStatement(String sql,int i, int y) throws
SQLException {
setLastSQL(sql);
@@ -242,40 +240,41 @@
}
/**
- * [EMAIL PROTECTED]
+ * @see java.sql.Connection#setHoldability(int)
*/
public void setHoldability(int holdability) throws SQLException {
con.setHoldability(holdability);
}
+
/**
- * [EMAIL PROTECTED]
+ * @see java.sql.Connection#getHoldability()
*/
public int getHoldability() throws SQLException {
return con.getHoldability();
}
/**
- * [EMAIL PROTECTED]
+ * @see java.sql.Connection#setSavepoint()
*/
public Savepoint setSavepoint() throws SQLException {
return con.setSavepoint();
}
/**
- * [EMAIL PROTECTED]
+ * @see java.sql.Connection#setSavepoint(String)
*/
public Savepoint setSavepoint(String name) throws SQLException {
return con.setSavepoint(name);
}
/**
- * [EMAIL PROTECTED]
+ * @see java.sql.Connection#rollback(Savepoint)
*/
public void rollback(Savepoint savepoint) throws SQLException {
con.rollback(savepoint);
}
/**
- * [EMAIL PROTECTED]
+ * @see java.sql.Connection#releaseSavepoint(Savepoint)
*/
public void releaseSavepoint(Savepoint savepoint) throws SQLException {
con.releaseSavepoint(savepoint);
@@ -283,7 +282,7 @@
/**
- * [EMAIL PROTECTED]
+ * @see java.sql.Connection#prepareCall(String, int, int, int)
*/
public CallableStatement prepareCall(String sql, int type, int
concurrency, int holdability) throws SQLException {
setLastSQL(sql);
@@ -342,5 +341,3 @@
}
}
-
-
Index: MultiConnection.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/module/database/MultiConnection.java,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -b -r1.48 -r1.49
--- MultiConnection.java 6 Dec 2007 08:05:51 -0000 1.48
+++ MultiConnection.java 25 Mar 2008 21:00:24 -0000 1.49
@@ -56,8 +56,8 @@
public SQLWarning getWarnings() throws SQLException;
public void clearWarnings() throws SQLException;
public CallableStatement prepareCall(String sql, int i, int y) throws
SQLException;
- public void setTypeMap(Map mp) throws SQLException;
- public Map getTypeMap() throws SQLException;
+ public void setTypeMap(Map<String,Class<?>> mp) throws SQLException;
+ public Map<String,Class<?>> getTypeMap() throws SQLException;
public PreparedStatement prepareStatement(String sql,int i, int y) throws
SQLException;
public void setHoldability(int holdability) throws SQLException;
public int getHoldability() throws SQLException;
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
