[v1.1][F12-B1] NUS F&T

docs/DeveloperGuide.adoc

@@ -10,7 +10,7 @@ ifdef::env-github[]
 :tip-caption: :bulb:
 :note-caption: :information_source:
 endif::[]
-:repoURL: https://github.com/se-edu/addressbook-level4/tree/master
+:repoURL: https://github.com/CS2103JAN2018-F12-B1/main/tree/master
 
 By: `Team SE-EDU`      Since: `Jun 2016`      Licence: `MIT`
 

docs/UserGuide.adoc

@@ -11,7 +11,7 @@ ifdef::env-github[]
 :tip-caption: :bulb:
 :note-caption: :information_source:
 endif::[]
-:repoURL: https://github.com/se-edu/addressbook-level4
+:repoURL: https://github.com/CS2103JAN2018-F12-B1/main
 
 By: `Team SE-EDU`      Since: `Jun 2016`      Licence: `MIT`
 

src/main/java/seedu/address/commons/core/LogsCenter.java

@@ -1,9 +1,9 @@
 package seedu.address.commons.core;
 
 import java.io.IOException;
+import java.util.Arrays;
 import java.util.logging.ConsoleHandler;
 import java.util.logging.FileHandler;
-import java.util.logging.Handler;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.logging.SimpleFormatter;
@@ -76,10 +76,8 @@ private static void addConsoleHandler(Logger logger) {
      * Remove all the handlers from {@code logger}.
      */
     private static void removeHandlers(Logger logger) {
-        Handler[] handlers = logger.getHandlers();
-        for (Handler handler : handlers) {
-            logger.removeHandler(handler);
-        }
+        Arrays.stream(logger.getHandlers())
+                .forEach(logger::removeHandler);
     }
 
     /**

src/main/java/seedu/address/commons/util/CollectionUtil.java

@@ -4,9 +4,7 @@
 
 import java.util.Arrays;
 import java.util.Collection;
-import java.util.HashSet;
 import java.util.Objects;
-import java.util.Set;
 import java.util.stream.Stream;
 
 /**
@@ -39,13 +37,6 @@ public static boolean isAnyNonNull(Object... items) {
      * Returns true if every element in a collection are unique by {@link Object#equals(Object)}.
      */
     public static boolean elementsAreUnique(Collection<?> items) {
-        final Set<Object> testSet = new HashSet<>();
-        for (Object item : items) {
-            final boolean itemAlreadyExists = !testSet.add(item); // see Set documentation
-            if (itemAlreadyExists) {
-                return false;
-            }
-        }
-        return true;
+        return items.size() == items.stream().distinct().count();
     }
 }

src/main/java/seedu/address/commons/util/StringUtil.java

@@ -5,6 +5,7 @@
 
 import java.io.PrintWriter;
 import java.io.StringWriter;
+import java.util.Arrays;
 
 /**
  * Helper functions for handling strings.
@@ -33,12 +34,8 @@ public static boolean containsWordIgnoreCase(String sentence, String word) {
         String preppedSentence = sentence;
         String[] wordsInPreppedSentence = preppedSentence.split("\\s+");
 
-        for (String wordInSentence: wordsInPreppedSentence) {
-            if (wordInSentence.equalsIgnoreCase(preppedWord)) {
-                return true;
-            }
-        }
-        return false;
+        return Arrays.stream(wordsInPreppedSentence)
+                .anyMatch(preppedWord::equalsIgnoreCase);
     }
 
     /**

src/main/java/seedu/address/logic/parser/ArgumentTokenizer.java

@@ -1,7 +1,9 @@
 package seedu.address.logic.parser;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * Tokenizes arguments string of the form: {@code preamble <prefix>value <prefix>value ...}<br>
@@ -34,13 +36,9 @@ public static ArgumentMultimap tokenize(String argsString, Prefix... prefixes) {
      * @return           List of zero-based prefix positions in the given arguments string
      */
     private static List<PrefixPosition> findAllPrefixPositions(String argsString, Prefix... prefixes) {
-        List<PrefixPosition> positions = new ArrayList<>();
-
-        for (Prefix prefix : prefixes) {
-            positions.addAll(findPrefixPositions(argsString, prefix));
-        }
-
-        return positions;
+        return Arrays.stream(prefixes)
+                .flatMap(prefix -> findPrefixPositions(argsString, prefix).stream())
+                .collect(Collectors.toList());
     }
 
     /**

src/main/java/seedu/address/model/AddressBook.java

@@ -139,12 +139,8 @@ private Person syncWithMasterTagList(Person person) {
      * Removes {@code key} from this {@code AddressBook}.
      * @throws PersonNotFoundException if the {@code key} is not in this {@code AddressBook}.
      */
