２段階目

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

.gitignore

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

.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/BasicCheck1.java

@@ -3,15 +3,25 @@ public class BasicCheck1 {
 
 	public static void main(String[] args) {
 		// TODO 自動生成されたメソッド・スタブ
-
 		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("銀河鉄道の夜", "宮沢賢治", 500);
+		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);
+
+	
 	}
+
 }

em-oop/src/BasicCheck2.java

@@ -1,21 +1,21 @@
 
 public class BasicCheck2 {
-
 	public static void main(String[] args) {
-		// TODO 自動生成されたメソッド・スタブ
 		
-		//コンストラクタを使ってインスタンスを作成
 		Student student1 = new Student(1,"鈴木一郎");
 		Student student2 = new Student(2,"田中花子");
 		Student student3 = new Student(3,"佐藤次郎");
 		
-		//メソッド呼び出し
+//		student.studentId = 1;
+//		student.name = "鈴木一郎";
+		
+//		System.out.print("学籍番号"+student.studentId);
+//		System.out.print("名前:" + student.name);
 		student1.printProfile();
 		student2.printProfile();
 		student3.printProfile();
 		
-		//クラスから直接呼び出し
+		System.out.println("現在の生徒数:" + Student.getStudentCount() + "人");
-		System.out.println("現在の生徒数" +Student.getStudentCount() + "人");
 	}
 	
 }

em-oop/src/BasicCheck3.java

@@ -7,28 +7,29 @@ public class BasicCheck3 {
 		Item[] items = new Item[3];
 		
 		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);
 		
-		items[0].sell(5);
+		for (int i = 0; i < items.length; i++) {
-		items[1].sell(5);
+			items[i].sell(5);
-		items[2].sell(5);
+		}	
 		
-		for(int i= 0;i<3;i++) {
+		for (int i = 0; i < items.length; i++) {
 			System.out.println(items[i]);
 			
 		}
-		
 	}
+
 }

em-oop/src/Book.java

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

em-oop/src/Circle.java

@@ -1,25 +1,22 @@
 
 public class Circle extends Shape {
 
-	//Shapeクラスを継承
-
-	//フィールド作成
 	private double radius;
 	
-	//コンストラクタ作成
 	public Circle(double radius) {
 		super("円");
 		this.radius = radius;
+		
 	}
 	
-	//メソッド作成
+	@Override
 	public double area() {
 		return Math.PI * radius * radius;
 	}
 	
+	@Override
 	public void showInfo() {
 		super.showInfo();
-		System.out.println("(半径:" + this.radius + ")");
+		System.out.println("半径:" + this.radius);
 	}
-
 }

em-oop/src/Day3Check1.java

@@ -3,13 +3,9 @@ public class Day3Check1 {
 
 	public static void main(String[] args) {
 		
-		//インスタンス作成
+		Circle circle = new Circle(2.0);
-		Circle c = new Circle(2);
-		
-		//メソッド呼び出し
-		c.showInfo();
-		
 		
+		circle.showInfo();
 	}
 
 }

em-oop/src/Day3Check2.java

@@ -2,10 +2,13 @@
 public class Day3Check2 {
 
 	public static void main(String[] args) {
-		// TODO 自動生成されたメソッド・スタブ
+		Rectangle rectangle = new Rectangle(3,4);
-		Rectangle r = new Rectangle(3, 4);
+		
-		r.showInfo();
+		rectangle.showInfo();
-		Greeting gre = new JapaneseGreeting();
+		System.out.println("四角形の面積は" + rectangle.area() + "です");
-		System.out.println(gre.hello());
+		
+		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型の変数shapeにradius引数2のCircle代入
-		Shape shape1 = new Circle(2);
-		shape1.showInfo();
-		
-		//Shape型の変数2に引数(widthが3、heightが4)を代入する
-		Shape shape2 = new Rectangle(3, 4);
-		shape2.showInfo();
-
-	}
-
-}

