2日目_段階3完了

q5の1~3まで終了

em-oop/src/BaseData.java

@@ -1,8 +0,0 @@
-
-public abstract class BaseData {
-
-	public abstract String toString();
-	public abstract String toCSV();
-	public abstract String getPrimaryKeyValue();
-	
-}

em-oop/src/BasicCheck1.java

@@ -2,17 +2,24 @@
 public class BasicCheck1 {
 
 	public static void main(String[] args) {
-
+		// TODO 自動生成されたメソッド・スタブ
+//		Book book = new Book();
+//		book.title = "吾輩は猫である";
+//		book.author ="夏目漱石";
+//		book.price = 800;
+		
 		Book book1 = new Book();
-		Book book2 = new Book("銀河鉄道の夜", "宮沢賢治", 500);
+		
-
+		System.out.println(book1.title);
-		//		book.title = "吾輩は猫である";
+		System.out.println(book1.author);
-		//		book.author = "夏目漱石";
+		System.out.println(book1.price);
-		//		book.price = 800;
+		
-
+		Book book2 = new Book("銀河鉄道の夜","宮沢賢治", 500);
-		System.out.println(book1.title +"\n"+ book1.author +"\n"+ book1.price);
+		System.out.println(book2.title);
-		System.out.println(book2.title +"\n"+ book2.author +"\n"+ book2.price);
+		System.out.println(book2.author);
-
+		System.out.println(book2.price);
+		
+	
 	}
 
 }

em-oop/src/BasicCheck2.java

@@ -1,26 +1,36 @@
 
 public class BasicCheck2 {
-
 	public static void main(String[] args) {
-		// TODO 自動生成されたメソッド・スタブ
+		
-		Student student1 = new Student(1, "鈴木一郎");
+//		Student student = new Student(3,"a");
-
+		//Student型のstudentを宣言、インスタンスを代入する
-		//		student1.studentId = 1;
+		Student student1 = new Student(1,"鈴木一郎");
-		//		student1.name = "鈴木一郎";
-		student1.printProfile();
-
 		Student student2 = new Student(2, "田中花子");
+		Student student3 = new Student(3,"佐藤次郎");
+		
+		
+//		student1.studentId = 1;
+//		student1.name = "鈴木一郎";
+//        //studentIDに１，nameに鈴木一郎を代入
+//		
+//		student2.studentId = 2;
+//		student2.name ="田中花子";
+//		
+//		student3.studentId = 3;
+//		student3.name ="佐藤次郎";
+//		
+		
+		
 
+		//studentのprintProfileメソッドを呼び出す
+		student1.printProfile();
 		student2.printProfile();
-
-		Student student3 = new Student(3, "佐藤次郎");
-
 		student3.printProfile();
-
-		Student.getStudentCount();{
-			System.out.println("現在の生徒数:" + Student.studentCount + "人");
-		}
-
 	}
-
+	
 }
+
+
+//
+//System.out.print("学籍番号"+student.studentId);
+//System.out.print("名前:" + student.name);

em-oop/src/BasicCheck3.java

