V1.2 #64

sharadk1234 · 2019-03-19T14:57:51Z

Remark Command

into sharadk1234-branch

…into sharadk1234-branch # Conflicts: # src/main/java/seedu/address/MainApp.java # src/main/java/seedu/address/logic/commands/PinCommand.java # src/main/java/seedu/address/logic/parser/AddressBookParser.java # src/main/java/seedu/address/model/ModelManager.java # src/main/java/seedu/address/model/util/SampleDataUtil.java # src/test/java/seedu/address/logic/commands/AddCommandIntegrationTest.java # src/test/java/seedu/address/logic/commands/ClearCommandTest.java # src/test/java/seedu/address/logic/commands/DeleteCommandTest.java # src/test/java/seedu/address/logic/commands/EditCommandTest.java # src/test/java/seedu/address/logic/commands/FindCommandTest.java # src/test/java/seedu/address/logic/commands/ListCommandTest.java # src/test/java/seedu/address/logic/commands/RedoCommandTest.java # src/test/java/seedu/address/logic/commands/SelectCommandTest.java # src/test/java/seedu/address/logic/commands/UndoCommandTest.java # src/test/java/seedu/address/model/ModelManagerTest.java # src/test/java/seedu/address/testutil/TypicalPersons.java

into sharadk1234-branch # Conflicts: # src/main/java/seedu/address/logic/commands/EditCommand.java # src/main/java/seedu/address/logic/parser/AddressBookParser.java # src/main/java/seedu/address/logic/parser/RemarkCommandParser.java # src/main/java/seedu/address/model/Model.java # src/main/java/seedu/address/model/person/Person.java # src/main/java/seedu/address/model/util/SampleDataUtil.java # src/main/java/seedu/address/storage/JsonAdaptedPerson.java # src/main/resources/view/PersonListCard.fxml # src/test/java/seedu/address/logic/parser/AddressBookParserTest.java

sharadk1234 · 2019-03-19T15:46:07Z

Test passed successfully !

sharadk1234 · 2019-03-19T16:00:01Z

LATEST ONES

…into sharadk1234-branch # Conflicts: # src/main/java/seedu/address/logic/parser/ParserUtil.java # src/main/java/seedu/address/model/person/Person.java

sharadk1234 · 2019-03-19T16:03:03Z

V1.1

tanlongbin · 2019-03-20T14:43:44Z

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

@@ -32,9 +28,15 @@
 import seedu.address.storage.Storage;
 import seedu.address.storage.StorageManager;
 import seedu.address.storage.UserPrefsStorage;
+>>>>>>> 9be1c895c54ada063db055dc4b099ac35b753363


This line is added by Git to show you where are the conflicting portions between your file and the team repo's file. You should resolve the conflict and remove this line before committing the file again. Please refer to the textbook portion below. https://nus-cs2103-ay1819s2.github.io/cs2103-website/se-book-adapted/chapters/gitAndGithub.html#merge-conflicts

tanlongbin · 2019-03-20T14:45:42Z

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

@@ -1,6 +1,6 @@
 package seedu.address.commons.core;

-import java.awt.Point;
+import java.awt.*;


Import statements should be listed out fully and individually instead of using the * modifier to import the entire package. Please refer to the following textbook portion. https://nus-cs2103-ay1819s2.github.io/cs2103-website/coding-standards/java/basic.html#package-and-import-statements

tanlongbin · 2019-03-20T14:46:31Z

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

-import java.util.logging.Level;
-import java.util.logging.Logger;
-import java.util.logging.SimpleFormatter;
+import java.util.logging.*;


Similar import statement style violation as mentioned above.

tanlongbin · 2019-03-20T14:47:31Z

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

 import seedu.address.logic.CommandHistory;
 import seedu.address.logic.commands.exceptions.CommandException;
 import seedu.address.model.Model;
 import seedu.address.model.person.Person;

+import static java.util.Objects.requireNonNull;
+import static seedu.address.logic.parser.CliSyntax.*;


