 Liam Beckett
|
9c594fd474
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# src/main/java/seng202/group9/GUI/MenuController.java
|
2016-09-13 16:42:33 +12:00 |
|
|
Liam Beckett
|
3e5b793cb2
|
Trying to fix the merge conflict
|
2016-09-13 16:39:22 +12:00 |
|
|
Liam Beckett
|
a46609b0b2
|
Begun work on the flight data parser, committing changes and merging in order to add another feature.
|
2016-09-13 16:24:43 +12:00 |
|
 YaFedImYaEatIm
|
6f14fc48f0
|
Added Raw Data loader for Airline
|
2016-09-13 16:23:27 +12:00 |
|
|
YaFedImYaEatIm
|
d7ddf99842
|
Added Sample Loading for the GUI
|
2016-09-13 16:16:24 +12:00 |
|
|
Liam Beckett
|
b7674fc8ea
|
Added in the Raw Flight Data page which now appears as a new window something again we will need to fix, have updated the menu.fxml document to include the tags for the two menu buttons for flight. Have realized that I will have to rework the GUI so that it scales better.
|
2016-09-13 13:46:25 +12:00 |
|
|
Liam Beckett
|
83ccf04d85
|
Implemented the GUI to open for the Flight Data Summary page however was unable to get it to open in the same stage so it opens in a new window. This is something to address later.
|
2016-09-13 13:23:44 +12:00 |
|
|
YaFedImYaEatIm
|
19ee2d2fff
|
Moved files around to get resources folder for maven
|
2016-09-12 14:40:18 +12:00 |
|
|
YaFedImYaEatIm
|
a0f5505e27
|
Added Route Parser to Dataset, Runtime takes a while optimisation may be needed
|
2016-09-12 10:38:08 +12:00 |
|
|
YaFedImYaEatIm
|
6f861400c2
|
Added Dataset Implementation as well as fixing a small bugs
|
2016-09-12 10:13:04 +12:00 |
|
|
YaFedImYaEatIm
|
ffa26bc944
|
Starting run time changed to run some of the Dataset Parser Functions
|
2016-09-12 10:12:13 +12:00 |
|
|
YaFedImYaEatIm
|
4c53609a45
|
Added Current Dataset Variable
|
2016-09-11 20:54:00 +12:00 |
|
|
YaFedImYaEatIm
|
bbb9a250ba
|
Parsers, Core Files and Dataset Controllers
|
2016-09-09 10:05:02 +12:00 |
|
|
YaFedImYaEatIm
|
5d70c087ac
|
Added Name Attribute and changed location to city as it was vague
|
2016-08-26 17:31:06 +12:00 |
|
|
YaFedImYaEatIm
|
af3a30011a
|
Added Javadoc to Airport and configured a few variable types.
|
2016-08-25 15:37:58 +12:00 |
|
|
YaFedImYaEatIm
|
eac9a931b6
|
Added Route Unit Tests and DataException Exceptions Class
|
2016-08-25 13:28:44 +12:00 |
|
|
YaFedImYaEatIm
|
c096cf07dc
|
Finished basic airline JUnit test
|
2016-08-22 18:36:10 +12:00 |
|
 Sunguin
|
ccb852e670
|
Completed the first draft GUI for airline, airport and route raw data viewers.
|
2016-08-19 17:36:18 +12:00 |
|
|
Liam
|
8111b9d35d
|
Added in the GUI template for the raw flight data view.
|
2016-08-19 12:29:02 +12:00 |
|
|
Liam
|
c3a6dd406b
|
Added in the GUI template for the flight data summary.
|
2016-08-19 12:28:36 +12:00 |
|
|
YaFedImYaEatIm
|
392246dfed
|
Added java doc to route as well as reordered the constructor to match openflights.org/data
|
2016-08-16 13:50:32 +12:00 |
|
|
YaFedImYaEatIm
|
215e626afc
|
Added Unit tests to Airline (Missing Add, Set and Get routes)
|
2016-08-15 22:54:13 +12:00 |
|
|
YaFedImYaEatIm
|
8d6c1badcb
|
Wrote java doc for Airline as well as fixed up constructor order to match the openflights layout. Lastly added a toString function which returns the name of the Airline.
|
2016-08-15 22:29:10 +12:00 |
|
|
YaFedImYaEatIm
|
9f7d53c192
|
Added setters for Core classes
|
2016-08-15 22:14:54 +12:00 |
|
|
YaFedImYaEatIm
|
09675d9d3f
|
Finished Core Skeleton
|
2016-08-12 13:55:12 +12:00 |
|
|
YaFedImYaEatIm
|
e1d72c318d
|
Partial Skeleton of the project
|
2016-08-12 12:54:16 +12:00 |
|
|
YaFedImYaEatIm
|
09aa6c97fc
|
Removed unecessary file hierachy
|
2016-08-01 13:38:31 +12:00 |
|