Merge branch 'master' of github.com:CS2103AUG2016-W11-C3/main

src/main/java/harmony/mastermind/ui/ArchivesTableView.java

@@ -2,6 +2,7 @@
 
 import org.ocpsoft.prettytime.PrettyTime;
 
+import harmony.mastermind.commons.util.AppUtil;
 import harmony.mastermind.commons.util.FxViewUtil;
 import harmony.mastermind.logic.Logic;
 import harmony.mastermind.model.task.ReadOnlyTask;
@@ -16,6 +17,7 @@
 import javafx.stage.Stage;
 
 public class ArchivesTableView extends DefaultTableView {
+    private static final String RECUR_ICON = "/images/recur_white.png";
 
     private static final String FXML = "ArchivesTableView.fxml";
 
@@ -155,7 +157,7 @@ protected void initTags() {
      */
     protected void initRecur() {
         recurColumn.prefWidthProperty().bind(archivesTableView.widthProperty().multiply(WIDTH_MULTIPLIER_RECUR));
-        recurColumn.setGraphic(new ImageView("file:src/main/resources/images/recur_white.png"));
+        recurColumn.setGraphic(new ImageView(AppUtil.getImage(RECUR_ICON)));
         recurColumn.setCellValueFactory(task -> new SimpleBooleanProperty(task.getValue().isRecur()));
         recurColumn.setCellFactory(col -> renderRecurCell());
     }

src/main/java/harmony/mastermind/ui/DeadlinesTableView.java

@@ -2,6 +2,7 @@
 
 import org.ocpsoft.prettytime.PrettyTime;
 
+import harmony.mastermind.commons.util.AppUtil;
 import harmony.mastermind.commons.util.FxViewUtil;
 import harmony.mastermind.logic.Logic;
 import harmony.mastermind.model.task.ReadOnlyTask;
@@ -16,6 +17,7 @@
 import javafx.stage.Stage;
 
 public class DeadlinesTableView extends DefaultTableView {
+    private static final String RECUR_ICON = "/images/recur_white.png";
 
     private static final String FXML = "DeadlinesTableView.fxml";
 
@@ -156,7 +158,7 @@ protected void initTags() {
      */
     protected void initRecur() {
         recurColumn.prefWidthProperty().bind(deadlinesTableView.widthProperty().multiply(WIDTH_MULTIPLIER_RECUR));
-        recurColumn.setGraphic(new ImageView("file:src/main/resources/images/recur_white.png"));
+        recurColumn.setGraphic(new ImageView(AppUtil.getImage(RECUR_ICON)));
         recurColumn.setCellValueFactory(task -> new SimpleBooleanProperty(task.getValue().isRecur()));
         recurColumn.setCellFactory(col -> renderRecurCell());
     }

src/main/java/harmony/mastermind/ui/HomeTableView.java

@@ -5,6 +5,7 @@
 import com.google.common.eventbus.Subscribe;
 
 import harmony.mastermind.commons.events.ui.HighlightLastActionedRowRequestEvent;
+import harmony.mastermind.commons.util.AppUtil;
 import harmony.mastermind.commons.util.FxViewUtil;
 import harmony.mastermind.logic.Logic;
 import harmony.mastermind.model.task.ReadOnlyTask;
@@ -20,7 +21,7 @@
 
 //@@author A0138862W
 public class HomeTableView extends DefaultTableView {
-
+    private static final String RECUR_ICON = "/images/recur_white.png";
     private static final String FXML = "HomeTableView.fxml";
 
     private static final PrettyTime prettyTime = new PrettyTime();
@@ -172,7 +173,7 @@ protected void initTags() {
     protected void initRecur() {
         recurColumn.setSortable(false);
         recurColumn.prefWidthProperty().bind(homeTableView.widthProperty().multiply(WIDTH_MULTIPLIER_RECUR));
-        recurColumn.setGraphic(new ImageView("file:src/main/resources/images/recur_white.png"));
+        recurColumn.setGraphic(new ImageView(AppUtil.getImage(RECUR_ICON)));
         recurColumn.setCellValueFactory(task -> new SimpleBooleanProperty(task.getValue().isRecur()));
         recurColumn.setCellFactory(col -> renderRecurCell());
     }

src/main/java/harmony/mastermind/ui/MainWindow.java

@@ -47,7 +47,7 @@
  * and space where other JavaFX elements can be placed.
  */
 public class MainWindow extends UiPart {
-    private static final String ICON = "/images/address_book_32.png";
+    private static final String ICON = "/images/to_do_list_32.png";
     private static final String FXML = "MainWindow.fxml";
 
     private static final short INDEX_HOME = 0;

src/main/java/harmony/mastermind/ui/UiManager.java

@@ -26,7 +26,7 @@
  */
 public class UiManager extends ComponentManager implements Ui {
     private static final Logger logger = LogsCenter.getLogger(UiManager.class);
-    private static final String ICON_APPLICATION = "/images/address_book_32.png";
+    private static final String ICON_APPLICATION = "/images/to_do_list_32.png";
     private final HelpPopup helpPopup;
 
     private Logic logic;

src/main/resources/view/MainWindow.fxml

@@ -15,7 +15,7 @@
 <?import javafx.scene.layout.HBox?>
 <?import javafx.scene.layout.VBox?>
 
-<VBox maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="800.0" prefWidth="1280.0" styleClass="root" stylesheets="@MainWindow.css" xmlns="http://javafx.com/javafx/8.0.102" xmlns:fx="http://javafx.com/fxml/1" fx:controller="harmony.mastermind.ui.MainWindow">
+<VBox maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="800.0" prefWidth="1280.0" styleClass="root" stylesheets="@MainWindow.css" xmlns="http://javafx.com/javafx/8.0.101" xmlns:fx="http://javafx.com/fxml/1" fx:controller="harmony.mastermind.ui.MainWindow">
     <children>
           <AnchorPane prefHeight="369.0" prefWidth="485.0" VBox.vgrow="ALWAYS">
               <children>

src/test/java/harmony/mastermind/commons/util/AppUtilTest.java

@@ -15,7 +15,7 @@ public class AppUtilTest {
 
     @Test
     public void getImage_exitingImage(){
-        assertNotNull(AppUtil.getImage("/images/address_book_32.png"));
+        assertNotNull(AppUtil.getImage("/images/to_do_list_32.png"));
     }