diff --git a/em-oop/src/EmployeeData.java b/em-oop/src/EmployeeData.java index 6cca5b7..7f36691 100644 --- a/em-oop/src/EmployeeData.java +++ b/em-oop/src/EmployeeData.java @@ -5,6 +5,22 @@ public class EmployeeData { private String knEmployee; private String mailAddress; private String password; + private String idDepartment; + + public EmployeeData() { + + } + + 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); + } + public String getIdEmployee() { return idEmployee; } @@ -53,11 +69,10 @@ public class EmployeeData { this.idDepartment = idDepartment; } - private String idDepartment; - public void showInfo() { - System.out.println(this.getIdEmployee() + "\t" + this.getNmEmployee() + "\t" + this.getKnEmployee() + "\t" + this.getMailAddress() + "\t" + this.getPassword() + "\t" + this.getIdDepartment()); - + System.out.println(this.getIdEmployee() + "\t" + this.getNmEmployee() + "\t" + this.getKnEmployee() + "\t" + + this.getMailAddress() + "\t" + this.getPassword() + "\t" + this.getIdDepartment()); + } } \ No newline at end of file diff --git a/em-oop/src/Main.java b/em-oop/src/Main.java index b992bae..74b771c 100644 --- a/em-oop/src/Main.java +++ b/em-oop/src/Main.java @@ -2,54 +2,18 @@ public class Main { public static void main(String[] args) { EmployeeData[] employees = new EmployeeData[5]; - - employees[0] = new EmployeeData(); - employees[1] = new EmployeeData(); - employees[2] = new EmployeeData(); - employees[3] = new EmployeeData(); - employees[4] = 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].setIdEmployee ("10001"); - employees[1].setNmEmployee ("高橋準"); - employees[1].setKnEmployee ("タカハシジュン"); - employees[1].setMailAddress ("jtaka@hoge.jp"); - employees[1].setPassword ("bbb"); - employees[1].setIdDepartment ("10"); - - 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].setIdEmployee ("10003"); - employees[3].setNmEmployee ("丸戸章介"); - employees[3].setKnEmployee("マルトショウスケ"); - employees[3].setMailAddress ("marusyo@hoge.jp"); - employees[3].setPassword ("ddd"); - employees[3].setIdDepartment ("12"); - - 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("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"); + for (int i = 0; i < employees.length; i++) { employees[i].showInfo(); - + } - + } }