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

[Mark Biju George] iP #306

Open
wants to merge 57 commits into
base: master
Choose a base branch
from
Open
Changes from 2 commits
Commits
Show all changes
57 commits
Select commit Hold shift + click to select a range
d839859
Add Gradle support
May 24, 2020
88c8d20
Update Duke.java
markbiju16 Jan 20, 2022
6a2ea62
Update Duke.java
markbiju16 Jan 20, 2022
8d817b0
Update Duke.java
markbiju16 Jan 20, 2022
b8c4536
Level-4
markbiju16 Jan 21, 2022
0eaf074
Level-4 upd
markbiju16 Jan 22, 2022
a5fd6ec
A-TextUiTesting
markbiju16 Jan 22, 2022
0f0b793
Level-5
markbiju16 Jan 26, 2022
3a748c6
Update Duke.java
markbiju16 Jan 26, 2022
f1e27b0
Level-7
markbiju16 Feb 1, 2022
3edf9ae
Level-8
markbiju16 Feb 2, 2022
2466584
Merge branch 'branch-Level-8'
markbiju16 Feb 2, 2022
987ae8f
A-MoreOOP
markbiju16 Feb 5, 2022
91a36da
update A-MoreOOP
markbiju16 Feb 5, 2022
83901c6
Delete AddCommand.java
markbiju16 Feb 11, 2022
ab034ad
A-Packages
markbiju16 Feb 11, 2022
edcb4fc
A-JUnit
markbiju16 Feb 12, 2022
eb2a949
Delete file.txt
markbiju16 Feb 12, 2022
cd19b3c
A-Jar
markbiju16 Feb 12, 2022
a61bb16
branch-A-JavaDoc
markbiju16 Feb 12, 2022
4440da8
branch-A-CodingStandard
markbiju16 Feb 13, 2022
3430097
Level-9
markbiju16 Feb 14, 2022
a502950
Merge branch 'branch-A-CodingStandard'
markbiju16 Feb 14, 2022
5a5a5a0
Merge branch 'branch-Level-9'
markbiju16 Feb 14, 2022
c6b7c86
Merge branch 'add-gradle-support'
markbiju16 Feb 15, 2022
e11f89b
Level-10
markbiju16 Feb 19, 2022
9c12c96
Update Storage.java
markbiju16 Feb 19, 2022
5f2d63d
update Ui
markbiju16 Feb 19, 2022
8255963
Update tasks.txt
markbiju16 Feb 19, 2022
f3bb3d2
Update build.gradle
markbiju16 Feb 19, 2022
53ed0bf
update A-Jar
markbiju16 Feb 19, 2022
dc7bd54
update Unmark
markbiju16 Feb 19, 2022
690237a
Update find
markbiju16 Feb 19, 2022
6cb9827
Update delete
markbiju16 Feb 19, 2022
cbc97e1
Add assertions
markbiju16 Feb 21, 2022
df4e00f
Update Ui.java
markbiju16 Feb 21, 2022
8ae349f
Merge branch 'branch-Level-10'
markbiju16 Feb 21, 2022
3e5b53a
Improve code quality
markbiju16 Feb 21, 2022
5dc99cf
Update Deadline.java
markbiju16 Feb 21, 2022
7b9e93d
Update Deadline.java
markbiju16 Feb 21, 2022
c13f1a0
Merge branch 'master' into branch-A-Assertions
markbiju Feb 21, 2022
134e81c
Merge pull request #2 from markbiju/branch-A-Assertions
markbiju Feb 21, 2022
7cab92e
Merge branch 'master' into branch-A-CodeQuality
markbiju Feb 21, 2022
be9a892
Merge pull request #3 from markbiju/branch-A-CodeQuality
markbiju Feb 21, 2022
d93a64d
Update deadline saving
markbiju16 Feb 21, 2022
84784f9
Merge branch 'master' of https://github.com/markbiju/ip
markbiju16 Feb 21, 2022
ad26dcd
Update deadline saving
markbiju16 Feb 21, 2022
9124b44
BCD-Extension
markbiju16 Feb 21, 2022
0613f16
Update README.md
markbiju16 Feb 21, 2022
354d8b1
Ui.png
markbiju16 Feb 21, 2022
aacf706
Update README.md
markbiju16 Feb 21, 2022
6deb38d
Update README.md
markbiju16 Feb 21, 2022
0411ea5
Update README.md
markbiju16 Feb 21, 2022
046ca8f
Update SnoozeCommand.java
markbiju16 Feb 21, 2022
0cf6b0c
Update README.md
markbiju Feb 22, 2022
dd9d9a3
Update Parser.java
markbiju16 Feb 24, 2022
d84593a
Update Parser.java
markbiju16 Feb 24, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/main/.idea/.name

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions src/main/java/duke/Storage.java
Original file line number Diff line number Diff line change
@@ -33,11 +33,11 @@ public ArrayList<Task> load() throws DukeException {
file.createNewFile();
}
}
Scanner myObj = new Scanner(file);
Scanner scanner = new Scanner(file);
boolean doneOrNot = false;
ArrayList<Task> tasks = new ArrayList<>();
while (myObj.hasNext()) {
String fullCommand = myObj.nextLine();
while (scanner.hasNext()) {
String fullCommand = scanner.nextLine();
String[] arrOfStr = fullCommand.split(" ", 5);
String command = arrOfStr[0];
if (Integer.parseInt(arrOfStr[2]) == 1) {
4 changes: 2 additions & 2 deletions src/main/java/duke/Ui.java
Original file line number Diff line number Diff line change
@@ -24,8 +24,8 @@ public void showWelcome() {
* @return String entered by user
*/
public String readCommand() {
Scanner myObj = new Scanner(System.in);
return myObj.nextLine();
Scanner scanner = new Scanner(System.in);
return scanner.nextLine();
}

/**