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>

.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/.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="src"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>

em-oop/.gitignore

@@ -1,2 +0,0 @@
-/bin/
-/.metadata/

em-oop/.project

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>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,9 +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

@@ -2,22 +2,16 @@
 public class BasicCheck1 {
 
 	public static void main(String[] args) {
-		//Book book = new Book();
+		// TODO 自動生成されたメソッド・スタブ
-		
-		//book.title = "吾輩は猫である";
-		//book.author = "夏目漱石";
-		//book.price = 800;
-		
-		//System.out.println(book.title);
-		//System.out.println(book.author);
-		//System.out.println(book.price);
-		
-		//引数なし
 		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 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) {
-		//変数宣言
+		// TODO 自動生成されたメソッド・スタブ
-		Student students = new Student();
+		Student student1 = new Student(1,"鈴木一郎");
-		//代入
+		Student student2 = new Student(2,"田中花子");
-		//student.studentId = 1;
+		Student student3 = new Student(3,"佐藤次郎");
-		//student.name = "鈴木一郎";
+		student1.printProfile();
-		//student.printProfile();
+		student2.printProfile();
-
+		student3.printProfile();
-		Student students1 = new Student(1, "鈴木一郎");
+		int total=Student.getStudentCount();
-		Student students2 = new Student(2, "田中花子");
+		System.out.println("現在の生徒数" + total + "人");
-		Student students3 = new Student(3, "佐藤次郎");
-
-		students1.printProfile();
-		students2.printProfile();
-		students3.printProfile();
-
-		 System.out.println("現在の生徒数:" + Student.getstudentCount()  + "人");
 	}
+	
+
 }

em-oop/src/BasicCheck3.java

@@ -2,35 +2,27 @@
 public class BasicCheck3 {
 
 	public static void main(String[] args) {
-		//配列3件分
+		// 配列
 		Item[] items = new Item[3];
-		//newインスタンス代入
 		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[0].setStock (50);
-		items[1] = new Item();
+		//items[1]代入
 		items[1].setName("消しゴム");
 		items[1].setPrice(80);
-		items[1].setStock (30);
+		items[1].setStock(30);
-		items[2] = new Item();
+		//items[2]代入
 		items[2].setName("鉛筆");
 		items[2].setPrice(60);
 		items[2].setStock(100);
-		
+		for (int i=0; i<=2; i++) {
-		//for文残り数の引き算
+			items[i].sell(5);
-		for (int i = 0; i <= 2 ; i++) {
-		
-		  items[i].sell(5);
-		}
-		//3件出力
-		for (int i = 0; i <= 2 ; i++) {
 			System.out.println(items[i]);
-			
+		}
-	
-		
-	
-	}
 
 	}
-}
+}

em-oop/src/Book.java

@@ -4,18 +4,15 @@ public class Book {
 	String author;
 	int price;
 	
-	//コンストラクタ生成
+	public Book () {
-	public Book() {
+		title = "タイトル未設定";
-		System.out.println( "タイトル未設定");
+		author = "著者未設定";
-		System.out.println( "著者未設定"); 
+		price = 0;
-		System.out.println( "0"); 
-	}
-	//3つの引数を持つコンストラクタ生成
-	public Book(String title, String author, int price) {
-		System.out.println(this.title = title);
-		System.out.println(this.author = author);
-		System.out.println(this.price = price);
-		
 	}
 	
-}
+	public Book(String title,String author,int price) {
+		this.title = title;
+		this.author = author;
+		this.price = price;
+	}
+}

em-oop/src/Circle.java

@@ -1,21 +1,20 @@
 
 public class Circle extends Shape {
-	//フィールド
 	private double radius;
-	//コンストラクタ
+	
 	public Circle(double radius) {
 		super("円");
 		this.radius = radius;
 	}
-	//メソッド1
 	@Override
 	public double area() {
-		return Math.PI * radius * radius;
+		double num;
-}
+		num = Math.PI * radius * radius;
-	//メソッド2
+		return num;
+	}
 	@Override
 	public void showInfo() {
 		super.showInfo();
-		System.out.println("半径:" + this.radius + "");
+		System.out.println("(半径:" + this.radius + ")");
 	}
-}
+}

em-oop/src/Day3Check1.java

@@ -2,9 +2,12 @@
 public class Day3Check1 {
 
 	public static void main(String[] args) {
-		//インスタンス
+		Circle circle = new Circle(2);
-		 Circle circle = new Circle(2.0); 
+		circle.showInfo();
-		 circle.showInfo();
+		Rectangle rectangle = new Rectangle(3,4);
+		rectangle.showInfo();
+		
+		Greeting greeting = new JapaneseGreeting();
+		System.out.println(greeting.hello());
 	}
-
 }

em-oop/src/Day3Check2.java

