Merge branch 'master' into Delete-Feature

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

@@ -8,7 +8,7 @@
 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;
+import seedu.address.model.module.Module;
 
 /**
  * API of the Logic component
@@ -30,8 +30,8 @@ public interface Logic {
      */
     ReadOnlyAddressBook getAddressBook();
 
-    /** Returns an unmodifiable view of the filtered list of persons */
-    ObservableList<Person> getFilteredPersonList();
+    /** Returns an unmodifiable view of the filtered list of modules */
+    ObservableList<Module> getFilteredModuleList();
 
     /**
      * Returns the user prefs' address book file path.

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

@@ -15,7 +15,7 @@
 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.model.module.Module;
 import seedu.address.storage.Storage;
 
 /**
@@ -67,8 +67,8 @@ public ReadOnlyAddressBook getAddressBook() {
     }
 
     @Override
-    public ObservableList<Person> getFilteredPersonList() {
-        return model.getFilteredPersonList();
+    public ObservableList<Module> getFilteredModuleList() {
+        return model.getFilteredModuleList();
     }
 
     @Override

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

@@ -15,8 +15,8 @@ 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_PERSON_DISPLAYED_INDEX = "The person index provided is invalid";
-    public static final String MESSAGE_PERSONS_LISTED_OVERVIEW = "%1$d persons listed!";
+    public static final String MESSAGE_INVALID_MODULE_DISPLAYED_INDEX = "The module index provided is invalid";
+    public static final String MESSAGE_MODULES_LISTED_OVERVIEW = "%1$d modules listed!";
     public static final String MESSAGE_DUPLICATE_FIELDS =
                 "Multiple values specified for the following single-valued field(s): ";
 

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

@@ -6,7 +6,7 @@
 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 static seedu.address.model.Model.PREDICATE_SHOW_ALL_PERSONS;
+import static seedu.address.model.Model.PREDICATE_SHOW_ALL_MODULES;
 
 import java.util.Collections;
 import java.util.HashSet;
@@ -27,6 +27,7 @@
 import seedu.address.model.person.Person;
 import seedu.address.model.person.Phone;
 import seedu.address.model.tag.Tag;
+import seedu.address.model.module.Module;
 
 /**
  * Edits the details of an existing person in the address book.
@@ -69,6 +70,8 @@ public EditCommand(Index index, EditPersonDescriptor editPersonDescriptor) {
 
     @Override
     public CommandResult execute(Model model) throws CommandException {
+        throw new CommandException("EditCommand not implemented yet");
+        /*
         requireNonNull(model);
         List<Person> lastShownList = model.getFilteredPersonList();
 
@@ -86,6 +89,7 @@ public CommandResult execute(Model model) throws CommandException {
         model.setPerson(personToEdit, editedPerson);
         model.updateFilteredPersonList(PREDICATE_SHOW_ALL_PERSONS);
         return new CommandResult(String.format(MESSAGE_EDIT_PERSON_SUCCESS, Messages.format(editedPerson)));
+        */
     }
 
     /**

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

@@ -4,11 +4,12 @@
 
 import seedu.address.commons.util.ToStringBuilder;
 import seedu.address.logic.Messages;
+import seedu.address.logic.commands.exceptions.CommandException;
 import seedu.address.model.Model;
-import seedu.address.model.person.NameContainsKeywordsPredicate;
+import seedu.address.model.module.NameContainsKeywordsPredicate;
 
 /**
- * Finds and lists all persons in address book whose name contains any of the argument keywords.
+ * Finds and lists all modules in address book whose name contains any of the argument keywords.
  * Keyword matching is case insensitive.
  */
 public class FindCommand extends Command {
@@ -27,11 +28,14 @@ public FindCommand(NameContainsKeywordsPredicate predicate) {
     }
 
     @Override
-    public CommandResult execute(Model model) {
+    public CommandResult execute(Model model) throws CommandException {
+        throw new CommandException("FindCommand not implemented yet");
+        /*
         requireNonNull(model);
         model.updateFilteredPersonList(predicate);
         return new CommandResult(
                 String.format(Messages.MESSAGE_PERSONS_LISTED_OVERVIEW, model.getFilteredPersonList().size()));
+        */
     }
 
     @Override

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

@@ -1,8 +1,9 @@
 package seedu.address.logic.commands;
 
 import static java.util.Objects.requireNonNull;
-import static seedu.address.model.Model.PREDICATE_SHOW_ALL_PERSONS;
+import static seedu.address.model.Model.PREDICATE_SHOW_ALL_MODULES;
 
+import seedu.address.logic.commands.exceptions.CommandException;
 import seedu.address.model.Model;
 
 /**
@@ -16,9 +17,9 @@ public class ListCommand extends Command {
 
 
     @Override
-    public CommandResult execute(Model model) {
+    public CommandResult execute(Model model) throws CommandException {
         requireNonNull(model);
-        model.updateFilteredPersonList(PREDICATE_SHOW_ALL_PERSONS);
+        model.updateFilteredModuleList(PREDICATE_SHOW_ALL_MODULES);
         return new CommandResult(MESSAGE_SUCCESS);
     }
 }

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

@@ -34,9 +34,9 @@ public AddCommand parse(String args) throws ParseException {
         }
 
         argMultimap.verifyNoDuplicatePrefixesFor(PREFIX_CODE, PREFIX_YEAR, PREFIX_SEMESTER, PREFIX_GRADE);
-        ModuleCode code = ParserUtil.parseCode(argMultimap.getValue(PREFIX_CODE).get());
+        ModuleCode code = ParserUtil.parseModuleCode(argMultimap.getValue(PREFIX_CODE).get());
         Year year = ParserUtil.parseYear(argMultimap.getValue(PREFIX_YEAR).get());
-        Semester semester = ParserUtil.parseSem(argMultimap.getValue(PREFIX_SEMESTER).get());
+        Semester semester = ParserUtil.parseSemester(argMultimap.getValue(PREFIX_SEMESTER).get());
         Grade grade = ParserUtil.parseGrade(argMultimap.getValue(PREFIX_GRADE).get());
 
         Module module = new Module(code, year, semester, grade);

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

@@ -6,7 +6,7 @@
 
 import seedu.address.logic.commands.FindCommand;
 import seedu.address.logic.parser.exceptions.ParseException;
-import seedu.address.model.person.NameContainsKeywordsPredicate;
+import seedu.address.model.module.NameContainsKeywordsPredicate;
 
 /**
  * Parses input arguments and creates a new FindCommand object

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

@@ -9,13 +9,14 @@
 import seedu.address.commons.core.index.Index;
 import seedu.address.commons.util.StringUtil;
 import seedu.address.logic.parser.exceptions.ParseException;
-import seedu.address.model.Model;
+import seedu.address.model.module.Description;
 import seedu.address.model.module.ModuleCode;
+import seedu.address.model.module.ModuleName;
 import seedu.address.model.module.Year;
 import seedu.address.model.module.Semester;
 import seedu.address.model.module.Grade;
-import seedu.address.model.module.ModuleName;
-import seedu.address.model.module.Description;
+import seedu.address.model.module.ModularCredit;
+import seedu.address.model.person.Name;
 import seedu.address.model.person.Address;
 import seedu.address.model.person.Email;
 import seedu.address.model.person.Phone;
@@ -48,7 +49,6 @@ public static Index parseIndex(String oneBasedIndex) throws ParseException {
      *
      * @throws ParseException if the given {@code name} is invalid.
      */
-    /*
     public static Name parseName(String name) throws ParseException {
         requireNonNull(name);
         String trimmedName = name.trim();
@@ -58,8 +58,6 @@ public static Name parseName(String name) throws ParseException {
         return new Name(trimmedName);
     }
 
-     */
-
     /**
      * Parses a {@code String phone} into a {@code Phone}.
      * Leading and trailing whitespaces will be trimmed.
@@ -132,15 +130,27 @@ public static Set<Tag> parseTags(Collection<String> tags) throws ParseException
         return tagSet;
     }
 
-    public static ModuleCode parseCode(String code) throws ParseException {
-        requireNonNull(code);
-        String trimmedCode = code.trim();
+    /**
+     * Parses a {@code String moduleCode} into an {@code ModuleCode}.
+     * Leading and trailing whitespaces will be trimmed.
+     *
+     * @throws ParseException if the given {@code moduleCode} is invalid.
+     */
+    public static ModuleCode parseModuleCode(String moduleCode) throws ParseException {
+        requireNonNull(moduleCode);
+        String trimmedCode = moduleCode.trim();
         if (!ModuleCode.isValidModuleCode(trimmedCode)) {
             throw new ParseException(ModuleCode.MESSAGE_CONSTRAINTS);
         }
         return new ModuleCode(trimmedCode);
     }
 
+    /**
+     * Parses a {@code String year} into an {@code Year}.
+     * Leading and trailing whitespaces will be trimmed.
+     *
+     * @throws ParseException if the given {@code year} is invalid.
+     */
     public static Year parseYear(String year) throws ParseException {
         requireNonNull(year);
         String trimmedYear = year.trim();
@@ -150,15 +160,27 @@ public static Year parseYear(String year) throws ParseException {
         return new Year(trimmedYear);
     }
 
-    public static Semester parseSem(String sem) throws ParseException {
-        requireNonNull(sem);
-        String trimmedSem = sem.trim();
-        if (!Semester.isValidSemester(trimmedSem)) {
+    /**
+     * Parses a {@code String semester} into an {@code Semester}.
+     * Leading and trailing whitespaces will be trimmed.
+     *
+     * @throws ParseException if the given {@code semester} is invalid.
+     */
+    public static Semester parseSemester(String semester) throws ParseException {
+        requireNonNull(semester);
+        String trimmedSemester = semester.trim();
+        if (!Semester.isValidSemester(trimmedSemester)) {
             throw new ParseException(Semester.MESSAGE_CONSTRAINTS);
         }
-        return new Semester(trimmedSem);
+        return new Semester(trimmedSemester);
     }
 
+    /**
+     * Parses a {@code String grade} into an {@code Grade}.
+     * Leading and trailing whitespaces will be trimmed.
+     *
+     * @throws ParseException if the given {@code grade} is invalid.
+     */
     public static Grade parseGrade(String grade) throws ParseException {
         requireNonNull(grade);
         String trimmedGrade = grade.trim();
@@ -167,4 +189,49 @@ public static Grade parseGrade(String grade) throws ParseException {
         }
         return new Grade(trimmedGrade);
     }
+
+    /**
+     * Parses a {@code String moduleName} into an {@code ModuleName}.
+     * Leading and trailing whitespaces will be trimmed.
+     *
+     * @throws ParseException if the given {@code moduleName} is invalid.
+     */
+    public static ModuleName parseModuleName(String moduleName) throws ParseException {
+        requireNonNull(moduleName);
+        String trimmedModuleName = moduleName.trim();
+        if (!ModuleName.isValidName(trimmedModuleName)) {
+            throw new ParseException(ModuleName.MESSAGE_CONSTRAINTS);
+        }
+        return new ModuleName(trimmedModuleName);
+    }
+
+    /**
+     * Parses a {@code String description} into an {@code Description}.
+     * Leading and trailing whitespaces will be trimmed.
+     *
+     * @throws ParseException if the given {@code description} is invalid.
+     */
+    public static Description parseDescription(String description) throws ParseException {
+        requireNonNull(description);
+        String trimmedDescription = description.trim();
+        if (!Description.isValidDescription(trimmedDescription)) {
+            throw new ParseException(Grade.MESSAGE_CONSTRAINTS);
+        }
+        return new Description(trimmedDescription);
+    }
+
+    /**
+     * Parses a {@code String modularCredit} into an {@code ModularCredit}.
+     * Leading and trailing whitespaces will be trimmed.
+     *
+     * @throws ParseException if the given {@code modularCredit} is invalid.
+     */
+    public static ModularCredit parseModularCredit(String modularCredit) throws ParseException {
+        requireNonNull(modularCredit);
+        String trimmedModularCredit = modularCredit.trim();
+        if (!ModularCredit.isValidModularCredit(trimmedModularCredit)) {
+            throw new ParseException(ModularCredit.MESSAGE_CONSTRAINTS);
+        }
+        return new ModularCredit(trimmedModularCredit);
+    }
 }

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

@@ -55,26 +55,26 @@ public interface Model {
     ReadOnlyAddressBook getAddressBook();
 
     /**
-     * Returns true if a person with the same identity as {@code person} exists in the address book.
+     * Returns true if a module with the same identity as {@code module} exists in the address book.
      */
-
     boolean hasModule(Module module);
 
     /**
-     * Deletes the given person.
-     * The person must exist in the address book.
+     * Deletes the given module.
+     * The module must exist in the address book.
      */
     void deleteModule(Module module);
+
     /**
-     * Adds the given person.
-     * {@code person} must not already exist in the address book.
+     * Adds the given module.
+     * {@code module} must not already exist in the address book.
      */
     void addModule(Module module);
 
     /**
-     * Replaces the given person {@code target} with {@code editedPerson}.
+     * Replaces the given module {@code target} with {@code editedModule}.
      * {@code target} must exist in the address book.
-     * The person identity of {@code editedPerson} must not be the same as another existing person in the address book.
+     * The module identity of {@code editedModule} must not be the same as another existing module in the address book.
      */
     void setModule(Module target, Module editedPerson);
 
@@ -90,7 +90,7 @@ public interface Model {
     ObservableList<Module> getFilteredModuleList();
 
     /**
-     * Updates the filter of the filtered person list to filter by the given {@code predicate}.
+     * Updates the filter of the filtered module list to filter by the given {@code predicate}.
      * @throws NullPointerException if {@code predicate} is null.
      */
     void updateFilteredModuleList(Predicate<Module> predicate);

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

@@ -2,9 +2,6 @@
 
 import javafx.collections.ObservableList;
 import seedu.address.model.module.Module;
-import seedu.address.model.person.Person;
-
-import java.util.List;
 
 /**
  * Unmodifiable view of an address book

src/main/java/seedu/address/model/module/Description.java

@@ -12,7 +12,7 @@ public class Description {
             "Description should only contain alphanumeric characters and spaces, and it should not be blank";
 
     /*
-     * The first character of the lecturer's name must not be a whitespace,
+     * The first character of the description must not be a whitespace,
      * otherwise " " (a blank string) becomes a valid input.
      */
     public static final String VALIDATION_REGEX = "[\\p{Alnum}][\\p{Alnum} ]*";

src/main/java/seedu/address/model/module/Grade.java

@@ -58,6 +58,10 @@ public static GradeEnum fromString(String grade) {
         public String getGrade() {
             return this.grade;
         }
+
+        public Float getGradePoint() {
+            return this.gradePoint;
+        }
     }
 
     public static final String MESSAGE_CONSTRAINTS = "Grade should only be the following: "
@@ -68,9 +72,9 @@ public String getGrade() {
     private final GradeEnum grade;
 
     /**
-     * Constructs a {@code Lecturer}.
+     * Constructs a {@code Grade}.
      *
-     * @param grade A valid lecturer's name.
+     * @param grade A valid grade.
      */
     public Grade(String grade) {
         requireNonNull(grade);