Day3、5段階目完了

.gitignore

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

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

em-oop/.gitignore

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

em-oop/.project

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

@@ -1,8 +1,9 @@
 
 public abstract class BaseData {
+	//抽象メソッドを宣言
 	public abstract String toString();
+
 	public abstract String toCSV();
+
 	public abstract String getPrimaryKeyValue();
-
 }
-             

em-oop/src/BasicCheck1.java

@@ -2,21 +2,21 @@
 public class BasicCheck1 {
 
 	public static void main(String[] args) {
-		// TODO 自動生成されたメソッド・スタブ
+		//Book book = new Book();
+		
+		//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();
-		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);
-		
-		System.out.println(book2.title);
-		System.out.println(book2.author);
-		System.out.println(book2.price);
+		//引数あり
+		Book book2 = new Book("銀河鉄道の夜", "宮沢賢治", 500);
 		
 	}
 

em-oop/src/BasicCheck2.java

@@ -1,21 +1,21 @@
 
 public class BasicCheck2 {
 	public static void main(String[] args) {
-		Student student1 = new Student(1, "鈴木一郎");
-		Student student2 = new Student(2, "田中花子");
-		Student student3 = new Student(3, "佐藤次郎");
+		//変数宣言
+		Student students = new Student();
+		//代入
+		//student.studentId = 1;
+		//student.name = "鈴木一郎";
+		//student.printProfile();
 
-		student1.printProfile();
-		student2.printProfile();
-		student3.printProfile();
+		Student students1 = new Student(1, "鈴木一郎");
+		Student students2 = new Student(2, "田中花子");
+		Student students3 = new Student(3, "佐藤次郎");
 
-		System.out.println("現在の生徒数："+Student.getStudentCount()+"人");
+		students1.printProfile();
+		students2.printProfile();
+		students3.printProfile();
 
-
-//		student.studentId = 1;
-//		student.name = "鈴木一郎";
-//
-//		student.printProfile();
+		 System.out.println("現在の生徒数:" + Student.getstudentCount()  + "人");
 	}
-
 }

em-oop/src/BasicCheck3.java

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

em-oop/src/Book.java

@@ -4,17 +4,18 @@ public class Book {
 	String author;
 	int price;
 	
+	//コンストラクタ生成
 	public Book() {
-		this.title="タイトル未設定";
-		this.author="著者未設定";
-		this.price=0;
+		System.out.println( "タイトル未設定");
+		System.out.println( "著者未設定"); 
+		System.out.println( "0"); 
 	}
-	public Book(String title,String author,int price) {
-		this.title=title;
-		this.author=author;
-		this.price=price;
+	//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);
+		
 	}
+	
 }
-	
-
-

em-oop/src/Circle.java

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

em-oop/src/Day3Check1.java

@@ -0,0 +1,10 @@
+
+public class Day3Check1 {
+
+	public static void main(String[] args) {
+		//インスタンス
+		 Circle circle = new Circle(2.0); 
+		 circle.showInfo();
+	}
+
+}

em-oop/src/Day3Check2.java

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

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

@@ -1,37 +0,0 @@
-
-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,96 +1,30 @@
-
 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++;
-	}
+	//フィールド宣言
+	private String idEmployee;//社員ID
+	private String nmEmployee;//社員名
+	private String knEmployee;//社員カナ
+	private String mailAddress;//メールアドレス
+	private String password;//パスワード
+	private String idDepartment;//部署ID
 
 	public String getIdEmployee() {
-		return this.idEmployee;
+		return 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;
+		return knEmployee;
 	}
 
 	public void setKnEmployee(String knEmployee) {
@@ -98,7 +32,7 @@ public class EmployeeData extends BaseData {
 	}
 
 	public String getMailAddress() {
-		return this.mailAddress;
+		return mailAddress;
 	}
 
 	public void setMailAddress(String mailAddress) {
@@ -121,4 +55,59 @@ 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"+
+				 getNmEmployee() + "\t"+
+				 getKnEmployee() + "\t"+
+				 getMailAddress() + "\t"+
+				 getPassword() + "\t"+
+				 getIdDepartment();
+
+	}
+
+	//コンストラクタ追加(引数なし)
+	public EmployeeData() {
+	}
+
+	//6つ引数持ちコンストラクタ追加
+	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);
+	}
+
+	//メソッド2つ追加
+	@Override
+	public String toCSV() {
+		return getIdEmployee() + "," + getNmEmployee() + "," + getKnEmployee() + "," + getMailAddress() + ","
+				+ getPassword() + "," + getIdDepartment();
+			}
+
+	@Override
+	public String getPrimaryKeyValue() {
+		return this.idEmployee;
+	}
+
+	//メソッド追加、7段目
+	public boolean isMatchID(String id) {
+		return idEmployee.equals(id);
+	}
+
+
 }

