List:NDB Connectors« Previous MessageNext Message »
From:Monty Taylor Date:September 17 2007 2:17am
Subject:Rev 155: Removed unnecessary wrapper classes around NdbError. in http://bazaar.launchpad.net/~ndb-connectors/ndb-connectors/ndbjmerge
View as plain text  
At http://bazaar.launchpad.net/~ndb-connectors/ndb-connectors/ndbjmerge

------------------------------------------------------------
revno: 155
revision-id: mtaylor@stripped
parent: mtaylor@stripped
committer: Monty Taylor <mtaylor@stripped>
branch nick: ndbjmerge
timestamp: Mon 2007-09-17 04:16:25 +0200
message:
  Removed unnecessary wrapper classes around NdbError. 
  Removed unnecessary enum NdbException.
removed:
  java/com/mysql/cluster/ndbj/NdbError.java
ndberror.java-20070520091932-flfya9c98z1ep0j3-2
  java/com/mysql/cluster/ndbj/NdbErrorImpl.java
ndberror.java-20070517181935-98huwjarzuh25b30-11
modified:
  java/Makefile.am               makefile.am-20070415032352-9dpe6aurqcnuwcrd-1
  java/build.xml                 build.xml-20070521233115-yg3ylf2k3vuzr27o-1
  java/com/mysql/cluster/mgmj/MgmApiException.java
mgmapiexception.java-20070914094439-b3vmm9orpa86yan5-1
  java/com/mysql/cluster/ndbj/BlobUndefinedException.java
blobundefinedexcepti-20070428054022-qvbhak1i97y86t1c-1
  java/com/mysql/cluster/ndbj/MgmApiException.java
mgmapiexception.java-20070528224344-z863qm98ai16jr9x-1
  java/com/mysql/cluster/ndbj/NdbApiException.java
ndbapiexception.java-20070428054022-qvbhak1i97y86t1c-2
  java/com/mysql/cluster/ndbj/NdbApiPermanentException.java
ndbapipermanentexcep-20070428054022-qvbhak1i97y86t1c-3
  java/com/mysql/cluster/ndbj/NdbApiTemporaryException.java
ndbapitemporaryexcep-20070428054022-qvbhak1i97y86t1c-5
  java/com/mysql/cluster/ndbj/NdbApiTimeStampOutOfBoundsException.java
ndbapitimestampoutof-20070428054022-qvbhak1i97y86t1c-6
  java/com/mysql/cluster/ndbj/NdbApiUserErrorPermanentException.java
ndbapiusererrorperma-20070428054022-qvbhak1i97y86t1c-7
  java/com/mysql/cluster/ndbj/NdbBase.java ndbbase.java-20070517181935-98huwjarzuh25b30-3
  java/com/mysql/cluster/ndbj/NdbBaseImpl.java
ndbbaseimpl.java-20070517181935-98huwjarzuh25b30-4
  java/com/mysql/cluster/ndbj/NdbBaseOperationImpl.java
ndboperationimpl.jav-20070517181935-98huwjarzuh25b30-20
  java/com/mysql/cluster/ndbj/NdbBlobImpl.java
ndbblobimpl.java-20070517181935-98huwjarzuh25b30-8
  java/com/mysql/cluster/ndbj/NdbClusterConnectionPermanentException.java
ndbclusterconnection-20070428054022-qvbhak1i97y86t1c-8
  java/com/mysql/cluster/ndbj/NdbClusterConnectionTemporaryException.java
ndbclusterconnection-20070428054022-qvbhak1i97y86t1c-9
  java/com/mysql/cluster/ndbj/NdbErrorNotAvailable.java
ndberrornotavailable-20070914075342-oilu5i8y3jkfvg96-1
  java/com/mysql/cluster/ndbj/NdbEventOperation.java
ndbeventoperation.ja-20070625182612-zsu6r68jih70efaq-1
  java/com/mysql/cluster/ndbj/NdbFactory.java
