emopで検索、登録、更新、削除の追加をしました。

.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/BaseDate.java

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

em-oop/src/BasicCheck1.java

@@ -4,20 +4,14 @@ public class BasicCheck1 {
 	public static void main(String[] args) {
 		// TODO 自動生成されたメソッド・スタブ
 		Book book1 = new Book();
-		Book book2 = new Book("銀河鉄道の夜","宮沢賢治",500);
-		
-//		book.title = "吾輩は猫である";
-//		book.author = "夏目漱石";
-//		book.price = 800;
-		
 		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);
-
 	}
 
 }

em-oop/src/BasicCheck2.java

@@ -1,21 +1,17 @@
 
 public class BasicCheck2 {
-	public static void main(String[] args) {
-		Student student1 = new Student(1, "鈴木一郎");
-		Student student2 = new Student(2, "田中花子");
-		Student student3 = new Student(3, "佐藤次郎");
 
+	public static void main(String[] args) {
+		// TODO 自動生成されたメソッド・スタブ
+		Student student1 = new Student(1,"鈴木一郎");
+		Student student2 = new Student(2,"田中花子");
+		Student student3 = new Student(3,"佐藤次郎");
 		student1.printProfile();
 		student2.printProfile();
 		student3.printProfile();
-		
-		System.out.println("現在の生徒数："+Student.getStudentCount()+"人");
-		
-
-//		student.studentId = 1;
-//		student.name = "鈴木一郎";
-//
-//		student.printProfile();
+		int total=Student.getStudentCount();
+		System.out.println("現在の生徒数" + total + "人");
 	}
 	
+
 }

em-oop/src/BasicCheck3.java

@@ -1,35 +1,28 @@
 
 public class BasicCheck3 {
+
 	public static void main(String[] args) {
+		// 配列
 		Item[] items = new Item[3];
 		items[0] = new Item();
 		items[1] = new Item();
 		items[2] = new Item();
-		
-		items[0].setName("ノート") ;
+		//items[0]代入
+		items[0].setName("ノート");
 		items[0].setPrice(120);
-		items[0].setStock(50);
-		
+		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<3;i++) {
+		for (int i=0; i<=2; i++) {
 			items[i].sell(5);
 			System.out.println(items[i]);
-//			System.out.println("合計金額："+items[i].totalPrice());
 		}
 
-		
-		
 	}
-	
-	
-
 }

em-oop/src/Book.java

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

em-oop/src/Circle.java

@@ -1,22 +1,20 @@
-package day3_123;
 
 public class Circle extends Shape {
 	private double radius;
 	
 	public Circle(double radius) {
 		super("円");
-		this.radius=radius;
+		this.radius = radius;
 	}
-	
 	@Override
 	public double area() {
-		return Math.PI*radius*radius;
+		double num;
+		num = Math.PI * radius * radius;
+		return num;
 	}
-	
 	@Override
 	public void showInfo() {
 		super.showInfo();
-		System.out.println("(半径:"+this.radius+")");
+		System.out.println("(半径:" + this.radius + ")");
 	}
-
 }

em-oop/src/Day3Check1.java

@@ -0,0 +1,13 @@
+
+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/Day3Check3.java

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

em-oop/src/DepartmentDate.java

@@ -1,8 +1,9 @@
 
-public class DepartmentData extends BaseData {
+public class DepartmentDate extends BaseDate {
 	private String idDepartment;
 	private String nmDepartment;
 	
+
 	public String getIdDepartment() {
 		return idDepartment;
 	}
@@ -21,17 +22,20 @@ public class DepartmentData extends BaseData {
 
 	@Override
 	public String toString() {
-		return getIdDepartment() + "\t" + getNmDepartment();
+		String str1 = (getIdDepartment() + "\t" + getNmDepartment());
+		return str1;
 	}
 
 	@Override
 	public String toCSV() {
-				return getIdDepartment() + "," + getNmDepartment();
+		String str2 = (getIdDepartment() + "," + getNmDepartment());
+		return str2;
 	}
 
 	@Override
 	public String getPrimaryKeyValue() {
-				return getIdDepartment();
+		String str3 = (getIdDepartment());
+		return str3;
 	}
 
 }

em-oop/src/EmployeeData.java

@@ -1,77 +1,18 @@
 
-public class EmployeeData extends BaseData {
+public class EmployeeData extends BaseDate {
 	private String idEmployee;
 	private String nmEmployee;
 	private String knEmployee;
 	private String mailAddress;
 	private String password;
 	private String idDepartment;
-	private static int empCount = 0;
-
-	static final String COMPANY_NAME = "Rhizome";
-
-	public void showInfo() {
-		System.out.println(this.idEmployee + "\t" + this.nmEmployee + "\t" + this.knEmployee + "\t" + this.mailAddress
-				+ "\t" + this.mailAddress + "\t" + this.password + "\t" + this.idDepartment);
-	}
-
-	@Override
-	public String toString() {
-		return getIdEmployee() + "\t" + getNmEmployee() + "　" + getKnEmployee() + "\t" + getMailAddress()
-				+ "\t" + getPassword() + "\t" + getIdDepartment();
-	}
-
-	@Override
-	public String toCSV() {
-		return getIdEmployee() + "," + getNmEmployee() + "," + getKnEmployee() + "," + getMailAddress() + ","
-				+ getPassword() + "," + getIdDepartment();
-	}
-
-	@Override
-	public String getPrimaryKeyValue() {
-		return idEmployee;
-
-	}
-
-	public boolean isMatchId(String id) {
-		return idEmployee.equals(id);
-	}
-
-	static int getEmpCount() {
-		return empCount;
-	}
-
-	//getNmEmployee.strip();
-
-	public EmployeeData() {
-		empCount++;
-
-	}
-
-	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);
-			empCount++;
-	}
 
 	public String getIdEmployee() {
-		return this.idEmployee;
+		return idEmployee;
 	}
 
 	public void setIdEmployee(String idEmployee) {
-		idEmployee = idEmployee.strip();
-		int idNum = idEmployee.length();
-
-		if (idNum == 0) {
-			System.out.println("社員IDが空のため設定できませんでした");
-		} else {
-			this.idEmployee = idEmployee;
-		}
+		this.idEmployee = idEmployee;
 	}
 
 	public String getNmEmployee() {
@@ -79,18 +20,11 @@ public class EmployeeData extends BaseData {
 	}
 
 	public void setNmEmployee(String nmEmployee) {
-		nmEmployee = nmEmployee.strip();
-		int nmNum = nmEmployee.length();
-		if (nmNum == 0) {
-			System.out.println("社員名が空のため設定できませんでした");
-
-		} else {
-			this.nmEmployee = nmEmployee;
+		this.nmEmployee = nmEmployee;
 		}
-	}
 
 	public String getKnEmployee() {
-		return this.knEmployee;
+		return knEmployee;
 	}
 
 	public void setKnEmployee(String knEmployee) {
@@ -98,7 +32,7 @@ public class EmployeeData extends BaseData {
 	}
 
 	public String getMailAddress() {
-		return this.mailAddress;
+		return mailAddress;
 	}
 
 	public void setMailAddress(String mailAddress) {
@@ -121,4 +55,64 @@ public class EmployeeData extends BaseData {
 		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;
+			
+		}
+	}
 }

em-oop/src/Greeting.java

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

em-oop/src/Item.java

@@ -4,40 +4,36 @@ public class Item {
 	private int price;
 	private int stock;
 	
-	public void sell(int amount) {
-		this.setStock(this.getStock()-amount) ;
-	}
-	
-	public int totalPrice() {
-		return this.price*this.stock;
-	}
-	
-	@Override
-	public String toString() {
-		return getName()+" "+getPrice()+"円(残り"+getStock()+"個)";
-	}
-	
 	public String getName() {
-		return this.name;
-	}
-	public void setName(String name) {
-		this.name=name;
+		return name;
 	}
 
+	public void setName(String name) {
+		this.name = name;
+	}
 
 	public int getPrice() {
-		return this.price;
-	}
-	public void setPrice(int price) {
-		this.price=price;
+		return price;
 	}
 
+	public void setPrice(int price) {
+		this.price = price;
+	}
 
 	public int getStock() {
-		return this.stock;
-	}
-	public void setStock(int stock) {
-		this.stock=stock;
+		return stock;
 	}
 
+	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;
+	}
 }

em-oop/src/JapaneseGreeting.java

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

em-oop/src/Main.java

@@ -2,201 +2,183 @@ import java.util.ArrayList;
 import java.util.Scanner;
 
 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 営業企画部");
 
-		//		BaseData employee = new EmployeeData();
-		//		BaseData[] employees = new BaseData[];
-		//		BaseData[] allData = new BaseData();
-		ArrayList<BaseData> allData = new ArrayList<>();
-
-		allData.add(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[11] = new EmployeeData("10005", "丸井悠", "マルイハルカ", "haru@hoge.jp", "fff", "13");
-		//		allData[12] = new EmployeeData("10006", "涼元香織", "スズモトカオリ", "suzumoto@hoge.jp", "ggg", "13");
-		//		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);
-
-		while (true) {
-			System.out.println("1:検索 2:登録 3:更新 4:削除 0:終了");
-			String usertype = scanner.nextLine();
-
-			//0:終了
-			if (usertype.equals("0")) {
-				break;
-			}
-
-			//1:検索
-			if (usertype.equals("1")) {
-				System.out.println("1:全検索 2:条件検索 それ以外:戻る");
-				usertype = scanner.nextLine();
-				if (usertype.equals("1")) {
-					for (int i = 0; i < allData.size(); i++)
-						if (allData.get(i) instanceof EmployeeData) {
-							System.out.println(allData.get(i).toString());
-						}
-
-				} else if (usertype.equals("2")) {
-					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("入力された値で情報がみつかりませんでした");
-						
+		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 {
-					continue;
-
 				}
-
-			}
-
-			//2:登録
-			if (usertype.equals("2")) {
+			} 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));
+
+			} 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]);
+		//			}
+		//		}
+		//		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();
+		//					break;
+		//				}
+		//			}
+		//		}
+		//		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")) {
+		//					System.out.println("該当する社員が見つかりませんでした");
+		//			}
+		//		}
+		//		System.out.println("システムを終了します");
 	}
 }
