配列をArrayListに変更

.classpath

@@ -0,0 +1,6 @@
+<?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,3 +25,4 @@ hs_err_pid*
 replay_pid*
 
 /.metadata/
+/bin/

.project

@@ -0,0 +1,17 @@
+<?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,7 +1,8 @@
 
-public abstract class BaseDate {
+public abstract class BaseData {
 	public abstract String toString();
 	public abstract String toCSV();
 	public abstract String getPrimaryKeyValue();
 
 }
+             

em-oop/src/BasicCheck1.java

@@ -4,14 +4,20 @@ 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,17 +1,21 @@
 
 public class BasicCheck2 {
-
 	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();
-		int total=Student.getStudentCount();
+		
-		System.out.println("現在の生徒数" + total + "人");
+		System.out.println("現在の生徒数："+Student.getStudentCount()+"人");
-	}
 		
 
+//		student.studentId = 1;
+//		student.name = "鈴木一郎";
+//
+//		student.printProfile();
+	}
+
 }

em-oop/src/BasicCheck3.java

@@ -1,28 +1,35 @@
 
 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]代入
+		
 		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++) {
+		
+		
+		
+		for(int i=0;i<3;i++) {
 			items[i].sell(5);
 			System.out.println(items[i]);
+//			System.out.println("合計金額："+items[i].totalPrice());
 		}
 		
+		
+		
 	}
+	
+	
+
 }

em-oop/src/Book.java

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

em-oop/src/Day3Check1.java

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

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

em-oop/src/EmployeeData.java

@@ -1,30 +1,96 @@
 
