X-Git-Url: https://git.piment-noir.org/?p=Persons_Comparator.git;a=blobdiff_plain;f=src%2FPerson.java;h=f1409f52760d91eb57e59e7624a3af2a7304cbfa;hp=6fbdf6ac55a644af4baf0043d23f89c40b240d75;hb=9f1e899962a92c9c1b8d3713eca0524964465014;hpb=a9c1e3ed70af9286718689befc35aae0c2eeb49c diff --git a/src/Person.java b/src/Person.java index 6fbdf6a..f1409f5 100644 --- a/src/Person.java +++ b/src/Person.java @@ -12,6 +12,7 @@ public class Person implements Comparator { Person() { setFirstname(new Firstname()); setOrigin(new Origin()); + setCountry(new Country()); setPersonSize(new Size()); setWeight(new Weight()); setEye(new Eye()); @@ -21,6 +22,7 @@ public class Person implements Comparator { Person(String firstname, String country, Integer size, Integer weight, String colorEye) { setFirstname(new Firstname(firstname)); setOrigin(new Origin(country)); + setCountry(new Country(country)); setPersonSize(new Size(size)); setWeight(new Weight(weight)); setEye(new Eye(colorEye)); @@ -88,7 +90,7 @@ public class Person implements Comparator { return "Person{" + "firstname=" + firstname.getFirstname() + ", origin=" + origin.getCountry() + - ", country=" + country + + ", country=" + country.getName() + ", size=" + size.getSize() + ", weight=" + weight.getWeight() + ", eye=" + eye.getStrColor() + "(" + this.getEye().getColor().getRed() + "," + this.getEye().getColor().getGreen() + "," + this.getEye().getColor().getBlue() + ")" +