Merge pull request nus-cs2103-AY2324S1#120 from jianrong7/feat/clear-…

…command Add clear command
Chrainx · Nov 2, 2023 · 6c5294d · 6c5294d
2 parents b1b9327 + 791c0e0
commit 6c5294d
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/src/main/java/seedu/address/logic/commands/ClearCommand.java b/src/main/java/seedu/address/logic/commands/ClearCommand.java
@@ -4,20 +4,22 @@
 
 import seedu.address.model.AddressBook;
 import seedu.address.model.Model;
+import seedu.address.model.PropertyBook;
 
 /**
  * Clears the address book.
  */
 public class ClearCommand extends Command {
 
     public static final String COMMAND_WORD = "clear";
-    public static final String MESSAGE_SUCCESS = "Address book has been cleared!";
+    public static final String MESSAGE_SUCCESS = "Customer List and Property List have been cleared!";
 
 
     @Override
     public CommandResult execute(Model model) {
         requireNonNull(model);
         model.setAddressBook(new AddressBook());
+        model.setPropertyBook(new PropertyBook());
         return new CommandResult(MESSAGE_SUCCESS);
     }
 }
diff --git a/src/main/resources/view/PropertyListCard.fxml b/src/main/resources/view/PropertyListCard.fxml
@@ -30,7 +30,7 @@
       <FlowPane fx:id="tags" />
       <Label fx:id="phone" styleClass="cell_small_label" text="\$propPhone" />
       <Label fx:id="address" styleClass="cell_small_label" text="\$propAddress" />
-      <Label fx:id="budget" styleClass="cell_small_label" text="\$budget" />
+      <Label fx:id="price" styleClass="cell_small_label" text="\$budget" />
     </VBox>
   </GridPane>
 </HBox>
diff --git a/src/test/java/seedu/address/logic/commands/ClearCommandTest.java b/src/test/java/seedu/address/logic/commands/ClearCommandTest.java
@@ -9,6 +9,7 @@
 import seedu.address.model.AddressBook;
 import seedu.address.model.Model;
 import seedu.address.model.ModelManager;
+import seedu.address.model.PropertyBook;
 import seedu.address.model.UserPrefs;
 
 public class ClearCommandTest {
@@ -26,6 +27,7 @@ public void execute_nonEmptyAddressBook_success() {
         Model model = new ModelManager(getTypicalAddressBook(), getTypicalPropertyBook(), new UserPrefs());
         Model expectedModel = new ModelManager(getTypicalAddressBook(), getTypicalPropertyBook(), new UserPrefs());
         expectedModel.setAddressBook(new AddressBook());
+        expectedModel.setPropertyBook(new PropertyBook());
 
         assertCommandSuccess(new ClearCommand(), model, ClearCommand.MESSAGE_SUCCESS, expectedModel);
     }