-public class EmployeeData extends BaseDate {
+public class EmployeeData extends BaseData {
 	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 idEmployee;
+		return this.idEmployee;
 	}
 
 	public void setIdEmployee(String idEmployee) {
+		idEmployee = idEmployee.strip();
+		int idNum = idEmployee.length();
+
+		if (idNum == 0) {
+			System.out.println("社員IDが空のため設定できませんでした");
+		} else {
 			this.idEmployee = idEmployee;
 		}
+	}
 
 	public String getNmEmployee() {
 		return nmEmployee;
 	}
 
 	public void setNmEmployee(String nmEmployee) {
+		nmEmployee = nmEmployee.strip();
+		int nmNum = nmEmployee.length();
+		if (nmNum == 0) {
+			System.out.println("社員名が空のため設定できませんでした");
+
+		} else {
 			this.nmEmployee = nmEmployee;
 		}
+	}
 
 	public String getKnEmployee() {
-		return knEmployee;
+		return this.knEmployee;
 	}
 
 	public void setKnEmployee(String knEmployee) {
@@ -32,7 +98,7 @@ public class EmployeeData extends BaseDate {
 	}
 
 	public String getMailAddress() {
-		return mailAddress;
+		return this.mailAddress;
 	}
 
 	public void setMailAddress(String mailAddress) {
@@ -55,64 +121,4 @@ public class EmployeeData extends BaseDate {
 		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/Item.java

@@ -4,36 +4,40 @@ public class Item {
 	private int price;
 	private int stock;
 	
-	public String getName() {
+	public void sell(int amount) {
-		return name;
+		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;
 	}
 	
-	public int getPrice() {
-		return price;
-	}
 	
+	public int getPrice() {
+		return this.price;
+	}
 	public void setPrice(int price) {
 		this.price=price;
 	}
 	
-	public int getStock() {
-		return stock;
-	}
 	
+	public int getStock() {
+		return this.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/Main.java

@@ -2,183 +2,201 @@ 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 営業企画部");
 
-		String str1 = (" ");
+		//		BaseData employee = new EmployeeData();
-		while (!str1.equals("0")) {
+		//		BaseData[] employees = new BaseData[];
-			System.out.println("1:検索　2:登録　3:更新: 4:削除 0:終了");
+		//		BaseData[] allData = new BaseData();
-			Scanner sc1 = new Scanner(System.in);
+		ArrayList<BaseData> allData = new ArrayList<>();
-			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));
 
-			} else if (str1.equals("3")) {
+		allData.add(new EmployeeData("10000", "山田龍也", "ヤマダタツヤ", "yamada@hoge.jp", "aaa", "10"));
-				System.out.println("社員IDを入力してください");
+		//		allData[1] = new EmployeeData("10001", "高橋準", "タカハシジュン", "jtaka@hoge.jp", "bbb", "10");
-				Scanner sc4 = new Scanner(System.in);
+		//		allData[2] = new EmployeeData("10002", "麻枝史明", "マエダフミアキ", "fmak@hoge.jp", "ccc", "11");
-				String str4 = sc4.nextLine();
+		//		allData[3] = new EmployeeData("10003", "丸戸章介", "マルトショウスケ", "marusyo@hoge.jp", "ddd", "12");
-				for (int k = 0; k < list.size(); k++) {
+		//		allData[4] = new EmployeeData("10004", "三宅武", "ミヤケタケシ", "miya@hoge.jp", "eee", "13");
-					if (list.get(k).getIdEmployee().equals(str4)) {
+		//		allData[11] = new EmployeeData("10005", "丸井悠", "マルイハルカ", "haru@hoge.jp", "fff", "13");
-						System.out.println(str4);
+		//		allData[12] = new EmployeeData("10006", "涼元香織", "スズモトカオリ", "suzumoto@hoge.jp", "ggg", "13");
-						System.out.println("社員名を入力してください");
+		//		allData[13] = new EmployeeData("10007", "葉山稔", "ハヤマミノル", "mhayama@hoge.jp", "hhh", "14");
-						Scanner sc5 = new Scanner(System.in);
+		//		allData[14] = new EmployeeData("10008", "川上朱里", "カワカミアカリ", "kawakami@hoge.jp", "iii", "14");
-						String str5 = sc5.nextLine();
+		//		allData[15] = new EmployeeData("10009", "杉井肇", "スギイハジメ", "sugi@hoge.jp", "jjj", "15");
-						System.out.println(str5);
+		//
-						System.out.println("フリガナを入力してください");
+		//		DepartmentData dept = new DepartmentData();
-						Scanner sc6 = new Scanner(System.in);
+		//		dept.setIdDepartment("10");
-						String str6 = sc6.nextLine();
+		//		dept.setNmDepartment("役員");
-						System.out.println(str6);
+		//		allData[5] = dept;
-						System.out.println("メールアドレスを入力してください");
+		//		dept = new DepartmentData();
-						Scanner sc7 = new Scanner(System.in);
+		//		dept.setIdDepartment("11");
-						String str7 = sc7.nextLine();
+		//		dept.setNmDepartment("人事・総務部");
-						System.out.println(str7);
+		//		dept = new DepartmentData();
-						System.out.println("パスワードを入力してください");
+		//		allData[6] = dept;
-						Scanner sc8 = new Scanner(System.in);
+		//		dept.setIdDepartment("12");
-						String str8 = sc8.nextLine();
+		//		dept.setNmDepartment("経理部");
-						System.out.println(str8);
+		//		allData[7] = dept;
-						System.out.println("部署IDを入力してください");
+		//		dept = new DepartmentData();
-						Scanner sc9 = new Scanner(System.in);
+		//		dept.setIdDepartment("13");
-						String str9 = sc9.nextLine();
+		//		dept.setNmDepartment("システム開発事業部");
-						System.out.println(str9);
+		//		allData[8] = dept;
-						System.out.println("更新が完了しました");
+		//		dept = new DepartmentData();
-						list.set(k, new EmployeeData(str4, str5, str6, str7, str8, str9));
+		//		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;
-					} else if (!list.get(k).getIdEmployee().equals(str4) && k == list.size()) {
-						System.out.println("入力された値で情報が見つかりませんでした");
 			}
+
+			//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 (str1.equals("4")) {
+
-				System.out.println("削除するIDを入力してください");
+				} else if (usertype.equals("2")) {
-				Scanner sc4 = new Scanner(System.in);
+					System.out.println("IDを入力してください");
-				String str4 = sc4.nextLine();
+					usertype = scanner.nextLine();
-				for (int l = 0; l < list.size(); l++) {
+
-					if (list.get(l).getIdEmployee().equals(str4)) {
+					boolean result = false;
-						System.out.println("指定されたIDの情報を削除します？ y/Y");
+					for (int i = 0; i < allData.size(); i++)
-						System.out.println("y/Y以外の入力であればキャンセル");
+						if (allData.get(i) instanceof EmployeeData) {
-						Scanner sc5 = new Scanner(System.in);
+							EmployeeData employee = (EmployeeData) allData.get(i);
-						String str5 = sc5.nextLine();
+							if (employee.getIdEmployee().equals(usertype)) {
-						System.out.println(str5);
+								result = true;
-						if (str5.equals("y") || str5.equals("Y")) {
+								System.out.println(employee.toString());
-							list.remove(l);
-							System.out.println("削除されました");
 								break;
+							}
+
+						}
+					if (result == false) {
+						System.out.println("入力された値で情報がみつかりませんでした");
+						
+					}
+
 				} else {
-							System.out.println("入力された値で情報が見つかりませんでした");
+					continue;
+
+				}
+
+			}
+
+			//2:登録
+			if (usertype.equals("2")) {
+				System.out.println("社員IDを入力してください");
+			}
+
+		}
+
 	}
 }
-				}
+
-			}
+//Day3.9---所属部署から従業員のメアドを検索する
-		}
+//		DepartmentData dep = null;
-		System.out.println("システムを終了します");
+//		EmployeeData emp;
-		//		 num1 = 0;
+//		String nmD = null;
-		//		int num2 = 0;
+//
-		//		for (int i = 0; i <= 10; i++) {
+//		for (int i = 0; i < allData.length; i++) {
-		//			if (alldate[i] instanceof EmployeeData) {
+//			if (allData[i] instanceof DepartmentData) {
-		//				num1++;
+//				dep = (DepartmentData) allData[i];
-		//				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();
+//					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();
+//
 //			}
-		//		}
+//
-		//		for (int l = 0; l < 10; l++) {
+//			if (result == false) {
-		//			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("システムを終了します");
+//
-	}
+//		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

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

em-oop/src/day3_123/Circle.java

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

em-oop/src/day3_123/Day3Check1.java

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

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

@@ -1,9 +1,11 @@
+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);
 		shape2.showInfo();
 	}

em-oop/src/day3_123/Greeting.java

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

em-oop/src/day3_123/JapaneseGreeting.java

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

em-oop/src/day3_123/Rectangle.java

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

@@ -0,0 +1,15 @@
+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()+"です");
+	}
+
+}