[T10-A2][W10-C3]

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

@@ -1,7 +1,6 @@
 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.jvm.arguments=
 connection.project.dir=

README.md

@@ -1,34 +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)
 
-# Address Book (Level 4)
+# SmartyDo
 
-<img src="docs/images/Ui.png" width="600"><br>
+<img src="docs/images/AddBasicCmd.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 time scheduler 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) 
 * [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 
-  [Java FX tutorial](http://code.makery.ch/library/javafx-8-tutorial/) by *Marco Jakob*. 
-
-
-#### Licence : [MIT](LICENSE)
+* [Contact Us](docs/ContactUs.md)

build.gradle

@@ -4,7 +4,6 @@
  * For more details take a look at the Java Quickstart chapter in the Gradle
  * user guide available at http://gradle.org/docs/2.2.1/userguide/tutorial_java_projects.html
  */
-
 plugins {
     id "com.github.kt3k.coveralls" version "2.4.0"
     id "com.github.johnrengelman.shadow" version '1.2.3'
@@ -27,6 +26,7 @@ allprojects {
 
     // This part is similar to global variables
     // Access them by using double-quoted strings (GStrings) and referencing by $ e.g. "Variable contains $Variable"
+    // Natty is used for Natural Language Date Parsing
     project.ext {
         controlsFxVersion = '8.40.11'
         guavaVersion = '19.0'
@@ -35,6 +35,7 @@ allprojects {
         junitVersion = '4.12'
         testFxVersion = '4.0.+'
         monocleVersion = '1.8.0_20'
+	    nattyVersion = '0.11'
 
         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"
@@ -61,7 +63,7 @@ allprojects {
         }
         testCompile "org.testfx:openjfx-monocle:$monocleVersion"
     }
-    
+
     sourceSets {
         main {
             java {
@@ -72,7 +74,7 @@ allprojects {
             }
         }
     }
-    
+
     shadowJar {
         archiveName = "addressbook.jar"
 

collated/RunCollate.cmd

@@ -0,0 +1,13 @@
+:: Name:     RunCollate.cmd
+:: Purpose:  Runs Collate!
+:: Author:   A0135812L Kenneth
+
+rmdir main /S /q
+rmdir test /S /q
+rmdir docs /S /q
+
+java -jar Collate-TUI.jar collate from ../src/main to main include java, fxml, css
+
+java -jar Collate-TUI.jar collate from ../src/test to test include java
+
+java -jar Collate-TUI.jar collate from ../docs to docs include md, html