fanwuyang/SENG202
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://eng-git.canterbury.ac.nz/fwy13/SENG202

Browse Source
This commit is contained in:
Sunguin Peng
2016-09-15 16:54:24 +12:00
parent 33aafeb510 ddcb3f65a7
commit 0189cfbe1c
4 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
res/userdb.db
BIN
View File
Binary file not shown.
src/main/java/seng202/group9/Controller/App.java
+3 -3
View File
@@ -62,7 +62,7 @@ public class App extends Application
e.printStackTrace(); e.printStackTrace();
} }
/*
//testout single route adding //testout single route adding
try { try {
currentDataset.addRoute("D2", "MAC", "WIN", "Y", "0", "NOW"); currentDataset.addRoute("D2", "MAC", "WIN", "Y", "0", "NOW");
@@ -75,7 +75,7 @@ public class App extends Application
}catch (DataException e){ }catch (DataException e){
e.printStackTrace(); e.printStackTrace();
} }
/*
//testout single airline adding //testout single airline adding
try { try {
currentDataset.addAirline("Dota2", "Valve", "D2", "DOT", "Defence of the Ancients", "Steam", "Y"); currentDataset.addAirline("Dota2", "Valve", "D2", "DOT", "Defence of the Ancients", "Steam", "Y");
@@ -101,7 +101,7 @@ public class App extends Application
System.out.println(currentDataset.importRoute("res/Samples/Routes.txt")); System.out.println(currentDataset.importRoute("res/Samples/Routes.txt"));
} catch (DataException e) { } catch (DataException e) {
e.printStackTrace(); e.printStackTrace();
}*/ }
//testing out flight parser //testing out flight parser
try { try {
src/main/resources/flight_data_summary.fxml
+2
View File
@@ -14,6 +14,7 @@
<?import javafx.scene.shape.Rectangle?> <?import javafx.scene.shape.Rectangle?>
<?import javafx.scene.text.Font?> <?import javafx.scene.text.Font?>
<?import javafx.scene.text.Text?> <?import javafx.scene.text.Text?>
<?import javafx.scene.web.WebView?>
<VBox maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="800.0" prefWidth="800.0" xmlns="http://javafx.com/javafx/8.0.65" xmlns:fx="http://javafx.com/fxml/1" fx:controller="seng202.group9.GUI.FlightSummaryController"> <VBox maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="800.0" prefWidth="800.0" xmlns="http://javafx.com/javafx/8.0.65" xmlns:fx="http://javafx.com/fxml/1" fx:controller="seng202.group9.GUI.FlightSummaryController">
<children> <children>
@@ -63,6 +64,7 @@
</Pane> </Pane>
<Pane prefHeight="934.0" prefWidth="474.0" GridPane.columnIndex="1" GridPane.rowIndex="1"> <Pane prefHeight="934.0" prefWidth="474.0" GridPane.columnIndex="1" GridPane.rowIndex="1">
<children> <children>
<WebView prefHeight="431.0" prefWidth="310.0" />
<Rectangle arcHeight="5.0" arcWidth="5.0" fill="#0d93e0" height="432.0" layoutX="5.0" layoutY="-1.0" smooth="false" stroke="BLACK" strokeType="INSIDE" strokeWidth="0.0" width="305.0" /> <Rectangle arcHeight="5.0" arcWidth="5.0" fill="#0d93e0" height="432.0" layoutX="5.0" layoutY="-1.0" smooth="false" stroke="BLACK" strokeType="INSIDE" strokeWidth="0.0" width="305.0" />
</children> </children>
<padding> <padding>
src/main/resources/userdb.db
View File