ndbfactory.java-20070517181935-98huwjarzuh25b30-13
  java/com/mysql/cluster/ndbj/NdbImpl.java ndbimpl.java-20070517181935-98huwjarzuh25b30-14
  java/com/mysql/cluster/ndbj/NdbTransactionImpl.java
ndbtransactionimpl.j-20070517181935-98huwjarzuh25b30-28
  java/ndbj.i                    ndbj.i-20070913223244-5938mztpztyn9sry-1
  java/testsuite/ndbj/SelectCountTest.java
selectcounttest.java-20070517181935-98huwjarzuh25b30-61
  swig/NdbMgmReply.i             ndbmgmreply.i-20070528224404-qscgbkcvhcru9u2o-5
  swig/ndbglobals.i              globals.i-20070228021421-qkr4cbpxymyqdrf3-7
=== removed file 'java/com/mysql/cluster/ndbj/NdbError.java'
--- a/java/com/mysql/cluster/ndbj/NdbError.java	2007-09-13 21:28:09 +0000
+++ b/java/com/mysql/cluster/ndbj/NdbError.java	1970-01-01 00:00:00 +0000
@@ -1,27 +0,0 @@
-package com.mysql.cluster.ndbj;
-
-public interface NdbError {
-
-	/**
-	 * @return
-	 * @see com.mysql.cluster.ndbj.NdbErrorRef#getClassification()
-	 */ 
-	// TODO: Make NDB/J Classification
-	public abstract com.mysql.cluster.ndbj.NdbErrorRef.Classification getClassification();
-
-	/**
-	 * @return
-	 * @see com.mysql.cluster.ndbj.NdbErrorRef#getCode()
-	 */
-	public abstract int getCode();
-
-	/**
-	 * @return
-	 * @see com.mysql.cluster.ndbj.NdbErrorRef#getMessage()
-	 */
-
-	public abstract String getMessage();
-
-	// TODO: Make NDB/J Status
-	public abstract com.mysql.cluster.ndbj.NdbErrorRef.Status getStatus();
-}
\ No newline at end of file

=== removed file 'java/com/mysql/cluster/ndbj/NdbErrorImpl.java'
--- a/java/com/mysql/cluster/ndbj/NdbErrorImpl.java	2007-09-13 21:28:09 +0000
+++ b/java/com/mysql/cluster/ndbj/NdbErrorImpl.java	1970-01-01 00:00:00 +0000
@@ -1,53 +0,0 @@
-package com.mysql.cluster.ndbj;
-
-import com.mysql.cluster.ndbj.NdbErrorRef.Classification;
-import com.mysql.cluster.ndbj.NdbErrorRef.Status;
-
-
-/**
- * A NdbErrorRef object is generated by the NdbRef cluster due to some
- * condition arising in the cluster.
- * An NdbErrorRef can be of type ndberror_st_success,
- * ndberror_st_temporary, ndberror_st_permanent, or ndberror_st_unknown.
- */
-public class NdbErrorImpl implements NdbError
-{
-    private final com.mysql.cluster.ndbj.NdbErrorRef errRef; 
-
-    /**
-     * constructor for NdbErrorImpl to wrap the underlying ndbapi.NdbErrorRef object
-     */
-    public NdbErrorImpl(com.mysql.cluster.ndbj.NdbErrorRef errRef) {
-    	this.errRef = errRef;    	
-    }
-
-	/* (non-Javadoc)
-	 * @see com.mysql.cluster.ndbj.NdbError#getClassification()
-	 */
-	public Classification getClassification() {
-		return errRef.getClassification();
-	}
-
-	/* (non-Javadoc)
-	 * @see com.mysql.cluster.ndbj.NdbError#getCode()
-	 */
-	public int getCode() {
-		return errRef.getCode();
-	}
-
-	/* (non-Javadoc)
-	 * @see com.mysql.cluster.ndbj.NdbError#getMessage()
-	 */
-	public String getMessage() {
-		return errRef.getMessage();
-	}
-
-	/**
-	 * @return
-	 * @see com.mysql.cluster.ndbj.NdbErrorRef#getStatus()
-	 */
-	public Status getStatus() {
-		return errRef.getStatus();
-	}
- 
-}

