Lab5 - done

Author: Wajktor13

lab04/lab-gui-gallery/build/classes/java/main/driver/DuckDuckGoDriver.class

@@ -14,11 +14,21 @@ public AddTransactionCommand(Transaction transactionToAdd, Account account) {
     }
     @Override
     public void execute() {
-        account.addTransaction(transactionToAdd);
+        this.account.addTransaction(transactionToAdd);
     }
 
     @Override
     public String getName() {
         return "New transaction: " + transactionToAdd.toString();
     }
+
+    @Override
+    public void undo() {
+        this.account.removeTransaction(this.transactionToAdd);
+    }
+
+    @Override
+    public void redo() {
+        this.account.addTransaction(this.transactionToAdd);
+    }
 }

lab05/command/.gradle/7.2/executionHistory/executionHistory.bin

@@ -5,4 +5,8 @@ public interface Command {
 	void execute();
 
 	String getName();
+
+	public void undo();
+
+	public void redo();
 }

lab05/command/.gradle/7.2/executionHistory/executionHistory.lock

@@ -3,9 +3,14 @@
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 
+import java.util.concurrent.ConcurrentMap;
+
 public class CommandRegistry {
 
-	private ObservableList<Command> commandStack = FXCollections
+	private final ObservableList<Command> commandStack = FXCollections
+			.observableArrayList();
+
+	private final ObservableList<Command> undoneCommandStack = FXCollections
 			.observableArrayList();
 
 	public void executeCommand(Command command) {
@@ -14,14 +19,26 @@ public void executeCommand(Command command) {
 	}
 
 	public void redo() {
-		
+		if(!this.undoneCommandStack.isEmpty()) {
+			Command latestUndoneCommand = this.undoneCommandStack.remove(this.undoneCommandStack.size() - 1);
+			latestUndoneCommand.redo();
+			this.commandStack.add(latestUndoneCommand);
+		}
 	}
 
 	public void undo() {
-		
+		if (!this.commandStack.isEmpty()) {
+			Command latestCommand = this.commandStack.remove(this.commandStack.size() - 1);
+			latestCommand.undo();
+			this.undoneCommandStack.add(latestCommand);
+		}
 	}
 
 	public ObservableList<Command> getCommandStack() {
 		return commandStack;
 	}
+
+	public void clearUndoneCommandStack() {
+		this.undoneCommandStack.clear();
+	}
 }

lab05/command/.gradle/7.2/fileHashes/fileHashes.bin

@@ -0,0 +1,35 @@
+package command;
+
+import model.Account;
+import model.Transaction;
+
+public class RemoveTransactionCommand implements Command {
+    private final Transaction transactionToRemove;
+
+    private final Account account;
+
+    public RemoveTransactionCommand(Transaction transactionToRemove, Account account) {
+        this.transactionToRemove = transactionToRemove;
+        this.account = account;
+    }
+    
+    @Override
+    public void execute() {
+        this.account.removeTransaction(transactionToRemove);
+    }
+
+    @Override
+    public String getName() {
+        return "Removed transaction: " + transactionToRemove.toString();
+    }
+
+    @Override
+    public void undo() {
+        this.account.addTransaction(this.transactionToRemove);
+    }
+
+    @Override
+    public void redo() {
+        this.account.removeTransaction(this.transactionToRemove);
+    }
+}

lab05/command/.gradle/7.2/fileHashes/fileHashes.lock

@@ -35,7 +35,7 @@ public void initRootLayout() {
 			// set initial data into controller
 			AccountOverviewController controller = loader.getController();
 			controller.setAppController(this);
-			controller.setData(DataGenerator.generateAccountData());
+			controller.setAccount(DataGenerator.generateAccountData());
 			controller.setCommandRegistry(commandRegistry);
 
 			// add layout to a scene and show them all

lab05/command/.gradle/7.2/fileHashes/resourceHashesCache.bin

@@ -4,6 +4,7 @@
 import java.time.LocalDate;
 
 import command.AddTransactionCommand;
+import command.RemoveTransactionCommand;
 import javafx.beans.binding.Bindings;
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
@@ -21,7 +22,7 @@
 
 public class AccountOverviewController {
 
-	private Account data;
+	private Account account;
 
 	private AccountAppController appController;
 
@@ -96,8 +97,13 @@ private void initialize() {
 	private void handleDeleteAction(ActionEvent event) {
 		for (Transaction transaction : transactionsTable.getSelectionModel()
 				.getSelectedItems()) {
-			data.removeTransaction(transaction);
+
+			RemoveTransactionCommand removeTransactionCommand = new RemoveTransactionCommand(transaction,
+					this.account);
+			this.commandRegistry.executeCommand(removeTransactionCommand);
 		}
+
+		commandRegistry.clearUndoneCommandStack();
 	}
 
 	@FXML
@@ -114,7 +120,7 @@ private void handleAddAction(ActionEvent event) {
 		Transaction transaction = Transaction.newTransaction();
 
 		if (appController.showTransactionEditDialog(transaction)) {
-			AddTransactionCommand addTransactionCommand = new AddTransactionCommand(transaction, data);
+			AddTransactionCommand addTransactionCommand = new AddTransactionCommand(transaction, account);
 			commandRegistry.executeCommand(addTransactionCommand);
 		}
 	}
@@ -129,9 +135,9 @@ private void handleRedoAction(ActionEvent event) {
 		commandRegistry.redo();
 	}
 
-	public void setData(Account acccount) {
-		this.data = acccount;
-		transactionsTable.setItems(data.getTransactions());
+	public void setAccount(Account acccount) {
+		this.account = acccount;
+		transactionsTable.setItems(account.getTransactions());
 	}
 
 	public void setAppController(AccountAppController appController) {