Merge branch 'master' into ui-enhancement

# Conflicts: # src/main/java/seedu/agendum/ui/AllTasksPanel.java # src/main/java/seedu/agendum/ui/CommandBox.java # src/main/java/seedu/agendum/ui/CompletedTasksPanel.java # src/main/java/seedu/agendum/ui/MainWindow.java # src/main/java/seedu/agendum/ui/OtherTasksPanel.java
CS2103AUG2016-W11-C2 · Oct 29, 2016 · 79b9a3e · 79b9a3e
2 parents 8aadaa6 + 8e85531
commit 79b9a3e
Show file tree

Hide file tree

Showing 85 changed files with 798 additions and 818 deletions.
diff --git a/.project b/.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>Agendum</name>
+	<comment>Agendum created by Buildship.</comment>
 	<projects>
 	</projects>
 	<buildSpec>

diff --git a/.travis.yml b/.travis.yml
@@ -11,3 +11,8 @@ addons:
   apt:
     packages:
       - oracle-java8-installer
+
+notifications:
+  email:
+    on_success: change
+    on_failure: always
diff --git a/build.gradle b/build.gradle
@@ -36,6 +36,7 @@ allprojects {
         testFxVersion = '4.0.+'
         monocleVersion = '1.8.0_20'
         nattyVersion = '0.12'
+		reflectionsVersion = '0.9.10'
 
         libDir = 'lib'
     }
@@ -54,6 +55,7 @@ allprojects {
         compile "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jacksonDataTypeVersion"
         compile "com.google.guava:guava:$guavaVersion"
         compile "com.joestelmach:natty:$nattyVersion"
+		compile "org.reflections:reflections:$reflectionsVersion"
 
         testCompile "junit:junit:$junitVersion"
         testCompile "org.testfx:testfx-core:$testFxVersion"

diff --git a/docs/LearningOutcomes.md b/docs/LearningOutcomes.md
diff --git a/docs/UserGuide.md b/docs/UserGuide.md
@@ -27,26 +27,14 @@ As shown below, Agendum has 3 panels: **"Do It Soon"**, **"Do It Anytime"** and
 ## Quick Start
 
 0. Ensure you have Java version `1.8.0_60` or above installed in your Computer.
-
-   > Take note that Agendum might not work with earlier versions of Java 8.
-
-1. Download the latest `Agendum.jar` from the [releases](../../../releases) tab.
-
-2. Copy Agendum.jar to the folder you want to use as the home.
-
-3. Double-click the file to start Agendum. The GUI should appear promptly.
-
-4. Type a command in the command box and press <kbd>Enter</kbd> to execute it.
-
-   e.g. typing **`help`** and pressing <kbd>Enter</kbd> will list some information about commands.
-
-5. Go ahead and try some of the commands listed below!
+1. Download the latest `Agendum.jar` from [here](../../../releases).
+2. Launch Agendum!
+3. Type a command in the command box and press <kbd>Enter</kbd> to execute it. Tip: type **`help`** to learn some new commands.
+4. Go ahead and try some of the commands listed below!
    * **`add`**` Go to shopping mall` : adds a task with description `Go to shopping mall` to Agendum.
-   * **`delete`**` 3` : deletes the 3rd task shown in the current list
-   * **`list`** : lists all uncompleted tasks
+   * **`delete`**` 3` : deletes the 3rd task shown in the current
    * **`exit`** : exits Agendum
-
-6. You can refer to the [Features](#features) section below for more details of each command.
+5. You can refer to the [Features](#features) section below for more details of each command.
 
 
 &nbsp;

diff --git a/docs/UsingGradle.md b/docs/UsingGradle.md
diff --git a/docs/UsingTravis.md b/docs/UsingTravis.md
diff --git a/docs/images/build_pending.png b/docs/images/build_pending.png
diff --git a/docs/images/flick_repository_switch.png b/docs/images/flick_repository_switch.png
diff --git a/docs/images/grant_access.png b/docs/images/grant_access.png
diff --git a/docs/images/request_access.png b/docs/images/request_access.png
diff --git a/docs/images/review_and_add.png b/docs/images/review_and_add.png
diff --git a/docs/images/signing_in.png b/docs/images/signing_in.png
diff --git a/docs/images/travis_build.png b/docs/images/travis_build.png
diff --git a/src/main/java/seedu/agendum/MainApp.java b/src/main/java/seedu/agendum/MainApp.java
@@ -56,7 +56,7 @@ public void init() throws Exception {
 
         model = initModelManager(storage, userPrefs);
 
-        logic = new LogicManager(model, storage);
+        logic = new LogicManager(model);
 
         ui = new UiManager(logic, config, userPrefs);
 
@@ -85,7 +85,7 @@ private Model initModelManager(Storage storage, UserPrefs userPrefs) {
             initialData = new ToDoList();
         }
 
-        return new ModelManager(initialData, userPrefs);
+        return new ModelManager(initialData);
     }
 
     private void initLogging(Config config) {

diff --git a/src/main/java/seedu/agendum/commons/core/Config.java b/src/main/java/seedu/agendum/commons/core/Config.java
@@ -8,20 +8,19 @@
  */
 public class Config {
 
-    public static final String DEFAULT_CONFIG_FILE = "config.json";
-    public static final String DEFAULT_SAVE_LOCATION = "data/todolist.xml";
+    public static final String DEFAULT_DATA_DIR = "data/";
+    public static final String DEFAULT_JSON_DIR = "json/";
+    public static final String DEFAULT_CONFIG_FILE = DEFAULT_DATA_DIR + DEFAULT_JSON_DIR + "config.json";
+    public static final String DEFAULT_USER_PREFS_FILE = DEFAULT_DATA_DIR + DEFAULT_JSON_DIR + "preferences.json";
+    public static final String DEFAULT_SAVE_LOCATION = DEFAULT_DATA_DIR + "todolist.xml";
 
     // Config values customizable through config file
     private String appTitle = "Agendum";
     private Level logLevel = Level.INFO;
-    private String userPrefsFilePath = "preferences.json";
+    private String userPrefsFilePath = DEFAULT_USER_PREFS_FILE;
     private String toDoListFilePath = DEFAULT_SAVE_LOCATION;
     private String toDoListName = "MyToDoList";
 
-
-    public Config() {
-    }
-
     public String getAppTitle() {
         return appTitle;
     }