Merge pull request #93 from hsiaojietng/add-favourite-window-feature

Fix accidental deletion of buyer/seller labels and exit command's beh…
AY2122S2-CS2103-W16-4 · Mar 22, 2022 · 0d04112 · 0d04112
2 parents 4a5e59a + f00c287
commit 0d04112
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/src/main/java/seedu/address/logic/commands/ExitCommand.java b/src/main/java/seedu/address/logic/commands/ExitCommand.java
@@ -13,7 +13,7 @@ public class ExitCommand extends Command {
 
     @Override
     public CommandResult execute(Model model) {
-        return new CommandResult(MESSAGE_EXIT_ACKNOWLEDGEMENT, false, false, true, false);
+        return new CommandResult(MESSAGE_EXIT_ACKNOWLEDGEMENT, false, false, false, true);
     }
 
 }
diff --git a/src/main/resources/view/PersonListCard.fxml b/src/main/resources/view/PersonListCard.fxml
@@ -32,7 +32,8 @@
           <Label fx:id="name" styleClass="cell_big_label" text="\$first" />
         </HBox>
         <VBox>
-          <FlowPane fx:id="userType" />
+          <Label fx:id="seller"/>
+          <Label fx:id="buyer"/>
           <Label fx:id="phone" styleClass="cell_small_label" text="\$phone" />
           <Label fx:id="address" styleClass="cell_small_label" text="\$address" />
           <Label fx:id="email" styleClass="cell_small_label" text="\$email" />

diff --git a/src/test/java/seedu/address/logic/commands/CommandResultTest.java b/src/test/java/seedu/address/logic/commands/CommandResultTest.java
@@ -32,10 +32,10 @@ public void equals() {
         assertFalse(commandResult.equals(new CommandResult("feedback", true, false, false, false)));
 
         // different showFavourites value -> returns false
-        assertFalse(commandResult.equals(new CommandResult("feedback", true, false, true, false)));
+        assertFalse(commandResult.equals(new CommandResult("feedback", false, false, true, false)));
 
         // different exit value -> returns false
-        assertFalse(commandResult.equals(new CommandResult("feedback", false, false, true, false)));
+        assertFalse(commandResult.equals(new CommandResult("feedback", false, false, false, true)));
     }
 
     @Test
@@ -55,6 +55,6 @@ public void hashcode() {
         assertNotEquals(commandResult.hashCode(), new CommandResult("feedback", false, false, true, false).hashCode());
 
         // different exit value -> returns different hashcode
-        assertNotEquals(commandResult.hashCode(), new CommandResult("feedback", false, false, true, false).hashCode());
+        assertNotEquals(commandResult.hashCode(), new CommandResult("feedback", false, false, false, true).hashCode());
     }
 }
diff --git a/src/test/java/seedu/address/logic/commands/ExitCommandTest.java b/src/test/java/seedu/address/logic/commands/ExitCommandTest.java
@@ -15,7 +15,7 @@ public class ExitCommandTest {
     @Test
     public void execute_exit_success() {
         CommandResult expectedCommandResult = new CommandResult(MESSAGE_EXIT_ACKNOWLEDGEMENT,
-                false, false, true, false);
+                false, false, false, true);
         assertCommandSuccess(new ExitCommand(), model, expectedCommandResult, expectedModel);
     }
 }