[T8][F10-C3]

.classpath

@@ -15,7 +15,7 @@
 			<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.buildship.core.gradleclasspathcontainer"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/Java SE 8 [1.8.0_74]"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

.project

@@ -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-final</name>
+	<comment>Project main-final created by Buildship.</comment>
 	<projects>
 	</projects>
 	<buildSpec>
@@ -20,4 +20,24 @@
 		<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>
+	<filteredResources>
+		<filter>
+			<id>1478618700355</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>1478618700593</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>

.settings/gradle.prefs

@@ -0,0 +1,12 @@
+{
+  "1.0": {
+    "project_path": ":",
+    "project_dir": "/Users/ravi/Desktop/main",
+    "connection_project_dir": "/Users/ravi/Desktop/main",
+    "connection_gradle_user_home": null,
+    "connection_gradle_distribution": "GRADLE_DISTRIBUTION(WRAPPER)",
+    "connection_java_home": null,
+    "connection_jvm_arguments": "",
+    "connection_arguments": ""
+  }
+}

.settings/org.eclipse.buildship.core.prefs

@@ -1,3 +1,6 @@
+GRADLE_BUILD_COMMANDS=org.eclipse.jdt.core.javabuilder
+GRADLE_FILTERS=1.0-projectRelativePath-matches-false-false-build,1.0-projectRelativePath-matches-false-false-.gradle
+GRADLE_NATURES=org.eclipse.jdt.core.javanature
 build.commands=org.eclipse.jdt.core.javabuilder
 connection.arguments=
 connection.gradle.distribution=GRADLE_DISTRIBUTION(WRAPPER)

.travis.yml

@@ -10,4 +10,4 @@ before_install:
 addons:
   apt:
     packages:
-      - oracle-java8-installer
+      - oracle-java8-installer 

README.md

