３日目 段階１ 小澤

em-oop/src/BasicCheck1.java

@@ -3,23 +3,20 @@ public class BasicCheck1 {
 
 	public static void main(String[] args) {
 		// TODO 自動生成されたメソッド・スタブ
-		//Book book = new Book();
+		Book book1 = new Book();
+		Book book2 = new Book("銀河鉄道の夜","宮沢賢治",500);
+		
 //		book.title = "吾輩は猫である";
-//		 book.author ="夏目漱石";
+//		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);
-
 		System.out.println(book2.title);
 		System.out.println(book2.author);
 		System.out.println(book2.price);
-		
-		
-		
 
 	}
 

em-oop/src/BasicCheck2.java

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

em-oop/src/BasicCheck3.java

@@ -1,56 +1,35 @@
 
 public class BasicCheck3 {
-
 	public static void main(String[] args) {
-		// TODO 自動生成されたメソッド・スタブ
-		Item []items = new Item[3];
-		
-//		items[0]= new Item();
-//		items[0].name = "ノート";
-//        items[0].price = 120;
-//        items[0].stock = 50;
-//
-//        items[1] = new Item();
-//        items[1].name = "消しゴム";
-//        items[1].price = 80;
-//        items[1].stock = 30;
-//
-//        items[2] = new Item();
-//        items[2].name = "鉛筆";
-//        items[2].price = 60;
-//        items[2].stock = 100;
+		Item[] items = new Item[3];
 		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[2] = new Item();
-        items[2].setName("鉛筆");
-        items[2].setPrice(60);
-        items[2].setStock(100);
-        
-//        Item[] items = {
-//        	    new Item("ノート", 120, 50),
-//        	    new Item("消しゴム", 80, 30),       //this is also fine but the question is make items[i].setName(...),so we should be change
-//        	    new Item("鉛筆", 60, 100)
-//        	};
-       
-
-        for (int i = 0; i < items.length; i++) {
-            items[i].sell(5);
-            System.out.println(items[i]);
-        }
+		items[1] = new Item();
+		items[2] = new Item();
+		
+		items[0].setName("ノート") ;
+		items[0].setPrice(120);
+		items[0].setStock(50);
+		
+		items[1].setName("消しゴム");
+		items[1].setPrice(80);
+		items[1].setStock(30);
+		
+		items[2].setName("鉛筆");
+		items[2].setPrice(60);
+		items[2].setStock(100);
+		
+		
+		
+		for(int i=0;i<3;i++) {
+			items[i].sell(5);
+			System.out.println(items[i]);
+//			System.out.println("合計金額："+items[i].totalPrice());
+		}
+		
+		
 		
-
 	}
+	
+	
 
 }

em-oop/src/Book.java

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

em-oop/src/EmployeeData.java

@@ -6,36 +6,75 @@ public class EmployeeData {
 	private String mailAddress;
 	private String password;
 	private String idDepartment;
+	private static int empCount = 0;
+
+	static final String COMPANY_NAME = "Rhizome";
+
+	@Override
+	public String toString() {
+		return getIdEmployee() + "\t" + getNmEmployee() + "　" + getKnEmployee() + "\t" + getMailAddress()
+				+ "\t" + getPassword() + "\t" + getIdDepartment();
+	}
+
+	static int getEmpCount() {
+		return empCount;
+	}
+
+	//getNmEmployee.strip();
+
+	public EmployeeData() {
+		empCount++;
+
+	}
+
+	public EmployeeData(String idEmployee, String nmEmployee, String knEmployee, String mailAddress, String password,
+			String idDepartment) {
+
+		nmEmployee = nmEmployee.strip();
+		int nmNum = nmEmployee.length();
+
+		idEmployee = idEmployee.strip();
+		int idNum = idEmployee.length();
+
+		if (nmNum == 0) {
+			System.out.println("社員名が空のため設定できませんでした");
+
+		}
+		if (idNum == 0) {
+			System.out.println("社員IDが空のため設定できませんでした");
+		}
+		if (nmNum > 0 && idNum > 0) {
+
+			this.setIdEmployee(idEmployee);
+			this.setNmEmployee(nmEmployee);
+			this.setKnEmployee(knEmployee);
+			this.setMailAddress(mailAddress);
+			this.setPassword(password);
+			this.setIdDepartment(idDepartment);
+			empCount++;
+
+		}
+	}
 
 	public String getIdEmployee() {
-		return idEmployee;
+		return this.idEmployee;
 	}
 
 	public void setIdEmployee(String idEmployee) {
-		// null ဖြစ်နေသလား (သို့မဟုတ်) ရှေ့နောက် Space များကို ဖယ်ရှားလိုက်လျှင် စာသားအလွတ် ဖြစ်သွားသလား စစ်ဆေးခြင်း
-		if (idEmployee == null || idEmployee.trim().isEmpty()) {
-			System.out.println("社員Idが空のため設定できませんでした");
-		} else {
-			this.idEmployee = idEmployee;
-		}
+
+		this.idEmployee = idEmployee;
 	}
 
 	public String getNmEmployee() {
 		return nmEmployee;
 	}
 
-	public void setNmEmployee(String nmEmployee) {
-		// null ဖြစ်နေသလား (သို့မဟုတ်) ရှေ့နောက် Space များကို ဖယ်ရှားလိုက်လျှင် စာသားအလွတ် ဖြစ်သွားသလား စစ်ဆေးခြင်း
-		if (nmEmployee == null || nmEmployee.trim().isEmpty()) {
-			System.out.println("社員名が空のため設定できませんでした");
-		} else {
-
-			this.nmEmployee = nmEmployee;
-		}
+	public void setNmEmployee(String nmEMployee) {
+		this.nmEmployee = nmEMployee;
 	}
 
 	public String getKnEmployee() {
-		return knEmployee;
+		return this.knEmployee;
 	}
 
 	public void setKnEmployee(String knEmployee) {
@@ -43,7 +82,7 @@ public class EmployeeData {
 	}
 
 	public String getMailAddress() {
-		return mailAddress;
+		return this.mailAddress;
 	}
 
 	public void setMailAddress(String mailAddress) {
@@ -66,43 +105,4 @@ public class EmployeeData {
 		this.idDepartment = idDepartment;
 	}
 
-	private static int empCount = 0;
-
-	public void showInfo() {
-		System.out.println(this.idEmployee + "\t" + this.nmEmployee + this.knEmployee + this.mailAddress + this.password
-				+ this.idDepartment);
-		//		System.out.println("社員ID: " + this.getIdEmployee());
-		//        System.out.println("社員氏名: " + this.getNmEmployee());
-		//        System.out.println("フリガナ: " + this.getKnEmployee());
-		//        System.out.println("メールアドレス: " + this.getMailAddress());
-		//        System.out.println("パスワード: " + this.getPassword());
-		//        System.out.println("部署ID: " + this.getIdDepartment());
-	}
-
-	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 static int getEmpCount() {
-
-		return empCount;
-	}
-
-	//	boolean isMatchId(String id) {                   //stept 7
-	//		return this.idEmployee.equals(id);
-	//
-	//	}
 }

em-oop/src/Item.java

@@ -3,46 +3,41 @@ public class Item {
 	private String name;
 	private int price;
 	private int stock;
-
-//	public Item(String name, int price, int stock) {
-//		this.name = name;
-//		this.price = price;
-//		this.stock = stock;
-//
-//	}
-
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public int getPrice() {
-		return price;
-	}
-
-	public void setPrice(int price) {
-		this.price = price;
-	}
-
-	public int getStock() {
-		return stock;
-	}
-
-	public void setStock(int stock) {
-		this.stock = stock;
-	}
-
+	
 	public void sell(int amount) {
-		this.stock = this.stock - amount;
-
+		this.setStock(this.getStock()-amount) ;
 	}
-
+	
+	public int totalPrice() {
+		return this.price*this.stock;
+	}
+	
 	@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/Main.java

@@ -1,147 +1,76 @@
+
 public class Main {
-
 	public static void main(String[] args) {
-		// TODO 自動生成されたメソッド・スタブ
-		EmployeeData[] employees = new EmployeeData[5];
-		EmployeeData employee1 = new EmployeeData();
-		employee1.setIdEmployee("10000");
-		employee1.setNmEmployee("山田太郎");
-		employee1.setKnEmployee("ヤマダタツヤ");
-		employee1.setMailAddress("yamada@hoge.jp");
-		employee1.setPassword("aaa");
-		employee1.setIdDepartment("10");
-		//1st person
-		//EmployeeData employee = new EmployeeData("10000", "山田龍也", "ヤマダタツヤ", "yamada@hoge.jp", "aaa", "10");
-		//		employees[0] = new EmployeeData();
-		//		employees[0].idEmployee = "10000";
-		//		employees[0].nmEmployee = "山田龍也";
-		//		employees[0].knEmployee = "ヤマダタツヤ";
-		//		employees[0].mailAddress = "yamada@hoge.jp";
-		//		employees[0].password = "aaa";
-		//		employees[0].idDepartment = "10";
-		EmployeeData employee2 = new EmployeeData();
-		employee2.setIdEmployee("10001");
-		employee2.setNmEmployee("高橋準");
-		employee2.setKnEmployee("タカハシジュン");
-		employee2.setMailAddress("jtaka@hoge.jp");
-		employee2.setPassword("bbb");
-		employee2.setIdDepartment("10");
-		//		//2nd person
-		//		employees[1] = new EmployeeData();
-		//		employees[1].idEmployee = "10001";
-		//		employees[1].nmEmployee = "高橋準";
-		//		employees[1].knEmployee = "タカハシジュン";
-		//		employees[1].mailAddress = "jtaka@hoge.jp";
-		//		employees[1].password = "bbb";
-		//		employees[1].idDepartment = "10";
-		//		//3rd person
-		EmployeeData employee3 = new EmployeeData();
-		employee3.setIdEmployee("10002");
-		employee3.setNmEmployee("麻枝史明");
-		employee3.setKnEmployee("マエダフミアキ");
-		employee3.setMailAddress("fmak@hoge.jp");
-		employee3.setPassword("ccc");
-		employee3.setIdDepartment("11");
-		//		employees[2] = new EmployeeData();
-		//		employees[2].idEmployee = "10002";
-		//		employees[2].nmEmployee = "麻枝史明";
-		//		employees[2].knEmployee = "マエダフミアキ";
-		//		employees[2].mailAddress = "fmak@hoge.jp";
-		//		employees[2].password = "ccc";
-		//		employees[2].idDepartment = "11";
-		EmployeeData employee4 = new EmployeeData();
-		employee4.setIdEmployee("10003");
-		employee4.setNmEmployee("丸戸章介");
-		employee4.setKnEmployee("マルトショウスケ");
-		employee4.setMailAddress("marusyo@hoge.jp");
-		employee4.setPassword("ddd");
-		employee4.setIdDepartment("12");
-		//		//4th person
-		//		employees[3] = new EmployeeData();
-		//		employees[3].idEmployee = "10003";
-		//		employees[3].nmEmployee = "丸戸章介";
-		//		employees[3].knEmployee = "マルトショウスケ";
-		//		employees[3].mailAddress = "marusyo@hoge.jp";
-		//		employees[3].password = "ddd";
-		//		employees[3].idDepartment = "12";
-		EmployeeData employee5 = new EmployeeData();
-		employee5.setIdEmployee("10004");
-		employee5.setNmEmployee("三宅武");
-		employee5.setKnEmployee("ミヤケタケシ");
-		employee5.setMailAddress("miya@hoge.jp");
-		employee5.setPassword("eee");
-		employee5.setIdDepartment("13");
-		//		//5th pe5rson
-		//		employees[4] = new EmployeeData();
-		//		employees[4].idEmployee = "10004";
-		//		employees[4].nmEmployee = "三宅武";
-		//		employees[4].knEmployee = "ミヤケタケシ";
-		//		employees[4].mailAddress = "miya@hoge.jp";
-		//		employees[4].password = "eee";
-		//		employees[4].idDepartment = "13";
-		// stept6
-		//        for (int i = 0; i < employees.length; i++) {
-		//            employees[i].showInfo();
-		//        }
-		employee1.showInfo();
-		employee2.showInfo();
-		employee3.showInfo();
-		employee4.showInfo();
-		employee5.showInfo();
-
-		//stept 7
-		//System.out.println("10002 を検索します");
-		//		System.out.println(employees[2].isMatchId("10002"));
-		//
-		//		System.out.println("99999 を検索します");
-		//		System.out.println(employees[2].isMatchId("99999"));
-
-		//stept 5
-		// employee.showInfo();
-		// stept6
-
-		//        System.out.println(employee.idEmployee);
-		//        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);
-		//		Scanner scan = new Scanner(System.in);
-		//		while (true) {
-		//			System.out.println("検索したい社員IDを入力してください（終了する場合は0）");
-		//
-		//			//stept 8
-		//			
-		//			//System.out.println("検索したい社員IDを入力してください");
-		//			String serchId = scan.nextLine();
-		//
-		//			if (serchId.equals("0")) {    //stept 9
-		//				System.out.println("システムを終了します");
-		//				break;
-		//			}
-
-		//			boolean found = false; //←if it haven't this boolean , they can't be decided true or false, so we should be make boolan name (found)
-		for (int i = 0; i < employees.length; i++) {
-
+		EmployeeData[] employee = new EmployeeData[5];
+		employee[0] = new EmployeeData("10000","","ヤマダタツヤ","yamada@hoge.jp","aaa","10");
+		employee[1] = new EmployeeData();
+		employee[2] = new EmployeeData();
+		employee[3] = new EmployeeData();
+		employee[4] = new EmployeeData();
+		
+		
+		
+//		employee[0].setIdEmployee("10000");
+//		employee[0].setNmEmployee("山田龍也");
+//		employee[0].setKnEmployee("ヤマダタツヤ");
+//		employee[0].setMailAddress("yamada@hoge.jp");
+//		employee[0].setPassword("aaa");
+//		employee[0].setIdDepartment("10");
+//		
+		employee[1].setIdEmployee("10001");
+		employee[1].setNmEmployee("高橋準");
+		employee[1].setKnEmployee("タカハシジュン");
+		employee[1].setMailAddress("jtaka@hoge.jp");
+		employee[1].setPassword("bbb");
+		employee[1].setIdDepartment("10");
+		
+		employee[2].setIdEmployee("10002");
+		employee[2].setNmEmployee("麻枝史明");
+		employee[2].setKnEmployee("マエダフミアキ");
+		employee[2].setMailAddress("fmak@hoge.jp");
+		employee[2].setPassword("ccc");
+		employee[2].setIdDepartment("11");
+		
+		employee[3].setIdEmployee("10003");
+		employee[3].setNmEmployee("丸戸章介");
+		employee[3].setKnEmployee("マルトショウスケ");
+		employee[3].setMailAddress("marusyo@hoge.jp");
+		employee[3].setPassword("ddd");
+		employee[3].setIdDepartment("12");
+		
+		employee[4].setIdEmployee("10004");
+		employee[4].setNmEmployee("三宅武");
+		employee[4].setKnEmployee("ミヤケタケシ");
+		employee[4].setMailAddress("miya@hoge.jp");
+		employee[4].setPassword("eee");
+		employee[4].setIdDepartment("13");
+//		
+		
+		
+		for(int i=0;i<5;i++) {
+			if(employee[i].getNmEmployee()==null) {
+				continue;
+			}
+			System.out.println(employee[i]);
 		}
-		System.out.println("現在社員データ数：" + EmployeeData.getEmpCount() + "件");
-		//				if (employees[i].isMatchId(serchId)) {
-		//					employees[i].showInfo();
-		//					found = true;
-		//					break;
-		//				}
-		//
-		//			}
-		//			if (!found) {
-		//				System.out.println("該当する社員が見つかりませんでした");
-		//			}
-		System.out.println("--- 空文字のテスト ---");
-		employee1.setNmEmployee(""); // စာသားအလွတ်
-		employee1.setIdEmployee("   "); // Space သီးသန့်
-		employee1.setNmEmployee(null); // null တန်ဖိုး
-
+		
+		
+		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);
+		
+		
 	}
-
-	//scan.close();
+	
+	
+	
+	
 
 }

em-oop/src/Student.java

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

em-oop/src/day3Keisho/BaseData.java

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

em-oop/src/day3Keisho/Day3Check1.java

@@ -1,13 +0,0 @@
-package day3Keisho;
-
-public class Day3Check1 {
-
-	public static void main(String[] args) {
-		// TODO 自動生成されたメソッド・スタブ
-		Circle circle = new Circle(2.0);
-		
-		circle.showInfo();
-
-	}
-
-}

em-oop/src/day3Keisho/Day3Check2.java

@@ -1,15 +0,0 @@
-package day3Keisho;
-
-public class Day3Check2 {
-
-	public static void main(String[] args) {
-		// TODO 自動生成されたメソッド・スタブ
-		Rectangle rect = new Rectangle(3.0, 4.0);
-		rect.showInfo();
-		
-		Greeting greeting = new JapaneseGreeting();
-		
-		System.out.println(greeting.hello());
-		
-	}
-}

em-oop/src/day3Keisho/Day3Check3.java

@@ -1,14 +0,0 @@
-package day3Keisho;
-
-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/day3Keisho/DepartmentData.java

@@ -1,41 +0,0 @@
-package day3Keisho;
-
-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() {
-		// TODO 自動生成されたメソッド・スタブ
-		return getIdDepartment() + "\t" + getNmDepartment();
-	}
-
-	@Override
-	public String toCSV() {
-		// TODO 自動生成されたメソッド・スタブ
-		return getIdDepartment() + "," + getNmDepartment();
-	}
-
-	@Override
-	public String getPrimaryKeyValue() {
-		// TODO 自動生成されたメソッド・スタブ
-		return getIdDepartment();
-	}
-
-}

em-oop/src/day3Keisho/EmployeeData.java

@@ -1,99 +0,0 @@
-package day3Keisho;
-
-public class EmployeeData extends BaseData {
-	private String idEmployee;
-	private String nmEmployee;
-	private String knEmployee;
-	private String mailAddress;
-	private String password;
-	private String idDepartment;
-	
-	
-	public EmployeeData(String idEmployee, String nmEmployee, String knEmployee, String mailAddress, String password, String idDepartment) {
-        this.idEmployee = idEmployee;
-        this.nmEmployee = nmEmployee;
-        this.knEmployee = knEmployee;
-        this.mailAddress = mailAddress;
-        this.password = password;
-        this.idDepartment = idDepartment;
-    }
-	public EmployeeData() {
-    }
-	
-    public String getIdEmployee(String idEmployee) {
-		return idEmployee;
-	}
-
-	public void setIdEmployee(String idEmployee) {
-		// null ဖြစ်နေသလား (သို့မဟုတ်) ရှေ့နောက် Space များကို ဖယ်ရှားလိုက်လျှင် စာသားအလွတ် ဖြစ်သွားသလား စစ်ဆေးခြင်း
-		if (idEmployee == null || idEmployee.trim().isEmpty()) {
-			System.out.println("社員Idが空のため設定できませんでした");
-		} else {
-			this.idEmployee = idEmployee;
-		}
-	}
-
-	public String getNmEmployee() {
-		return nmEmployee;
-	}
-
-	public void setNmEmployee(String nmEmployee) {
-		// null ဖြစ်နေသလား (သို့မဟုတ်) ရှေ့နောက် Space များကို ဖယ်ရှားလိုက်လျှင် စာသားအလွတ် ဖြစ်သွားသလား စစ်ဆေးခြင်း
-		if (nmEmployee == null || nmEmployee.trim().isEmpty()) {
-			System.out.println("社員名が空のため設定できませんでした");
-		} else {
-
-			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() {
-		return idEmployee + "\t" + nmEmployee + "\t" + knEmployee + "\t" + mailAddress + "\t" + password + "\t" + idDepartment;
-    }
-		
-	
-	@Override
-    public String toCSV() {
-        return idEmployee + "," + nmEmployee + "," + knEmployee + "," + mailAddress + "," + password + "," + idDepartment;
-    }
-
-    @Override
-    public String getPrimaryKeyValue() {
-        return idEmployee;
-  
-    }
-
-}

em-oop/src/day3Keisho/Greeting.java

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

em-oop/src/day3Keisho/JapaneseGreeting.java

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

em-oop/src/day3Keisho/Main.java

@@ -1,126 +0,0 @@
-package day3Keisho;
-
-import java.util.Scanner;
-
-public class Main {
-
-	public static void main(String[] args) {
-		// TODO 自動生成されたメソッド・スタブ
-		//EmployeeData[] employees = 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");
-
-		System.out.println(employees[0].toCSV());
-		System.out.println(employees[0].getPrimaryKeyValue());
-
-		System.out.println("10002 を検索します");
-		System.out.println(employees[2].getPrimaryKeyValue().equals("10002"));
-
-		BaseData[] allData = new BaseData[11];
-
-		for (int i = 0; i < employees.length; i++) {
-			allData[i] = employees[i];
-		}
-
-		DepartmentData dept1 = new DepartmentData();
-		dept1.setIdDepartment("10");
-		dept1.setNmDepartment("役員");
-		allData[5] = dept1;
-
-		DepartmentData dept2 = new DepartmentData();
-		dept2.setIdDepartment("11");
-		dept2.setNmDepartment("人事・総務部");
-		allData[6] = dept2;
-
-		DepartmentData dept3 = new DepartmentData();
-		dept3.setIdDepartment("12");
-		dept3.setNmDepartment("経理部");
-		allData[7] = dept3;
-
-		DepartmentData dept4 = new DepartmentData();
-		dept4.setIdDepartment("13");
-		dept4.setNmDepartment("システム開発事業部");
-		allData[8] = dept4;
-
-		DepartmentData dept5 = new DepartmentData();
-		dept5.setIdDepartment("14");
-		dept5.setNmDepartment("教育事業部");
-		allData[9] = dept5;
-
-		DepartmentData dept6 = new DepartmentData();
-		dept6.setIdDepartment("15");
-		dept6.setNmDepartment("営業企画部");
-		allData[10] = dept6;
-
-		for (BaseData data : allData) {
-			System.out.println(data.toString());
-		}
-		//Stept 7
-		int employeeCount =0;
-		int departmentCount =0;
-		
-		for(BaseData data: allData) {
-			if(data instanceof EmployeeData) { //instanceof is looking for inside
-				employeeCount++;
-				
-			}else if(data instanceof DepartmentData) {
-				departmentCount++;
-				
-			}
-		}
-		System.out.println("社員データ:" + employeeCount + "件");
-		System.out.println("部署データ:" + departmentCount + "件");
-		
-	//Strpt 8
-		for (BaseData data : allData) {
-		    if (data instanceof EmployeeData) {
-		        // EmployeeData သို့ Cast လုပ်ခြင်း
-		        EmployeeData emp = (EmployeeData) data;
-		        System.out.println(emp.getMailAddress());
-		    }
-		}
-		// Stept 9
-		Scanner scanner = new Scanner(System.in);
-		System.out.print("検索したい部署名を入力してください: ");
-		String targetDepartmentName = scanner.nextLine();
-
-		String targetDepartmentId = null;
-
-		// ၁။ ဌာနနာမည်မှတစ်ဆင့် ဌာန ID (idDepartment) ကို ရှာခြင်း
-		for (BaseData data : allData) {
-		    if (data instanceof DepartmentData) {
-		        DepartmentData dept = (DepartmentData) data;
-		        if (targetDepartmentName.equals(dept.getNmDepartment())) {
-		            targetDepartmentId = dept.getIdDepartment();
-		            break;
-		        }
-		    }
-		}
-
-		// ၂။ ဌာန ID တူညီသည့် ဝန်ထမ်းများကို ရှာဖွေပြီး ထုတ်ပြခြင်း
-		if (targetDepartmentId != null) {
-		    boolean found = false;
-		    for (BaseData data : allData) {
-		        if (data instanceof EmployeeData) {
-		            EmployeeData emp = (EmployeeData) data;
-		            if (targetDepartmentId.equals(emp.getIdDepartment())) {
-		                System.out.println(emp.getNmEmployee() + "\t" + emp.getMailAddress());
-		                found = true;
-		            }
-		        }
-		    }
-		    if (!found) {
-		        System.out.println("その部署に所属する社員は見つかりませんでした");
-		    }
-		} else {
-		    System.out.println("該当する部署が見つかりませんでした");
-		}
-
-		scanner.close();
-	}
-}

em-oop/src/day3Keisho/Rectangle.java

@@ -1,21 +0,0 @@
-package day3Keisho;
-
-public class Rectangle extends Shape {
-	private double width;
-	private double height;
-	
-	
-	public Rectangle(double width,double height) {
-		super("四角形");
-		this.height=height;
-		this.width=width;
-	}
-
-	@Override
-	public double area() {
-		// TODO 自動生成されたメソッド・スタブ
-		//super.showInfo();
-		return width*height;
-	}
-
-}

em-oop/src/day3Keisho/Shape.java

@@ -1,22 +0,0 @@
-package day3Keisho;
-
-//public class Shape { //stept 1
-	
-	public abstract class Shape{ //stept 2
-	private String name;
-
-	public Shape(String name) {
-		this.name = name;
-	}
-
-	public abstract double area();  //stept 2
-//	public double area() { //stept 1
-//		return 0.0;
-//
-//	}
-
-	public void showInfo() {
-		System.out.println(this.name + "の面積は" + this.area() + "です");
-	}
-
-}

em-oop/src/day3_123/Circle.java

@@ -1,22 +1,22 @@
-package day3Keisho;
+package day3_123;
 
 public class Circle extends Shape {
 	private double radius;
 	
-	public Circle (double radius) {
+	public Circle(double radius) {
 		super("円");
-		this.radius= radius;
+		this.radius=radius;
 	}
+	
 	@Override
 	public double area() {
-		return Math.PI * radius * radius;
-		
+		return Math.PI*radius*radius;
 	}
+	
 	@Override
 	public void showInfo() {
 		super.showInfo();
-		System.out.println("(半径:" + this.radius + ")");
-		
+		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/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()+"です");
+	}
+
+}