[T9][F11-C2]

.classpath

@@ -1,21 +1,32 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="src/main/java">
+	<classpathentry kind="src" output="target/classes" path="src/main/java">
 		<attributes>
 			<attribute name="FROM_GRADLE_MODEL" value="true"/>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="src" path="src/main/resources">
+	<classpathentry kind="src" output="bin" path="src/main/resources">
 		<attributes>
 			<attribute name="FROM_GRADLE_MODEL" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="src" path="src/test/java">
+	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
 		<attributes>
 			<attribute name="FROM_GRADLE_MODEL" value="true"/>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" 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="output" path="bin"/>
+	<classpathentry kind="con" path="org.eclipse.fx.ide.jdt.core.JAVAFX_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="output" path="target/classes"/>
 </classpath>

.gitignore

@@ -14,3 +14,5 @@ preferences.json
 classes/
 /data/
 /bin/
+/target/
+target/

.project

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>addressbook-level4</name>
+	<name>CMDo</name>
 	<comment>Project addressbook-level4 created by Buildship.</comment>
 	<projects>
 	</projects>
@@ -15,8 +15,14 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>

.settings/org.eclipse.jdt.core.prefs

@@ -0,0 +1,12 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.source=1.8

.settings/org.eclipse.m2e.core.prefs

@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1

README.md

