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

Collate the code #191

Open
wants to merge 615 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
615 commits
Select commit Hold shift + click to select a range
9b9f8e9
Merge pull request #91 from CS2103AUG2016-W15-C3/implement_save_location
turtle96 Oct 23, 2016
49fc1d3
update intro in userguide
turtle96 Oct 23, 2016
b3ea823
edit header
turtle96 Oct 23, 2016
53567dd
update intro in developer guide
turtle96 Oct 23, 2016
7247c67
update format and sentence structure for product survey
turtle96 Oct 23, 2016
a8aa21a
create CommandHistory as data structure to hold relevant details for …
turtle96 Oct 23, 2016
d043a77
edit undoCommand
turtle96 Oct 23, 2016
b75c2b5
Merge branch 'master' of https://github.com/CS2103AUG2016-W15-C3/main…
turtle96 Oct 23, 2016
6cee57e
comment out UndoCommand static updates in ModelManager
turtle96 Oct 23, 2016
21f2f53
update Parser to support Undo with index
turtle96 Oct 23, 2016
62c1a60
add setTask() to commandHistory
turtle96 Oct 23, 2016
c039afb
edit UndoCommand
turtle96 Oct 23, 2016
1d05d22
set AddCommand to set task of corresponding UndoCommand
turtle96 Oct 23, 2016
8cb6f62
set DeleteCommand to set task of corresponding CommandHistory
turtle96 Oct 23, 2016
b3e9164
add comment
turtle96 Oct 23, 2016
8fe09d7
convert BrowserPanel to DisplayPanel
turtle96 Oct 23, 2016
f27d3da
add event to notify when DisplayPanel on UI should be updated
turtle96 Oct 23, 2016
9489f41
add getter method to return list of history command text
turtle96 Oct 23, 2016
4ff75cb
delete corresponding command history added to list if AddCommand fails
turtle96 Oct 23, 2016
d11cd45
add ListUndoCommand which display list on DisplayPanel
turtle96 Oct 23, 2016
08b70da
parse support for ListUndoCommand
turtle96 Oct 23, 2016
e04988d
add logging and exceptions handling in UndoCommand
turtle96 Oct 23, 2016
4f1da40
add handleDisplayListChanged() to UIManager
turtle96 Oct 23, 2016
a3fb3ae
edit MainWindow to remove references to browser and web page loading
turtle96 Oct 23, 2016
ed07878
edit logging
turtle96 Oct 23, 2016
a07bd88
update comment
turtle96 Oct 23, 2016
e1f9962
edit splitpane to have 8:2 ratio
turtle96 Oct 23, 2016
f2330c2
set style to results-display
turtle96 Oct 23, 2016
311b9b0
add assert
turtle96 Oct 23, 2016
5bf2902
initialize commandHistory in LogicManagerTest so that test wont have …
turtle96 Oct 23, 2016
652e37d
edit to use getOffset()
turtle96 Oct 23, 2016
5a23e72
update command strings
turtle96 Oct 23, 2016
401d635
Format display according to taskType
marcusngwj Oct 24, 2016
91f125d
Remove comma that awkwardly separate tags
marcusngwj Oct 24, 2016
2a6c6c2
Fix inconsistent exception naming
marcusngwj Oct 24, 2016
315d29c
Add now as a valid time keyword
marcusngwj Oct 24, 2016
6a591f4
Add afternoon as a valid time
marcusngwj Oct 24, 2016
c2074eb
Remove redundant check
marcusngwj Oct 24, 2016
226af95
Change edit-description to edit-desc
Mamtha3005 Oct 24, 2016
53048f8
Add edit-name, an alt to edit-desc
Mamtha3005 Oct 24, 2016
86550a7
Change old and new task to original and updated task respectively
Mamtha3005 Oct 24, 2016
ec97808
Add JUnit for edit-desc
Mamtha3005 Oct 24, 2016
1760cd7
Add editStartDate and endDate
Mamtha3005 Oct 24, 2016
1d2011c
CHange new to updated
Mamtha3005 Oct 24, 2016
fa06fe9
Add default constructor for superclass Task
marcusngwj Oct 24, 2016
e910a89
Restructor EventTask constructor to do decision making
marcusngwj Oct 24, 2016
8131708
Add support for midnight
marcusngwj Oct 24, 2016
1331c73
Add method for getting next day
marcusngwj Oct 24, 2016
ae38ba8
Add test for midnight
marcusngwj Oct 24, 2016
5d1a8c9
Add test for date before today and test for task with same date but s…
marcusngwj Oct 24, 2016
cb48787
Add test for now, afternoon and midnight
marcusngwj Oct 24, 2016
fb45f56
Add getNextWeek method
marcusngwj Oct 24, 2016
3867ecf
Fix issue #103
marcusngwj Oct 24, 2016
60ba4d5
Add new JUnit tests
marcusngwj Oct 24, 2016
c441d0a
Merge pull request #104 from CS2103AUG2016-W15-C3/fix-issue-103
marcusngwj Oct 24, 2016
4e0cd44
delete CommandHistory if DeleteCommand invalid
turtle96 Oct 24, 2016
27c2327
mark code for collate
turtle96 Oct 24, 2016
c0eb6cb
delete unused package imports and update comment
turtle96 Oct 24, 2016
136d0d2
mark code for collate
turtle96 Oct 24, 2016
f93c8cf
refactoring
turtle96 Oct 24, 2016
de056a8
update display panel with new list of command history
turtle96 Oct 24, 2016
22a07d9
mark code for collate for saveStorageLocationCommand and related classes
turtle96 Oct 24, 2016
7de03bb
Fix issue#103
marcusngwj Oct 24, 2016
230b0a6
Merge pull request #105 from CS2103AUG2016-W15-C3/fix-issue-103-minor
marcusngwj Oct 24, 2016
5e9e0cb
mark code for collate
turtle96 Oct 24, 2016
d85d1f6
mark code
turtle96 Oct 24, 2016
d4210d9
mark code and update comment
turtle96 Oct 24, 2016
eeca088
mark code
turtle96 Oct 24, 2016
7c2afe3
update comment
turtle96 Oct 24, 2016
1859b73
add collate/ folder and main/, and test/
turtle96 Oct 24, 2016
76c4296
edit name error
turtle96 Oct 24, 2016
a025129
fix invalid deleteCommand saved to history bug
turtle96 Oct 24, 2016
57f8583
comments to divide code into sections
turtle96 Oct 24, 2016
276cf87
add support for redoing of undo
turtle96 Oct 24, 2016
d584ab2
add more text on welcome screen
turtle96 Oct 24, 2016
2b1ad79
edit ratio of split-pane
turtle96 Oct 24, 2016
47e4a16
add oldTask attribute and commenting sections
turtle96 Oct 24, 2016
9785876
add undo and redo edit command support
turtle96 Oct 24, 2016
c5ab3f9
set Parser to save CommandHistory for edit commands
turtle96 Oct 24, 2016
bc2604a
fix parsing bugs that save invalid commands to history
turtle96 Oct 24, 2016
7e28295
save to history
turtle96 Oct 24, 2016
2374eee
save to history
turtle96 Oct 24, 2016
62d551c
save to history
turtle96 Oct 24, 2016
a324ec9
save to history
turtle96 Oct 24, 2016
94eee47
split cases for undo and redo
turtle96 Oct 24, 2016
4bb3f91
save to history
turtle96 Oct 24, 2016
62bee78
case switch for edit
turtle96 Oct 24, 2016
d8366ab
add clear history
turtle96 Oct 24, 2016
97f03e0
add undo command test
turtle96 Oct 24, 2016
388e025
remove import
turtle96 Oct 24, 2016
01d5e68
update documentation
turtle96 Oct 24, 2016
2036a2e
update devguide
turtle96 Oct 24, 2016
a69854a
mark code and edit documentation
turtle96 Oct 24, 2016
949a081
mark test
turtle96 Oct 24, 2016
0319eb9
Add edit-endTime and edit-startTime JUNIT tests
Mamtha3005 Oct 24, 2016
e6bd7bf
change startDate to startTime
Mamtha3005 Oct 24, 2016
af09bb7
Add valid index for each edit
Mamtha3005 Oct 24, 2016
a71ee46
Merge pull request #102 from CS2103AUG2016-W15-C3/add-now_afternoon_m…
turtle96 Oct 24, 2016
75645fb
Merge pull request #94 from CS2103AUG2016-W15-C3/add-keyboard-shortcuts
turtle96 Oct 24, 2016
a86350b
code quality fixes
turtle96 Oct 24, 2016
56c02f0
add task details to commandText of command history of delete command
turtle96 Oct 24, 2016
9cfedf6
Unable to edit floating task
Mamtha3005 Oct 24, 2016
aff0e66
Add Junit test for edit-priority
Mamtha3005 Oct 24, 2016
95b71f6
Remove whiteSpace
Mamtha3005 Oct 24, 2016
cc5c710
Implement list-date command
Mamtha3005 Oct 24, 2016
158f3fa
Make sure only event tasks are displayed
Mamtha3005 Oct 24, 2016
03e2bb4
Add Codacy Badge
marcusngwj Oct 25, 2016
c811cc6
Add default priority default colours
marcusngwj Oct 25, 2016
a0459ea
Add background colour to differentiate priority
marcusngwj Oct 25, 2016
5b96a23
Mark collate
marcusngwj Oct 25, 2016
361cbb2
SLAP
marcusngwj Oct 25, 2016
0675271
Mark collate
marcusngwj Oct 25, 2016
13b4203
Modify test to show the different priority level colours
marcusngwj Oct 25, 2016
796b26b
Fix bug that allow user to add task before current time
marcusngwj Oct 25, 2016
68579a1
Modify test to suit changes
marcusngwj Oct 25, 2016
2cb2b0f
Merge pull request #113 from CS2103AUG2016-W15-C3/add-codacy
turtle96 Oct 25, 2016
21420ac
Merge pull request #97 from CS2103AUG2016-W15-C3/implement_Undo
turtle96 Oct 25, 2016
b4217f2
Merge pull request #100 from CS2103AUG2016-W15-C3/fix-bug-in-displayi…
turtle96 Oct 25, 2016
1892c0c
Change return type of getTimeNow()
marcusngwj Oct 25, 2016
202e2ca
Merge branch 'master' of https://github.com/CS2103AUG2016-W15-C3/main…
turtle96 Oct 25, 2016
6aab9d7
fix test bug
turtle96 Oct 25, 2016
eb4f470
Implemet List-Priority command
Mamtha3005 Oct 25, 2016
d0ba474
Merge pull request #111 from CS2103AUG2016-W15-C3/enhance-edit-command
turtle96 Oct 25, 2016
677a5fe
Return TaskDate instead of String
marcusngwj Oct 25, 2016
aba0c35
add CalendarView class
turtle96 Oct 25, 2016
b90fa0c
add jfxtras to gradle build
turtle96 Oct 25, 2016
aae45c2
edit DisplayPanel
turtle96 Oct 25, 2016
68e3679
add clear command history before each test
turtle96 Oct 25, 2016
4813089
rename browserPlaceHolder to displayPanelPlaceholder
turtle96 Oct 25, 2016
f16c93f
edit calendar view class
turtle96 Oct 25, 2016
401cc08
loadCalendar()
turtle96 Oct 25, 2016
2c614bd
Redo Done command in new master
ZuoZhuolin Oct 25, 2016
31e8f49
Merge pull request #119 from CS2103AUG2016-W15-C3/fix_undoTests_bug
turtle96 Oct 25, 2016
7ea053d
fix display bug
ZuoZhuolin Oct 25, 2016
88cb82c
Add Junit test for list-date
Mamtha3005 Oct 25, 2016
e99539a
create ViewCalendarCommand
turtle96 Oct 25, 2016
e1182a1
change CalendarView class structure (not supposed to extend UIPart)
turtle96 Oct 25, 2016
c419f39
remove handleTaskPanelSelectionChanged since no longer using web browser
turtle96 Oct 25, 2016
89b4576
refactor DisplayListChangedEvent to be under events.ui package
turtle96 Oct 25, 2016
f46b9ce
Solve merge conflict
Mamtha3005 Oct 25, 2016
9f5d42a
add new event to alert show calendar
turtle96 Oct 25, 2016
28b5c6f
add method to handle DisplayCalendarViewEvent
turtle96 Oct 25, 2016
44819b7
update the done command
ZuoZhuolin Oct 25, 2016
3ccb3be
Merge pull request #122 from CS2103AUG2016-W15-C3/change-return-type-…
marcusngwj Oct 25, 2016
ae3a37f
solve bug in start time
marcusngwj Oct 25, 2016
079cac9
change start time
marcusngwj Oct 25, 2016
e4a81ad
Add Junit tests for list
Mamtha3005 Oct 25, 2016
1eb97b1
Merge branch 'master' into Add-list-priority
Mamtha3005 Oct 25, 2016
65f1ee5
Resolve merge conflict
marcusngwj Oct 25, 2016
5b80809
edit assert task
ZuoZhuolin Oct 25, 2016
2c745bf
Merge branch 'master' into fix-bug-that-accept-time-before-current-ti…
marcusngwj Oct 25, 2016
9590654
add execute() for view calendar
turtle96 Oct 25, 2016
57eeed9
edit loading logic
turtle96 Oct 25, 2016
8b9c300
add parser support for calendar view
turtle96 Oct 25, 2016
e846fcf
edit DisplayPanel and refactor
turtle96 Oct 25, 2016
edb5d0d
Merge branch 'master' of https://github.com/CS2103AUG2016-W15-C3/main…
turtle96 Oct 25, 2016
26b63c1
add short form command "cal"
turtle96 Oct 25, 2016
e845d28
add parsing for short form
turtle96 Oct 25, 2016
f1fb9ae
rearrange code order
turtle96 Oct 25, 2016
5d7a18d
remove import
turtle96 Oct 25, 2016
bc9cec6
update docs
turtle96 Oct 25, 2016
5c2d5ee
improve readability
turtle96 Oct 25, 2016
6edd1ca
mark code
turtle96 Oct 25, 2016
98d46c4
mark code
turtle96 Oct 25, 2016
e39c88f
add test for calendar view
turtle96 Oct 25, 2016
27f6381
mark test code
turtle96 Oct 25, 2016
10a48da
edit grammar
turtle96 Oct 25, 2016
a6ff92b
Merge pull request #95 from CS2103AUG2016-W15-C3/update_UserGuide
turtle96 Oct 25, 2016
4ad5fd8
remove linebreak
turtle96 Oct 25, 2016
6b4c0fc
update UI screenshot
turtle96 Oct 25, 2016
11d3312
change test error
ZuoZhuolin Oct 25, 2016
0cb6e30
remove assert
turtle96 Oct 25, 2016
2e6d8df
fix test error!
ZuoZhuolin Oct 25, 2016
58de91a
change not completed to incomplete
ZuoZhuolin Oct 25, 2016
6cfb88c
delete redundant code and add isTaskPresent()
turtle96 Oct 25, 2016
b6c668c
add isTaskPresent()
turtle96 Oct 25, 2016
0733c4f
add isTaskPresent to TaskManager
turtle96 Oct 25, 2016
842db2c
update commandhistory list before display
turtle96 Oct 25, 2016
ff88dc6
set model for instance
turtle96 Oct 25, 2016
e714838
refactor
turtle96 Oct 25, 2016
573665f
add updates for undo-edit commands
turtle96 Oct 25, 2016
0098e22
Merge pull request #96 from CS2103AUG2016-W15-C3/update_DeveloperGuide
turtle96 Oct 25, 2016
cd16df1
Merge pull request #127 from CS2103AUG2016-W15-C3/update_ReadMe
turtle96 Oct 25, 2016
153ded5
update screenshot
turtle96 Oct 25, 2016
51a1cbe
Merge pull request #129 from CS2103AUG2016-W15-C3/update_ReadMe
turtle96 Oct 25, 2016
17e4e6b
Revert "update screenshot"
turtle96 Oct 25, 2016
e4e32a4
fix url
turtle96 Oct 25, 2016
450e420
Merge pull request #130 from CS2103AUG2016-W15-C3/update_ReadMe
turtle96 Oct 25, 2016
498f522
mark code
turtle96 Oct 25, 2016
b392bba
Merge pull request #132 from CS2103AUG2016-W15-C3/mark_collate_code
turtle96 Oct 25, 2016
8468d44
Merge branch 'master' into implement-done-command-done
ZuoZhuolin Oct 25, 2016
58fb6ce
Add DoneCommandTest
ZuoZhuolin Oct 25, 2016
bca1b99
refactor to taskStatus.
ZuoZhuolin Oct 25, 2016
fe786ad
refactor incomplete to "TaskStatus.INCOMPLETE"
ZuoZhuolin Oct 25, 2016
468b76d
fix code quality
ZuoZhuolin Oct 25, 2016
d566688
Remove whitespace and add magic string
Mamtha3005 Oct 26, 2016
339ec25
Change the Ui resilt messages
Mamtha3005 Oct 26, 2016
3740b30
CHange results for both edit and list-priority commands
Mamtha3005 Oct 26, 2016
6350721
Change and handle error
Mamtha3005 Oct 26, 2016
d08379e
Add magic string
Mamtha3005 Oct 26, 2016
2e47684
Add Jaz commands and remove explanations
Mamtha3005 Oct 26, 2016
f987044
update done command UG
ZuoZhuolin Oct 26, 2016
4b76978
Edit edit and list command
Mamtha3005 Oct 26, 2016
4627d97
update test case
ZuoZhuolin Oct 26, 2016
17fa8b7
Remove 1 delete picture
Mamtha3005 Oct 26, 2016
eb781fb
Change pictures to taskell
Mamtha3005 Oct 26, 2016
0c51eb0
Merge pull request #135 from CS2103AUG2016-W15-C3/EditUG
Mamtha3005 Oct 26, 2016
f24d89e
Add magic string
Mamtha3005 Oct 26, 2016
55b3480
Merge pull request #128 from CS2103AUG2016-W15-C3/implement_Undo
Mamtha3005 Oct 26, 2016
4640e26
Add whitespaces
Mamtha3005 Oct 26, 2016
3dd843d
Merge branch 'implement-done-command-done' of https://github.com/CS21…
Mamtha3005 Oct 26, 2016
a510ae8
Merge branch 'master' into implement-done-command-d
Mamtha3005 Oct 26, 2016
309ffab
Merge branch 'master' of https://github.com/CS2103AUG2016-W15-C3/main…
Mamtha3005 Oct 26, 2016
71aaeb8
update developer guide
marcusngwj Oct 26, 2016
5ef705d
update dg
marcusngwj Oct 26, 2016
575e932
Merge pull request #124 from CS2103AUG2016-W15-C3/implement-done-comm…
Mamtha3005 Oct 26, 2016
9d3e940
Merge pull request #136 from CS2103AUG2016-W15-C3/update-DG
Mamtha3005 Oct 26, 2016
231029c
Merge branch 'master' into Add-list-date
Mamtha3005 Oct 26, 2016
2cde2ea
fix merge conflict
ZuoZhuolin Oct 26, 2016
226a1ca
add singleton method
turtle96 Oct 26, 2016
fbbe981
trigger update list whenever task is deleted
turtle96 Oct 26, 2016
bd424a3
Merge branch 'master' of https://github.com/CS2103AUG2016-W15-C3/main…
ZuoZhuolin Oct 26, 2016
5351b96
Merge branch 'implement_calendar_view' of https://github.com/CS2103AU…
turtle96 Oct 26, 2016
c04737d
add return statement to handle null model
turtle96 Oct 26, 2016
bcc454d
Merge pull request #115 from CS2103AUG2016-W15-C3/priority-colour
ZuoZhuolin Oct 26, 2016
6530345
Merge branch 'master' of https://github.com/CS2103AUG2016-W15-C3/main…
marcusngwj Oct 26, 2016
3aeedce
Merge branch 'master' of https://github.com/CS2103AUG2016-W15-C3/main…
Mamtha3005 Oct 26, 2016
2752874
Merge branch 'master' of https://github.com/CS2103AUG2016-W15-C3/main…
marcusngwj Oct 26, 2016
b58b322
Merge pull request #138 from CS2103AUG2016-W15-C3/Resolve-merge-list-…
marcusngwj Oct 26, 2016
b9122e2
Merge branch 'master' of https://github.com/CS2103AUG2016-W15-C3/main…
marcusngwj Oct 26, 2016
468338b
Merge pull request #117 from CS2103AUG2016-W15-C3/fix-bug-that-accept…
marcusngwj Oct 26, 2016
ac65801
update aboutUs
ZuoZhuolin Oct 26, 2016
367f25f
upload teammate photo
ZuoZhuolin Oct 26, 2016
8f35c1f
File name refactor
ZuoZhuolin Oct 26, 2016
43bdeaf
Merge pull request #139 from CS2103AUG2016-W15-C3/update-AboutUs
marcusngwj Oct 26, 2016
56dabca
remove synchronized for deleteTask() so undo list can be updated in time
turtle96 Oct 26, 2016
b5f4b2d
Merge branch 'master' into Add-list-date
Mamtha3005 Oct 26, 2016
bc25054
Merge pull request #121 from CS2103AUG2016-W15-C3/Add-list-date
Mamtha3005 Oct 26, 2016
dc70e5f
Merge pull request #137 from CS2103AUG2016-W15-C3/implement_Undo
Mamtha3005 Oct 26, 2016
19f6992
Update readme.md
marcusngwj Oct 26, 2016
828c594
Merge pull request #126 from CS2103AUG2016-W15-C3/implement_calendar_…
Mamtha3005 Oct 26, 2016
a9afb8f
Merge pull request #140 from CS2103AUG2016-W15-C3/fix-missing-diagrams
marcusngwj Oct 26, 2016
f47b877
no message
marcusngwj Oct 26, 2016
d89d6ab
Merge pull request #141 from CS2103AUG2016-W15-C3/mark_collate_add
marcusngwj Oct 26, 2016
cccda4a
collect the code
ZuoZhuolin Oct 26, 2016
cddd9c1
Coolate UG
Mamtha3005 Oct 26, 2016
0046745
Merge branch 'master' of https://github.com/CS2103AUG2016-W15-C3/main…
ZuoZhuolin Oct 26, 2016
db2e2b1
Merge branch 'master' of https://github.com/CS2103AUG2016-W15-C3/main…
Mamtha3005 Oct 26, 2016
e574cd7
Merge pull request #142 from CS2103AUG2016-W15-C3/collate_UG
Mamtha3005 Oct 26, 2016
c1c742c
Merge branch 'master' of https://github.com/CS2103AUG2016-W15-C3/main…
ZuoZhuolin Oct 26, 2016
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
6 changes: 5 additions & 1 deletion .classpath
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,11 @@
<attribute name="FROM_GRADLE_MODEL" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
<accessrules>
<accessrule kind="accessible" pattern="javafx/**"/>
</accessrules>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/>
<classpathentry kind="output" path="bin"/>
</classpath>
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,4 @@ preferences.json
classes/
/data/
/bin/
src/test/data/SaveLocationCommandTest/newStorageLocation/taskmanager.xml
4 changes: 2 additions & 2 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>Taskell</name>
<comment>Project Taskell created by Team Autumn.</comment>
<projects>
</projects>
<buildSpec>
Expand Down
3 changes: 1 addition & 2 deletions .settings/org.eclipse.buildship.core.prefs
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
build.commands=org.eclipse.jdt.core.javabuilder
connection.arguments=
connection.gradle.distribution=GRADLE_DISTRIBUTION(WRAPPER)
connection.gradle.user.home=null
connection.java.home=null
connection.java.home=C\:\\Program Files\\Java\\jdk1.8.0_101
connection.jvm.arguments=
connection.project.dir=
derived.resources=.gradle,build
Expand Down
24 changes: 11 additions & 13 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,20 +1,17 @@
[![Build Status](https://travis-ci.org/se-edu/addressbook-level4.svg?branch=master)](https://travis-ci.org/se-edu/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)
[![Build Status](https://travis-ci.org/CS2103AUG2016-W15-C3/main.svg?branch=master)](https://travis-ci.org/CS2103AUG2016-W15-C3/main)
[![Coverage Status](https://coveralls.io/repos/github/CS2103AUG2016-W15-C3/main/badge.svg?branch=master)](https://coveralls.io/github/CS2103AUG2016-W15-C3/main?branch=master)
[![Codacy Badge](https://api.codacy.com/project/badge/Grade/c82c9523e1474a039d2e30e6d34a2da0)](https://www.codacy.com/app/marcusngwj/main?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=CS2103AUG2016-W15-C3/main&amp;utm_campaign=Badge_Grade)

# Address Book (Level 4)
# Taskell

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

* This is a desktop Address Book application. It has a GUI but most of the user interactions happen using
* This is a desktop task manager 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
* It is a Java application built by 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.


#### Site Map
Expand All @@ -25,10 +22,11 @@
* [Contact Us](docs/ContactUs.md)


#### Acknowledgements
#### Acknowledgement

* Some parts of this sample application were inspired by the excellent
* Some parts of this application were inspired by the excellent
[Java FX tutorial](http://code.makery.ch/library/javafx-8-tutorial/) by *Marco Jakob*.
* Some parts of this application were adapted from [Address Book 4](https://github.com/nus-cs2103-AY1617S1/addressbook-level4) by *Damith C. Rajapakse* and his team


#### Licence : [MIT](LICENSE)
#### License : [MIT](LICENSE)
17 changes: 9 additions & 8 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ allprojects {
compile "com.fasterxml.jackson.core:jackson-databind:$jacksonVersion"
compile "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jacksonDataTypeVersion"
compile "com.google.guava:guava:$guavaVersion"
compile "org.jfxtras:jfxtras-agenda:8.0-r1"

testCompile "junit:junit:$junitVersion"
testCompile "org.testfx:testfx-core:$testFxVersion"
Expand All @@ -74,10 +75,10 @@ allprojects {
}

shadowJar {
archiveName = "addressbook.jar"
archiveName = "Taskell.jar"

manifest {
attributes "Main-Class": "seedu.address.MainApp"
attributes "Main-Class": "seedu.taskell.MainApp"
}

destinationDir = file("${buildDir}/jar/")
Expand Down Expand Up @@ -113,8 +114,8 @@ tasks.coveralls {
onlyIf { System.env.'CI' }
}

class AddressBookTest extends Test {
public AddressBookTest() {
class TaskManagerTest extends Test {
public TaskManagerTest() {
forkEvery = 1
systemProperty 'testfx.setup.timeout', '60000'
}
Expand All @@ -128,7 +129,7 @@ class AddressBookTest extends Test {
}
}

task guiTests(type: AddressBookTest) {
task guiTests(type: TaskManagerTest) {
include 'guitests/**'

jacoco {
Expand All @@ -137,16 +138,16 @@ task guiTests(type: AddressBookTest) {
}


task nonGuiTests(type: AddressBookTest) {
include 'seedu/address/**'
task nonGuiTests(type: TaskManagerTest) {
include 'seedu/taskell/**'

jacoco {
destinationFile = new File("${buildDir}/jacoco/test.exec")
}
}

// Test mode depends on whether headless task has been run
task allTests(type: AddressBookTest) {
task allTests(type: TaskManagerTest) {
jacoco {
destinationFile = new File("${buildDir}/jacoco/test.exec")
}
Expand Down
Loading