Date: Thursday, November 10, 2005 @ 12:12:43
Author: gilles
Path: /cvsroot/carob/carob
Modified: .cdtproject (1.2 -> 1.3) include/Connection.hpp (1.17 -> 1.18)
include/JavaSocket.hpp (1.9 -> 1.10) include/Statement.hpp (1.1
-> 1.2) src/JavaSocket.cpp (1.9 -> 1.10) src/Statement.cpp (1.1
-> 1.2) test/TestOnValidConnection.hpp (1.1 -> 1.2)
Various javadoc fixes to remove warning when gererating doc
--------------------------------+
.cdtproject | 7 +++++++
include/Connection.hpp | 4 ++--
include/JavaSocket.hpp | 2 +-
include/Statement.hpp | 16 ++++++++--------
src/JavaSocket.cpp | 2 +-
src/Statement.cpp | 4 ++--
test/TestOnValidConnection.hpp | 1 +
7 files changed, 22 insertions(+), 14 deletions(-)
Index: carob/.cdtproject
diff -u carob/.cdtproject:1.2 carob/.cdtproject:1.3
--- carob/.cdtproject:1.2 Wed Nov 9 14:36:54 2005
+++ carob/.cdtproject Thu Nov 10 12:12:42 2005
@@ -51,6 +51,13 @@
<stopOnError>false</stopOnError>
<useDefaultCommand>true</useDefaultCommand>
</target>
+<target name="clean-doc" targetID="org.eclipse.cdt.make.MakeTargetBuilder"
path="">
+<buildCommand>make</buildCommand>
+<buildArguments/>
+<buildTarget>clean-doc</buildTarget>
+<stopOnError>false</stopOnError>
+<useDefaultCommand>true</useDefaultCommand>
+</target>
</buildTargets>
</item>
<item id="scannerConfiguration">
Index: carob/include/Connection.hpp
diff -u carob/include/Connection.hpp:1.17 carob/include/Connection.hpp:1.18
--- carob/include/Connection.hpp:1.17 Thu Nov 10 12:03:33 2005
+++ carob/include/Connection.hpp Thu Nov 10 12:12:42 2005
@@ -143,10 +143,10 @@
* <code>Statement</code> objects. If the same SQL statement is executed
* many times, it is more efficient to use a <code>PreparedStatement</code>.
* The <code>ResultSet</code> will be
- * <code>TYPE_FORWARD_ONLY</cde>/<code>CONCUR_READ_ONLY</code>.
+ * <code>TYPE_FORWARD_ONLY</code>/<code>CONCUR_READ_ONLY</code>.
*
* @return a new <code>Statement</code> object
- * @exception DriverSQLException passed through from the constructor
+ * @throw DriverException passed through from the constructor
*/
Statement* createStatement() throw (SocketIOException,
DriverException, UnexpectedException);
Index: carob/include/JavaSocket.hpp
diff -u carob/include/JavaSocket.hpp:1.9 carob/include/JavaSocket.hpp:1.10
--- carob/include/JavaSocket.hpp:1.9 Thu Nov 3 15:29:02 2005
+++ carob/include/JavaSocket.hpp Thu Nov 10 12:12:42 2005
@@ -50,7 +50,7 @@
/**
* Gives socket validity status.
* @return true if the socket is valid (has been created), so
- * [EMAIL PROTECTED] #connectTo(wstring, in_addr_t)} can be called
+ * [EMAIL PROTECTED] #connectTo(std::wstring, in_addr_t)} can be called
*/
inline bool isValid() const { return socketFd != -1; }
/**
Index: carob/include/Statement.hpp
diff -u carob/include/Statement.hpp:1.1 carob/include/Statement.hpp:1.2
--- carob/include/Statement.hpp:1.1 Thu Nov 10 12:03:33 2005
+++ carob/include/Statement.hpp Thu Nov 10 12:12:42 2005
@@ -46,7 +46,7 @@
virtual ~Statement();
/**
* Executes a SQL statement that returns a single ResultSet
- * @param sqlQuery typically a static SQL <code>SELECT</code> statement
+ * @param query typically a static SQL <code>SELECT</code> statement
* @param mustBroadcast whether the SelectRequest must be broadcasted on the
* cluster (eg. for queries like SELECT FOR UPDATE)
* @return a ResulSet pointer that contains the data produced by the query
@@ -93,7 +93,7 @@
/** Gets the fetch size */
int getFetchSize() { return fetchSize; }
/**
- * Set the default fetch size for the produced ResultSet.
+ * Sets the default fetch size for the produced ResultSet.
*
* @param rows number of rows that should be fetched from the database
* @throw DriverException if the condition 0 <= size <= getMaxRows()
@@ -101,12 +101,6 @@
*/
void setFetchSize(int rows) throw (DriverException, UnexpectedException);
/**
- * Retrieve the type of the generated <code>ResultSet</code>.
- *
- * @return one of <code>TYPE_FORWARD_ONLY</code> or
- * <code>TYPE_SCROLL_INSENSITIVE</code>
- */
- /**
* Defines the SQL cursor name that will be used by subsequent execute
* methods. This name can then be used in SQL positioned update/delete
* statements to identify the current row in the ResultSet generated by this
@@ -116,6 +110,12 @@
* @param name the new cursor name
*/
void setCursorName(wstring name) { cursorName = name; }
+ /**
+ * Retrieves the type of the generated <code>ResultSet</code>.
+ *
+ * @return one of <code>TYPE_FORWARD_ONLY</code> or
+ * <code>TYPE_SCROLL_INSENSITIVE</code>
+ */
int getResultSetType() { return resultSetType; }
/**
* @param value an <code>int</code> value
Index: carob/src/JavaSocket.cpp
diff -u carob/src/JavaSocket.cpp:1.9 carob/src/JavaSocket.cpp:1.10
--- carob/src/JavaSocket.cpp:1.9 Thu Nov 3 15:29:02 2005
+++ carob/src/JavaSocket.cpp Thu Nov 10 12:12:42 2005
@@ -74,7 +74,7 @@
return true;
}
-bool JavaSocket::connectTo(wstring host, in_addr_t port)
+bool JavaSocket::connectTo(std::wstring host, in_addr_t port)
throw (ConnectionException, UnexpectedException)
{
wstring fctName(L"JavaSocket::Connect");
Index: carob/src/Statement.cpp
diff -u carob/src/Statement.cpp:1.1 carob/src/Statement.cpp:1.2
--- carob/src/Statement.cpp:1.1 Thu Nov 10 12:03:33 2005
+++ carob/src/Statement.cpp Thu Nov 10 12:12:42 2005
@@ -32,7 +32,7 @@
}
-DriverResultSet* Statement::executeQuery(wstring query, bool mustBroadcast)
+DriverResultSet* Statement::executeQuery(std::wstring query, bool
mustBroadcast)
throw (SocketIOException, BackendException, ControllerException,
ProtocolException, NotImplementedException, UnexpectedException)
{
@@ -60,7 +60,7 @@
return resultPtr;
}
-int Statement::executeUpdate(wstring query) throw (SocketIOException,
+int Statement::executeUpdate(std::wstring query) throw (SocketIOException,
BackendException, ControllerException, ProtocolException,
UnexpectedException)
{
Index: carob/test/TestOnValidConnection.hpp
diff -u carob/test/TestOnValidConnection.hpp:1.1
carob/test/TestOnValidConnection.hpp:1.2
--- carob/test/TestOnValidConnection.hpp:1.1 Wed Nov 9 14:34:10 2005
+++ carob/test/TestOnValidConnection.hpp Thu Nov 10 12:12:42 2005
@@ -47,6 +47,7 @@
void tearDown();
protected:
+ /** Valid connection on which data transferts are to be done */
Connection* connectionPtr;
};
_______________________________________________
Carob-commits mailing list
[email protected]
https://forge.continuent.org/mailman/listinfo/carob-commits
