２日目の９段階目終了

.classpath

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="src" path="em-oop/src"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>

.project

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>java-cui-em-oop</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>

em-oop/src/BaseData.java

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

em-oop/src/BasicCheck1.java

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

em-oop/src/BasicCheck2.java

@@ -1,6 +1,7 @@
 
 public class BasicCheck2 {
 	public static void main(String[] args) {
+		
 		Student student1 = new Student(1, "鈴木一郎");
         Student student2 = new Student(2, "田中花子");
         Student student3 = new Student(3, "佐藤次郎");
@@ -9,13 +10,14 @@ public class BasicCheck2 {
 		student2.printProfile();
 		student3.printProfile();
 		
-		System.out.println("現在の生徒数："+Student.getStudentCount()+"人");
+		
+		Student.getStudentCount();
+		System.out.println("現在の生徒数:" + Student.getStudentCount() + "人");
 		
 		
-//		student.studentId = 1;
-//		student.name = "鈴木一郎";
-//
-//		student.printProfile();
 	}
 		
+		
+		
+	
 }

em-oop/src/BasicCheck3.java

@@ -6,30 +6,26 @@ public class BasicCheck3 {
 		items[1] = new Item();
 		items[2] = new Item();
 
-		items[0].setName("ノート") ;
+		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[0].setPrice(120);
+		items[1].setPrice(80);
 		items[2].setPrice(60);
+
+		items[0].setStock(50);
+		items[1].setStock(30);
 		items[2].setStock(100);
 
-		
+		for (int i = 0; i < items.length; i++) {
-		
-		for(int i=0;i<3;i++) {
 			items[i].sell(5);
-			System.out.println(items[i]);
+			System.out.println(items[i].getName() + " " + items[i].getPrice() + "円 (残り" + items[i].getStock() + "個) ");
-//			System.out.println("合計金額："+items[i].totalPrice());
+			//			System.out.println("合計金額　" + items[i].totalPrice() + "円");
-		}
+			//			System.out.println();
-		
-		
 
 		}
 
-	
+	}
 
 }

em-oop/src/Book.java

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

em-oop/src/Circle.java

@@ -1,22 +1,20 @@
-package day3_123;
 
 public class Circle extends Shape {
 	private 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/Day3Check1.java

@@ -1,10 +1,8 @@
-package day3_123;
 
 public class Day3Check1 {
-
 	public static void main(String[] args) {
-		Circle circle=new Circle(2);
+		Circle radius = new Circle(2);
-		circle.showInfo();
+		radius.showInfo();
 	}
 
 }

em-oop/src/Day3Check2.java

@@ -0,0 +1,11 @@
+
+public class Day3Check2 {
+	public static void main(String[] args) {
+		Rectangle rect = new Rectangle(3, 4);
+		rect.showInfo();
+		
+		Greeting greeting = new JapaneseGreeting();
+		System.out.println(greeting.hello());
+	}
+
+}

em-oop/src/Day3Check3.java

@@ -1,12 +1,10 @@
-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);
+		Shape shape2 = new Rectangle(3, 4);
 		shape2.showInfo();
 	}
 

em-oop/src/DepartmentData.java

