配列をArrayListに変更

em-oop/src/BaseData.java

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

em-oop/src/BasicCheck1.java

@@ -3,23 +3,21 @@ 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();
+		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,37 +1,21 @@
 
 public class BasicCheck2 {
 	public static void main(String[] args) {
-		
+		Student student1 = new Student(1, "鈴木一郎");
-//		Student student = new Student(3,"a");
-		//Student型のstudentを宣言、インスタンスを代入する
-		Student student1 = new Student(1,"鈴木一郎");
 		Student student2 = new Student(2, "田中花子");
-		Student student3 = new Student(3,"佐藤次郎");
+		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();
-		Student.getStudentCount();
+		
+		System.out.println("現在の生徒数："+Student.getStudentCount()+"人");
+		
+
+//		student.studentId = 1;
+//		student.name = "鈴木一郎";
+//
+//		student.printProfile();
 	}
 
 }
-
-
-//
-//System.out.print("学籍番号"+student.studentId);
-//System.out.print("名前:" + student.name);

em-oop/src/BasicCheck3.java

@@ -1,53 +1,35 @@
 
 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[0].setName("ノート");
+		items[1] = new Item();
-		items[0].setPrice(80);
+		items[2] = new Item();
+		
+		items[0].setName("ノート") ;
+		items[0].setPrice(120);
 		items[0].setStock(50);
 		
-		items[1] = new Item();
+		items[1].setName("消しゴム");
-		items[1].setName("ノート");
+		items[1].setPrice(80);
-		items[1].setPrice(120);
 		items[1].setStock(30);
 		
-		items[2] = new Item();
+		items[2].setName("鉛筆");
-		items[2].setName("ノート");
 		items[2].setPrice(60);
 		items[2].setStock(100);
 		
 		
 		
-		
+		for(int i=0;i<3;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].totalPrice());
+		}
 		
-//			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,24 +1,20 @@
 
 public class Book {
-	public String title;
+	String title;
-	public String author;
+	String author;
-	public int price;
+	int price;
 	
-	//引数なしコンストラクタ
 	public Book() {
-		this.title = "タイトル未設定";
+		this.title="タイトル未設定";
-		this.author = "著者未設定";
+		this.author="著者未設定";
-		this.price = 0;
+		this.price=0;
-		
-//		System.out.println("コンストラクタが呼び出されました");
-		
 	}
-	//引数ありコンストラクタ
+	public Book(String title,String author,int price) {
-	public Book(String title, String author, int price) {
+		this.title=title;
-//		System.out.println("引数なしのコンストラクタが呼び出されました");
+		this.author=author;
-		this.title = title;
+		this.price=price;
-		this.author = author;
-		this.price = price;
 	}
-
 }
+	
+
+

em-oop/src/Circle.java

@@ -1,21 +0,0 @@
-
-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  double area() {                     //Overrideは 子クラスで！
-		return  Math.PI * radius * radius;
-	}
-    public void showInfo(){
-    	super.showInfo();
-		System.out.println("(半径:" + this.radius + ")");
-	}
-	
-
-}

em-oop/src/Day3Check1.java

@@ -1,14 +0,0 @@
-
-public class Day3Check1 {
-
-	public static void main(String[] args) {
-	
-		Circle circle = new Circle(2);
-		circle.area();
-		circle.showInfo();
-		
-//		Rectangle rectangle = new Rectangle(2);
-//		rectangle.area();
-		employee.showinfo();
-	}
-}

em-oop/src/Day3Check2.java

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

em-oop/src/DepartmentData.java

@@ -0,0 +1,37 @@
+
+public class DepartmentData extends BaseData {
+	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() {
+		return getIdDepartment() + "\t" + getNmDepartment();
+	}
+
+	@Override
+	public String toCSV() {
+				return getIdDepartment() + "," + getNmDepartment();
+	}
+
+	@Override
+	public String getPrimaryKeyValue() {
+				return getIdDepartment();
+	}
+
+}

em-oop/src/EmployeeData.java

@@ -1,23 +1,124 @@
 
-public class EmployeeData {
+public class EmployeeData extends BaseData {
-//	public static void main(String args[]) {
+	private String idEmployee;
+	private String nmEmployee;
+	private String knEmployee;
+	private String mailAddress;
+	private String password;
+	private String idDepartment;
+	private static int empCount = 0;
 
-		String idEmployee ;
+	static final String COMPANY_NAME = "Rhizome";
-		String nmEmployee ;
-		String knEmployee ;
-		String mailAddress ;
-		String password ;
-		String idDepartment ;
 
+	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);
+	}
 
