Merge pull request #51 from AY1920S2-CS2103T-F10-2/revert-49-master

Revert "Create New and Refactor Old UI classes "

Author: wxwxwxwx9

docs/DeveloperGuide.adoc

@@ -16,10 +16,6 @@ endif::[]
 
 By: `CS2103T-F10-2`      Since: `Feb 2020`      Licence: `MIT`
 
-== Introduction
-
-(to be inserted)
-
 == Setting up
 
 Refer to the guide <<SettingUp#, here>>.

docs/diagrams/tracing/LogicSequenceDiagram.puml

@@ -13,7 +13,7 @@ create ecp
 abp -> ecp
 abp -> ecp ++: parse(arguments)
 create ec
-ecp -> ec ++: index, editInternshipDescriptor
+ecp -> ec ++: index, editPersonDescriptor
 ec --> ecp --
 ecp --> abp --: command
 abp --> logic --: command

docs/tutorials/TracingCode.adoc

@@ -180,7 +180,7 @@ image::LogicSequenceDiagram.png[]
 public CommandResult execute(Model model) throws CommandException {
     ...
     Person personToEdit = lastShownList.get(index.getZeroBased());
-    Person editedPerson = createEditedPerson(personToEdit, editInternshipDescriptor);
+    Person editedPerson = createEditedPerson(personToEdit, editPersonDescriptor);
     if (!personToEdit.isSamePerson(editedPerson) && model.hasPerson(editedPerson)) {
         throw new CommandException(MESSAGE_DUPLICATE_PERSON);
     }

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

@@ -15,15 +15,15 @@
 import seedu.address.commons.util.StringUtil;
 import seedu.address.logic.Logic;
 import seedu.address.logic.LogicManager;
-import seedu.address.model.InternshipDiary;
+import seedu.address.model.AddressBook;
 import seedu.address.model.Model;
 import seedu.address.model.ModelManager;
-import seedu.address.model.ReadOnlyInternshipDiary;
+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.InternshipDiaryStorage;
-import seedu.address.storage.JsonInternshipDiaryStorage;
+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;
@@ -48,17 +48,16 @@ public class MainApp extends Application {
 
     @Override
     public void init() throws Exception {
-        logger.info("=============================[ Initializing InternshipDiary ]===========================");
+        logger.info("=============================[ Initializing AddressBook ]===========================");
         super.init();
 
         AppParameters appParameters = AppParameters.parse(getParameters());
         config = initConfig(appParameters.getConfigPath());
 
         UserPrefsStorage userPrefsStorage = new JsonUserPrefsStorage(config.getUserPrefsFilePath());
         UserPrefs userPrefs = initPrefs(userPrefsStorage);
-        InternshipDiaryStorage internshipDiaryStorage =
-                new JsonInternshipDiaryStorage(userPrefs.getInternshipDiaryFilePath());
-        storage = new StorageManager(internshipDiaryStorage, userPrefsStorage);
+        AddressBookStorage addressBookStorage = new JsonAddressBookStorage(userPrefs.getAddressBookFilePath());
+        storage = new StorageManager(addressBookStorage, userPrefsStorage);
 
         initLogging(config);
 
@@ -75,20 +74,20 @@ public void init() throws Exception {
      * or an empty address book will be used instead if errors occur when reading {@code storage}'s address book.
      */
     private Model initModelManager(Storage storage, ReadOnlyUserPrefs userPrefs) {
-        Optional<ReadOnlyInternshipDiary> internshipDiaryOptional;
-        ReadOnlyInternshipDiary initialData;
+        Optional<ReadOnlyAddressBook> addressBookOptional;
+        ReadOnlyAddressBook initialData;
         try {
-            internshipDiaryOptional = storage.readInternshipDiary();
-            if (!internshipDiaryOptional.isPresent()) {
-                logger.info("Data file not found. Will be starting with a sample InternshipDiary");
+            addressBookOptional = storage.readAddressBook();
+            if (!addressBookOptional.isPresent()) {
+                logger.info("Data file not found. Will be starting with a sample AddressBook");
             }
-            initialData = internshipDiaryOptional.orElseGet(SampleDataUtil::getSampleInternshipDiary);
+            initialData = addressBookOptional.orElseGet(SampleDataUtil::getSampleAddressBook);
         } catch (DataConversionException e) {
-            logger.warning("Data file not in the correct format. Will be starting with an empty InternshipDiary");
-            initialData = new InternshipDiary();
+            logger.warning("Data file not in the correct format. Will be starting with an empty AddressBook");
+            initialData = new AddressBook();
         } catch (IOException e) {
-            logger.warning("Problem while reading from the file. Will be starting with an empty InternshipDiary");
-            initialData = new InternshipDiary();
+            logger.warning("Problem while reading from the file. Will be starting with an empty AddressBook");
+            initialData = new AddressBook();
         }
 
         return new ModelManager(initialData, userPrefs);
@@ -152,7 +151,7 @@ protected UserPrefs initPrefs(UserPrefsStorage storage) {
                     + "Using default user prefs");
             initializedPrefs = new UserPrefs();
         } catch (IOException e) {
-            logger.warning("Problem while reading from the file. Will be starting with an empty InternshipDiary");
+            logger.warning("Problem while reading from the file. Will be starting with an empty AddressBook");
             initializedPrefs = new UserPrefs();
         }
 
@@ -168,13 +167,13 @@ protected UserPrefs initPrefs(UserPrefsStorage storage) {
 
     @Override
     public void start(Stage primaryStage) {
-        logger.info("Starting InternshipDiary " + MainApp.VERSION);
+        logger.info("Starting AddressBook " + MainApp.VERSION);
         ui.start(primaryStage);
     }
 
     @Override
     public void stop() {
-        logger.info("============================ [ Stopping InternshipDiary ] =============================");
+        logger.info("============================ [ Stopping Address Book ] =============================");
         try {
             storage.saveUserPrefs(model.getUserPrefs());
         } catch (IOException e) {

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

@@ -7,8 +7,7 @@ public class Messages {
 
     public static final String MESSAGE_UNKNOWN_COMMAND = "Unknown command";
     public static final String MESSAGE_INVALID_COMMAND_FORMAT = "Invalid command format! \n%1$s";
-    public static final String MESSAGE_INVALID_INTERNSHIP_DISPLAYED_INDEX =
-            "The internship application index provided is invalid";
-    public static final String MESSAGE_INTERNSHIP_LISTED_OVERVIEW = "%1$d internship application listed!";
+    public static final String MESSAGE_INVALID_PERSON_DISPLAYED_INDEX = "The person index provided is invalid";
+    public static final String MESSAGE_PERSONS_LISTED_OVERVIEW = "%1$d persons listed!";
 
 }

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

@@ -8,8 +8,6 @@
 import seedu.address.logic.commands.exceptions.CommandException;
 import seedu.address.logic.parser.exceptions.ParseException;
 import seedu.address.model.ReadOnlyAddressBook;
-import seedu.address.model.ReadOnlyInternshipDiary;
-import seedu.address.model.internship.InternshipApplication;
 import seedu.address.model.person.Person;
 
 /**
@@ -32,30 +30,14 @@ public interface Logic {
      */
     ReadOnlyAddressBook getAddressBook();
 
-    /**
-     * Returns the InternshipDiary.
-     *
-     * @see seedu.address.model.Model#getInternshipDiary()
-     */
-    ReadOnlyInternshipDiary getInternshipDiary();
-
-
     /** Returns an unmodifiable view of the filtered list of persons */
     ObservableList<Person> getFilteredPersonList();
 
-    /** Returns an unmodifiable view of the filtered list of internship applications */
-    ObservableList<InternshipApplication> getFilteredInternshipApplicationList();
-
     /**
      * Returns the user prefs' address book file path.
      */
     Path getAddressBookFilePath();
 
-    /**
-     * Returns the user prefs' internship diary file path.
-     */
-    Path getInternshipDiaryFilePath();
-
     /**
      * Returns the user prefs' GUI settings.
      */

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

@@ -10,12 +10,10 @@
 import seedu.address.logic.commands.Command;
 import seedu.address.logic.commands.CommandResult;
 import seedu.address.logic.commands.exceptions.CommandException;
-import seedu.address.logic.parser.InternshipDiaryParser;
+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.ReadOnlyInternshipDiary;
-import seedu.address.model.internship.InternshipApplication;
 import seedu.address.model.person.Person;
 import seedu.address.storage.Storage;
 
@@ -28,25 +26,24 @@ public class LogicManager implements Logic {
 
     private final Model model;
     private final Storage storage;
-    private final InternshipDiaryParser internshipDiaryParser;
+    private final AddressBookParser addressBookParser;
 
     public LogicManager(Model model, Storage storage) {
         this.model = model;
         this.storage = storage;
-        internshipDiaryParser = new InternshipDiaryParser();
+        addressBookParser = new AddressBookParser();
     }
 
     @Override
     public CommandResult execute(String commandText) throws CommandException, ParseException {
         logger.info("----------------[USER COMMAND][" + commandText + "]");
 
         CommandResult commandResult;
-        Command command = internshipDiaryParser.parseCommand(commandText);
+        Command command = addressBookParser.parseCommand(commandText);
         commandResult = command.execute(model);
 
         try {
-            //cf: Needs to be changed after storage is refactored.
-            storage.saveInternshipDiary(model.getInternshipDiary());
+            storage.saveAddressBook(model.getAddressBook());
         } catch (IOException ioe) {
             throw new CommandException(FILE_OPS_ERROR_MESSAGE + ioe, ioe);
         }
@@ -59,31 +56,16 @@ public ReadOnlyAddressBook getAddressBook() {
         return model.getAddressBook();
     }
 
-    @Override
-    public ReadOnlyInternshipDiary getInternshipDiary() {
-        return model.getInternshipDiary();
-    }
-
     @Override
     public ObservableList<Person> getFilteredPersonList() {
         return model.getFilteredPersonList();
     }
 
-    @Override
-    public ObservableList<InternshipApplication> getFilteredInternshipApplicationList() {
-        return model.getFilteredInternshipApplicationList();
-    }
-
     @Override
     public Path getAddressBookFilePath() {
         return model.getAddressBookFilePath();
     }
 
-    @Override
-    public Path getInternshipDiaryFilePath() {
-        return model.getInternshipDiaryFilePath();
-    }
-
     @Override
     public GuiSettings getGuiSettings() {
         return model.getGuiSettings();

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

@@ -2,69 +2,59 @@
 
 import static java.util.Objects.requireNonNull;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_ADDRESS;
-import static seedu.address.logic.parser.CliSyntax.PREFIX_COMPANY;
-import static seedu.address.logic.parser.CliSyntax.PREFIX_DATE;
 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_PRIORITY;
-import static seedu.address.logic.parser.CliSyntax.PREFIX_ROLE;
-import static seedu.address.logic.parser.CliSyntax.PREFIX_STATUS;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_TAG;
 
 import seedu.address.logic.commands.exceptions.CommandException;
 import seedu.address.model.Model;
-import seedu.address.model.internship.InternshipApplication;
+import seedu.address.model.person.Person;
 
 /**
- * Adds a person to the internship diary.
+ * Adds a person to the address book.
  */
 public class AddCommand extends Command {
 
     public static final String COMMAND_WORD = "add";
 
-    public static final String MESSAGE_USAGE = COMMAND_WORD
-            + ": Adds an internship application to the internship diary. "
+    public static final String MESSAGE_USAGE = COMMAND_WORD + ": Adds a person to the address book. "
             + "Parameters: "
-            + PREFIX_COMPANY + "COMPANY "
-            + PREFIX_ROLE + "ROLE "
-            + PREFIX_ADDRESS + "ADDRESS "
+            + PREFIX_NAME + "NAME "
             + PREFIX_PHONE + "PHONE "
             + PREFIX_EMAIL + "EMAIL "
-            + PREFIX_DATE + "APPLICATION DATE "
-            + PREFIX_PRIORITY + "PRIORITY "
-            + PREFIX_STATUS + "STATUS "
+            + PREFIX_ADDRESS + "ADDRESS "
+            + "[" + PREFIX_TAG + "TAG]...\n"
             + "Example: " + COMMAND_WORD + " "
-            + PREFIX_COMPANY + "Google "
-            + PREFIX_ROLE + "Software Engineer "
-            + PREFIX_ADDRESS + "123 Kent Ridge Road "
-            + PREFIX_PHONE + "67654321 "
-            + PREFIX_EMAIL + "[email protected] "
-            + PREFIX_DATE + "10 Feb 2020 "
-            + PREFIX_PRIORITY + "5 "
-            + PREFIX_STATUS + "Active ";
+            + PREFIX_NAME + "John Doe "
+            + PREFIX_PHONE + "98765432 "
+            + PREFIX_EMAIL + "[email protected] "
+            + PREFIX_ADDRESS + "311, Clementi Ave 2, #02-25 "
+            + PREFIX_TAG + "friends "
+            + PREFIX_TAG + "owesMoney";
 
-    public static final String MESSAGE_SUCCESS = "New internship application added: %1$s";
-    public static final String MESSAGE_DUPLICATE_INTERNSHIP =
-            "This internship application already exists in the internship diary";
+    public static final String MESSAGE_SUCCESS = "New person added: %1$s";
+    public static final String MESSAGE_DUPLICATE_PERSON = "This person already exists in the address book";
 
-    private final InternshipApplication toAdd;
+    private final Person toAdd;
 
     /**
-     * Creates an AddCommand to add the specified {@code internshipApplication}
+     * Creates an AddCommand to add the specified {@code Person}
      */
-    public AddCommand(InternshipApplication internshipApplication) {
-        requireNonNull(internshipApplication);
-        toAdd = internshipApplication;
+    public AddCommand(Person person) {
+        requireNonNull(person);
+        toAdd = person;
     }
 
     @Override
     public CommandResult execute(Model model) throws CommandException {
         requireNonNull(model);
 
-        if (model.hasInternshipApplication(toAdd)) {
-            throw new CommandException(MESSAGE_DUPLICATE_INTERNSHIP);
+        if (model.hasPerson(toAdd)) {
+            throw new CommandException(MESSAGE_DUPLICATE_PERSON);
         }
 
-        model.addInternshipApplication(toAdd);
+        model.addPerson(toAdd);
         return new CommandResult(String.format(MESSAGE_SUCCESS, toAdd));
     }
 

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

@@ -2,22 +2,22 @@
 
 import static java.util.Objects.requireNonNull;
 
-import seedu.address.model.InternshipDiary;
+import seedu.address.model.AddressBook;
 import seedu.address.model.Model;
 
 /**
- * Clears the internship diary.
+ * Clears the address book.
  */
 public class ClearCommand extends Command {
 
     public static final String COMMAND_WORD = "clear";
-    public static final String MESSAGE_SUCCESS = "Internship diary has been cleared!";
+    public static final String MESSAGE_SUCCESS = "Address book has been cleared!";
 
 
     @Override
     public CommandResult execute(Model model) {
         requireNonNull(model);
-        model.setInternshipDiary(new InternshipDiary());
+        model.setAddressBook(new AddressBook());
         return new CommandResult(MESSAGE_SUCCESS);
     }
 }