Merge pull request #99 from jeffreygohkw/master

[BUGFIX] Fix Bug when locating a person with private address
CS2103AUG2017-W09-B2 · Oct 31, 2017 · 079aa5e · 079aa5e
2 parents e3667a9 + 86b04df
commit 079aa5e
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/collated/main/jeffreygohkw.md b/collated/main/jeffreygohkw.md
@@ -549,6 +549,7 @@ public class LocateCommand extends Command {
             + "Example: " + COMMAND_WORD + " 1";
 
     public static final String MESSAGE_LOCATE_PERSON_SUCCESS = "Searching for Person: %1$s";
+    public static final String MESSAGE_PRIVATE_ADDRESS_FAILURE = "Person %1$s has a Private Address";
 
     private final Index targetIndex;
 
@@ -564,7 +565,9 @@ public class LocateCommand extends Command {
         if (targetIndex.getZeroBased() >= lastShownList.size()) {
             throw new CommandException(Messages.MESSAGE_INVALID_PERSON_DISPLAYED_INDEX);
         }
-
+        if (model.getFilteredPersonList().get(targetIndex.getZeroBased()).getAddress().isPrivate()) {
+            throw new CommandException(String.format(MESSAGE_PRIVATE_ADDRESS_FAILURE, targetIndex.getOneBased()));
+        }
         EventsCenter.getInstance().post(new BrowserPanelLocateEvent(
                 model.getFilteredPersonList().get(targetIndex.getZeroBased())));
         return new CommandResult(String.format(MESSAGE_LOCATE_PERSON_SUCCESS, targetIndex.getOneBased()));
@@ -1101,6 +1104,9 @@ public class LocateCommandParser implements Parser<LocateCommand> {
         loadPersonPage(event.getNewSelection().person);
     }
 
+```
+###### \java\seedu\address\ui\BrowserPanel.java
+``` java
     @Subscribe
     private void handleBrowserPanelLocateEvent(BrowserPanelLocateEvent event) {
         logger.info(LogsCenter.getEventHandlingLogMessage(event));

diff --git a/src/main/java/seedu/address/logic/commands/LocateCommand.java b/src/main/java/seedu/address/logic/commands/LocateCommand.java
@@ -24,6 +24,7 @@ public class LocateCommand extends Command {
             + "Example: " + COMMAND_WORD + " 1";
 
     public static final String MESSAGE_LOCATE_PERSON_SUCCESS = "Searching for Person: %1$s";
+    public static final String MESSAGE_PRIVATE_ADDRESS_FAILURE = "Person %1$s has a Private Address";
 
     private final Index targetIndex;
 
@@ -39,7 +40,9 @@ public CommandResult execute() throws CommandException {
         if (targetIndex.getZeroBased() >= lastShownList.size()) {
             throw new CommandException(Messages.MESSAGE_INVALID_PERSON_DISPLAYED_INDEX);
         }
-
+        if (model.getFilteredPersonList().get(targetIndex.getZeroBased()).getAddress().isPrivate()) {
+            throw new CommandException(String.format(MESSAGE_PRIVATE_ADDRESS_FAILURE, targetIndex.getOneBased()));
+        }
         EventsCenter.getInstance().post(new BrowserPanelLocateEvent(
                 model.getFilteredPersonList().get(targetIndex.getZeroBased())));
         return new CommandResult(String.format(MESSAGE_LOCATE_PERSON_SUCCESS, targetIndex.getOneBased()));

diff --git a/src/main/java/seedu/address/ui/BrowserPanel.java b/src/main/java/seedu/address/ui/BrowserPanel.java
@@ -105,6 +105,7 @@ private void handlePersonPanelSelectionChangedEvent(PersonPanelSelectionChangedE
         loadPersonPage(event.getNewSelection().person);
     }
 
+    //@@author jeffreygohkw
     @Subscribe
     private void handleBrowserPanelLocateEvent(BrowserPanelLocateEvent event) {
         logger.info(LogsCenter.getEventHandlingLogMessage(event));