-//	public String Employee(String idEmployee) {
+	@Override
-//		this.idEmployee= idEmployee;
+	public String toString() {
-//	}
+		return getIdEmployee() + "\t" + getNmEmployee() + "　" + getKnEmployee() + "\t" + getMailAddress()
+				+ "\t" + getPassword() + "\t" + getIdDepartment();
+	}
 
-	public void showinfo() {
+	@Override
-//		this.idEmployee = idEmployee;
+	public String toCSV() {
-		System.out.println(this.idEmployee + "\t" + this.nmEmployee+ "\t" + this.knEmployee + "\t"+ this.mailAddress+ "\t" + this.password + "\t"+ this.idDepartment );
+		return getIdEmployee() + "," + getNmEmployee() + "," + getKnEmployee() + "," + getMailAddress() + ","
+				+ getPassword() + "," + getIdDepartment();
+	}
+
+	@Override
+	public String getPrimaryKeyValue() {
+		return idEmployee;
 
 	}
 
+	public boolean isMatchId(String id) {
+		return idEmployee.equals(id);
+	}
+
+	static int getEmpCount() {
+		return empCount;
+	}
+
+	//getNmEmployee.strip();
+
+	public EmployeeData() {
+		empCount++;
+
+	}
+
+	public EmployeeData(String idEmployee, String nmEmployee, String knEmployee, String mailAddress, String password,
+			String idDepartment) {
+			this.setIdEmployee(idEmployee);
+			this.setNmEmployee(nmEmployee);
+			this.setKnEmployee(knEmployee);
+			this.setMailAddress(mailAddress);
+			this.setPassword(password);
+			this.setIdDepartment(idDepartment);
+			empCount++;
+	}
+
+	public String getIdEmployee() {
+		return this.idEmployee;
+	}
+
+	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 this.knEmployee;
+	}
+
+	public void setKnEmployee(String knEmployee) {
+		this.knEmployee = knEmployee;
+	}
+
+	public String getMailAddress() {
+		return this.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;
+	}
+
 }

em-oop/src/Greeting.java

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

em-oop/src/Item.java

@@ -1,54 +1,43 @@
 
 public class Item {
-	//フィールドを宣言・外から触れないようにprivate
 	private String name;
 	private int price;
 	private int stock;
 	
-	//nameを取得するgetter
-	public String getName() {
-		return 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;
-	}
-
-	public void setStock(int stock) {
-		this.stock = stock;
-	}
-
-	//	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);
+		this.setStock(this.getStock()-amount) ;
+	}
+	
+	public int totalPrice() {
+		return this.price*this.stock;
 	}
 	
-	//Itemの情報を文字列として返す
 	@Override
 	public String toString() {
-		return getName() + "" + getPrice() + "円(残り" + getStock() + "個)";
+		return getName()+" "+getPrice()+"円(残り"+getStock()+"個)";
+	}
+	
+	public String getName() {
+		return this.name;
+	}
+	public void setName(String name) {
+		this.name=name;
+	}
+	
+	
+	public int getPrice() {
+		return this.price;
+	}
+	public void setPrice(int price) {
+		this.price=price;
+	}
+	
+	
+	public int getStock() {
+		return this.stock;
+	}
+	public void setStock(int stock) {
+		this.stock=stock;
 	}
 
 }

em-oop/src/JapaneseGreeting.java

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

em-oop/src/Main.java