-    public boolean removePerson(Person key) throws PersonNotFoundException {
-        if (persons.remove(key)) {
-            return true;
-        } else {
-            throw new PersonNotFoundException();
-        }
+    public void removePerson(Person key) throws PersonNotFoundException {
+        persons.remove(key);
     }
 
     //// tag-level operations

src/main/java/seedu/address/model/person/UniquePersonList.java

@@ -72,13 +72,11 @@ public void setPerson(Person target, Person editedPerson)
      *
      * @throws PersonNotFoundException if no such person could be found in the list.
      */
-    public boolean remove(Person toRemove) throws PersonNotFoundException {
+    public void remove(Person toRemove) throws PersonNotFoundException {
         requireNonNull(toRemove);
-        final boolean personFoundAndDeleted = internalList.remove(toRemove);
-        if (!personFoundAndDeleted) {
+        if (!internalList.remove(toRemove)) {
             throw new PersonNotFoundException();
         }
-        return personFoundAndDeleted;
     }
 
     public void setPersons(UniquePersonList replacement) {
@@ -87,11 +85,11 @@ public void setPersons(UniquePersonList replacement) {
 
     public void setPersons(List<Person> persons) throws DuplicatePersonException {
         requireAllNonNull(persons);
-        final UniquePersonList replacement = new UniquePersonList();
-        for (final Person person : persons) {
-            replacement.add(person);
+        if (!CollectionUtil.elementsAreUnique(persons)) {
+            throw new DuplicatePersonException();
         }
-        setPersons(replacement);
+
+        this.internalList.setAll(persons);
     }
 
     /**

src/main/java/seedu/address/model/util/SampleDataUtil.java

@@ -1,7 +1,8 @@
 package seedu.address.model.util;
 
-import java.util.HashSet;
+import java.util.Arrays;
 import java.util.Set;
+import java.util.stream.Collectors;
 
 import seedu.address.model.AddressBook;
 import seedu.address.model.ReadOnlyAddressBook;
@@ -56,12 +57,9 @@ public static ReadOnlyAddressBook getSampleAddressBook() {
      * Returns a tag set containing the list of strings given.
      */
     public static Set<Tag> getTagSet(String... strings) {
-        HashSet<Tag> tags = new HashSet<>();
-        for (String s : strings) {
-            tags.add(new Tag(s));
-        }
-
-        return tags;
+        return Arrays.stream(strings)
+                .map(Tag::new)
+                .collect(Collectors.toSet());
     }
 
 }

src/main/java/seedu/address/storage/XmlAdaptedPerson.java

@@ -5,6 +5,7 @@
 import java.util.List;
 import java.util.Objects;
 import java.util.Set;
+import java.util.stream.Collectors;
 
 import javax.xml.bind.annotation.XmlElement;
 
@@ -64,10 +65,9 @@ public XmlAdaptedPerson(Person source) {
         phone = source.getPhone().value;
         email = source.getEmail().value;
         address = source.getAddress().value;
-        tagged = new ArrayList<>();
-        for (Tag tag : source.getTags()) {
-            tagged.add(new XmlAdaptedTag(tag));
-        }
+        tagged = source.getTags().stream()
+                .map(XmlAdaptedTag::new)
+                .collect(Collectors.toList());
     }
 
     /**

src/main/resources/view/MainWindow.fxml

@@ -12,7 +12,7 @@
 <?import javafx.scene.layout.VBox?>
 
 <fx:root type="javafx.stage.Stage" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1"
-         minWidth="450" minHeight="600">
+         minWidth="450" minHeight="600" onCloseRequest="#handleExit">
   <icons>
     <Image url="@/images/address_book_32.png" />
   </icons>

src/test/java/seedu/address/ui/MainWindowCloseTest.java

@@ -0,0 +1,83 @@
+package seedu.address.ui;
+
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.testfx.api.FxToolkit;
+
+import guitests.guihandles.StageHandle;
+import javafx.stage.Stage;
+import javafx.stage.WindowEvent;
+import seedu.address.commons.core.Config;
+import seedu.address.commons.events.ui.ExitAppRequestEvent;
+import seedu.address.logic.LogicManager;
+import seedu.address.model.ModelManager;
+import seedu.address.model.UserPrefs;
+import seedu.address.ui.testutil.EventsCollectorRule;
+
+/**
+ * Contains tests for closing of the {@code MainWindow}.
+ */
+public class MainWindowCloseTest extends GuiUnitTest {
+    @Rule
+    public final EventsCollectorRule eventsCollectorRule = new EventsCollectorRule();
+
+    private MainWindow mainWindow;
+    private EmptyMainWindowHandle mainWindowHandle;
+    private Stage stage;
+
+    @Before
+    public void setUp() throws Exception {
+        FxToolkit.setupStage(stage -> {
+            this.stage = stage;
+            mainWindow = new MainWindow(stage, new Config(), new UserPrefs(), new LogicManager(new ModelManager()));
+            mainWindowHandle = new EmptyMainWindowHandle(stage);
+
+            stage.setScene(mainWindow.getRoot().getScene());
+            mainWindowHandle.focus();
+        });
+        FxToolkit.showStage();
+    }
+
+    @Test
+    public void close_menuBarExitButton_exitAppRequestEventPosted() {
+        mainWindowHandle.clickOnMenuExitButton();
+        assertTrue(eventsCollectorRule.eventsCollector.getMostRecent() instanceof ExitAppRequestEvent);
+        assertTrue(eventsCollectorRule.eventsCollector.getSize() == 1);
+    }
+
+    @Test
+    public void close_externalRequest_exitAppRequestEventPosted() {
+        mainWindowHandle.closeMainWindowExternally();
+        assertTrue(eventsCollectorRule.eventsCollector.getMostRecent() instanceof ExitAppRequestEvent);
+        assertTrue(eventsCollectorRule.eventsCollector.getSize() == 1);
+    }
+
+    /**
+     * A handle for an empty {@code MainWindow}. The components in {@code MainWindow} are not initialized.
+     */
+    private class EmptyMainWindowHandle extends StageHandle {
+
+        private EmptyMainWindowHandle(Stage stage) {
+            super(stage);
+        }
+
+        /**
+         * Closes the {@code MainWindow} by clicking on the menu bar's exit button.
+         */
+        private void clickOnMenuExitButton() {
+            guiRobot.clickOn("File");
+            guiRobot.clickOn("Exit");
+        }
+
+        /**
+         * Closes the {@code MainWindow} through an external request {@code MainWindow} (e.g pressing the 'X' button on
+         * the {@code MainWindow} or closing the app through the taskbar).
+         */
+        private void closeMainWindowExternally() {
+            guiRobot.interact(() -> stage.fireEvent(new WindowEvent(stage, WindowEvent.WINDOW_CLOSE_REQUEST)));
+        }
+    }
+}