diff --git a/em-oop/src/EmployeeData.java b/em-oop/src/EmployeeData.java index 7de2bd4..560e4a3 100644 --- a/em-oop/src/EmployeeData.java +++ b/em-oop/src/EmployeeData.java @@ -8,67 +8,54 @@ public class EmployeeData { private String password;//パスワード private String idDepartment;//部署ID - public String getIdEmployee() { return idEmployee; } - public void setIdEmployee(String idEmployee) { this.idEmployee = idEmployee; } - public String getNmEmployee() { return nmEmployee; } - public void setNmEmployee(String nmEmployee) { this.nmEmployee = nmEmployee; } - public String getKnEmployee() { return knEmployee; } - public void setKnEmployee(String knEmployee) { this.knEmployee = knEmployee; } - public String getMailAddress() { return mailAddress; } - public void setMailAddress(String mailAddress) { this.mailAddress = mailAddress; } - public String getPassword() { return password; } - public void setPassword(String password) { this.password = password; } - public String getIdDepartment() { return idDepartment; } - public void setIdDepartment(String idDepartment) { this.idDepartment = idDepartment; } - //メソッド追加 void showInfo() { System.out.println(getIdEmployee()); @@ -78,5 +65,19 @@ public class EmployeeData { System.out.println(getPassword()); System.out.println(getIdDepartment()); } -} + //コンストラクタ追加(引数なし) + public EmployeeData() { + } + + //6つ引数持ちコンストラクタ追加 + public EmployeeData(String idEmployee, String nmEmployee, String knEmployee, String mailAddress, String password, + String idDepartment) { + this.setIdEmployee(idEmployee); + this.setNmEmployee(nmEmployee); + this.setKnEmployee(knEmployee); + this.setMailAddress(mailAddress); + this.setPassword(password); + this.setIdDepartment(idDepartment); + } +} diff --git a/em-oop/src/Main.java b/em-oop/src/Main.java index ab33223..7a1bf61 100644 --- a/em-oop/src/Main.java +++ b/em-oop/src/Main.java @@ -9,41 +9,47 @@ public class Main { EmployeeData[] employees = new EmployeeData[5]; //インスタンス代入 - employees[0] = new EmployeeData(); - employees[0].setIdEmployee("10000"); - employees[0].setNmEmployee("山田龍也"); - employees[0].setKnEmployee("ヤマダタツヤ"); - employees[0].setMailAddress("yamada@hoge.jp"); - employees[0].setPassword("aaa"); - employees[0].setIdDepartment("10"); - employees[1] = new EmployeeData(); - employees[1].setIdEmployee("10001"); - employees[1].setNmEmployee("高橋準"); - employees[1].setKnEmployee("タカハシジュン"); - employees[1].setMailAddress("jtaka@hoge.jp"); - employees[1].setPassword("bbb"); - employees[1].setIdDepartment("10"); - employees[2] = new EmployeeData(); - employees[2].setIdEmployee("10002"); - employees[2].setNmEmployee("麻枝史明"); - employees[2].setKnEmployee("マエダフミアキ"); - employees[2].setMailAddress("fmak@hoge.jp"); - employees[2].setPassword("ccc"); - employees[2].setIdDepartment("11"); - employees[3] = new EmployeeData(); - employees[3].setIdEmployee("10003"); - employees[3].setNmEmployee("丸戸章介"); - employees[3].setKnEmployee("マルトショウスケ"); - employees[3].setMailAddress("marusyo@hoge.jp"); - employees[3].setPassword("ddd"); - employees[3].setIdDepartment("12"); - employees[4] = new EmployeeData(); - employees[4].setIdEmployee("10004"); - employees[4].setNmEmployee("三宅武"); - employees[4].setKnEmployee("ミヤケタケシ"); - employees[4].setMailAddress("miya@hoge.jp"); - employees[4].setPassword("eee"); - employees[4].setIdDepartment("13"); + // employees[0] = new EmployeeData(); + // employees[0].setIdEmployee("10000"); + // employees[0].setNmEmployee("山田龍也"); + // employees[0].setKnEmployee("ヤマダタツヤ"); + // employees[0].setMailAddress("yamada@hoge.jp"); + // employees[0].setPassword("aaa"); + // employees[0].setIdDepartment("10"); + // employees[1] = new EmployeeData(); + // employees[1].setIdEmployee("10001"); + // employees[1].setNmEmployee("高橋準"); + // employees[1].setKnEmployee("タカハシジュン"); + // employees[1].setMailAddress("jtaka@hoge.jp"); + // employees[1].setPassword("bbb"); + // employees[1].setIdDepartment("10"); + // employees[2] = new EmployeeData(); + // employees[2].setIdEmployee("10002"); + // employees[2].setNmEmployee("麻枝史明"); + // employees[2].setKnEmployee("マエダフミアキ"); + // employees[2].setMailAddress("fmak@hoge.jp"); + // employees[2].setPassword("ccc"); + // employees[2].setIdDepartment("11"); + // employees[3] = new EmployeeData(); + // employees[3].setIdEmployee("10003"); + // employees[3].setNmEmployee("丸戸章介"); + // employees[3].setKnEmployee("マルトショウスケ"); + // employees[3].setMailAddress("marusyo@hoge.jp"); + // employees[3].setPassword("ddd"); + // employees[3].setIdDepartment("12"); + // employees[4] = new EmployeeData(); + // employees[4].setIdEmployee("10004"); + // employees[4].setNmEmployee("三宅武"); + // employees[4].setKnEmployee("ミヤケタケシ"); + // employees[4].setMailAddress("miya@hoge.jp"); + // employees[4].setPassword("eee"); + // employees[4].setIdDepartment("13"); + //5段階目書き換え + employees[0] = new EmployeeData("10000", "山田龍也", "ヤマダタツヤ", "yamada@hoge.jp", "aaa", "10"); + employees[1] = new EmployeeData("10001", "高橋準", "タカハシジュン", "jtaka@hoge.jp", "bbb", "10"); + employees[2] = new EmployeeData("10002", "麻枝文明", "マエダフミアキ", "fmak@hoge.jp", "ccc", "11"); + employees[3] = new EmployeeData("10003","丸戸章介","マルトショウスケ","marusyo@hoge.jp","ddd","12"); + employees[4] = new EmployeeData("10004","三宅武","ミヤケタケシ","miya@hoge.jp","eee","13"); //各フィールド代入 //employee.idEmployee = "10000"; //employee.nmEmployee = "山田龍也";