Similar import statement style violation as mentioned above.

tanlongbin · 2019-03-20T14:47:55Z

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

+import java.util.*;
+
+import static java.util.Objects.requireNonNull;
+import static seedu.address.logic.parser.CliSyntax.*;


Similar import statement style violation as mentioned above.

tanlongbin · 2019-03-20T14:49:00Z

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

        Set<Tag> updatedTags = editPersonDescriptor.getTags().orElse(personToEdit.getTags());

-        return new Person(updatedName, updatedPhone, updatedEmail, updatedAddress, updatedTags);
+<<<<<<< HEAD


Similar error due to committing conflicting files as mentioned above.

tanlongbin · 2019-03-20T14:49:37Z

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

@@ -1,18 +1,26 @@
 package seedu.address.logic.commands;

+<<<<<<< HEAD


Similar error due to committing conflicting files as mentioned above.

tanlongbin · 2019-03-20T14:50:13Z

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

-import static seedu.address.logic.parser.CliSyntax.PREFIX_TAG;
+import seedu.address.logic.commands.AddCommand;
+import seedu.address.logic.parser.exceptions.ParseException;
+import seedu.address.model.person.*;


Similar import statement style violation as mentioned above.

tanlongbin · 2019-03-20T14:50:41Z

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


 import java.util.regex.Matcher;
 import java.util.regex.Pattern;

+<<<<<<< HEAD


Similar error due to committing conflicting files as mentioned above.

tanlongbin · 2019-03-20T14:50:58Z

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

-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
+import java.util.*;


Similar import statement style violation as mentioned above.

tanlongbin · 2019-03-20T14:51:37Z

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

 import javafx.beans.property.ReadOnlyProperty;
 import javafx.collections.ObservableList;
 import seedu.address.commons.core.GuiSettings;
 import seedu.address.model.person.Person;
+import seedu.address.model.person.Remark;
+<<<<<<< HEAD


Similar error due to committing conflicting files as mentioned above.

tanlongbin · 2019-03-20T14:52:12Z

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

@@ -75,7 +79,14 @@
     * Returns true if a person with the same identity as {@code person} exists in the address book.
     */
    boolean hasPerson(Person person);
-
+    /**


Duplicated functions.

tanlongbin · 2019-03-20T14:52:25Z

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

+     * Adds the given remark.
+     * {@code person} must not already exist in the address book.
+     */
+    void addRemark(Remark remark);


Duplicated functions

tanlongbin · 2019-03-20T14:52:41Z

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

@@ -136,6 +137,13 @@ public void setPerson(Person target, Person editedPerson) {
        versionedAddressBook.setPerson(target, editedPerson);
    }

+<<<<<<< HEAD


Similar error due to committing conflicting files as mentioned above.

tanlongbin · 2019-03-20T14:52:55Z

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


 import java.util.Collections;
 import java.util.HashSet;
 import java.util.Objects;
 import java.util.Set;

+<<<<<<< HEAD


Similar error due to committing conflicting files as mentioned above.

tanlongbin · 2019-03-20T14:53:06Z

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

@@ -20,21 +24,46 @@
    private final Name name;
    private final Phone phone;
    private final Email email;
+    private final Remark remark;
+<<<<<<< HEAD


Similar error due to committing conflicting files as mentioned above.

tanlongbin · 2019-03-20T14:53:22Z

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

 import seedu.address.model.AddressBook;
 import seedu.address.model.ArchiveBook;
 import seedu.address.model.ReadOnlyAddressBook;
+<<<<<<< HEAD


Similar error due to committing conflicting files as mentioned above.

tanlongbin · 2019-03-20T14:53:34Z

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

 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;

+<<<<<<< HEAD


Similar error due to committing conflicting files as mentioned above.

tanlongbin · 2019-03-20T14:53:49Z

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

-import seedu.address.model.person.Name;
-import seedu.address.model.person.Person;
-import seedu.address.model.person.Phone;
+import seedu.address.model.person.*;


