Campaign and new enums Mashier, Distrcit:

Update according to UML
   Set vehicles for camp
   new Constructor for camp

   Enum for District and Mashier. This will be set as endpoints
    for Streets, Routes or Campaigns.

Signed-off-by: HeshamTB <hishaminv@gmail.com>
This commit is contained in:
HeshamTB 2020-11-06 19:21:46 +03:00
parent d7cbd2910d
commit 8a4a7d8f29
3 changed files with 32 additions and 17 deletions

View File

@ -2,11 +2,10 @@ import java.util.Date;
public class Campaign { public class Campaign {
private int UID; private String UID;
private int numberOfPeople; //private int housingNumber;
private int housingNumber;
private String name; private String name;
private boolean local; private District hotelDistrict;
private Route housingToDestRoute; private Route housingToDestRoute;
private Route destToHousingRoute; private Route destToHousingRoute;
@ -17,24 +16,17 @@ public class Campaign {
private Date timeToLeaveToDest; private Date timeToLeaveToDest;
private Date timeToLeaveToHousing; private Date timeToLeaveToHousing;
public Campaign(int numberOfPeople, String name, Route housingToDestRoute, Route destToHousingRoute) { private static int numeberOfCampains;
setNumberOfPeople(numberOfPeople);
public Campaign(String name, District hotelDistrict) {
numeberOfCampains++;
this.name = name; this.name = name;
this.housingToDestRoute = housingToDestRoute; this.hotelDistrict = hotelDistrict;
this.destToHousingRoute = destToHousingRoute; this.UID = String.format("%4d", numeberOfCampains);
} }
public Campaign(int numberOfPeople){ public Campaign(int numberOfPeople){
setNumberOfPeople(numberOfPeople);
}
public int getNumberOfPeople() {
return numberOfPeople;
}
public void setNumberOfPeople(int numberOfPeople) {
if (numberOfPeople > 0) this.numberOfPeople = numberOfPeople;
else throw new IllegalArgumentException("Negative number of people in camp");
} }
public Route getHousingToDestRoute() { public Route getHousingToDestRoute() {
@ -60,4 +52,16 @@ public class Campaign {
} }
return busses; return busses;
} }
public void setVehicles(Vehicle[] vehicles){
/*TODO
check if vehicles is not null then set vehicles.
*/
}
public void generateBusses(int number){
/*TODO
generate "number" of busses and set them to vehicles array.
*/
}
} }

5
src/District.java Normal file
View File

@ -0,0 +1,5 @@
public enum District {
ALAZIZIYA,
ALHIJRA,
ALMANSOOR
}

6
src/Mashier.java Normal file
View File

@ -0,0 +1,6 @@
public enum Mashier {
ARAFAT,
MENA,
ALHARAM,
MOZDALIFA
}