個人開発の修正です

.classpath

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

.gitignore

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

.project

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

em-oop/src/BaseData.java

@@ -1,9 +1,8 @@
 
 public abstract class BaseData {
-	//3-4
+
 	public abstract String toString();
-
 	public abstract String toCSV();
-
 	public abstract String getPrimaryKeyValue();
+	
 }

em-oop/src/BasicCheck1.java

@@ -2,27 +2,17 @@
 public class BasicCheck1 {
 
 	public static void main(String[] args) {
-		//1-1
+
-		//		Book book = new Book();
+		Book book1 = new Book();
+		Book book2 = new Book("銀河鉄道の夜", "宮沢賢治", 500);
+
 		//		book.title = "吾輩は猫である";
 		//		book.author = "夏目漱石";
 		//		book.price = 800;
-		//		
-		//		System.out.println(book.title);
-		//		System.out.println(book.author);
-		//		System.out.println(book.price);
-		//1-1
 
-		//2-1
+		System.out.println(book1.title +"\n"+ book1.author +"\n"+ book1.price);
-		Book book1 = new Book();
+		System.out.println(book2.title +"\n"+ book2.author +"\n"+ book2.price);
-		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);
-		//2-1
 	}
+
 }

em-oop/src/BasicCheck2.java

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

em-oop/src/BasicCheck3.java

@@ -1,19 +1,53 @@
 
 public class BasicCheck3 {
+
 	public static void main(String[] args) {
-		//1-3
+		// TODO 自動生成されたメソッド・スタブ
+
 		Item[] items = new Item[3];
-		items[0] = new Item("ノート", 120, 50);
-		items[1] = new Item("消しゴム", 80, 30);
-		items[2] = new Item("鉛筆", 60, 100);
 
-		for (int i = 0; i < 3; i++) {
+		Item item0 = new Item();
+		Item item1 = new Item();
+		Item item2 = new Item();
+
+		items[0] = item0;
+		items[1] = item1;
+		items[2] = item2;
+
+		item0.setName("ノート");
+		item0.setPrice(120);
+		item0.setStock(50);
+
+		item1.setName("消しゴム");
+		item1.setPrice(80);
+		item1.setStock(30);
+
+		item2.setName("鉛筆");
+		item2.setPrice(60);
+		item2.setStock(100);
+		//		item1.setName = "ノート";
+		//		item1.price = 120;
+		//		item1.stock = 50;
+		//		
+		//		Item item2 = new Item();
+		//		
+		//		item2.name = "消しゴム";
+		//		item2.price = 80;
+		//		item2.stock = 30;
+		//		
+		//		Item item3 = new Item();
+		//		
+		//		item3.name = "鉛筆";
+		//		item3.price = 60;
+		//		item3.stock = 100;
+
+		for (int i = 0; i < items.length; i++) {
+
 			items[i].sell(5);
-			//2-2
+
-			System.out.println(items[i].toString());
+			System.out.println(items[i]);
-			//2-2
+
-		}
-		//1-3
 		}
 
+	}
 }

em-oop/src/Book.java

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

em-oop/src/Circle.java

