個人開発の修正です

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

.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

@@ -2,9 +2,7 @@
 public abstract class BaseData {
 
 	public abstract String toString();
-
 	public abstract String toCSV();
-
 	public abstract String getPrimaryKeyValue();
 	
 }

em-oop/src/BasicCheck1.java

@@ -6,8 +6,12 @@ public class BasicCheck1 {
 		Book book1 = new Book();
 		Book book2 = new Book("銀河鉄道の夜", "宮沢賢治", 500);
 
-		System.out.println(book1.title + "\n" + book1.author + "\n" + book1.price);
+		//		book.title = "吾輩は猫である";
-		System.out.println(book2.title + "\n" + book2.author + "\n" + book2.price);
+		//		book.author = "夏目漱石";
+		//		book.price = 800;
+
+		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,23 +1,26 @@
 
 public class BasicCheck2 {
-	public static void main(String[] args) {
 
+	public static void main(String[] args) {
+		// TODO 自動生成されたメソッド・スタブ
 		Student student1 = new Student(1, "鈴木一郎");
+
+		//		student1.studentId = 1;
+		//		student1.name = "鈴木一郎";
+		student1.printProfile();
+
 		Student student2 = new Student(2, "田中花子");
+
+		student2.printProfile();
+
 		Student student3 = new Student(3, "佐藤次郎");
 
-		student1.printProfile();
-		student2.printProfile();
 		student3.printProfile();
 
-		
+		Student.getStudentCount();{
-		Student.getStudentCount();
+			System.out.println("現在の生徒数:" + Student.studentCount + "人");
-		System.out.println("現在の生徒数:" + Student.getStudentCount() + "人");
+		}
-		
 
 	}
 
-		
-		
-	
 }

em-oop/src/BasicCheck3.java

@@ -1,31 +1,53 @@
 
 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("ノート");
+		Item item0 = new Item();
-		items[1].setName("消しゴム");
+		Item item1 = new Item();
-		items[2].setName("鉛筆");
+		Item item2 = new Item();
 
-		items[0].setPrice(120);
+		items[0] = item0;
-		items[1].setPrice(80);
+		items[1] = item1;
-		items[2].setPrice(60);
+		items[2] = item2;
 
-		items[0].setStock(50);
+		item0.setName("ノート");
-		items[1].setStock(30);
+		item0.setPrice(120);
-		items[2].setStock(100);
+		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);
-			System.out.println(items[i].getName() + " " + items[i].getPrice() + "円 (残り" + items[i].getStock() + "個) ");
+
-			//			System.out.println("合計金額　" + items[i].totalPrice() + "円");
+			System.out.println(items[i]);
-			//			System.out.println();
 
 		}
 
 	}
-
 }

em-oop/src/Book.java

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

em-oop/src/Circle.java

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

em-oop/src/Day3Check2.java

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

em-oop/src/Day3Check3.java

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

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

em-oop/src/DepartmentData.java

