Day3、5段階目完了

.gitignore

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

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

em-oop/.gitignore

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

em-oop/.project

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

em-oop/src/BasicCheck1.java

@@ -2,17 +2,22 @@
 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);
 		
-		//		book.title = "吾輩は猫である";
-		//		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,26 +1,21 @@
 
 public class BasicCheck2 {
-
 	public static void main(String[] args) {
-		// TODO 自動生成されたメソッド・スタブ
-		Student student1 = new Student(1, "鈴木一郎");
+		//変数宣言
+		Student students = new Student();
+		//代入
+		//student.studentId = 1;
+		//student.name = "鈴木一郎";
+		//student.printProfile();
 
-		//		student1.studentId = 1;
-		//		student1.name = "鈴木一郎";
-		student1.printProfile();
+		Student students1 = new Student(1, "鈴木一郎");
+		Student students2 = new Student(2, "田中花子");
+		Student students3 = new Student(3, "佐藤次郎");
 
-		Student student2 = new Student(2, "田中花子");
-
-		student2.printProfile();
-
-		Student student3 = new Student(3, "佐藤次郎");
-
-		student3.printProfile();
-
-		Student.getStudentCount();{
-			System.out.println("現在の生徒数:" + Student.studentCount + "人");
-		}
+		students1.printProfile();
+		students2.printProfile();
+		students3.printProfile();
 
+		 System.out.println("現在の生徒数:" + Student.getstudentCount()  + "人");
 	}
-
 }

em-oop/src/BasicCheck3.java

@@ -2,52 +2,35 @@
 public class BasicCheck3 {
 
 	public static void main(String[] args) {
-		// TODO 自動生成されたメソッド・スタブ
-
+		//配列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[2].setName("鉛筆");
+		items[2].setPrice(60);
+		items[2].setStock(100);
 		
-		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);
+		//for文残り数の引き算
+		for (int i = 0; i <= 2 ; i++) {
 		
+		  items[i].sell(5);
+		}
+		//3件出力
+		for (int i = 0; i <= 2 ; i++) {
 			System.out.println(items[i]);
 			
-		}
+	
+		
+	
+	}
 
 	}
 }

em-oop/src/Book.java

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

em-oop/src/Circle.java

@@ -1,22 +1,21 @@
 
 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

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

em-oop/src/Day3Check2.java

