6段階目（複数の社員をまとめて表示してみよう）

.gitignore

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

em-oop/src/BaseData.java

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

em-oop/src/BasicCheck1.java

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

em-oop/src/BasicCheck2.java

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

em-oop/src/BasicCheck3.java

@@ -1,31 +1,26 @@
 
 public class BasicCheck3 {
+
 	public static void main(String[] args) {
+		// TODO 自動生成されたメソッド・スタブ
 		Item[] items = new Item[3];
-		items[0] = new Item();
-		items[1] = new Item();
-		items[2] = new Item();
-
-		items[0].setName("ノート");
-		items[1].setName("消しゴム");
-		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++) {
-			items[i].sell(5);
+			items[i] = new Item();
-			System.out.println(items[i].getName() + " " + items[i].getPrice() + "円 (残り" + items[i].getStock() + "個) ");
+		}
-			//			System.out.println("合計金額　" + items[i].totalPrice() + "円");
+		items[0].name = "ノート";
-			//			System.out.println();
+		items[0].price = 120;
-
+		items[0].stock = 50;
-		}
+		items[1].name = "消しゴム";
+		items[1].price = 80;
+		items[1].stock = 30;
+		items[2].name = "鉛筆";
+		items[2].price = 60;
+		items[2].stock = 100;
 
+		for (Item i : items) {
+			i.sell(5);
+			System.out.println(i.name + " " + i.price + "円　残り" + i.stock + "個　合計金額" + i.totalPrice() + "円");
+		}
 	}
 
 }

em-oop/src/Book.java

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

em-oop/src/Circle.java

@@ -1,20 +0,0 @@
-
-public class Circle extends Shape {
-	private double radius;
-
-	public Circle(double radius) {
-		super("円");
-		this.radius = radius;
-	}
-
-	@Override
-	public double area() {
-		return Math.PI * radius * radius;
-	}
-
-	@Override
-	public void showInfo() {
-		super.showInfo();
-		System.out.println("(半径：" + this.radius + ")");
-	}
-}

em-oop/src/Day3Check1.java

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

em-oop/src/Day3Check2.java

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

@@ -1,39 +0,0 @@
-
-public class DepartmentData extends BaseData {
-	private String idDepartment, nmDepartment;
-
-	public DepartmentData(String idDepartment,String nmDepartment) {
-		this.setIdDepartment(idDepartment);
-		this.setNmDepartment(nmDepartment);
-		return; 
-			}
-
-
-	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();
-	}
-	public String toCSV() {
-		return getIdDepartment() + "," + getNmDepartment();
-	}
-	public String getPrimaryKeyValue() {
-		return getIdDepartment();
-	}
-
-}

em-oop/src/EmployeeData.java

@@ -1,121 +1,15 @@
 