@@ -1,53 +1,53 @@
 
 public class BasicCheck3 {
-
+	
-	public static void main(String[] args) {
+	public static void main(String[] args){
-		// TODO 自動生成されたメソッド・スタブ
+		
-
+		
+		
 		Item[] items = new Item[3];
-
+		
-		Item item0 = new Item();
+		items[0] = new Item();
-		Item item1 = new Item();
+		items[0].setName("ノート");
-		Item item2 = new Item();
+		items[0].setPrice(80);
-
+		items[0].setStock(50);
-		items[0] = item0;
+		
-		items[1] = item1;
+		items[1] = new Item();
-		items[2] = item2;
+		items[1].setName("ノート");
-
+		items[1].setPrice(120);
-		item0.setName("ノート");
+		items[1].setStock(30);
-		item0.setPrice(120);
+		
-		item0.setStock(50);
+		items[2] = new Item();
-
+		items[2].setName("ノート");
-		item1.setName("消しゴム");
+		items[2].setPrice(60);
-		item1.setPrice(80);
+		items[2].setStock(100);
-		item1.setStock(30);
+		
-
+		
-		item2.setName("鉛筆");
+		
-		item2.setPrice(60);
+		
-		item2.setStock(100);
+		
-		//		item1.setName = "ノート";
+		
-		//		item1.price = 120;
+		
-		//		item1.stock = 50;
+		for(int i = 0; i < items.length; i++ )
-		//		
+		{
-		//		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("在庫");
+		for(int i = 0; i < items.length; i ++) {
+			//items[i]をprintlnに渡すとitemクラスのtoStringが自動で呼ばれる
 			System.out.println(items[i]);
-
+			
+//			System.out.println("商品名" + items[i].name+ "価格" + items[i].price +"在庫" + items[i].stock);
+//			System.out.println("価格" + items[i].price);
+//			System.out.println("在庫" + items[i].stock);
+			
+			
 		}
-
+		
+		
+//		Item 0 = new Item("ノート", 120, 50);
+		
 	}
+
 }

em-oop/src/Book.java

@@ -3,18 +3,22 @@ public class Book {
 	public String title;
 	public String author;
 	public int price;
-
+	
+	//引数なしコンストラクタ
 	public Book() {
-		title = "タイトル未設定";
+		this.title = "タイトル未設定";
-		author = "著者未設定";
+		this.author = "著者未設定";
-		price = 0;
+		this.price = 0;
-
+		
+//		System.out.println("コンストラクタが呼び出されました");
+		
 	}
-
+	//引数ありコンストラクタ
 	public Book(String title, String author, int price) {
+//		System.out.println("引数なしのコンストラクタが呼び出されました");
 		this.title = title;
 		this.author = author;
 		this.price = price;
-
 	}
+
 }

em-oop/src/Circle.java

@@ -1,22 +1,21 @@
 
-public class Circle extends Shape {
+public class Circle extends Shape { //shapeクラスを継承する
-	private double radius;
+	private double radius;  //radius: 半径  フィールドradius (double型、private)
-
+           
-	public Circle(double radius) {
+	
-		super("円");
+	
-		this.radius = radius;
+	public Circle(double radius) { //コンストラクタpub 引数dou/raを受け取る
-
+		super("円");               //"円"呼び出し 文字列
+		this.radius = radius;      //radiusフィールドにも引数の値を代入する。
+		
 	}
-
+	public  double area() {                     //Overrideは 子クラスで！
-	@Override
+		return  Math.PI * radius * radius;
-	public double area() {
-		return Math.PI * radius * radius;
 	}
-
+    public void showInfo(){
-	@Override
+    	super.showInfo();
-	public void showInfo() {
-		super.showInfo();
 		System.out.println("(半径:" + this.radius + ")");
-
 	}
+	
+
 }

em-oop/src/Day3Check1.java

@@ -0,0 +1,14 @@
+
+public class Day3Check1 {
+
+	public static void main(String[] args) {
+	
+		Circle circle = new Circle(2);
+		circle.area();
+		circle.showInfo();
+		
+//		Rectangle rectangle = new Rectangle(2);
+//		rectangle.area();
+		
+	}
+}

em-oop/src/Day3Check2.java

@@ -1,12 +1,21 @@
 
 public class Day3Check2 {
-
 	public static void main(String[] args) {
-		// TODO 自動生成されたメソッド・スタブ
-		Rectangle Rectangle = new Rectangle(3, 4);
-		Rectangle.showInfo();
 		
+		//Rect-クラスをもとにrect-のインスタンスつくる
+		//3,4をRectangleのコンストラクタに渡す
+		Rectangle rectangle = new Rectangle(3, 4);
+		
+		//Rect-はShapeを継承しているため親クラスのshowInfoメソッドを使える
+		rectangle.showInfo();
+		
+		
+		//JaGrクラスをもとにインスタンスをつくる
+		//変数の型はGreetingインタフェース型にしている
 		Greeting greeting = new JapaneseGreeting();
+		
+		//greeetingのhelloメソッドよびだす
+		//実際に入っているインスタンスはJaGrなのでJaGrで作ったhello()が実行される
 		System.out.println(greeting.hello());
 	}
 

em-oop/src/Day3Check3.java

@@ -1,15 +1,15 @@
 
 public class Day3Check3 {
-
 	public static void main(String[] args) {
-		// TODO 自動生成されたメソッド・スタブ
-		Shape shape1 = new Circle(2);
-
-		shape1.showInfo();
-
-		Shape shape2 = new Rectangle(3, 4);
 		
+		//Shape型の変数にCircleのインスタンスを代入
+		Shape shape1 = new Circle(2);
+		//円の情報を表示
+		shape1.showInfo();
+		//Shape型の変数にRectangleのインスタンスを代入
+		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,115 +1,21 @@
 
-public class EmployeeData extends BaseData {
+public class EmployeeData {
-	private String idEmployee;
+	public static void main(String args[]) {
-	private String nmEmployee;
+		String idEmployee;
-	private String knEmployee;
+		String nmEmployee;
-	private String mailAddress;
+		String knEmployee;
-	private String password;
+		String mailAddress;
-	private String idDepartment;
+		String password;
-	private static int empCount = 0;
+		String idDepartment;
+	}
+	
+//	public EmployeeData() {
+//		this.idEmployee = "";
+//	}
+
+	public void showinfo() {
+		System.out.println();
 
-	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;
-	}
-
-	public String getIdEmployee() {
-		return idEmployee;
-	}
-
-	public void setIdEmployee(String idEmployee) {
-		this.idEmployee = idEmployee;
-	}
-
-	public String getNmEmployee() {
-		return nmEmployee;
-	}
-
-	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;
-	}
-
-	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;
-	}
-
-	public static int getEmpCount() {
-		return empCount;
-	}
-
-	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()
-				+ "," + getPassword() + "," + getIdDepartment();
-	}
-
-	public String getPrimaryKeyValue() {
-		return idEmployee;
-	}
-
-	public static int empCount() {
-		return empCount;
-	}
 }

em-oop/src/Greeting.java

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

em-oop/src/Item.java

@@ -1,38 +1,31 @@
 
 public class Item {
+	//フィールドを宣言・外から触れないようにprivate
 	private String name;
 	private int price;
 	private int stock;
 
-	//	void sell(int amount) {
+	//nameを取得するgetter
-	//		this.stock = this.stock - amount;
-
-	public void sell(int amount) {
-		setStock(this.getStock() - amount);
-	}
-
-	@Override
-	public String toString() {
-		String output = getName() + " " + getPrice() + "円 (残り" + getStock() + "個)";
-		return output;
-	}
-
 	public String getName() {
 		return name;
 	}
 
-	public void setName(String name) {
+	//nameを設定するsetter
+	public void setName(String name) {       //item="ノート"はもう使えない。item[0].setName("ノート")にしている
 		this.name = name;
 	}
 
+	//priceを取得するgetter
 	public int getPrice() {
 		return price;
 	}
 
+	//priceを設定するsetter
 	public void setPrice(int price) {
 		this.price = price;
 	}
 
+	//stockを取得するgetter
 	public int getStock() {
 		return stock;
 	}
@@ -41,4 +34,21 @@ public class Item {
 		this.stock = stock;
 	}
 
+	//	Item(String name, int price, int stock){
+	//		this.name = name;
+	//		this.price = price;
+	//		this.stock = stock;
+	//	}
+
+	//売れた数を在庫から引く
+	public void sell(int amount) {
+		this.setStock(this.getStock() - amount);
+	}
+	
+	//Itemの情報を文字列として返す
+	@Override
+	public String toString() {
+		return getName() + "" + getPrice() + "円(残り" + getStock() + "個)";
+	}
+
 }

em-oop/src/JapaneseGreeting.java

@@ -1,10 +1,13 @@
 
+//JaGrクラスを作る、implements GrによってGreetingインターフェースを実装する
 public class JapaneseGreeting implements Greeting {
-
+	
+	//Grインターフェースで定義されているhello()メソッドをこのクラスに実装する
 	@Override
 	public String hello() {
-		// TODO 自動生成されたメソッド・スタブ
+		//hello()が呼び出されたらString型の文字列を呼び出し元に返す
 		return "こんにちは";
+		
 	}
-	
+
 }

em-oop/src/Main.java

@@ -1,79 +1,25 @@
-import java.util.Scanner;
 
 public class Main {
-
 	public static void main(String[] args) {
-		// TODO 自動生成されたメソッド・スタブ
+		EmployeeData employee = new EmployeeData() ;
-
+			String idEmployee = "10000";
-		while (true) {
+			String nmEmployee = "山田龍也";
-
+			String knEmployee = "ヤマダタツヤ";
-			System.out.println("検索したい社員IDを入力してください（終了したい場合は0）");
+			String mailAddress = "yamada@hoge.jp";
-			Scanner scanner = new Scanner(System.in);
+			String password = "aaa";
-			String id = scanner.nextLine();
+			String idDepartment = "10";
-			boolean bo = false;
+			
-
+//			System.out.println(employee);
-			BaseData[] allData = new BaseData[11];
+			System.out.println(idEmployee);
-
+			System.out.println(nmEmployee);
-			BaseData employee = new EmployeeData("10000", "山田龍也", "ヤマダタツヤ", "yamada@hoge.jp", "aaa", "10");
+			System.out.println(knEmployee);
-
+			System.out.println(mailAddress);
-			BaseData employee1 = new EmployeeData("10001", "高橋準", "タカハシジュン", "jtaka@hoge.jp", "bbb", "10");
+			System.out.println(password);
-
+			System.out.println(idDepartment);
-			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;
-			}
-
 		}
-
+		
 	}
 
-}
+

em-oop/src/Rectangle.java

@@ -1,18 +1,22 @@
 
 public class Rectangle extends Shape {
-	private double width;
+	private double width; 
-	private double height;
+	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;
 	}
+//	public void showInfo(){
+//    	super.showInfo();
+//		System.out.println("(半径:" + this.area + ")");
+//	}
 
 }

em-oop/src/Shape.java

@@ -1,15 +1,36 @@
 
 public abstract class Shape {
-	private String name;
+	
+	private String name; //フィールドname ・privateにしなきゃいけない
+//	public double area;
+//	public int radius;
 
+	
+	public Shape() {		
+	}
+	
 	public Shape(String name) {
-
+		this.name = name; //Circleが"円"を呼び出すための文字列をいれるところ
-		this.name = name;
 	}
+	
+	public  abstract double area();{  //メソッドarea 引数なし・戻り値double 中身return0.0;
+//		return 0.0;	
+	}
+	
+//	@Override
 
-	public abstract double area();
+	
-
+	public void showInfo(){ //メソッドshowinfo 引数戻り値なし・中身はsyso
-	public void showInfo() {
 		System.out.println(this.name + "の面積は" + this.area() + "です");
+//	    System.out.println("(半径:" + this.radius + ")");
+	    System.out.println("四角形" + "の面積は" + this.area() + "です。");
 	}
+	
+//	@Override
+//	public void showInfo(){
+//		
+//	}
+	
+	
+
 }

em-oop/src/Student.java

@@ -1,25 +1,53 @@
 
-public class Student {
+public class Student {//クラス新規作成
-	int studentId;
+
-	String name;
+	int studentId; //フィールドを宣言 int
-	static int studentCount = 0;
+	String name; //String
-	{
+	static int studentCount = 0;   //生徒が何人作られたかを数えるための、クラス全体で共有するフィールド
+
+	void printProfile() {//メソッドを宣言・以下の内容をsysoで出力
+		
+//		for(int i = 0; i <= 3; i++) {
+			System.out.println("学籍番号:" + this.studentId + " 名前:" + this.name);
+//		}
+		
+//		System.out.println("学籍番号:" + this.studentId + " 名前:" + this.name);
+	}
+	
+	
+	public Student(int studentId, String name) { //コンストラクタを追加
+		this.studentId = studentId;              //渡された引数をそれぞれ対応するフィールドに代入する
+		this.name = name;
 		studentCount++;
 	}
-
+	
-	Student(int studentId, String name) {
-		this.studentId = studentId;
-		this.name = name;
-	}
 
 	public static int getStudentCount() {
+//		studentCount++;
 		return studentCount;
 	}
-
+	
-	void printProfile() {
-
-		System.out.println("学籍番号:" + this.studentId + " 名前:" + this.name);
-
-	}
 
 }
+
+
+
+
+
+
+
+
+
+
+
+
+
+//	public static void main(String[] args) {
+//		Student s = new Student(1,"鈴木一郎");
+//		s.printProfile();
+
+//		
+
+//	
+//		public Student(int studentId, String name) {
+//			student.studentId = 1;