@@ -1,14 +1,13 @@
 
 public class DepartmentData extends BaseData {
-	private String idDepartment, nmDepartment;
+	private String idDepartment;
+	private String nmDepartment;
 
-	public DepartmentData(String idDepartment,String nmDepartment) {
+	public DepartmentData(String idDepartment, String nmDepartment) {
-		this.setIdDepartment(idDepartment);
+		setIdDepartment(idDepartment);
-		this.setNmDepartment(nmDepartment);
+		setNmDepartment(nmDepartment);
-		return; 
 	}
 
-
 	public String getIdDepartment() {
 		return idDepartment;
 	}
@@ -29,11 +28,12 @@ public class DepartmentData extends BaseData {
 	public String toString() {
 		return getIdDepartment() + "\t" + getNmDepartment();
 	}
+
 	public String toCSV() {
 		return getIdDepartment() + "," + getNmDepartment();
 	}
+
 	public String getPrimaryKeyValue() {
 		return getIdDepartment();
 	}
-
 }

em-oop/src/EmployeeData.java

@@ -6,33 +6,21 @@ public class EmployeeData extends BaseData {
 	private String mailAddress;
 	private String password;
 	private String idDepartment;
-
 	private static int empCount = 0;
 
-	static int getempCount() {
+	EmployeeData() {
-		return empCount;
+		empCount = empCount + 1;
-
 	}
 
-	public EmployeeData() {
+	EmployeeData(String idEmployee, String nmEmployee, String knEmployee, String mailAddress, String password,
-		empCount++;
-
-	}
-
-	static int getEmpCount() {
-		return empCount;
-	}
-
-	public EmployeeData(String idEmployee, String nmEmployee, String knEmployee, String mailAddress, String password,
 			String idDepartment) {
-		this.setIdEmployee(idEmployee);
+		setIdEmployee(idEmployee);
-		this.setNmEmployee(nmEmployee);
+		setNmEmployee(nmEmployee);
-		this.setKnEmployee(knEmployee);
+		setKnEmployee(knEmployee);
-		this.setMailAddress(mailAddress);
+		setMailAddress(mailAddress);
-		this.setPassword(password);
+		setPassword(password);
-		this.setIdDepartment(idDepartment);
+		setIdDepartment(idDepartment);
-		empCount++;
+		empCount = empCount + 1;
-
 	}
 
 	public String getIdEmployee() {
@@ -41,10 +29,6 @@ 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() {
@@ -52,12 +36,16 @@ public class EmployeeData extends BaseData {
 	}
 
 	public void setNmEmployee(String nmEmployee) {
+		//		2日目段階8
+		//		String stripped = nmEmployee.strip();
+		//		int length = stripped.length();
+		//		if (nmEmployee == null) {
+		//		System.out.println("社員名が空のため設定できませんでした");
+		//		}
+		//		if (length == 0) {
+		//			System.out.println("社員名が空のため設定できませんでした");
+		//		} else
 		this.nmEmployee = nmEmployee;
-
-		if (nmEmployee == null || nmEmployee.strip().isEmpty()) {
-			System.out.println("社員名が空のため設定できませんでした");
-			return;
-		}
 	}
 
 	public String getKnEmployee() {
@@ -92,30 +80,36 @@ public class EmployeeData extends BaseData {
 		this.idDepartment = idDepartment;
 	}
 
-	@Override
+	public static int getEmpCount() {
-	public String toString() {
+		return empCount;
-
+	}
-		return (this.getIdEmployee() + "\t" + this.getNmEmployee() + "\t" + this.getKnEmployee() + "\t"
-				+ this.getMailAddress() + "\t" + this.getPassword() + "\t" + this.getIdDepartment());
 
+	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() + ","
+		return getIdEmployee() + "," + getNmEmployee() + "," + getKnEmployee() + "," + getMailAddress()
-				+ getPassword() + "," + getIdDepartment();
+				+ "," + getPassword() + "," + getIdDepartment();
 	}
 
 	public String getPrimaryKeyValue() {
-		return getIdEmployee();
+		return idEmployee;
 	}
 
-	public boolean isMatchId(String id) {
+	public static int empCount() {
-		if (id == null || this.idEmployee == null) {
+		return empCount;
-			return false;
 	}
-		return this.idEmployee.equals(id);
-
-	}
-
 }

em-oop/src/Greeting.java

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

em-oop/src/Item.java

@@ -4,18 +4,17 @@ public class Item {
 	private int price;
 	private int stock;
 
+	//	void sell(int amount) {
+	//		this.stock = this.stock - amount;
+
 	public void sell(int amount) {
-		this.setStock(this.getStock() - amount);
+		setStock(this.getStock() - amount);
-	}
-
-	public int totalPrice() {
-		return price * stock;
-
 	}
 
 	@Override
 	public String toString() {
-		return (getName() + " " + getPrice() + "円 (残り" + getStock() + "個");
+		String output = getName() + " " + getPrice() + "円 (残り" + getStock() + "個)";
+		return output;
 	}
 
 	public String getName() {

em-oop/src/JapaneseGreeting.java

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

em-oop/src/Main.java

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

em-oop/src/Rectangle.java

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

em-oop/src/Shape.java

@@ -3,6 +3,7 @@ public abstract class Shape {
 	private String name;
 
 	public Shape(String name) {
+
 		this.name = name;
 	}
 
@@ -11,5 +12,4 @@ public abstract class Shape {
 	public void showInfo() {
 		System.out.println(this.name + "の面積は" + this.area() + "です");
 	}
-
 }

em-oop/src/Student.java

@@ -2,23 +2,24 @@
 public class Student {
 	int studentId;
 	String name;
-	
 	static int studentCount = 0;
-	
+	{
-	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() {
+	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);
+
+	}
 
 }