@@ -1,7 +1,13 @@
 
 public class DepartmentData extends BaseData {
-	private String idDepartment;
+	private String idDepartment, nmDepartment;
-	private String nmDepartment;
+
+	public DepartmentData(String idDepartment,String nmDepartment) {
+		this.setIdDepartment(idDepartment);
+		this.setNmDepartment(nmDepartment);
+		return; 
+			}
+
 
 	public String getIdDepartment() {
 		return idDepartment;
@@ -23,13 +29,9 @@ public class DepartmentData extends BaseData {
 	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

@@ -6,48 +6,23 @@ public class EmployeeData extends BaseData {
 	private String mailAddress;
 	private String password;
 	private String idDepartment;
+
 	private static int empCount = 0;
 
-	static final String COMPANY_NAME = "Rhizome";
+	static int getempCount() {
-
-	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++;
 
 	}
 
+	static int getEmpCount() {
+		return empCount;
+	}
+
 	public EmployeeData(String idEmployee, String nmEmployee, String knEmployee, String mailAddress, String password,
 			String idDepartment) {
 		this.setIdEmployee(idEmployee);
@@ -57,20 +32,18 @@ public class EmployeeData extends BaseData {
 		this.setPassword(password);
 		this.setIdDepartment(idDepartment);
 		empCount++;
+
 	}
 
 	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;
+		if (idEmployee == null || idEmployee.strip().isEmpty()) {
+			System.out.println("社員IDが空のため設定できませんでした");
+			return;
 		}
 	}
 
@@ -79,18 +52,16 @@ public class EmployeeData extends BaseData {
 	}
 
 	public void setNmEmployee(String nmEmployee) {
-		nmEmployee = nmEmployee.strip();
-		int nmNum = nmEmployee.length();
-		if (nmNum == 0) {
-			System.out.println("社員名が空のため設定できませんでした");
-
-		} else {
 		this.nmEmployee = nmEmployee;
+
+		if (nmEmployee == null || nmEmployee.strip().isEmpty()) {
+			System.out.println("社員名が空のため設定できませんでした");
+			return;
 		}
 	}
 
 	public String getKnEmployee() {
-		return this.knEmployee;
+		return knEmployee;
 	}
 
 	public void setKnEmployee(String knEmployee) {
@@ -98,7 +69,7 @@ public class EmployeeData extends BaseData {
 	}
 
 	public String getMailAddress() {
-		return this.mailAddress;
+		return mailAddress;
 	}
 
 	public void setMailAddress(String mailAddress) {
@@ -121,4 +92,30 @@ public class EmployeeData extends BaseData {
 		this.idDepartment = idDepartment;
 	}
 
+	@Override
+	public String toString() {
+
+		return (this.getIdEmployee() + "\t" + this.getNmEmployee() + "\t" + this.getKnEmployee() + "\t"
+				+ this.getMailAddress() + "\t" + this.getPassword() + "\t" + this.getIdDepartment());
+
+	}
+
+	@Override
+	public String toCSV() {
+		return getIdEmployee() + "," + getNmEmployee() + "," + getKnEmployee() + "," + getMailAddress() + ","
+				+ getPassword() + "," + getIdDepartment();
+	}
+
+	public String getPrimaryKeyValue() {
+		return getIdEmployee();
+	}
+
+	public boolean isMatchId(String id) {
+		if (id == null || this.idEmployee == null) {
+			return false;
+		}
+		return this.idEmployee.equals(id);
+
+	}
+
 }

em-oop/src/Greeting.java

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

em-oop/src/Item.java

@@ -5,39 +5,41 @@ public class Item {
 	private int stock;
 
 	public void sell(int amount) {
-		this.setStock(this.getStock()-amount) ;
+		this.setStock(this.getStock() - amount);
 	}
 
 	public int totalPrice() {
-		return this.price*this.stock;
+		return price * stock;
+
 	}
 
 	@Override
 	public String toString() {
-		return getName()+" "+getPrice()+"円(残り"+getStock()+"個)";
+		return (getName() + " " + getPrice() + "円 (残り" + getStock() + "個");
 	}
 
 	public String getName() {
-		return this.name;
+		return name;
-	}
-	public void setName(String name) {
-		this.name=name;
 	}
 
+	public void setName(String name) {
+		this.name = name;
+	}
 
 	public int getPrice() {
-		return this.price;
+		return price;
-	}
-	public void setPrice(int price) {
-		this.price=price;
 	}
 
+	public void setPrice(int price) {
+		this.price = price;
+	}
 
 	public int getStock() {
-		return this.stock;
+		return stock;
 	}
+
 	public void setStock(int stock) {
-		this.stock=stock;
+		this.stock = stock;
 	}
 
 }

em-oop/src/JapaneseGreeting.java

@@ -1,4 +1,3 @@
-package day3_123;
 
 public class JapaneseGreeting implements Greeting {
 	@Override

em-oop/src/Main.java

@@ -1,202 +1,130 @@
-import java.util.ArrayList;
-import java.util.Scanner;
-
 public class Main {
 	public static void main(String[] args) {
 
-		//		BaseData employee = new EmployeeData();
+		//		while (true) {
-		//		BaseData[] employees = new BaseData[];
+		//			Scanner scanner = new Scanner(System.in);
-		//		BaseData[] allData = new BaseData();
+		//			System.out.println("検索したい社員IDを入力してください（終了する場合は0）");
-		ArrayList<BaseData> allData = new ArrayList<>();
+		//			String input = scanner.nextLine();
 
-		allData.add(new EmployeeData("10000", "山田龍也", "ヤマダタツヤ", "yamada@hoge.jp", "aaa", "10"));
+		BaseData[] employees = new BaseData[5];
-		//		allData[1] = new EmployeeData("10001", "高橋準", "タカハシジュン", "jtaka@hoge.jp", "bbb", "10");
+		//		BaseData employee = new EmployeeData("10000", "山田龍也", "ヤマダタツヤ", "yamada@hoge.jp", "aaa", "10");
-		//		allData[2] = new EmployeeData("10002", "麻枝史明", "マエダフミアキ", "fmak@hoge.jp", "ccc", "11");
+		BaseData[] allData = new BaseData[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);
+		allData[0] = 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[5] = new DepartmentData("10", "役員");
+		allData[6] = new DepartmentData("11", "人事・総務部");
+		allData[7] = new DepartmentData("12", "経理");
+		allData[8] = new DepartmentData("13", "システム開発事業部");
+		allData[9] = new DepartmentData("14", "教育事業部");
+		allData[10] = new DepartmentData("15", "営業企画部");
 
-		while (true) {
+		//		String targetDeptId = "";
-			System.out.println("1:検索 2:登録 3:更新 4:削除 0:終了");
+		//
-			String usertype = scanner.nextLine();
+		//		for (int i = 0; i < allData.length; i++) {
+		//
+		//			if (allData[i] instanceof DepartmentData) {
+		//				DepartmentData dept = (DepartmentData) allData[i];
+		//
+		//				if (dept.getNmDepartment().equals("システム開発事業部")) {
+		//					targetDeptId = dept.getIdDepartment();
+		//					break;
+		//				}
+		//			}
+		//		}
+		//
+		//		for (int i = 0; i < allData.length; i++) {
+		//			if (allData[i] instanceof EmployeeData) {
+		//				EmployeeData emp = (EmployeeData) allData[i];
+		//				if (emp.getIdDepartment().equals(targetDeptId)) {
+		//					System.out.println(emp.getNmEmployee() + "\t" + emp.getMailAddress());
+		//				}
+		//			}
+		//		}
 
-			//0:終了
+		//		int count = 0;
-			if (usertype.equals("0")) {
+		//		int countt = 0;
-				break;
+		//		for (int i = 0; i < allData.length; i++) {
+		//			if (allData[i] instanceof EmployeeData) {
+		//				//				count++;
+		//				EmployeeData emp = (EmployeeData) allData[i];
+		//
+		//				System.out.println(emp.getMailAddress());
+
+		//			else if (allData[i] instanceof DepartmentData) {
+		//				countt++;
+		//			}
+
+		//		System.out.println("社員のデータ：" + count + "件");
+		//		System.out.println("部署のデータ：" + countt + "件");
+
+		//			System.out.println(allData[i]);
+
+		//			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");
+		//			//
+
+		//		for (int i = 0; i < employees.length; i++) {
+		//			System.out.println(allData[i]);
+		//		}
+		//		System.out.println("現在の社員データ件数：" + EmployeeData.getEmpCount() + "件");
+
+		if (allData[0] instanceof EmployeeData) {
+			EmployeeData sampleEmp = (EmployeeData) allData[0];
+			sampleEmp.setNmEmployee("");
+		}
+		if (allData[0] instanceof EmployeeData) {
+			EmployeeData sampleEmp = (EmployeeData) allData[0];
+			sampleEmp.setIdEmployee("");
 		}
 
-			//1:検索
+		//			String serchId1 = "10002";
-			if (usertype.equals("1")) {
+		//		System.out.println(serchId1 + "を検索します");
-				System.out.println("1:全検索 2:条件検索 それ以外:戻る");
+		//		boolean bo = false;
-				usertype = scanner.nextLine();
+		//		for (int i = 0; i < employees.length; i++) {
-				if (usertype.equals("1")) {
+		//			if (((EmployeeData) employees[i]).isMatchId(serchId1)) {
-					for (int i = 0; i < allData.size(); i++)
+		//				bo = true;
-						if (allData.get(i) instanceof EmployeeData) {
+		//				break;
-							System.out.println(allData.get(i).toString());
+		//			}
-						}
+		//
+		//		}
+		//		System.out.println(bo);
+		//			String serchId2 = "99999";
+		//		System.out.println(serchId2 + "を検索します");
+		//		boolean bl = false;
+		//		for (int i = 0; i < employees.length; i++) {
+		//			if (((EmployeeData) employees[i]).isMatchId(serchId2)) {
+		//				bl = true;
+		//				break;
+		//			}
+		//		}
+		//		System.out.println(bl);
 
-				} else if (usertype.equals("2")) {
+		//			boolean a = false;
-					System.out.println("IDを入力してください");
+		//			for (int i = 0; i < employees.length; i++) {
-					usertype = scanner.nextLine();
+		//				if (((EmployeeData) employees[i]).isMatchId(input)) {
-
+		//					a = true;
-					boolean result = false;
+		//					System.out.println(employees[i]);
-					for (int i = 0; i < allData.size(); i++)
+		//					break;
-						if (allData.get(i) instanceof EmployeeData) {
+		//
-							EmployeeData employee = (EmployeeData) allData.get(i);
+		//				}
-							if (employee.getIdEmployee().equals(usertype)) {
+		//			}
-								result = true;
+		//			if (!a) {
-								System.out.println(employee.toString());
+		//				System.out.println("該当する社員が見つかりませんでした");
-								break;
+		//			}
-							}
+		//			if (input.equals("0")) {
-
+		//				System.out.println("システムを終了します");
-						}
+		//				break;
-					if (result == false) {
+		//			}
-						System.out.println("入力された値で情報がみつかりませんでした");
-						
-					}
-
-				} else {
-					continue;
-
-				}
-
-			}
-
-			//2:登録
-			if (usertype.equals("2")) {
-				System.out.println("社員IDを入力してください");
-			}
-
-		}
 
+		//		System.out.println(employee.toCSV());
+		//		System.out.println(employee.getPrimaryKeyValue());
 	}
 }
-
-//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,17 @@
+
+public class Rectangle extends Shape{
+	private double width;
+	private double height;
+	
+	public Rectangle(double width, double height) {
+		super("四角形");
+		this.width = width;
+		this.height = height;
+	}
+	
+	@Override
+	public double area() {
+		return width * height;
+	}
+
+}

em-oop/src/Shape.java

@@ -1,15 +1,15 @@
-package day3_123;
 
 public abstract class Shape {
 	private String name;
+
 	public Shape(String name) {
-		this.name=name;
+		this.name = name;
 	}
 
 	public abstract double area();
 
 	public void showInfo() {
-		System.out.println(this.name+"の面積は"+this.area()+"です");
+		System.out.println(this.name + "の面積は" + this.area() + "です");
 	}
 
 }

em-oop/src/Student.java

@@ -2,20 +2,20 @@
 public class Student {
 	int studentId;
 	String name;
+	
 	static int studentCount = 0;
 	
-	public void printProfile() {
+	public void printProfile () {
 		System.out.println("学籍番号:" + this.studentId + " 名前:" + this.name);
 		
 	}
-
 	public Student(int studentId, String name) {
 		this.studentId = studentId;
 		this.name = name;
 		studentCount++;
 	}
 	
-	public static int getStudentCount() {
+	static int getStudentCount() {
 		return studentCount;
 	}
 	

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/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;
-	}
-
-}