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

Update menu:

Browse Source 
- View buses instead of vehicles.
    - showVehicle option menu.

Signed-off-by: HeshamTB <hishaminv@gmail.com>
This commit is contained in:
HeshamTB 2020-12-02 03:01:01 +03:00
parent afb2b85643
commit 6dbe6a331f
Signed by: Hesham
GPG Key ID: 74876157D199B09E
1 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/MakkahCity.java
View File

@ -153,7 +153,7 @@ public class MakkahCity {
Scanner in = new Scanner(System.in); Scanner in = new Scanner(System.in);
System.out.println("\n"+currenttimeManager.getCurrentTime()+"\n"+ System.out.println("\n"+currenttimeManager.getCurrentTime()+"\n"+
"---------------------------\n" + "---------------------------\n" +
"[1] View Vehicles\n" + "[1] View Buses\n" +
"[2] View Streets\n" + "[2] View Streets\n" +
"[3] View Campaigns\n" + "[3] View Campaigns\n" +
"[4] View Routes\n" + "[4] View Routes\n" +
@ -163,9 +163,12 @@ public class MakkahCity {
String choice = in.next(); String choice = in.next();
//Split into methods? //Split into methods?
if (choice.equals("1")){ if (choice.equals("1")){
System.out.printf("choose from 0 to %d\n", listOfVehicles.size()-1); ArrayList<Vehicle> buses = new ArrayList<>();
for (Campaign campaign : listOfCampaigns)
buses.addAll(campaign.getVehicles());
System.out.printf("choose from 0 to %d\n", buses.size()-1);
String c = in.next(); String c = in.next();
Vehicle v = listOfVehicles.get(Integer.parseInt(c)); Vehicle v = buses.get(Integer.parseInt(c));
showVehicle(v); showVehicle(v);
//meybe add option here to go to members (Campaign, Street ...) //meybe add option here to go to members (Campaign, Street ...)
} }
@ -198,8 +201,19 @@ public class MakkahCity {
} }
private static void showVehicle(Vehicle vehicle) { private static void showVehicle(Vehicle vehicle) {
System.out.print("\n\n"+vehicle.getUID()+"\n"+vehicle.toString()+"\n\n"); String choice = "";
//TODO: Continue here for more options or return Scanner in = new Scanner(System.in);
Bus bus = (Bus) vehicle; //Should always be bus since 'View buses'
System.out.print("\n\n"+vehicle.getUID()+"\n");
System.out.println("---------------------------\n"+
"[1] Details\n" +
"[2] Get Campaign\n" +
"[3] Return");
choice = in.next();
if (choice.equals("1")) System.out.println(bus.toString());
if (choice.equals("2")) showCampaign(bus.getCampaign());
if (choice.equals("3")) return;
showVehicle(vehicle);
} }
private static void showCampaign(Campaign campaign){ private static void showCampaign(Campaign campaign){