diff --git a/em-oop/src/Main.java b/em-oop/src/Main.java
index 56b233c..1a0e1a5 100644
--- a/em-oop/src/Main.java
+++ b/em-oop/src/Main.java
@@ -14,15 +14,18 @@ public class Main {
 		//			employees[1] = new Employee;
 
 		employees[0] = new EmployeeData();
-		employees[0].setIdEmployee("1000");
-		employees[0].setNmEmployee("山田龍也");
-		employees[0].setKnEmployee("ヤマダタツヤ");
-		employees[0].setMailAddress("yamada@hoge.jp");
-		employees[0].setPassword("aaa");
-		employees[0].setIdDepartment("10");
+		
+		EmployeeData employee = new EmployeeData("10000", "山田龍也", "ヤマダタツヤ", "yamada@hoge.jp", "aaa", "10");
+				
+//		employees[0].setIdEmployee("1000");                        //private　後　に使用する！！
+//		employees[0].setNmEmployee("山田龍也");
+//		employees[0].setKnEmployee("ヤマダタツヤ");
+//		employees[0].setMailAddress("yamada@hoge.jp");
+//		employees[0].setPassword("aaa");
+//		employees[0].setIdDepartment("10");
 		
 				
-//		employees[0].idEmployee = "1000"; //段階5の分に　s[0]　足した   //priveteにする前に使用！！！！！！
+//		employees[0].idEmployee = "1000"; //段階5の分に　s[0]　足した   //privete　前　に使用！！！！！！
 //		employees[0].nmEmployee = "山田龍也";
 //		employees[0].knEmployee = "ヤマダタツヤ";
 //		employees[0].mailAddress = "yamada@hoge.jp";
@@ -31,12 +34,14 @@ public class Main {
 
 		//		
 		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");
+		EmployeeData employee1 = new EmployeeData("10000", "高橋準", "タカハシジュン", "jtaka@hoge.jp", "bbb", "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[1].idEmployee = "10001";
 //		employees[1].nmEmployee = "高橋準";
@@ -46,14 +51,16 @@ public class Main {
 //		employees[1].idDepartment = "10";
 		
 		
-		//各employee[]をコメントアウトしていたからエラー！　employeeに何の箱を入れるかを表記		
-		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[2] = new EmployeeData();//各employee[]をコメントアウトしていたからエラー！　employeeに何の箱を入れるかを表記
+		EmployeeData employee2 = new EmployeeData("10002", "麻枝文明", "マエダフミアキ", "fmak@hoge.jp", "ccc", "11");
+				
+//		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[2].idEmployee = "10002";
 //		employees[2].nmEmployee = "麻枝文明";
@@ -61,14 +68,16 @@ public class Main {
 //		employees[2].mailAddress = "fmak@hoge.jp";
 //		employees[2].password = "ccc";
 //		employees[2].idDepartment = "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");
+		EmployeeData employee3 = new EmployeeData("10003", "丸戸章介", "マルトショウスケ", "marusyo@hoge.jp", "ddd", "12");
+		
+//		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[3].idEmployee = "10003";
 //		employees[3].nmEmployee = "丸戸章介";
@@ -76,14 +85,16 @@ public class Main {
 //		employees[3].mailAddress = "marusyo@hoge.jp";
 //		employees[3].password = "ddd";
 //		employees[3].idDepartment = "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");
+		EmployeeData employee4 = new EmployeeData("10004", "三宅武", "ミヤケタケシ", "miya@hoge.jp", "eee", "13");
+		
+//		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[4].idEmployee = "10004";
 //		employees[4].nmEmployee = "三宅武";
@@ -92,11 +103,17 @@ public class Main {
 //		employees[4].password = "eee";
 //		employees[4].idDepartment = "13";
 
-		employees[0].showinfo();
-		employees[1].showinfo();
-		employees[2].showinfo();
-		employees[3].showinfo();
-		employees[4].showinfo();
+		employee.showinfo();
+		employee1.showinfo();
+		employee2.showinfo();
+		employee3.showinfo();
+		employee4.showinfo();
+		
+//		employees[0].showinfo();
+//		employees[1].showinfo();
+//		employees[2].showinfo();
+//		employees[3].showinfo();
+//		employees[4].showinfo();
 
 		//			System.out.println(employee);
 		//			System.out.println(idEmployee);