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

[T7][W15-B4] #49

Open
wants to merge 600 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
600 commits
Select commit Hold shift + click to select a range
b757d76
Rename isValidName to isValidTitle
howsiwei Mar 24, 2017
6a3f4af
Rename Name to Title
howsiwei Mar 24, 2017
bbe93b8
Rename "[in]valid name" to "[in]valid title"
howsiwei Mar 24, 2017
7df705e
Rename name to title in UserGuide.md
howsiwei Mar 24, 2017
d049d7a
Rename name to title except in UI
howsiwei Mar 24, 2017
4156684
Rename nameKeyWords to titleKeyWords
howsiwei Mar 24, 2017
45a7cb7
Rename "long names" to "long title"
howsiwei Mar 24, 2017
9f4377b
Rename filedName to fieldName
howsiwei Mar 24, 2017
3e2a126
Rename TASKNAME to TASKTITLE in UserGuide.md
howsiwei Mar 24, 2017
a4ce3ea
Rename names that contains NAME
howsiwei Mar 24, 2017
02c305d
Rename Phone to DateTime
howsiwei Mar 24, 2017
3b0b61b
Rename phone to endDateTime except in UI
howsiwei Mar 24, 2017
d21f98d
Rename Email to DateTime
howsiwei Mar 24, 2017
f8c2999
Rename email to startDateTime except in UI
howsiwei Mar 24, 2017
9d8e31a
Simply the way to sort tasks by category.
VeryLazyBoy Mar 24, 2017
95b09b7
Remove unnecessary method updateInnerParts
VeryLazyBoy Mar 24, 2017
000ed28
Change method signatures of update done and undone command in Model
VeryLazyBoy Mar 24, 2017
3b9dc50
Use index in update done and undone command in Logic
VeryLazyBoy Mar 24, 2017
73c7e4e
Remove trailing spaces
VeryLazyBoy Mar 24, 2017
e4a5008
Merge pull request #93 from CS2103JAN2017-W15-B4/simply-index-impleme…
VeryLazyBoy Mar 24, 2017
6ca9773
Rename task manager to geekeep in comment lines
VeryLazyBoy Mar 24, 2017
6762ac1
Rename task manager geekeep in config files
VeryLazyBoy Mar 24, 2017
4667005
Rename taskmanager geekeep
VeryLazyBoy Mar 25, 2017
d28e650
Rename components of taskmanager
VeryLazyBoy Mar 25, 2017
969fb7f
Merge branch 'staging' into refactor
VeryLazyBoy Mar 25, 2017
37fd01f
Correct diagrams
VeryLazyBoy Mar 25, 2017
08f0d72
Pass codacy
VeryLazyBoy Mar 25, 2017
2e9aa95
Pass codacy
VeryLazyBoy Mar 25, 2017
8c66b7c
Pass codacy
VeryLazyBoy Mar 25, 2017
36c5f01
Merge pull request #94 from CS2103JAN2017-W15-B4/refactor
VeryLazyBoy Mar 25, 2017
3404277
Rename: edit => update
VeryLazyBoy Mar 26, 2017
f1ffc56
Modify the sample data to match GeeKeep
VeryLazyBoy Mar 26, 2017
8af7166
Pass codacy
VeryLazyBoy Mar 26, 2017
caa112f
Merge pull request #95 from CS2103JAN2017-W15-B4/refactor
VeryLazyBoy Mar 26, 2017
c57c8eb
Update UI with staging branch
VeryLazyBoy Mar 26, 2017
404a55e
TaskCard: always show id
VeryLazyBoy Mar 26, 2017
fa87e2b
Makes tab switching visible
VeryLazyBoy Mar 26, 2017
9c1996a
Update README.md
VeryLazyBoy Mar 26, 2017
b3508b7
Pass checkStyle
VeryLazyBoy Mar 26, 2017
911b94e
Remove trailing spaces
VeryLazyBoy Mar 26, 2017
ea32142
Add guitests.UndoCommandTest
howsiwei Mar 22, 2017
11f6531
Add guitests.RedoCommandTest
howsiwei Mar 27, 2017
437687e
Compare isDone in ReadOnlyTask.isSameStateAs
howsiwei Mar 27, 2017
015f529
Add method setDone in Task
howsiwei Mar 27, 2017
88264c8
Use setDone in markDone and markUndone
howsiwei Mar 27, 2017
48cf1bb
Add setDone in resetData
howsiwei Mar 27, 2017
c197a57
Add source.isDone() in Task(ReadOnlyTask source)
howsiwei Mar 27, 2017
d83c8f3
Add methods for comparing priority and datetime
yirui94 Mar 27, 2017
e47b33e
Sort internalList by type priority and datetime
yirui94 Mar 27, 2017
36f04a3
SampleDataTest : Sort expected tasks by type priority and date
yirui94 Mar 27, 2017
54494d5
Change regex to make hour optional
yirui94 Mar 27, 2017
a44df8e
Add default time if time is missing
yirui94 Mar 27, 2017
a6ac9e7
Make Task constructor to require isDone explicitly
howsiwei Mar 27, 2017
26edf78
Update default time and message
yirui94 Mar 27, 2017
6a85f84
update use cases in devguide
ZhangHanming Mar 27, 2017
e7d075b
Implement sorting floating tasks in lexicographic order
yirui94 Mar 27, 2017
2fd89ad
Merge pull request #98 from CS2103JAN2017-W15-B4/undo
yirui94 Mar 28, 2017
d665b60
Merge pull request #99 from CS2103JAN2017-W15-B4/done
yirui94 Mar 28, 2017
4c219b1
Merge pull request #100 from CS2103JAN2017-W15-B4/sort-tasks
yirui94 Mar 28, 2017
7a58e7b
Merge pull request #101 from CS2103JAN2017-W15-B4/optional-hour
yirui94 Mar 28, 2017
e04cb53
Add test cases for the new DateTime format
yirui94 Mar 28, 2017
96d817e
Fix checkstyle
yirui94 Mar 28, 2017
3fc16df
Remove unused invalidDateTimeException.java
yirui94 Mar 28, 2017
c033478
Add LogicManager testcases for done and undone
yirui94 Mar 28, 2017
1ae5b7f
Combine Start and End DateTime test to DateTime test
yirui94 Mar 28, 2017
999aa50
Add LogicManager testcases for listdone and listundone
yirui94 Mar 28, 2017
052d3da
Add failure testcase for undo and redo
yirui94 Mar 28, 2017
133aec9
Add success testcase for Undo and Redo
yirui94 Mar 28, 2017
794f52d
finish use cases
ZhangHanming Mar 28, 2017
2c53703
Merge branch 'staging' of github.com:CS2103JAN2017-W15-B4/main into s…
ZhangHanming Mar 28, 2017
2c4f1ad
Use checkboxes for taskcard
yirui94 Mar 28, 2017
6780a53
Change implementation of checkbox
yirui94 Mar 28, 2017
930cacd
Fix task panels margin
yirui94 Mar 28, 2017
ff5f448
Merge pull request #103 from CS2103JAN2017-W15-B4/datetime-test-cases
VeryLazyBoy Mar 28, 2017
eddda0e
Merge pull request #104 from CS2103JAN2017-W15-B4/list-done-undone-te…
VeryLazyBoy Mar 28, 2017
054b733
Merge pull request #105 from CS2103JAN2017-W15-B4/pretty-ui
VeryLazyBoy Mar 28, 2017
1b2319b
Fix delete task and update task to sort tasks properly
yirui94 Mar 28, 2017
3ae260b
Apply collating
VeryLazyBoy Mar 28, 2017
89ee98e
Collate applied
VeryLazyBoy Mar 28, 2017
563aeea
Update AboutUs.md
ZhangHanming Mar 28, 2017
0ef3f31
Update AboutUs.md
ZhangHanming Mar 28, 2017
10d2066
Update AboutUs.md
ZhangHanming Mar 28, 2017
3f72532
Merge pull request #106 from CS2103JAN2017-W15-B4/fix-task-sort-bug
yirui94 Mar 28, 2017
73209df
Merge pull request #107 from CS2103JAN2017-W15-B4/staging
yirui94 Mar 28, 2017
64685b8
Correct collating
VeryLazyBoy Mar 28, 2017
7c873dc
Correct collating
VeryLazyBoy Mar 28, 2017
579f6f7
Correct collating
VeryLazyBoy Mar 28, 2017
aabc96b
Fix alignment of taskcard details
yirui94 Mar 28, 2017
065bcbf
Update taskcard displayed details
yirui94 Mar 28, 2017
3ee1251
Move class Config from commons.core to model
howsiwei Mar 28, 2017
7e6d008
Add Storage.ConfigStorage
howsiwei Mar 28, 2017
b3b425a
Remove throws IOException for readConfig
howsiwei Mar 28, 2017
f377594
Remove throws IOException for readUserPrefs
howsiwei Mar 28, 2017
e615508
Replace ConfigUtil with ConfigStorage in MainApp
howsiwei Mar 28, 2017
0bdac0f
Add Config as a field of Model
howsiwei Mar 28, 2017
6081d91
Add getConfig in Model
howsiwei Mar 28, 2017
23689c0
Fix mark done and undone not updating properly
yirui94 Mar 29, 2017
6dc2123
Update listdone and listundone testcases
yirui94 Mar 29, 2017
93461cd
Merge pull request #108 from CS2103JAN2017-W15-B4/pretty-task-card-2
yirui94 Mar 29, 2017
2be1b27
Add method setGeeKeepFilePath
howsiwei Mar 29, 2017
7d30753
Add GeekeepFilePathChangedEvent
howsiwei Mar 29, 2017
26d13e7
Add handleGeekeepFilePathChangedEvent in Storage
howsiwei Mar 29, 2017
7815788
Add inidicateGeekeepFilePathChanged in ModelManager
howsiwei Mar 29, 2017
ac14965
Add setGeekeepFilePath in Model
howsiwei Mar 29, 2017
618e1e3
Change GeekeepFilePathChangeEvent to use config
howsiwei Mar 29, 2017
4f42f2a
Change GeekeepFilePathChangedEvent.toString
howsiwei Mar 29, 2017
3fdac37
Save config to file when handleGeekeepFilePathChangedEvent
howsiwei Mar 29, 2017
56500a8
Add SetStorageCommand
howsiwei Mar 29, 2017
ccd224c
Update UI when GeeKeep file path changes
howsiwei Mar 29, 2017
5698c1f
Correct typo in UI tab
VeryLazyBoy Mar 29, 2017
59f75c7
Sort tags by name
VeryLazyBoy Mar 29, 2017
916dfc8
Rename SetStorage to store
howsiwei Mar 31, 2017
6963eab
Use Files.move when GeeKeep file path changes
howsiwei Mar 31, 2017
ca68faf
refactor Location.java to Description.java
ZhangHanming Mar 31, 2017
9797367
refactor token format l/ to d/
ZhangHanming Mar 31, 2017
5364c8d
refactor all variable names
ZhangHanming Mar 31, 2017
681085e
make checkstyle happy
ZhangHanming Mar 31, 2017
cca6d89
update doc
ZhangHanming Mar 31, 2017
a8a1a83
make checkstyle happy
ZhangHanming Mar 31, 2017
3539441
Merge pull request #113 from CS2103JAN2017-W15-B4/refactor-location
ZhangHanming Mar 31, 2017
3f2c1b8
recollate
ZhangHanming Mar 31, 2017
7818037
merge
ZhangHanming Mar 31, 2017
08d7c12
redo collation
ZhangHanming Mar 31, 2017
860c3fe
Add method addHistory in Model
howsiwei Apr 1, 2017
3b0833d
Rename syncWithStacks to updateGeekeepHistory
howsiwei Apr 1, 2017
e1dbb2e
Change pastGeeKeeps to type Stack<ReadOnlyGeeKeep>
howsiwei Apr 1, 2017
ed3fedd
Change model to update Geekeep history only when command succeeds
howsiwei Apr 1, 2017
32468c5
Add undoableCommandHistory
howsiwei Apr 2, 2017
f3ac593
Rename addHistory to updateCommandHistory in Model
howsiwei Apr 2, 2017
1c98268
Add updateUndoableCommandHistory in Model
howsiwei Apr 2, 2017
e3e35f7
Add updateCommandHistory and setCommandText in Command
howsiwei Apr 2, 2017
5900dba
Update LogicManager to call command.updateCommandHistory
howsiwei Apr 2, 2017
f7cbc58
Add class UndoableComamnd
howsiwei Apr 2, 2017
256cc37
Make some classes become subclasses of UndoableCommand
howsiwei Apr 2, 2017
0c1f887
Update Model.undo to return command that was undone
howsiwei Apr 2, 2017
ce17e69
Edit updateUndoableCommandHistory
howsiwei Apr 2, 2017
4702eab
Show command undid
howsiwei Apr 2, 2017
dfb7fc9
Update Model.redo to return command redid
howsiwei Apr 2, 2017
17e3c1c
Show command redid
howsiwei Apr 2, 2017
4fd91c2
Edit LogicManagerTest.execute_undo_redo_Success
howsiwei Apr 2, 2017
f828970
Add method Model.getCommandHistory
howsiwei Apr 2, 2017
0362db6
Add method Logic.getCommandHistory
howsiwei Apr 2, 2017
fe7c47d
Add method CommandBox.addHistoryEventHandler
howsiwei Apr 2, 2017
82d7961
Rename addCommandHistory to appendCommandHistory
howsiwei Apr 2, 2017
43edbee
Merge pull request #118 from CS2103JAN2017-W15-B4/history
yirui94 Apr 3, 2017
6d1f3d5
Merge pull request #119 from CS2103JAN2017-W15-B4/specify-storage-loc…
yirui94 Apr 3, 2017
98489b7
Merge branch 'staging' into pretty-task-card-2
yirui94 Apr 3, 2017
cfdbb66
Fix merge conflicts
yirui94 Apr 3, 2017
d6a28c5
Change location to description
yirui94 Apr 3, 2017
5e351c7
Fix getDisplayedLocation
yirui94 Apr 3, 2017
bbdc270
Merge pull request #120 from CS2103JAN2017-W15-B4/pretty-task-card-2
yirui94 Apr 3, 2017
448c4f1
Adds more functionalities in ReadOnlyTask
VeryLazyBoy Apr 5, 2017
e05e5f1
Modify find parser to support powerful find
VeryLazyBoy Apr 5, 2017
a7cfb27
Modify find command to support powerful find
VeryLazyBoy Apr 5, 2017
0321660
Add more qualifier classes in model to support powerful find
VeryLazyBoy Apr 5, 2017
97a9713
Update find tests
VeryLazyBoy Apr 5, 2017
c034c1e
Annotation for collate
VeryLazyBoy Apr 5, 2017
a1623f3
Apply tutor's words
VeryLazyBoy Apr 5, 2017
fe4ac4a
Update collate
VeryLazyBoy Apr 5, 2017
8141800
List doestn't allow arguments
VeryLazyBoy Apr 5, 2017
e04a932
Listdone doesn't allow arguments
VeryLazyBoy Apr 5, 2017
7ae3bb1
Listundone doesn't allow arguments
VeryLazyBoy Apr 5, 2017
7e83053
Update parser to check arguments of list, listdone and listundone
VeryLazyBoy Apr 5, 2017
0ed5f04
Update tests for list, listdone and listundone
VeryLazyBoy Apr 5, 2017
3c7f0be
Merge pull request #121 from CS2103JAN2017-W15-B4/find-command
yirui94 Apr 5, 2017
895e984
Merge pull request #123 from CS2103JAN2017-W15-B4/staging
yirui94 Apr 5, 2017
a683eca
Fix documentation and update UI screnshots
yirui94 Apr 5, 2017
1c46562
fix indentation
ZhangHanming Apr 8, 2017
b08f449
refactor parameter names
ZhangHanming Apr 8, 2017
adec163
change code style
ZhangHanming Apr 8, 2017
a9c71f4
remove trailing spaces
ZhangHanming Apr 8, 2017
27210f9
remove trailing spaces
ZhangHanming Apr 8, 2017
1659e5b
Update the UI to set the upcoming as default
VeryLazyBoy Apr 9, 2017
2d97590
Fix checkstyle issues
VeryLazyBoy Apr 9, 2017
5bc8980
Update userGuide to include find and store
yirui94 Apr 9, 2017
5b1eac1
Fix the wording for the find command
yirui94 Apr 9, 2017
b9d323b
Delete repeated collated code
VeryLazyBoy Apr 9, 2017
b17a341
Update CommandBox's alert behavior
VeryLazyBoy Apr 9, 2017
ed98b15
Update parameter names in TaskCatefory enum class
VeryLazyBoy Apr 9, 2017
e1e9ceb
Update keyword message in FindCommand
yirui94 Apr 9, 2017
c61d871
Update logicManagerTest
yirui94 Apr 9, 2017
0bbf4bc
Change code style and add comments
yirui94 Apr 9, 2017
91b8f60
Correct implementation in update command
VeryLazyBoy Apr 9, 2017
4b98083
Add autoscroll during addCommand or updateCommand
yirui94 Apr 9, 2017
573b4be
Remove trailing spaces
yirui94 Apr 9, 2017
df4f698
Add SampleData
yirui94 Apr 9, 2017
2693ef2
Removed unused use cases
yirui94 Apr 9, 2017
2067c39
Merge pull request #128 from CS2103JAN2017-W15-B4/improve-wording
yirui94 Apr 9, 2017
1eda625
Merge pull request #129 from CS2103JAN2017-W15-B4/a0139438w-collation…
yirui94 Apr 9, 2017
b2f4486
Improve result text
yirui94 Apr 9, 2017
cb9cb50
Update command keeps the original view
VeryLazyBoy Apr 9, 2017
f23bf04
Merge pull request #130 from CS2103JAN2017-W15-B4/auto-scroll
yirui94 Apr 9, 2017
ca2c3b2
Merge pull request #131 from CS2103JAN2017-W15-B4/improve-result-text
VeryLazyBoy Apr 9, 2017
a91adeb
Merge branch 'staging' into UI
VeryLazyBoy Apr 9, 2017
3201141
Merge pull request #132 from CS2103JAN2017-W15-B4/staging
yirui94 Apr 9, 2017
6020ab8
Final collate
yirui94 Apr 9, 2017
3a1686b
Fix UI explanation diagram
yirui94 Apr 9, 2017
db82513
Update UiBreakdownDiagram
yirui94 Apr 9, 2017
1ddbd79
Merge pull request #126 from CS2103JAN2017-W15-B4/UI
VeryLazyBoy Apr 9, 2017
a6f08d3
Beautify display message
VeryLazyBoy Apr 9, 2017
a0c9c44
update model diagram
ZhangHanming Apr 9, 2017
ce511e8
update model diagram
ZhangHanming Apr 9, 2017
2b58abd
Update currentListView in TaskListPanel
VeryLazyBoy Apr 9, 2017
6005230
Add TestScript
yirui94 Apr 9, 2017
cdfe3c7
Update TestScipt
yirui94 Apr 9, 2017
aa878c3
Update to reflect own responsibilities
yirui94 Apr 9, 2017
2f2e84e
Merge branch 'master' of https://github.com/CS2103JAN2017-W15-B4/main
yirui94 Apr 9, 2017
c05f617
Revert the default view to all
VeryLazyBoy Apr 9, 2017
086b2dd
Fix the bug of help window
VeryLazyBoy Apr 9, 2017
c87d764
Remove browser panel
VeryLazyBoy Apr 10, 2017
6ce49e0
Fix whitespace issues
howsiwei Apr 10, 2017
d98f3e6
Apply SRP
VeryLazyBoy Apr 10, 2017
421323a
Remove dependency on TaskListPanel in MainWindow
VeryLazyBoy Apr 10, 2017
460c90c
Update model diagram
howsiwei Apr 10, 2017
2c5f387
Update storage diagram
howsiwei Apr 10, 2017
10191e0
Add CommandBoxHandle.type
howsiwei Apr 5, 2017
d4d11a4
Move caret to the end of text in enterCommand
howsiwei Apr 5, 2017
5baed25
Add RetrieveCommandHistoryTest
howsiwei Apr 5, 2017
c89bc83
Reimplement method to retrive command history
howsiwei Apr 5, 2017
57d1675
Change RetrieveCommandHistoryTest to enter command directly
howsiwei Apr 5, 2017
e23bced
Reset matching commands only when changes detected
howsiwei Apr 9, 2017
d7bf560
Extract method resetMatchingCommands
howsiwei Apr 9, 2017
ec9e184
Collate code
howsiwei Apr 9, 2017
dea5762
Remove ./ in storage path in status bar
howsiwei Apr 10, 2017
893d8d8
Update UI diagram
VeryLazyBoy Apr 10, 2017
78e919c
Create parent dirs of storage file if necessary
howsiwei Apr 10, 2017
0714331
Update Dev Guide
VeryLazyBoy Apr 10, 2017
458d907
Update Abouts.md
howsiwei Apr 10, 2017
8a0c768
Merge pull request #135 from CS2103JAN2017-W15-B4/history
howsiwei Apr 10, 2017
fc62ba8
Merge pull request #134 from CS2103JAN2017-W15-B4/specify-storage-loc…
howsiwei Apr 10, 2017
77d49e7
Update AboutUs.md
VeryLazyBoy Apr 10, 2017
60ac059
Merge branch 'master' of https://github.com/CS2103JAN2017-W15-B4/main
VeryLazyBoy Apr 10, 2017
8c2b3b0
Update storage class diagram
howsiwei Apr 10, 2017
357ffea
Update AboutUs.md
ZhangHanming Apr 10, 2017
21069ad
Fix links
VeryLazyBoy Apr 10, 2017
6954671
Merge pull request #133 from CS2103JAN2017-W15-B4/UI
VeryLazyBoy Apr 10, 2017
9979365
Merge branch 'master' into staging
VeryLazyBoy Apr 10, 2017
d1d19f8
Merge pull request #136 from CS2103JAN2017-W15-B4/staging
VeryLazyBoy Apr 10, 2017
17689e7
Merge branch 'master' of https://github.com/CS2103JAN2017-W15-B4/main
VeryLazyBoy Apr 10, 2017
cc49df3
Collate siwei and ziyang's codes
VeryLazyBoy Apr 10, 2017
a2052bf
Fix links inside Aboutus.md
VeryLazyBoy Apr 10, 2017
30fac3c
Update model diagram
howsiwei Apr 10, 2017
c818a60
Update storage class diagram
howsiwei Apr 10, 2017
a8bbe8e
Fix typo in DeveloperGuide
howsiwei Apr 10, 2017
0d5dbbf
Update storage class diagram
howsiwei Apr 10, 2017
365a3fb
Update model diagram
howsiwei Apr 10, 2017
80b0279
Update model diagram
howsiwei Apr 10, 2017
a5b92d8
Finalize collation of Ziyang
VeryLazyBoy Apr 10, 2017
d3ff5c7
Merge branch 'master' of https://github.com/CS2103JAN2017-W15-B4/main
VeryLazyBoy Apr 10, 2017
68c2ff5
Last commit to remove redundant lines
VeryLazyBoy Apr 10, 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
16 changes: 5 additions & 11 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>GeeKeep</name>
<comment>CLI featured Task Manager created by CS2103T-W15-B4.</comment>
<projects>
</projects>
<buildSpec>
Expand All @@ -15,20 +15,14 @@
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>net.sf.eclipsecs.core.CheckstyleBuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
</natures>
<filteredResources>
<filter>
<id>1476898072165</id>
<id>0</id>
<name></name>
<type>26</type>
<matcher>
Expand All @@ -37,7 +31,7 @@
</matcher>
</filter>
<filter>
<id>1476898072188</id>
<id>0</id>
<name></name>
<type>26</type>
<matcher>
Expand Down
4 changes: 4 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,7 @@ addons:
apt:
packages:
- oracle-java8-installer

