[Tay Jun Yang] iP by dannytayjy · Pull Request #500 · nus-cs2103-AY2122S1/ip

dannytayjy · 2021-08-30T22:35:45Z

No description provided.

leeroy999

Overall lgtm! Just note the few nits, and perhaps it could be better to reduce copy-pasting of certain code blocks, and abstract them or use as default from abstract class that it is inheriting from.

leeroy999 · 2021-09-01T08:26:39Z

+        new Duke("data", "tasks.txt").run();
+    }
+
+    public void run() {


Would be good to add headers comments for public methods.

leeroy999 · 2021-09-01T08:27:10Z

+
+import java.io.IOException;
+
+public class Duke {


Perhaps add header comment for the class.

Noticed that there is no JavaDocs added throughout. Perhaps it would be good practice to have them, as documentation to improve readability of your code.

leeroy999 · 2021-09-01T08:32:21Z

+            if ((commandType.equals("bye") || commandType.equals("list")) && !commandInfo.equals("")) {
+                throw new DukeException("INVALID COMMAND. Please try again!");
+            }
+        } else { // for "bye" and "list" commands


Comments should be indented relative to their position in the code.

leeroy999 · 2021-09-01T08:43:40Z

+        return command;
+    }
+
+    private int getTaskNumFromCommand(String commandInfo) throws DukeException {


Perhaps a shorter name would be better e.g. getTaskNum.

leeroy999 · 2021-09-01T08:46:48Z

+        }
+    }
+
+    private String getTaskDescriptionFromToDoCommand(String commandInfo) throws DukeException {


Same comment as above, method names could be shorter and more concise, and if they are specific to a command, perhaps it could be a better design to have them in the respective command classes.

This applies to other method names as well.

leeroy999 · 2021-09-01T08:49:20Z

+            if (deadlineTaskDetails.length == 2) {
+                if (deadlineTaskDetails[0].trim().length() > 0) {
+                    if (deadlineTaskDetails[1].trim().startsWith("by")) {
+                        String beforeDateTime = deadlineTaskDetails[1].trim();
+                        String[] beforeDateTimeParts = beforeDateTime.split("\\s+", 2);
+
+                        if (beforeDateTimeParts.length == 2) {
+                            return commandInfo;
+                        } else {
+                            throw new DukeException("INCOMPLETE COMMAND"
+                                    + System.lineSeparator() + "\t"
+                                    + "The date/time of a deadline cannot be empty!"
+                                    + System.lineSeparator() + "\t"
+                                    + "[Note: Enter /by before specifying the date/time]");
+                        }
+                    } else {
+                        throw new DukeException("WRONG COMMAND"
+                                + System.lineSeparator() + "\t"
+                                + "Enter /by before specifying the date!");
+                    }
+                } else {
+                    if (deadlineTaskDetails[1].trim().startsWith("by")) {
+                        String beforeDateTime = deadlineTaskDetails[1].trim();
+                        String[] beforeDateTimeParts = beforeDateTime.split("\\s+", 2);
+
+                        if (beforeDateTimeParts.length == 2) {
+                            throw new DukeException("INCOMPLETE COMMAND"
+                                    + System.lineSeparator() + "\t"
+                                    + "The description of a deadline cannot be empty!");
+                        } else {
+                            throw new DukeException("INCOMPLETE COMMAND"
+                                    + System.lineSeparator() + "\t"
+                                    + "The description of a deadline cannot be empty!"
+                                    + System.lineSeparator() + "\t"
+                                    + "The date/time of a deadline cannot be empty!"
+                                    + System.lineSeparator() + "\t"
+                                    + "[Note: Enter /by before specifying the date/time]");
+                        }
+                    } else {
+                        throw new DukeException("INCOMPLETE & WRONG COMMAND"
+                                + System.lineSeparator() + "\t"
+                                + "The description of a deadline cannot be empty!"
+                                + System.lineSeparator() + "\t"
+                                + "Enter /by before specifying the date/time!");
+                    }
+                }
+            } else {
+                throw new DukeException("INCOMPLETE COMMAND"
+                        + System.lineSeparator() + "\t"
+                        + "The date/time of a deadline cannot be empty!"
+                        + System.lineSeparator() + "\t"
+                        + "[Note: Enter /by before specifying the date/time]");
+            }
+        } else {
+            throw new DukeException("INCOMPLETE COMMAND"
+                    + System.lineSeparator() + "\t"
+                    + "The description and date/time of a deadline cannot be empty!"
+                    + System.lineSeparator() + "\t"
+                    + "[Note: Enter /by before specifying the date/time]");
+        }
+    }


Avoid deep nesting, especially if you need more than 3 levels of indentation. In particular, avoid arrowhead style code.

leeroy999 · 2021-09-01T08:50:55Z

