Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replace Deadline class with Time class #230

Merged

Conversation

itsjerryho
Copy link
Collaborator

No description provided.

@itsjerryho itsjerryho added this to the v1.4 milestone Nov 1, 2020
@itsjerryho itsjerryho self-assigned this Nov 1, 2020
Copy link
Collaborator

@ChooJiaXin ChooJiaXin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good job! Left some comments below :)

Comment on lines 12 to 15
* Represents the deadline of an assignment in the assignment list.
* Guarantees: immutable; is valid as declared in {@link #isValidDeadline(String)}
*/
public class Deadline {
public class Time {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The JavaDocs of the Time class should be changed to match the new name.

Maybe something like:
"Represents the time found in a task in ProductiveNUS
Guarantees: immutable; is valid as decalred in {@link #isValidTime(String)"}

It would be ideal if isValidDeadline is changed to isValidTime as well, though if only the assignment class uses isValidDeadline, then it may be fine to leave the name as it is.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

okay thank you!!

src/main/java/seedu/tasklist/model/task/Time.java Outdated Show resolved Hide resolved
src/main/java/seedu/tasklist/model/task/Time.java Outdated Show resolved Hide resolved
src/main/java/seedu/tasklist/model/task/Time.java Outdated Show resolved Hide resolved
src/main/java/seedu/tasklist/ui/AssignmentCard.java Outdated Show resolved Hide resolved
src/main/java/seedu/tasklist/ui/UpcomingTaskListPanel.java Outdated Show resolved Hide resolved
# Conflicts:
#	docs/UserGuide.md
#	src/main/java/seedu/address/logic/commands/DoneCommand.java
#	src/main/java/seedu/address/logic/commands/EditCommand.java
#	src/main/java/seedu/address/logic/commands/ListCommand.java
#	src/main/java/seedu/address/logic/commands/PrioritizeCommand.java
#	src/main/java/seedu/address/logic/commands/RemindCommand.java
#	src/main/java/seedu/address/logic/commands/ScheduleCommand.java
#	src/main/java/seedu/address/logic/commands/UndoneCommand.java
#	src/main/java/seedu/address/logic/commands/UnprioritizeCommand.java
#	src/main/java/seedu/address/logic/commands/UnremindCommand.java
#	src/main/java/seedu/address/logic/commands/UnscheduleCommand.java
#	src/main/java/seedu/address/logic/parser/AddCommandParser.java
#	src/main/java/seedu/address/logic/parser/ParserUtil.java
#	src/main/java/seedu/address/logic/parser/ScheduleCommandParser.java
#	src/main/java/seedu/address/model/ProductiveNus.java
#	src/main/java/seedu/address/model/assignment/Assignment.java
#	src/main/java/seedu/address/model/assignment/Schedule.java
#	src/main/java/seedu/address/model/lesson/Lesson.java
#	src/main/java/seedu/address/model/task/Deadline.java
#	src/main/java/seedu/address/model/task/Time.java
#	src/main/java/seedu/address/model/util/SampleDataUtil.java
#	src/main/java/seedu/address/storage/JsonAdaptedAssignment.java
#	src/main/java/seedu/address/storage/JsonAdaptedLesson.java
#	src/main/java/seedu/address/timetable/TimetableRetriever.java
#	src/main/java/seedu/address/ui/AssignmentCard.java
#	src/main/java/seedu/address/ui/AssignmentCardWithSchedule.java
#	src/main/java/seedu/address/ui/UpcomingLessonCard.java
#	src/main/java/seedu/address/ui/UpcomingTaskListPanel.java
#	src/main/java/seedu/tasklist/model/task/Deadline.java
#	src/test/java/seedu/address/logic/commands/ListCommandTest.java
#	src/test/java/seedu/address/logic/parser/AddCommandParserTest.java
#	src/test/java/seedu/address/logic/parser/EditCommandParserTest.java
#	src/test/java/seedu/address/logic/parser/ParserUtilTest.java
#	src/test/java/seedu/address/model/task/DeadlineTest.java
#	src/test/java/seedu/address/model/task/TimeTest.java
#	src/test/java/seedu/address/storage/JsonAdaptedAssignmentTest.java
#	src/test/java/seedu/address/testutil/AssignmentBuilder.java
#	src/test/java/seedu/address/testutil/EditAssignmentDescriptorBuilder.java
#	src/test/java/seedu/address/testutil/LessonBuilder.java
Copy link
Collaborator

@ChooJiaXin ChooJiaXin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

@itsjerryho itsjerryho merged commit 478a00d into AY2021S1-CS2103T-F11-3:master Nov 7, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants