Merge pull request #66 from AY1920S1-CS2103T-F13-4/revert-65-branch-c…

…aleb-v1.2

Revert "Branch caleb v1.2"

build.gradle

@@ -15,18 +15,14 @@ plugins {
 }
 
 // Specifies the entry point of the application
-mainClassName = 'seedu.ezwatchlist.Main'
+mainClassName = 'seedu.address.Main'
 
 sourceCompatibility = JavaVersion.VERSION_11
 targetCompatibility = JavaVersion.VERSION_11
 
 repositories {
     mavenCentral()
     maven { url 'https://oss.sonatype.org/content/repositories/snapshots/' }
-    maven {
-        url  "https://jcenter.bintray.com"
-    }
-    jcenter()
 }
 
 checkstyle {
@@ -68,14 +64,10 @@ dependencies {
     testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: jUnitVersion
 
     testRuntimeOnly group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: jUnitVersion
-
-    compile group: 'info.movito', name: 'themoviedbapi', version:'1.9'
-    compile group: 'org.slf4j', name: 'slf4j-log4j12', version: '1.7.28'
-    compile group: 'ch.qos.logback', name:'logback-core', version: '1.0.9'
 }
 
 shadowJar {
-    archiveName = 'ezwatchlist.jar'
+    archiveName = 'addressbook.jar'
 
     destinationDir = file("${buildDir}/jar/")
 }

src/main/java/seedu/ezwatchlist/AppParameters.java → src/main/java/seedu/address/AppParameters.java

@@ -1,4 +1,4 @@
-package seedu.ezwatchlist;
+package seedu.address;
 
 import java.nio.file.Path;
 import java.nio.file.Paths;
@@ -7,8 +7,8 @@
 import java.util.logging.Logger;
 
 import javafx.application.Application;
-import seedu.ezwatchlist.commons.core.LogsCenter;
-import seedu.ezwatchlist.commons.util.FileUtil;
+import seedu.address.commons.core.LogsCenter;
+import seedu.address.commons.util.FileUtil;
 
 /**
  * Represents the parsed command-line parameters given to the application.

src/main/java/seedu/ezwatchlist/Main.java → src/main/java/seedu/address/Main.java

@@ -1,4 +1,4 @@
-package seedu.ezwatchlist;
+package seedu.address;
 
 import javafx.application.Application;
 

src/main/java/seedu/ezwatchlist/MainApp.java → src/main/java/seedu/address/MainApp.java

@@ -1,4 +1,4 @@
-package seedu.ezwatchlist;
+package seedu.address;
 
 import java.io.IOException;
 import java.nio.file.Path;
@@ -7,29 +7,29 @@
 
 import javafx.application.Application;
 import javafx.stage.Stage;
-import seedu.ezwatchlist.commons.core.Config;
-import seedu.ezwatchlist.commons.core.LogsCenter;
-import seedu.ezwatchlist.commons.core.Version;
-import seedu.ezwatchlist.commons.exceptions.DataConversionException;
-import seedu.ezwatchlist.commons.util.ConfigUtil;
-import seedu.ezwatchlist.commons.util.StringUtil;
-import seedu.ezwatchlist.logic.Logic;
-import seedu.ezwatchlist.logic.LogicManager;
-import seedu.ezwatchlist.model.AddressBook;
-import seedu.ezwatchlist.model.Model;
-import seedu.ezwatchlist.model.ModelManager;
-import seedu.ezwatchlist.model.ReadOnlyAddressBook;
-import seedu.ezwatchlist.model.ReadOnlyUserPrefs;
-import seedu.ezwatchlist.model.UserPrefs;
-import seedu.ezwatchlist.model.util.SampleDataUtil;
-import seedu.ezwatchlist.storage.AddressBookStorage;
-import seedu.ezwatchlist.storage.JsonAddressBookStorage;
-import seedu.ezwatchlist.storage.JsonUserPrefsStorage;
-import seedu.ezwatchlist.storage.Storage;
-import seedu.ezwatchlist.storage.StorageManager;
-import seedu.ezwatchlist.storage.UserPrefsStorage;
-import seedu.ezwatchlist.ui.Ui;
-import seedu.ezwatchlist.ui.UiManager;
+import seedu.address.commons.core.Config;
+import seedu.address.commons.core.LogsCenter;
+import seedu.address.commons.core.Version;
+import seedu.address.commons.exceptions.DataConversionException;
+import seedu.address.commons.util.ConfigUtil;
+import seedu.address.commons.util.StringUtil;
+import seedu.address.logic.Logic;
+import seedu.address.logic.LogicManager;
+import seedu.address.model.AddressBook;
+import seedu.address.model.Model;
+import seedu.address.model.ModelManager;
+import seedu.address.model.ReadOnlyAddressBook;
+import seedu.address.model.ReadOnlyUserPrefs;
+import seedu.address.model.UserPrefs;
+import seedu.address.model.util.SampleDataUtil;
+import seedu.address.storage.AddressBookStorage;
+import seedu.address.storage.JsonAddressBookStorage;
+import seedu.address.storage.JsonUserPrefsStorage;
+import seedu.address.storage.Storage;
+import seedu.address.storage.StorageManager;
+import seedu.address.storage.UserPrefsStorage;
+import seedu.address.ui.Ui;
+import seedu.address.ui.UiManager;
 
 /**
  * Runs the application.

src/main/java/seedu/ezwatchlist/commons/core/Config.java → src/main/java/seedu/address/commons/core/Config.java

@@ -1,4 +1,4 @@
-package seedu.ezwatchlist.commons.core;
+package seedu.address.commons.core;
 
 import java.nio.file.Path;
 import java.nio.file.Paths;

src/main/java/seedu/ezwatchlist/commons/core/GuiSettings.java → src/main/java/seedu/address/commons/core/GuiSettings.java

@@ -1,4 +1,4 @@
-package seedu.ezwatchlist.commons.core;
+package seedu.address.commons.core;
 
 import java.awt.Point;
 import java.io.Serializable;

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

@@ -1,4 +1,4 @@
-package seedu.ezwatchlist.commons.core;
+package seedu.address.commons.core;
 
 import java.io.IOException;
 import java.util.Arrays;

src/main/java/seedu/ezwatchlist/commons/core/Messages.java → src/main/java/seedu/address/commons/core/Messages.java

@@ -1,4 +1,4 @@
-package seedu.ezwatchlist.commons.core;
+package seedu.address.commons.core;
 
 /**
  * Container for user visible messages.

src/main/java/seedu/ezwatchlist/commons/core/Version.java → src/main/java/seedu/address/commons/core/Version.java

@@ -1,4 +1,4 @@
-package seedu.ezwatchlist.commons.core;
+package seedu.address.commons.core;
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;

src/main/java/seedu/ezwatchlist/commons/core/index/Index.java → src/main/java/seedu/address/commons/core/index/Index.java

@@ -1,4 +1,4 @@
-package seedu.ezwatchlist.commons.core.index;
+package seedu.address.commons.core.index;
 
 /**
  * Represents a zero-based or one-based index.

src/main/java/seedu/ezwatchlist/commons/exceptions/DataConversionException.java → src/main/java/seedu/address/commons/exceptions/DataConversionException.java

@@ -1,4 +1,4 @@
-package seedu.ezwatchlist.commons.exceptions;
+package seedu.address.commons.exceptions;
 
 /**
  * Represents an error during conversion of data from one format to another

src/main/java/seedu/ezwatchlist/commons/exceptions/IllegalValueException.java → src/main/java/seedu/address/commons/exceptions/IllegalValueException.java

@@ -1,4 +1,4 @@
-package seedu.ezwatchlist.commons.exceptions;
+package seedu.address.commons.exceptions;
 
 /**
  * Signals that some given data does not fulfill some constraints.

src/main/java/seedu/ezwatchlist/commons/util/AppUtil.java → src/main/java/seedu/address/commons/util/AppUtil.java

@@ -1,9 +1,9 @@
-package seedu.ezwatchlist.commons.util;
+package seedu.address.commons.util;
 
 import static java.util.Objects.requireNonNull;
 
 import javafx.scene.image.Image;
-import seedu.ezwatchlist.MainApp;
+import seedu.address.MainApp;
 
 /**
  * A container for App specific utility functions

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

@@ -1,4 +1,4 @@
-package seedu.ezwatchlist.commons.util;
+package seedu.address.commons.util;
 
 import static java.util.Objects.requireNonNull;
 

src/main/java/seedu/ezwatchlist/commons/util/ConfigUtil.java → src/main/java/seedu/address/commons/util/ConfigUtil.java

@@ -1,11 +1,11 @@
-package seedu.ezwatchlist.commons.util;
+package seedu.address.commons.util;
 
 import java.io.IOException;
 import java.nio.file.Path;
 import java.util.Optional;
 
-import seedu.ezwatchlist.commons.core.Config;
-import seedu.ezwatchlist.commons.exceptions.DataConversionException;
+import seedu.address.commons.core.Config;
+import seedu.address.commons.exceptions.DataConversionException;
 
 /**
  * A class for accessing the Config File.

src/main/java/seedu/ezwatchlist/commons/util/FileUtil.java → src/main/java/seedu/address/commons/util/FileUtil.java

@@ -1,4 +1,4 @@
-package seedu.ezwatchlist.commons.util;
+package seedu.address.commons.util;
 
 import java.io.IOException;
 import java.nio.file.Files;

src/main/java/seedu/ezwatchlist/commons/util/JsonUtil.java → src/main/java/seedu/address/commons/util/JsonUtil.java

@@ -1,4 +1,4 @@
-package seedu.ezwatchlist.commons.util;
+package seedu.address.commons.util;
 
 import static java.util.Objects.requireNonNull;
 
@@ -20,8 +20,8 @@
 import com.fasterxml.jackson.databind.module.SimpleModule;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 
-import seedu.ezwatchlist.commons.core.LogsCenter;
-import seedu.ezwatchlist.commons.exceptions.DataConversionException;
+import seedu.address.commons.core.LogsCenter;
+import seedu.address.commons.exceptions.DataConversionException;
 
 /**
  * Converts a Java object instance to JSON and vice versa

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

@@ -1,7 +1,7 @@
-package seedu.ezwatchlist.commons.util;
+package seedu.address.commons.util;
 
 import static java.util.Objects.requireNonNull;
-import static seedu.ezwatchlist.commons.util.AppUtil.checkArgument;
+import static seedu.address.commons.util.AppUtil.checkArgument;
 
 import java.io.PrintWriter;
 import java.io.StringWriter;

src/main/java/seedu/ezwatchlist/logic/Logic.java → src/main/java/seedu/address/logic/Logic.java

@@ -1,14 +1,14 @@
-package seedu.ezwatchlist.logic;
+package seedu.address.logic;
 
 import java.nio.file.Path;
 
 import javafx.collections.ObservableList;
-import seedu.ezwatchlist.commons.core.GuiSettings;
-import seedu.ezwatchlist.logic.commands.CommandResult;
-import seedu.ezwatchlist.logic.commands.exceptions.CommandException;
-import seedu.ezwatchlist.logic.parser.exceptions.ParseException;
-import seedu.ezwatchlist.model.ReadOnlyAddressBook;
-import seedu.ezwatchlist.model.person.Person;
+import seedu.address.commons.core.GuiSettings;
+import seedu.address.logic.commands.CommandResult;
+import seedu.address.logic.commands.exceptions.CommandException;
+import seedu.address.logic.parser.exceptions.ParseException;
+import seedu.address.model.ReadOnlyAddressBook;
+import seedu.address.model.person.Person;
 
 /**
  * API of the Logic component
@@ -26,7 +26,7 @@ public interface Logic {
     /**
      * Returns the AddressBook.
      *
-     * @see seedu.ezwatchlist.model.Model#getAddressBook()
+     * @see seedu.address.model.Model#getAddressBook()
      */
     ReadOnlyAddressBook getAddressBook();
 

src/main/java/seedu/ezwatchlist/logic/LogicManager.java → src/main/java/seedu/address/logic/LogicManager.java

@@ -1,21 +1,21 @@
-package seedu.ezwatchlist.logic;
+package seedu.address.logic;
 
 import java.io.IOException;
 import java.nio.file.Path;
 import java.util.logging.Logger;
 
 import javafx.collections.ObservableList;
-import seedu.ezwatchlist.commons.core.GuiSettings;
-import seedu.ezwatchlist.commons.core.LogsCenter;
-import seedu.ezwatchlist.logic.commands.Command;
-import seedu.ezwatchlist.logic.commands.CommandResult;
-import seedu.ezwatchlist.logic.commands.exceptions.CommandException;
-import seedu.ezwatchlist.logic.parser.AddressBookParser;
-import seedu.ezwatchlist.logic.parser.exceptions.ParseException;
-import seedu.ezwatchlist.model.Model;
-import seedu.ezwatchlist.model.ReadOnlyAddressBook;
-import seedu.ezwatchlist.model.person.Person;
-import seedu.ezwatchlist.storage.Storage;
+import seedu.address.commons.core.GuiSettings;
+import seedu.address.commons.core.LogsCenter;
+import seedu.address.logic.commands.Command;
+import seedu.address.logic.commands.CommandResult;
+import seedu.address.logic.commands.exceptions.CommandException;
+import seedu.address.logic.parser.AddressBookParser;
+import seedu.address.logic.parser.exceptions.ParseException;
+import seedu.address.model.Model;
+import seedu.address.model.ReadOnlyAddressBook;
+import seedu.address.model.person.Person;
+import seedu.address.storage.Storage;
 
 /**
  * The main LogicManager of the app.

src/main/java/seedu/ezwatchlist/logic/commands/AddCommand.java → src/main/java/seedu/address/logic/commands/AddCommand.java

@@ -1,15 +1,15 @@
-package seedu.ezwatchlist.logic.commands;
+package seedu.address.logic.commands;
 
 import static java.util.Objects.requireNonNull;
-import static seedu.ezwatchlist.logic.parser.CliSyntax.PREFIX_ADDRESS;
-import static seedu.ezwatchlist.logic.parser.CliSyntax.PREFIX_EMAIL;
-import static seedu.ezwatchlist.logic.parser.CliSyntax.PREFIX_NAME;
-import static seedu.ezwatchlist.logic.parser.CliSyntax.PREFIX_PHONE;
-import static seedu.ezwatchlist.logic.parser.CliSyntax.PREFIX_TAG;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_ADDRESS;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_EMAIL;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_NAME;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_PHONE;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_TAG;
 
-import seedu.ezwatchlist.logic.commands.exceptions.CommandException;
-import seedu.ezwatchlist.model.Model;
-import seedu.ezwatchlist.model.person.Person;
+import seedu.address.logic.commands.exceptions.CommandException;
+import seedu.address.model.Model;
+import seedu.address.model.person.Person;
 
 /**
  * Adds a person to the address book.

src/main/java/seedu/ezwatchlist/logic/commands/ClearCommand.java → src/main/java/seedu/address/logic/commands/ClearCommand.java

@@ -1,9 +1,9 @@
-package seedu.ezwatchlist.logic.commands;
+package seedu.address.logic.commands;
 
 import static java.util.Objects.requireNonNull;
 
-import seedu.ezwatchlist.model.AddressBook;
-import seedu.ezwatchlist.model.Model;
+import seedu.address.model.AddressBook;
+import seedu.address.model.Model;
 
 /**
  * Clears the address book.

src/main/java/seedu/ezwatchlist/logic/commands/Command.java → src/main/java/seedu/address/logic/commands/Command.java

@@ -1,7 +1,7 @@
-package seedu.ezwatchlist.logic.commands;
+package seedu.address.logic.commands;
 
-import seedu.ezwatchlist.logic.commands.exceptions.CommandException;
-import seedu.ezwatchlist.model.Model;
+import seedu.address.logic.commands.exceptions.CommandException;
+import seedu.address.model.Model;
 
 /**
  * Represents a command with hidden internal logic and the ability to be executed.

src/main/java/seedu/ezwatchlist/logic/commands/CommandResult.java → src/main/java/seedu/address/logic/commands/CommandResult.java

@@ -1,4 +1,4 @@
-package seedu.ezwatchlist.logic.commands;
+package seedu.address.logic.commands;
 
 import static java.util.Objects.requireNonNull;
 

src/main/java/seedu/ezwatchlist/logic/commands/DeleteCommand.java → src/main/java/seedu/address/logic/commands/DeleteCommand.java

@@ -1,14 +1,14 @@
-package seedu.ezwatchlist.logic.commands;
+package seedu.address.logic.commands;
 
 import static java.util.Objects.requireNonNull;
 
 import java.util.List;
 
-import seedu.ezwatchlist.commons.core.Messages;
-import seedu.ezwatchlist.commons.core.index.Index;
-import seedu.ezwatchlist.logic.commands.exceptions.CommandException;
-import seedu.ezwatchlist.model.Model;
-import seedu.ezwatchlist.model.person.Person;
+import seedu.address.commons.core.Messages;
+import seedu.address.commons.core.index.Index;
+import seedu.address.logic.commands.exceptions.CommandException;
+import seedu.address.model.Model;
+import seedu.address.model.person.Person;
 
 /**
  * Deletes a person identified using it's displayed index from the address book.