２日目の９段階目終了

.gitignore

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

em-oop/src/BaseData.java

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

@@ -2,16 +2,13 @@
 public class BasicCheck1 {
 
 	public static void main(String[] args) {
-		// TODO 自動生成されたメソッド・スタブ
-		Book book1 = new Book();
-		System.out.println(book1.title);
-		System.out.println(book1.author);
-		System.out.println(book1.price);
 
-		Book book2 = new Book("銀河鉄道の夜","宮沢賢治",500);
+		Book book1 = new Book();
-		System.out.println(book2.title);
+		Book book2 = new Book("銀河鉄道の夜", "宮沢賢治", 500);
-		System.out.println(book2.author);
+
-		System.out.println(book2.price);
+		System.out.println(book1.title + "\n" + book1.author + "\n" + book1.price);
+		System.out.println(book2.title + "\n" + book2.author + "\n" + book2.price);
+
 	}
 
 }

em-oop/src/BasicCheck2.java

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

em-oop/src/BasicCheck3.java

@@ -1,28 +1,31 @@
 
 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[0].setPrice(120);
+		items[1].setPrice(80);
 		items[2].setPrice(60);
+
+		items[0].setStock(50);
+		items[1].setStock(30);
 		items[2].setStock(100);
-		for (int i=0; i<=2; i++) {
+
+		for (int i = 0; i < items.length; i++) {
 			items[i].sell(5);
-			System.out.println(items[i]);
+			System.out.println(items[i].getName() + " " + items[i].getPrice() + "円 (残り" + items[i].getStock() + "個) ");
+			//			System.out.println("合計金額　" + items[i].totalPrice() + "円");
+			//			System.out.println();
+
 		}
 
 	}
+
 }

em-oop/src/Book.java

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

em-oop/src/Circle.java

@@ -6,15 +6,15 @@ 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 + ")");
+		System.out.println("(半径：" + this.radius + ")");
 	}
 }

em-oop/src/Day3Check1.java

@@ -1,13 +1,8 @@
 
 public class Day3Check1 {
-
 	public static void main(String[] args) {
-		Circle circle = new Circle(2);
+		Circle radius = new Circle(2);
-		circle.showInfo();
+		radius.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 rect = new Rectangle(3, 4);
+		rect.showInfo();
+		
+		Greeting greeting = new JapaneseGreeting();
+		System.out.println(greeting.hello());
+	}
+
+}

em-oop/src/Day3Check3.java

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

@@ -1,7 +1,12 @@
 
