Update Exercise

Author: SteffenLm

Company.java

@@ -2,24 +2,39 @@
 
 public class Company {
 
-  private String name;
-  private ArrayList<Employee> employees;
+  private final String name;
+  private final ArrayList<Employee> employees;
   private int numberOfEmployees;
 
   public Company(String name) {
     this.name = name;
     employees = new ArrayList<>();
+    numberOfEmployees = 0;
+  }
+
+  public String getName() {
+    return name;
+  }
+
+  public ArrayList<Employee> getEmployees() {
+    return employees;
+  }
+
+  public int getNumberOfEmployees() {
+    return numberOfEmployees;
   }
 
   public void addEmployee(Employee employee) {
     employees.add(employee);
     numberOfEmployees++;
   }
 
-  public void print() {
-    System.out.println(name + " (" + numberOfEmployees + " Mitarbeiter)");
-    for (Employee e : employees) {
-      e.print();
+  public String toString() {
+    String result = "";
+    result += name + " (" + numberOfEmployees + " Mitarbeiter)" + "\n";
+    for (Employee employee : employees) {
+      result += employee.toString() + "\n";
     }
+    return result;
   }
 }

Employee.java

@@ -1,13 +1,13 @@
 public class Employee {
 
-  private int employeeId;
-  private Person person;
-  private int salary;
+  private final int employeeId;
+  private final Person person;
+  private int salaryInEuro;
 
-  public Employee(int employeeId, Person person, int salary) {
+  public Employee(int employeeId, Person person, int salaryInEuro) {
     this.employeeId = employeeId;
     this.person = person;
-    this.salary = salary;
+    this.salaryInEuro = salaryInEuro;
   }
 
   public int getEmployeeId() {
@@ -18,11 +18,15 @@ public String getName() {
     return person.getName();
   }
 
-  public int getSalary() {
-    return salary;
+  public int getSalaryInEuro() {
+    return salaryInEuro;
   }
 
-  public void print() {
-    System.out.println(employeeId + " - " + getName() + " - " + salary + "€");
+  public void setSalaryInEuro(int salaryInEuro) {
+    this.salaryInEuro = salaryInEuro;
+  }
+
+  public String toString() {
+    return employeeId + " - " + getName() + " - " + salaryInEuro + "€";
   }
 }

Exercise.java

@@ -17,6 +17,6 @@ public static void main(String[] args) {
     company.addEmployee(new Employee(4, new Person("Peter Schneider"), 55000));
     company.addEmployee(new Employee(5, new Person("Miriam Albers"), 90000));
 
-    company.print();
+    System.out.println(company.toString());
   }
 }

Person.java

@@ -1,6 +1,6 @@
 public class Person {
 
-  private String name;
+  private final String name;
 
   public Person(String name) {
     this.name = name;