+        if (commandInfo.trim().length() > 0) {
+            String[] eventTaskDetails = commandInfo.split("/", 2);
+
+            if (eventTaskDetails.length == 2) {
+                if (eventTaskDetails[0].trim().length() > 0) {
+                    if (eventTaskDetails[1].trim().startsWith("at")) {
+                        String startEndDateTime = eventTaskDetails[1].trim();
+                        String[] startEndDateTimeParts = startEndDateTime.split("\\s+", 2);
+
+                        if (startEndDateTimeParts.length == 2) {
+                            return commandInfo;
+                        } else {
+                            throw new DukeException("INCOMPLETE COMMAND"
+                                    + System.lineSeparator() + "\t"
+                                    + "The date/time of an event cannot be empty!"
+                                    + System.lineSeparator() + "\t"
+                                    + "[Note: Enter /at before specifying the date/time]");
+                        }
+                    } else {
+                        throw new DukeException("WRONG COMMAND"
+                                + System.lineSeparator() + "\t"
+                                + "Enter /at before specifying the date!");
+                    }
+                } else {
+                    if (eventTaskDetails[1].trim().startsWith("at")) {
+                        String startEndDateTime = eventTaskDetails[1].trim();
+                        String[] startEndDateTimeParts = startEndDateTime.split("\\s+", 2);
+
+                        if (startEndDateTimeParts.length == 2) {
+                            throw new DukeException("INCOMPLETE COMMAND"
+                                    + System.lineSeparator() + "\t"
+                                    + "The description of an event cannot be empty!");
+                        } else {
+                            throw new DukeException("INCOMPLETE COMMAND"
+                                    + System.lineSeparator() + "\t"
+                                    + "The description of an event cannot be empty!"
+                                    + System.lineSeparator() + "\t"
+                                    + "The date/time of an event cannot be empty!"
+                                    + System.lineSeparator() + "\t"
+                                    + "[Note: Enter /at before specifying the date/time]");
+                        }
+                    } else {
+                        throw new DukeException("INCOMPLETE & WRONG COMMAND"
+                                + System.lineSeparator() + "\t"
+                                + "The description of an event cannot be empty!"
+                                + System.lineSeparator() + "\t"
+                                + "Enter /at before specifying the date/time!");
+                    }
+                }
+            } else {
+                throw new DukeException("INCOMPLETE COMMAND"
+                        + System.lineSeparator() + "\t"
+                        + "The date/time of an event cannot be empty!"
+                        + System.lineSeparator() + "\t"
+                        + "[Note: Enter /at before specifying the date/time]");
+            }
+        } else {
+            throw new DukeException("INCOMPLETE COMMAND"
+                    + System.lineSeparator() + "\t"
+                    + "The description and date/time of an event cannot be empty!"
+                    + System.lineSeparator() + "\t"
+                    + "[Note: Enter /at before specifying the date/time]");
+        }


Same as comment above, avoid deep nesting.

leeroy999 · 2021-09-01T09:06:16Z

+        if (!timeInput.equals("")) {
+            try {
+                int timeInputInInt = Integer.parseInt(timeInput);
+
+                if ((timeInputInInt < 0 || timeInputInInt > 2359)) {
+                    isTimeInputProper = false;
+                    time = null;
+                } else {
+                    if (timeInput.length() != 4) {
+                        isTimeInputProper = false;
+                        time = null;
+                    } else {
+                        int hour = timeInputInInt / 100;
+                        int min = timeInputInInt - (hour * 100);
+
+                        String timeInputInTimeFormat = "";
+
+                        if (hour < 10) {
+                            timeInputInTimeFormat += "0" + hour;
+                        } else {
+                            timeInputInTimeFormat += hour;
+                        }
+
+                        if (min < 10) {
+                            timeInputInTimeFormat += ":" + "0" + min;
+                        } else {
+                            timeInputInTimeFormat += ":" + min;
+                        }
+
+                        DateTimeFormatter timeFormatter = DateTimeFormatter.ISO_LOCAL_TIME;
+                        time = LocalTime.parse(timeInputInTimeFormat, timeFormatter);
+                    }
+                }
+            } catch (Exception e) {
+                time = null;
+            }
+        } else {
+            time = null;
+        }


Same as above, try to avoid deep nesting.

leeroy999 · 2021-09-01T09:09:28Z

+    EVENT("event", "E");
+
+    private final String label;
+    private final String abbr;


Perhaps better name could be letter or spelled in full abbreviation

dannytayjy added 14 commits August 19, 2021 19:39

Implement Level-1: Greet, Echo, Exit

7d4a3b6

Implement Level-2: Add, List

103b9a9

Implement Level-3: Mark task as Done

a48639a

Implement Level-4: ToDo, Event, Deadline and TaskType Enum

5ae82e5

Update Duke.java: Edit print output

5c3a321

Implement A-TextUiTesting: Update EXPECTED.TXT and input.txt

3f58e09

Implement Level-5: Handle errors via Exception Handling

b71fe73

Implement Level-6: Delete task

7c277bc

Implement Level-7: Save tasks to text file

73492fc

Implement Level-8: Teach Duke to understand dates and times

0a46d99

Merge branch 'branch-Level-8'

474f703

Implement A-MoreOOP: Make the code more OOP

0f100be

Update A-MoreOOP: Make the code more OOP

d89b0c1

Implement A-Packages and fix bugs

942e26c

leeroy999 reviewed Sep 1, 2021

View reviewed changes

dannytayjy added 4 commits September 9, 2021 19:41

Add JavaDoc comments

765d73c

Update Ui.java to amend String in displayWelcomeMessage

483a811

Add JUnit tests

4fa286f

Merge branch 'branch-A-JavaDoc'

377e1db

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

[Tay Jun Yang] iP#500

[Tay Jun Yang] iP#500
dannytayjy wants to merge 18 commits into
nus-cs2103-AY2122S1:masterfrom
dannytayjy:master

dannytayjy commented Aug 30, 2021

Uh oh!

leeroy999 left a comment

Uh oh!

leeroy999 Sep 1, 2021

Uh oh!

leeroy999 Sep 1, 2021

Uh oh!

leeroy999 Sep 1, 2021

Uh oh!

leeroy999 Sep 1, 2021

Uh oh!

leeroy999 Sep 1, 2021

Uh oh!

leeroy999 Sep 1, 2021

Uh oh!

leeroy999 Sep 1, 2021

Uh oh!

leeroy999 Sep 1, 2021

Uh oh!

leeroy999 Sep 1, 2021

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Uh oh!

Conversation

dannytayjy commented Aug 30, 2021

Uh oh!

leeroy999 left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants