Code updated

Author: suren-rjs

AirTrafficController/src/AirTrafficControl.java

@@ -54,6 +54,7 @@ public void getChoice() {
  runWays.forEach(System.out::println);
  break;
  case 5:
+ System.out.println("Exiting...");
  System.exit(0);
  }
  }
@@ -64,18 +65,20 @@ private void getAndAllocate() {
  Flight getFlight =
  flights.stream().filter(f -> f.flightName.equals(flightName)).findFirst().orElse(null);
  if (getFlight != null) {
- System.out.println("Enter weight of flight(in tons):");
- flightWeight = sc.nextInt();
- compTime = getFlight.computeTime(flightWeight);
- checkAndAssignRunWay();
+ if (!getFlight.isRunwayAllocated){
+ System.out.println("Enter weight of flight(in tons):");
+ flightWeight = sc.nextInt();
+ compTime = getFlight.computeTime(flightWeight);
+ checkAndAssignRunWay(getFlight);
+ } else System.out.println("--> Runway already allocated for this flight\n");
  } else System.out.println("Flight doesn't authorised");
  }
 
- public void checkAndAssignRunWay() {
+ public void checkAndAssignRunWay(Flight selectedFlight) {
  RunWay selectedRunWay =
  runWays.stream().filter(r -> compTime <= r.time && r.status).findFirst().orElse(null);
  if (selectedRunWay != null) {
- Request r = new Request(flightName, flightWeight, cho, compTime, selectedRunWay);
+ Request r = new Request(flightName, flightWeight, cho, compTime, selectedRunWay, selectedFlight);
  r.start();
  try {
  Thread.sleep(500);

AirTrafficController/src/Flight.java

@@ -2,6 +2,7 @@ class Flight {
  String flightName;
  int maxWeight;
  int allottedTime;
+ boolean isRunwayAllocated = false;
 
  Flight(String fName, int maxWeight, int timeHalt) {
  this.flightName = fName;

AirTrafficController/src/Request.java

@@ -5,17 +5,21 @@ class Request extends Thread {
 
  String type;
  RunWay runWay;
+ Flight allottedFlight;
 
- public Request(String aName, int weightA, String cho, int compTime, RunWay rw) {
- this.requestedFlight = aName;
- this.flightWeight = weightA;
- this.runWay = rw;
- this.coolTime = compTime;
- this.type = cho;
+ public Request(String flightName, int weight, String requestType, int coolTime, RunWay runWay, Flight selectedFlight) {
+ this.requestedFlight = flightName;
+ this.flightWeight = weight;
+ this.runWay = runWay;
+ this.coolTime = coolTime;
+ this.type = requestType;
+ this.allottedFlight = selectedFlight;
  }
 
  public void run() {
  runWay.status = false;
+ runWay.allottedFlight = allottedFlight;
+ allottedFlight.isRunwayAllocated = true;
  try {
  System.out.println(
  "---------------------------------------------------------------------------------");
@@ -28,6 +32,8 @@ public void run() {
  "---------------------------------------------------------------------------------");
  Thread.sleep(1000L * coolTime);
  runWay.status = true;
+ runWay.allottedFlight = null;
+ allottedFlight.isRunwayAllocated = false;
  } catch (Exception ignored) {
  }
  }

AirTrafficController/src/RunWay.java

@@ -3,10 +3,13 @@ class RunWay {
  int time;
  boolean status;
 
+ Flight allottedFlight;
+
  RunWay(String name, int time, boolean status) {
  this.name = name;
  this.time = time;
  this.status = status;
+ this.allottedFlight = null;
  }
 
  @Override