Violation of import statement coding style.

tanlongbin · 2019-03-20T14:57:25Z

src/test/java/seedu/address/testutil/PersonBuilder.java

@@ -20,11 +16,13 @@
    public static final String DEFAULT_PHONE = "85355255";
    public static final String DEFAULT_EMAIL = "alice@gmail.com";
    public static final String DEFAULT_ADDRESS = "123, Jurong West Ave 6, #08-111";
+    public static final String DEFAULT_Remark = "123, Jurong West Ave 6, #08-111";


Constant variable names need to be in all Caps.

tanlongbin

Multiple violations of import statement coding style. I have flagged out the first few that I spotted. Please read through and rectify all the violations.
Multiple files were merged and committed despite the conflicts highlighted by Git. This led to multiple lines added in multiple files (purpose of the lines are to demarcate the conflicts) which led to compilation error. I have flagged out the first few that I spotted. Please read through and rectify all the conflicts.
Multiple files have changes to the position of the import statements, which does not affect the functionality of the code. Please avoid these changes to minimise the modifications to the files in the code base.
A few other coding style mistakes spotted. Please read through all the comments I left in the "Files changed" tab.

tanlongbin · 2019-03-20T15:26:25Z

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

+import static seedu.address.logic.parser.CliSyntax.*;
+
+public class RemarkCommandParser {
+//    /**


Any reason why the entire portion of code is commented out?

sharadk123 added 7 commits March 19, 2019 22:44

no message

3405fc6

no message

df10d9a

Merge branch 'sharadk1234-branch' of https://github.com/sharadk1234/main

4079fee

into sharadk1234-branch

no message

292188e

no message

c1c6b62

no message

0437465

Merge branch 'master' of https://github.com/CS2103-AY1819S2-W16-2/main …

417bf77

…into sharadk1234-branch # Conflicts: # src/main/java/seedu/address/logic/parser/ParserUtil.java # src/main/java/seedu/address/model/person/Person.java

no message

fb85382

tanlongbin reviewed Mar 20, 2019

View reviewed changes

tanlongbin requested changes Mar 20, 2019

View reviewed changes

tanlongbin reviewed Mar 20, 2019

View reviewed changes

nus-se-bot mentioned this pull request Mar 20, 2019

Feedback on week 9 project progress #70

Closed

36 tasks

tanlongbin closed this Mar 21, 2019

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

V1.2 #64

V1.2 #64

sharadk1234 commented Mar 19, 2019

sharadk1234 commented Mar 19, 2019

sharadk1234 commented Mar 19, 2019

sharadk1234 commented Mar 19, 2019

tanlongbin Mar 20, 2019

tanlongbin Mar 20, 2019

tanlongbin Mar 20, 2019

tanlongbin Mar 20, 2019

tanlongbin Mar 20, 2019

tanlongbin Mar 20, 2019

tanlongbin Mar 20, 2019

tanlongbin Mar 20, 2019

tanlongbin Mar 20, 2019

tanlongbin Mar 20, 2019

tanlongbin Mar 20, 2019

tanlongbin Mar 20, 2019

tanlongbin Mar 20, 2019

tanlongbin Mar 20, 2019

tanlongbin Mar 20, 2019

tanlongbin Mar 20, 2019

tanlongbin Mar 20, 2019

tanlongbin Mar 20, 2019

tanlongbin Mar 20, 2019

tanlongbin Mar 20, 2019

tanlongbin left a comment •

edited

tanlongbin Mar 20, 2019

		@@ -1,18 +1,26 @@
		package seedu.address.logic.commands;

		<<<<<<< HEAD

V1.2 #64

V1.2 #64

Conversation

sharadk1234 commented Mar 19, 2019

sharadk1234 commented Mar 19, 2019

sharadk1234 commented Mar 19, 2019

sharadk1234 commented Mar 19, 2019

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

tanlongbin left a comment • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

tanlongbin left a comment •

edited