-
-//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]);
-//		}
-//		
-//		
-//		
-//		System.out.println("現在の社員データ数"+EmployeeData.getEmpCount());
-//		
-//		System.out.println(EmployeeData.COMPANY_NAME);
-
-//		System.out.println();
-//		System.out.println(employee.nmEmployee);
-//		System.out.println(employee.knEmployee);
-//		System.out.println(employee.mailAddress);
-//		System.out.println(employee.password);
-//		System.out.println(employee.idDepartment);

em-oop/src/Shape.java

@@ -0,0 +1,14 @@
+
+public abstract class Shape {
+	private String name;
+	
+	public Shape (String name) {
+		this.name = name;
+	}
+	
+	public abstract double area() ;
+	
+	public void showInfo() {
+		System.out.println(this.name + "の面積は" +this.area() + "です");
+	}
+}

em-oop/src/Student.java

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

em-oop/src/day3_123/Day3Check1.java

@@ -1,10 +0,0 @@
-package day3_123;
-
-public class Day3Check1 {
-
-	public static void main(String[] args) {
-		Circle circle=new Circle(2);
-		circle.showInfo();
-	}
-
-}

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());
-	}
-	
-	
-
-}

em-oop/src/day3_123/Rectangle.java

@@ -1,18 +0,0 @@
-package day3_123;
-
-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/day3_123/Shape.java

@@ -1,15 +0,0 @@
-package day3_123;
-
-public abstract class Shape {
-	private String name;
-	public Shape(String name) {
-		this.name=name;
-	}
-	
-	public abstract double area();
-	
-	public void showInfo() {
-		System.out.println(this.name+"の面積は"+this.area()+"です");
-	}
-
-}