em-oop/src/Greeting.java

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

em-oop/src/Item.java

@@ -1,43 +1,42 @@
 
 public class Item {
+	//フィールド宣言
 	private String name;
 	private int price;
 	private int stock;
 
-	public void sell(int amount) {
-		this.setStock(this.getStock()-amount) ;
+	//メソッド宣言
+	void sell(int amount) {
+		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;
+		return name;
 	}
 
+	public void setName(String name) {
+		this.name = name;
+	}
 
 	public int getPrice() {
-		return this.price;
-	}
-	public void setPrice(int price) {
-		this.price=price;
+		return price;
 	}
 
+	public void setPrice(int price) {
+		this.price = price;
+	}
 
 	public int getStock() {
-		return this.stock;
-	}
-	public void setStock(int stock) {
-		this.stock=stock;
+		return stock;
 	}
 
+	public void setStock(int stock) {
+		this.stock = stock;
+	}
+	@Override
+	public String toString() {
+		return getName() + " " + getPrice() + "円 (残り" + getStock() + "個)";
+	}
 }

em-oop/src/JapaneseGreeting.java

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

em-oop/src/Main.java

@@ -1,202 +1,55 @@
-import java.util.ArrayList;
 import java.util.Scanner;
 
 public class Main {
+
 	public static void main(String[] args) {
+		// TODO 自動生成されたメソッド・スタブ
+		//インスタンス宣言
+		BaseData employee = new EmployeeData();
+		//配列5件分
+		BaseData[] employees = new BaseData[5];
+		//５段階目書き換え
+		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");
 
-		//		BaseData employee = new EmployeeData();
-		//		BaseData[] employees = new BaseData[];
-		//		BaseData[] allData = new BaseData();
-		ArrayList<BaseData> allData = new ArrayList<>();
-
-		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;
-
-		Scanner scanner = new Scanner(System.in);
+		//5段階目記載の処理呼び出し
+		//employee.showInfo();
 
+		//Day1、8段階目検索
 		while (true) {
-			System.out.println("1:検索 2:登録 3:更新 4:削除 0:終了");
-			String usertype = scanner.nextLine();
+			Scanner sc = new Scanner(System.in);//インスタンス化
+			System.out.println("検索したい社員IDを入力してください(終了する場合は０を入力)");
+			String id = sc.next();
 
-			//0:終了
-			if (usertype.equals("0")) {
+			if (id.equals("0")) {
+				System.out.println("システムを終了します");
 				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変数作成
 			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)) {
+			//該当の場合
+			for (int i = 0; i < employees.length; i++) {
+				if (employees[i].getPrimaryKeyValue().equals(id)) {
 					result = true;
-								System.out.println(employee.toString());
+					System.out.println(employees[i]);
 					break;
 				}
-
 			}
 			if (result == false) {
-						System.out.println("入力された値で情報がみつかりませんでした");
-						
-					}
-
-				} else {
-					continue;
-
+				System.out.println("該当する社員が見つかりませんでした(終了する場合は０を入力)");
 			}
 
 		}
 
-			//2:登録
-			if (usertype.equals("2")) {
-				System.out.println("社員IDを入力してください");
+		//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();を上記に書き換え
+		}
 	}
 
-		}
-
-	}
-}
-
-//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

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

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

em-oop/src/Student.java

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

em-oop/src/day3_123/Day3Check1.java

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

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

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

em-oop/src/day3_123/Rectangle.java

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

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