３日目 段階１ 小澤

.gitignore

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

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

em-oop/src/BasicCheck1.java

@@ -2,21 +2,21 @@
 public class BasicCheck1 {
 
 	public static void main(String[] args) {
-		//Book book = new Book();
+		// TODO 自動生成されたメソッド・スタブ
+		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);
+		System.out.println(book1.title);
+		System.out.println(book1.author);
+		System.out.println(book1.price);
 		
-		//引数なし
-		Book book1 = new Book();
-		
-		//引数あり
-		Book book2 = new Book("銀河鉄道の夜", "宮沢賢治", 500);
+		System.out.println(book2.title);
+		System.out.println(book2.author);
+		System.out.println(book2.price);
 
 	}
 

em-oop/src/BasicCheck2.java

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

em-oop/src/BasicCheck3.java

@@ -1,36 +1,35 @@
 
 public class BasicCheck3 {
-
 	public static void main(String[] args) {
-		//配列3件分
 		Item[] items = new Item[3];
-		//newインスタンス代入
 		items[0] = new Item();
+		items[1] = new Item();
+		items[2] = 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);
 		
-		//for文残り数の引き算
-		for (int i = 0; i <= 2 ; i++) {
 		
+		
+		for(int i=0;i<3;i++) {
 			items[i].sell(5);
-		}
-		//3件出力
-		for (int i = 0; i <= 2 ; i++) {
 			System.out.println(items[i]);
-			
+//			System.out.println("合計金額："+items[i].totalPrice());
+		}
 		
 		
 		
 	}
 	
-	}
+	
+
 }

em-oop/src/Book.java

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

em-oop/src/Day3Check1.java

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

em-oop/src/Day3Check2.java

