From 94fc6a89211c474eb5fea14ea595fe7f9579a982 Mon Sep 17 00:00:00 2001
From: YaFedImYaEatIm <gondra2000@hotmail.com>
Date: Fri, 30 Sep 2016 14:55:02 +1300
Subject: [PATCH] Open, delete and add dataset now work

---
 res/userdb.db                                 | Bin 8387584 -> 8387584 bytes
 .../java/seng202/group9/Controller/App.java   |  23 ++++++++----
 .../seng202/group9/Controller/Session.java    |  10 ++++++
 .../seng202/group9/GUI/DatasetController.java |  33 ++++++++++++++++--
 src/main/resources/dataset_editor.fxml        |   4 +--
 5 files changed, 59 insertions(+), 11 deletions(-)

diff --git a/res/userdb.db b/res/userdb.db
index dd0d554e540363b23075e38bc1d1e7788217859e..dafa4b37413b07881ce0df04a2252c83d1ae2457 100644
GIT binary patch
delta 2827
zcmbtWT}%{L6uxus><-L|fX*=d>RM42gaZDu{HU-XQb1v)6>(M$DwVakC@fZKEkBym
z2W_JgJ3jbeNMrl1VQXrd+Gt|azBciJgtia0P5NLPHKv-_JG(my+1=8_O}@K#&v)*f
z@80{JJ3IFD1smfypOZdC$nqD2$a#dMT_VJ;UMOC-Vv3af=CBb$Z0rGV<xcjDJz;;b
zKiLDJmEC9ejh^$K8`swh*J%N#8~I?lEQ_b_R(P{Bl{YO(DSRYlvxGfnv+PbN{d3<m
zo4h0Clqw=4rMrd$hlc%uf+1&pPq1gGH<(Nr$qM!k1q+7c@W@Am{lgxyhvvv%+2liq
zm~CT%Ac|&7X(WkHKg%ER#7qjY$-Al987eCkVrCbwKTefJL7Y%f5m2G1FjPcTY^c~#
zkx)rOB^ebN6$dJdP)R{$F)FF3q@j|I$`VwTqM}SIs+gIXL_CC@WZRiW?+Rz>$7Gy%
z=xuXTD#U`xR$+5!yjUG`6!KL_q=>LSRz|;~Bf>4=I4Pn}=~GV3`-B2r>P5k*t5UzA
z)r%%~3M-9I+-jEbutGgyY_3!*jB9T7@^rOIbCm*O6H*A9reD)hA%(6XH_6RQ&g9Gs
zZH{D3mC7>gnkUaF_jYCWbl3U^j}8n5yUVSfT*8keUCYa(r>lZJ`}=z>!upnrJl=-d
zjs|B(ZCy))6RbEmU0}`DR1eOk9UTqc45P%`l{*@<*Vdr!@`RLJGNCP%v@KgKA#pSN
z{ej+uguF5$HOtZ(lWF`=qTZrjB`mW#hBjrIPe>rsq~z6=OYB-}L3lq6+NCZt{^(Sn
z*|(?JwY?i6(R&qYs&TbTwHZZKY9{I`>KUkOsPldn>e;C0pq`6*9_q_bUyiyH^%bbU
zf%;0+^HE=g`fAh*rgfL3j5>HBjd2Wf3~~%`^mFua^m6Ry*vGM#<5UzK{M$l1@9*HK
zpA$2=x$#>5dlN@9M<a*%yeL9=)HR}gcBNnZLOkQ+%{f<6NCe+~F*I}8mG7A5K_30m
zl@#Vf;tkhxDbp-;8~K^gpXj)7PZ;6dbEKFQU#L~=UAcDcNMm@X>SIq}TfhHMU$DEa
zC)gM76z0(8ipbyI>_nFH3=9W?gD2z75~bvtaV;xsx$%hiW939M6B2Uef|e_Ds}=T^
zOuN?Y4lg=Rb$I;2_&Rx9-ZZ{ZlQg%RPT0Z)8b=FHiyxKO%`aXvD`nmtYy9F?ee^X8
z*QG`Z*Ox$G^qz>-7$vMb=06JeyJGeGi}f?1nQvYBQq*)mx)w!EH^WUg4Zay}%HLfs
z$uj68)1Z;CSm=_X$!UepCB<|ozx;_HvK9Q!?j%!W%6x@=YHxGewF5QbquLg$*gG)H
z-$?OH6=BS}BM0{_vunqiDe(sm_P(A&Cl2RHT5~f!)0ALut%?}%2ZBSfdSBA3OkQq|
z^}~ES+%DhqVs44XajP}u|0&UNJx9_S8|lP`1?2O|;)*Y{ZUeb?0qLQ$v%YpAG?QES
z^3aQ49eM>n^r#i;Uq#yrpF0+tR$z23VOQxHy4L*LkWc5jAkG#n?1G7`<&suYLr;4W
zEIcwr?3$xCYJas_)qL&7BpR+g>MeW3XkoL~#iVpwCl&TaJkQQckar*yA`~I4K`2Hj
zL3k6P6rl{E9APcOI)wEI8xS@kY(l6&a3fSAR3TI&)F5m|*n+SXp%$SI!Glnb(15TF
zp%Gy_LKDJU2+asB2(1YGi8~S65ZV#E2)htE5Z*?32VpltC&C_tE`+@ZI)V>jA3`?*
zAoL*YM>v3R5TO_0U4%mjeF%Pp!wByo^dlTW2p|j~97Q;WFo-aO5JVV8IF9f>!U=?v
T2qOp|Abf~$3gM$`FnZ-*WdDs<

delta 1349
zcmZwFUrbw790%}o@40O^%0|(1q5PQ}(v90vgv#b9bnIU@z|nSWoosNNxDCZIHyms-
zbOIWGOK=Z!O}tC?;ENf?SCG4?F`BS9-zD+R2V>MFKJXw7VI=c=TQDa2@HuJk?|Xi~
z-d{Sg{De=yt%~9)#<o6TtY8aczI%+h*~j6=swr0Yo7cq{Q+XDrtD8UOS>+@310|s(
z_yS)ryVCmX%uZ!SHGi+yi~Pu>HsR>>;A9G4Vtk4J%;&A*eZe`NnfFxGpXDraICbnq
zvLl^7bUfXWY)d6OPi<5=D;wz_9;q2F$lY9Fe1&KEqI2^Xo>}y2<<Y2%D~dx^^Pyb(
zEYCV2i)S7bm6w$8i1Od|GfPDUnxeihNGK#!5}bra!bQSO!b4&MiH#%*NO(yUlGsFI
zGl?P+J`%+wo+9xy2{9*h&F}ZHNye}7c3!GJz$$LANhP6vk5xoEl^Sz0thZV?CcI_p
zRcvvQsbk7LwUsR@1N;E{LS0suou%D!$2Yr6yCY_#NB5h_7Tsgsjp|kA{bqesjTL56
zO11fEvtDKnwCH!th8Dd^Q|~h^lTcbU>}SgSFs#Si?LK#D@2-FK_^DUlZhjNhznzQe
zYNc-*bFoK^f2Cej1MHFVt26mW^Xne{u{qwO$DAc<|J%a~HR-n%k~+x}lBFd5B+E#a
zldK?FNpcIxXGm@(xs7BM$!AGclMImDPI3pynmK8B#CRqCP7_cKJ0Jvg&;X6F8=7Gc
z?1wnC!4XKpb?AaLoP=ID4QHSq2H*l*g3E9PoOx?38ZyR8Z^v!RHfjw%t=%*>WVHB#
zW&3IaJoo&L5%A)}mv*lH`Fj1&kiji&)>!qRIBl<<*DU)xBj9|q?0FQYwI7Vae6QJD
z*3M@w`?Jtm>pu*`<0Pi-hCy8aD?iDyN7n;dFdwk&bGa72;M%yfldlX0yq^pWKC~Xj
zLe=>n8^(ocZ3tDZDW64by<7aBZdxeBE%(vjit}a|95nb1tuF{6sD&`p!E;a#4G@9n
zp%He%E_eZULlZ=y8CoC)d!QBe!amp!2jC#Y;Sd~#HfV<qcoB|3CnO*VDL4vUa14$^
z8cx7V&<!Wy6!btZNO&1e!z<7SufiEP3+JF8UW3<R0N#M}FbEgmO}Ge`U<lrV%P<Th
ba0RZy+b{~(U<}@Yci}p`XK8)ot9SnfE98xh

diff --git a/src/main/java/seng202/group9/Controller/App.java b/src/main/java/seng202/group9/Controller/App.java
index 1957f79..b9e6c68 100644
--- a/src/main/java/seng202/group9/Controller/App.java
+++ b/src/main/java/seng202/group9/Controller/App.java
@@ -72,12 +72,6 @@ public class App extends Application
 		} catch (Exception e){
 			e.printStackTrace();
 		}
-		//testing out dataset
-		try {
-			currentDataset = new Dataset("test's", Dataset.getExisting);
-		}catch (DataException e){
-			e.printStackTrace();
-		}
 		//after all loading then load the previous session
 		try{
 			FileInputStream fileIn = new FileInputStream("res/session.ser");
@@ -99,7 +93,20 @@ public class App extends Application
 			session = new Session();
 			e.printStackTrace();
 		}
-		//menuController.createPopUpStage(SceneCode.DATASET_CONTROLLER, 600, 400);
+		//testing out dataset
+		try {
+			if (session.getCurrentDataset() != null) {
+				currentDataset = new Dataset(session.getCurrentDataset(), Dataset.getExisting);
+			}else{
+				menuController.createPopUpStage(SceneCode.DATASET_CONTROLLER, 600, 400);
+			}
+		}catch (DataException e){
+			menuController.createPopUpStage(SceneCode.DATASET_CONTROLLER, 600, 400);
+		}catch (NullPointerException e){
+			menuController.createPopUpStage(SceneCode.DATASET_CONTROLLER, 600, 400);
+		}catch (Exception e){
+			menuController.createPopUpStage(SceneCode.DATASET_CONTROLLER, 600, 400);
+		}
 	}
 
 	/**
@@ -198,6 +205,7 @@ public class App extends Application
      */
 	public void setCurrentDataset(int index){
 		currentDataset = datasets.get(index);
+		session.setCurrentDataset(currentDataset.getName());
 	}
 
 	/**
@@ -206,6 +214,7 @@ public class App extends Application
      */
 	public void setCurrentDataset(Dataset dataset){
 		currentDataset = dataset;
+		session.setCurrentDataset(currentDataset.getName());
 	}
 
 	/**
diff --git a/src/main/java/seng202/group9/Controller/Session.java b/src/main/java/seng202/group9/Controller/Session.java
index 71a3dc5..f14787c 100644
--- a/src/main/java/seng202/group9/Controller/Session.java
+++ b/src/main/java/seng202/group9/Controller/Session.java
@@ -25,6 +25,8 @@ public class Session implements Serializable {
     private String airportToEdit;
     private String routeToEdit;
 
+    private String currentDataset;
+
 
     /**
      * Constructor for a new session
@@ -42,6 +44,14 @@ public class Session implements Serializable {
         this.sceneDisplayed = scene;
     }
 
+    public String getCurrentDataset(){
+        return this.currentDataset;
+    }
+
+    public void setCurrentDataset(String currentDataset){
+        this.currentDataset = currentDataset;
+    }
+
     /**
      * changes the serialized scene.
      * @param sceneDisplayed
diff --git a/src/main/java/seng202/group9/GUI/DatasetController.java b/src/main/java/seng202/group9/GUI/DatasetController.java
index a3e0deb..3215abf 100644
--- a/src/main/java/seng202/group9/GUI/DatasetController.java
+++ b/src/main/java/seng202/group9/GUI/DatasetController.java
@@ -5,8 +5,12 @@ import javafx.collections.FXCollections;
 import javafx.collections.ListChangeListener;
 import javafx.collections.ObservableList;
 import javafx.fxml.FXML;
+import javafx.scene.control.Alert;
+import javafx.scene.control.Button;
 import javafx.scene.control.ListView;
 import javafx.scene.control.TextField;
+import javafx.stage.Stage;
+import seng202.group9.Controller.DataException;
 import seng202.group9.Controller.Dataset;
 
 import java.util.*;
@@ -22,11 +26,14 @@ public class DatasetController extends Controller{
     ListView datasetView;
     @FXML
     TextField datasetName;
+    @FXML
+    Button openDataset;
     Dataset curDataset = null;
     ObservableList<Dataset> datasetList = observableArrayList();
 
     public void load() {
         curDataset = getParent().getCurrentDataset();
+        loadTable();
     }
 
     public void loadTable(){
@@ -38,13 +45,35 @@ public class DatasetController extends Controller{
     public void deleteDataset(){
         Dataset datasetToDelete = (Dataset) datasetView.getSelectionModel().getSelectedItem();
         getParent().deleteDataset(datasetToDelete);
+        loadTable();
     }
 
     public void addDataset(){
-
+        String name = datasetName.getText();
+        if (!name.equals("") && name != null) {
+            try {
+                getParent().createDataset(name);
+            } catch (DataException e) {
+                Alert alert = new Alert(Alert.AlertType.ERROR);
+                alert.setTitle("Dataset Creation Error");
+                alert.setHeaderText("Error creating Dataset.");
+                alert.setContentText(e.getMessage());
+                alert.showAndWait();
+            }
+        }else{
+            Alert alert = new Alert(Alert.AlertType.ERROR);
+            alert.setTitle("Dataset Creation Error");
+            alert.setHeaderText("Error creating Dataset.");
+            alert.setContentText("Dataset Name Cannot be Empty");
+            alert.showAndWait();
+        }
+        loadTable();
     }
 
     public void openDataset(){
-
+        Dataset datasetToOpen = (Dataset) datasetView.getSelectionModel().getSelectedItem();
+        getParent().setCurrentDataset(datasetToOpen);
+        loadTable();
+        ((Stage) openDataset.getScene().getWindow()).close();
     }
 }
diff --git a/src/main/resources/dataset_editor.fxml b/src/main/resources/dataset_editor.fxml
index 9e2f29c..a43b40c 100644
--- a/src/main/resources/dataset_editor.fxml
+++ b/src/main/resources/dataset_editor.fxml
@@ -22,7 +22,7 @@
          <contextMenu>
             <ContextMenu>
               <items>
-                <MenuItem fx:id="deleteBtn" mnemonicParsing="false" onAction="#deleteDataset" text="Unspecified Action" />
+                <MenuItem fx:id="deleteBtn" mnemonicParsing="false" onAction="#deleteDataset" text="Delete Dataset" />
               </items>
             </ContextMenu>
          </contextMenu>
@@ -34,7 +34,7 @@
             <Font size="18.0" />
          </font>
       </Label>
-      <Button mnemonicParsing="false" onAction="#openDataset" prefHeight="25.0" prefWidth="785.0" text="Open" GridPane.columnSpan="2" GridPane.halignment="CENTER" GridPane.rowIndex="3" />
+      <Button fx:id="openDataset" mnemonicParsing="false" onAction="#openDataset" prefHeight="25.0" prefWidth="785.0" text="Open" GridPane.columnSpan="2" GridPane.halignment="CENTER" GridPane.rowIndex="3" />
    </children>
    <padding>
       <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />