From 6c5a6c92ea4e674701c5d95e93fa282c7edff016 Mon Sep 17 00:00:00 2001 From: Marco Zanon Date: Thu, 22 Oct 2015 13:16:29 +0000 Subject: [PATCH] Renamed MTransactionSqlException to MSqlTransactionException. --- .../marcozanon/macaco/sql/MSqlConnection.java | 16 ++++++++-------- ...eption.java => MSqlTransactionException.java} | 10 +++++----- 2 files changed, 13 insertions(+), 13 deletions(-) rename src/java/com/marcozanon/macaco/sql/{MTransactionSqlException.java => MSqlTransactionException.java} (55%) diff --git a/src/java/com/marcozanon/macaco/sql/MSqlConnection.java b/src/java/com/marcozanon/macaco/sql/MSqlConnection.java index 63424a5..8a2d4f8 100644 --- a/src/java/com/marcozanon/macaco/sql/MSqlConnection.java +++ b/src/java/com/marcozanon/macaco/sql/MSqlConnection.java @@ -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/src/java/com/marcozanon/macaco/sql/MTransactionSqlException.java b/src/java/com/marcozanon/macaco/sql/MSqlTransactionException.java similarity index 55% rename from src/java/com/marcozanon/macaco/sql/MTransactionSqlException.java rename to src/java/com/marcozanon/macaco/sql/MSqlTransactionException.java index 2987b4b..62773e1 100644 --- a/src/java/com/marcozanon/macaco/sql/MTransactionSqlException.java +++ b/src/java/com/marcozanon/macaco/sql/MSqlTransactionException.java @@ -7,23 +7,23 @@ package com.marcozanon.macaco.sql; @SuppressWarnings("serial") -public class MTransactionSqlException extends MSqlException { +public class MSqlTransactionException extends MSqlException { /* */ - public MTransactionSqlException() { + public MSqlTransactionException() { super(); } - public MTransactionSqlException(String message) { + public MSqlTransactionException(String message) { super(message); } - public MTransactionSqlException(Throwable error) { + public MSqlTransactionException(Throwable error) { super(error); } - public MTransactionSqlException(String message, Throwable error) { + public MSqlTransactionException(String message, Throwable error) { super(message, error); } -- 2.30.2