task2909. Рефакторинг 9

Author: SkyrocketStan

3.JavaMultithreading/src/com/javarush/task/task29/task2909/human/BloodGroup.java

@@ -0,0 +1,30 @@
+package com.javarush.task.task29.task2909.human;
+
+/** @author Stanislav Rakitov */
+public class BloodGroup {
+  private final int code;
+
+  private BloodGroup(int code) {
+    this.code = code;
+  }
+
+  public static BloodGroup first() {
+    return new BloodGroup(1);
+  }
+
+  public static BloodGroup second() {
+    return new BloodGroup(2);
+  }
+
+  public static BloodGroup third() {
+    return new BloodGroup(3);
+  }
+
+  public static BloodGroup fourth() {
+    return new BloodGroup(4);
+  }
+
+  public int getCode() {
+    return code;
+  }
+}

3.JavaMultithreading/src/com/javarush/task/task29/task2909/human/Human.java

@@ -4,93 +4,77 @@
 import java.util.Collections;
 import java.util.List;
 
-public class Human implements Alive{
-    private static int nextId = 0;
-    private int id;
-    protected int age;
-    protected String name;
-
-    protected int[] size;
-
-    public static final int FIRST = 1;
-    public static final int SECOND = 2;
-    public static final int THIRD = 3;
-    public static final int FOURTH = 4;
-    private int bloodGroup;
-    private List<Human> children = new ArrayList<>();
-
-    public void setBloodGroup(int code) {
-        bloodGroup = code;
-    }
-
-    public int getBloodGroup() {
-        return bloodGroup;
-    }
-
-//    public Human(boolean isSoldier) {
-//        this.isSoldier = isSoldier;
-//        this.id = nextId;
-//        nextId++;
-//    }
-
-    public int getAge() {
-        return age;
-    }
-
-    public void setAge(int age) {
-        this.age = age;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-
-    public List<Human> getChildren() {
-        return Collections.unmodifiableList(children);
-//        return children;
-    }
-
-
-//    public void setChildren(List<Human> children) {
-//        this.children = children;
-//    }
-
-    public void addChild(Human child){
-        children.add(child);
-    }
-
-    public void removeChild(Human child){
-        children.remove(child);
-    }
-
-    public Human(String name, int age) {
-        this.age = age;
-        this.name = name;
-    }
-
-    public int getId() {
-        return id;
-    }
-
-    public void printSize() {
-        System.out.println("Рост: " + size[0] + " Вес: " + size[1]);
-    }
-
-    @Override
-    public void live() {
-
-    }
-
-    public void printData() {
-        System.out.println(getPosition() + ": " + name);
-    }
-
-    public String getPosition(){
-        return "Человек";
-    }
-}
+public class Human implements Alive {
+  private static int nextId = 0;
+  protected int age;
+  protected String name;
+  protected Size size;
+  private int id;
+  private BloodGroup bloodGroup;
+  private List<Human> children = new ArrayList<>();
+
+  public Human(String name, int age) {
+    this.age = age;
+    this.name = name;
+  }
+
+  public BloodGroup getBloodGroup() {
+    return bloodGroup;
+  }
+
+  public void setBloodGroup(BloodGroup bloodGroup) {
+    this.bloodGroup = bloodGroup;
+  }
+
+  public int getAge() {
+    return age;
+  }
+
+  public void setAge(int age) {
+    this.age = age;
+  }
+
+  public String getName() {
+    return name;
+  }
+
+  public void setName(String name) {
+    this.name = name;
+  }
+
+  public List<Human> getChildren() {
+    return Collections.unmodifiableList(children);
+  }
+
+  public void addChild(Human child) {
+    children.add(child);
+  }
+
+  public void removeChild(Human child) {
+    children.remove(child);
+  }
+
+  public int getId() {
+    return id;
+  }
+
+  public void printSize() {
+    System.out.println("Рост: " + size.height + " Вес: " + size.weight);
+  }
+
+  @Override
+  public void live() {}
+
+  public void printData() {
+    System.out.println(getPosition() + ": " + name);
+  }
+
+  public String getPosition() {
+    return "Человек";
+  }
+
+  public class Size {
+    public int height;
+    public int weight;
+  }
+}

3.JavaMultithreading/src/com/javarush/task/task29/task2909/human/Student.java

@@ -12,8 +12,6 @@ public class Student extends UniversityPerson {
 
     public Student(String name, int age, double averageGrade) {
         super(name, age);
-//        this.name = name;
-//        this.age = age;
         this.averageGrade = averageGrade;
     }
 
@@ -24,16 +22,9 @@ public void live() {
     public void learn() {
     }
 
-//    public void incAverageGradeBy01() {
-//        averageGrade += 0.1;
-//    }
-//
-//    public void incAverageGradeBy02() {
-//        averageGrade += 0.2;
-//    }
-
     public void incAverageGrade(double delta){
-        averageGrade += delta;
+        setAverageGrade(getAverageGrade() + delta);
+//        averageGrade += delta;
     }
 
     public void setCourse(int value){

3.JavaMultithreading/src/com/javarush/task/task29/task2909/human/Worker.java

@@ -2,7 +2,16 @@
 
 public class Worker extends Human{
     private double salary;
-    public String company;
+
+    public String getCompany() {
+        return company;
+    }
+
+    public void setCompany(String company) {
+        this.company = company;
+    }
+
+    private String company;
 
     public Worker(String name, int age) {
         super(name, age);