@@ -1,17 +0,0 @@
-
-public class Day3Check2 {
-
-	public static void main(String[] args) {
-		//インスタンス
-		Rectangle rect = new Rectangle(3.0,4.0);
-		//メソッド呼び出し
-		rect.showInfo();
-		//戻り値出力
-		//Greeting greeting = new JapaneseGreeting();
-		//System.out.println();
-		
-		//インスタンスを代入
-		Greeting greeting = new JapaneseGreeting();
-		System.out.println(greeting.hello());
-	}
-}

em-oop/src/Day3Check3.java

@@ -2,15 +2,9 @@
 public class Day3Check3 {
 
 	public static void main(String[] args) {
-		// TODO 自動生成されたメソッド・スタブ
-		//インスタンスを代入
 		Shape shape1 = new Circle(2);
-		//メソッド呼び出し
 		shape1.showInfo();
-		
-		//インスタンスを代入
 		Shape shape2 = new Rectangle(3, 4);
-		//メソッド呼び出し
 		shape2.showInfo();
 	}
 

em-oop/src/DepartmentDate.java

@@ -0,0 +1,41 @@
+
+public class DepartmentDate extends BaseDate {
+	private String idDepartment;
+	private String nmDepartment;
+	
+
+	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;
+	}
+
+	@Override
+	public String toString() {
+		String str1 = (getIdDepartment() + "\t" + getNmDepartment());
+		return str1;
+	}
+
+	@Override
+	public String toCSV() {
+		String str2 = (getIdDepartment() + "," + getNmDepartment());
+		return str2;
+	}
+
+	@Override
+	public String getPrimaryKeyValue() {
+		String str3 = (getIdDepartment());
+		return str3;
+	}
+
+}

em-oop/src/EmployeeData.java

