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

em-oop/src/BaseData.java

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

em-oop/src/BasicCheck1.java

@@ -2,7 +2,18 @@
 public class BasicCheck1 {
 
 	public static void main(String[] args) {
-		// TODO 自動生成されたメソッド・スタブ
+		//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);
@@ -12,6 +23,6 @@ public class BasicCheck1 {
 		System.out.println(book2.title);
 		System.out.println(book2.author);
 		System.out.println(book2.price);
+		//2-1
 	}
-
 }

em-oop/src/BasicCheck2.java

@@ -2,16 +2,23 @@
 public class BasicCheck2 {
 
 	public static void main(String[] args) {
-		// TODO 自動生成されたメソッド・スタブ
+		//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();
-		int total=Student.getStudentCount();
-		System.out.println("現在の生徒数" + total + "人");
-	}
-	
 
+		System.out.println("現在の生徒数:" + Student.getStudentCount() + "人");
+		//2-3
+	}
 }

em-oop/src/BasicCheck3.java

@@ -1,28 +1,19 @@
 
 public class BasicCheck3 {
-
 	public static void main(String[] args) {
-		// 配列
+		//1-3
 		Item[] items = new Item[3];
-		items[0] = new Item();
-		items[1] = new Item();
-		items[2] = new Item();
-		//items[0]代入
-		items[0].setName("ノート");
-		items[0].setPrice(120);
-		items[0].setStock (50);
-		//items[1]代入
-		items[1].setName("消しゴム");
-		items[1].setPrice(80);
-		items[1].setStock(30);
-		//items[2]代入
-		items[2].setName("鉛筆");
-		items[2].setPrice(60);
-		items[2].setStock(100);
-		for (int i=0; i<=2; i++) {
+		items[0] = new Item("ノート", 120, 50);
+		items[1] = new Item("消しゴム", 80, 30);
+		items[2] = new Item("鉛筆", 60, 100);
+
+		for (int i = 0; i < 3; i++) {
 			items[i].sell(5);
-			System.out.println(items[i]);
+			//2-2
+			System.out.println(items[i].toString());
+			//2-2
+		}
+		//1-3
 	}
 
 }
-}

em-oop/src/Book.java

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

em-oop/src/Circle.java

@@ -6,12 +6,12 @@ public class Circle extends Shape {
 		super("円");
 		this.radius = radius;
 	}
+
 	@Override
 	public double area() {
-		double num;
-		num = Math.PI * radius * radius;
-		return num;
+		return Math.PI * radius * radius;
 	}
+
 	@Override
 	public void showInfo() {
 		super.showInfo();

em-oop/src/Day3Check1.java

@@ -4,10 +4,6 @@ public class Day3Check1 {
 	public static void main(String[] args) {
 		Circle circle = new Circle(2);
 		circle.showInfo();
-		Rectangle rectangle = new Rectangle(3,4);
-		rectangle.showInfo();
+		}
 
-		Greeting greeting = new JapaneseGreeting();
-		System.out.println(greeting.hello());
-	}
 }

em-oop/src/Day3Check2.java

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

em-oop/src/DayCheck3.java

@@ -1,9 +1,10 @@
 
