Hesham/Hajj-simulation
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Menu functions (Exit, Continue)

Browse Source
This commit is contained in:
HeshamTB 2020-11-27 20:04:23 +03:00
parent 4346b9348d
commit fc05264a46
Signed by: Hesham
GPG Key ID: 74876157D199B09E
2 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/InputListener.java
View File

@ -19,11 +19,6 @@ public class InputListener implements Runnable {
input = in.next(); input = in.next();
hasNew = true; hasNew = true;
} }
try {
Thread.sleep(500);
} catch (InterruptedException e) {
e.printStackTrace();
}
} }
System.out.println("Stopped input listener"); System.out.println("Stopped input listener");
} }

24
src/MakkahCity.java
View File

@ -152,6 +152,7 @@ public class MakkahCity {
lastDayTimeMan.step(Calendar.MINUTE, 1); lastDayTimeMan.step(Calendar.MINUTE, 1);
//for (int i = 0; i < 46; i++) System.out.print("\b"); //for (int i = 0; i < 46; i++) System.out.print("\b");
} }
inputListener.stop();
t.interrupt(); t.interrupt();
//TODO: print final report //TODO: print final report
} }
@ -160,17 +161,12 @@ public class MakkahCity {
String input = ""; String input = "";
if (inputListener.hasNew()){ if (inputListener.hasNew()){
input = inputListener.getInput(); input = inputListener.getInput();
if (input.equals("p")){ if (input.equals("m")){
System.out.println("PAUSED: "+ currenttimeManager.getCurrentTime()); System.out.println("PAUSED: "+ currenttimeManager.getCurrentTime());
inputListener.pause(); inputListener.pause();
startMenu(); startMenu();
inputListener.unpause(); inputListener.unpause();
} }
else if (input.equals("s")) {
inputListener.stop();
t.interrupt();
System.exit(0);
}
} }
} }
@ -180,10 +176,12 @@ public class MakkahCity {
"[1] View Vehicles\n" + "[1] View Vehicles\n" +
"[2] View Streets\n" + "[2] View Streets\n" +
"[3] View Campaigns\n" + "[3] View Campaigns\n" +
"[4] View Routes"); "[4] View Routes\n" +
"[5] Continue\n" +
"[6] Exit");
String chose = in.next(); String chose = in.next();
if (chose.equals("1")){ if (chose.equals("1")){
System.out.printf("choose from 0 to %d", listOfVehicles.size()-1); System.out.printf("choose from 0 to %d\n", listOfVehicles.size()-1);
String c = in.next(); String c = in.next();
Vehicle v = listOfVehicles.get(Integer.parseInt(c)); Vehicle v = listOfVehicles.get(Integer.parseInt(c));
//TODO: override toString() in vehicle then Bus. This will throw cast ex. //TODO: override toString() in vehicle then Bus. This will throw cast ex.
@ -191,7 +189,6 @@ public class MakkahCity {
"Arrived: %s Starting time: %s Arrive Time: %s\n", "Arrived: %s Starting time: %s Arrive Time: %s\n",
v.toString(), ((Bus)v).getCampaign().getUID(),v.getCurrentStreet().getName().name(), v.toString(), ((Bus)v).getCampaign().getUID(),v.getCurrentStreet().getName().name(),
v.getCurrentLocation(),v.isArrivedToDest(),v.getTimeStartedMoving(),v.getTimeOfArrival()); v.getCurrentLocation(),v.isArrivedToDest(),v.getTimeStartedMoving(),v.getTimeOfArrival());
startMenu();
} }
if (chose.equals("4")){ if (chose.equals("4")){
for (int i = 0; i < stdRoutes.length; i++){ for (int i = 0; i < stdRoutes.length; i++){
@ -199,6 +196,13 @@ public class MakkahCity {
} }
String c = in.next(); String c = in.next();
} }
if (chose.equals("5")) return;
if (chose.equals("6")) {
inputListener.stop();
t.interrupt();
System.exit(0);
}
startMenu();
} }
private static void clearDoneCivilVehicles() { private static void clearDoneCivilVehicles() {
@ -540,7 +544,7 @@ public class MakkahCity {
} }
report.append("\n"); report.append("\n");
} }
report.append("\n").append(getFinalRep()); report.append("\n").append(getFinalRep()).append("\nType m+Enter to view menu\n");
report.append("*************************"); report.append("*************************");
return report.toString(); return report.toString();
} }