@@ -1,35 +1,202 @@
+import java.util.ArrayList;
+import java.util.Scanner;
 
 public class Main {
 	public static void main(String[] args) {
-		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";
+		//		BaseData employee = new EmployeeData();
-			employee.nmEmployee = "山田龍也";
+		//		BaseData[] employees = new BaseData[];
-			employee.knEmployee = "ヤマダタツヤ";
+		//		BaseData[] allData = new BaseData();
-			employee.mailAddress ="yamada@hoge.jp";
+		ArrayList<BaseData> allData = new ArrayList<>();
-			employee.password = "aaa";
-			employee.idDepartment ="10";
 
+		allData.add(new EmployeeData("10000", "山田龍也", "ヤマダタツヤ", "yamada@hoge.jp", "aaa", "10"));
+		//		allData[1] = new EmployeeData("10001", "高橋準", "タカハシジュン", "jtaka@hoge.jp", "bbb", "10");
+		//		allData[2] = new EmployeeData("10002", "麻枝史明", "マエダフミアキ", "fmak@hoge.jp", "ccc", "11");
+		//		allData[3] = new EmployeeData("10003", "丸戸章介", "マルトショウスケ", "marusyo@hoge.jp", "ddd", "12");
+		//		allData[4] = new EmployeeData("10004", "三宅武", "ミヤケタケシ", "miya@hoge.jp", "eee", "13");
+		//		allData[11] = new EmployeeData("10005", "丸井悠", "マルイハルカ", "haru@hoge.jp", "fff", "13");
+		//		allData[12] = new EmployeeData("10006", "涼元香織", "スズモトカオリ", "suzumoto@hoge.jp", "ggg", "13");
+		//		allData[13] = new EmployeeData("10007", "葉山稔", "ハヤマミノル", "mhayama@hoge.jp", "hhh", "14");
+		//		allData[14] = new EmployeeData("10008", "川上朱里", "カワカミアカリ", "kawakami@hoge.jp", "iii", "14");
+		//		allData[15] = new EmployeeData("10009", "杉井肇", "スギイハジメ", "sugi@hoge.jp", "jjj", "15");
+		//
+		//		DepartmentData dept = new DepartmentData();
+		//		dept.setIdDepartment("10");
+		//		dept.setNmDepartment("役員");
+		//		allData[5] = dept;
+		//		dept = new DepartmentData();
+		//		dept.setIdDepartment("11");
+		//		dept.setNmDepartment("人事・総務部");
+		//		dept = new DepartmentData();
+		//		allData[6] = dept;
+		//		dept.setIdDepartment("12");
+		//		dept.setNmDepartment("経理部");
+		//		allData[7] = dept;
+		//		dept = new DepartmentData();
+		//		dept.setIdDepartment("13");
+		//		dept.setNmDepartment("システム開発事業部");
+		//		allData[8] = dept;
+		//		dept = new DepartmentData();
+		//		dept.setIdDepartment("14");
+		//		dept.setNmDepartment("教育事業部");
+		//		allData[9] = dept;
+		//		dept = new DepartmentData();
+		//		dept.setIdDepartment("15");
+		//		dept.setNmDepartment("営業企画部");
+		//		allData[10] = dept;
 
-			employee.showinfo();
+		Scanner scanner = new Scanner(System.in);
 
-//			System.out.println(employee);
+		while (true) {
-//			System.out.println(idEmployee);
+			System.out.println("1:検索 2:登録 3:更新 4:削除 0:終了");
-//			System.out.println(nmEmployee);
+			String usertype = scanner.nextLine();
-//			System.out.println(knEmployee);
-//			System.out.println(mailAddress);
-//			System.out.println(password);
-//			System.out.println(idDepartment);
 
+			//0:終了
+			if (usertype.equals("0")) {
+				break;
+			}
+
+			//1:検索
+			if (usertype.equals("1")) {
+				System.out.println("1:全検索 2:条件検索 それ以外:戻る");
+				usertype = scanner.nextLine();
+				if (usertype.equals("1")) {
+					for (int i = 0; i < allData.size(); i++)
+						if (allData.get(i) instanceof EmployeeData) {
+							System.out.println(allData.get(i).toString());
+						}
+
+				} else if (usertype.equals("2")) {
+					System.out.println("IDを入力してください");
+					usertype = scanner.nextLine();
+
+					boolean result = false;
+					for (int i = 0; i < allData.size(); i++)
+						if (allData.get(i) instanceof EmployeeData) {
+							EmployeeData employee = (EmployeeData) allData.get(i);
+							if (employee.getIdEmployee().equals(usertype)) {
+								result = true;
+								System.out.println(employee.toString());
+								break;
+							}
+
+						}
+					if (result == false) {
+						System.out.println("入力された値で情報がみつかりませんでした");
+						
+					}
+
+				} else {
+					continue;
 
 				}
 
 			}
 
+			//2:登録
+			if (usertype.equals("2")) {
+				System.out.println("社員IDを入力してください");
+			}
 
+		}
+
+	}
+}
+
+//Day3.9---所属部署から従業員のメアドを検索する
+//		DepartmentData dep = null;
+//		EmployeeData emp;
+//		String nmD = null;
+//
+//		for (int i = 0; i < allData.length; i++) {
+//			if (allData[i] instanceof DepartmentData) {
+//				dep = (DepartmentData) allData[i];
+//				if (dep.getNmDepartment().equals("システム開発事業部")) {
+//					nmD = dep.getIdDepartment();
+//				}
+//			}
+//
+//		}
+//
+//		for (int i = 0; i < allData.length; i++) {
+//			if (allData[i] instanceof EmployeeData) {
+//				emp = (EmployeeData) allData[i];
+//				if (emp.getIdDepartment().equals(nmD)) {
+//					System.out.println(emp.getNmEmployee() + "\t" + emp.getMailAddress());
+//				}
+//
+//			}
+//
+//		}
+
+//		for (int i = 0; i < allData.length; i++) {
+//			if (allData[i] instanceof EmployeeData) {
+//				EmployeeData emp = (EmployeeData) allData[i];
+//				System.out.println(emp.getMailAddress());
+//			}
+//		}
+
+//		int emp=0;
+//		int dep=0;
+//		for(int i=0;i<allData.length;i++) {
+//			if(allData[i] instanceof EmployeeData) {
+//				emp++;
+//			}
+//			if(allData[i] instanceof DepartmentData) {
+//				dep++;
+//			}
+//		}
+//		System.out.println("社員データ："+emp+"件");
+//		System.out.println("部署データ："+dep+"件");
+
+//		employees[0] = new EmployeeData("10000", "山田龍也", "ヤマダタツヤ", "yamada@hoge.jp", "aaa", "10");
+//		employees[1] = new EmployeeData("10001","高橋準","タカハシジュン","jtaka@hoge.jp","bbb","10");
+//		employees[2] = new EmployeeData("10002","麻枝史明","マエダフミアキ","fmak@hoge.jp","ccc","11");
+//		employees[3] = new EmployeeData("10003","丸戸章介","マルトショウスケ","marusyo@hoge.jp","ddd","12");
+//		employees[4] = new EmployeeData("10004","三宅武","ミヤケタケシ","miya@hoge.jp","eee","13");
+
+//		System.out.println(employees[0].toCSV());
+//		System.out.println(employees[0].getPrimaryKeyValue());
+
+//		Scanner sc = new Scanner(System.in);
+//		//
+//		for (int i = 0; i < employees.length; i++) {
+//			System.out.println("1:検索 2:登録 3:更新 4:削除 0:終了");
+//			String id = sc.nextLine();
+//			boolean result = false;
+//
+//			if (id.equals("0")) {
+//				System.out.println("システムを終了します");
+//				break;
+//			}
+//			if (employees[i].getPrimaryKeyValue().equals(id)) {
+//				result = true;
+//				employees[i].toString();
+//
+//			}
+//
+//			if (result == false) {
+//				System.out.println("該当する社員が見つかりませんでした");
+//			}
+//
+//		}
+//
+//		for (int i = 0; i < 5; i++) {
+//			if (employee[i].getNmEmployee() == null) {
+//				continue;
+//			}
+//			System.out.println(employee[i]);
+//		}
+//		
+//		
+//		
+//		System.out.println("現在の社員データ数"+EmployeeData.getEmpCount());
+//		
+//		System.out.println(EmployeeData.COMPANY_NAME);
+
+//		System.out.println();
+//		System.out.println(employee.nmEmployee);
+//		System.out.println(employee.knEmployee);
+//		System.out.println(employee.mailAddress);
+//		System.out.println(employee.password);
+//		System.out.println(employee.idDepartment);

