3日分のミッション課題です。

.gitignore

@@ -25,4 +25,3 @@ hs_err_pid*
 replay_pid*
 
 /.metadata/
-/bin/

em-oop/src/BaseData.java

@@ -1,10 +1,9 @@
 
 public abstract class BaseData {
-
+	//3-4
 	public abstract String toString();
 
 	public abstract String toCSV();
 
 	public abstract String getPrimaryKeyValue();
-
 }

em-oop/src/BasicCheck1.java

@@ -2,13 +2,27 @@
 public class BasicCheck1 {
 
 	public static void main(String[] args) {
+		//1-1
+		//		Book book = new Book();
+		//		book.title = "吾輩は猫である";
+		//		book.author = "夏目漱石";
+		//		book.price = 800;
+		//		
+		//		System.out.println(book.title);
+		//		System.out.println(book.author);
+		//		System.out.println(book.price);
+		//1-1
 
+		//2-1
 		Book book1 = new Book();
+		System.out.println(book1.title);
+		System.out.println(book1.author);
+		System.out.println(book1.price);
+
 		Book book2 = new Book("銀河鉄道の夜", "宮沢賢治", 500);
-
+		System.out.println(book2.title);
-		System.out.println(book1.title + "\n" + book1.author + "\n" + book1.price);
+		System.out.println(book2.author);
-		System.out.println(book2.title + "\n" + book2.author + "\n" + book2.price);
+		System.out.println(book2.price);
-
+		//2-1
 	}
-
 }

em-oop/src/BasicCheck2.java

@@ -1,23 +1,24 @@
 
 public class BasicCheck2 {
+
 	public static void main(String[] args) {
+		//1-2
+		//		Student student = new Student();
+		//		student.studentId=1;
+		//		student.name="鈴木一郎";
+		//		
+		//		student.printProfile();
+		//1-2
 
+		//2-3
 		Student student1 = new Student(1, "鈴木一郎");
-        Student student2 = new Student(2, "田中花子");
-        Student student3 = new Student(3, "佐藤次郎");
-        
 		student1.printProfile();
+		Student student2 = new Student(2, "田中花子");
 		student2.printProfile();
+		Student student3 = new Student(3, "佐藤次郎");
 		student3.printProfile();
 
-		
-		Student.getStudentCount();
 		System.out.println("現在の生徒数:" + Student.getStudentCount() + "人");
-		
+		//2-3
-		
 	}
-		
-		
-		
-	
 }

em-oop/src/BasicCheck3.java

@@ -1,31 +1,19 @@
 
 public class BasicCheck3 {
 	public static void main(String[] args) {
+		//1-3
 		Item[] items = new Item[3];
-		items[0] = new Item();
+		items[0] = new Item("ノート", 120, 50);
-		items[1] = new Item();
+		items[1] = new Item("消しゴム", 80, 30);
-		items[2] = new Item();
+		items[2] = new Item("鉛筆", 60, 100);
 
-		items[0].setName("ノート");
+		for (int i = 0; i < 3; i++) {
-		items[1].setName("消しゴム");
-		items[2].setName("鉛筆");
-
-		items[0].setPrice(120);
-		items[1].setPrice(80);
-		items[2].setPrice(60);
-
-		items[0].setStock(50);
-		items[1].setStock(30);
-		items[2].setStock(100);
-
-		for (int i = 0; i < items.length; i++) {
 			items[i].sell(5);
-			System.out.println(items[i].getName() + " " + items[i].getPrice() + "円 (残り" + items[i].getStock() + "個) ");
+			//2-2
-			//			System.out.println("合計金額　" + items[i].totalPrice() + "円");
+			System.out.println(items[i].toString());
-			//			System.out.println();
+			//2-2
-
 		}
-
+		//1-3
 	}
 
 }

em-oop/src/Book.java

@@ -1,22 +1,22 @@
 
 public class Book {
-
+	//1-1
 	String title;
 	String author;
 	int price;
+	//1-1
 
+	//2-1
 	public Book() {
-		this.title = "タイトル未設定";
+		title = "タイトル未設定";
-		this.author = "著者未設定";
+		author = "著者未設定";
-		this.price = 0;
+		price = 0;
-
 	}
 
 	public Book(String title, String author, int price) {
 		this.title = title;
 		this.author = author;
 		this.price = price;
-
 	}
-
+	//2-1
 }

em-oop/src/Circle.java

@@ -15,6 +15,6 @@ public class Circle extends Shape {
 	@Override
 	public void showInfo() {
 		super.showInfo();
-		System.out.println("(半径：" + this.radius + ")");
+		System.out.println("(半径:" + this.radius + ")");
 	}
 }

em-oop/src/Day3Check1.java

@@ -1,8 +1,9 @@
 
 public class Day3Check1 {
+
 	public static void main(String[] args) {
-		Circle radius = new Circle(2);
+		Circle circle = new Circle(2);
-		radius.showInfo();
+		circle.showInfo();
-	}
+		}
 
 }