em-oop/src/EmployeeData.java

@@ -1,5 +1,6 @@
 
 public class EmployeeData {
+
 	String idEmployee;
 	String nmEmployee;
 	String knEmployee;
@@ -7,11 +8,16 @@ public class EmployeeData {
 	String password;
 	String idDepartment;
 	
-	void showInfo(){
+	void showInfo() {
-	System.out.println(idEmployee + "\t" + nmEmployee +
-			"\t" +knEmployee + "\t" + mailAddress +
-			"\t" +password + "\t" + idDepartment );
 		
+		System.out.println(
+				this.idEmployee + "\t"
+				+ this.nmEmployee + "\t"
+				+ this.knEmployee + "\t"
+				+ this.mailAddress + "\t"
+				+ this.password + "\t"
+				+ this.idDepartment
+		);
 	}
 
 }

em-oop/src/Greeting.java

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

em-oop/src/Item.java

@@ -1,10 +1,12 @@
 
 public class Item {
-	//
+
-	String name;
+	private String name;
 	private int price;
 	private int stock;
 
+
+	
 	public String getName() {
 		return name;
 	}
@@ -31,9 +33,11 @@ public class Item {
 
 	void sell(int amount) {
 		this.setStock(this.getStock() - amount);
+		
 	}
+	
 	@Override
 	public String toString() {
-		return getName() + " " + getPrice() + "円 (残り" + getStock() + "個)";
+		return getName() + "" + getPrice() + "円(残り" + getStock() + "個)";
 	}
 }

em-oop/src/JapaneseGreeting.java

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

em-oop/src/Main.java

@@ -4,56 +4,61 @@ public class Main {
 	public static void main(String[] args) {
 		// TODO 自動生成されたメソッド・スタブ
 
-		//型、変数宣言しインスタンス化
+		EmployeeData[] Employees = new EmployeeData[5];
-		EmployeeData employee = new EmployeeData();
 		
-		EmployeeData[] employees = new EmployeeData[5];
+		Employees[0] = new EmployeeData();
-		employees[0] = new EmployeeData();
+		Employees[1] = new EmployeeData();
-		employees[1] = new EmployeeData();
+		Employees[2] = new EmployeeData();
-		employees[2] = new EmployeeData();
+		Employees[3] = new EmployeeData();
-		employees[3] = new EmployeeData();
+		Employees[4] = new EmployeeData();
-		employees[4] = new EmployeeData();
 		
-		//フィールドに代入
+		Employees[0].idEmployee = "10000";
-		employees[0].idEmployee = "10000";
+		Employees[0].nmEmployee = "山田龍也";
-		employees[0].nmEmployee = "山田龍也";
+		Employees[0].knEmployee = "ヤマダタツヤ";
-		employees[0].knEmployee = "ヤマダタツヤ";
+		Employees[0].mailAddress = "yamada@hoge.jp";
-		employees[0].mailAddress = "yamada@hoge.jp";
+		Employees[0].password = "aaa";
-		employees[0].password = "aaa";
+		Employees[0].idDepartment = "10";
-		employees[0].idDepartment = "10";
 		
-		employees[1].idEmployee = "10001";
+		Employees[1].idEmployee = "10001";
-		employees[1].nmEmployee = "高橋準";
+		Employees[1].nmEmployee = "高橋準";
-		employees[1].knEmployee = "タカハシジュン";
+		Employees[1].knEmployee = "タカハシジュン";
-		employees[1].mailAddress = "jtaka@hoge.jp";
+		Employees[1].mailAddress = "jtaka@hoge.jp";
-		employees[1].password = "bbb";
+		Employees[1].password = "bbb";
-		employees[1].idDepartment = "10";
+		Employees[1].idDepartment = "10";
 		
-		employees[2].idEmployee = "10002";
+		Employees[2].idEmployee = "10002";
-		employees[2].nmEmployee = "麻枝史明";
+		Employees[2].nmEmployee = "麻枝史明";
-		employees[2].knEmployee = "マエダフミアキ";
+		Employees[2].knEmployee = "マエダフミアキ";
-		employees[2].mailAddress = "fumi@hoge.jp";
+		Employees[2].mailAddress = "fmak@hoge.jp";
-		employees[2].password = "ccc";
+		Employees[2].password = "ccc";
-		employees[2].idDepartment = "11";
+		Employees[2].idDepartment = "11";
 		
-		employees[3].idEmployee = "10003";
+		Employees[3].idEmployee = "10003";
-		employees[3].nmEmployee = "丸戸章介";
+		Employees[3].nmEmployee = "丸戸章介";
-		employees[3].knEmployee = "マルトショウスケ";
+		Employees[3].knEmployee = "マルトショウスケ";
-		employees[3].mailAddress = "marusyo@hoge.jp";
+		Employees[3].mailAddress = "marusyo@hoge.jp";
-		employees[3].password = "ddd";
+		Employees[3].password = "ddd";
-		employees[3].idDepartment = "12";
+		Employees[3].idDepartment = "12";
 		
-		employees[4].idEmployee = "10004";
+		Employees[4].idEmployee = "10004";
-		employees[4].nmEmployee = "三宅武";
+		Employees[4].nmEmployee = "三宅武";
-		employees[4].knEmployee = "ミヤケタケシ";
+		Employees[4].knEmployee = "ミヤケタケシ";
-		employees[4].mailAddress = "miya@hoge.jp";
+		Employees[4].mailAddress = "miya@hoge.jp";
-		employees[4].password = "eee";
+		Employees[4].password = "eee";
-		employees[4].idDepartment = "13";
+		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();
 			
-		for(int i= 0; i < 5 ; i++) {
-			employees[i].showInfo();
 		}
-
 	}
 
 }

em-oop/src/Rectangle.java

@@ -0,0 +1,20 @@
+
+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() {
+		// TODO 自動生成されたメソッド・スタブ
+		return width * height;
+	}
+
+}

em-oop/src/Shape.java

@@ -1,22 +1,20 @@
 
-public class Shape {
+public abstract class Shape {
 
-	//フィールド作成
 	private String name;
 	
-	//コンストラクタ作成
 	public Shape(String name) {
+		this.name = name;
+		
 	}
 	
-	//メソッド作成
+	public abstract double area();
-	double area() {
+		//return 0.0;
-		return 0.0;
-	}
 		
-	//メソッド作成
-	void showInfo() {
-		//出力
-		System.out.println(this.name + "の面積は" + this.area() + "です");
-	}
 	
+	
+	public void showInfo() {
+		//System.out.println(this.name + "の面積は" + this.area() + "です");
+		
+	}
 }

em-oop/src/Student.java

@@ -1,25 +1,30 @@
 
 public class Student {
-		//変数を作る
+	int studentId;
-		int studentId;
+	String name;
-		String name;
 	
-		//フィールド追加
+	static int studentCount = 0;
-		static int studentCount = 0;
-		//コンストラクタ追加
-		public Student(int studentId,String name) {
-			this.studentId = studentId;
-			this.name = name;
-			studentCount++;
-		}
 		
-		//メソッド追加
+	public Student(int studentId, String name) {
-		public static int getStudentCount() {
+		this.studentId = studentId;
-			return studentCount;
+		this.name = name;
-		}
+		
-		//メソッド
+		studentCount++;
-		public void printProfile() {
+		
+	}
+
+	public void printProfile() {
 		System.out.println("学籍番号:" + this.studentId + " 名前:" + this.name);
+	}
+	//public static void main(String[] args) {
+		//Student s = new Student(1,"鈴木一郎");
+		//s.printProfile();
+		
+	//}
+	public static int getStudentCount() {
+		return studentCount;
+		
+	}
 
-		}
 }
+