@@ -1,11 +1,11 @@
-public class EmployeeData extends BaseData {
+
-	//フィールド宣言
+public class EmployeeData extends BaseDate {
-	private String idEmployee;//社員ID
+	private String idEmployee;
-	private String nmEmployee;//社員名
+	private String nmEmployee;
-	private String knEmployee;//社員カナ
+	private String knEmployee;
-	private String mailAddress;//メールアドレス
+	private String mailAddress;
-	private String password;//パスワード
+	private String password;
-	private String idDepartment;//部署ID
+	private String idDepartment;
 
 	public String getIdEmployee() {
 		return idEmployee;
@@ -21,7 +21,7 @@ public class EmployeeData extends BaseData {
 
 	public void setNmEmployee(String nmEmployee) {
 		this.nmEmployee = nmEmployee;
-	}
+		}
 
 	public String getKnEmployee() {
 		return knEmployee;
@@ -55,59 +55,64 @@ public class EmployeeData extends BaseData {
 		this.idDepartment = idDepartment;
 	}
 
-	//メソッド追加
-		void showInfo() {
-			System.out.println(getIdEmployee());
-			System.out.println(getNmEmployee());
-			System.out.println(getKnEmployee());
-			System.out.println(getMailAddress());
-			System.out.println(getPassword());
-			System.out.println(getIdDepartment());
-		}
-
-	//上記メソッドの書き換え
 	@Override
 	public String toString() {
-		return getIdEmployee() + "\t"+
+		String str;
-				 getNmEmployee() + "\t"+
+		str = (getIdEmployee() + "\t" + getNmEmployee() + "\t" + getKnEmployee() + "\t" + getMailAddress()
-				 getKnEmployee() + "\t"+
+				+ "\t" + getPassword() + "\t" + getIdDepartment());
-				 getMailAddress() + "\t"+
+		return str;
-				 getPassword() + "\t"+
-				 getIdDepartment();
-
 	}
+	
+	private static int empCount = 0;
 
-	//コンストラクタ追加(引数なし)
 	public EmployeeData() {
+		empCount++;
 	}
-
+//
-	//6つ引数持ちコンストラクタ追加
 	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;
 	}
 
-	//メソッド2つ追加
 	@Override
 	public String toCSV() {
-		return getIdEmployee() + "," + getNmEmployee() + "," + getKnEmployee() + "," + getMailAddress() + ","
+		String str;
-				+ getPassword() + "," + getIdDepartment();
+		str = (getIdEmployee() + "," + getNmEmployee() + "," + getKnEmployee() + "," + getMailAddress()
-			}
+		+ "," + getPassword() + "," + getIdDepartment());
+		return str;
+	}
 
 	@Override
 	public String getPrimaryKeyValue() {
-		return this.idEmployee;
+		return idEmployee;
 	}
-
+	public boolean isMatchId(String id) {
-	//メソッド追加、7段目
+//		System.out.println(id + "を検索します");
-	public boolean isMatchID(String id) {
+		if(id.equals(idEmployee)) {
-		return idEmployee.equals(id);
+			return true;
+		} else {
+			return false;
+			
+		}
 	}
-
-
 }

em-oop/src/Greeting.java

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

em-oop/src/Item.java

@@ -1,17 +1,9 @@
 
 public class Item {
-	//フィールド宣言
 	private String name;
 	private int price;
 	private int stock;
-
-	//メソッド宣言
-	void sell(int amount) {
-		this.setStock(this.getStock() - amount);
-	}
 	
-	//ゲッター、セッター設定
-
 	public String getName() {
 		return name;
 	}
@@ -35,8 +27,13 @@ public class Item {
 	public void setStock(int stock) {
 		this.stock = stock;
 	}
-	@Override
+
-	public String toString() {
+	void sell(int amount) {
-		return getName() + " " + getPrice() + "円 (残り" + getStock() + "個)";
+		this.setStock(this.getStock() - amount);
 	}
-}
+	
+	 public String toString() { 
+		String str = getName() + " " + getPrice() + "円 (残り" + getStock() + "個)";
+		return str;
+	}
+}

em-oop/src/JapaneseGreeting.java

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

em-oop/src/Main.java

@@ -1,55 +1,184 @@
+import java.util.ArrayList;
 import java.util.Scanner;
 
 public class Main {
 
 	public static void main(String[] args) {
-		// TODO 自動生成されたメソッド・スタブ
+		ArrayList<EmployeeData> list = new ArrayList<>();
-		//インスタンス宣言
+		list.add(new EmployeeData("10000", "山田龍也", "ヤマダタツヤ", "yamada@hoge.jp", "aaa", "10"));
-		BaseData employee = new EmployeeData();
+		list.add(new EmployeeData("10001", "高橋準", "タカハシジュン", "jtaka@hoge.jp", "bbb", "11"));
-		//配列5件分
+		list.add(new EmployeeData("10002", "麻枝史明", "マエダフミアキ", "fmak@hoge.jp", "ccc", "12"));
-		BaseData[] employees = new BaseData[5];
+		list.add(new EmployeeData("10003", "丸戸章介", "マルトショウスケ", "marusyo@hoge.jp", "ddd", "13"));
-		//５段階目書き換え
+		list.add(new EmployeeData("10004", "三宅武", "ミヤケタケシ", "miya@hoge.jp", "eee", "14"));
-		employees[0] = new EmployeeData("10000", "山田龍也", "ヤマダタツヤ", "yamada@hoge.jp", "aaa", "10");
+		//		list.add("10 役員");
-		employees[1] = new EmployeeData("10001", "高橋準", "タカハシジュン", "jtaka@hoge.jp", "bbb", "10");
+		//		list.add("11 人事・総務部");
-		employees[2] = new EmployeeData("10002", "麻枝文明", "マエダフミアキ", "fmak@hoge.jp", "ccc", "11");
+		//		list.add("12 経理部");
-		employees[3] = new EmployeeData("10003", "丸戸章介", "マルトショウスケ", "marusyo@hoge.jp", "ddd", "12");
+		//		list.add("13 システム開発事業部");
-		employees[4] = new EmployeeData("10004", "三宅武", "ミヤケタケシ", "miya@hoge.jp", "eee", "13");
+		//		list.add("14 教育事業部");
+		//		list.add("15 営業企画部");
 
-		//5段階目記載の処理呼び出し
+		String str1 = (" ");
-		//employee.showInfo();
+		while (!str1.equals("0")) {
+			System.out.println("1:検索　2:登録　3:更新: 4:削除 0:終了");
+			Scanner sc1 = new Scanner(System.in);
+			str1 = sc1.nextLine();
+			System.out.println(str1);
+			if (str1.equals("1")) {
+				System.out.println("1:全検索　2:条件検索　それ以外:戻る");
+				Scanner sc2 = new Scanner(System.in);
+				String str2 = sc2.nextLine();
+				System.out.println(str2);
+				if (str2.equals("1")) {
+					for (int i = 0; i < list.size(); i++) {
+						System.out.println(list.get(i));
+					}
+				} else if (str2.equals("2")) {
+					System.out.println("検索したい社員IDを入力してください");
+					Scanner sc3 = new Scanner(System.in);
+					String str3 = sc3.nextLine();
+					for (int j = 0; j < list.size(); j++) {
+						if (list.get(j).getIdEmployee().equals(str3)) {
+							System.out.println(list.get(j));
+							break;
+						} else if (!list.get(j).getIdEmployee().equals(str3) && j == list.size()) {
+							System.out.println("入力された値で情報が見つかりませんでした");
+						}
+					}
+				}
+			} else if (str1.equals("2")) {
+				System.out.println("社員IDを入力してください");
+				Scanner sc4 = new Scanner(System.in);
+				String str4 = sc4.nextLine();
+				System.out.println(str4);
+				System.out.println("社員名を入力してください");
+				Scanner sc5 = new Scanner(System.in);
+				String str5 = sc5.nextLine();
+				System.out.println(str5);
+				System.out.println("フリガナを入力してください");
+				Scanner sc6 = new Scanner(System.in);
+				String str6 = sc6.nextLine();
+				System.out.println(str6);
+				System.out.println("メールアドレスを入力してください");
+				Scanner sc7 = new Scanner(System.in);
+				String str7 = sc7.nextLine();
+				System.out.println(str7);
+				System.out.println("パスワードを入力してください");
+				Scanner sc8 = new Scanner(System.in);
+				String str8 = sc8.nextLine();
+				System.out.println(str8);
+				System.out.println("部署IDを入力してください");
+				Scanner sc9 = new Scanner(System.in);
+				String str9 = sc9.nextLine();
+				System.out.println(str9);
+				System.out.println("登録が完了しました");
+				list.add(new EmployeeData(str4, str5, str6, str7, str8, str9));
 
-		//Day1、8段階目検索
+			} else if (str1.equals("3")) {
-		while (true) {
+				System.out.println("社員IDを入力してください");
-			Scanner sc = new Scanner(System.in);//インスタンス化
+				Scanner sc4 = new Scanner(System.in);
-			System.out.println("検索したい社員IDを入力してください(終了する場合は０を入力)");
+				String str4 = sc4.nextLine();
-			String id = sc.next();
+				for (int k = 0; k < list.size(); k++) {
-
+					if (list.get(k).getIdEmployee().equals(str4)) {
-			if (id.equals("0")) {
+						System.out.println(str4);
-				System.out.println("システムを終了します");
+						System.out.println("社員名を入力してください");
-				break;
+						Scanner sc5 = new Scanner(System.in);
-			}
+						String str5 = sc5.nextLine();
-			//boolean変数作成
+						System.out.println(str5);
-			boolean result = false;
+						System.out.println("フリガナを入力してください");
-			//該当の場合
+						Scanner sc6 = new Scanner(System.in);
-			for (int i = 0; i < employees.length; i++) {
+						String str6 = sc6.nextLine();
-				if (employees[i].getPrimaryKeyValue().equals(id)) {
+						System.out.println(str6);
-					result = true;
+						System.out.println("メールアドレスを入力してください");
-					System.out.println(employees[i]);
+						Scanner sc7 = new Scanner(System.in);
-					break;
+						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("入力された値で情報が見つかりませんでした");
+						}
+					}
 				}
 			}
-			if (result == false) {
-				System.out.println("該当する社員が見つかりませんでした(終了する場合は０を入力)");
-			}
-
-		}
-
-		//for文
-		//for (int i = 0; i < employees.length; i++) {
-			//System.out.println(employees[i]);
-			//System.out.println(employees[i].toCSV());
-			//System.out.println(employees[i].getPrimaryKeyValue());
-			//employees[i].showInfo();を上記に書き換え
 		}
+		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("システムを終了します");
 	}
-
+}

em-oop/src/Rectangle.java

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

@@ -1,18 +1,14 @@
 
 public abstract class Shape {
-	//フィールド宣言
 	private String name;
-
+	
-	//コンストラクタ
+	public Shape (String name) {
-	public Shape(String name) {
 		this.name = name;
 	}
-
+	
-	//メソッド1（抽象メソッド）
+	public abstract double area() ;
-	public abstract double area();
+	
-
+	public void showInfo() {
-	//メソッド2
+		System.out.println(this.name + "の面積は" +this.area() + "です");
-	void showInfo() {
-		System.out.println(this.name + "の面積は" + this.area() + "です");
 	}
 }

em-oop/src/Student.java

@@ -1,29 +1,18 @@
 
 public class Student {
-	//フィールド宣言
 	int studentId;
 	String name;
-	//フィールド追加
+	
-	static int studentCount = 0;
+	 void printProfile() {
-
+		System.out.println("学籍番号;"+this.studentId+" 名前;"+this.name);
-	//メソッド宣言
-	void printProfile() {
-		System.out.println("学籍番号:" + this.studentId + " 名前:" + this.name);
 	}
-
+	 static int studentCount = 0;
-	//コントラクタ追加
+	 public Student (int studentId,String name){
-	public Student(int studentId, String name) {
+		 this.studentId = studentId;
-		this.studentId = studentId;
+		 this.name = name;
-		this.name = name;
+		 studentCount++;
-	}
+	 }
-	public Student() {
+	 static int getStudentCount() {
-		// TODO 自動生成されたコンストラクター・スタブ
-	}
-
-	//コントラクタ追加
-	public static int getstudentCount() {
 		return studentCount;
-
+	 }
-	}
-
 }