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

.classpath

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="src" path="em-oop/src"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>

.gitignore

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

.project

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>java-cui-em-oop</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>

em-oop/src/BaseData.java

@@ -1,8 +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,22 +2,27 @@
 public class BasicCheck1 {
 
 	public static void main(String[] args) {
-		// TODO 自動生成されたメソッド・スタブ
+		//1-1
-		Book book1 = new Book();
+		//		Book book = new Book();
-		Book book2 = new Book("銀河鉄道の夜","宮沢賢治",500);
-		
 		//		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(book2.author);
 		System.out.println(book2.price);
-
+		//2-1
 	}
-
 }

em-oop/src/BasicCheck2.java

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

em-oop/src/BasicCheck3.java

@@ -1,35 +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("ノート") ;
-		items[0].setPrice(120);
-		items[0].setStock(50);
-		
-		items[1].setName("消しゴム");
-		items[1].setPrice(80);
-		items[1].setStock(30);
-		
-		items[2].setName("鉛筆");
-		items[2].setPrice(60);
-		items[2].setStock(100);
-		
-		
 
 		for (int i = 0; i < 3; i++) {
 			items[i].sell(5);
-			System.out.println(items[i]);
+			//2-2
-//			System.out.println("合計金額："+items[i].totalPrice());
+			System.out.println(items[i].toString());
+			//2-2
+		}
+		//1-3
 	}
 
-		
-		
-	}
-	
-	
-
 }

em-oop/src/Book.java

@@ -1,20 +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

@@ -1,4 +1,3 @@
-package day3_123;
 
 public class Circle extends Shape {
 	private double radius;
@@ -18,5 +17,4 @@ public class Circle extends Shape {
 		super.showInfo();
 		System.out.println("(半径:" + this.radius + ")");
 	}
-
 }

em-oop/src/Day3Check1.java

