Rearrange code.

[Persons_Comparator.git] / src / Person.java

diff --git a/src/Person.java b/src/Person.java
index 5d9d812924ec1daf2c66351c4f90272a397e7bce..6e5ff4012e13f44e14f3df3e023a51f58bca8f00 100644 (file)
--- a/src/Person.java
+++ b/src/Person.java
@@ -3,6 +3,7 @@ import java.util.Comparator;
 public class Person implements Comparator<Person> {
     private Firstname firstname;
     private Origin origin;
+    private Country country;
     private Size size;
     private Weight weight;
     private Eye eye;
@@ -11,74 +12,85 @@ public class Person implements Comparator<Person> {
     Person() {
         setFirstname(new Firstname());
         setOrigin(new Origin());
+        setCountry(new Country());
         setPersonSize(new Size());
         setWeight(new Weight());
         setEye(new Eye());
         setDistanceFromReference(0);
     }
 
-    Person(String firstname, String country, Integer size, Integer weight, String colorEye) {
+    Person(String firstname, String countryName, Integer size, Integer weight, String colorEye) {
         setFirstname(new Firstname(firstname));
-        setOrigin(new Origin(country));
+        setOrigin(new Origin(countryName));
+        setCountry(new Country(countryName));
         setPersonSize(new Size(size));
         setWeight(new Weight(weight));
         setEye(new Eye(colorEye));
         setDistanceFromReference(0);
     }
 
+    public Firstname getFirstname() {
+        return firstname;
+    }
+
     public void setFirstname(Firstname firstname) {
         this.firstname = firstname;
     }
 
-    public Firstname getFirstname() {
-        return firstname;
+    public Origin getOrigin() {
+        return origin;
     }
 
     public void setOrigin(Origin origin) {
         this.origin = origin;
     }
 
-    public Origin getOrigin() {
-        return origin;
+    public Country getCountry() {
+        return country;
     }
 
-    public void setPersonSize(Size size) {
-        this.size = size;
+    public void setCountry(Country country) {
+        this.country = country;
     }
 
     public Size getPersonSize() {
         return size;
     }
 
-    public void setWeight(Weight weight) {
-        this.weight = weight;
+    public void setPersonSize(Size size) {
+        this.size = size;
     }
 
     public Weight getWeight() {
         return weight;
     }
 
-    public void setEye(Eye eye) {
-        this.eye = eye;
+    public void setWeight(Weight weight) {
+        this.weight = weight;
     }
 
     public Eye getEye() {
         return eye;
     }
 
-    public void setDistanceFromReference(Integer distanceFromReference) {
-        this.distanceFromReference = distanceFromReference;
+    public void setEye(Eye eye) {
+        this.eye = eye;
     }
 
     public Integer getDistanceFromReference() {
         return distanceFromReference;
     }
 
+    public void setDistanceFromReference(Integer distanceFromReference) {
+        this.distanceFromReference = distanceFromReference;
+    }
+
     @Override
     public String toString() {
         return "Person{" +
                 "firstname=" + firstname.getFirstname() +
                 ", origin=" + origin.getCountry() +
+                ", country=" + country.getName() +
                 ", size=" + size.getSize() +
                 ", weight=" + weight.getWeight() +
                 ", eye=" + eye.getStrColor() + "(" + this.getEye().getColor().getRed() + "," + this.getEye().getColor().getGreen() + "," + this.getEye().getColor().getBlue() + ")" +
@@ -88,8 +100,8 @@ public class Person implements Comparator<Person> {
 
     public Integer distanceTo(Person person) {
         return this.getFirstname().distanceTo(person.getFirstname()) + this.getOrigin().distanceTo(person.getOrigin())
-                + this.getPersonSize().distanceTo(person.getPersonSize()) + this.getWeight().distanceTo(person.getWeight())
-                + this.getEye().distanceTo(person.getEye());
+                + this.getCountry().distanceTo(person.getCountry()) + this.getPersonSize().distanceTo(person.getPersonSize())
+                + this.getWeight().distanceTo(person.getWeight()) + this.getEye().distanceTo(person.getEye());
     }
 
     @Override