notifications:
slack: cs2103tw15b4:t3OJlwvZsadj4awsaYqlqoZQ
email: false
40 changes: 23 additions & 17 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,36 +1,42 @@
# Address Book (Level 4)
# GeeKeep

[![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)
[![Build Status](https://travis-ci.org/CS2103JAN2017-W15-B4/main.svg?branch=master)](https://travis-ci.org/CS2103JAN2017-W15-B4/main)
[![Build status](https://ci.appveyor.com/api/projects/status/sh3iswuhfor7us5n?svg=true)](https://ci.appveyor.com/project/yirui94/main)
[![Coverage Status](https://coveralls.io/repos/github/CS2103JAN2017-W15-B4/main/badge.svg?branch=master)](https://coveralls.io/github/CS2103JAN2017-W15-B4/main?branch=master)
[![Codacy Badge](https://api.codacy.com/project/badge/Grade/43c1404bac364bb7852a769d8f796a9e)](https://www.codacy.com/app/yirui94/main?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=CS2103JAN2017-W15-B4/main&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
* 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 sample application intended for fulfilling Software Engineering Course Requirements 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.

* It is **written in OOP fashion**. It has a more sophisticated GUI that includes a list panel and an in-built Browser.
* It includes automated GUI testing and supports for *Build Automation* using Gradle and for *Continuous Integration* using Travis CI.

#### Site Map
* [User Guide](docs/UserGuide.md)
* [Developer Guide](docs/DeveloperGuide.md)
* [Learning Outcomes](docs/LearningOutcomes.md)
* [About Us](docs/AboutUs.md)
* [Contact Us](docs/ContactUs.md)


#### Acknowledgements

* Some parts of this sample application were inspired by the excellent
* This project is a morphing of [AddressBook Level 4](https://github.com/nus-cs2103-AY1617S2/addressbook-level4) which provides educational sample code for us.
* Some parts of this sample application are inspired by the excellent
[Java FX tutorial](http://code.makery.ch/library/javafx-8-tutorial/) by *Marco Jakob*.

#### Dependencies

* Libraries
* [Guava](https://github.com/google/guava)
* [JavaFX](http://docs.oracle.com/javafx/2/overview/jfxpub-overview.htm)
* [Jackson](http://wiki.fasterxml.com/JacksonHome)
* [JFoenix](https://github.com/jfoenixadmin/JFoenix)
* [TestFX](https://github.com/TestFX/TestFX)

* Testing Frameworks
* [JUnit](https://github.com/junit-team/junit4)


#### Licence : [MIT](LICENSE)
17 changes: 9 additions & 8 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.geekeep.MainApp'

allprojects {
apply plugin: 'idea'
Expand Down Expand Up @@ -63,6 +63,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 'com.jfoenix:jfoenix:1.2.0'

testCompile "junit:junit:$junitVersion"
testCompile "org.testfx:testfx-core:$testFxVersion"
Expand All @@ -85,7 +86,7 @@ allprojects {
}

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

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

class AddressBookTest extends Test {
public AddressBookTest() {
class GeeKeepTest extends Test {
public GeeKeepTest() {
forkEvery = 1
systemProperty 'testfx.setup.timeout', '60000'

Expand All @@ -146,7 +147,7 @@ class AddressBookTest extends Test {
}
}

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

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


task nonGuiTests(type: AddressBookTest) {
include 'seedu/address/**'
task nonGuiTests(type: GeeKeepTest) {
include 'seedu/geekeep/**'

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: GeeKeepTest) {
jacoco {
destinationFile = new File("${buildDir}/jacoco/test.exec")
}
Expand Down
Loading