@@ -2,12 +2,16 @@
 public class Day3Check2 {
 
 	public static void main(String[] args) {
-		// TODO 自動生成されたメソッド・スタブ
-		Rectangle Rectangle = new Rectangle(3, 4);
-		Rectangle.showInfo();
+		//インスタンス
+		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

@@ -3,12 +3,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,9 +0,0 @@
-
-public class DayCheck1 {
-
-	public static void main(String[] args) {
-		Circle radius = new Circle(2);
-		
-		radius.showInfo();
-	}
-}

em-oop/src/DepartmentData.java

@@ -1,39 +0,0 @@
-
-public class DepartmentData extends BaseData {
-	private String idDepartment;
-	private String nmDepartment;
-
-	public DepartmentData(String idDepartment, String nmDepartment) {
-		setIdDepartment(idDepartment);
-		setNmDepartment(nmDepartment);
-	}
-
-	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,27 +1,11 @@
-
 public class EmployeeData extends BaseData {
-	private String idEmployee;
-	private String nmEmployee;
-	private String knEmployee;
-	private String mailAddress;
-	private String password;
-	private String idDepartment;
-	private static int empCount = 0;
-
-	EmployeeData() {
-		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;
-	}
+	//フィールド宣言
+	private String idEmployee;//社員ID
+	private String nmEmployee;//社員名
+	private String knEmployee;//社員カナ
+	private String mailAddress;//メールアドレス
+	private String password;//パスワード
+	private String idDepartment;//部署ID
 
 	public String getIdEmployee() {
 		return idEmployee;
@@ -36,15 +20,6 @@ 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;
 	}
 
@@ -80,36 +55,59 @@ public class EmployeeData extends BaseData {
 		this.idDepartment = idDepartment;
 	}
 
-	public static int getEmpCount() {
-		return empCount;
-	}
-
-	public static void setEmpCount(int empCount) {
-		EmployeeData.empCount = empCount;
-	}
+	//メソッド追加
+		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" + getKnEmployee() + "\t" + getMailAddress()
-				+ "\t" + getPassword() + "\t" + getIdDepartment();
+		return getIdEmployee() + "\t"+
+				 getNmEmployee() + "\t"+
+				 getKnEmployee() + "\t"+
+				 getMailAddress() + "\t"+
+				 getPassword() + "\t"+
+				 getIdDepartment();
+
 	}
 
-	//	public boolean isMatchId(String id) {
-	//
-	//		return idEmployee.equals(id);
-	//
-	//	}
+	//コンストラクタ追加(引数なし)
+	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();
-	}
+		return getIdEmployee() + "," + getNmEmployee() + "," + getKnEmployee() + "," + getMailAddress() + ","
+				+ getPassword() + "," + getIdDepartment();
+			}
 
+	@Override
 	public String getPrimaryKeyValue() {
-		return idEmployee;
+		return this.idEmployee;
 	}
 
-	public static int empCount() {
-		return empCount;
+	//メソッド追加、7段目
+	public boolean isMatchID(String id) {
+		return idEmployee.equals(id);
 	}
+
+
 }

em-oop/src/Greeting.java

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

em-oop/src/Item.java

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

em-oop/src/JapaneseGreeting.java

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

em-oop/src/Main.java

@@ -4,76 +4,52 @@ public class Main {
 
 	public static void main(String[] args) {
 		// TODO 自動生成されたメソッド・スタブ
+		//インスタンス宣言
+		BaseData employee = new EmployeeData();
+		//配列5件分
+		BaseData[] employees = new BaseData[5];
+		//５段階目書き換え
+		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");
 
+		//5段階目記載の処理呼び出し
+		//employee.showInfo();
+
+		//Day1、8段階目検索
 		while (true) {
+			Scanner sc = new Scanner(System.in);//インスタンス化
+			System.out.println("検索したい社員IDを入力してください(終了する場合は０を入力)");
+			String id = sc.next();
 
-			System.out.println("検索したい社員IDを入力してください（終了したい場合は0）");
-			Scanner scanner = new Scanner(System.in);
-			String id = scanner.nextLine();
-			boolean bo = false;
-
-			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]);
-
-					//					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;
 			}
+			//boolean変数作成
+			boolean result = false;
+			//該当の場合
+			for (int i = 0; i < employees.length; i++) {
+				if (employees[i].getPrimaryKeyValue().equals(id)) {
+					result = true;
+					System.out.println(employees[i]);
+					break;
+				}
+			}
+			if (result == false) {
+				System.out.println("該当する社員が見つかりませんでした(終了する場合は０を入力)");
+			}
 
 		}
 
+		//for文
+		//for (int i = 0; i < employees.length; i++) {
+			//System.out.println(employees[i]);
+			//System.out.println(employees[i].toCSV());
+			//System.out.println(employees[i].getPrimaryKeyValue());
+			//employees[i].showInfo();を上記に書き換え
+		}
 	}
 
-}

em-oop/src/Rectangle.java

@@ -1,15 +1,17 @@
 
 public class Rectangle extends Shape {
+	//フィールド
 	private double width;
 	private double height;
 
+	//コンストラクタ
 	public Rectangle(double width, double height) {
 		super("四角形");
-		this.height = height;
 		this.width = width;
-
+		this.height = height;
 	}
 
+	//抽象メソッドのオーバーライド
 	@Override
 	public double area() {
 		return width * height;

em-oop/src/Shape.java

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

em-oop/src/Student.java

@@ -1,24 +1,28 @@
 
 public class Student {
+	//フィールド宣言
 	int studentId;
 	String name;
+	//フィールド追加
 	static int studentCount = 0;
-	{
-		studentCount++;
+
+	//メソッド宣言
+	void printProfile() {
+		System.out.println("学籍番号:" + this.studentId + " 名前:" + this.name);
 	}
 
-	Student(int studentId, String name) {
+	//コントラクタ追加
+	public Student(int studentId, String name) {
 		this.studentId = studentId;
 		this.name = name;
 	}
-
-	public static int getStudentCount() {
-		return studentCount;
+	public Student() {
+		// TODO 自動生成されたコンストラクター・スタブ
 	}
 
-	void printProfile() {
-
-		System.out.println("学籍番号:" + this.studentId + " 名前:" + this.name);
+	//コントラクタ追加
+	public static int getstudentCount() {
+		return studentCount;
 
 	}