Updated ToggleMovement methods

MerchantRPGCSE2102/src/controller/RPGame.java

@@ -130,8 +130,8 @@ public void createTransaction(Player player, Merchant targetMerchant)
 		if(_transactionLimit > 0)
 		{
 			toggleMovement("OFF");
-			Transaction newTransaction = new Transaction(player, targetMerchant);
-			toggleMovement("ON");
+			System.out.println("Transaction Begining");
+			Transaction newTransaction = new Transaction(player, targetMerchant, this);
 			_transactionLimit -= 1;
 		}
 		else

MerchantRPGCSE2102/src/controller/Transaction.java

@@ -12,11 +12,13 @@ public class Transaction
 	private Player _player;
 	private Merchant _targetMerchant;
 	private TransactionUI _window;
+	private RPGame _game;
 
-	public Transaction(Player player, Merchant targetMerchant)
+	public Transaction(Player player, Merchant targetMerchant, RPGame game)
 	{
 		_player = player;
 		_targetMerchant = targetMerchant;
+		_game = game;
 		_window = new TransactionUI(this);
 		_window.setVisible(true);
 	}
@@ -61,16 +63,6 @@ public boolean actionSell(String itemName, int amount) throws NotInInventoryExce
 			return false;
 	}
 
-	/**
-	 * This method will push a true up to the class calling it
-	 * incomplete method
-	 * @return returns true
-	 */
-	public boolean actionCancel()
-	{
-		return true;
-	}
-
 	/**
 	 * Searches the player inventory for the item matching the item name
 	 * @param itemName		name of the item
@@ -91,6 +83,14 @@ public Item searchMerchantInventory(String itemName)
 		return _targetMerchant.getItem(itemName);
 	}
 
+	/**
+	 * Toggles the RPGame movement back on
+	 */
+	public void endTransaction()
+	{
+		_game.toggleMovement("ON");
+	}
+
 	/**
 	 * Returns the player in transaction
 	 * @return returns the player

MerchantRPGCSE2102/src/view/TransactionUI.java

@@ -66,7 +66,7 @@ public void mouseReleased(MouseEvent e) {
 			public void mouseReleased(MouseEvent e) {
 				System.out.println("Cancel");							//temporary test code
 
-				MASTER.actionCancel();
+				MASTER.endTransaction();
 				exitWindow();										//Will end the transaction main screen but only if player does not have another transaction screen open
 			}
 		});