=== modified file 'java/Makefile.am'
--- a/java/Makefile.am	2007-09-14 09:49:57 +0000
+++ b/java/Makefile.am	2007-09-17 02:16:25 +0000
@@ -21,7 +21,7 @@
 	$(ANT) clean
 
 %_wrap.cxx: %.i
-	$(SWIG) -java -outdir ${package_namespace}/$* -package `echo ${package_namespace}/$* |
sed 's,/,.,g'` -I$(SWIG_DIR) $(MYSQL_INCLUDES) -o $@ $<
+	$(SWIG) -java -outdir ${package_namespace}/$* -package `echo ${package_namespace}/$* |
sed 's,/,.,g'` -I$(SWIG_DIR) -I./swig $(MYSQL_INCLUDES) -o $@ $<
 
 ndbj.jar: libndbj.la libmgmj.la
 	$(ANT) build-jar

=== modified file 'java/build.xml'
--- a/java/build.xml	2007-09-15 00:21:06 +0000
+++ b/java/build.xml	2007-09-17 02:16:25 +0000
@@ -51,6 +51,7 @@
       <fileset dir="com/mysql/cluster/ndbj" includes="NdbIndex.java" />
       <fileset dir="com/mysql/cluster/ndbj" includes="NdbObject.java" />
       <fileset dir="com/mysql/cluster/ndbj" includes="NdbTable.java" />
+      <fileset dir="com/mysql/cluster/ndbj" includes="NdbError.java" />
     </delete>
     <delete dir="javadoc" />
   </target>

=== modified file 'java/com/mysql/cluster/mgmj/MgmApiException.java'
--- a/java/com/mysql/cluster/mgmj/MgmApiException.java	2007-09-14 09:55:15 +0000
+++ b/java/com/mysql/cluster/mgmj/MgmApiException.java	2007-09-17 02:16:25 +0000
@@ -1,11 +1,11 @@
 package com.mysql.cluster.mgmj;
 