@@ -1,20 +1,10 @@
-[![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-F11-C2/main.svg?branch=master)](https://travis-ci.org/CS2103AUG2016-F11-C2/main)
+[![Coverage Status](https://coveralls.io/repos/github/CS2103AUG2016-F11-C2/main/badge.svg?branch=master)](https://coveralls.io/github/CS2103AUG2016-F11-C2/main?branch=master)
 
-# Address Book (Level 4)
+# CMDo
 
-<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.
+<img src="docs/images/Ui.jpeg" width="600"><br>
+<img src="docs/images/Main.jpeg" width="600"><br>
 
 
 #### Site Map
@@ -26,9 +16,6 @@
 
 
 #### Acknowledgements
+* [Natty](https://github.com/joestelmach/natty), a natural language date parser written in Java by [Joe Stelmach](https://github.com/joestelmach/).
 
-* Some parts of this sample application were inspired by the excellent 
-  [Java FX tutorial](http://code.makery.ch/library/javafx-8-tutorial/) by *Marco Jakob*. 
-
-
-#### Licence : [MIT](LICENSE)
+#### Licence : [MIT](LICENSE)

build.gradle

@@ -35,6 +35,7 @@ allprojects {
         junitVersion = '4.12'
         testFxVersion = '4.0.+'
         monocleVersion = '1.8.0_20'
+        nattyVersion = '0.12'
 
         libDir = 'lib'
     }
@@ -52,6 +53,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:$nattyVersion"
 
         testCompile "junit:junit:$junitVersion"
         testCompile "org.testfx:testfx-core:$testFxVersion"
@@ -77,7 +79,7 @@ allprojects {
         archiveName = "addressbook.jar"
 
         manifest {
-            attributes "Main-Class": "seedu.address.MainApp"
+            attributes "Main-Class": "seedu.cmdo.MainApp"
         }
 
         destinationDir = file("${buildDir}/jar/")
@@ -113,8 +115,8 @@ tasks.coveralls {
     onlyIf { System.env.'CI' }
 }
 
-class AddressBookTest extends Test {
-    public AddressBookTest() {
+class ToDoListTest extends Test {
+    public ToDoListTest() {
     	  forkEvery = 1
         systemProperty 'testfx.setup.timeout', '60000'
     }
@@ -128,7 +130,7 @@ class AddressBookTest extends Test {
     }
 }
 
-task guiTests(type: AddressBookTest) {
+task guiTests(type: ToDoListTest) {
     include 'guitests/**'
 
     jacoco {
@@ -137,16 +139,16 @@ task guiTests(type: AddressBookTest) {
 }
 
 
-task nonGuiTests(type: AddressBookTest) {
-    include 'seedu/address/**'
+task nonGuiTests(type: ToDoListTest) {
+    include 'seedu/cmdo/**'
 
     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: ToDoListTest) {
     jacoco {
         destinationFile = new File("${buildDir}/jacoco/test.exec")
     }

docs/AboutUs.md

@@ -1,51 +1,53 @@
 # About Us
 
-We are a team based in the [School of Computing, National University of Singapore](http://www.comp.nus.edu.sg).
+We are a team F11-C2, a CS2103 team based in [School of Computing, National University of Singapore](http://www.comp.nus.edu.sg).
 
 ## Project Team
 
-#### [Damith C. Rajapakse](http://www.comp.nus.edu.sg/~damithch) <br>
-<img src="images/DamithRajapakse.jpg" width="150"><br>
-**Role**: Project Advisor
+#### [Chiang Weng Kiat](http://github.com/wengkiat) <br>
+<img src="images/ChiangWengKiat.jpg" width="150"><br>
+**Role**: Team Lead, Project Coordinator
+Responsibilities: 
+* Responsible for overall project coordination.
+* Documentation
+* Responsible for the quality of various project documents
 
 -----
 
-#### [Joshua Lee](http://github.com/lejolly)
-<img src="images/JoshuaLee.jpg" width="150"><br>
-Role: Developer <br>  
-Responsibilities: UI
-
+#### [Justin Ng](http://github.com/njyjn)
+<img src="images/JustinNg.jpg" width="150"><br>
+Role: Integration Lead <br>  
+Responsibilities: Integration
+* In charge of versioning of the code, maintaining the code repository, integrating various parts of the software to create a whole.
+* Scheduling and tracking: In charge of defining, assigning, and tracking project tasks.
+* [Git/Eclipse] expert: e.g. Eclipse expert, Git expert, etc. Helps other team member with matters related to the specific tool.
+
 -----
-
-#### [Leow Yijin](http://github.com/yijinl) 
-<img src="images/LeowYijin.jpg" width="150"><br>
-Role: Developer <br>  
-Responsibilities: Data
+#### [Rahumathmarini](http://github.com/marinirah)
+<img src="images/Rahumathmarini.jpg" width="150"><br>
+Role: Quality Lead <br>  
+Responsibilities:
+* Looks after code quality, ensures adherence to coding standards, etc.
+* Deliverables and deadlines: Ensure project deliverables are done on time and in the right format.
 
 -----
 
-#### [Martin Choo](http://github.com/m133225)
-Role: Developer <br>  
-Responsibilities: Dev Ops
+#### [Lim Hong Wei](http://github.com/imhongw)
+<img src="images/LimHongWei.jpg" width="150"><br>
+Role: Chief Designer, Lead Tester <br>  
+Responsibilities:
+* Takes care of the UI, UX and design of the project.
+* Ensures the testing of the project is done properly (all passing), extensively, and on time.
 
 -----
 
-#### [Thien Nguyen](https://github.com/ndt93)
- Role: Developer <br>  
- Responsibilities: Threading
- 
- -----
+#### [Bay Chuan Wei Candiie](http://github.com/Candiie)
+<img src="images/BayChuanWeiCandiie.png" width="150"><br>
+Role: Project Mentor <br>  
+Responsibilities:
+* Provides guidance for the project.
 
-#### [You Liang](http://github.com/yl-coder) 
-<img src="images/YouLiang.jpg" width="150"><br>
- Role: Developer <br>  
- Responsibilities: UI
-
- -----
 
 # Contributors
 
 We welcome contributions. See [Contact Us](ContactUs.md) page for more info.
-
-* [Akshay Narayan](https://github.com/se-edu/addressbook-level4/pulls?q=is%3Apr+author%3Aokkhoy)
-* [Sam Yong](https://github.com/se-edu/addressbook-level4/pulls?q=is%3Apr+author%3Amauris)