@@ -1,4 +1,3 @@
-package day3_123;
 
 public class Day3Check1 {
 

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,6 +1,5 @@
-package day3_123;
 
-public class Day3Check3 {
+public class DayCheck3 {
 
 	public static void main(String[] args) {
 		Shape shape1 = new Circle(2);

em-oop/src/DepartmentData.java

@@ -1,21 +1,12 @@
 
 public class DepartmentData extends BaseData {
+	//3-6
 	private String idDepartment;
 	private String nmDepartment;
 
-	public String getIdDepartment() {
+	//3-6
-		return idDepartment;
+	public DepartmentData(String idDepartment, String nmDepartment) {
-	}
-
-	public void setIdDepartment(String idDepartment) {
 		this.idDepartment = idDepartment;
-	}
-
-	public String getNmDepartment() {
-		return nmDepartment;
-	}
-
-	public void setNmDepartment(String nmDepartment) {
 		this.nmDepartment = nmDepartment;
 	}
 
@@ -34,4 +25,20 @@ public class DepartmentData extends BaseData {
 		return getIdDepartment();
 	}
 
+	public String getIdDepartment() {
+		return idDepartment;
+	}
+
+	public void setIdDepartment(String idDepartment) {
+		this.idDepartment = idDepartment;
+	}
+
+	public String getNmDepartment() {
+		return nmDepartment;
+	}
+
+	public void setNmDepartment(String nmDepartment) {
+		this.nmDepartment = nmDepartment;
+	}
+	//3-6
 }

em-oop/src/EmployeeData.java

@@ -1,51 +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;
 
-	static final String COMPANY_NAME = "Rhizome";
+	//1-6
-
+	//	public EmployeeData(String idEmployee, String nmEmployee, String knEmployee, String mailAddress, String password,
-	public void showInfo() {
+	//			String idDepartment) {
-		System.out.println(this.idEmployee + "\t" + this.nmEmployee + "\t" + this.knEmployee + "\t" + this.mailAddress
+	//		this.IdEmployee = idEmployee;
-				+ "\t" + this.mailAddress + "\t" + this.password + "\t" + this.idDepartment);
+	//		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() {
-		return getIdEmployee() + "\t" + getNmEmployee() + "　" + getKnEmployee() + "\t" + getMailAddress()
+		//		System.out.println(getIdEmployee() + "\t" + getNmEmployee() + "\t" + getKnEmployee() + "\t" + getMailAddress()
-				+ "\t" + getPassword() + "\t" + getIdDepartment();
+		//				+ "\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() + ","
+		return getIdEmployee() + "," + getNmEmployee() + "," + getKnEmployee() + "," + getMailAddress()
-				+ getPassword() + "," + getIdDepartment();
+				+ "," + getPassword() + "," + getIdDepartment();
 	}
 
-	@Override
 	public String getPrimaryKeyValue() {
-		return idEmployee;
+		return IdEmployee;
-
 	}
+	//3-4
 
-	public boolean isMatchId(String id) {
+	//1-7
-		return idEmployee.equals(id);
+	boolean isMatchId(String id) {
+		System.out.println(id + " を検索します");
+		if (id.equals(IdEmployee)) {
+			System.out.println(true);
+		} else {
+			System.out.println(false);
 		}
-
+		return false;
-	static int getEmpCount() {
-		return empCount;
 	}
+	//1-7
 
-	//getNmEmployee.strip();
+	//2-5
-
 	public EmployeeData() {
+		//2-7
 		empCount++;
-
+		//2-7
 	}
 
 	public EmployeeData(String idEmployee, String nmEmployee, String knEmployee, String mailAddress, String password,
@@ -56,22 +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 this.idEmployee;
+		return IdEmployee;
 	}
 
 	public void setIdEmployee(String idEmployee) {
+		//2-9
 		idEmployee = idEmployee.strip();
-		int idNum = idEmployee.length();
+		if (idEmployee.length() == 0) {
-
-		if (idNum == 0) {
 			System.out.println("社員IDが空のため設定できませんでした");
+			return;
 		} else {
-			this.idEmployee = idEmployee;
+			this.IdEmployee = idEmployee;
 		}
+		//2-9
 	}
 
 	public String getNmEmployee() {
@@ -79,18 +106,19 @@ public class EmployeeData extends BaseData {
 	}
 
 	public void setNmEmployee(String nmEmployee) {
+		//2-8
 		nmEmployee = nmEmployee.strip();
-		int nmNum = nmEmployee.length();
+		if (nmEmployee.length() == 0) {
-		if (nmNum == 0) {
 			System.out.println("社員名が空のため設定できませんでした");
-
+			return;
 		} else {
 			this.nmEmployee = nmEmployee;
 		}
+		//2-8
 	}
 
 	public String getKnEmployee() {
-		return this.knEmployee;
+		return knEmployee;
 	}
 
 	public void setKnEmployee(String knEmployee) {
@@ -98,7 +126,7 @@ public class EmployeeData extends BaseData {
 	}
 
 	public String getMailAddress() {
-		return this.mailAddress;
+		return mailAddress;
 	}
 
 	public void setMailAddress(String mailAddress) {
@@ -120,5 +148,5 @@ public class EmployeeData extends BaseData {
 	public void setIdDepartment(String idDepartment) {
 		this.idDepartment = idDepartment;
 	}
-
+	//2-4
 }

em-oop/src/Greeting.java

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

em-oop/src/Item.java

@@ -1,43 +1,51 @@
 
 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 this.price*this.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() {
-		return this.name;
+		return name;
 	}
+
 	public void setName(String name) {
 		this.name = name;
 	}
 
-	
 	public int getPrice() {
-		return this.price;
+		return price;
 	}
+
 	public void setPrice(int price) {
 		this.price = price;
 	}
 
-	
 	public int getStock() {
-		return this.stock;
+		return stock;
 	}
+
 	public void setStock(int stock) {
 		this.stock = stock;
 	}
-
+	//2-2
 }

em-oop/src/JapaneseGreeting.java

@@ -1,9 +1,7 @@
-package day3_123;
 
 public class JapaneseGreeting implements Greeting {
 	@Override
 	public String hello() {
 		return "こんにちは";
 	}
-
 }

em-oop/src/Main.java

@@ -1,202 +1,168 @@
-import java.util.ArrayList;
+//import java.util.Scanner;//1-8
-import java.util.Scanner;
 
 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();
-		//		BaseData[] employees = new BaseData[];
+		//		employee.setIdEmployee("10000");
-		//		BaseData[] allData = new BaseData();
+		//		employee.setNmEmployee("山田龍也");
-		ArrayList<BaseData> allData = new ArrayList<>();
+		//		employee.setKnEmployee("ヤマダタツヤ");
+		//		employee.setMailAddress("yamada@hoge.jp");
+		//		employee.setPassword("aaa");
+		//		employee.setIdDepartment("10");
 
-		allData.add(new EmployeeData("10000", "山田龍也", "ヤマダタツヤ", "yamada@hoge.jp", "aaa", "10"));
+		//				System.out.println(employee.getIdEmployee());
-		//		allData[1] = new EmployeeData("10001", "高橋準", "タカハシジュン", "jtaka@hoge.jp", "bbb", "10");
+		//				System.out.println(employee.getNmEmployee());
-		//		allData[2] = new EmployeeData("10002", "麻枝史明", "マエダフミアキ", "fmak@hoge.jp", "ccc", "11");
+		//				System.out.println(employee.getKnEmployee());
-		//		allData[3] = new EmployeeData("10003", "丸戸章介", "マルトショウスケ", "marusyo@hoge.jp", "ddd", "12");
+		//				System.out.println(employee.getMailAddress());
-		//		allData[4] = new EmployeeData("10004", "三宅武", "ミヤケタケシ", "miya@hoge.jp", "eee", "13");
+		//				System.out.println(employee.getPassword());
-		//		allData[11] = new EmployeeData("10005", "丸井悠", "マルイハルカ", "haru@hoge.jp", "fff", "13");
+		//				System.out.println(employee.getIdDepartment());
-		//		allData[12] = new EmployeeData("10006", "涼元香織", "スズモトカオリ", "suzumoto@hoge.jp", "ggg", "13");
+		//1-4
-		//		allData[13] = new EmployeeData("10007", "葉山稔", "ハヤマミノル", "mhayama@hoge.jp", "hhh", "14");
-		//		allData[14] = new EmployeeData("10008", "川上朱里", "カワカミアカリ", "kawakami@hoge.jp", "iii", "14");
-		//		allData[15] = new EmployeeData("10009", "杉井肇", "スギイハジメ", "sugi@hoge.jp", "jjj", "15");
-		//
-		//		DepartmentData dept = new DepartmentData();
-		//		dept.setIdDepartment("10");
-		//		dept.setNmDepartment("役員");
-		//		allData[5] = dept;
-		//		dept = new DepartmentData();
-		//		dept.setIdDepartment("11");
-		//		dept.setNmDepartment("人事・総務部");
-		//		dept = new DepartmentData();
-		//		allData[6] = dept;
-		//		dept.setIdDepartment("12");
-		//		dept.setNmDepartment("経理部");
-		//		allData[7] = dept;
-		//		dept = new DepartmentData();
-		//		dept.setIdDepartment("13");
-		//		dept.setNmDepartment("システム開発事業部");
-		//		allData[8] = dept;
-		//		dept = new DepartmentData();
-		//		dept.setIdDepartment("14");
-		//		dept.setNmDepartment("教育事業部");
-		//		allData[9] = dept;
-		//		dept = new DepartmentData();
-		//		dept.setIdDepartment("15");
-		//		dept.setNmDepartment("営業企画部");
-		//		allData[10] = dept;
 
-		Scanner scanner = new Scanner(System.in);
+		//3-4
+		//		System.out.println(employee.toCSV());
+		//		System.out.println(employee.getPrimaryKeyValue());
+		//3-4
 
-		while (true) {
+		//2-5
-			System.out.println("1:検索 2:登録 3:更新 4:削除 0:終了");
+		//		EmployeeData emp1 = new EmployeeData("10000", "山田龍也", "ヤマダタツヤ", "yamada@hoge.jp", "aaa", "10");
-			String usertype = scanner.nextLine();
+		//		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
 
-			//0:終了
+		//1-6
-			if (usertype.equals("0")) {
+		BaseData[] employee = new EmployeeData[5];
-				break;
+		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");
-			//1:検索
+		employee[3] = new EmployeeData("10003", "丸戸章介", "マルトショウスケ", "marusyo@hoge.jp", "ddd", "12");
-			if (usertype.equals("1")) {
+		employee[4] = new EmployeeData("10004", "三宅武", "ミヤケタケシ", "miya@hoge.jp", "eee", "13");
-				System.out.println("1:全検索 2:条件検索 それ以外:戻る");
+		//1-5
-				usertype = scanner.nextLine();
+		//1-6
-				if (usertype.equals("1")) {
+		//2-5
-					for (int i = 0; i < allData.size(); i++)
+		//		System.out.println(emp1);
-						if (allData.get(i) instanceof EmployeeData) {
+		//		System.out.println(emp2);
-							System.out.println(allData.get(i).toString());
+		//		System.out.println(emp3);
-						}
+		//		System.out.println(emp4);
-
+		//		System.out.println(emp5);
-				} else if (usertype.equals("2")) {
+		//			for (int i = 0; i < employee.length; i++) {
-					System.out.println("IDを入力してください");
-					usertype = scanner.nextLine();
-
-					boolean result = false;
-					for (int i = 0; i < allData.size(); i++)
-						if (allData.get(i) instanceof EmployeeData) {
-							EmployeeData employee = (EmployeeData) allData.get(i);
-							if (employee.getIdEmployee().equals(usertype)) {
-								result = true;
-								System.out.println(employee.toString());
-								break;
-							}
-
-						}
-					if (result == false) {
-						System.out.println("入力された値で情報がみつかりませんでした");
-						
-					}
-
-				} else {
-					continue;
-
-				}
-
-			}
-
-			//2:登録
-			if (usertype.equals("2")) {
-				System.out.println("社員IDを入力してください");
-			}
-
-		}
-
-	}
-}
-
-//Day3.9---所属部署から従業員のメアドを検索する
-//		DepartmentData dep = null;
-//		EmployeeData emp;
-//		String nmD = null;
-//
-//		for (int i = 0; i < allData.length; i++) {
-//			if (allData[i] instanceof DepartmentData) {
-//				dep = (DepartmentData) allData[i];
-//				if (dep.getNmDepartment().equals("システム開発事業部")) {
-//					nmD = dep.getIdDepartment();
-//				}
-//			}
-//
-//		}
-//
-//		for (int i = 0; i < allData.length; i++) {
-//			if (allData[i] instanceof EmployeeData) {
-//				emp = (EmployeeData) allData[i];
-//				if (emp.getIdDepartment().equals(nmD)) {
-//					System.out.println(emp.getNmEmployee() + "\t" + emp.getMailAddress());
-//				}
-//
-//			}
-//
-//		}
-
-//		for (int i = 0; i < allData.length; i++) {
-//			if (allData[i] instanceof EmployeeData) {
-//				EmployeeData emp = (EmployeeData) allData[i];
-//				System.out.println(emp.getMailAddress());
-//			}
-//		}
-
-//		int emp=0;
-//		int dep=0;
-//		for(int i=0;i<allData.length;i++) {
-//			if(allData[i] instanceof EmployeeData) {
-//				emp++;
-//			}
-//			if(allData[i] instanceof DepartmentData) {
-//				dep++;
-//			}
-//		}
-//		System.out.println("社員データ："+emp+"件");
-//		System.out.println("部署データ："+dep+"件");
-
-//		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");
-
-//		System.out.println(employees[0].toCSV());
-//		System.out.println(employees[0].getPrimaryKeyValue());
-
-//		Scanner sc = new Scanner(System.in);
-//		//
-//		for (int i = 0; i < employees.length; i++) {
-//			System.out.println("1:検索 2:登録 3:更新 4:削除 0:終了");
-//			String id = sc.nextLine();
-//			boolean result = false;
-//
-//			if (id.equals("0")) {
-//				System.out.println("システムを終了します");
-//				break;
-//			}
-//			if (employees[i].getPrimaryKeyValue().equals(id)) {
-//				result = true;
-//				employees[i].toString();
-//
-//			}
-//
-//			if (result == false) {
-//				System.out.println("該当する社員が見つかりませんでした");
-//			}
-//
-//		}
-//
-//		for (int i = 0; i < 5; i++) {
-//			if (employee[i].getNmEmployee() == null) {
-//				continue;
-//			}
 		//				System.out.println(employee[i]);
 		//			}
-//		
+		//2-7
-//		
+		//		System.out.println("現在の社員データ件数:" + EmployeeData.getEmpCount() + "件");
-//		
+		//					for (int i = 0; i < 5; i++) {
-//		System.out.println("現在の社員データ数"+EmployeeData.getEmpCount());
+		//						employee[i].showInfo();
-//		
+		//					}
-//		System.out.println(EmployeeData.COMPANY_NAME);
+		//2-7
+		//2-5
+		//1-6
+		//1-5
 
-//		System.out.println();
+		//1-7
-//		System.out.println(employee.nmEmployee);
+		//3-5
-//		System.out.println(employee.knEmployee);
+		//		System.out.println(employee[2].getPrimaryKeyValue().equals("10002"));
-//		System.out.println(employee.mailAddress);
+		//		System.out.println(employee[2].getPrimaryKeyValue().equals("99999"));
-//		System.out.println(employee.password);
+		//3-5
-//		System.out.println(employee.idDepartment);
+		//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,4 +1,3 @@
-package day3_123;
 
 public class Rectangle extends Shape {
 	private double width;
@@ -14,5 +13,4 @@ public class Rectangle extends Shape {
 	public double area() {
 		return width * height;
 	}
-
 }

em-oop/src/Shape.java

@@ -1,7 +1,7 @@
-package day3_123;
 
 public abstract class Shape {
 	private String name;
+
 	public Shape(String name) {
 		this.name = name;
 	}
@@ -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;
 
-	public void printProfile() {
+	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++;
 	}
 
-	public static int getStudentCount() {
+	static int getStudentCount() {
 		return studentCount;
-	}
-	
-	
 
 	}
+	//2-3
+}

em-oop/src/day3_123/Day3Check2.java

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