２日目の９段階目終了

.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>

.gitignore

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

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

em-oop/.gitignore

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

em-oop/.project

@@ -1,17 +0,0 @@
-<?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,9 +1,10 @@
 
 public abstract class BaseData {
-	//抽象メソッドを宣言
+
 	public abstract String toString();
 
 	public abstract String toCSV();
 
 	public abstract String getPrimaryKeyValue();
+
 }

em-oop/src/BasicCheck1.java

@@ -2,22 +2,13 @@
 public class BasicCheck1 {
 
 	public static void main(String[] args) {
-		//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);
 
+		System.out.println(book1.title + "\n" + book1.author + "\n" + book1.price);
+		System.out.println(book2.title + "\n" + book2.author + "\n" + book2.price);
+
 	}
 
 }

em-oop/src/BasicCheck2.java

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

em-oop/src/BasicCheck3.java

@@ -1,36 +1,31 @@
 
 public class BasicCheck3 {
-
 	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[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文残り数の引き算
+		for (int i = 0; i < items.length; i++) {
-		for (int i = 0; i <= 2 ; i++) {
-		
 			items[i].sell(5);
-		}
+			System.out.println(items[i].getName() + " " + items[i].getPrice() + "円 (残り" + items[i].getStock() + "個) ");
-		//3件出力
+			//			System.out.println("合計金額　" + items[i].totalPrice() + "円");
-		for (int i = 0; i <= 2 ; i++) {
+			//			System.out.println();
-			System.out.println(items[i]);
-			
-	
-		
 
 		}
 
 	}
+
 }

em-oop/src/Book.java

@@ -1,20 +1,21 @@
 
 public class Book {
+
 	String title;
 	String author;
 	int price;
 
-	//コンストラクタ生成
 	public Book() {
-		System.out.println( "タイトル未設定");
+		this.title = "タイトル未設定";
-		System.out.println( "著者未設定"); 
+		this.author = "著者未設定";
-		System.out.println( "0"); 
+		this.price = 0;
+
 	}
-	//3つの引数を持つコンストラクタ生成
+
 	public Book(String title, String author, int price) {
-		System.out.println(this.title = title);
+		this.title = title;
-		System.out.println(this.author = author);
+		this.author = author;
-		System.out.println(this.price = price);
+		this.price = price;
 
 	}
 

em-oop/src/Circle.java

@@ -1,21 +1,20 @@
 
 public class Circle extends Shape {
-	//フィールド
 	private double radius;
-	//コンストラクタ
+
 	public Circle(double radius) {
 		super("円");
 		this.radius = radius;
 	}
-	//メソッド1
+
 	@Override
 	public double area() {
 		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

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

em-oop/src/Day3Check2.java

@@ -1,17 +1,11 @@
 
 public class Day3Check2 {
-
 	public static void main(String[] args) {
-		//インスタンス
+		Rectangle rect = new Rectangle(3, 4);
-		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

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

@@ -0,0 +1,39 @@
+
+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,11 +1,39 @@
+
 public class EmployeeData extends BaseData {
-	//フィールド宣言
+	private String idEmployee;
-	private String idEmployee;//社員ID
+	private String nmEmployee;
-	private String nmEmployee;//社員名
+	private String knEmployee;
-	private String knEmployee;//社員カナ
+	private String mailAddress;
-	private String mailAddress;//メールアドレス
+	private String password;
-	private String password;//パスワード
+	private String idDepartment;
-	private String idDepartment;//部署ID
+
+	private static int empCount = 0;
+
+	static int getempCount() {
+		return empCount;
+
+	}
+
+	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;
@@ -13,6 +41,10 @@ public class EmployeeData extends BaseData {
 
 	public void setIdEmployee(String idEmployee) {
 		this.idEmployee = idEmployee;
+		if (idEmployee == null || idEmployee.strip().isEmpty()) {
+			System.out.println("社員IDが空のため設定できませんでした");
+			return;
+		}
 	}
 
 	public String getNmEmployee() {
@@ -21,6 +53,11 @@ public class EmployeeData extends BaseData {
 
 	public void setNmEmployee(String nmEmployee) {
 		this.nmEmployee = nmEmployee;
+
+		if (nmEmployee == null || nmEmployee.strip().isEmpty()) {
+			System.out.println("社員名が空のため設定できませんでした");
+			return;
+		}
 	}
 
 	public String getKnEmployee() {
@@ -55,59 +92,30 @@ 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"+
+		return (this.getIdEmployee() + "\t" + this.getNmEmployee() + "\t" + this.getKnEmployee() + "\t"
-				 getKnEmployee() + "\t"+
+				+ this.getMailAddress() + "\t" + this.getPassword() + "\t" + this.getIdDepartment());
-				 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;
+		return getIdEmployee();
 	}
 
-	//メソッド追加、7段目
+	public boolean isMatchId(String id) {
-	public boolean isMatchID(String id) {
+		if (id == null || this.idEmployee == null) {
-		return idEmployee.equals(id);
+			return false;
+		}
+		return this.idEmployee.equals(id);
+
 	}
-
 
 }

em-oop/src/Greeting.java

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

em-oop/src/Item.java

@@ -1,16 +1,22 @@
 
 public class Item {
-	//フィールド宣言
 	private String name;
 	private int price;
 	private int stock;
 
-	//メソッド宣言
+	public void sell(int amount) {
-	void sell(int amount) {
 		this.setStock(this.getStock() - amount);
 	}
 
-	//ゲッター、セッター設定
+	public int totalPrice() {
+		return price * stock;
+
+	}
+
+	@Override
+	public String toString() {
+		return (getName() + " " + getPrice() + "円 (残り" + getStock() + "個");
+	}
 
 	public String getName() {
 		return name;
@@ -35,8 +41,5 @@ public class Item {
 	public void setStock(int stock) {
 		this.stock = stock;
 	}
-	@Override
+
-	public String toString() {
-		return getName() + " " + getPrice() + "円 (残り" + getStock() + "個)";
-	}
 }

em-oop/src/JapaneseGreeting.java

@@ -4,4 +4,5 @@ public class JapaneseGreeting implements Greeting{
 	public String hello() {
 		return "こんにちは";
 	}
+
 }

em-oop/src/Main.java

@@ -1,55 +1,130 @@
-import java.util.Scanner;
-
 public class Main {
-
 	public static void main(String[] args) {
-		// TODO 自動生成されたメソッド・スタブ
+
-		//インスタンス宣言
+		//		while (true) {
-		BaseData employee = new EmployeeData();
+		//			Scanner scanner = new Scanner(System.in);
-		//配列5件分
+		//			System.out.println("検索したい社員IDを入力してください（終了する場合は0）");
+		//			String input = scanner.nextLine();
+
 		BaseData[] employees = new BaseData[5];
-		//５段階目書き換え
+		//		BaseData employee = new EmployeeData("10000", "山田龍也", "ヤマダタツヤ", "yamada@hoge.jp", "aaa", "10");
-		employees[0] = new EmployeeData("10000", "山田龍也", "ヤマダタツヤ", "yamada@hoge.jp", "aaa", "10");
+		BaseData[] allData = new BaseData[11];
-		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");
 
-		//5段階目記載の処理呼び出し
+		allData[0] = new EmployeeData("10000", "山田龍也", "ヤマダタツヤ", "yamada@hoge.jp", "aaa", "10");
-		//employee.showInfo();
+		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", "営業企画部");
 
-		//Day1、8段階目検索
+		//		String targetDeptId = "";
-		while (true) {
+		//
-			Scanner sc = new Scanner(System.in);//インスタンス化
+		//		for (int i = 0; i < allData.length; i++) {
-			System.out.println("検索したい社員IDを入力してください(終了する場合は０を入力)");
+		//
-			String id = sc.next();
+		//			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());
+		//				}
+		//			}
+		//		}
 
-			if (id.equals("0")) {
+		//		int count = 0;
-				System.out.println("システムを終了します");
+		//		int countt = 0;
-				break;
+		//		for (int i = 0; i < allData.length; i++) {
-			}
+		//			if (allData[i] instanceof EmployeeData) {
-			//boolean変数作成
+		//				//				count++;
-			boolean result = false;
+		//				EmployeeData emp = (EmployeeData) allData[i];
-			//該当の場合
+		//
-			for (int i = 0; i < employees.length; i++) {
+		//				System.out.println(emp.getMailAddress());
-				if (employees[i].getPrimaryKeyValue().equals(id)) {
-					result = true;
-					System.out.println(employees[i]);
-					break;
-				}
-			}
-			if (result == false) {
-				System.out.println("該当する社員が見つかりませんでした(終了する場合は０を入力)");
-			}
 
-		}
+		//			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文
 		//		for (int i = 0; i < employees.length; i++) {
-			//System.out.println(employees[i]);
+		//			System.out.println(allData[i]);
-			//System.out.println(employees[i].toCSV());
+		//		}
-			//System.out.println(employees[i].getPrimaryKeyValue());
+		//		System.out.println("現在の社員データ件数：" + EmployeeData.getEmpCount() + "件");
-			//employees[i].showInfo();を上記に書き換え
+
+		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 + "を検索します");
+		//		boolean bo = false;
+		//		for (int i = 0; i < employees.length; i++) {
+		//			if (((EmployeeData) employees[i]).isMatchId(serchId1)) {
+		//				bo = true;
+		//				break;
+		//			}
+		//
+		//		}
+		//		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;
+		//			for (int i = 0; i < employees.length; i++) {
+		//				if (((EmployeeData) employees[i]).isMatchId(input)) {
+		//					a = true;
+		//					System.out.println(employees[i]);
+		//					break;
+		//
+		//				}
+		//			}
+		//			if (!a) {
+		//				System.out.println("該当する社員が見つかりませんでした");
+		//			}
+		//			if (input.equals("0")) {
+		//				System.out.println("システムを終了します");
+		//				break;
+		//			}
+
+		//		System.out.println(employee.toCSV());
+		//		System.out.println(employee.getPrimaryKeyValue());
+	}
+}

em-oop/src/Rectangle.java

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

em-oop/src/Student.java

@@ -1,29 +1,24 @@
 
 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 自動生成されたコンストラクター・スタブ
 	}
 	
-	//コントラクタ追加
+	static int getStudentCount() {
-	public static int getstudentCount() {
 		return studentCount;
-
 	}
 	
+	
+
 }