From 80b97ecbc086a28247dbf30ddc74c2b3aba7a1fb Mon Sep 17 00:00:00 2001
From: Ph3nyclidine <p.claudepeon@gmail.com>
Date: Sat, 29 Oct 2016 17:26:14 -0400
Subject: [PATCH] Changed access of closeDrawer to private to decrease coupling
 between MainController and DrawerContentController

---
 src/controller/DrawerContentController.java |  7 -------
 src/controller/MainController.java          | 10 +++++++++-
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/controller/DrawerContentController.java b/src/controller/DrawerContentController.java
index 5c38a03..10143fd 100644
--- a/src/controller/DrawerContentController.java
+++ b/src/controller/DrawerContentController.java
@@ -59,7 +59,6 @@ private void hide(Node n) {
     @FXML
     private void handleMapPressed(ActionEvent event) {
         mainController.showMap();
-        mainController.closeDrawer();
     }
 
     /**
@@ -68,7 +67,6 @@ private void handleMapPressed(ActionEvent event) {
     @FXML
     private void handleReportListPressed(ActionEvent event) {
         mainController.showReportList();
-        mainController.closeDrawer();
     }
 
     /**
@@ -77,7 +75,6 @@ private void handleReportListPressed(ActionEvent event) {
     @FXML
     private void handleCreateReportPressed(ActionEvent event) {
         mainController.showCreateReport();
-        mainController.closeDrawer();
     }
 
     /**
@@ -86,24 +83,20 @@ private void handleCreateReportPressed(ActionEvent event) {
     @FXML
     private void handleEditProfilePressed(ActionEvent event) {
         mainController.showEditProfile();
-        mainController.closeDrawer();
     }
 
     @FXML
     private void handlePurityReportListPressed(ActionEvent event) {
         mainController.showPurityReportList();
-        mainController.closeDrawer();
     }
 
     @FXML
     private void handleCreatePurityReportPressed(ActionEvent event) {
         mainController.showCreatePurityReport();
-        mainController.closeDrawer();
     }
 
     @FXML
     private void handleHistoricalReportPressed(ActionEvent event) {
         mainController.showHistoricalReport();
-        mainController.closeDrawer();
     }
 }
diff --git a/src/controller/MainController.java b/src/controller/MainController.java
index 537a84a..afbb8f1 100644
--- a/src/controller/MainController.java
+++ b/src/controller/MainController.java
@@ -97,7 +97,7 @@ private void handleEditProfile(ActionEvent event) {
     /**
      * Slides the drawer shut.
      */
-    public void closeDrawer() {
+    private void closeDrawer() {
         transition.setRate(-1);
         transition.play();
         drawer.close();
@@ -107,7 +107,9 @@ public void closeDrawer() {
      * Shows the map screen.
      */
     public void showMap() {
+        //closeDrawer();
         showView("Map");
+        closeDrawer();
     }
 
     /**
@@ -115,6 +117,7 @@ public void showMap() {
      */
     public void showReportList() {
         showView("ReportList");
+        closeDrawer();
     }
 
     /**
@@ -122,6 +125,7 @@ public void showReportList() {
      */
     public void showCreateReport() {
         showView("CreateReport");
+        closeDrawer();
     }
 
     /**
@@ -129,6 +133,7 @@ public void showCreateReport() {
      */
     public void showPurityReportList() {
         showView("PurityReportList");
+        closeDrawer();
     }
 
     /**
@@ -136,6 +141,7 @@ public void showPurityReportList() {
      */
     public void showCreatePurityReport() {
         showView("CreatePurityReport");
+        closeDrawer();
     }
 
     /**
@@ -143,6 +149,7 @@ public void showCreatePurityReport() {
      */
     public void showEditProfile() {
         showView("Profile");
+        closeDrawer();
     }
 
     /**
@@ -150,6 +157,7 @@ public void showEditProfile() {
      */
     public void showHistoricalReport() {
         showView("HistoricalReport");
+        closeDrawer();
     }
 
     /**