-public class Day3Check3 {
+public class DayCheck3 {
 
 	public static void main(String[] args) {
 		Shape shape1 = new Circle(2);
 		shape1.showInfo();
+
 		Shape shape2 = new Rectangle(3, 4);
 		shape2.showInfo();
 	}

em-oop/src/DepartmentData.java

@@ -1,8 +1,29 @@
 
-public class DepartmentDate extends BaseDate {
+public class DepartmentData extends BaseData {
+	//3-6
 	private String idDepartment;
 	private String nmDepartment;
 
+	//3-6
+	public DepartmentData(String idDepartment, String nmDepartment) {
+		this.idDepartment = idDepartment;
+		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;
@@ -19,23 +40,5 @@ public class DepartmentDate extends BaseDate {
 	public void setNmDepartment(String nmDepartment) {
 		this.nmDepartment = nmDepartment;
 	}
-
-	@Override
-	public String toString() {
-		String str1 = (getIdDepartment() + "\t" + getNmDepartment());
-		return str1;
-	}
-
-	@Override
-	public String toCSV() {
-		String str2 = (getIdDepartment() + "," + getNmDepartment());
-		return str2;
-	}
-
-	@Override
-	public String getPrimaryKeyValue() {
-		String str3 = (getIdDepartment());
-		return str3;
-	}
-
+	//3-6
 }

em-oop/src/EmployeeData.java

@@ -1,18 +1,104 @@
 
-public class EmployeeData extends BaseDate {
-	private String idEmployee;
-	private String nmEmployee;
-	private String knEmployee;
-	private String mailAddress;
-	private String password;
-	private String idDepartment;
+public class EmployeeData extends BaseData {
+	//1-4
+	private String IdEmployee, nmEmployee, knEmployee, mailAddress, password, idDepartment;
+	//1-4 + 2-4
 
+	//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
+
+	//1-5
+	//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
+	}
+
+	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);
+		//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
+		idEmployee = idEmployee.strip();
+		if (idEmployee.length() == 0) {
+			System.out.println("社員IDが空のため設定できませんでした");
+			return;
+		} else {
+			this.IdEmployee = idEmployee;
+		}
+		//2-9
 	}
 
 	public String getNmEmployee() {
@@ -20,8 +106,16 @@ public class EmployeeData extends BaseDate {
 	}
 
 	public void setNmEmployee(String nmEmployee) {
+		//2-8
+		nmEmployee = nmEmployee.strip();
+		if (nmEmployee.length() == 0) {
+			System.out.println("社員名が空のため設定できませんでした");
+			return;
+		} else {
 			this.nmEmployee = nmEmployee;
 		}
+		//2-8
+	}
 
 	public String getKnEmployee() {
 		return knEmployee;
@@ -54,65 +148,5 @@ public class EmployeeData extends BaseDate {
 	public void setIdDepartment(String idDepartment) {
 		this.idDepartment = idDepartment;
 	}
-
-	@Override
-	public String toString() {
-		String str;
-		str = (getIdEmployee() + "\t" + getNmEmployee() + "\t" + getKnEmployee() + "\t" + getMailAddress()
-				+ "\t" + getPassword() + "\t" + getIdDepartment());
-		return str;
-	}
-	
-	private static int empCount = 0;
-
-	public EmployeeData() {
-		empCount++;
-	}
-//
-	public EmployeeData(String idEmployee, String nmEmployee, String knEmployee, String mailAddress, String password,
-			String idDepartment) {
-		idEmployee = idEmployee.trim();
-		int in =idEmployee.length();
-		if (in==0) {
-			nmEmployee ="社員IDが空のため設定できませんでした";
-		}
-		this.setIdEmployee(idEmployee);
-		nmEmployee = nmEmployee.trim();
-		int i =nmEmployee.length();
-		if (i==0) {
-			nmEmployee ="社員名がからのため設定できませんでした";
-		}
-		this.setNmEmployee(nmEmployee);
-		this.setKnEmployee(knEmployee);
-		this.setMailAddress(mailAddress);
-		this.setPassword(password);
-		this.setIdDepartment(idDepartment);
-		empCount++;
-	}
-	static int getEmpCount() {
-		int result = empCount;
-		return result;
-	}
-
-	@Override
-	public String toCSV() {
-		String str;
-		str = (getIdEmployee() + "," + getNmEmployee() + "," + getKnEmployee() + "," + getMailAddress()
-		+ "," + getPassword() + "," + getIdDepartment());
-		return str;
-	}
-
-	@Override
-	public String getPrimaryKeyValue() {
-		return idEmployee;
-	}
-	public boolean isMatchId(String id) {
-//		System.out.println(id + "を検索します");
-		if(id.equals(idEmployee)) {
-			return true;
-		} else {
-			return false;
-			
-		}
-	}
+	//2-4
 }

em-oop/src/Greeting.java

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

em-oop/src/Item.java

@@ -1,9 +1,29 @@
 
 public class Item {
+	//1-3
 	private String name;
 	private int price;
 	private int stock;
 
+	public Item(String name, int price, int stock) {
+		this.name = name;
+		this.price = price;
+		this.stock = stock;
+	}
+
+	void sell(int amount) {
+		//		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() + "個）";
+	}
+
 	public String getName() {
 		return name;
 	}
@@ -27,13 +47,5 @@ public class Item {
 	public void setStock(int stock) {
 		this.stock = stock;
 	}
-
-	void sell(int amount) {
-		this.setStock(this.getStock() - amount);
-	}
-	
-	 public String toString() { 
-		String str = getName() + " " + getPrice() + "円 (残り" + getStock() + "個)";
-		return str;
-	}
+	//2-2
 }

em-oop/src/JapaneseGreeting.java

@@ -2,8 +2,6 @@
 public class JapaneseGreeting implements Greeting {
 	@Override
 	public String hello() {
-		String str =("こんにちは");
-		return str;
+		return "こんにちは";
 	}
-
 }

em-oop/src/Main.java

@@ -1,184 +1,168 @@
-import java.util.ArrayList;
-import java.util.Scanner;
+//import java.util.Scanner;//1-8
 
 public class Main {
-
 	public static void main(String[] args) {
-		ArrayList<EmployeeData> list = new ArrayList<>();
-		list.add(new EmployeeData("10000", "山田龍也", "ヤマダタツヤ", "yamada@hoge.jp", "aaa", "10"));
-		list.add(new EmployeeData("10001", "高橋準", "タカハシジュン", "jtaka@hoge.jp", "bbb", "11"));
-		list.add(new EmployeeData("10002", "麻枝史明", "マエダフミアキ", "fmak@hoge.jp", "ccc", "12"));
-		list.add(new EmployeeData("10003", "丸戸章介", "マルトショウスケ", "marusyo@hoge.jp", "ddd", "13"));
-		list.add(new EmployeeData("10004", "三宅武", "ミヤケタケシ", "miya@hoge.jp", "eee", "14"));
-		//		list.add("10 役員");
-		//		list.add("11 人事・総務部");
-		//		list.add("12 経理部");
-		//		list.add("13 システム開発事業部");
-		//		list.add("14 教育事業部");
-		//		list.add("15 営業企画部");
+		//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");
 
-		String str1 = (" ");
-		while (!str1.equals("0")) {
-			System.out.println("1:検索　2:登録　3:更新: 4:削除 0:終了");
-			Scanner sc1 = new Scanner(System.in);
-			str1 = sc1.nextLine();
-			System.out.println(str1);
-			if (str1.equals("1")) {
-				System.out.println("1:全検索　2:条件検索　それ以外:戻る");
-				Scanner sc2 = new Scanner(System.in);
-				String str2 = sc2.nextLine();
-				System.out.println(str2);
-				if (str2.equals("1")) {
-					for (int i = 0; i < list.size(); i++) {
-						System.out.println(list.get(i));
-					}
-				} else if (str2.equals("2")) {
-					System.out.println("検索したい社員IDを入力してください");
-					Scanner sc3 = new Scanner(System.in);
-					String str3 = sc3.nextLine();
-					for (int j = 0; j < list.size(); j++) {
-						if (list.get(j).getIdEmployee().equals(str3)) {
-							System.out.println(list.get(j));
-							break;
-						} else if (!list.get(j).getIdEmployee().equals(str3) && j == list.size()) {
-							System.out.println("入力された値で情報が見つかりませんでした");
-						}
-					}
-				}
-			} else if (str1.equals("2")) {
-				System.out.println("社員IDを入力してください");
-				Scanner sc4 = new Scanner(System.in);
-				String str4 = sc4.nextLine();
-				System.out.println(str4);
-				System.out.println("社員名を入力してください");
-				Scanner sc5 = new Scanner(System.in);
-				String str5 = sc5.nextLine();
-				System.out.println(str5);
-				System.out.println("フリガナを入力してください");
-				Scanner sc6 = new Scanner(System.in);
-				String str6 = sc6.nextLine();
-				System.out.println(str6);
-				System.out.println("メールアドレスを入力してください");
-				Scanner sc7 = new Scanner(System.in);
-				String str7 = sc7.nextLine();
-				System.out.println(str7);
-				System.out.println("パスワードを入力してください");
-				Scanner sc8 = new Scanner(System.in);
-				String str8 = sc8.nextLine();
-				System.out.println(str8);
-				System.out.println("部署IDを入力してください");
-				Scanner sc9 = new Scanner(System.in);
-				String str9 = sc9.nextLine();
-				System.out.println(str9);
-				System.out.println("登録が完了しました");
-				list.add(new EmployeeData(str4, str5, str6, str7, str8, str9));
+		//				System.out.println(employee.getIdEmployee());
+		//				System.out.println(employee.getNmEmployee());
+		//				System.out.println(employee.getKnEmployee());
+		//				System.out.println(employee.getMailAddress());
+		//				System.out.println(employee.getPassword());
+		//				System.out.println(employee.getIdDepartment());
+		//1-4
 
-			} else if (str1.equals("3")) {
-				System.out.println("社員IDを入力してください");
-				Scanner sc4 = new Scanner(System.in);
-				String str4 = sc4.nextLine();
-				for (int k = 0; k < list.size(); k++) {
-					if (list.get(k).getIdEmployee().equals(str4)) {
-						System.out.println(str4);
-						System.out.println("社員名を入力してください");
-						Scanner sc5 = new Scanner(System.in);
-						String str5 = sc5.nextLine();
-						System.out.println(str5);
-						System.out.println("フリガナを入力してください");
-						Scanner sc6 = new Scanner(System.in);
-						String str6 = sc6.nextLine();
-						System.out.println(str6);
-						System.out.println("メールアドレスを入力してください");
-						Scanner sc7 = new Scanner(System.in);
-						String str7 = sc7.nextLine();
-						System.out.println(str7);
-						System.out.println("パスワードを入力してください");
-						Scanner sc8 = new Scanner(System.in);
-						String str8 = sc8.nextLine();
-						System.out.println(str8);
-						System.out.println("部署IDを入力してください");
-						Scanner sc9 = new Scanner(System.in);
-						String str9 = sc9.nextLine();
-						System.out.println(str9);
-						System.out.println("更新が完了しました");
-						list.set(k, new EmployeeData(str4, str5, str6, str7, str8, str9));
-						break;
-					} else if (!list.get(k).getIdEmployee().equals(str4) && k == list.size()) {
-						System.out.println("入力された値で情報が見つかりませんでした");
-					}
-				}
-			} else if (str1.equals("4")) {
-				System.out.println("削除するIDを入力してください");
-				Scanner sc4 = new Scanner(System.in);
-				String str4 = sc4.nextLine();
-				for (int l = 0; l < list.size(); l++) {
-					if (list.get(l).getIdEmployee().equals(str4)) {
-						System.out.println("指定されたIDの情報を削除します？ y/Y");
-						System.out.println("y/Y以外の入力であればキャンセル");
-						Scanner sc5 = new Scanner(System.in);
-						String str5 = sc5.nextLine();
-						System.out.println(str5);
-						if (str5.equals("y") || str5.equals("Y")) {
-							list.remove(l);
-							System.out.println("削除されました");
-							break;
-						} else {
-							System.out.println("入力された値で情報が見つかりませんでした");
-						}
-					}
-				}
-			}
-		}
-		System.out.println("システムを終了します");
-		//		 num1 = 0;
-		//		int num2 = 0;
-		//		for (int i = 0; i <= 10; i++) {
-		//			if (alldate[i] instanceof EmployeeData) {
-		//				num1++;
-		//				EmployeeData emp = (EmployeeData) alldate[i];
-		//				System.out.println(emp.getMailAddress());
-		//			} else {
-		//				num2++;
-		//				System.out.println(alldate[i]);
+		//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();
 		//					}
-		//		System.out.println("社員データ:" + num1 + "件");
-		//		System.out.println("部署データ" + num2 + "件");
-		//		int j = EmployeeData.getEmpCount();
-		//		System.out.println("現在の社員データ件数;" + j + "件");
-		//		String id = ("");
-		//		for (int k = 0; k <= 10; k++) {
-		//			if (alldate[k] instanceof DepartmentDate) {
-		//				DepartmentDate dep = (DepartmentDate) alldate[k];
-		//				if (dep.getNmDepartment().equals("システム開発事業部")) {
-		//					id = dep.getIdDepartment();
+		//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;
 		//				}
 		//			}
-		//		}
-		//		for (int l = 0; l < 10; l++) {
-		//			if (alldate[l] instanceof EmployeeData) {
-		//				EmployeeData emp = (EmployeeData) alldate[l];
-		//				if (emp.getIdDepartment().equals(id)) {
-		//					System.out.println(emp.getNmEmployee() + " " + emp.getMailAddress());
-		//				}
-		//			}
-		//		}
-		//		System.out.println(employee[0].toCSV());
-		//		System.out.println(employee[0].getPrimaryKeyValue());
-		//		String str = "";
-		//		while (!str.equals("0")) {
-		//			System.out.println("検索したい社員IDを入力してください(終了する場合は0)");
-		//			Scanner sc3 = new Scanner(System.in);
-		//			str = sc.nextLine();
-		//			for (int m = 0; m <= 4; m++) {
-		//				if (employee[m].getPrimaryKeyValue().equals(str)) {
-		//					System.out.println(employee[m]);
-		//					break;
-		//				} else if (!employee[m].getPrimaryKeyValue().equals(str) && m == 4 && !str.equals("0")) {
+		//			if (!found) {
 		//				System.out.println("該当する社員が見つかりませんでした");
 		//			}
+		//1-8 isMatchIdメソッドを使っていない
 		//		}
-		//		System.out.println("システムを終了します");
+
+		//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

@@ -0,0 +1,16 @@
+
+public class Rectangle extends Shape {
+	private double width;
+	private double height;
+
+	public Rectangle(double width, double height) {
+		super("四角形");
+		this.width = width;
+		this.height = height;
+	}
+
+	@Override
+	public double area() {
+		return width * height;
+	}
+}

em-oop/src/Student.java

@@ -1,18 +1,27 @@
-
 public class Student {
+	//1-2
 	int studentId;
 	String name;
 
 	void printProfile() {
-		System.out.println("学籍番号;"+this.studentId+" 名前;"+this.name);
+		System.out.println("学籍番号:" + this.studentId + " 名前:" + this.name);
 	}
-	 static int studentCount = 0;
+	//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
 }