Renamed MTransactionSqlException to MSqlTransactionException.
authorMarco Zanon <info@marcozanon.com>
Thu, 22 Oct 2015 13:16:29 +0000 (13:16 +0000)
committerMarco Zanon <info@marcozanon.com>
Thu, 22 Oct 2015 13:16:29 +0000 (13:16 +0000)
4.x/src/java/com/marcozanon/macaco/sql/MSqlConnection.java
4.x/src/java/com/marcozanon/macaco/sql/MSqlTransactionException.java [new file with mode: 0644]
4.x/src/java/com/marcozanon/macaco/sql/MTransactionSqlException.java [deleted file]

index 63424a5a57105629a787707b19e71316b2720d25..8a2d4f85c9ba5c79e1122c823c26e6144b4d9d2e 100644 (file)
@@ -143,9 +143,9 @@ public class MSqlConnection extends MObject {
         return this.transactionStatus;
     }
 
-    public void startTransaction() throws MTransactionSqlException {
+    public void startTransaction() throws MSqlTransactionException {
         if (MSqlConnection.TransactionStatus.CLOSED != this.getTransactionStatus()) {
-            throw new MTransactionSqlException("Nested transactions not allowed.");
+            throw new MSqlTransactionException("Nested transactions not allowed.");
         }
         try {
             this.getConnectionReference().setTransactionIsolation(Connection.TRANSACTION_SERIALIZABLE);
@@ -153,13 +153,13 @@ public class MSqlConnection extends MObject {
             this.setTransactionStatus(MSqlConnection.TransactionStatus.SUCCESSFUL);
         }
         catch (SQLException exception) {
-            throw new MTransactionSqlException("Could not start transaction.", exception);
+            throw new MSqlTransactionException("Could not start transaction.", exception);
         }
     }
 
-    public void rollBackTransaction() throws MTransactionSqlException {
+    public void rollBackTransaction() throws MSqlTransactionException {
         if (MSqlConnection.TransactionStatus.CLOSED == this.getTransactionStatus()) {
-            throw new MTransactionSqlException("Transaction not started.");
+            throw new MSqlTransactionException("Transaction not started.");
         }
         try {
             this.getConnectionReference().rollback();
@@ -168,11 +168,11 @@ public class MSqlConnection extends MObject {
         }
         catch (SQLException exception) {
             this.setTransactionStatus(MSqlConnection.TransactionStatus.FAILED);
-            throw new MTransactionSqlException("Could not roll back transaction.", exception);
+            throw new MSqlTransactionException("Could not roll back transaction.", exception);
         }
     }
 
-    public MSqlConnection.TransactionStatus commitTransaction() throws MTransactionSqlException {
+    public MSqlConnection.TransactionStatus commitTransaction() throws MSqlTransactionException {
         switch (this.getTransactionStatus()) {
             case SUCCESSFUL:
                 try {
@@ -189,7 +189,7 @@ public class MSqlConnection extends MObject {
                 this.rollBackTransaction();
                 return MSqlConnection.TransactionStatus.FAILED;
             default: // instead of "case CLOSED:" (necessary to avoid Java compilation errors)
-                throw new MTransactionSqlException("Transaction not started.");
+                throw new MSqlTransactionException("Transaction not started.");
         }
     }
 
diff --git a/4.x/src/java/com/marcozanon/macaco/sql/MSqlTransactionException.java b/4.x/src/java/com/marcozanon/macaco/sql/MSqlTransactionException.java
new file mode 100644 (file)
index 0000000..62773e1
--- /dev/null
@@ -0,0 +1,30 @@
+/**
+ * Macaco
+ * Copyright (c) 2009-2015 Marco Zanon <info@marcozanon.com>.
+ * Released under MIT license (see LICENSE for details).
+ */
+
+package com.marcozanon.macaco.sql;
+
+@SuppressWarnings("serial")
+public class MSqlTransactionException extends MSqlException {
+
+    /* */
+
+    public MSqlTransactionException() {
+        super();
+    }
+
+    public MSqlTransactionException(String message) {
+        super(message);
+    }
+
+    public MSqlTransactionException(Throwable error) {
+        super(error);
+    }
+
+    public MSqlTransactionException(String message, Throwable error) {
+        super(message, error);
+    }
+
+}
diff --git a/4.x/src/java/com/marcozanon/macaco/sql/MTransactionSqlException.java b/4.x/src/java/com/marcozanon/macaco/sql/MTransactionSqlException.java
deleted file mode 100644 (file)
index 2987b4b..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-/**
- * Macaco
- * Copyright (c) 2009-2015 Marco Zanon <info@marcozanon.com>.
- * Released under MIT license (see LICENSE for details).
- */
-
-package com.marcozanon.macaco.sql;
-
-@SuppressWarnings("serial")
-public class MTransactionSqlException extends MSqlException {
-
-    /* */
-
-    public MTransactionSqlException() {
-        super();
-    }
-
-    public MTransactionSqlException(String message) {
-        super(message);
-    }
-
-    public MTransactionSqlException(Throwable error) {
-        super(error);
-    }
-
-    public MTransactionSqlException(String message, Throwable error) {
-        super(message, error);
-    }
-
-}