2段階目

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

em-oop/src/BasicCheck2.java

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

em-oop/src/BasicCheck3.java

@@ -2,35 +2,34 @@
 public class BasicCheck3 {
 
 	public static void main(String[] args) {
-		//配列3件分
+		// TODO 自動生成されたメソッド・スタブ
+
 		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 < items.length; i++) {
-		for (int i = 0; i <= 2 ; i++) {
-		
 			items[i].sell(5);
 		}	
-		//3件出力
+		
-		for (int i = 0; i <= 2 ; i++) {
+		for (int i = 0; i < items.length; i++) {
 			System.out.println(items[i]);
 			
-	
+		}
-		
-	
 	}
 
 }
-}

em-oop/src/Book.java

@@ -4,18 +4,17 @@ public class Book {
 	String author;
 	int price;
 	
-	//コンストラクタ生成
 	public Book() {
-		System.out.println( "タイトル未設定");
+		title = "タイトル未設定";
-		System.out.println( "著者未設定"); 
+		author = "著者未設定";
-		System.out.println( "0"); 
+		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/Circle.java

@@ -1,21 +0,0 @@
-
-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 + "");
-	}
-}

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,113 +1,23 @@
-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 String getIdEmployee() {
+public class EmployeeData {
-		return idEmployee;
-	}
 
-	public void setIdEmployee(String idEmployee) {
+	String idEmployee;
-		this.idEmployee = idEmployee;
+	String nmEmployee;
-	}
+	String knEmployee;
+	String mailAddress;
+	String password;
+	String idDepartment;
 	
-	public String getNmEmployee() {
-		return nmEmployee;
-	}
-
-	public void setNmEmployee(String nmEmployee) {
-		this.nmEmployee = nmEmployee;
-	}
-
-	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;
-	}
-
-	//メソッド追加
 	void showInfo() {
-			System.out.println(getIdEmployee());
+		
-			System.out.println(getNmEmployee());
+		System.out.println(
-			System.out.println(getKnEmployee());
+				this.idEmployee + "\t"
-			System.out.println(getMailAddress());
+				+ this.nmEmployee + "\t"
-			System.out.println(getPassword());
+				+ this.knEmployee + "\t"
-			System.out.println(getIdDepartment());
+				+ this.mailAddress + "\t"
+				+ this.password + "\t"
+				+ this.idDepartment
+		);
 	}
 
-	//上記メソッドの書き換え
-	@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,16 +1,11 @@
 
 public class Item {
-	//フィールド宣言
+
 	private String name;
 	private int price;
 	private int stock;
 
-	//メソッド宣言
-	void sell(int amount) {
-		this.setStock(this.getStock() - amount);
-	}
 
-	//ゲッター、セッター設定
 	
 	public String getName() {
 		return name;
@@ -35,6 +30,12 @@ public class Item {
 	public void setStock(int stock) {
 		this.stock = stock;
 	}
+
+	void sell(int amount) {
+		this.setStock(this.getStock() - amount);
+		
+	}
+	
 	@Override
 	public String toString() {
 		return getName() + "" + getPrice() + "円(残り" + getStock() + "個)";

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,64 @@
-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");
 
-		//5段階目記載の処理呼び出し
+		EmployeeData[] Employees = new EmployeeData[5];
-		//employee.showInfo();
 		
-		//Day1、8段階目検索
+		Employees[0] = new EmployeeData();
-		while (true) {
+		Employees[1] = new EmployeeData();
-			Scanner sc = new Scanner(System.in);//インスタンス化
+		Employees[2] = new EmployeeData();
-			System.out.println("検索したい社員IDを入力してください(終了する場合は０を入力)");
+		Employees[3] = new EmployeeData();
-			String id = sc.next();
+		Employees[4] = new EmployeeData();
+		
+		Employees[0].idEmployee = "10000";
+		Employees[0].nmEmployee = "山田龍也";
+		Employees[0].knEmployee = "ヤマダタツヤ";
+		Employees[0].mailAddress = "yamada@hoge.jp";
+		Employees[0].password = "aaa";
+		Employees[0].idDepartment = "10";
+		
+		Employees[1].idEmployee = "10001";
+		Employees[1].nmEmployee = "高橋準";
+		Employees[1].knEmployee = "タカハシジュン";
+		Employees[1].mailAddress = "jtaka@hoge.jp";
+		Employees[1].password = "bbb";
+		Employees[1].idDepartment = "10";
+		
+		Employees[2].idEmployee = "10002";
+		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";
+		
+		
+//		System.out.println(Employees.idEmployee);
+//		System.out.println(Employees.nmEmployee);
+//		System.out.println(Employees.knEmployee);
+//		System.out.println(Employees.mailAddress);
+//		System.out.println(Employees.password);
+//		System.out.println(Employees.idDepartment);
+		
+		for (int i = 0; i < Employees.length; i++) {
+			Employees[i].showInfo();
 			
-			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,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,23 @@
 
 public class Student {
-	//フィールド宣言
 	int studentId;
 	String name;
-	//フィールド追加
-	static int studentCount = 0;
 		
-	//メソッド宣言
-	void printProfile() {
-		System.out.println("学籍番号:" + this.studentId + " 名前:" + this.name);
-	}
-
-	//コントラクタ追加
 	public Student(int studentId, String name) {
 		this.studentId = studentId;
 		this.name = name;
-	}
-	public Student() {
-		// TODO 自動生成されたコンストラクター・スタブ
-	}
-
-	//コントラクタ追加
-	public static int getstudentCount() {
-		return studentCount;
 		
 	}
 
+	public void printProfile() {
+		System.out.println("学籍番号:" + this.studentId + " 名前:" + this.name);
 	}
+	//public static void main(String[] args) {
+		//Student s = new Student(1,"鈴木一郎");
+		//s.printProfile();
+		
+	//}
+	
+
+}
+