-public class DepartmentDate extends BaseDate {
+public class DepartmentData extends BaseData {
-	private String idDepartment;
+	private String idDepartment, nmDepartment;
-	private String nmDepartment;
+
+	public DepartmentData(String idDepartment,String nmDepartment) {
+		this.setIdDepartment(idDepartment);
+		this.setNmDepartment(nmDepartment);
+		return; 
+			}
 
 
 	public String getIdDepartment() {
@@ -22,20 +27,13 @@ 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,5 +1,5 @@
 
-public class EmployeeData extends BaseDate {
+public class EmployeeData extends BaseData {
 	private String idEmployee;
 	private String nmEmployee;
 	private String knEmployee;
@@ -7,12 +7,44 @@ public class EmployeeData extends BaseDate {
 	private String password;
 	private String idDepartment;
 
+	private static int empCount = 0;
+
+	static int getempCount() {
+		return empCount;
+
+	}
+
+	public EmployeeData() {
+		empCount++;
+
+	}
+
+	static int getEmpCount() {
+		return 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;
 	}
 
 	public void setIdEmployee(String idEmployee) {
 		this.idEmployee = idEmployee;
+		if (idEmployee == null || idEmployee.strip().isEmpty()) {
+			System.out.println("社員IDが空のため設定できませんでした");
+			return;
+		}
 	}
 
 	public String getNmEmployee() {
@@ -21,6 +53,11 @@ public class EmployeeData extends BaseDate {
 
 	public void setNmEmployee(String nmEmployee) {
 		this.nmEmployee = nmEmployee;
+
+		if (nmEmployee == null || nmEmployee.strip().isEmpty()) {
+			System.out.println("社員名が空のため設定できませんでした");
+			return;
+		}
 	}
 
 	public String getKnEmployee() {
@@ -57,62 +94,28 @@ public class EmployeeData extends BaseDate {
 
 	@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;
+		return (this.getIdEmployee() + "\t" + this.getNmEmployee() + "\t" + this.getKnEmployee() + "\t"
+				+ this.getMailAddress() + "\t" + this.getPassword() + "\t" + this.getIdDepartment());
 
-	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;
+		return getIdEmployee() + "," + getNmEmployee() + "," + getKnEmployee() + "," + getMailAddress() + ","
-		str = (getIdEmployee() + "," + getNmEmployee() + "," + getKnEmployee() + "," + getMailAddress()
+				+ getPassword() + "," + getIdDepartment();
-		+ "," + getPassword() + "," + getIdDepartment());
-		return str;
 	}
 
-	@Override
 	public String getPrimaryKeyValue() {
-		return idEmployee;
+		return getIdEmployee();
 	}
+
 	public boolean isMatchId(String id) {
-//		System.out.println(id + "を検索します");
+		if (id == null || this.idEmployee == null) {
-		if(id.equals(idEmployee)) {
-			return true;
-		} else {
 			return false;
+		}
+		return this.idEmployee.equals(id);
 
 	}
-	}
+
 }

em-oop/src/Greeting.java

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

em-oop/src/Item.java

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

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

em-oop/src/Main.java

@@ -1,184 +1,130 @@
-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 = (" ");
+		//		while (true) {
-		while (!str1.equals("0")) {
+		//			Scanner scanner = new Scanner(System.in);
-			System.out.println("1:検索　2:登録　3:更新: 4:削除 0:終了");
+		//			System.out.println("検索したい社員IDを入力してください（終了する場合は0）");
-			Scanner sc1 = new Scanner(System.in);
+		//			String input = scanner.nextLine();
-			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")) {
+		BaseData[] employees = new BaseData[5];
-				System.out.println("社員IDを入力してください");
+		//		BaseData employee = new EmployeeData("10000", "山田龍也", "ヤマダタツヤ", "yamada@hoge.jp", "aaa", "10");
-				Scanner sc4 = new Scanner(System.in);
+		BaseData[] allData = new BaseData[11];
-				String str4 = sc4.nextLine();
+		//		
-				for (int k = 0; k < list.size(); k++) {
+
-					if (list.get(k).getIdEmployee().equals(str4)) {
+		allData[0] = new EmployeeData("10000", "山田龍也", "ヤマダタツヤ", "yamada@hoge.jp", "aaa", "10");
-						System.out.println(str4);
+		allData[1] = new EmployeeData("10001", "高橋準", "タカハシジュン", "jtaka@hoge.jp", "bbb", "10");
-						System.out.println("社員名を入力してください");
+		allData[2] = new EmployeeData("10002", "麻枝史明", "マエダフミアキ", "fmak@hoge.jp", "ccc", "11");
-						Scanner sc5 = new Scanner(System.in);
+		allData[3] = new EmployeeData("10003", "丸戸章介", "マルトショウスケ", "marusyo@hoge.jp", "ddd", "12");
-						String str5 = sc5.nextLine();
+		allData[4] = new EmployeeData("10004", "三宅武", "ミタケタケシ", "miya@hoge.jp", "eee", "13");
-						System.out.println(str5);
+		allData[5] = new DepartmentData("10", "役員");
-						System.out.println("フリガナを入力してください");
+		allData[6] = new DepartmentData("11", "人事・総務部");
-						Scanner sc6 = new Scanner(System.in);
+		allData[7] = new DepartmentData("12", "経理");
-						String str6 = sc6.nextLine();
+		allData[8] = new DepartmentData("13", "システム開発事業部");
-						System.out.println(str6);
+		allData[9] = new DepartmentData("14", "教育事業部");
-						System.out.println("メールアドレスを入力してください");
+		allData[10] = new DepartmentData("15", "営業企画部");
-						Scanner sc7 = new Scanner(System.in);
+
-						String str7 = sc7.nextLine();
+		//		String targetDeptId = "";
-						System.out.println(str7);
+		//
-						System.out.println("パスワードを入力してください");
+		//		for (int i = 0; i < allData.length; i++) {
-						Scanner sc8 = new Scanner(System.in);
+		//
-						String str8 = sc8.nextLine();
+		//			if (allData[i] instanceof DepartmentData) {
-						System.out.println(str8);
+		//				DepartmentData dept = (DepartmentData) allData[i];
-						System.out.println("部署IDを入力してください");
+		//
-						Scanner sc9 = new Scanner(System.in);
+		//				if (dept.getNmDepartment().equals("システム開発事業部")) {
-						String str9 = sc9.nextLine();
+		//					targetDeptId = dept.getIdDepartment();
-						System.out.println(str9);
+		//					break;
-						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("入力された値で情報が見つかりませんでした");
+		//		for (int i = 0; i < allData.length; i++) {
-					}
+		//			if (allData[i] instanceof EmployeeData) {
-				}
+		//				EmployeeData emp = (EmployeeData) allData[i];
-			} else if (str1.equals("4")) {
+		//				if (emp.getIdDepartment().equals(targetDeptId)) {
-				System.out.println("削除するIDを入力してください");
+		//					System.out.println(emp.getNmEmployee() + "\t" + emp.getMailAddress());
-				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");
+		//		int count = 0;
-						System.out.println("y/Y以外の入力であればキャンセル");
+		//		int countt = 0;
-						Scanner sc5 = new Scanner(System.in);
+		//		for (int i = 0; i < allData.length; i++) {
-						String str5 = sc5.nextLine();
+		//			if (allData[i] instanceof EmployeeData) {
-						System.out.println(str5);
+		//				//				count++;
-						if (str5.equals("y") || str5.equals("Y")) {
+		//				EmployeeData emp = (EmployeeData) allData[i];
-							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++;
+		//			else if (allData[i] instanceof DepartmentData) {
-		//				System.out.println(alldate[i]);
+		//				countt++;
 		//			}
+
+		//		System.out.println("社員のデータ：" + count + "件");
+		//		System.out.println("部署のデータ：" + countt + "件");
+
+		//			System.out.println(allData[i]);
+
+		//			employees[0] = new EmployeeData("10000", "山田龍也", "ヤマダタツヤ", "yamada@hoge.jp", "aaa", "10");
+		//			employees[1] = new EmployeeData("10001", "高橋準", "タカハシジュン", "jtaka@hoge.jp", "bbb", "10");
+		//			employees[2] = new EmployeeData("10002", "麻枝史明", "マエダフミアキ", "fmak@hoge.jp", "ccc", "11");
+		//			employees[3] = new EmployeeData("10003", "丸戸章介", "マルトショウスケ", "marusyo@hoge.jp", "ddd", "12");
+		//			employees[4] = new EmployeeData("10004", "三宅武", "ミタケタケシ", "miya@hoge.jp", "eee", "13");
+		//			//
+
+		//		for (int i = 0; i < employees.length; i++) {
+		//			System.out.println(allData[i]);
 		//		}
-		//		System.out.println("社員データ:" + num1 + "件");
+		//		System.out.println("現在の社員データ件数：" + EmployeeData.getEmpCount() + "件");
-		//		System.out.println("部署データ" + num2 + "件");
+
-		//		int j = EmployeeData.getEmpCount();
+		if (allData[0] instanceof EmployeeData) {
-		//		System.out.println("現在の社員データ件数;" + j + "件");
+			EmployeeData sampleEmp = (EmployeeData) allData[0];
-		//		String id = ("");
+			sampleEmp.setNmEmployee("");
-		//		for (int k = 0; k <= 10; k++) {
+		}
-		//			if (alldate[k] instanceof DepartmentDate) {
+		if (allData[0] instanceof EmployeeData) {
-		//				DepartmentDate dep = (DepartmentDate) alldate[k];
+			EmployeeData sampleEmp = (EmployeeData) allData[0];
-		//				if (dep.getNmDepartment().equals("システム開発事業部")) {
+			sampleEmp.setIdEmployee("");
-		//					id = dep.getIdDepartment();
+		}
+
+		//			String serchId1 = "10002";
+		//		System.out.println(serchId1 + "を検索します");
+		//		boolean bo = false;
+		//		for (int i = 0; i < employees.length; i++) {
+		//			if (((EmployeeData) employees[i]).isMatchId(serchId1)) {
+		//				bo = true;
+		//				break;
+		//			}
+		//
+		//		}
+		//		System.out.println(bo);
+		//			String serchId2 = "99999";
+		//		System.out.println(serchId2 + "を検索します");
+		//		boolean bl = false;
+		//		for (int i = 0; i < employees.length; i++) {
+		//			if (((EmployeeData) employees[i]).isMatchId(serchId2)) {
+		//				bl = true;
 		//				break;
 		//			}
 		//		}
-		//		}
+		//		System.out.println(bl);
-		//		for (int l = 0; l < 10; l++) {
+
-		//			if (alldate[l] instanceof EmployeeData) {
+		//			boolean a = false;
-		//				EmployeeData emp = (EmployeeData) alldate[l];
+		//			for (int i = 0; i < employees.length; i++) {
-		//				if (emp.getIdDepartment().equals(id)) {
+		//				if (((EmployeeData) employees[i]).isMatchId(input)) {
-		//					System.out.println(emp.getNmEmployee() + " " + emp.getMailAddress());
+		//					a = true;
-		//				}
+		//					System.out.println(employees[i]);
-		//			}
-		//		}
-		//		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 (!a) {
 		//				System.out.println("該当する社員が見つかりませんでした");
 		//			}
-		//		}
+		//			if (input.equals("0")) {
 		//				System.out.println("システムを終了します");
+		//				break;
+		//			}
+
+		//		System.out.println(employee.toCSV());
+		//		System.out.println(employee.getPrimaryKeyValue());
 	}
 }

em-oop/src/Rectangle.java

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

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

em-oop/src/Student.java

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