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

Made route RD display things in the table and added functionality to the add button

Browse Source
This commit is contained in:
Sunguin Peng
2016-09-15 13:57:56 +12:00
parent 8192c59bb4
commit ae522e14d3
10 changed files with 168 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/seng202/group9/Core/Route.java
+4 -4
View File
@@ -148,14 +148,14 @@ public class Route {
* returns the source airport of this route
* @return
*/
public String departsFrom(){
public String getDepartureAirport(){
return departureAirport;
}
/**
* returns the target airport of this route.
* @return
*/
public String arrivesAt(){
public String getArrivalAirport(){
return arrivalAirport;
}
@@ -164,8 +164,8 @@ public class Route {
*/
public void hasDuplicate(Route route) throws DataException{
//routeAirline + routeSourceAirport + routeArrvAirport + routeCodeShare + routeStops + routeEquip
if (route.getAirline().equals(this.airline) && route.departsFrom().equals(this.departureAirport)
&& route.arrivesAt().equals(this.arrivalAirport) && route.getCode().equals(this.codeShare)
if (route.getAirline().equals(this.airline) && route.getDepartureAirport().equals(this.departureAirport)
&& route.getArrivalAirport().equals(this.arrivalAirport) && route.getCode().equals(this.codeShare)
&& route.getStops() == this.stops && route.getEquipment().equals(this.equipment)){
throw new DataException("This Route already exists.");
}