From 2c029953c0dae65b37b907aafbcf6d0dafc6692a Mon Sep 17 00:00:00 2001 From: nichee Date: Tue, 9 Apr 2024 02:34:47 +0800 Subject: [PATCH 1/2] Remove redundant code --- .../seedu/address/logic/commands/RemoveClassCommand.java | 5 ++--- src/main/java/seedu/address/model/ModelManager.java | 6 ------ 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/src/main/java/seedu/address/logic/commands/RemoveClassCommand.java b/src/main/java/seedu/address/logic/commands/RemoveClassCommand.java index ea4d338e315..03e12b07dac 100644 --- a/src/main/java/seedu/address/logic/commands/RemoveClassCommand.java +++ b/src/main/java/seedu/address/logic/commands/RemoveClassCommand.java @@ -28,11 +28,11 @@ public class RemoveClassCommand extends Command { public static final String MESSAGE_DELETE_PERSON_SUCCESS = "Deleted Class: %1$s"; private final Index targetIndex; - private ViewClassesCommand viewClassesCommand; + // private ViewClassesCommand viewClassesCommand; public RemoveClassCommand(Index targetIndex) { this.targetIndex = targetIndex; - this.viewClassesCommand = new ViewClassesCommand(); + // this.viewClassesCommand = new ViewClassesCommand(); } @Override @@ -47,7 +47,6 @@ public CommandResult execute(Model model) throws CommandException { Classes classToDelete = lastShownList.get(targetIndex.getZeroBased()); model.removeClass(classToDelete); return new CommandResult(String.format(MESSAGE_DELETE_PERSON_SUCCESS, Messages.classFormat(classToDelete))); - } @Override diff --git a/src/main/java/seedu/address/model/ModelManager.java b/src/main/java/seedu/address/model/ModelManager.java index 62b2e611e30..2e13f9388d8 100644 --- a/src/main/java/seedu/address/model/ModelManager.java +++ b/src/main/java/seedu/address/model/ModelManager.java @@ -267,7 +267,6 @@ public void selectClass(Classes classes) { requireNonNull(classes); selectedClass = classes; - // selectedClassAddressBook = selectedClass.getAddressBook(); this.storage = new JsonAddressBookStorage(selectedClass.getFilePath()); userPrefs.setAddressBookFilePath(selectedClass.getFilePath()); @@ -287,12 +286,7 @@ public void selectClass(Classes classes) { } filteredPersons = new FilteredList<>(this.selectedClassAddressBook.getPersonList()); - - // Predicate predicate = person -> selectedClassAddressBook.getPersonList().contains(person); updateFilteredPersonList(PREDICATE_SHOW_ALL_PERSONS); - for (UiUpdateListener listener : uiUpdateListeners) { - listener.updateUi(); - } notifyUiUpdateListeners(); } From 90a4df3820fb707eb59524c2443d334af065ab6e Mon Sep 17 00:00:00 2001 From: nichee Date: Tue, 9 Apr 2024 03:05:19 +0800 Subject: [PATCH 2/2] Update remove class function to hide the filepath in the UI --- .../address/logic/commands/RemoveClassCommand.java | 8 +++++--- src/main/java/seedu/address/model/ModelManager.java | 3 +++ src/main/java/seedu/address/ui/UiManager.java | 11 ----------- 3 files changed, 8 insertions(+), 14 deletions(-) diff --git a/src/main/java/seedu/address/logic/commands/RemoveClassCommand.java b/src/main/java/seedu/address/logic/commands/RemoveClassCommand.java index 03e12b07dac..f458ad367f2 100644 --- a/src/main/java/seedu/address/logic/commands/RemoveClassCommand.java +++ b/src/main/java/seedu/address/logic/commands/RemoveClassCommand.java @@ -28,11 +28,9 @@ public class RemoveClassCommand extends Command { public static final String MESSAGE_DELETE_PERSON_SUCCESS = "Deleted Class: %1$s"; private final Index targetIndex; - // private ViewClassesCommand viewClassesCommand; public RemoveClassCommand(Index targetIndex) { this.targetIndex = targetIndex; - // this.viewClassesCommand = new ViewClassesCommand(); } @Override @@ -46,7 +44,11 @@ public CommandResult execute(Model model) throws CommandException { Classes classToDelete = lastShownList.get(targetIndex.getZeroBased()); model.removeClass(classToDelete); - return new CommandResult(String.format(MESSAGE_DELETE_PERSON_SUCCESS, Messages.classFormat(classToDelete))); + return new CommandResult(String.format(MESSAGE_DELETE_PERSON_SUCCESS, + Messages.classFormat(classToDelete)) + + "\nUse the 'view' command to see your remaining classes!" + + ); } @Override diff --git a/src/main/java/seedu/address/model/ModelManager.java b/src/main/java/seedu/address/model/ModelManager.java index 2e13f9388d8..06f1ce6d967 100644 --- a/src/main/java/seedu/address/model/ModelManager.java +++ b/src/main/java/seedu/address/model/ModelManager.java @@ -5,6 +5,7 @@ import java.io.IOException; import java.nio.file.Path; +import java.nio.file.Paths; import java.util.ArrayList; import java.util.List; import java.util.Optional; @@ -181,6 +182,7 @@ public void createClass(Classes classes) { public void removeClass(Classes classes) { hideStudentsUi(); classBook.removeClass(classes); + userPrefs.setAddressBookFilePath(Paths.get("")); notifyUiUpdateListeners(); } @@ -230,6 +232,7 @@ public void updateFilteredPersonList(Predicate predicate) { requireNonNull(predicate); filteredPersons.setPredicate(predicate); notifyUiUpdateListeners(); + } @Override diff --git a/src/main/java/seedu/address/ui/UiManager.java b/src/main/java/seedu/address/ui/UiManager.java index dfba3c93ad7..586c8532bbc 100644 --- a/src/main/java/seedu/address/ui/UiManager.java +++ b/src/main/java/seedu/address/ui/UiManager.java @@ -99,15 +99,4 @@ public void updateUi() { logger.severe("Error updating UI on class selection: " + e.getMessage()); } } - - -// @Override -// public void updateUiOnView() { -// try { -// mainWindow.fillInnerParts(); // Fill the inner parts of the main window -// } catch (Exception e) { -// logger.severe("Error updating UI on view command: " + e.getMessage()); -// } -// } - }