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

[Chen Xingjian] iP #402

Open
wants to merge 64 commits into
base: master
Choose a base branch
from
Open

Conversation

ChenXJ98
Copy link

No description provided.

@ChenXJ98 ChenXJ98 changed the title Chen Xingjian [Chen Xingjian] iP Aug 25, 2020
* master:
  UPDATE UI

# Conflicts:
#	src/main/java/Duke.java
* branch-Level-8:
  Level-8
  UPDATE Duke.class file

# Conflicts:
#	src/main/java/Command.java
#	src/main/java/Duke.java
* branch-A-JavaDoc:
  A-JavaDoc
* branch-A-CodingStandard:
  A-CodingStandard

# Conflicts:
#	src/main/java/Duke/Command/DeleteCommand.java
#	src/main/java/Duke/Parser.java
#	src/main/java/Duke/Task.java
#	src/main/java/Duke/TaskList.java
* branch-A-CheckStyle:
  A-CheckStyle
* branch-A-CheckStyle:
  Update Ui
* branch-A-Gradle:
  Update build.gradle checkstyle
* branch-GUI:
  Update Main
  Setup Launcher and Main java class
  GUI Test setup

# Conflicts:
#	src/main/java/duke/DialogBox.java
#	src/main/java/duke/Duke.java
#	src/main/java/duke/Launcher.java
#	src/main/java/duke/Main.java
#	src/main/java/duke/Tester.java
Copy link

@WeiJie96 WeiJie96 left a comment

Choose a reason for hiding this comment

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

Looks good in general 👍


/**
* Creates a DateAndTime object
* @param date String representing date
Copy link

Choose a reason for hiding this comment

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

Should there be a newline after the description?

* @param date String representing date
* @param time String representing time
* @throws InvalidDateTimeException
*/
Copy link

Choose a reason for hiding this comment

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

Should there be a description to say when the exception would be thrown?


/**
* Represents date and time object
*/
Copy link

Choose a reason for hiding this comment

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

Should there be a full stop after the description


/**
* An example of a custom control using FXML.
* This control represents a dialog box consisting of an ImageView to represent the speaker's face and a label
Copy link

Choose a reason for hiding this comment

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

Should this line be one more indented by one more space? Perhaps we can align the second "" of the "/**" line with the "" of the subsequent lines

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

4 participants