@@ -5,6 +5,7 @@ public class Circle extends Shape {
 	public Circle(double radius) {
 		super("円");
 		this.radius = radius;
+
 	}
 
 	@Override
@@ -16,5 +17,6 @@ public class Circle extends Shape {
 	public void showInfo() {
 		super.showInfo();
 		System.out.println("(半径:" + this.radius + ")");
+
 	}
 }

em-oop/src/Day3Check1.java

@@ -1,9 +0,0 @@
-
-public class Day3Check1 {
-
-	public static void main(String[] args) {
-		Circle circle = new Circle(2);
-		circle.showInfo();
-		}
-
-}

em-oop/src/Day3Check2.java

@@ -1,8 +1,10 @@
 
 public class Day3Check2 {
+
 	public static void main(String[] args) {
-		Rectangle rectangle = new Rectangle(3, 4);
+		// TODO 自動生成されたメソッド・スタブ
-		rectangle.showInfo();
+		Rectangle Rectangle = new Rectangle(3, 4);
+		Rectangle.showInfo();
 		
 		Greeting greeting = new JapaneseGreeting();
 		System.out.println(greeting.hello());

em-oop/src/Day3Check3.java

@@ -1,11 +1,14 @@
 
-public class DayCheck3 {
+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/DayCheck1.java

@@ -0,0 +1,9 @@
+
+public class DayCheck1 {
+
+	public static void main(String[] args) {
+		Circle radius = new Circle(2);
+		
+		radius.showInfo();
+	}
+}

em-oop/src/DepartmentData.java

@@ -1,28 +1,11 @@
 
 public class DepartmentData extends BaseData {
-	//3-6
 	private String idDepartment;
 	private String nmDepartment;
 
-	//3-6
 	public DepartmentData(String idDepartment, String nmDepartment) {
-		this.idDepartment = idDepartment;
+		setIdDepartment(idDepartment);
-		this.nmDepartment = nmDepartment;
+		setNmDepartment(nmDepartment);
-	}
-
-	@Override
-	public String toString() {
-		return getIdDepartment() + "\t" + getNmDepartment();
-	}
-
-	@Override
-	public String toCSV() {
-		return getIdDepartment() + "," + getNmDepartment();
-	}
-
-	@Override
-	public String getPrimaryKeyValue() {
-		return getIdDepartment();
 	}
 
 	public String getIdDepartment() {
@@ -40,5 +23,17 @@ public class DepartmentData extends BaseData {
 	public void setNmDepartment(String nmDepartment) {
 		this.nmDepartment = nmDepartment;
 	}
-	//3-6
+
+	@Override
+	public String toString() {
+		return getIdDepartment() + "\t" + getNmDepartment();
+	}
+
+	public String toCSV() {
+		return getIdDepartment() + "," + getNmDepartment();
+	}
+
+	public String getPrimaryKeyValue() {
+		return getIdDepartment();
+	}
 }

em-oop/src/EmployeeData.java

@@ -1,104 +1,34 @@
 
 public class EmployeeData extends BaseData {
-	//1-4
+	private String idEmployee;
-	private String IdEmployee, nmEmployee, knEmployee, mailAddress, password, idDepartment;
+	private String nmEmployee;
-	//1-4 + 2-4
+	private String knEmployee;
-
+	private String mailAddress;
-	//1-6
+	private String password;
-	//	public EmployeeData(String idEmployee, String nmEmployee, String knEmployee, String mailAddress, String password,
+	private String idDepartment;
-	//			String idDepartment) {
-	//		this.IdEmployee = idEmployee;
-	//		this.nmEmployee = nmEmployee;
-	//		this.knEmployee = knEmployee;
-	//		this.mailAddress = mailAddress;
-	//		this.password = password;
-	//		this.idDepartment = idDepartment;
-	//	}
-	//1-6
-
-	//1-5
-	//2-4
-	//2-6
-	@Override
-	public String toString() {
-		//		System.out.println(getIdEmployee() + "\t" + getNmEmployee() + "\t" + getKnEmployee() + "\t" + getMailAddress()
-		//				+ "\t" + getPassword() + "\t" + getIdDepartment());
-		return (getIdEmployee() + "\t" + getNmEmployee() + "\t" + getKnEmployee() + "\t" + getMailAddress()
-				+ "\t" + getPassword() + "\t" + getIdDepartment());
-	}
-	//2-6
-	//2-4
-	//1-5
-
-	//3-4
-	@Override
-	public String toCSV() {
-		return getIdEmployee() + "," + getNmEmployee() + "," + getKnEmployee() + "," + getMailAddress()
-				+ "," + getPassword() + "," + getIdDepartment();
-	}
-
-	public String getPrimaryKeyValue() {
-		return IdEmployee;
-	}
-	//3-4
-
-	//1-7
-	boolean isMatchId(String id) {
-		System.out.println(id + " を検索します");
-		if (id.equals(IdEmployee)) {
-			System.out.println(true);
-		} else {
-			System.out.println(false);
-		}
-		return false;
-	}
-	//1-7
-
-	//2-5
-	public EmployeeData() {
-		//2-7
-		empCount++;
-		//2-7
-	}
-
-	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-7
-		empCount++;
-		//2-7
-	}
-	//2-5
-
-	//2-7
 	private static int empCount = 0;
 
-	static int getEmpCount() {
+	EmployeeData() {
-		return empCount;
+		empCount = empCount + 1;
-
+	}
+
+	EmployeeData(String idEmployee, String nmEmployee, String knEmployee, String mailAddress, String password,
+			String idDepartment) {
+		setIdEmployee(idEmployee);
+		setNmEmployee(nmEmployee);
+		setKnEmployee(knEmployee);
+		setMailAddress(mailAddress);
+		setPassword(password);
+		setIdDepartment(idDepartment);
+		empCount = empCount + 1;
 	}
-	//2-7
 
-	//2-4
 	public String getIdEmployee() {
-		return IdEmployee;
+		return idEmployee;
 	}
 
 	public void setIdEmployee(String idEmployee) {
-		//2-9
+		this.idEmployee = idEmployee;
-		idEmployee = idEmployee.strip();
-		if (idEmployee.length() == 0) {
-			System.out.println("社員IDが空のため設定できませんでした");
-			return;
-		} else {
-			this.IdEmployee = idEmployee;
-		}
-		//2-9
 	}
 
 	public String getNmEmployee() {
@@ -106,16 +36,17 @@ public class EmployeeData extends BaseData {
 	}
 
 	public void setNmEmployee(String nmEmployee) {
-		//2-8
+		//		2日目段階8
-		nmEmployee = nmEmployee.strip();
+		//		String stripped = nmEmployee.strip();
-		if (nmEmployee.length() == 0) {
+		//		int length = stripped.length();
-			System.out.println("社員名が空のため設定できませんでした");
+		//		if (nmEmployee == null) {
-			return;
+		//		System.out.println("社員名が空のため設定できませんでした");
-		} else {
+		//		}
+		//		if (length == 0) {
+		//			System.out.println("社員名が空のため設定できませんでした");
+		//		} else
 		this.nmEmployee = nmEmployee;
 	}
-		//2-8
-	}
 
 	public String getKnEmployee() {
 		return knEmployee;
@@ -148,5 +79,37 @@ public class EmployeeData extends BaseData {
 	public void setIdDepartment(String idDepartment) {
 		this.idDepartment = idDepartment;
 	}
-	//2-4
+
+	public static int getEmpCount() {
+		return empCount;
+	}
+
+	public static void setEmpCount(int empCount) {
+		EmployeeData.empCount = empCount;
+	}
+
+	@Override
+	public String toString() {
+		return getIdEmployee() + "\t" + getNmEmployee() + "\t" + getKnEmployee() + "\t" + getMailAddress()
+				+ "\t" + getPassword() + "\t" + getIdDepartment();
+	}
+
+	//	public boolean isMatchId(String id) {
+	//
+	//		return idEmployee.equals(id);
+	//
+	//	}
+
+	public String toCSV() {
+		return getIdEmployee() + "," + getNmEmployee() + "," + getKnEmployee() + "," + getMailAddress()
+				+ "," + getPassword() + "," + getIdDepartment();
+	}
+
+	public String getPrimaryKeyValue() {
+		return idEmployee;
+	}
+
+	public static int empCount() {
+		return empCount;
+	}
 }

em-oop/src/Greeting.java

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

em-oop/src/Item.java

@@ -1,27 +1,20 @@
 
 public class Item {
-	//1-3
 	private String name;
 	private int price;
 	private int stock;
 
-	public Item(String name, int price, int stock) {
+	//	void sell(int amount) {
-		this.name = name;
-		this.price = price;
-		this.stock = stock;
-	}
-
-	void sell(int amount) {
 	//		this.stock = this.stock - amount;
-		this.setStock(this.getStock() - amount); //2-2
-		//System.out.println(name + " " + price + "円 残り" + stock + "個");
-	}
-	//1-3
 
-	//2-2
+	public void sell(int amount) {
+		setStock(this.getStock() - amount);
+	}
+
 	@Override
 	public String toString() {
-		return getName() + "" + getPrice() + "円（残り" + getStock() + "個）";
+		String output = getName() + " " + getPrice() + "円 (残り" + getStock() + "個)";
+		return output;
 	}
 
 	public String getName() {
@@ -47,5 +40,5 @@ public class Item {
 	public void setStock(int stock) {
 		this.stock = stock;
 	}
-	//2-2
+
 }

em-oop/src/JapaneseGreeting.java

@@ -1,7 +1,10 @@
 
 public class JapaneseGreeting implements Greeting {
+
 	@Override
 	public String hello() {
+		// TODO 自動生成されたメソッド・スタブ
 		return "こんにちは";
 	}
+	
 }

em-oop/src/Main.java

@@ -1,168 +1,79 @@
-//import java.util.Scanner;//1-8
+import java.util.Scanner;
 
 public class Main {
+
 	public static void main(String[] args) {
-		//1-8
+		// TODO 自動生成されたメソッド・スタブ
-		//		Scanner scanner = new Scanner(System.in);
-		//		//1-9
-		//		boolean end = false;
-		//		while (!end) {
-		//		//1-9
-		//			System.out.println("検索したい社員IDを入力してください（終了するには0を入力）");
-		//			String num = scanner.nextLine().strip();
-		//			boolean found = false;
-		//1-8
-		//1-4
-		//		BaseData employee = new EmployeeData();
-		//		employee.setIdEmployee("10000");
-		//		employee.setNmEmployee("山田龍也");
-		//		employee.setKnEmployee("ヤマダタツヤ");
-		//		employee.setMailAddress("yamada@hoge.jp");
-		//		employee.setPassword("aaa");
-		//		employee.setIdDepartment("10");
 
-		//				System.out.println(employee.getIdEmployee());
+		while (true) {
-		//				System.out.println(employee.getNmEmployee());
+
-		//				System.out.println(employee.getKnEmployee());
+			System.out.println("検索したい社員IDを入力してください（終了したい場合は0）");
-		//				System.out.println(employee.getMailAddress());
+			Scanner scanner = new Scanner(System.in);
-		//				System.out.println(employee.getPassword());
+			String id = scanner.nextLine();
-		//				System.out.println(employee.getIdDepartment());
+			boolean bo = false;
-		//1-4
+
+			BaseData[] allData = new BaseData[11];
+
+			BaseData employee = new EmployeeData("10000", "山田龍也", "ヤマダタツヤ", "yamada@hoge.jp", "aaa", "10");
+
+			BaseData employee1 = new EmployeeData("10001", "高橋準", "タカハシジュン", "jtaka@hoge.jp", "bbb", "10");
+
+			BaseData employee2 = new EmployeeData("10002", "麻枝史明", "マエダフミアキ", "fmak@hoge.jp", "ccc", "11");
+
+			BaseData employee3 = new EmployeeData("10003", "丸戸章介", "マルトショウスケ", "marusyo@hoge.jp", "ddd", "12");
+
+			BaseData employee4 = new EmployeeData("10004", "三宅武", "ミヤケタケシ", "miya@hoge.jp,eee", "eee", "13");
+
+			allData[0] = employee;
+			allData[1] = employee1;
+			allData[2] = employee2;
+			allData[3] = employee3;
+			allData[4] = employee4;
+
+			BaseData dept = new DepartmentData("10", "役員");
+			BaseData dept1 = new DepartmentData("11", "人事・総務部");
+			BaseData dept2 = new DepartmentData("12", "経理部");
+			BaseData dept3 = new DepartmentData("13", "システム開発事業部");
+			BaseData dept4 = new DepartmentData("14", "教育事業部");
+			BaseData dept5 = new DepartmentData("15", "営業企画部");
+
+			allData[5] = dept;
+			allData[6] = dept1;
+			allData[7] = dept2;
+			allData[8] = dept3;
+			allData[9] = dept4;
+			allData[10] = dept5;
+
+//			for (int i = 0; i < allData.length; i++) {
+//				System.out.println(allData[i]);
+//			}
+//			System.out.println("現在の社員データ件数"+ EmployeeData.getEmpCount()+ "件");
+
+			for (int i = 0; i < allData.length; i++) {
+
+				//			System.out.println(employees[i]);
+				if (allData[i].getPrimaryKeyValue().equals(id)) {
+					bo = true;
+					System.out.println(allData[i]);
 
-		//3-4
 					//					System.out.println(employee.toCSV());
 					//					System.out.println(employee.getPrimaryKeyValue());
-		//3-4
-
-		//2-5
-		//		EmployeeData emp1 = new EmployeeData("10000", "山田龍也", "ヤマダタツヤ", "yamada@hoge.jp", "aaa", "10");
-		//		EmployeeData emp2 = new EmployeeData("10001", "高橋準", "タカハシジュン", "Jtaka@hoge.jp", "bbb", "11");
-		//		EmployeeData emp3 = new EmployeeData("10002", "麻枝史明", "マエダフミアキ", "fmak@hoge.jp", "ccc", "12");
-		//		EmployeeData emp4 = new EmployeeData("10003", "丸戸章介", "マルトショウスケ", "marusyo@hoge.jp", "ddd", "13");
-		//		EmployeeData emp5 = new EmployeeData("10004", "三宅武", "ミヤケタケシ", "miya@hoge.jp", "eee", "14");
-		//2-5
-
-		//1-6
-		BaseData[] employee = new EmployeeData[5];
-		employee[0] = new EmployeeData("10000", "山田龍也", "ヤマダタツヤ", "yamada@hoge.jp", "aaa", "10");
-		employee[1] = new EmployeeData("10001", "高橋準", "タカハシジュン", "Jtaka@hoge.jp", "bbb", "10");
-		employee[2] = new EmployeeData("10002", "麻枝史明", "マエダフミアキ", "fmak@hoge.jp", "ccc", "11");
-		employee[3] = new EmployeeData("10003", "丸戸章介", "マルトショウスケ", "marusyo@hoge.jp", "ddd", "12");
-		employee[4] = new EmployeeData("10004", "三宅武", "ミヤケタケシ", "miya@hoge.jp", "eee", "13");
-		//1-5
-		//1-6
-		//2-5
-		//		System.out.println(emp1);
-		//		System.out.println(emp2);
-		//		System.out.println(emp3);
-		//		System.out.println(emp4);
-		//		System.out.println(emp5);
-		//			for (int i = 0; i < employee.length; i++) {
-		//				System.out.println(employee[i]);
-		//			}
-		//2-7
-		//		System.out.println("現在の社員データ件数:" + EmployeeData.getEmpCount() + "件");
-		//					for (int i = 0; i < 5; i++) {
-		//						employee[i].showInfo();
-		//					}
-		//2-7
-		//2-5
-		//1-6
-		//1-5
-
-		//1-7
-		//3-5
-		//		System.out.println(employee[2].getPrimaryKeyValue().equals("10002"));
-		//		System.out.println(employee[2].getPrimaryKeyValue().equals("99999"));
-		//3-5
-		//1-7
-
-		//1-8
-		//			for (int i = 0; i < employee.length; i++) {
-		//				if (num.equals(employee[i].getIdEmployee())) {
-		//					//2-6
-		//					System.out.println(employee[i]);
-		//					//2-6
-		////					employee[i].showInfo();
-		//					found = true;
-		//					break;
-		//				} else if (num.equals("0")) {
-		//					System.out.println("システムを終了します");
-		//					return;
-		//				}
-		//			}
-		//			if (!found) {
-		//				System.out.println("該当する社員が見つかりませんでした");
-		//			}
-		//1-8 isMatchIdメソッドを使っていない
-		//		}
-
-		//3-6
-		BaseData[] allData = new BaseData[11];
-		allData[0] = employee[0];
-		allData[1] = employee[1];
-		allData[2] = employee[2];
-		allData[3] = employee[3];
-		allData[4] = employee[4];
-
-		DepartmentData dept = new DepartmentData("10", "役員");
-		allData[5] = dept;
-		DepartmentData dept2 = new DepartmentData("11", "人事・総務部");
-		allData[6] = dept2;
-		DepartmentData dept3 = new DepartmentData("12", "経理部");
-		allData[7] = dept3;
-		DepartmentData dept4 = new DepartmentData("13", "システム開発事業部");
-		allData[8] = dept4;
-		DepartmentData dept5 = new DepartmentData("14", "教育事業部");
-		allData[9] = dept5;
-		DepartmentData dept6 = new DepartmentData("15", "営業企画部");
-		allData[10] = dept6;
-
-		for (int i = 0; i < 11; i++) {
-			System.out.println(allData[i]);
 				}
-		//3-6
 
-		//3-7
+				//			employees[i].isMatchId("10002");
-		int Cou = 0;
+				//			employees[i].isMatchId("99999");
-		int Cou2 = 0;
+				continue;
-		for (int i = 0; i < 11; i++) {
-			if (allData[i] instanceof EmployeeData) {
-				Cou = Cou + 1;
-			} else if (allData[i] instanceof DepartmentData) {
-				Cou2 = Cou2 + 1;
 			}
+			if (bo == false && !id.equals("0")) {
+				System.out.println("該当する社員が見つかりませんでした");
 			}
-		System.out.println("社員データ：" + Cou + "件");
+			if (id.equals("0")) {
-		System.out.println("部署データ：" + Cou2 + "件");
+				System.out.println("システムを終了します");
-		//3-7
+				break;
-
-		//3-8
-		for (int i = 0; i < 11; i++) {
-			if (allData[i] instanceof EmployeeData) {
-				EmployeeData emp = (EmployeeData) allData[i];
-				System.out.println(emp.getMailAddress());
-			}
-		}
-		//3-8
-
-		//3-9
-		for (int i = 0; i < 11; i++) {
-			if (allData[i] instanceof DepartmentData) {
-				DepartmentData bd = (DepartmentData) allData[i];
-				if (bd.getNmDepartment().equals("システム開発事業部")) {
-					for (int j = 0; j < 11; j++) {
-						if (allData[j] instanceof EmployeeData) {
-							EmployeeData emp = (EmployeeData) allData[j];
-							if (bd.getIdDepartment().equals(emp.getIdDepartment())) {
-								System.out.println(emp.getNmEmployee() + "\t" + emp.getMailAddress());
-							}
 			}
 
 		}
+
 	}
-			}
+
-		}
-		//3-9
-	}
 }

em-oop/src/Rectangle.java

@@ -5,12 +5,14 @@ public class Rectangle extends Shape {
 
 	public Rectangle(double width, double height) {
 		super("四角形");
-		this.width = width;
 		this.height = height;
+		this.width = width;
+
 	}
 
 	@Override
 	public double area() {
 		return width * height;
 	}
+
 }

em-oop/src/Shape.java

@@ -3,6 +3,7 @@ public abstract class Shape {
 	private String name;
 
 	public Shape(String name) {
+
 		this.name = name;
 	}
 

em-oop/src/Student.java

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