@@ -1,21 +1,13 @@
 [![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)
+[![Coverage Status](https://coveralls.io/repos/github/CS2103AUG2016-F10-C3/main/badge.svg?branch=master)](https://coveralls.io/github/CS2103AUG2016-F10-C3/main?branch=master)
+[![Codacy Badge](https://api.codacy.com/project/badge/Grade/72e712e19dd241cfa8820139dbab0bef)](https://www.codacy.com/app/shwetha-ravi3/main?utm_source=github.com&utm_medium=referral&utm_content=CS2103AUG2016-F10-C3/main&utm_campaign=Badge_Grade)
 
-# Address Book (Level 4)
+# Tary
 
-<img src="docs/images/Ui.png" width="600"><br>
+<img src="docs/images/Ui.jpg" 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 GTD (Get things done) 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.
-
 
 #### Site Map
 * [User Guide](docs/UserGuide.md) 

build.gradle

@@ -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 "com.joestelmach:natty:0.7"
 
         testCompile "junit:junit:$junitVersion"
         testCompile "org.testfx:testfx-core:$testFxVersion"
@@ -74,10 +75,10 @@ allprojects {
     }
 
     shadowJar {
-        archiveName = "addressbook.jar"
+        archiveName = "tary.jar"
 
         manifest {
-            attributes "Main-Class": "seedu.address.MainApp"
+            attributes "Main-Class": "seedu.gtd.MainApp"
         }
 
         destinationDir = file("${buildDir}/jar/")
@@ -138,7 +139,7 @@ task guiTests(type: AddressBookTest) {
 
 
 task nonGuiTests(type: AddressBookTest) {
-    include 'seedu/address/**'
+    include 'seedu/gtd/**'
 
     jacoco {
         destinationFile = new File("${buildDir}/jacoco/test.exec")

collated/docs/A0130677A.md

@@ -0,0 +1,148 @@
+# A0130677A
+###### /UserGuide.md
+``` md
+
+### Adding a person: `add`
+**Format:** `add NAME [a/LOCATION s/START_DATE d/DEADLINE_OR_END_DATE p/PRIORITY t/TAGS]`<br>
+* Adds a task to the task list in a flexible format (in any order).
+* All parameters except name are optional.
+* This command supports 3 types of tasks: floating tasks, event tasks and deadline tasks. 
+* Persons can have any number of tags (including 0)
+<br>
+Examples:
+* Floating task: `add Visit Dentist`
+* Event task: `add hackathon a/NUS s/tomorrow d/sunday p/3 t/preparation`
+* Deadline task: `add submit tutorial d/monday p/5`
+
+**Field Type Constraints**
+* Task duedate or startdate is formatted like the following: Wed Nov 02 15:39:55 UTC 2016 
+* Accepted formal dates: 1978-01-28, 1984/04/02, 1/02/1980, 2/28/79 
+* Relaxed dates: The 31st of April in the year 2008, Fri, 21 Nov 1997, Jan 21, '97, Sun, Nov 21, jan 1st, february twenty-eighth 
+* Relative dates: next thursday, last wednesday, today, tomorrow, yesterday, next week, next month, next year, 3 days from * now, three weeks ago 
+* Prefixes: day after, the day before, the monday after, the monday before, 2 fridays before, 4 tuesdays after 
+* Time: 0600h, 06:00 hours, 6pm, 5:30 a.m., 5, 12:59, 23:59, 8p, noon, afternoon, midnight 
+* Relative times: 10 seconds ago, in 5 minutes, 4 minutes from now.
+<br><br><br>
+
+### Mark task as done : `done`
+Format: `done INDEX`
+Marks a task as done by the index displayed on the task panel.<br>
+* tasks marked as done can be shown when using command 'list done'
+* once marked as done, cannot be undone unless using `undone` command immediately
+<br><br><br>
+
+### Edit task by attributes: `edit`
+Format: `edit INDEX [NEW_NAME] FIELD_TYPE/NEW_FIELD_DETAILS`
+Edits a task as done by the index displayed on the task panel.<br>
+* to change the name only, use `edit NEW_NAME` without specifying field type
+* able to accept multiple field types e.g. `edit 2 taskA a/NUS d/friday`
+<br><br><br>
+
+### Undo previous command: `undo`
+Format: `undo`
+Undo the last command.<br>
+* multiple undos supported.
+<br><br><br>
+
+### Listing all tasks : `list`
+Format: `list [done]`
+Shows a list of all tasks done or not done in the task list.<br>
+* `list` shows all tasks not done
+* `list done` shows all tasks done
+<br><br><br>
+
+### Finding all tasks containing any keyword in their name or attributes: `find`
+Format: `find [FIELD_TYPE] KEYWORD`
+Finds tasks whose descriptions contain any of the given keyword.<br>
+* The search is case sensitive. e.g `hmk` will not match `HMK`
+* The order of the keywords does not matter. e.g. `Do Homework` will match `Homework Do`
+* If field type is specified, only the field type will be matched with the keyword
+* If field type is not specified, name will be search for a match first, before searching all the other fields for the keyword.
+* Only full words will be matched e.g. `Hmk` will not match `Hmks`
+* Tasks matching at least one keyword will be returned (i.e. `OR` search).
+    e.g. `Hmk` will match `Do Hmk`
+
+Examples: 
+* `find p/3` : Returns any task that has priority 3
+* `find a/NUS` : Returns any task that occurs in NUS
+* `find homework`: Returns task with homework in the name, if not found, returns tasks with homework in other fields such as tags
+<br><br><br>
+
+### Deleting a task : `delete`
+Deletes the specified task from the address book. Irreversible.<br>
+Format: `delete INDEX`
+
+Deletes the task at the specified `INDEX`. 
+The index refers to the index number shown in the most recent listing.<br>
+The index **must be a positive integer** 1, 2, 3, ...
+
+Examples: 
+* `list`<br>
+  `delete 2`<br>
+  Deletes the 2nd task in the task list.
+* `find CS2101`<br> 
+  `delete 1`<br>
+  Deletes the 1st task in the results of the `find` command.
+<br><br><br>
+
+### Select a person : `select`
+Selects the person identified by the index number used in the last person listing.<br>
+Format: `select INDEX`
+
+Selects the person and loads the Google Maps for location of the task at the specified `INDEX`. 
+The index refers to the index number shown in the most recent listing.<br>
+The index **must be a positive integer** 1, 2, 3, ...
+
+Examples: 
+* `list`<br>
+  `select 2`<br>
+  Selects the 2nd task in the task list.
+* `find a/NUS` <br> 
+  `select 1`<br>
+  Selects the 1st task in the results of the `find` command.
+<br><br><br>
+
+### Clearing all entries : `clear`
+Clears all entries from the task list.<br>
+Format: `clear` 
+<br><br><br>
+
+### Change file path of storage : `setPath`
+Change the path of the task list to be stored to the specified file path.<br>
+Format: `setPath NEW_PATH`
+Example:
+* `setPath data/newfilepath.xml`
+<br><br><br>
+
+### Exiting the program : `exit`
+Exits the program.<br>
+Format: `exit`  
+<br><br><br>
+
+### Saving the data 
+Task List data are saved in the hard disk automatically after any command that changes the data.<br>
+There is no need to save manually.
+<br><br><br>
+
+## FAQ
+
+**Q**: How do I transfer my data to another Computer?<br>
+**A**: Install the app in the other computer and overwrite the empty data file it creates with 
+       the file that contains the data of your previous Tasks folder.
+<br><br>       
+## Command Summary
+
+Command | Format  
+-------- | :-------- 
+Add | `add NAME [s/startdate d/duedate a/address p/priorityrank(1- highest,5-lowest) t/TAG]...`
+Edit | `edit INDEX [NEW_NAME] FIELD_TYPE/NEW_FIELD_DETAILS` where FIELD_TYPE is either `d/` `a/` `s/` `p/`
+Done | `done INDEX`
+Clear | `clear`
+Delete | `delete INDEX`
+Find | `find [FIELD_TYPE] KEYWORD` FIELD_TYPE options: `t/` `a/` `s/` `d/` `p/`
+List | `list [done]`
+Help | `help`
+Select | `select INDEX`
+SetPath | `setPath NEW_FILE_PATH` NEW_FILE_PATH: e.g. `data/newfile.xml`  
+Exit | `exit`
+```

collated/docs/A0139072H.md

@@ -0,0 +1,37 @@
+# A0139072H
+###### /DeveloperGuide.md
+``` md
+<img src="images/TaryArchitecture.png" width="600"><br>
+```
+###### /DeveloperGuide.md
+``` md
+<img src="images/TaskLogicClassDiagram.png" width="800"><br>
+```
+###### /DeveloperGuide.md
+``` md
+<img src="images\SDforDeleteTask.png" width="800">
+```
+###### /DeveloperGuide.md
+``` md
+<img src="images\SDforDeleteTaskEventHandling.png" width="800">
+```
+###### /DeveloperGuide.md
+``` md
+<img src="images/TaskUiClassDiagram.png" width="800"><br>
+```
+###### /DeveloperGuide.md
+``` md
+<img src="images/TaskLogicClassDiagram.png" width="800"><br>
+```
+###### /DeveloperGuide.md
+``` md
+<img src="images/DeleteTaskSdForLogic.png" width="800"><br>
+```
+###### /DeveloperGuide.md
+``` md
+<img src="images/TaskModelClassDiagram.png" width="800"><br>
+```
+###### /DeveloperGuide.md
+``` md
+<img src="images/TaskStorageClassDiagram.png" width="800"><br>
+```

collated/docs/A0146130W.md

@@ -0,0 +1,51 @@
+# A0146130W
+###### /DeveloperGuide.md
+``` md
+
+## Appendix A : User Stories
+
+Priorities: High (must have) - `* * *`, Medium (nice to have)  - `* *`,  Low (unlikely to have) - `*`
+
+Priority | As a ... | I want to ... | So that I can...
+-------- | :-------- | :--------- | :-----------
+`* * *` | new user | see usage instructions | refer to instructions when I forget how to use the application
+`* * *` | user | add a task with a deadline | be reminded of tasks that I have to complete soon and prioritise them 
+`* * ` | user | add a task with a priority rank | view a prioritised list of tasks and know which task to start with
+`* * ` | user | add a task with a location | immediately know the location and context without having to refer to other sources
+`* * *` | user | add a task with tag(s) | search or filter tasks by these tags
+`* * ` | user | select a task to access widgets like Google Calendar and Google Maps | immediately connect with these frequently used applications, without having to take more steps such as opening a browser and visiting the link, and typing in the search bar
+`* * *` | user | delete a task | remove clutter from the task list
+`* * *` | user | find a task by title | find tasks easily
+`* * *` | user | find a task by tags | categorise and find tasks easily
+`* * *` | user | edit information about a task | update the task (such as adding a deadline or location) when more information is available or when changes arise
+`* * *` | user | view all tasks entered | have a quick summary of what tasks I have
+`* * *` | user | clear all tasks | reset the task list
+
+```
+###### /DeveloperGuide.md
+``` md
+
+## Appendix E : Product Survey
+
+Reminders for Mac: Simple, clean white interface that is close to a text editor. Mouse use for interaction only required for tags, adding and deleting.
+Features:
+a) tags can be added to items on the list like date due and priority
+b) schedule tab can arrange the reminders by due date
+c) iCloud sync allows use on laptop and phone
+d) periodic tasks can be set such that a reminder alert is displayed every time it is due.
+
+Drawbacks:
+a) Need to refer to calendar to set due dates. 
+
+Asana: Collaborative GTD, a team can set up project tasks and subgroups that divide people into smaller groups based on tasks (Marketing, Engineering, etc).
+a) Can setup individual tasks on personal dashboard, so it also works well for individual use.
+b) Can hold conversations with team members.
+c) Can set up team tasks.
+d) Can divide members into smaller groups for better organisation.
+
+Taskwarrior: feature-rich software that allows the user to manage his todo list from the command line.
+Uses a natural and expressive syntax
+Allows user to perform CRUD functions and prioritising of tasks in a fast manner
+Support for creating deadlines, searching of tasks
+However, it does not support Jim’s need for “blocking� and “unblocking� timeslots
+```