diff --git a/em-oop/src/EmployeeData.java b/em-oop/src/EmployeeData.java index 0cbdc7c..16c224b 100644 --- a/em-oop/src/EmployeeData.java +++ b/em-oop/src/EmployeeData.java @@ -40,6 +40,8 @@ public class EmployeeData { } public void setIdEmployee(String idEmployee) { + if (!check(idEmployee, "社員ID")) + return; this.idEmployee = idEmployee; } @@ -48,10 +50,8 @@ public class EmployeeData { } public void setNmEmployee(String nmEmployee) { - if (nmEmployee == null || nmEmployee.strip().length() == 0) { - System.out.println("社員名が空のため設定できませんでした"); + if (!check(nmEmployee, "社員名")) return; - } this.nmEmployee = nmEmployee; } @@ -90,4 +90,12 @@ public class EmployeeData { public static int getEmpCount() { return empCount; } + + private boolean check(String str, String stringName) { + if (str == null || str.strip().length() == 0) { + System.out.println(stringName + "が空のため設定できませんでした"); + return false; + } + return true; + } } diff --git a/em-oop/src/Main.java b/em-oop/src/Main.java index bdb4f4d..ff9ffd7 100644 --- a/em-oop/src/Main.java +++ b/em-oop/src/Main.java @@ -65,6 +65,11 @@ public class Main { emp.setNmEmployee("   "); System.out.println(emp); + System.out.println(); + + EmployeeData emptyEmployee = new EmployeeData("", "", "", "", "", ""); + System.out.println(emptyEmployee); + } }