From b0d903c164c86df79237b705e3fe397a250095b9 Mon Sep 17 00:00:00 2001
From: o-matsuda <26-o-matsuda-stellatecnica@it-college.co.jp>
Date: Tue, 15 Sep 2026 15:29:55 +0900
Subject: [PATCH] =?UTF-8?q?=E6=AE=B5=E9=9A=8E=EF=BC=95=E5=AE=8C=E4=BA=86?=
 =?UTF-8?q?=E3=81=97=E3=81=BE=E3=81=97=E3=81=9F=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 em-oop/src/EmployeeData.java | 29 ++++++++++------------
 em-oop/src/Main.java         | 47 +++++-------------------------------
 2 files changed, 19 insertions(+), 57 deletions(-)

diff --git a/em-oop/src/EmployeeData.java b/em-oop/src/EmployeeData.java
index 8704940..dc197f5 100644
--- a/em-oop/src/EmployeeData.java
+++ b/em-oop/src/EmployeeData.java
@@ -6,70 +6,67 @@ public class EmployeeData {
 	private String mailAddress;
 	private String password;
 	private String idDepartment;
-	
-	
+
 	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()+"\t"+getNmEmployee()+"\t"+getKnEmployee()+"\t"+getMailAddress()+"\t"+getPassword()+"\t"+getIdDepartment());
-		
+		System.out.println(getIdEmployee() + "\t" + getNmEmployee() + "\t" + 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);
 	}
 }
diff --git a/em-oop/src/Main.java b/em-oop/src/Main.java
index a23c6f5..8947298 100644
--- a/em-oop/src/Main.java
+++ b/em-oop/src/Main.java
@@ -4,47 +4,12 @@ public class Main {
 	public static void main(String[] args) {
 		EmployeeData[] employee = new EmployeeData[5];
 		
-		employee[0] = new EmployeeData();
-		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[1].setIdEmployee ("10001");
-		employee[1].setNmEmployee ("高橋準");
-		employee[1].setKnEmployee ("タカハシジュン");
-		employee[1].setMailAddress ("jtaka@hoge.jp");
-		employee[1].setPassword ("bbb");
-		employee[1].setIdDepartment ("11");
-		
-		employee[2].setIdEmployee ("10002");
-		employee[2].setNmEmployee ("麻枝史明");
-		employee[2].setKnEmployee ("マエダフミアキ");
-		employee[2].setMailAddress ("fmak@hoge.jp");
-		employee[2].setPassword ("ccc");
-		employee[2].setIdDepartment ("12");
-		
-		employee[3].setIdEmployee ("10003");
-		employee[3].setNmEmployee ("丸戸章介");
-		employee[3].setKnEmployee ("マルトショウスケ");
-		employee[3].setMailAddress ("marusyo@hoge.jp");
-		employee[3].setPassword ("ddd");
-		employee[3].setIdDepartment ("13");
-		
-		employee[4].setIdEmployee ("10004");
-		employee[4].setNmEmployee ("三宅武");
-		employee[4].setKnEmployee ("ミヤケタケシ");
-		employee[4].setMailAddress ("miya@hoge.jp");
-		employee[4].setPassword ("eee");
-		employee[4].setIdDepartment ("14");
-		
+		employee[0] = new EmployeeData("10000","山田龍也","ヤマダタツヤ","yamada@hoge.jp","aaa","10");
+		employee[1] = new EmployeeData("10001","高橋準","タカハシジュン","jtaka@hoge.jp","bbb","11");
+		employee[2] = new EmployeeData("10002","麻枝史明","マエダフミアキ","fmak@hoge.jp","ccc","12");
+		employee[3] = new EmployeeData("10003","丸戸章介","マルトショウスケ","marusyo@hoge.jp","ddd","13");
+		employee[4] = new EmployeeData("10004","三宅武","ミヤケタケシ","miya@hoge.jp","eee","14");
+			
 		
 		for (int i=0; i<=4; i++ ) {
 			employee[i].showInfo();