em-oop/src/Day3Check2.java

@@ -1,8 +1,8 @@
 
 public class Day3Check2 {
 	public static void main(String[] args) {
-		Rectangle rect = new Rectangle(3, 4);
+		Rectangle rectangle = new Rectangle(3, 4);
-		rect.showInfo();
+		rectangle.showInfo();
 
 		Greeting greeting = new JapaneseGreeting();
 		System.out.println(greeting.hello());

em-oop/src/DayCheck3.java

@@ -1,5 +1,6 @@
 
-public class Day3Check3 {
+public class DayCheck3 {
+
 	public static void main(String[] args) {
 		Shape shape1 = new Circle(2);
 		shape1.showInfo();

em-oop/src/DepartmentData.java

@@ -1,13 +1,29 @@
 
 public class DepartmentData extends BaseData {
-	private String idDepartment, nmDepartment;
+	//3-6
+	private String idDepartment;
+	private String nmDepartment;
 
-	public DepartmentData(String idDepartment,String nmDepartment) {
+	//3-6
-		this.setIdDepartment(idDepartment);
+	public DepartmentData(String idDepartment, String nmDepartment) {
-		this.setNmDepartment(nmDepartment);
+		this.idDepartment = idDepartment;
-		return; 
+		this.nmDepartment = nmDepartment;
-			}
+	}
 
+	@Override
+	public String toString() {
+		return getIdDepartment() + "\t" + getNmDepartment();
+	}
+
+	@Override
+	public String toCSV() {
+		return getIdDepartment() + "," + getNmDepartment();
+	}
+
+	@Override
+	public String getPrimaryKeyValue() {
+		return getIdDepartment();
+	}
 
 	public String getIdDepartment() {
 		return idDepartment;
@@ -24,16 +40,5 @@ public class DepartmentData extends BaseData {
 	public void setNmDepartment(String nmDepartment) {
 		this.nmDepartment = nmDepartment;
 	}
-	
+	//3-6
-	@Override
-	public String toString() {
-		return getIdDepartment() + "\t" + getNmDepartment();
-	}
-	public String toCSV() {
-		return getIdDepartment() + "," + getNmDepartment();
-	}
-	public String getPrimaryKeyValue() {
-		return getIdDepartment();
-	}
-
 }

em-oop/src/EmployeeData.java

@@ -1,26 +1,64 @@
 
 public class EmployeeData extends BaseData {
-	private String idEmployee;
+	//1-4
-	private String nmEmployee;
+	private String IdEmployee, nmEmployee, knEmployee, mailAddress, password, idDepartment;
-	private String knEmployee;
+	//1-4 + 2-4
-	private String mailAddress;
-	private String password;
-	private String idDepartment;
 
-	private static int empCount = 0;
+	//1-6
+	//	public EmployeeData(String idEmployee, String nmEmployee, String knEmployee, String mailAddress, String password,
+	//			String idDepartment) {
+	//		this.IdEmployee = idEmployee;
+	//		this.nmEmployee = nmEmployee;
+	//		this.knEmployee = knEmployee;
+	//		this.mailAddress = mailAddress;
+	//		this.password = password;
+	//		this.idDepartment = idDepartment;
+	//	}
+	//1-6
 
-	static int getempCount() {
+	//1-5
-		return empCount;
+	//2-4
+	//2-6
+	@Override
+	public String toString() {
+		//		System.out.println(getIdEmployee() + "\t" + getNmEmployee() + "\t" + getKnEmployee() + "\t" + getMailAddress()
+		//				+ "\t" + getPassword() + "\t" + getIdDepartment());
+		return (getIdEmployee() + "\t" + getNmEmployee() + "\t" + getKnEmployee() + "\t" + getMailAddress()
+				+ "\t" + getPassword() + "\t" + getIdDepartment());
+	}
+	//2-6
+	//2-4
+	//1-5
 
+	//3-4
+	@Override
+	public String toCSV() {
+		return getIdEmployee() + "," + getNmEmployee() + "," + getKnEmployee() + "," + getMailAddress()
+				+ "," + getPassword() + "," + getIdDepartment();
 	}
 
+	public String getPrimaryKeyValue() {
+		return IdEmployee;
+	}
+	//3-4
+
+	//1-7
+	boolean isMatchId(String id) {
+		System.out.println(id + " を検索します");
+		if (id.equals(IdEmployee)) {
+			System.out.println(true);
+		} else {
+			System.out.println(false);
+		}
+		return false;
+	}
+	//1-7
+
+	//2-5
 	public EmployeeData() {
+		//2-7
 		empCount++;
-
+		//2-7
-	}
-
-	static int getEmpCount() {
-		return empCount;
 	}
 
 	public EmployeeData(String idEmployee, String nmEmployee, String knEmployee, String mailAddress, String password,
@@ -31,20 +69,36 @@ public class EmployeeData extends BaseData {
 		this.setMailAddress(mailAddress);
 		this.setPassword(password);
 		this.setIdDepartment(idDepartment);
+		//2-7
 		empCount++;
+		//2-7
+	}
+	//2-5
+
+	//2-7
+	private static int empCount = 0;
+
+	static int getEmpCount() {
+		return empCount;
 
 	}
+	//2-7
 
+	//2-4
 	public String getIdEmployee() {
-		return idEmployee;
+		return IdEmployee;
 	}
 
 	public void setIdEmployee(String idEmployee) {
-		this.idEmployee = idEmployee;
+		//2-9
-		if (idEmployee == null || idEmployee.strip().isEmpty()) {
+		idEmployee = idEmployee.strip();
+		if (idEmployee.length() == 0) {
 			System.out.println("社員IDが空のため設定できませんでした");
 			return;
+		} else {
+			this.IdEmployee = idEmployee;
 		}
+		//2-9
 	}
 
 	public String getNmEmployee() {
@@ -52,12 +106,15 @@ public class EmployeeData extends BaseData {
 	}
 
 	public void setNmEmployee(String nmEmployee) {
-		this.nmEmployee = nmEmployee;
+		//2-8
-
+		nmEmployee = nmEmployee.strip();
-		if (nmEmployee == null || nmEmployee.strip().isEmpty()) {
+		if (nmEmployee.length() == 0) {
 			System.out.println("社員名が空のため設定できませんでした");
 			return;
+		} else {
+			this.nmEmployee = nmEmployee;
 		}
+		//2-8
 	}
 
 	public String getKnEmployee() {
@@ -91,31 +148,5 @@ public class EmployeeData extends BaseData {
 	public void setIdDepartment(String idDepartment) {
 		this.idDepartment = idDepartment;
 	}
-
+	//2-4
-	@Override
-	public String toString() {
-
-		return (this.getIdEmployee() + "\t" + this.getNmEmployee() + "\t" + this.getKnEmployee() + "\t"
-				+ this.getMailAddress() + "\t" + this.getPassword() + "\t" + this.getIdDepartment());
-
-	}
-
-	@Override
-	public String toCSV() {
-		return getIdEmployee() + "," + getNmEmployee() + "," + getKnEmployee() + "," + getMailAddress() + ","
-				+ getPassword() + "," + getIdDepartment();
-	}
-
-	public String getPrimaryKeyValue() {
-		return getIdEmployee();
-	}
-
-	public boolean isMatchId(String id) {
-		if (id == null || this.idEmployee == null) {
-			return false;
-		}
-		return this.idEmployee.equals(id);
-
-	}
-
 }

em-oop/src/Greeting.java

@@ -1,6 +1,3 @@
-
 public interface Greeting {
-
 	String hello();
-
 }

em-oop/src/Item.java

@@ -1,21 +1,27 @@
 
 public class Item {
+	//1-3
 	private String name;
 	private int price;
 	private int stock;
 
-	public void sell(int amount) {
+	public Item(String name, int price, int stock) {
-		this.setStock(this.getStock() - amount);
+		this.name = name;
+		this.price = price;
+		this.stock = stock;
 	}
 
-	public int totalPrice() {
+	void sell(int amount) {
-		return price * stock;
+		//		this.stock = this.stock - amount;
-
+		this.setStock(this.getStock() - amount); //2-2
+		//System.out.println(name + " " + price + "円 残り" + stock + "個");
 	}
+	//1-3
 
+	//2-2
 	@Override
 	public String toString() {
-		return (getName() + " " + getPrice() + "円 (残り" + getStock() + "個");
+		return getName() + "" + getPrice() + "円（残り" + getStock() + "個）";
 	}
 
 	public String getName() {
@@ -41,5 +47,5 @@ public class Item {
 	public void setStock(int stock) {
 		this.stock = stock;
 	}
-
+	//2-2
 }

em-oop/src/JapaneseGreeting.java

@@ -4,5 +4,4 @@ public class JapaneseGreeting implements Greeting {
 	public String hello() {
 		return "こんにちは";
 	}
-
 }

em-oop/src/Main.java

@@ -1,130 +1,168 @@
+//import java.util.Scanner;//1-8
+
 public class Main {
 	public static void main(String[] args) {
+		//1-8
+		//		Scanner scanner = new Scanner(System.in);
+		//		//1-9
+		//		boolean end = false;
+		//		while (!end) {
+		//		//1-9
+		//			System.out.println("検索したい社員IDを入力してください（終了するには0を入力）");
+		//			String num = scanner.nextLine().strip();
+		//			boolean found = false;
+		//1-8
+		//1-4
+		//		BaseData employee = new EmployeeData();
+		//		employee.setIdEmployee("10000");
+		//		employee.setNmEmployee("山田龍也");
+		//		employee.setKnEmployee("ヤマダタツヤ");
+		//		employee.setMailAddress("yamada@hoge.jp");
+		//		employee.setPassword("aaa");
+		//		employee.setIdDepartment("10");
 
-		//		while (true) {
+		//				System.out.println(employee.getIdEmployee());
-		//			Scanner scanner = new Scanner(System.in);
+		//				System.out.println(employee.getNmEmployee());
-		//			System.out.println("検索したい社員IDを入力してください（終了する場合は0）");
+		//				System.out.println(employee.getKnEmployee());
-		//			String input = scanner.nextLine();
+		//				System.out.println(employee.getMailAddress());
-
+		//				System.out.println(employee.getPassword());
-		BaseData[] employees = new BaseData[5];
+		//				System.out.println(employee.getIdDepartment());
-		//		BaseData employee = new EmployeeData("10000", "山田龍也", "ヤマダタツヤ", "yamada@hoge.jp", "aaa", "10");
+		//1-4
-		BaseData[] allData = new BaseData[11];
-		//		
-
-		allData[0] = new EmployeeData("10000", "山田龍也", "ヤマダタツヤ", "yamada@hoge.jp", "aaa", "10");
-		allData[1] = new EmployeeData("10001", "高橋準", "タカハシジュン", "jtaka@hoge.jp", "bbb", "10");
-		allData[2] = new EmployeeData("10002", "麻枝史明", "マエダフミアキ", "fmak@hoge.jp", "ccc", "11");
-		allData[3] = new EmployeeData("10003", "丸戸章介", "マルトショウスケ", "marusyo@hoge.jp", "ddd", "12");
-		allData[4] = new EmployeeData("10004", "三宅武", "ミタケタケシ", "miya@hoge.jp", "eee", "13");
-		allData[5] = new DepartmentData("10", "役員");
-		allData[6] = new DepartmentData("11", "人事・総務部");
-		allData[7] = new DepartmentData("12", "経理");
-		allData[8] = new DepartmentData("13", "システム開発事業部");
-		allData[9] = new DepartmentData("14", "教育事業部");
-		allData[10] = new DepartmentData("15", "営業企画部");
-
-		//		String targetDeptId = "";
-		//
-		//		for (int i = 0; i < allData.length; i++) {
-		//
-		//			if (allData[i] instanceof DepartmentData) {
-		//				DepartmentData dept = (DepartmentData) allData[i];
-		//
-		//				if (dept.getNmDepartment().equals("システム開発事業部")) {
-		//					targetDeptId = dept.getIdDepartment();
-		//					break;
-		//				}
-		//			}
-		//		}
-		//
-		//		for (int i = 0; i < allData.length; i++) {
-		//			if (allData[i] instanceof EmployeeData) {
-		//				EmployeeData emp = (EmployeeData) allData[i];
-		//				if (emp.getIdDepartment().equals(targetDeptId)) {
-		//					System.out.println(emp.getNmEmployee() + "\t" + emp.getMailAddress());
-		//				}
-		//			}
-		//		}
-
-		//		int count = 0;
-		//		int countt = 0;
-		//		for (int i = 0; i < allData.length; i++) {
-		//			if (allData[i] instanceof EmployeeData) {
-		//				//				count++;
-		//				EmployeeData emp = (EmployeeData) allData[i];
-		//
-		//				System.out.println(emp.getMailAddress());
-
-		//			else if (allData[i] instanceof DepartmentData) {
-		//				countt++;
-		//			}
-
-		//		System.out.println("社員のデータ：" + count + "件");
-		//		System.out.println("部署のデータ：" + countt + "件");
-
-		//			System.out.println(allData[i]);
-
-		//			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++) {
-		//			System.out.println(allData[i]);
-		//		}
-		//		System.out.println("現在の社員データ件数：" + EmployeeData.getEmpCount() + "件");
-
-		if (allData[0] instanceof EmployeeData) {
-			EmployeeData sampleEmp = (EmployeeData) allData[0];
-			sampleEmp.setNmEmployee("");
-		}
-		if (allData[0] instanceof EmployeeData) {
-			EmployeeData sampleEmp = (EmployeeData) allData[0];
-			sampleEmp.setIdEmployee("");
-		}
-
-		//			String serchId1 = "10002";
-		//		System.out.println(serchId1 + "を検索します");
-		//		boolean bo = false;
-		//		for (int i = 0; i < employees.length; i++) {
-		//			if (((EmployeeData) employees[i]).isMatchId(serchId1)) {
-		//				bo = true;
-		//				break;
-		//			}
-		//
-		//		}
-		//		System.out.println(bo);
-		//			String serchId2 = "99999";
-		//		System.out.println(serchId2 + "を検索します");
-		//		boolean bl = false;
-		//		for (int i = 0; i < employees.length; i++) {
-		//			if (((EmployeeData) employees[i]).isMatchId(serchId2)) {
-		//				bl = true;
-		//				break;
-		//			}
-		//		}
-		//		System.out.println(bl);
-
-		//			boolean a = false;
-		//			for (int i = 0; i < employees.length; i++) {
-		//				if (((EmployeeData) employees[i]).isMatchId(input)) {
-		//					a = true;
-		//					System.out.println(employees[i]);
-		//					break;
-		//
-		//				}
-		//			}
-		//			if (!a) {
-		//				System.out.println("該当する社員が見つかりませんでした");
-		//			}
-		//			if (input.equals("0")) {
-		//				System.out.println("システムを終了します");
-		//				break;
-		//			}
 
+		//3-4
 		//		System.out.println(employee.toCSV());
 		//		System.out.println(employee.getPrimaryKeyValue());
+		//3-4
+
+		//2-5
+		//		EmployeeData emp1 = new EmployeeData("10000", "山田龍也", "ヤマダタツヤ", "yamada@hoge.jp", "aaa", "10");
+		//		EmployeeData emp2 = new EmployeeData("10001", "高橋準", "タカハシジュン", "Jtaka@hoge.jp", "bbb", "11");
+		//		EmployeeData emp3 = new EmployeeData("10002", "麻枝史明", "マエダフミアキ", "fmak@hoge.jp", "ccc", "12");
+		//		EmployeeData emp4 = new EmployeeData("10003", "丸戸章介", "マルトショウスケ", "marusyo@hoge.jp", "ddd", "13");
+		//		EmployeeData emp5 = new EmployeeData("10004", "三宅武", "ミヤケタケシ", "miya@hoge.jp", "eee", "14");
+		//2-5
+
+		//1-6
+		BaseData[] employee = new EmployeeData[5];
+		employee[0] = new EmployeeData("10000", "山田龍也", "ヤマダタツヤ", "yamada@hoge.jp", "aaa", "10");
+		employee[1] = new EmployeeData("10001", "高橋準", "タカハシジュン", "Jtaka@hoge.jp", "bbb", "10");
+		employee[2] = new EmployeeData("10002", "麻枝史明", "マエダフミアキ", "fmak@hoge.jp", "ccc", "11");
+		employee[3] = new EmployeeData("10003", "丸戸章介", "マルトショウスケ", "marusyo@hoge.jp", "ddd", "12");
+		employee[4] = new EmployeeData("10004", "三宅武", "ミヤケタケシ", "miya@hoge.jp", "eee", "13");
+		//1-5
+		//1-6
+		//2-5
+		//		System.out.println(emp1);
+		//		System.out.println(emp2);
+		//		System.out.println(emp3);
+		//		System.out.println(emp4);
+		//		System.out.println(emp5);
+		//			for (int i = 0; i < employee.length; i++) {
+		//				System.out.println(employee[i]);
+		//			}
+		//2-7
+		//		System.out.println("現在の社員データ件数:" + EmployeeData.getEmpCount() + "件");
+		//					for (int i = 0; i < 5; i++) {
+		//						employee[i].showInfo();
+		//					}
+		//2-7
+		//2-5
+		//1-6
+		//1-5
+
+		//1-7
+		//3-5
+		//		System.out.println(employee[2].getPrimaryKeyValue().equals("10002"));
+		//		System.out.println(employee[2].getPrimaryKeyValue().equals("99999"));
+		//3-5
+		//1-7
+
+		//1-8
+		//			for (int i = 0; i < employee.length; i++) {
+		//				if (num.equals(employee[i].getIdEmployee())) {
+		//					//2-6
+		//					System.out.println(employee[i]);
+		//					//2-6
+		////					employee[i].showInfo();
+		//					found = true;
+		//					break;
+		//				} else if (num.equals("0")) {
+		//					System.out.println("システムを終了します");
+		//					return;
+		//				}
+		//			}
+		//			if (!found) {
+		//				System.out.println("該当する社員が見つかりませんでした");
+		//			}
+		//1-8 isMatchIdメソッドを使っていない
+		//		}
+
+		//3-6
+		BaseData[] allData = new BaseData[11];
+		allData[0] = employee[0];
+		allData[1] = employee[1];
+		allData[2] = employee[2];
+		allData[3] = employee[3];
+		allData[4] = employee[4];
+
+		DepartmentData dept = new DepartmentData("10", "役員");
+		allData[5] = dept;
+		DepartmentData dept2 = new DepartmentData("11", "人事・総務部");
+		allData[6] = dept2;
+		DepartmentData dept3 = new DepartmentData("12", "経理部");
+		allData[7] = dept3;
+		DepartmentData dept4 = new DepartmentData("13", "システム開発事業部");
+		allData[8] = dept4;
+		DepartmentData dept5 = new DepartmentData("14", "教育事業部");
+		allData[9] = dept5;
+		DepartmentData dept6 = new DepartmentData("15", "営業企画部");
+		allData[10] = dept6;
+
+		for (int i = 0; i < 11; i++) {
+			System.out.println(allData[i]);
+		}
+		//3-6
+
+		//3-7
+		int Cou = 0;
+		int Cou2 = 0;
+		for (int i = 0; i < 11; i++) {
+			if (allData[i] instanceof EmployeeData) {
+				Cou = Cou + 1;
+			} else if (allData[i] instanceof DepartmentData) {
+				Cou2 = Cou2 + 1;
+			}
+		}
+		System.out.println("社員データ：" + Cou + "件");
+		System.out.println("部署データ：" + Cou2 + "件");
+		//3-7
+
+		//3-8
+		for (int i = 0; i < 11; i++) {
+			if (allData[i] instanceof EmployeeData) {
+				EmployeeData emp = (EmployeeData) allData[i];
+				System.out.println(emp.getMailAddress());
+			}
+		}
+		//3-8
+
+		//3-9
+		for (int i = 0; i < 11; i++) {
+			if (allData[i] instanceof DepartmentData) {
+				DepartmentData bd = (DepartmentData) allData[i];
+				if (bd.getNmDepartment().equals("システム開発事業部")) {
+					for (int j = 0; j < 11; j++) {
+						if (allData[j] instanceof EmployeeData) {
+							EmployeeData emp = (EmployeeData) allData[j];
+							if (bd.getIdDepartment().equals(emp.getIdDepartment())) {
+								System.out.println(emp.getNmEmployee() + "\t" + emp.getMailAddress());
+							}
+						}
+
+					}
+				}
+			}
+		}
+		//3-9
 	}
 }

em-oop/src/Rectangle.java

@@ -1,5 +1,5 @@
 
-public class Rectangle extends Shape{
+public class Rectangle extends Shape {
 	private double width;
 	private double height;
 
@@ -13,5 +13,4 @@ public class Rectangle extends Shape{
 	public double area() {
 		return width * height;
 	}
-
 }

em-oop/src/Shape.java

@@ -11,5 +11,4 @@ public abstract class Shape {
 	public void showInfo() {
 		System.out.println(this.name + "の面積は" + this.area() + "です");
 	}
-
 }

em-oop/src/Student.java

@@ -1,24 +1,27 @@
-
 public class Student {
+	//1-2
 	int studentId;
 	String name;
 
-	static int studentCount = 0;
+	void printProfile() {
-	
-	public void printProfile () {
 		System.out.println("学籍番号:" + this.studentId + " 名前:" + this.name);
-		
 	}
+	//1-2
+
+	//2-3
 	public Student(int studentId, String name) {
 		this.studentId = studentId;
 		this.name = name;
+	}
+
+	static int studentCount = 0;
+	{
 		studentCount++;
 	}
 
 	static int getStudentCount() {
 		return studentCount;
+
 	}
-	
+	//2-3
-	
-
 }