-public class EmployeeData extends BaseData {
+public class EmployeeData {
-	private String idEmployee;
+	String idEmployee;
-	private String nmEmployee;
+	String nmEmployee;
-	private String knEmployee;
+	String knEmployee;
-	private String mailAddress;
+	String mailAddress;
-	private String password;
+	String password;
-	private String idDepartment;
+	String idDepartment;
 
-	private static int empCount = 0;
+	void showInfo() {
-
+		System.out.println(this.idEmployee + "\t" + this.nmEmployee
-	static int getempCount() {
+				+ "\t" + this.knEmployee + "\t" + this.mailAddress
-		return empCount;
+				+ "\t" + this.password + "\t" + this.idDepartment);
-
-	}
-
-	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);
-		this.setNmEmployee(nmEmployee);
-		this.setKnEmployee(knEmployee);
-		this.setMailAddress(mailAddress);
-		this.setPassword(password);
-		this.setIdDepartment(idDepartment);
-		empCount++;
-
-	}
-
-	public String getIdEmployee() {
-		return idEmployee;
-	}
-
-	public void setIdEmployee(String idEmployee) {
-		this.idEmployee = idEmployee;
-		if (idEmployee == null || idEmployee.strip().isEmpty()) {
-			System.out.println("社員IDが空のため設定できませんでした");
-			return;
 	}
 }
-
-	public String getNmEmployee() {
-		return nmEmployee;
-	}
-
-	public void setNmEmployee(String nmEmployee) {
-		this.nmEmployee = nmEmployee;
-
-		if (nmEmployee == null || nmEmployee.strip().isEmpty()) {
-			System.out.println("社員名が空のため設定できませんでした");
-			return;
-		}
-	}
-
-	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 (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 +0,0 @@
-
-public interface Greeting {
-
-	String hello();
-
-}

em-oop/src/Item.java

@@ -1,45 +1,14 @@
 
 public class Item {
-	private String name;
+	String name;
-	private int price;
+	int price;
-	private int stock;
+	int stock;
 
-	public void sell(int amount) {
+	void sell(int amount) {
-		this.setStock(this.getStock() - amount);
+		this.stock -= amount;
 	}
 
-	public int totalPrice() {
+	int totalPrice() {
-		return price * stock;
+		return this.price * this.stock;
-
 	}
-
-	@Override
-	public String toString() {
-		return (getName() + " " + getPrice() + "円 (残り" + getStock() + "個");
-	}
-
-	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;
-	}
-
 }

em-oop/src/JapaneseGreeting.java

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

em-oop/src/Main.java

@@ -1,130 +1,64 @@
+
 public class Main {
+
 	public static void main(String[] args) {
+		// TODO 自動生成されたメソッド・スタブ
+		EmployeeData employee = new EmployeeData();
 
-		//		while (true) {
+		employee.idEmployee = "10000";
-		//			Scanner scanner = new Scanner(System.in);
+		employee.nmEmployee = "山田龍也";
-		//			System.out.println("検索したい社員IDを入力してください（終了する場合は0）");
+		employee.knEmployee = "ヤマダタツヤ";
-		//			String input = scanner.nextLine();
+		employee.mailAddress = "yamada@hoge.jp";
+		employee.password = "aaa";
+		employee.idDepartment = "10";
 
-		BaseData[] employees = new BaseData[5];
+		employee.showInfo();
-		//		BaseData employee = new EmployeeData("10000", "山田龍也", "ヤマダタツヤ", "yamada@hoge.jp", "aaa", "10");
-		BaseData[] allData = new BaseData[11];
-		//		
 
-		allData[0] = new EmployeeData("10000", "山田龍也", "ヤマダタツヤ", "yamada@hoge.jp", "aaa", "10");
+		EmployeeData[] employees = new EmployeeData[5];
-		allData[1] = new EmployeeData("10001", "高橋準", "タカハシジュン", "jtaka@hoge.jp", "bbb", "10");
+		for (int i = 0; i < employees.length; i++) {
-		allData[2] = new EmployeeData("10002", "麻枝史明", "マエダフミアキ", "fmak@hoge.jp", "ccc", "11");
+			employees[i] = new EmployeeData();
-		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", "営業企画部");
-
-		//		String targetDeptId = "";
-		//
-		//		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());
-		//				}
-		//			}
-		//		}
-
-		//		int count = 0;
-		//		int countt = 0;
-		//		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("");
 		}
 
-		//			String serchId1 = "10002";
+		//やり方わからないのでごり押し
-		//		System.out.println(serchId1 + "を検索します");
+		employees[0].idEmployee = "10000";
-		//		boolean bo = false;
+		employees[0].nmEmployee = "山田龍也";
-		//		for (int i = 0; i < employees.length; i++) {
+		employees[0].knEmployee = "ヤマダタツヤ";
-		//			if (((EmployeeData) employees[i]).isMatchId(serchId1)) {
+		employees[0].mailAddress = "yamada@hoge.jp";
-		//				bo = true;
+		employees[0].password = "aaa";
-		//				break;
+		employees[0].idDepartment = "10";
-		//			}
-		//
-		//		}
-		//		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);
 
-		//			boolean a = false;
+		employees[1].idEmployee = "10001";
-		//			for (int i = 0; i < employees.length; i++) {
+		employees[1].nmEmployee = "高橋準";
-		//				if (((EmployeeData) employees[i]).isMatchId(input)) {
+		employees[1].knEmployee = "タカハシジュン";
-		//					a = true;
+		employees[1].mailAddress = "jtaka@hoge.jp";
-		//					System.out.println(employees[i]);
+		employees[1].password = "bbb";
-		//					break;
+		employees[1].idDepartment = "10";
-		//
-		//				}
-		//			}
-		//			if (!a) {
-		//				System.out.println("該当する社員が見つかりませんでした");
-		//			}
-		//			if (input.equals("0")) {
-		//				System.out.println("システムを終了します");
-		//				break;
-		//			}
 
-		//		System.out.println(employee.toCSV());
+		employees[2].idEmployee = "10002";
-		//		System.out.println(employee.getPrimaryKeyValue());
+		employees[2].nmEmployee = "麻枝史明";
+		employees[2].knEmployee = "マエダフミアキ";
+		employees[2].mailAddress = "fmak@hoge.jp";
+		employees[2].password = "ccc";
+		employees[2].idDepartment = "11";
+
+		employees[3].idEmployee = "10003";
+		employees[3].nmEmployee = "丸戸章介";
+		employees[3].knEmployee = "マルトショウスケ";
+		employees[3].mailAddress = "marusyo@hoge.jp";
+		employees[3].password = "ddd";
+		employees[3].idDepartment = "12";
+
+		employees[4].idEmployee = "10004";
+		employees[4].nmEmployee = "三宅武";
+		employees[4].knEmployee = "ミヤケタケシ";
+		employees[4].mailAddress = "miya@hoge.jp";
+		employees[4].password = "eee";
+		employees[4].idDepartment = "13";
+
+		for (EmployeeData e : employees) {
+			e.showInfo();
 		}
+
+	}
+
 }

em-oop/src/Rectangle.java

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

em-oop/src/Shape.java

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

em-oop/src/Student.java

@@ -3,22 +3,7 @@ public class Student {
 	int studentId;
 	String name;
 
-	static int studentCount = 0;
+	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++;
-	}
-	
-	static int getStudentCount() {
-		return studentCount;
-	}
-	
-	
-
 }