1日目_段階4

q5の1~3まで終了

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

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

em-oop/src/BasicCheck1.java

@@ -3,15 +3,23 @@ public class BasicCheck1 {
 
 	public static void main(String[] args) {
 		// TODO 自動生成されたメソッド・スタブ
+//		Book book = new Book();
+//		book.title = "吾輩は猫である";
+//		book.author ="夏目漱石";
+//		book.price = 800;
+		
 		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,17 +1,37 @@
 
 public class BasicCheck2 {
-
 	public static void main(String[] args) {
-		// TODO 自動生成されたメソッド・スタブ
+		
+//		Student student = new Student(3,"a");
+		//Student型のstudentを宣言、インスタンスを代入する
 		Student student1 = new Student(1,"鈴木一郎");
-		Student student2 = new Student(2,"田中花子");
+		Student student2 = new Student(2, "田中花子");
 		Student student3 = new Student(3,"佐藤次郎");
+		
+		
+//		student1.studentId = 1;
+//		student1.name = "鈴木一郎";
+//        //studentIDに１，nameに鈴木一郎を代入
+//		
+//		student2.studentId = 2;
+//		student2.name ="田中花子";
+//		
+//		student3.studentId = 3;
+//		student3.name ="佐藤次郎";
+//		
+		
+		
+
+		//studentのprintProfileメソッドを呼び出す
 		student1.printProfile();
 		student2.printProfile();
 		student3.printProfile();
-		int total=Student.getStudentCount();
-		System.out.println("現在の生徒数" + total + "人");
+		Student.getStudentCount();
 	}
 	
-
 }
+
+
+//
+//System.out.print("学籍番号"+student.studentId);
+//System.out.print("名前:" + student.name);

em-oop/src/BasicCheck3.java

@@ -1,28 +1,53 @@
 
 public class BasicCheck3 {
 	
-	public static void main(String[] args) {
-		// 配列
+	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[0].setPrice(80);
+		items[0].setStock(50);
+		
+		items[1] = new Item();
+		items[1].setName("ノート");
+		items[1].setPrice(120);
 		items[1].setStock(30);
-		//items[2]代入
-		items[2].setName("鉛筆");
+		
+		items[2] = new Item();
+		items[2].setName("ノート");
 		items[2].setPrice(60);
 		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("在庫");
+		for(int i = 0; i < items.length; i ++) {
+			//items[i]をprintlnに渡すとitemクラスのtoStringが自動で呼ばれる
 			System.out.println(items[i]);
+			
+//			System.out.println("商品名" + items[i].name+ "価格" + items[i].price +"在庫" + items[i].stock);
+//			System.out.println("価格" + items[i].price);
+//			System.out.println("在庫" + items[i].stock);
+			
+			
 		}
 		
+		
+//		Item 0 = new Item("ノート", 120, 50);
+		
 	}
+
 }

em-oop/src/Book.java

@@ -1,18 +1,24 @@
 
 public class Book {
-	String title;
-	String author;
-	int price;
+	public String title;
+	public String author;
+	public int price;
+	
+	//引数なしコンストラクタ
+	public Book() {
+		this.title = "タイトル未設定";
+		this.author = "著者未設定";
+		this.price = 0;
+		
+//		System.out.println("コンストラクタが呼び出されました");
 		
-	public Book () {
-		title = "タイトル未設定";
-		author = "著者未設定";
-		price = 0;
 	}
-	
-	public Book(String title,String author,int price) {
+	//引数ありコンストラクタ
+	public Book(String title, String author, int price) {
+//		System.out.println("引数なしのコンストラクタが呼び出されました");
 		this.title = title;
 		this.author = author;
 		this.price = price;
 	}
+
 }

em-oop/src/Circle.java

@@ -1,20 +1,21 @@
 
-public class Circle extends Shape {
-	private double radius;
+public class Circle extends Shape { //shapeクラスを継承する
+	private double radius;  //radius: 半径  フィールドradius (double型、private)
+           
+	
+	
+	public Circle(double radius) { //コンストラクタpub 引数dou/raを受け取る
+		super("円");               //"円"呼び出し 文字列
+		this.radius = radius;      //radiusフィールドにも引数の値を代入する。
 		
-	public Circle(double radius) {
-		super("円");
-		this.radius = radius;
 	}
-	@Override
-	public double area() {
-		double num;
-		num = Math.PI * radius * radius;
-		return num;
+	public  double area() {                     //Overrideは 子クラスで！
+		return  Math.PI * radius * radius;
 	}
-	@Override
-	public void showInfo() {
-		super.showInfo();
+    public void showInfo(){
+    	super.showInfo();
 		System.out.println("(半径:" + this.radius + ")");
 	}
+	
+
 }

em-oop/src/Day3Check1.java

@@ -2,12 +2,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());
+		Circle circle = new Circle(2);
+		circle.area();
+		circle.showInfo();
+		
+//		Rectangle rectangle = new Rectangle(2);
+//		rectangle.area();
+		employee.showinfo();
 	}
 }

em-oop/src/Day3Check2.java

@@ -0,0 +1,22 @@
+
+public class Day3Check2 {
+	public static void main(String[] args) {
+		
+		//Rect-クラスをもとにrect-のインスタンスつくる
+		//3,4をRectangleのコンストラクタに渡す
+		Rectangle rectangle = new Rectangle(3, 4);
+		
+		//Rect-はShapeを継承しているため親クラスのshowInfoメソッドを使える
+		rectangle.showInfo();
+		
+		
+		//JaGrクラスをもとにインスタンスをつくる
+		//変数の型はGreetingインタフェース型にしている
+		Greeting greeting = new JapaneseGreeting();
+		
+		//greeetingのhelloメソッドよびだす
+		//実際に入っているインスタンスはJaGrなのでJaGrで作ったhello()が実行される
+		System.out.println(greeting.hello());
+	}
+
+}

em-oop/src/Day3Check3.java

@@ -1,11 +1,15 @@
 
 public class Day3Check3 {
-
 	public static void main(String[] args) {
-		Shape shape1 = new Circle(2);
-		shape1.showInfo();
-		Shape shape2 = new Rectangle(3, 4);
-		shape2.showInfo();
-	}
 		
+		//Shape型の変数にCircleのインスタンスを代入
+		Shape shape1 = new Circle(2);
+		//円の情報を表示
+		shape1.showInfo();
+		//Shape型の変数にRectangleのインスタンスを代入
+		Shape shape2 = new Rectangle(3, 4);
+		//四角形の情報を表示
+		shape2.showInfo();
+		
+	}
 }

em-oop/src/DepartmentDate.java

@@ -1,41 +0,0 @@
-
-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,118 +1,23 @@
 
-public class EmployeeData extends BaseDate {
-	private String idEmployee;
-	private String nmEmployee;
-	private String knEmployee;
-	private String mailAddress;
-	private String password;
-	private String idDepartment;
+public class EmployeeData {
+//	public static void main(String args[]) {
+		
+		String idEmployee ;
+		String nmEmployee ;
+		String knEmployee ;
+		String mailAddress ;
+		String password ;
+		String idDepartment ;
+		
+
+//	public String Employee(String idEmployee) {
+//		this.idEmployee= idEmployee;
+//	}
+
+	public void showinfo() {
+//		this.idEmployee = idEmployee;
+		System.out.println(this.idEmployee + "\t" + this.nmEmployee+ "\t" + this.knEmployee + "\t"+ this.mailAddress+ "\t" + this.password + "\t"+ this.idDepartment );
 
-	public String getIdEmployee() {
-		return idEmployee;
 	}
 
-	public void setIdEmployee(String idEmployee) {
-		this.idEmployee = idEmployee;
-	}
-
-	public String getNmEmployee() {
-		return nmEmployee;
-	}
-
-	public void setNmEmployee(String nmEmployee) {
-		this.nmEmployee = nmEmployee;
-		}
-
-	public String getKnEmployee() {
-		return knEmployee;
-	}
-
-	public void setKnEmployee(String knEmployee) {
-		this.knEmployee = knEmployee;
-	}
-
-	public String getMailAddress() {
-		return mailAddress;
-	}
-
-	public void setMailAddress(String mailAddress) {
-		this.mailAddress = mailAddress;
-	}
-
-	public String getPassword() {
-		return password;
-	}
-
-	public void setPassword(String password) {
-		this.password = password;
-	}
-
-	public String getIdDepartment() {
-		return idDepartment;
-	}
-
-	public void setIdDepartment(String idDepartment) {
-		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,4 +1,4 @@
 
 public interface Greeting {
-	String hello();
+		String hello();
 }

em-oop/src/Item.java

@@ -1,25 +1,31 @@
 
 public class Item {
+	//フィールドを宣言・外から触れないようにprivate
 	private String name;
 	private int price;
 	private int stock;
 
+	//nameを取得するgetter
 	public String getName() {
 		return name;
 	}
 
-	public void setName(String name) {
+	//nameを設定するsetter
+	public void setName(String name) {       //item="ノート"はもう使えない。item[0].setName("ノート")にしている
 		this.name = name;
 	}
 
+	//priceを取得するgetter
 	public int getPrice() {
 		return price;
 	}
 
+	//priceを設定するsetter
 	public void setPrice(int price) {
 		this.price = price;
 	}
 
+	//stockを取得するgetter
 	public int getStock() {
 		return stock;
 	}
@@ -28,12 +34,21 @@ public class Item {
 		this.stock = stock;
 	}
 
-	void sell(int amount) {
+	//	Item(String name, int price, int stock){
+	//		this.name = name;
+	//		this.price = price;
+	//		this.stock = stock;
+	//	}
+
+	//売れた数を在庫から引く
+	public void sell(int amount) {
 		this.setStock(this.getStock() - amount);
 	}
 	
-	 public String toString() { 
-		String str = getName() + " " + getPrice() + "円 (残り" + getStock() + "個)";
-		return str;
+	//Itemの情報を文字列として返す
+	@Override
+	public String toString() {
+		return getName() + "" + getPrice() + "円(残り" + getStock() + "個)";
 	}
+
 }

em-oop/src/JapaneseGreeting.java

@@ -1,9 +1,13 @@
 
+//JaGrクラスを作る、implements GrによってGreetingインターフェースを実装する
 public class JapaneseGreeting implements Greeting {
+	
+	//Grインターフェースで定義されているhello()メソッドをこのクラスに実装する
 	@Override
 	public String hello() {
-		String str =("こんにちは");
-		return str;
+		//hello()が呼び出されたらString型の文字列を呼び出し元に返す
+		return "こんにちは";
+		
 	}
 
 }

em-oop/src/Main.java

@@ -1,184 +1,35 @@
-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 営業企画部");
+		EmployeeData employee = new EmployeeData() ;
+			String idEmployee = "10000";
+			String nmEmployee = "山田龍也";
+			String knEmployee = "ヤマダタツヤ";
+			String mailAddress = "yamada@hoge.jp";
+			String password = "aaa";
+			String idDepartment = "10";
+			
+			employee.idEmployee = "1000";
+			employee.nmEmployee = "山田龍也";
+			employee.knEmployee = "ヤマダタツヤ";
+			employee.mailAddress ="yamada@hoge.jp";
+			employee.password = "aaa";
+			employee.idDepartment ="10";
+			
+			
+			employee.showinfo();
+			
+//			System.out.println(employee);
+//			System.out.println(idEmployee);
+//			System.out.println(nmEmployee);
+//			System.out.println(knEmployee);
+//			System.out.println(mailAddress);
+//			System.out.println(password);
+//			System.out.println(idDepartment);
 			
-		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 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("システムを終了します");
+		
 	}
-}
+
+

em-oop/src/Rectangle.java

@@ -0,0 +1,22 @@
+
+public class Rectangle extends Shape {
+	private double width; 
+	private double height; {
+		
+	}
+	
+	public Rectangle(double width, double height) {
+		super("四角形");
+		this.width = width;
+		this.height = height;
+	}
+	
+	public double area() {
+		return width * height;
+	}
+//	public void showInfo(){
+//    	super.showInfo();
+//		System.out.println("(半径:" + this.area + ")");
+//	}
+
+}

em-oop/src/Shape.java

@@ -1,14 +1,36 @@
 
 public abstract class Shape {
-	private String name;
 	
-	public Shape (String name) {
-		this.name = name;
+	private String name; //フィールドname ・privateにしなきゃいけない
+//	public double area;
+//	public int radius;
+
+	
+	public Shape() {		
 	}
 	
-	public abstract double area() ;
-	
-	public void showInfo() {
-		System.out.println(this.name + "の面積は" +this.area() + "です");
+	public Shape(String name) {
+		this.name = name; //Circleが"円"を呼び出すための文字列をいれるところ
 	}
+	
+	public  abstract double area();{  //メソッドarea 引数なし・戻り値double 中身return0.0;
+//		return 0.0;	
+	}
+	
+//	@Override
+
+	
+	public void showInfo(){ //メソッドshowinfo 引数戻り値なし・中身はsyso
+		System.out.println(this.name + "の面積は" + this.area() + "です");
+//	    System.out.println("(半径:" + this.radius + ")");
+	    System.out.println("四角形" + "の面積は" + this.area() + "です。");
+	}
+	
+//	@Override
+//	public void showInfo(){
+//		
+//	}
+	
+	
+
 }

em-oop/src/Student.java

@@ -1,18 +1,53 @@
 
-public class Student {
-	int studentId;
-	String name;
+public class Student {//クラス新規作成
 
-	 void printProfile() {
-		System.out.println("学籍番号;"+this.studentId+" 名前;"+this.name);
+	int studentId; //フィールドを宣言 int
+	String name; //String
+	static int studentCount = 0;   //生徒が何人作られたかを数えるための、クラス全体で共有するフィールド
+
+	void printProfile() {//メソッドを宣言・以下の内容をsysoで出力
+		
+//		for(int i = 0; i <= 3; i++) {
+			System.out.println("学籍番号:" + this.studentId + " 名前:" + this.name);
+//		}
+		
+//		System.out.println("学籍番号:" + this.studentId + " 名前:" + this.name);
 	}
-	 static int studentCount = 0;
-	 public Student (int studentId,String name){
-		 this.studentId = studentId;
-		 this.name = name;
-		 studentCount++;
-	 }
-	 static int getStudentCount() {
+	
+	
+	public Student(int studentId, String name) { //コンストラクタを追加
+		this.studentId = studentId;              //渡された引数をそれぞれ対応するフィールドに代入する
+		this.name = name;
+		studentCount++;
+	}
+	
+
+	public static int getStudentCount() {
+//		studentCount++;
 		return studentCount;
-	 }
+	}
+	
+
 }
+
+
+
+
+
+
+
+
+
+
+
+
+
+//	public static void main(String[] args) {
+//		Student s = new Student(1,"鈴木一郎");
+//		s.printProfile();
+
+//		
+
+//	
+//		public Student(int studentId, String name) {
+//			student.studentId = 1;