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

Jay2 #131

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

Jay2 #131

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
683 commits
Select commit Hold shift + click to select a range
65b934a
update user guide command summary
tylerrocha Mar 30, 2017
4c55c88
fix comment
tylerrocha Mar 31, 2017
64f179b
create SaveCommand.java
tylerrocha Mar 31, 2017
64f9e90
editthis basic functionality
jay500s Mar 31, 2017
24f063e
editthis fully functional
jay500s Mar 31, 2017
9b28f5d
factored out modifyOccurrence into Task class
jay500s Mar 31, 2017
e605447
fixed edit frequency on gui;
jay500s Mar 31, 2017
b95e534
deletethis functionality
jay500s Mar 31, 2017
e9109c8
factored out common code in setOccurrences()
jay500s Mar 31, 2017
b2dfd02
fixed broken tests
jay500s Mar 31, 2017
1b9f1e9
fixed checkstyle + collated
jay500s Mar 31, 2017
602d4d2
Updated tests, added deletethis functionality, fixed bugs with editth…
jay500s Apr 3, 2017
ee0176f
Merge pull request #114 from CS2103JAN2017-T11-B3/jay2
jay500s Apr 3, 2017
4eb0184
removed commented out code from Task
jay500s Apr 3, 2017
89803e8
Fixed the logical bug raised by tutor during last week's demo
whyCaiJi Apr 4, 2017
a340f93
Fix checkstyle
whyCaiJi Apr 5, 2017
ac5335e
Added test cases for PrioritizeCommand
whyCaiJi Apr 5, 2017
d4e3479
Added CompleteCommand test cases
whyCaiJi Apr 5, 2017
7c39243
Merge branch 'master' of https://github.com/CS2103JAN2017-T11-B3/main…
whyCaiJi Apr 5, 2017
be08a5d
create SaveCommand constructor
tylerrocha Apr 5, 2017
f02cd60
add save command to Parser.java
tylerrocha Apr 5, 2017
7a0100a
removed commented out code,
jay500s Apr 5, 2017
9f732fd
change addressbook to taskmanager in Config.java
tylerrocha Apr 5, 2017
08853f9
Merge branch 'master' into jay2
jay500s Apr 5, 2017
3076910
unused pacakge
jay500s Apr 5, 2017
2190a3b
Merge branch 'jay2' of https://github.com/CS2103JAN2017-T11-B3/main i…
jay500s Apr 5, 2017
226d0c6
add config to LogicManager so it can be changed with save cmd
tylerrocha Apr 5, 2017
dce5694
Merge pull request #126 from CS2103JAN2017-T11-B3/jay2
whyCaiJi Apr 5, 2017
b18d665
fix Config compile erros
tylerrocha Apr 5, 2017
8668f7e
removed magic numbers/strings
jay500s Apr 5, 2017
a9f9797
update dev guide, renamed methods, added javadoc comments
jay500s Apr 5, 2017
24a1ddc
dev guide 'model' formatting
jay500s Apr 5, 2017
f0d2899
model updates in dev guide
jay500s Apr 5, 2017
ae7312d
dev guide
jay500s Apr 5, 2017
e4c547a
user guide update
jay500s Apr 5, 2017
a7aedd6
implement save command
tylerrocha Apr 5, 2017
9fa4bb5
spelling
jay500s Apr 5, 2017
9baee0c
create LoadCommand and LoadCommandParser
tylerrocha Apr 5, 2017
519dd09
update parser to include load
tylerrocha Apr 5, 2017
b16ad16
change calender's date and update about us and developer guide
Apr 5, 2017
971db87
implement load command
tylerrocha Apr 5, 2017
4965eb4
fix bug and ui
Apr 5, 2017
4220fdb
Merge branch 'master' into jay2
jay500s Apr 5, 2017
cbfc9a0
Merge pull request #128 from CS2103JAN2017-T11-B3/changeDate
Apr 5, 2017
cec71c4
reset data in model after load
tylerrocha Apr 5, 2017
ad7eab5
Merge branch 'master' of https://github.com/CS2103JAN2017-T11-B3/main…
tylerrocha Apr 5, 2017
0329977
Merge branch 'master' into jay2
jay500s Apr 5, 2017
acbaa2d
update docs to reflect save/load
tylerrocha Apr 5, 2017
14b5fe6
fix checkstyle
tylerrocha Apr 5, 2017
04d954d
- Implemented editthis and deletethis for recurring tasks properly
whyCaiJi Apr 5, 2017
69f92fe
user guide doc
jay500s Apr 5, 2017
d7a3cec
Ui diagram graph
Apr 5, 2017
a433064
fix ConfigTest
tylerrocha Apr 5, 2017
1c1c5c4
added section in user guide for recurring tasks
jay500s Apr 5, 2017
c762a10
fix ConfigUtil tests
tylerrocha Apr 5, 2017
4e9b1dd
Merge branch 'master' into undo-feature
whyCaiJi Apr 5, 2017
fbf33bb
indentations to spaces
jay500s Apr 5, 2017
fa412de
update about us
tylerrocha Apr 5, 2017
7348109
address codacy
tylerrocha Apr 5, 2017
25cd2ba
correct indentation
tylerrocha Apr 5, 2017
60af9c2
rename variable for codacy
tylerrocha Apr 5, 2017
0fb33e4
Merge pull request #130 from CS2103JAN2017-T11-B3/undo-feature
whyCaiJi Apr 5, 2017
cd2744b
Merge branch 'master' of https://github.com/CS2103JAN2017-T11-B3/main…
tylerrocha Apr 5, 2017
04f6f9c
Merge pull request #129 from CS2103JAN2017-T11-B3/save_directory
tylerrocha Apr 5, 2017
94d92df
update contribution
tylerrocha Apr 5, 2017
62c2849
fix order of events in complete command
tylerrocha Apr 5, 2017
05e4c3a
collate
tylerrocha Apr 5, 2017
a9850aa
update AboutUs.md
tylerrocha Apr 5, 2017
a355de1
Merge branch 'master' into changeDate
Apr 5, 2017
a0ffb5f
Merge pull request #132 from CS2103JAN2017-T11-B3/fix_complete
tylerrocha Apr 5, 2017
dd611ee
Merge branch 'master' into changeDate
whyCaiJi Apr 6, 2017
50d6aed
Merge pull request #131 from CS2103JAN2017-T11-B3/changeDate
whyCaiJi Apr 6, 2017
aad889e
Merge branch 'master' of https://github.com/CS2103JAN2017-T11-B3/main…
jay500s Apr 6, 2017
ba44e4d
resolve conflicts
jay500s Apr 6, 2017
a9ea137
Merge branch 'master' of https://github.com/CS2103JAN2017-T11-B3/main…
jay500s Apr 6, 2017
dfa9f0c
Merge pull request #127 from CS2103JAN2017-T11-B3/jay2
jay500s Apr 6, 2017
7182a2c
saved Date object in XML file
jay500s Apr 6, 2017
f0a107d
Merge branch 'master' into jay2
jay500s Apr 6, 2017
e45f84b
Merge branch 'master' of https://github.com/CS2103JAN2017-T11-B3/main…
jay500s Apr 6, 2017
081d8a7
Merge branch 'jay2' of https://github.com/CS2103JAN2017-T11-B3/main i…
jay500s Apr 6, 2017
6d91a68
Merge pull request #134 from CS2103JAN2017-T11-B3/jay2
jay500s Apr 6, 2017
f19ea20
fix date and timing
Apr 6, 2017
6231c16
Added test case for completing a normal task
whyCaiJi Apr 8, 2017
154f139
pass config part of save success test
tylerrocha Apr 8, 2017
b16b1e4
Fixed bug in AddCommand Test
whyCaiJi Apr 8, 2017
e4f9c31
Use FileUtil create file
tylerrocha Apr 8, 2017
a9db9ff
Added 1 recurring task test in AddCommandTest
whyCaiJi Apr 8, 2017
846c2b0
Refactored recurring label in UI
whyCaiJi Apr 8, 2017
3baf107
organize file paths
tylerrocha Apr 8, 2017
a3a9d35
use tasklist, not addressbook in TestUtil; use TestUtil to populate s…
tylerrocha Apr 8, 2017
594294d
pass save success again
tylerrocha Apr 8, 2017
f2f191b
start to add save fail tests
tylerrocha Apr 8, 2017
5c88902
add isFileContentSame method
tylerrocha Apr 8, 2017
aa4f112
Merge pull request #135 from CS2103JAN2017-T11-B3/fix-date-and-timing
Apr 8, 2017
9e7266b
calenderCommandTest
Apr 8, 2017
14b5e17
use task list not address book in TestApp
tylerrocha Apr 8, 2017
08421c2
Tested recurring task in AddCommand
whyCaiJi Apr 8, 2017
c697a56
ErrorDialogGuiTest.java fix
Apr 8, 2017
08a0922
Merge branch 'test-heyang' of https://github.com/CS2103JAN2017-T11-B3…
jay500s Apr 8, 2017
47482f8
Deleted redundant files left from address book
whyCaiJi Apr 8, 2017
109c5fb
finalize save command
tylerrocha Apr 8, 2017
89b81df
delete browser stuff
Apr 8, 2017
975488c
findCommandTest
Apr 8, 2017
7352319
add testing for recur month
jay500s Apr 8, 2017
6cb32c8
fix naming
Apr 8, 2017
8fa5d47
- Fixed bugs and added 1 edit command test case
whyCaiJi Apr 8, 2017
550210c
code quality
Apr 8, 2017
fd54f92
added test for yearly recurrsion
jay500s Apr 8, 2017
23ad953
fixed frequency test
jay500s Apr 8, 2017
fc1331a
add load command tests
tylerrocha Apr 8, 2017
3b69d80
fix checkstyle
tylerrocha Apr 8, 2017
5f03e5b
Merge branch 'master' of https://github.com/CS2103JAN2017-T11-B3/main…
tylerrocha Apr 8, 2017
6689488
Merge pull request #136 from CS2103JAN2017-T11-B3/calendetTest
Apr 8, 2017
2f0845a
Merge branch 'master' into test-jay
jay500s Apr 8, 2017
9c15ca9
Merge branch 'master' of https://github.com/CS2103JAN2017-T11-B3/main…
tylerrocha Apr 8, 2017
42ab59e
Merge pull request #137 from CS2103JAN2017-T11-B3/test-jay
jay500s Apr 8, 2017
41dc462
remove trailing whitespace
tylerrocha Apr 8, 2017
93dd912
Merge branch 'master' of https://github.com/CS2103JAN2017-T11-B3/main…
tylerrocha Apr 8, 2017
12f12d0
Dummy test to run ExtractOccurrence
whyCaiJi Apr 8, 2017
7a89446
Merge branch 'master' into test-heyang
whyCaiJi Apr 8, 2017
48618ed
Merge branch 'master' of https://github.com/CS2103JAN2017-T11-B3/main…
whyCaiJi Apr 8, 2017
0ba5bc8
Merge branch 'test-heyang' of https://github.com/CS2103JAN2017-T11-B3…
whyCaiJi Apr 8, 2017
77150e0
patch tests
tylerrocha Apr 8, 2017
abf3f50
Fix checkstyle
tylerrocha Apr 8, 2017
6a0b37e
Merge pull request #138 from CS2103JAN2017-T11-B3/test-heyang
whyCaiJi Apr 8, 2017
58a6a85
try clearing before some gui tests
tylerrocha Apr 8, 2017
7f72f0d
try TestApp revert
tylerrocha Apr 8, 2017
138d5c8
Add missing import
tylerrocha Apr 8, 2017
11ac685
hardcore fix save test
tylerrocha Apr 8, 2017
977fe8b
add storage manager comments
tylerrocha Apr 8, 2017
7e3666e
fix checkstyle
tylerrocha Apr 8, 2017
0625f38
Merge branch 'master' of https://github.com/CS2103JAN2017-T11-B3/main…
tylerrocha Apr 8, 2017
a9a89ff
collate
tylerrocha Apr 8, 2017
ad04edc
try appveyor test
tylerrocha Apr 8, 2017
4f54bfa
consider os in save command test
tylerrocha Apr 8, 2017
4427aa1
fix checkstyle
tylerrocha Apr 8, 2017
47eec7f
Merge pull request #139 from CS2103JAN2017-T11-B3/test_save_load
whyCaiJi Apr 9, 2017
6eb5d41
Remove addressbookbuilder.java
tylerrocha Apr 9, 2017
3598462
uncomment tests
tylerrocha Apr 9, 2017
2d30686
bug fix on extra task added using editthis command
whyCaiJi Apr 9, 2017
d6b1bc8
Added test cases for deletethis and editthis commands
whyCaiJi Apr 9, 2017
807c1f8
no message
jay500s Apr 9, 2017
070f53c
Merge branch 'master' of https://github.com/CS2103JAN2017-T11-B3/main…
jay500s Apr 9, 2017
c6f411c
removed magic numbers/strings
jay500s Apr 9, 2017
4218471
fix XmlUtilTest
tylerrocha Apr 9, 2017
cf29af9
reset logic manager test
tylerrocha Apr 9, 2017
d2f3f74
remove select tests
tylerrocha Apr 9, 2017
b93613d
remove address book from logic manager
tylerrocha Apr 9, 2017
976b205
update task functions
tylerrocha Apr 9, 2017
ac3ec8e
update generate add command
tylerrocha Apr 9, 2017
6b72e50
refactored code for run()
jay500s Apr 9, 2017
8f33e5b
collate
jay500s Apr 9, 2017
59e07db
Renaming to align with Task Manager
whyCaiJi Apr 9, 2017
4562f77
try null config... 5 errors, 7 fail
tylerrocha Apr 9, 2017
ad86028
Tested complete command on recurring task
whyCaiJi Apr 9, 2017
6b3e74c
Merge pull request #140 from CS2103JAN2017-T11-B3/jay2
jay500s Apr 9, 2017
1c75751
changed nonfunctional req for recurring tasks
jay500s Apr 9, 2017
a953992
Updating User Guide formatting
jay500s Apr 9, 2017
3501c87
pass some logic tests
tylerrocha Apr 9, 2017
d505ff1
Merge branch 'master' of https://github.com/CS2103JAN2017-T11-B3/main…
jay500s Apr 9, 2017
eb624c5
fix checkstyle
tylerrocha Apr 9, 2017
b274f15
Merge branch 'master' of https://github.com/CS2103JAN2017-T11-B3/main…
tylerrocha Apr 9, 2017
3897441
added logic to handle missing timings from recurring task commands
jay500s Apr 9, 2017
e7e6956
collate
jay500s Apr 9, 2017
af79a7c
fixed checkstyle
jay500s Apr 9, 2017
b87071c
Merge pull request #141 from CS2103JAN2017-T11-B3/jay2
jay500s Apr 9, 2017
9fdeb3c
Merge branch 'master' of https://github.com/CS2103JAN2017-T11-B3/main…
tylerrocha Apr 9, 2017
5d8e1cf
Merge AboutUs
tylerrocha Apr 9, 2017
0b2c713
Merge pull request #143 from CS2103JAN2017-T11-B3/logic_manager_test
tylerrocha Apr 9, 2017
159e78b
Update UserGuide.md
jay500s Apr 9, 2017
4606ecb
Added boundry test cases for EditCommandTest
whyCaiJi Apr 9, 2017
74b0fb2
Merge branch 'master' of https://github.com/CS2103JAN2017-T11-B3/main…
whyCaiJi Apr 9, 2017
ec6db21
Update UserGuide.md
jay500s Apr 9, 2017
5c7bdc9
doc and label
Apr 9, 2017
9943dc5
Update UserGuide.md
jay500s Apr 9, 2017
7310530
added proper logging
jay500s Apr 9, 2017
e057b3b
Merge pull request #144 from CS2103JAN2017-T11-B3/jay-patch
jay500s Apr 9, 2017
0f5aace
collate
jay500s Apr 9, 2017
0049820
Merge branch 'master' into jay2
jay500s Apr 9, 2017
a8b1ce6
small update to dev guide
jay500s Apr 9, 2017
e9de766
Added loggers
whyCaiJi Apr 9, 2017
497095a
add logger
Apr 9, 2017
e0c3e23
collate
Apr 9, 2017
6972205
collate
whyCaiJi Apr 9, 2017
356638b
Merge branch 'master' into test-heyang
whyCaiJi Apr 9, 2017
9c53812
Merge pull request #145 from CS2103JAN2017-T11-B3/jay2
jay500s Apr 9, 2017
e993b83
Merge branch 'master' into test-heyang
whyCaiJi Apr 9, 2017
6fbec6a
Update UserGuide.md
jay500s Apr 9, 2017
ad54047
Merge branch 'master' into larryDoc
tylerrocha Apr 9, 2017
dcc5d1f
Merge branch 'master' into jay-patch-1
jay500s Apr 9, 2017
c39089f
Merge branch 'jay-patch-1' of https://github.com/CS2103JAN2017-T11-B3…
whyCaiJi Apr 9, 2017
c79f0a8
Merge branch 'test-heyang' into larryDoc
Apr 9, 2017
3758494
Merge pull request #150 from CS2103JAN2017-T11-B3/larryDoc
Apr 9, 2017
85e0b86
Merge pull request #147 from CS2103JAN2017-T11-B3/test-heyang
whyCaiJi Apr 9, 2017
bf2cdfb
Added undo and redo
whyCaiJi Apr 9, 2017
3a6ac6e
changes to user guide
jay500s Apr 9, 2017
665bfab
adding examples in user guide
jay500s Apr 9, 2017
99b713d
updated about us
jay500s Apr 9, 2017
4ed60e5
Merge pull request #152 from CS2103JAN2017-T11-B3/jay2
jay500s Apr 9, 2017
83d440c
fixed recurring spelling
jay500s Apr 9, 2017
0825c82
fixed spelling dev guide
jay500s Apr 9, 2017
bd9182e
Update AboutUs
tylerrocha Apr 9, 2017
4fc4ee2
remove prints
tylerrocha Apr 9, 2017
a86a815
use logger
tylerrocha Apr 9, 2017
bedbf5d
update comments
tylerrocha Apr 9, 2017
5ef0fcf
remove unnecessary variable from method signatures
tylerrocha Apr 9, 2017
c72b102
improve comments
tylerrocha Apr 9, 2017
f982fc5
remove comment
tylerrocha Apr 9, 2017
4afc195
delete learning outcomes
tylerrocha Apr 9, 2017
216fd7f
rename method
tylerrocha Apr 9, 2017
014e716
grammar fix
jay500s Apr 9, 2017
82af8e0
update UserGuide.md
tylerrocha Apr 9, 2017
458107a
fix indent
tylerrocha Apr 9, 2017
128ce06
update comments
tylerrocha Apr 9, 2017
25d4df2
update UserGuide.md
tylerrocha Apr 9, 2017
402ae61
fix indent
tylerrocha Apr 9, 2017
617bd7e
add faq question
tylerrocha Apr 9, 2017
e295087
Update AboutUs
tylerrocha Apr 9, 2017
b25afcb
update comments
tylerrocha Apr 9, 2017
c31d955
fix indent
tylerrocha Apr 9, 2017
94ba0b9
update comments
tylerrocha Apr 9, 2017
e2e9726
fix indent
tylerrocha Apr 9, 2017
24338ec
Collate
tylerrocha Apr 9, 2017
7fea29f
update Architecture.png
tylerrocha Apr 9, 2017
79824ef
update StorageClassDiagram.png
tylerrocha Apr 9, 2017
1983f40
update UiClassDiagram.png
tylerrocha Apr 9, 2017
9a36342
fix typo in developerGuide
tylerrocha Apr 9, 2017
deb9373
make use cases alternate between User and Task Manager
tylerrocha Apr 9, 2017
d85cb4b
fix non functional requirements
tylerrocha Apr 9, 2017
05a2cb5
update product survey
tylerrocha Apr 9, 2017
a93f314
fix small things in userguide
tylerrocha Apr 9, 2017
82c9a24
update storage part of developer guide
tylerrocha Apr 9, 2017
153fb83
update Heyang AboutUs.md
tylerrocha Apr 9, 2017
b6f3e80
Merge pull request #153 from CS2103JAN2017-T11-B3/test-heyang
whyCaiJi Apr 9, 2017
f6bbd4d
update Heyang about us links
tylerrocha Apr 9, 2017
2d86d4b
fix some links
tylerrocha Apr 9, 2017
58f25fe
update links
tylerrocha Apr 9, 2017
54df11a
finalize about us
tylerrocha Apr 9, 2017
639f278
format dev guide
tylerrocha Apr 9, 2017
cfcfd7f
updated regex for description
jay500s Apr 9, 2017
35b7131
Merge pull request #154 from CS2103JAN2017-T11-B3/jay2
jay500s Apr 9, 2017
65420a7
docs updates
jay500s Apr 9, 2017
64615e4
Merge branch 'final_stuff' of https://github.com/CS2103JAN2017-T11-B3…
jay500s Apr 9, 2017
07b3b47
user guide updates
jay500s Apr 9, 2017
08b7bea
updated screenshot image of application
jay500s Apr 9, 2017
efff7b3
fixed edit commands
jay500s Apr 9, 2017
43d7fe1
updates to user guide
jay500s Apr 9, 2017
d78cc0f
update user guide
jay500s Apr 9, 2017
376397f
update UI image
jay500s Apr 9, 2017
55453a8
Updated Ui diagram
jay500s Apr 9, 2017
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
24 changes: 2 additions & 22 deletions .project
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>addressbook-level4</name>
<comment>Project addressbook-level4 created by Buildship.</comment>
<name>main</name>
<comment>Project main created by Buildship.</comment>
<projects>
</projects>
<buildSpec>
Expand All @@ -26,24 +26,4 @@
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
</natures>
<filteredResources>
<filter>
<id>1476898072165</id>
<name></name>
<type>26</type>
<matcher>
<id>org.eclipse.ui.ide.multiFilter</id>
<arguments>1.0-projectRelativePath-matches-false-false-build</arguments>
</matcher>
</filter>
<filter>
<id>1476898072188</id>
<name></name>
<type>26</type>
<matcher>
<id>org.eclipse.ui.ide.multiFilter</id>
<arguments>1.0-projectRelativePath-matches-false-false-.gradle</arguments>
</matcher>
</filter>
</filteredResources>
</projectDescription>
7 changes: 7 additions & 0 deletions .simplecov
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
require 'simplecov'
require 'coveralls'

