２日目 段階６ 小澤

em-oop/src/EmployeeData.java

@@ -7,9 +7,24 @@ public class EmployeeData {
 	private String password;
 	private String idDepartment;
 
-	public void showInfo() {
+	@Override
-		System.out.println(getIdEmployee() + "\t" + getNmEmployee() + "　" + getKnEmployee() + "\t" + getMailAddress()
+	public String toString() {
-				+ "\t" + getPassword() + "\t" + getIdDepartment());
+		return getIdEmployee() + "\t" + getNmEmployee() + "　" + getKnEmployee() + "\t" + getMailAddress()
+				+ "\t" + getPassword() + "\t" + getIdDepartment();
+	}
+
+	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() {
@@ -35,13 +50,13 @@ public class EmployeeData {
 	public void setKnEmployee(String knEmployee) {
 		this.knEmployee = knEmployee;
 	}
-	
+
 	public String getMailAddress() {
 		return this.mailAddress;
 	}
-	
+
 	public void setMailAddress(String mailAddress) {
-		this.mailAddress=mailAddress;
+		this.mailAddress = mailAddress;
 	}
 
 	public String getPassword() {
@@ -59,7 +74,5 @@ public class EmployeeData {
 	public void setIdDepartment(String idDepartment) {
 		this.idDepartment = idDepartment;
 	}
-	
-	
 
 }

em-oop/src/Main.java

@@ -2,20 +2,21 @@
 public class Main {
 	public static void main(String[] args) {
 		EmployeeData[] employee = new EmployeeData[5];
-		employee[0] = new EmployeeData();
+		employee[0] = new EmployeeData("10000","山田龍也","ヤマダタツヤ","yamada@hoge.jp","aaa","10");
 		employee[1] = new EmployeeData();
 		employee[2] = new EmployeeData();
 		employee[3] = new EmployeeData();
 		employee[4] = new EmployeeData();
 		
 		
-		employee[0].setIdEmployee("10000");
-		employee[0].setNmEmployee("山田龍也");
-		employee[0].setKnEmployee("ヤマダタツヤ");
-		employee[0].setMailAddress("yamada@hoge.jp");
-		employee[0].setPassword("aaa");
-		employee[0].setIdDepartment("10");
 		
+//		employee[0].setIdEmployee("10000");
+//		employee[0].setNmEmployee("山田龍也");
+//		employee[0].setKnEmployee("ヤマダタツヤ");
+//		employee[0].setMailAddress("yamada@hoge.jp");
+//		employee[0].setPassword("aaa");
+//		employee[0].setIdDepartment("10");
+//		
 		employee[1].setIdEmployee("10001");
 		employee[1].setNmEmployee("高橋準");
 		employee[1].setKnEmployee("タカハシジュン");
@@ -46,7 +47,7 @@ public class Main {
 //		
 		
 		for(int i=0;i<5;i++) {
-			employee[i].showInfo();
+			System.out.println(employee[i]);
 		}