-import com.mysql.cluster.ndbj.NdbErrorRef; 
+import com.mysql.cluster.ndbj.NdbError; 
 
 public class MgmApiException extends com.mysql.cluster.ndbj.NdbApiException {
 
 
-	public MgmApiException(NdbErrorRef error) {
+	public MgmApiException(NdbError error) {
 		super(error);
 	}
 

=== modified file 'java/com/mysql/cluster/ndbj/BlobUndefinedException.java'
--- a/java/com/mysql/cluster/ndbj/BlobUndefinedException.java	2007-09-14 07:54:14 +0000
+++ b/java/com/mysql/cluster/ndbj/BlobUndefinedException.java	2007-09-17 02:16:25 +0000
@@ -7,7 +7,7 @@
  */
 public class BlobUndefinedException extends NdbApiException {
 
-	public BlobUndefinedException(NdbErrorRef error) {
+	public BlobUndefinedException(NdbError error) {
 		super(error);
 	}
 

=== modified file 'java/com/mysql/cluster/ndbj/MgmApiException.java'
--- a/java/com/mysql/cluster/ndbj/MgmApiException.java	2007-09-14 07:54:14 +0000
+++ b/java/com/mysql/cluster/ndbj/MgmApiException.java	2007-09-17 02:16:25 +0000
@@ -3,7 +3,7 @@
 
 public class MgmApiException extends NdbApiException {
 
-	public MgmApiException(NdbErrorRef error) {
+	public MgmApiException(NdbError error) {
 		super(error);
 	}
 

=== modified file 'java/com/mysql/cluster/ndbj/NdbApiException.java'
--- a/java/com/mysql/cluster/ndbj/NdbApiException.java	2007-09-14 08:06:22 +0000
+++ b/java/com/mysql/cluster/ndbj/NdbApiException.java	2007-09-17 02:16:25 +0000
@@ -1,7 +1,7 @@
 package com.mysql.cluster.ndbj;
 
-import com.mysql.cluster.ndbj.NdbErrorRef.Classification;
-import com.mysql.cluster.ndbj.NdbErrorRef.Status;
+import com.mysql.cluster.ndbj.NdbError.Classification;
+import com.mysql.cluster.ndbj.NdbError.Status;
 
 /**
  * A NdbApiException is the base checked exception class of the NDB/J API Exception
hierarchy.
@@ -11,21 +11,21 @@
  * the cause of the problem.
  * <br>If the error is generated by NDB/J (rather than internally in the cluster);
  * then, an error message is supplied (but no error code or error status from the
cluster).
- * @see NdbErrorRef
+ * @see NdbError
  */
 public class NdbApiException extends Exception
 {
 
     protected static final long serialVersionUID=1234;
     protected final String message;
-    protected final NdbErrorRef errRef; 
+    protected final NdbError errRef; 
 
     /**
      * constructor for a NdbApiException can be created using a native
-     * NdbErrorRef object.
+     * NdbError object.
      * @param error
      */
-    public NdbApiException(NdbErrorRef error)
+    public NdbApiException(NdbError error)
 	{
     	super(error.getMessage());
     	this.errRef=error;
@@ -66,7 +66,7 @@
 
 	/**
 	 * @return
-	 * @see com.mysql.cluster.ndbj.NdbErrorRef#getClassification()
+	 * @see com.mysql.cluster.ndbj.NdbError#getClassification()
 	 */
 	public Classification getClassification() {
 		return errRef.getClassification();
@@ -75,7 +75,7 @@
 
 	/**
 	 * @return
-	 * @see com.mysql.cluster.ndbj.NdbErrorRef#getCode()
+	 * @see com.mysql.cluster.ndbj.NdbError#getCode()
 	 */
 	public int getCode() {
     	if (errRef == null) { 
@@ -87,7 +87,7 @@
 
 	/**
 	 * @return
-	 * @see com.mysql.cluster.ndbj.NdbErrorRef#getStatus()
+	 * @see com.mysql.cluster.ndbj.NdbError#getStatus()
 	 */
 	public Status getStatus() {
 		return errRef.getStatus();

=== modified file 'java/com/mysql/cluster/ndbj/NdbApiPermanentException.java'
--- a/java/com/mysql/cluster/ndbj/NdbApiPermanentException.java	2007-09-14 07:54:14 +0000
+++ b/java/com/mysql/cluster/ndbj/NdbApiPermanentException.java	2007-09-17 02:16:25 +0000
@@ -14,7 +14,7 @@
 	/**
 	 * @param error
 	 */
-	public NdbApiPermanentException(NdbErrorRef error) {
+	public NdbApiPermanentException(NdbError error) {
 		super(error);
 	}
 

=== modified file 'java/com/mysql/cluster/ndbj/NdbApiTemporaryException.java'
--- a/java/com/mysql/cluster/ndbj/NdbApiTemporaryException.java	2007-09-14 07:54:14 +0000
+++ b/java/com/mysql/cluster/ndbj/NdbApiTemporaryException.java	2007-09-17 02:16:25 +0000
@@ -35,7 +35,7 @@
 	/**
 	 * @param error
 	 */
-	public NdbApiTemporaryException(NdbErrorRef error) {
+	public NdbApiTemporaryException(NdbError error) {
 		super(error);
 	}
 

=== modified file 'java/com/mysql/cluster/ndbj/NdbApiTimeStampOutOfBoundsException.java'
--- a/java/com/mysql/cluster/ndbj/NdbApiTimeStampOutOfBoundsException.java	2007-09-14
07:54:14 +0000
+++ b/java/com/mysql/cluster/ndbj/NdbApiTimeStampOutOfBoundsException.java	2007-09-17
02:16:25 +0000
@@ -17,7 +17,7 @@
 	/**
 	 * @param error
 	 */
-	public NdbApiTimeStampOutOfBoundsException(NdbErrorRef error) {
+	public NdbApiTimeStampOutOfBoundsException(NdbError error) {
 		super(error);
 	}
 	/**

=== modified file 'java/com/mysql/cluster/ndbj/NdbApiUserErrorPermanentException.java'
--- a/java/com/mysql/cluster/ndbj/NdbApiUserErrorPermanentException.java	2007-09-14
07:54:14 +0000
+++ b/java/com/mysql/cluster/ndbj/NdbApiUserErrorPermanentException.java	2007-09-17
02:16:25 +0000
@@ -15,7 +15,7 @@
 	/**
 	 * @param error
 	 */
-	public NdbApiUserErrorPermanentException(NdbErrorRef error) {
+	public NdbApiUserErrorPermanentException(NdbError error) {
 		super(error);
 	}
 

=== modified file 'java/com/mysql/cluster/ndbj/NdbBase.java'
--- a/java/com/mysql/cluster/ndbj/NdbBase.java	2007-09-14 07:54:14 +0000
+++ b/java/com/mysql/cluster/ndbj/NdbBase.java	2007-09-17 02:16:25 +0000
@@ -4,12 +4,12 @@
 interface NdbBase {
 
 	/**
-	 * Gets the NdbErrorRef object.
-	 * <br> The NdbErrorRef object contains the state for a ndb/transaction/operation
object
+	 * Gets the NdbError object.
+	 * <br> The NdbError object contains the state for a ndb/transaction/operation
object
 	 * until subsequent method calls on the ndb/transaction/operation object.
 	 * @return
-	 * @exception NdbErrorNotAvailable Could not create a NdbErrorRef Object
-	 * @see NdbErrorRef
+	 * @exception NdbErrorNotAvailable Could not create a NdbError Object
+	 * @see NdbError
 	 */
 	public abstract NdbError getNdbError() throws NdbErrorNotAvailable;
 

=== modified file 'java/com/mysql/cluster/ndbj/NdbBaseImpl.java'
--- a/java/com/mysql/cluster/ndbj/NdbBaseImpl.java	2007-09-14 08:06:22 +0000
+++ b/java/com/mysql/cluster/ndbj/NdbBaseImpl.java	2007-09-17 02:16:25 +0000
@@ -1,12 +1,12 @@
 package com.mysql.cluster.ndbj;
 
-import com.mysql.cluster.ndbj.NdbErrorRef.Classification;
+import com.mysql.cluster.ndbj.NdbError.Classification;
 
 
 /**
  * NdbBase is an abstract class that encapsulates
  * common behaviour for some NdbRef classes, including the
- * ability to get an NdbErrorRef object from the cluster; provide
+ * ability to get an NdbError object from the cluster; provide
  * some resource maintainance methods (check if resource isValid or isClosed,
  * and get a pointer to the resource).
  * <br> Concrete classes that use NdbBase behaviour are NdbRef, NdbTransactionRef,
NdbOperationRef, NdbIndexOperationRef,
@@ -166,7 +166,7 @@
 
 
 
-	  abstract protected com.mysql.cluster.ndbj.NdbErrorRef getNdbErrorRef();
+	  abstract protected com.mysql.cluster.ndbj.NdbError getNdbErrorRef();
 
 	public NdbBaseImpl() { 
 		this.valid = true;
@@ -181,17 +181,16 @@
 		} catch (IllegalStateException e) {
 			throw new NdbErrorNotAvailable(this.getClass().getName() + " object is closed; Create
a new object.");
 		}
-		com.mysql.cluster.ndbj.NdbErrorRef errRef = this.getNdbErrorRef();
+		com.mysql.cluster.ndbj.NdbError err = this.getNdbErrorRef();
 		String msg=null;
-		msg=errRef.getMessage();
-		Classification classification= errRef.getClassification();
+		msg=err.getMessage();
+		Classification classification= err.getClassification();
 		if (msg == null	|| classification == Classification.NoError)
 		{
 			throw new NdbErrorNotAvailable("Problem creating NdbMgmError object from class: " +
this.getClass().getName());
 		}
 
-	  NdbError ndbError = NdbFactory.createError(errRef);
-	  return ndbError;
+	  return err;
     }
 
 

=== modified file 'java/com/mysql/cluster/ndbj/NdbBaseOperationImpl.java'
--- a/java/com/mysql/cluster/ndbj/NdbBaseOperationImpl.java	2007-09-17 01:09:47 +0000
+++ b/java/com/mysql/cluster/ndbj/NdbBaseOperationImpl.java	2007-09-17 02:16:25 +0000
@@ -87,7 +87,7 @@
 	 * @see com.mysql.cluster.ndbj.NdbBaseImpl#getNdbErrorRef()
 	 */
 	@Override
-	protected NdbErrorRef getNdbErrorRef() {
+	protected NdbError getNdbErrorRef() {
 		// TODO Auto-generated method stub
 		return this.opRef.getNdbError();
 	}

=== modified file 'java/com/mysql/cluster/ndbj/NdbBlobImpl.java'
--- a/java/com/mysql/cluster/ndbj/NdbBlobImpl.java	2007-09-14 08:06:22 +0000
+++ b/java/com/mysql/cluster/ndbj/NdbBlobImpl.java	2007-09-17 02:16:25 +0000
@@ -124,7 +124,7 @@
 	 * @see com.mysql.cluster.ndbj.NdbBaseImpl#getNdbErrorRef()
 	 */
 	@Override
-	protected NdbErrorRef getNdbErrorRef() {
+	protected NdbError getNdbErrorRef() {
 		return blobRef.getNdbError();
 	}
 

=== modified file
'java/com/mysql/cluster/ndbj/NdbClusterConnectionPermanentException.java'
--- a/java/com/mysql/cluster/ndbj/NdbClusterConnectionPermanentException.java	2007-09-14
07:54:14 +0000
+++ b/java/com/mysql/cluster/ndbj/NdbClusterConnectionPermanentException.java	2007-09-17
02:16:25 +0000
@@ -15,7 +15,7 @@
 	 * 
 	 * @param error
 	 */
-	public NdbClusterConnectionPermanentException(NdbErrorRef error) {
+	public NdbClusterConnectionPermanentException(NdbError error) {
 		super(error);
 	}
 

=== modified file
'java/com/mysql/cluster/ndbj/NdbClusterConnectionTemporaryException.java'
--- a/java/com/mysql/cluster/ndbj/NdbClusterConnectionTemporaryException.java	2007-09-14
07:54:14 +0000
+++ b/java/com/mysql/cluster/ndbj/NdbClusterConnectionTemporaryException.java	2007-09-17
02:16:25 +0000
@@ -32,7 +32,7 @@
 	 *
 	 * @param error
 	 */
-	public NdbClusterConnectionTemporaryException(NdbErrorRef error) {
+	public NdbClusterConnectionTemporaryException(NdbError error) {
 		super(error);
 	}
 

=== modified file 'java/com/mysql/cluster/ndbj/NdbErrorNotAvailable.java'
--- a/java/com/mysql/cluster/ndbj/NdbErrorNotAvailable.java	2007-09-14 07:54:14 +0000
+++ b/java/com/mysql/cluster/ndbj/NdbErrorNotAvailable.java	2007-09-17 02:16:25 +0000
@@ -1,9 +1,9 @@
 package com.mysql.cluster.ndbj;
 
 /**
- * If an error is not recognised by NdbRef/J, this exception is thrown.
- * This exception may be thrown if you have an old version of NdbRef/J.
- * Update your NdbRef/J version to the recommended version for your
+ * If an error is not recognised by Ndb/J, this exception is thrown.
+ * This exception may be thrown if you have an old version of Ndb/J.
+ * Update your Ndb/J version to the recommended version for your
  * version of MySQL cluster.
  *
  * @author jdowling

=== modified file 'java/com/mysql/cluster/ndbj/NdbEventOperation.java'
--- a/java/com/mysql/cluster/ndbj/NdbEventOperation.java	2007-09-14 08:06:22 +0000
+++ b/java/com/mysql/cluster/ndbj/NdbEventOperation.java	2007-09-17 02:16:25 +0000
@@ -22,7 +22,7 @@
 	}
 	
 	@Override
-	protected NdbErrorRef getNdbErrorRef() {
+	protected NdbError getNdbErrorRef() {
 		// TODO Auto-generated method stub
 		return opRef.getNdbError();
 	}

=== modified file 'java/com/mysql/cluster/ndbj/NdbFactory.java'
--- a/java/com/mysql/cluster/ndbj/NdbFactory.java	2007-09-14 08:06:22 +0000
+++ b/java/com/mysql/cluster/ndbj/NdbFactory.java	2007-09-17 02:16:25 +0000
@@ -253,24 +253,6 @@
     }
     
     /**
-     * Used internally by NDB/J
-     * @param errRef
-     * @return NdbErrorRef
-     * @throws NdbApiException
-     */
-    static NdbError createError(
-    		com.mysql.cluster.ndbj.NdbErrorRef errRef)
-    {
-    	NdbError error = null; 
-    	if (MODE.equals("development")) {
-            error = new NdbErrorImpl(errRef);
-        }
-        if (MODE.equals("production")) {
-
-        }
-        return error;
-    }
-    /**
      * Used internally by NDB/J.
      * @param ndbRef
      * @param transRef

=== modified file 'java/com/mysql/cluster/ndbj/NdbImpl.java'
--- a/java/com/mysql/cluster/ndbj/NdbImpl.java	2007-09-14 08:06:22 +0000
+++ b/java/com/mysql/cluster/ndbj/NdbImpl.java	2007-09-17 02:16:25 +0000
@@ -234,10 +234,10 @@
 
 	/*
 	 *  (non-Javadoc)
-	 * wrapper to get the NdbErrorRef for the NdbRef object
+	 * wrapper to get the NdbError for the NdbRef object
 	 * @see com.mysql.cluster.ndbapi.NdbRef#getNdbError()
 	 */
-	protected com.mysql.cluster.ndbj.NdbErrorRef getNdbErrorRef() { 
+	protected com.mysql.cluster.ndbj.NdbError getNdbErrorRef() { 
 		return ndbRef.getNdbError();
 	}
 

=== modified file 'java/com/mysql/cluster/ndbj/NdbTransactionImpl.java'
--- a/java/com/mysql/cluster/ndbj/NdbTransactionImpl.java	2007-09-17 01:09:47 +0000
+++ b/java/com/mysql/cluster/ndbj/NdbTransactionImpl.java	2007-09-17 02:16:25 +0000
@@ -289,7 +289,7 @@
 	 * @see NdbBaseImpl#getNdbErrorRef()
 	 */
 	@Override
-	protected NdbErrorRef getNdbErrorRef() {
+	protected NdbError getNdbErrorRef() {
 		return transRef.getNdbError();
 	}
 

=== modified file 'java/ndbj.i'
--- a/java/ndbj.i	2007-09-14 09:30:02 +0000
+++ b/java/ndbj.i	2007-09-17 02:16:25 +0000
@@ -27,7 +27,7 @@
 %rename NdbClusterConnection NdbClusterConnectionRef;
 %rename NdbColumn NdbColumnRef;
 %rename NdbDictionary NdbDictionaryRef;
-%rename NdbError NdbErrorRef;
+/*%rename NdbError NdbErrorRef;*/
 %rename NdbEventOperation NdbEventOperationRef;
 %rename NdbEvent NdbEventRef;
 %rename NdbException NdbExeptionRef;
@@ -301,30 +301,8 @@
 %include "NdbEventOperation.i"
 %include "NdbRecAttr.i"
 %include "NdbBlob.i"
+%include "NdbErrorDoc.i"
 %include "NdbError.i"
 %include "NdbScanFilter.i"
 
 
-/*%rename AbortOption AbortOptionRef; 
-%rename BaseCallback BaseCallbackRef; 
-%rename ExecType ExecTypeRef; 
-%rename NdbBlob NdbBlobRef; 
-%rename NdbClusterConnection NdbClusterConnectionRef; 
-%rename NdbColumn NdbColumnRef; 
-%rename NdbDictionary NdbDictionaryRef; 
-%rename NdbError NdbErrorRef; 
-%rename NdbEventOperation NdbEventOperationRef; 
-%rename NdbEvent NdbEventRef; 
-%rename NdbException NdbExceptionRef; 
-%rename NdbFactory NdbFactoryRef; 
-%rename NdbIndexOperation NdbIndexOperationRef; 
-%rename NdbIndexScanOperation NdbIndexScanOperationRef; 
-%rename NdbObject NdbObjectRef; 
-%rename NdbOperation NdbOperationRef; 
-%rename NdbRecAttr NdbRecAttrRef; 
-%rename Ndb NdbRef; 
-%rename NdbScanFilter NdbScanFilterRef; 
-%rename NdbScanOperation NdbScanOperationRef; 
-%rename NdbTable NdbTableRef; 
-%rename NdbTransaction NdbTransactionRef; 
-*/

=== modified file 'java/testsuite/ndbj/SelectCountTest.java'
--- a/java/testsuite/ndbj/SelectCountTest.java	2007-09-14 09:30:02 +0000
+++ b/java/testsuite/ndbj/SelectCountTest.java	2007-09-17 02:16:25 +0000
@@ -34,7 +34,7 @@
 	}
 
 	public void tearDown() throws Exception {
-		//super.tearDown();
+		super.tearDown();
 	}
 
 	/*

=== modified file 'swig/NdbMgmReply.i'
--- a/swig/NdbMgmReply.i	2007-09-06 06:59:43 +0000
+++ b/swig/NdbMgmReply.i	2007-09-17 02:16:25 +0000
@@ -24,7 +24,7 @@
 %rename ndb_mgm_reply NdbMgmReply;
 
 struct ndb_mgm_reply {
-  ndb_mgm_replay();
+  ndb_mgm_reply();
   ~ndb_mgm_reply();
   /** 0 if successful, otherwise error code. */
   int return_code;
@@ -33,7 +33,7 @@
 
 };
 
-%extend NdbMgmReply { 
+%extend ndb_mgm_reply { 
   int getReturnCode() { 
     return $self->return_code; 
   } 

=== modified file 'swig/ndbglobals.i'
--- a/swig/ndbglobals.i	2007-09-14 01:52:17 +0000
+++ b/swig/ndbglobals.i	2007-09-17 02:16:25 +0000
@@ -98,23 +98,6 @@
   Rollback = 3
 };
 
-enum NdbException {
-    BaseRuntimeError,
-    NdbApiException,
-    BlobUndefinedException,
-    NdbApiPermanentException,
-    NdbApiRuntimeException,
-    NdbApiTemporaryException,
-    NdbApiTimeStampOutOfBoundsException,
-    NdbApiUserErrorPermanentException,
-    NdbClusterConnectionPermanentException,
-    NdbClusterConnectionTemporaryException,
-    NoSuchColumnException,
-    NoSuchIndexException,
-    NoSuchTableException,
-};
-
-
 typedef void (* NdbAsynchCallback)(int, NdbTransaction*, void*);
 
 typedef const char * NdbDatetime;

Thread
Rev 155: Removed unnecessary wrapper classes around NdbError. in http://bazaar.launchpad.net/~ndb-connectors/ndb-connectors/ndbjmergeMonty Taylor18 Sep