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

Larry #169

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

Larry #169

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
348 commits
Select commit Hold shift + click to select a range
2169018
create XmlTaskListStorageTest.java to replace XmlAddressBookStorageTest
tylerrocha Mar 10, 2017
50d9da4
remove XmlAddressBookStorageTest
tylerrocha Mar 10, 2017
f1862bb
replace person with task in XmlSerializableTaskList.java
tylerrocha Mar 10, 2017
b698df4
remove apostrophe from task descriptions in TypicalTestTasks.java
tylerrocha Mar 10, 2017
b567ec1
add back ida and hoon to pass test
tylerrocha Mar 10, 2017
26756cd
add NotXmlFormatTaskList.xml
tylerrocha Mar 10, 2017
0513e59
remove NotXmlFormatAddressBook.xml; pass all 19 storage tests
tylerrocha Mar 10, 2017
79dad5b
remove trailing whitespace
tylerrocha Mar 10, 2017
8f5c2de
remove more trailing whitespace
tylerrocha Mar 10, 2017
9e0cbee
reorder AddCommand imports
tylerrocha Mar 10, 2017
cb5325e
reorder EditCommand imports
tylerrocha Mar 10, 2017
ef53289
reorder more imports
tylerrocha Mar 10, 2017
f6d7933
reorder even more imports
tylerrocha Mar 10, 2017
f535d20
fix more checkstyle things
tylerrocha Mar 10, 2017
80302b4
fix checkstyle problems in test folder
tylerrocha Mar 10, 2017
a2214a6
remove unused variable in TaskDate
tylerrocha Mar 10, 2017
6fecdc0
remove unused import in TaskDate
tylerrocha Mar 10, 2017
554968e
remove underscores from method names
tylerrocha Mar 11, 2017
26c52b2
add assert to test readTaskListNullFilePathAssertionFailure()
tylerrocha Mar 11, 2017
a07348a
add fail() to tests which check for thrown exceptions
tylerrocha Mar 11, 2017
69a4b2e
add one more fail()
tylerrocha Mar 11, 2017
90d9e8f
remove unused variable 'address'
tylerrocha Mar 11, 2017
8f00e22
Merge pull request #28 from CS2103JAN2017-T11-B3/storage
tylerrocha Mar 11, 2017
316d48c
Modified AddCommandParser, Priority and TaskDate to enable adding flo…
whyCaiJi Mar 13, 2017
9c17b3a
Renaming message string for deleting and finding index
whyCaiJi Mar 13, 2017
2a7a9e7
Implement the edit command (only functionality)
whyCaiJi Mar 13, 2017
b531e3f
Edit command fully implemented in TaskManger context
whyCaiJi Mar 13, 2017
824f416
Minor modification on EditCommandTest file
whyCaiJi Mar 13, 2017
42704a8
Fix Travis build issue
whyCaiJi Mar 13, 2017
9f6ebca
Should be final fix on checkstyle
whyCaiJi Mar 13, 2017
4456763
Implement clear and exit commands. Added a boolean variable complete …
whyCaiJi Mar 13, 2017
b7ef2ca
Minor renaming of constant in relevant to find command
whyCaiJi Mar 13, 2017
8d70485
Merge pull request #38 from CS2103JAN2017-T11-B3/Heyang
whyCaiJi Mar 13, 2017
d36a7e2
Minor change in comment
whyCaiJi Mar 13, 2017
dff0b13
add remove method to UniqueTagList.java
tylerrocha Mar 14, 2017
dc2c94b
add isComplete check to equals command in ReadOnlyTask
tylerrocha Mar 14, 2017
2060660
change person to task in comments of UniqueTaskList.java
tylerrocha Mar 14, 2017
a79b842
add TagNotFoundException to UniqueTagList.java
tylerrocha Mar 14, 2017
34f4d4e
change person to tag in comments of UniqueTagList.java
tylerrocha Mar 14, 2017
f985241
add priorty description, add color to complete tags
Mar 14, 2017
f873f12
remove address from fxml
Mar 14, 2017
e99a267
add border to tags
Mar 14, 2017
f63e6a1
replacebrowserPlaceholder with calenderPlaceholder
Mar 15, 2017
75b1012
CalenderPanel.fxml
Mar 15, 2017
bb9f39d
new calenderPanel
Mar 15, 2017
325c767
calenderpanel.java
Mar 15, 2017
45dc74f
Implemented complete command (by adding a complete tag to the task)
whyCaiJi Mar 15, 2017
d132700
Merge pull request #45 from CS2103JAN2017-T11-B3/Heyang
whyCaiJi Mar 15, 2017
bc5817b
Fixed NullPointerException when comparing TaskDate with null values a…
whyCaiJi Mar 15, 2017
14873cd
calenderpanel.java edit
Mar 15, 2017
c86c4d6
resolve conflict
Mar 15, 2017
ead97d3
edit calenderpanel.fxml
Mar 15, 2017
eccdf21
edit calenderPanel.fxml
Mar 15, 2017
fef6f57
implement Comparable in Priority.java
tylerrocha Mar 15, 2017
b657859
add comments to Priority.java
tylerrocha Mar 15, 2017
1bdf694
Implemented prioritize command
whyCaiJi Mar 15, 2017
6320591
implement Comparable in TaskDate.java
tylerrocha Mar 15, 2017
45e3c7a
Merge pull request #46 from CS2103JAN2017-T11-B3/Heyang
whyCaiJi Mar 15, 2017
7016584
Fixed checkstyle issue
whyCaiJi Mar 15, 2017
e11b48b
implement Comparable, use TaskDate in Task.java
tylerrocha Mar 15, 2017
59ffcf0
include 'complete' instance variable in TestTask.java
tylerrocha Mar 15, 2017
c9ca21c
remove TestPerson.java
tylerrocha Mar 15, 2017
9da8bfb
remove PersonBuilder.java
tylerrocha Mar 15, 2017
d3d8e31
remove TypicalTestPersons.java
tylerrocha Mar 15, 2017
9317b79
Fixed CSS warning
whyCaiJi Mar 15, 2017
339b54d
change AddressBookBuilder.java to TaskListBuilder.java
tylerrocha Mar 15, 2017
76410bc
change TestPerson to TestTask in TestUtil.java
tylerrocha Mar 15, 2017
234293e
change AddressBookTest.java to TaskListTest.java
tylerrocha Mar 15, 2017
796b574
change persons to tasks in TaskListTest.java
tylerrocha Mar 15, 2017
0eac250
change AddressBook to TaskList in XmlUtilTest.java
tylerrocha Mar 15, 2017
a4d0aa6
create TaskCardHandle.java
tylerrocha Mar 15, 2017
0a0e883
change person to task in a couple of places in TestUtil.java
tylerrocha Mar 15, 2017
ddc393e
Merge branch 'master' of https://github.com/CS2103JAN2017-T11-B3/main…
tylerrocha Mar 15, 2017
6e85e44
adding back TestPerson.java for GUI tests
tylerrocha Mar 15, 2017
3be3c9b
remove duplicate isComplete() in TestTask.java
tylerrocha Mar 15, 2017
8921ed2
use SortedList in UniqueTaskList.java
tylerrocha Mar 15, 2017
c80b6b1
add TaskComparator inner class to Task.java
tylerrocha Mar 15, 2017
98cbc75
state TaskComparator explicitly in SortedList constructor
tylerrocha Mar 15, 2017
a8feef9
comment out gui tests
tylerrocha Mar 15, 2017
337c3ad
implement Comparable, Comparator in Tag.java
tylerrocha Mar 15, 2017
4c397b8
fix spacing in Task.java
tylerrocha Mar 15, 2017
ead6225
fix compile error in Tag.java
tylerrocha Mar 15, 2017
4950dab
Merge branch 'master' of https://github.com/CS2103JAN2017-T11-B3/main
tylerrocha Mar 16, 2017
b305e20
Merge branch 'master' of https://github.com/CS2103JAN2017-T11-B3/main…
tylerrocha Mar 17, 2017
15e8890
Implemented Time component for a task
jay500s Mar 17, 2017
b492630
Implemented 'find' to work with any field.
jay500s Mar 17, 2017
6e4b580
Refactored a few missed parts
jay500s Mar 17, 2017
9a3c4ac
Changed default view to show only tasks for today
jay500s Mar 18, 2017
8c49aae
removed unused packages
jay500s Mar 18, 2017
b9c8314
Updated UI to display end date
jay500s Mar 19, 2017
fead858
Merge pull request #49 from CS2103JAN2017-T11-B3/jay2
jay500s Mar 19, 2017
4cc3951
fix test 'readAndSaveTaskListAllInOrderSuccess' by using a temporary …
tylerrocha Mar 19, 2017
87354b5
Color Coded Priorities
jay500s Mar 19, 2017
b07ca77
Merge pull request #50 from CS2103JAN2017-T11-B3/jay2
jay500s Mar 19, 2017
6671383
Merge branch 'master' of https://github.com/CS2103JAN2017-T11-B3/main…
tylerrocha Mar 19, 2017
dbac259
pass storage tests again; fix isSameStateAs in ReadOnlyTask.java
tylerrocha Mar 19, 2017
ad7651f
clean up XmlTaskListStorageTest.java
tylerrocha Mar 19, 2017
5f81c99
fix checkstyle issues
tylerrocha Mar 19, 2017
93fa505
Merge branch 'master' of https://github.com/CS2103JAN2017-T11-B3/main
tylerrocha Mar 19, 2017
2ef5c2c
rename address to task in directory structure
tylerrocha Mar 19, 2017
20d7485
change address to task in test directory structure
tylerrocha Mar 19, 2017
953be4d
Merge pull request #51 from CS2103JAN2017-T11-B3/storage
tylerrocha Mar 19, 2017
485b12d
update imports to match new directoy structure
tylerrocha Mar 19, 2017
97f356d
Merge branch 'master' of https://github.com/CS2103JAN2017-T11-B3/main…
tylerrocha Mar 19, 2017
c85adcc
fix checkstyle
tylerrocha Mar 19, 2017
7f5942c
Merge branch 'directory_structure' of https://github.com/CS2103JAN201…
tylerrocha Mar 19, 2017
6010a40
implement comparable in Timing.java
tylerrocha Mar 19, 2017
d54910f
Merge branch 'comparable' of https://github.com/CS2103JAN2017-T11-B3/…
tylerrocha Mar 19, 2017
f517faf
comment out EmailTest.java
tylerrocha Mar 19, 2017
5b527f7
fix imports in TaskListBuilder.java
tylerrocha Mar 19, 2017
5a55cda
fix compile errors
tylerrocha Mar 19, 2017
f3e074d
stop using sorted list for now
tylerrocha Mar 19, 2017
70dcf8c
change fx:id
Mar 19, 2017
ea97f4a
dynamic date implementation
Mar 19, 2017
1662704
update UniqueTaskList.java
tylerrocha Mar 19, 2017
faa6c4e
use my own compareTo in Timing.java, not built in Date.compareTo()
tylerrocha Mar 19, 2017
2e4e52e
consider n/a case in Timing.java compareTo()
tylerrocha Mar 19, 2017
d4300d3
further add null check to Timing.java, guessing somewhere a Timing is…
tylerrocha Mar 19, 2017
7793b5f
add null checks to fix comparable and view tasks in sorted order
tylerrocha Mar 20, 2017
8eab1bf
Merge branch 'master' of https://github.com/CS2103JAN2017-T11-B3/main…
tylerrocha Mar 20, 2017
7b55b7b
reposition string literals
tylerrocha Mar 20, 2017
335d382
comment unused private fields
tylerrocha Mar 20, 2017
810dcbb
comment unused local variable
tylerrocha Mar 20, 2017
aeda8a2
rename variable to pass codacy
tylerrocha Mar 20, 2017
df8ff55
Merge pull request #53 from CS2103JAN2017-T11-B3/directory_structure
tylerrocha Mar 20, 2017
6cf1331
comment out unused imports until gui tests are fixed; fix other check…
tylerrocha Mar 20, 2017
e3a3396
Merge pull request #55 from CS2103JAN2017-T11-B3/comparable
tylerrocha Mar 20, 2017
fa59acf
Update ContactUs.md
tylerrocha Mar 20, 2017
eb8fee8
add tyler test photo
tylerrocha Mar 20, 2017
1f6e3b2
update tyler photo
tylerrocha Mar 20, 2017
4bb26b3
Merge pull request #56 from CS2103JAN2017-T11-B3/tyler_picture_test
tylerrocha Mar 20, 2017
1443d3c
merge
jay500s Mar 21, 2017
f59e10c
merge2
jay500s Mar 21, 2017
8f47153
mainMenuHandle
jay500s Mar 21, 2017
5c1b8d7
add author tags to TestTask.java
tylerrocha Mar 21, 2017
9e431c9
fix typo
tylerrocha Mar 21, 2017
e0ce858
use final variable for constant in Timing.java
tylerrocha Mar 21, 2017
c127426
make Description.java comparable
tylerrocha Mar 21, 2017
7d34294
consider completedness and description in task compareTo
tylerrocha Mar 21, 2017
968ea0e
Tweak welcome message
tylerrocha Mar 21, 2017
4711e15
reverse complete ordering in Task compareTo
tylerrocha Mar 21, 2017
bfc7a1a
sort tasks after set, update
tylerrocha Mar 21, 2017
d39dcdb
Clarify welcome message
tylerrocha Mar 21, 2017
6b38b4e
Clarify welcome message
tylerrocha Mar 21, 2017
c22922b
add TaskComparableTest.java
tylerrocha Mar 21, 2017
e0fb6c7
add first comparable test checking completedness comparison
tylerrocha Mar 21, 2017
4f5439e
Updated dev guide with model class diagram
jay500s Mar 21, 2017
9695d1e
Merge pull request #73 from CS2103JAN2017-T11-B3/jay2
jay500s Mar 21, 2017
3fe6647
Merge branch 'master' of https://github.com/CS2103JAN2017-T11-B3/main
tylerrocha Mar 22, 2017
011b5b5
Update StorageClassDiagram.png
tylerrocha Mar 22, 2017
52d2aed
make nominal changes to storage part of DeveloperGuide
tylerrocha Mar 22, 2017
9df6b5f
try to fix hyperlinks in DevloperGuide
tylerrocha Mar 22, 2017
56d7889
Merge pull request #74 from CS2103JAN2017-T11-B3/storage_readme
tylerrocha Mar 22, 2017
7412c64
fix add,clear,delete command coomandbox test
Mar 22, 2017
61cd0b4
Merge branch 'test' of https://github.com/CS2103JAN2017-T11-B3/main i…
jay500s Mar 22, 2017
53ad7ee
fix trailing space
Mar 22, 2017
06fc21b
trailing space fix
Mar 22, 2017
79cfbbe
trailing space fix
Mar 22, 2017
aed994a
Merge branch 'test' of https://github.com/CS2103JAN2017-T11-B3/main i…
jay500s Mar 22, 2017
97a83ae
no new line
Mar 22, 2017
d01ac29
Updates in tests for model
jay500s Mar 22, 2017
a510b0e
fix compareTo in Timing.java
tylerrocha Mar 22, 2017
6f7684d
remove unused variable in Timing.java
tylerrocha Mar 22, 2017
d7047f3
Merge branch 'master' of https://github.com/CS2103JAN2017-T11-B3/main…
tylerrocha Mar 22, 2017
c10a737
fix checkstyle
tylerrocha Mar 22, 2017
1bcaec7
remove trailing whitespace
tylerrocha Mar 22, 2017
13fc74d
checkstyle fix
Mar 22, 2017
82ce2e7
checkstyle fix
Mar 22, 2017
2a36646
comment out failing tests, checkstyle fix
Mar 22, 2017
c4fa06f
fix configtest
Mar 22, 2017
6a8e3f4
checkstyle fix
Mar 22, 2017
ab3ecc8
Correct Appveyor badge
tylerrocha Mar 22, 2017
61a7d70
Merge branch 'master' of https://github.com/CS2103JAN2017-T11-B3/main…
tylerrocha Mar 22, 2017
791277f
Merge branch 'test' of https://github.com/CS2103JAN2017-T11-B3/main i…
tylerrocha Mar 22, 2017
7b301a0
uncomment XmlTaskListStorageTest.java
tylerrocha Mar 22, 2017
d9c8e29
pass storage tests
tylerrocha Mar 22, 2017
0ac168f
Merge branch 'test'
Mar 22, 2017
da4265e
Merge branch 'master' of https://github.com/CS2103JAN2017-T11-B3/main
Mar 22, 2017
d44343d
Merge branch 'master' into comparable
tylerrocha Mar 22, 2017
3832ba4
comment unused helper method in TaskComparableTest.java
tylerrocha Mar 22, 2017
c6d02c6
checkstyle fix
Mar 22, 2017
3e84730
Merge branch 'comparable' of https://github.com/CS2103JAN2017-T11-B3/…
tylerrocha Mar 22, 2017
082d8ff
add author tags to TaskComparableTest
tylerrocha Mar 22, 2017
5b7a85d
Merge branch 'master' of https://github.com/CS2103JAN2017-T11-B3/main…
tylerrocha Mar 22, 2017
5143154
comment unused variable
tylerrocha Mar 22, 2017
0da4bf1
Wrote tests for Description, Timing, Priority
jay500s Mar 22, 2017
758245a
Merge pull request #75 from CS2103JAN2017-T11-B3/comparable
tylerrocha Mar 22, 2017
620a45a
revise UserGuide.md to reflect design changes
tylerrocha Mar 22, 2017
953ccf9
Merge pull request #77 from CS2103JAN2017-T11-B3/update_user_guide
tylerrocha Mar 22, 2017
f0e06cf
equivalence partition
Mar 22, 2017
d0a315a
fix deletecommand
Mar 22, 2017
a4dff92
Merge branch 'master' of https://github.com/CS2103JAN2017-T11-B3/main
Mar 22, 2017
e9e535d
Uploaded Logic component class diagram
whyCaiJi Mar 22, 2017
b5b2e8d
Modified DeveloperGuide.md by updating API links
whyCaiJi Mar 22, 2017
231b19e
resolved conflicts
jay500s Mar 23, 2017
ad658fa
resolve merge conflicts
jay500s Mar 23, 2017
af713a0
fix help test
Mar 23, 2017
d6e92ae
Merge branch 'master' of https://github.com/CS2103JAN2017-T11-B3/main
Mar 23, 2017
c466712
fixed checkstyle
jay500s Mar 23, 2017
e3341bd
new commit to verify tests
Mar 23, 2017
0b0d5e2
delete # in developer.md
Mar 23, 2017
b3c5dfe
Update DeveloperGuide.md
tylerrocha Mar 23, 2017
0017ed0
fix typo in author tag
tylerrocha Mar 23, 2017
adfd126
Modified diagrams and DeveloperGuide.md
whyCaiJi Mar 23, 2017
374954d
Modified DeveloperGuide and UserGuide
whyCaiJi Mar 23, 2017
8164914
Updated the README.md
whyCaiJi Mar 23, 2017
44bd693
Undo change in license
whyCaiJi Mar 23, 2017
dc472cb
Final edits on UserGuide.md for v0.3
whyCaiJi Mar 23, 2017
980d6cc
Updated Larry's name
whyCaiJi Mar 23, 2017
fe0a7fd
Added newline at EOF
whyCaiJi Mar 23, 2017
a5a0191
Deleted trailing spaces
whyCaiJi Mar 23, 2017
9a0e74a
Merge branch 'master' of https://github.com/CS2103JAN2017-T11-B3/main…
tylerrocha Mar 23, 2017
fb02aad
changed test parameters of "fiona"
jay500s Mar 23, 2017
64eb8d9
undid changes from last commit
jay500s Mar 23, 2017
6fe7137
Merge branch 'master' of https://github.com/CS2103JAN2017-T11-B3/main…
jay500s Mar 23, 2017
6d61153
Merge pull request #83 from CS2103JAN2017-T11-B3/Documentation
tylerrocha Mar 23, 2017
150f38a
functionality for only adding HH:mm
jay500s Mar 23, 2017
3385901
Merge branch 'master' of https://github.com/CS2103JAN2017-T11-B3/main…
jay500s Mar 23, 2017
d51b83c
use old testFxVersion
tylerrocha Mar 23, 2017
9f938f5
Merge pull request #84 from CS2103JAN2017-T11-B3/patch_gui_tests
tylerrocha Mar 23, 2017
99866dc
Merge branch 'master' of https://github.com/CS2103JAN2017-T11-B3/main…
tylerrocha Mar 23, 2017
49a6233
fix links in DeveloperGuide
tylerrocha Mar 23, 2017
8c1b4c4
Merge pull request #82 from CS2103JAN2017-T11-B3/comparable
tylerrocha Mar 23, 2017
909b8a9
fix npe on exit by removing all old references to BrowserPanel
tylerrocha Mar 23, 2017
44c43d0
Merge branch 'master' into patch_exit
tylerrocha Mar 23, 2017
93d0a14
Merge pull request #85 from CS2103JAN2017-T11-B3/patch_exit
tylerrocha Mar 23, 2017
b009400
Added functionality to validate start/end time ordering
jay500s Mar 24, 2017
41dc2ea
Merge branch 'master' of https://github.com/CS2103JAN2017-T11-B3/main…
jay500s Mar 24, 2017
6803d96
Logic for edit command to check start/end timings.
jay500s Mar 26, 2017
1a0455c
codacy fixes in TimingTest
jay500s Mar 26, 2017
9d94c32
Merge pull request #81 from CS2103JAN2017-T11-B3/jay2
jay500s Mar 26, 2017
72725e6
add collate jar and script
tylerrocha Mar 28, 2017
d31bdda
add collate script results
tylerrocha Mar 28, 2017
537ca6b
try to ignore collated files in coveralls scan
tylerrocha Mar 28, 2017
c305d20
add slashes to .simplecov
tylerrocha Mar 28, 2017
7ac6d83
try one more .simplecov variation
tylerrocha Mar 28, 2017
6dff942
Implemented Undo/Redo feature
whyCaiJi Mar 28, 2017
ab219b2
Trying to solve merge conflict
whyCaiJi Mar 28, 2017
4e2bc1b
Merge pull request #101 from CS2103JAN2017-T11-B3/collate
tylerrocha Mar 28, 2017
5b711e4
updated about us (for Jay)
jay500s Mar 29, 2017
4d5e1a5
jay_about us page
jay500s Mar 29, 2017
b3fde66
dynamic tasks on calender
Mar 29, 2017
8ed32ef
Merge pull request #105 from CS2103JAN2017-T11-B3/jay_about_us
jay500s Mar 29, 2017
c7e635d
Merge branch 'master' into undo-feature
tylerrocha Mar 29, 2017
5a09f4b
fix checkstyle
Mar 29, 2017
df9c233
Merge pull request #102 from CS2103JAN2017-T11-B3/undo-feature
whyCaiJi Mar 29, 2017
7dfeb40
fix checkstyle
Mar 29, 2017
8b298d9
Merge branch 'master' into larry
Mar 29, 2017
630fcf5
add uiclassdiagram
Mar 29, 2017
029208e
Merge branch 'larry' of https://github.com/CS2103JAN2017-T11-B3/main …
Mar 29, 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
30 changes: 2 additions & 28 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 @@ -15,35 +15,9 @@
<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>
</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)
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
44 changes: 44 additions & 0 deletions collated/main/A0163559U.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
# A0163559U
###### /java/seedu/task/model/task/Timing.java
``` java
/**
* Results in Timing sorted in ascending order.
*/
@SuppressWarnings("deprecation")
@Override
public int compareTo(Timing compareTiming) {
boolean thisNull = this.timing == null;
boolean otherNull = compareTiming.timing == null;

if (thisNull && otherNull) {
return 0;
} else if (thisNull) {
return 1;
} else if (otherNull) {
return -1;
}

boolean thisNullTiming = this.timing.equals(NULL_TIMING);
boolean otherNullTiming = compareTiming.timing.equals(NULL_TIMING);

if (thisNullTiming && otherNullTiming) {
return 0;
} else if (thisNullTiming) {
return 1;
} else if (otherNullTiming) {
return -1;
}

int compareToResult = this.timing.getYear() - compareTiming.timing.getYear() + 3800;

if (compareToResult == 0) {
compareToResult = this.timing.getMonth() - compareTiming.timing.getMonth();
}

if (compareToResult == 0) {
compareToResult = this.timing.getDay() - compareTiming.timing.getDay();
}
return compareToResult;
}
}
```
Loading