SimpleCov.formatter = Coveralls::SimpleCov::Formatter
SimpleCov.start do
add_filter 'collated/'
end
Binary file added Collate-TUI.jar
Binary file not shown.
25 changes: 9 additions & 16 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,22 +1,14 @@
# Address Book (Level 4)
# Task Manager

[![Build Status](https://travis-ci.org/CS2103JAN2017-T11-B3/main.svg?branch=master)](https://travis-ci.org/CS2103JAN2017-T11-B3/main)
[![Build status](https://ci.appveyor.com/api/projects/status/7sjb96y2061vwddh/branch/master?svg=true)](https://ci.appveyor.com/project/tylerrocha/main/branch/master)
[![Coverage Status](https://coveralls.io/repos/github/CS2103JAN2017-T11-B3/main/badge.svg?branch=master)](https://coveralls.io/github/CS2103JAN2017-T11-B3/main?branch=master)
[![Codacy Badge](https://api.codacy.com/project/badge/Grade/0e7b2134ae32403ea022773f59c76332)](https://www.codacy.com/app/tylerrocha/main?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=CS2103JAN2017-T11-B3/main&amp;utm_campaign=Badge_Grade)

[![Build Status](https://travis-ci.org/se-edu/addressbook-level4.svg?branch=master)](https://travis-ci.org/se-edu/addressbook-level4)
[![Build status](https://ci.appveyor.com/api/projects/status/3boko2x2vr5cc3w2?svg=true)](https://ci.appveyor.com/project/damithc/addressbook-level4)
[![Coverage Status](https://coveralls.io/repos/github/se-edu/addressbook-level4/badge.svg?branch=master)](https://coveralls.io/github/se-edu/addressbook-level4?branch=master)
[![Codacy Badge](https://api.codacy.com/project/badge/Grade/fc0b7775cf7f4fdeaf08776f3d8e364a)](https://www.codacy.com/app/damith/addressbook-level4?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=se-edu/addressbook-level4&amp;utm_campaign=Badge_Grade)

<img src="docs/images/Ui.png" width="600"><br>

* This is a desktop Address Book application. It has a GUI but most of the user interactions happen using
a CLI (Command Line Interface).
* It is a Java sample application intended for students learning Software Engineering while using Java as
the main programming language.
* It is **written in OOP fashion**. It provides a **reasonably well-written** code example that is
**significantly bigger** (around 6 KLoC)than what students usually write in beginner-level SE modules.
* What's different from [level 3](https://github.com/se-edu/addressbook-level3):
* A more sophisticated GUI that includes a list panel and an in-built Browser.
* More test cases, including automated GUI testing.
* Support for *Build Automation* using Gradle and for *Continuous Integration* using Travis CI.
* This is a desktop Task Manager application created for CS2103 Software Engineering at the National University of Singapore. It has a GUI but most of the user interactions happen using a CLI (Command Line Interface).


#### Site Map
Expand All @@ -29,8 +21,9 @@

#### Acknowledgements

* Some parts of this sample application were inspired by the excellent
* Some parts of this sample application were inspired by this
[Java FX tutorial](http://code.makery.ch/library/javafx-8-tutorial/) by *Marco Jakob*.
* This project was built off an address book application by SE-EDU and can be found at https://github.com/se-edu/


#### Licence : [MIT](LICENSE)
2 changes: 1 addition & 1 deletion _config.yml
Original file line number Diff line number Diff line change
@@ -1 +1 @@
theme: jekyll-theme-cayman
theme: jekyll-theme-tactile
24 changes: 24 additions & 0 deletions blooper
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<tasklist>
<tasks>
<description>Say so long to Fiona Kunz</description>
<priority>1</priority>
<recurring>false</recurring>
<frequency>0</frequency>
<tagged>owesMoney</tagged>
<tagged>friends</tagged>
<occurrences>
<complete>false</complete>
<endTiming>
<value>02/03/2100</value>
<timing>2100-03-02T00:00:00+08:00</timing>
</endTiming>
<startTiming>
<value>01/02/2017</value>
<timing>2017-02-01T00:00:00+08:00</timing>
</startTiming>
</occurrences>
</tasks>
<tags>owesMoney</tags>
<tags>friends</tags>
</tasklist>
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ plugins {
}

// Specifies the entry point of the application
mainClassName = 'seedu.address.MainApp'
mainClassName = 'seedu.task.MainApp'

allprojects {
apply plugin: 'idea'
Expand All @@ -39,7 +39,7 @@ allprojects {
jacksonVersion = '2.7.0'
jacksonDataTypeVersion = '2.7.4'
junitVersion = '4.12'
testFxVersion = '4.0.+'
testFxVersion = '4.0.5-alpha'
monocleVersion = '1.8.0_20'
checkstyleVersion = '7.1.2'

Expand Down
5 changes: 5 additions & 0 deletions collate
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
java -jar Collate-TUI.jar collate from src/main to collated/main include java, fxml, css

java -jar Collate-TUI.jar collate from src/test to collated/test include java

java -jar Collate-TUI.jar collate from unused to collated/unused include java, fxml, css
Loading