Merge pull request AY2425S1-CS2103T-T11-2#282 from currynia/branch-b

Update view command
SwaminathanViswa · Nov 8, 2024 · f2bd627 · f2bd627
2 parents b340f50 + 491769a
commit f2bd627
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/src/main/java/seedu/address/logic/commands/ViewCommand.java b/src/main/java/seedu/address/logic/commands/ViewCommand.java
@@ -37,12 +37,11 @@ public class ViewCommand extends Command {
     public static final String CLOSE_VIEW_ACKNOWLEDGMENT = "Closing view of contact";
     private static final ViewCommand closeView = new ViewCommand();
     private static final CommandResult closeViewResult = new CommandResult(CLOSE_VIEW_ACKNOWLEDGMENT, null, true);
-
+    private static ListChangeListener<Person> listener;
     private final Name personName;
     private final boolean isClose;
 
 
-
     /**
      * @param name Name of the contact.
      */
@@ -66,6 +65,9 @@ public static CommandResult getCloseViewResult() {
 
     @Override
     public CommandResult execute(Model model) throws CommandException {
+        if (listener != null) {
+            model.getAddressBook().getPersonList().removeListener(listener);
+        }
         if (isClose) {
             return closeViewResult;
         }
@@ -80,12 +82,12 @@ public CommandResult execute(Model model) throws CommandException {
 
     private CommandResult createCommandResult(Model model) {
         ObjectProperty<Person> person = new SimpleObjectProperty<>(model.getPerson(personName).orElseThrow());
-        ListChangeListener<Person> listener = change -> {
+        listener = change -> {
             while (change.next()) {
-                if (change.wasAdded() || change.wasRemoved()) {
+                if (change.wasRemoved()) {
                     person.set(null);
                     model.getPerson(personName).ifPresentOrElse(
-                            person::set, () -> {});
+                            person::set, () -> model.getAddressBook().getPersonList().removeListener(listener));
 
                 }
             }