em-oop/src/Rectangle.java

@@ -1,22 +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;
-	}
-	
-	public double area() {
-		return width * height;
-	}
-//	public void showInfo(){
-//    	super.showInfo();
-//		System.out.println("(半径:" + this.area + ")");
-//	}
-
-}

em-oop/src/Shape.java

@@ -1,36 +0,0 @@
-
-public abstract class Shape {
-	
-	private String name; //フィールドname ・privateにしなきゃいけない
-//	public double area;
-//	public int radius;
-
-	
-	public Shape() {		
-	}
-	
-	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,53 +1,24 @@
 
-public class Student {//クラス新規作成
+public class Student {
+	int studentId;
+	String name;
+	static int studentCount = 0;
 
-	int studentId; //フィールドを宣言 int
+	public void printProfile() {
-	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);
 	}
 
-	
+	public Student(int studentId, String name) {
-	public Student(int studentId, String name) { //コンストラクタを追加
+		this.studentId = studentId;
-		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;

em-oop/src/day3_123/Circle.java

@@ -0,0 +1,22 @@
+package day3_123;
+
+public class Circle extends Shape {
+	private double radius;
+	
+	public Circle(double radius) {
+		super("円");
+		this.radius=radius;
+	}
+	
+	@Override
+	public double area() {
+		return Math.PI*radius*radius;
+	}
+	
+	@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

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

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

em-oop/src/day3_123/JapaneseGreeting.java

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

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()+"です");
+	}
+
+}