Rev 157: Cleaned up more aftermath from AbortOption/ExecType move. in http://bazaar.launchpad.net/~ndb-connectors/ndb-connectors/ndbjmerge

[Monty Taylor]

At http://bazaar.launchpad.net/~ndb-connectors/ndb-connectors/ndbjmerge

------------------------------------------------------------
revno: 157
revision-id: mtaylor@stripped
parent: mtaylor@stripped
committer: Monty Taylor <mtaylor@stripped>
branch nick: ndbjmerge
timestamp: Thu 2007-09-13 18:55:08 -0700
message:
  Cleaned up more aftermath from AbortOption/ExecType move.
modified:
  java/com/mysql/cluster/ndbj/NdbResultSetImpl.java
ndbresultsetimpl.jav-20070517181935-98huwjarzuh25b30-22
  java/com/mysql/cluster/ndbj/NdbTransaction.java
ndbtransaction.java-20070517181935-98huwjarzuh25b30-27
  java/com/mysql/cluster/ndbj/NdbTransactionImpl.java
ndbtransactionimpl.j-20070517181935-98huwjarzuh25b30-28
=== modified file 'java/com/mysql/cluster/ndbj/NdbResultSetImpl.java'
--- a/java/com/mysql/cluster/ndbj/NdbResultSetImpl.java	2007-09-13 21:28:09 +0000
+++ b/java/com/mysql/cluster/ndbj/NdbResultSetImpl.java	2007-09-14 01:55:08 +0000
@@ -302,8 +302,8 @@
 					NdbTransaction trans = null;
 					trans = ((NdbScanOperationImpl)theOp).getNdbTransaction();
 					
-					trans.execute(NdbTransaction.ExecType.NoCommit,
-							NdbTransaction.AbortOption.AbortOnError, true);
+					trans.execute(ExecType.NoCommit,
+							AbortOption.AbortOnError, true);
 					rowsModified = false;
 				}
 				return next();

=== modified file 'java/com/mysql/cluster/ndbj/NdbTransaction.java'
--- a/java/com/mysql/cluster/ndbj/NdbTransaction.java	2007-09-14 01:52:17 +0000
+++ b/java/com/mysql/cluster/ndbj/NdbTransaction.java	2007-09-14 01:55:08 +0000
@@ -149,9 +149,9 @@
 	public abstract void execute(ExecType execType, AbortOption abortOption) throws
NdbApiException;
 	public abstract void execute(ExecType execType) throws NdbApiException;
 
-	public void executeAsynchPrepare(ExecType execType, BaseCallbackRef cb,
+	public void executeAsynchPrepare(ExecType execType, BaseCallback cb,
 			AbortOption abortOption);
-	public void executeAsynchPrepare(ExecType execType, BaseCallbackRef cb);
+	public void executeAsynchPrepare(ExecType execType, BaseCallback cb);
 	/**
 	 * Creates a NdbOperationRef (primary key operation) and adds it to the transaction.
 	 * @param tableName name of the schema

=== modified file 'java/com/mysql/cluster/ndbj/NdbTransactionImpl.java'
--- a/java/com/mysql/cluster/ndbj/NdbTransactionImpl.java	2007-09-14 01:52:17 +0000
+++ b/java/com/mysql/cluster/ndbj/NdbTransactionImpl.java	2007-09-14 01:55:08 +0000
@@ -355,7 +355,7 @@
 	 *      BaseCallbackRef,
 	 *      AbortOptionRef)
 	 */
-	public void executeAsynchPrepare(ExecType execType, BaseCallbackRef cb,
+	public void executeAsynchPrepare(ExecType execType, BaseCallback cb,
 			AbortOption abortOption) {
 		transRef.executeAsynchPrepare(execType,	cb,	abortOption);
 	}
@@ -366,7 +366,7 @@
 	 * @see NdbTransactionRef#executeAsynchPrepare(ExecTypeRef,
 	 *      BaseCallbackRef)
 	 */
-	public void executeAsynchPrepare(ExecType execType, BaseCallbackRef cb) {
+	public void executeAsynchPrepare(ExecType execType, BaseCallback cb) {
 		transRef.executeAsynchPrepare(execType,	cb);
 	}