diff --git a/City.java b/City.java index 94664f9..92b9f05 100644 --- a/City.java +++ b/City.java @@ -4,13 +4,14 @@ public class City { private final String name; private final boolean hasAnAirport; - private final ArrayList destination; + private ArrayList destination; + private final ArrayList destinationS; //private final ArrayList placeList; - public City(String name, boolean hasAnAirport, ArrayList destination) { + public City(String name, boolean hasAnAirport, ArrayList destinationS) { this.name = name; this.hasAnAirport = hasAnAirport; - this.destination = destination; + this.destinationS = destinationS; } public String getName() { diff --git a/Main.java b/Main.java index e83eb9e..5c989d5 100644 --- a/Main.java +++ b/Main.java @@ -8,10 +8,30 @@ public static void main(String[] args) { System.out.println(i1.getDescription()); System.out.println(i2.getDescription()); - ArrayList listCity; + /*ArrayList listCity; + listCity.add("Paris"); listCity.add("Bordeaux"); listCity.add("Marseille"); + listCity.add("Lyon"); listCity.add("Lille"); listCity.add("Rennes"); + listCity.add("Strasbourg"); listCity.add("La Rochelle"); listCity.add("Nantes"); + listCity.add("Toulouse"); listCity.add("Montpellier"); listCity.add("Nice"); + listCity.add("Brest"); listCity.add("Dijon"); listCity.add("Reims"); + listCity.add("Le Havre"); listCity.add("Poitiers");*/ + ArrayList listCityUpdate = null; - //City poitiers = new City("Poitiers", false, listCity); - // listCity.add(poitiers); + + listCityUpdate.add("La Rochelle"); listCityUpdate.add("Nantes"); + City city1 = new City("Poitiers", false, listCityUpdate); + listCityUpdate.clear(); + listCityUpdate.add("Poitiers"); listCityUpdate.add("Bordeaux"); + City city2 = new City("La Rochelle", false, listCityUpdate); + listCityUpdate.clear(); + + + /* + poitiers.updateDestination() + si "bordeaux" == listCity[i].getName() + then poitiers.setDestination(listCity[i]); + poitiers.setDestination(listCity) + // listCity.add(poitiers);*/ } }