@@ -1,17 +0,0 @@
-
-public class Day3Check2 {
-
-	public static void main(String[] args) {
-		//インスタンス
-		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,17 +0,0 @@
-
-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/EmployeeData.java

@@ -1,17 +1,67 @@
-public class EmployeeData extends BaseData {
-	//フィールド宣言
-	private String idEmployee;//社員ID
-	private String nmEmployee;//社員名
-	private String knEmployee;//社員カナ
-	private String mailAddress;//メールアドレス
-	private String password;//パスワード
-	private String idDepartment;//部署ID
+
+public class EmployeeData {
+	private String idEmployee;
+	private String nmEmployee;
+	private String knEmployee;
+	private String mailAddress;
+	private String password;
+	private String idDepartment;
+	private static int empCount = 0;
+
+	static final String COMPANY_NAME = "Rhizome";
+
+	@Override
+	public String toString() {
+		return getIdEmployee() + "\t" + getNmEmployee() + "　" + getKnEmployee() + "\t" + getMailAddress()
+				+ "\t" + getPassword() + "\t" + getIdDepartment();
+	}
+
+	static int getEmpCount() {
+		return empCount;
+	}
+
+	//getNmEmployee.strip();
+
+	public EmployeeData() {
+		empCount++;
+
+	}
+
+	public EmployeeData(String idEmployee, String nmEmployee, String knEmployee, String mailAddress, String password,
+			String idDepartment) {
+
+		nmEmployee = nmEmployee.strip();
+		int nmNum = nmEmployee.length();
+
+		idEmployee = idEmployee.strip();
+		int idNum = idEmployee.length();
+
+		if (nmNum == 0) {
+			System.out.println("社員名が空のため設定できませんでした");
+
+		}
+		if (idNum == 0) {
+			System.out.println("社員IDが空のため設定できませんでした");
+		}
+		if (nmNum > 0 && idNum > 0) {
+
+			this.setIdEmployee(idEmployee);
+			this.setNmEmployee(nmEmployee);
+			this.setKnEmployee(knEmployee);
+			this.setMailAddress(mailAddress);
+			this.setPassword(password);
+			this.setIdDepartment(idDepartment);
+			empCount++;
+
+		}
+	}
 
 	public String getIdEmployee() {
-		return idEmployee;
+		return this.idEmployee;
 	}
 
 	public void setIdEmployee(String idEmployee) {
+
 		this.idEmployee = idEmployee;
 	}
 
@@ -19,12 +69,12 @@ public class EmployeeData extends BaseData {
 		return nmEmployee;
 	}
 
-	public void setNmEmployee(String nmEmployee) {
-		this.nmEmployee = nmEmployee;
+	public void setNmEmployee(String nmEMployee) {
+		this.nmEmployee = nmEMployee;
 	}
 
 	public String getKnEmployee() {
-		return knEmployee;
+		return this.knEmployee;
 	}
 
 	public void setKnEmployee(String knEmployee) {
@@ -32,7 +82,7 @@ public class EmployeeData extends BaseData {
 	}
 
 	public String getMailAddress() {
-		return mailAddress;
+		return this.mailAddress;
 	}
 
 	public void setMailAddress(String mailAddress) {
@@ -55,59 +105,4 @@ 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"+
-				 getKnEmployee() + "\t"+
-				 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;
-	}
-
-	//メソッド追加、7段目
-	public boolean isMatchID(String id) {
-		return idEmployee.equals(id);
-	}
-
-
 }

em-oop/src/Greeting.java

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

em-oop/src/Item.java

@@ -1,42 +1,43 @@
 
 public class Item {
-	//フィールド宣言
 	private String name;
 	private int price;
 	private int stock;
 	
-	//メソッド宣言
-	void sell(int amount) {
+	public void sell(int amount) {
 		this.setStock(this.getStock()-amount) ;
 	}
 	
-	//ゲッター、セッター設定
-
-	public String getName() {
-		return name;
+	public int totalPrice() {
+		return this.price*this.stock;
 	}
 	
-	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;
-	}
 	@Override
 	public String toString() {
 		return getName()+" "+getPrice()+"円(残り"+getStock()+"個)";
 	}
+	
+	public String getName() {
+		return this.name;
+	}
+	public void setName(String name) {
+		this.name=name;
+	}
+	
+	
+	public int getPrice() {
+		return this.price;
+	}
+	public void setPrice(int price) {
+		this.price=price;
+	}
+	
+	
+	public int getStock() {
+		return this.stock;
+	}
+	public void setStock(int stock) {
+		this.stock=stock;
+	}
+
 }

em-oop/src/JapaneseGreeting.java

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

em-oop/src/Main.java

@@ -1,55 +1,76 @@
-import java.util.Scanner;
 
 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");
+		EmployeeData[] employee = new EmployeeData[5];
+		employee[0] = new EmployeeData("10000","","ヤマダタツヤ","yamada@hoge.jp","aaa","10");
+		employee[1] = new EmployeeData();
+		employee[2] = new EmployeeData();
+		employee[3] = new EmployeeData();
+		employee[4] = new EmployeeData();
 		
-		//5段階目記載の処理呼び出し
-		//employee.showInfo();
 		
-		//Day1、8段階目検索
-		while (true) {
-			Scanner sc = new Scanner(System.in);//インスタンス化
-			System.out.println("検索したい社員IDを入力してください(終了する場合は０を入力)");
-			String id = sc.next();
 		
-			if (id.equals("0")) {
-				System.out.println("システムを終了します");
-				break;
+//		employee[0].setIdEmployee("10000");
+//		employee[0].setNmEmployee("山田龍也");
+//		employee[0].setKnEmployee("ヤマダタツヤ");
+//		employee[0].setMailAddress("yamada@hoge.jp");
+//		employee[0].setPassword("aaa");
+//		employee[0].setIdDepartment("10");
+//		
+		employee[1].setIdEmployee("10001");
+		employee[1].setNmEmployee("高橋準");
+		employee[1].setKnEmployee("タカハシジュン");
+		employee[1].setMailAddress("jtaka@hoge.jp");
+		employee[1].setPassword("bbb");
+		employee[1].setIdDepartment("10");
+		
+		employee[2].setIdEmployee("10002");
+		employee[2].setNmEmployee("麻枝史明");
+		employee[2].setKnEmployee("マエダフミアキ");
+		employee[2].setMailAddress("fmak@hoge.jp");
+		employee[2].setPassword("ccc");
+		employee[2].setIdDepartment("11");
+		
+		employee[3].setIdEmployee("10003");
+		employee[3].setNmEmployee("丸戸章介");
+		employee[3].setKnEmployee("マルトショウスケ");
+		employee[3].setMailAddress("marusyo@hoge.jp");
+		employee[3].setPassword("ddd");
+		employee[3].setIdDepartment("12");
+		
+		employee[4].setIdEmployee("10004");
+		employee[4].setNmEmployee("三宅武");
+		employee[4].setKnEmployee("ミヤケタケシ");
+		employee[4].setMailAddress("miya@hoge.jp");
+		employee[4].setPassword("eee");
+		employee[4].setIdDepartment("13");
+//		
+		
+		
+		for(int i=0;i<5;i++) {
+			if(employee[i].getNmEmployee()==null) {
+				continue;
 			}
-			//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("該当する社員が見つかりませんでした(終了する場合は０を入力)");
+			System.out.println(employee[i]);
 		}
 		
+		
+		System.out.println("現在の社員データ数"+EmployeeData.getEmpCount());
+		
+		System.out.println(EmployeeData.COMPANY_NAME);
+		
+//		System.out.println();
+//		System.out.println(employee.nmEmployee);
+//		System.out.println(employee.knEmployee);
+//		System.out.println(employee.mailAddress);
+//		System.out.println(employee.password);
+//		System.out.println(employee.idDepartment);
+		
+		
 	}
 	
-		//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,20 +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,18 +0,0 @@
-
-public abstract class Shape {
-	//フィールド宣言
-	private String name;
-
-	//コンストラクタ
-	public Shape(String name) {
-		this.name = name;
-	}
-
-	//メソッド1（抽象メソッド）
-	public abstract double area();
-
-	//メソッド2
-	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;
 
-	//メソッド宣言
-	void printProfile() {
+	public void printProfile() {
 		System.out.println("学籍番号:" + this.studentId + " 名前:" + this.name);
+
 	}
 
-	//コントラクタ追加
 	public Student(int studentId, String name) {
 		this.studentId = studentId;
 		this.name = name;
-	}
-	public Student() {
-		// TODO 自動生成されたコンストラクター・スタブ
+		studentCount++;
 	}
 	
-	//コントラクタ追加
-	public static int getstudentCount() {
+	public static int getStudentCount() {
 		return studentCount;
-
 	}
 	
+	
+
 }

em-oop/src/day3_123/Circle.java

@@ -1,21 +1,22 @@
+package day3_123;
 
 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/day3_123/Day3Check1.java

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

em-oop/src/day3_123/Shape.java

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