３日目 段階１ 小澤

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

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

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

em-oop/src/BasicCheck1.java

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

em-oop/src/BasicCheck2.java

@@ -1,7 +1,6 @@
 
 public class BasicCheck2 {
 	public static void main(String[] args) {
-		
 		Student student1 = new Student(1, "鈴木一郎");
 		Student student2 = new Student(2, "田中花子");
 		Student student3 = new Student(3, "佐藤次郎");
@@ -10,14 +9,13 @@ public class BasicCheck2 {
 		student2.printProfile();
 		student3.printProfile();
 		
-		
+		System.out.println("現在の生徒数："+Student.getStudentCount()+"人");
-		Student.getStudentCount();
-		System.out.println("現在の生徒数:" + Student.getStudentCount() + "人");
 		
 
+//		student.studentId = 1;
+//		student.name = "鈴木一郎";
+//
+//		student.printProfile();
 	}
 
-		
-		
-	
 }

em-oop/src/BasicCheck3.java

@@ -6,26 +6,30 @@ public class BasicCheck3 {
 		items[1] = new Item();
 		items[2] = new Item();
 		
-		items[0].setName("ノート");
+		items[0].setName("ノート") ;
-		items[1].setName("消しゴム");
-		items[2].setName("鉛筆");
-
 		items[0].setPrice(120);
-		items[1].setPrice(80);
-		items[2].setPrice(60);
-
 		items[0].setStock(50);
+		
+		items[1].setName("消しゴム");
+		items[1].setPrice(80);
 		items[1].setStock(30);
+		
+		items[2].setName("鉛筆");
+		items[2].setPrice(60);
 		items[2].setStock(100);
 		
-		for (int i = 0; i < items.length; i++) {
+		
+		
+		for(int i=0;i<3;i++) {
 			items[i].sell(5);
-			System.out.println(items[i].getName() + " " + items[i].getPrice() + "円 (残り" + items[i].getStock() + "個) ");
+			System.out.println(items[i]);
-			//			System.out.println("合計金額　" + items[i].totalPrice() + "円");
+//			System.out.println("合計金額："+items[i].totalPrice());
-			//			System.out.println();
+		}
+		
+		
 		
 	}
 	
-	}
+	
 
 }

em-oop/src/Book.java

@@ -1,22 +1,20 @@
 
 public class Book {
-
 	String title;
 	String author;
 	int price;
 	
 	public Book() {
-		this.title = "タイトル未設定";
+		this.title="タイトル未設定";
-		this.author = "著者未設定";
+		this.author="著者未設定";
-		this.price = 0;
+		this.price=0;
-
 	}
-
+	public Book(String title,String author,int price) {
-	public Book(String title, String author, int price) {
+		this.title=title;
-		this.title = title;
+		this.author=author;
-		this.author = author;
+		this.price=price;
-		this.price = price;
-
 	}
-
 }
+	
+
+

em-oop/src/Day3Check2.java

@@ -1,11 +0,0 @@
-
-public class Day3Check2 {
-	public static void main(String[] args) {
-		Rectangle rect = new Rectangle(3, 4);
-		rect.showInfo();
-		
-		Greeting greeting = new JapaneseGreeting();
-		System.out.println(greeting.hello());
-	}
-
-}

em-oop/src/Day3Check3.java

@@ -1,11 +0,0 @@
-
-public class Day3Check3 {
-	public static void main(String[] args) {
-		Shape shape1 = new Circle(2);
-		shape1.showInfo();
-		
-		Shape shape2 = new Rectangle(3, 4);
-		shape2.showInfo();
-	}
-
-}

em-oop/src/DepartmentData.java

@@ -1,39 +0,0 @@
-
-public class DepartmentData extends BaseData {
-	private String idDepartment, nmDepartment;
-
-	public DepartmentData(String idDepartment,String nmDepartment) {
-		this.setIdDepartment(idDepartment);
-		this.setNmDepartment(nmDepartment);
-		return; 
-			}
-
-
-	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,30 +1,50 @@
 
-public class EmployeeData extends BaseData {
+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 int getempCount() {
+	static final String COMPANY_NAME = "Rhizome";
-		return empCount;
-
-	}
-
-	public EmployeeData() {
-		empCount++;
 
+	@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);
@@ -34,34 +54,27 @@ public class EmployeeData extends BaseData {
 			empCount++;
 
 		}
+	}
 
 	public String getIdEmployee() {
-		return idEmployee;
+		return this.idEmployee;
 	}
 
 	public void setIdEmployee(String idEmployee) {
+
 		this.idEmployee = idEmployee;
-		if (idEmployee == null || idEmployee.strip().isEmpty()) {
-			System.out.println("社員IDが空のため設定できませんでした");
-			return;
-		}
 	}
 
 	public String getNmEmployee() {
 		return nmEmployee;
 	}
 
-	public void setNmEmployee(String nmEmployee) {
+	public void setNmEmployee(String nmEMployee) {
-		this.nmEmployee = nmEmployee;
+		this.nmEmployee = nmEMployee;
-
-		if (nmEmployee == null || nmEmployee.strip().isEmpty()) {
-			System.out.println("社員名が空のため設定できませんでした");
-			return;
-		}
 	}
 
 	public String getKnEmployee() {
-		return knEmployee;
+		return this.knEmployee;
 	}
 
 	public void setKnEmployee(String knEmployee) {
@@ -69,7 +82,7 @@ public class EmployeeData extends BaseData {
 	}
 
 	public String getMailAddress() {
-		return mailAddress;
+		return this.mailAddress;
 	}
 
 	public void setMailAddress(String mailAddress) {
@@ -92,30 +105,4 @@ public class EmployeeData extends BaseData {
 		this.idDepartment = idDepartment;
 	}
 
-	@Override
-	public String toString() {
-
-		return (this.getIdEmployee() + "\t" + this.getNmEmployee() + "\t" + this.getKnEmployee() + "\t"
-				+ this.getMailAddress() + "\t" + this.getPassword() + "\t" + this.getIdDepartment());
-
-	}
-
-	@Override
-	public String toCSV() {
-		return getIdEmployee() + "," + getNmEmployee() + "," + getKnEmployee() + "," + getMailAddress() + ","
-				+ getPassword() + "," + getIdDepartment();
-	}
-
-	public String getPrimaryKeyValue() {
-		return getIdEmployee();
-	}
-
-	public boolean isMatchId(String id) {
-		if (id == null || this.idEmployee == null) {
-			return false;
-		}
-		return this.idEmployee.equals(id);
-
-	}
-
 }

em-oop/src/Greeting.java

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

em-oop/src/Item.java

@@ -5,41 +5,39 @@ public class Item {
 	private int stock;
 	
 	public void sell(int amount) {
-		this.setStock(this.getStock() - amount);
+		this.setStock(this.getStock()-amount) ;
 	}
 	
 	public int totalPrice() {
-		return price * stock;
+		return this.price*this.stock;
-
 	}
 	
 	@Override
 	public String toString() {
-		return (getName() + " " + getPrice() + "円 (残り" + getStock() + "個");
+		return getName()+" "+getPrice()+"円(残り"+getStock()+"個)";
 	}
 	
 	public String getName() {
-		return name;
+		return this.name;
+	}
+	public void setName(String name) {
+		this.name=name;
 	}
 	
-	public void setName(String name) {
-		this.name = name;
-	}
 	
 	public int getPrice() {
-		return price;
+		return this.price;
+	}
+	public void setPrice(int price) {
+		this.price=price;
 	}
 	
-	public void setPrice(int price) {
-		this.price = price;
-	}
 	
 	public int getStock() {
-		return stock;
+		return this.stock;
 	}
-
 	public void setStock(int stock) {
-		this.stock = stock;
+		this.stock=stock;
 	}
 
 }

em-oop/src/JapaneseGreeting.java

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

em-oop/src/Main.java

@@ -1,130 +1,76 @@
+
 public class Main {
 	public static void main(String[] args) {
+		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();
 		
-		//		while (true) {
-		//			Scanner scanner = new Scanner(System.in);
-		//			System.out.println("検索したい社員IDを入力してください（終了する場合は0）");
-		//			String input = scanner.nextLine();
 		
-		BaseData[] employees = new BaseData[5];
-		//		BaseData employee = new EmployeeData("10000", "山田龍也", "ヤマダタツヤ", "yamada@hoge.jp", "aaa", "10");
-		BaseData[] allData = new BaseData[11];
-		//		
 		
-		allData[0] = new EmployeeData("10000", "山田龍也", "ヤマダタツヤ", "yamada@hoge.jp", "aaa", "10");
+//		employee[0].setIdEmployee("10000");
-		allData[1] = new EmployeeData("10001", "高橋準", "タカハシジュン", "jtaka@hoge.jp", "bbb", "10");
+//		employee[0].setNmEmployee("山田龍也");
-		allData[2] = new EmployeeData("10002", "麻枝史明", "マエダフミアキ", "fmak@hoge.jp", "ccc", "11");
+//		employee[0].setKnEmployee("ヤマダタツヤ");
-		allData[3] = new EmployeeData("10003", "丸戸章介", "マルトショウスケ", "marusyo@hoge.jp", "ddd", "12");
+//		employee[0].setMailAddress("yamada@hoge.jp");
-		allData[4] = new EmployeeData("10004", "三宅武", "ミタケタケシ", "miya@hoge.jp", "eee", "13");
+//		employee[0].setPassword("aaa");
-		allData[5] = new DepartmentData("10", "役員");
+//		employee[0].setIdDepartment("10");
-		allData[6] = new DepartmentData("11", "人事・総務部");
+//		
-		allData[7] = new DepartmentData("12", "経理");
+		employee[1].setIdEmployee("10001");
-		allData[8] = new DepartmentData("13", "システム開発事業部");
+		employee[1].setNmEmployee("高橋準");
-		allData[9] = new DepartmentData("14", "教育事業部");
+		employee[1].setKnEmployee("タカハシジュン");
-		allData[10] = new DepartmentData("15", "営業企画部");
+		employee[1].setMailAddress("jtaka@hoge.jp");
+		employee[1].setPassword("bbb");
+		employee[1].setIdDepartment("10");
 		
-		//		String targetDeptId = "";
+		employee[2].setIdEmployee("10002");
-		//
+		employee[2].setNmEmployee("麻枝史明");
-		//		for (int i = 0; i < allData.length; i++) {
+		employee[2].setKnEmployee("マエダフミアキ");
-		//
+		employee[2].setMailAddress("fmak@hoge.jp");
-		//			if (allData[i] instanceof DepartmentData) {
+		employee[2].setPassword("ccc");
-		//				DepartmentData dept = (DepartmentData) allData[i];
+		employee[2].setIdDepartment("11");
-		//
-		//				if (dept.getNmDepartment().equals("システム開発事業部")) {
-		//					targetDeptId = dept.getIdDepartment();
-		//					break;
-		//				}
-		//			}
-		//		}
-		//
-		//		for (int i = 0; i < allData.length; i++) {
-		//			if (allData[i] instanceof EmployeeData) {
-		//				EmployeeData emp = (EmployeeData) allData[i];
-		//				if (emp.getIdDepartment().equals(targetDeptId)) {
-		//					System.out.println(emp.getNmEmployee() + "\t" + emp.getMailAddress());
-		//				}
-		//			}
-		//		}
 		
-		//		int count = 0;
+		employee[3].setIdEmployee("10003");
-		//		int countt = 0;
+		employee[3].setNmEmployee("丸戸章介");
-		//		for (int i = 0; i < allData.length; i++) {
+		employee[3].setKnEmployee("マルトショウスケ");
-		//			if (allData[i] instanceof EmployeeData) {
+		employee[3].setMailAddress("marusyo@hoge.jp");
-		//				//				count++;
+		employee[3].setPassword("ddd");
-		//				EmployeeData emp = (EmployeeData) allData[i];
+		employee[3].setIdDepartment("12");
-		//
-		//				System.out.println(emp.getMailAddress());
 		
-		//			else if (allData[i] instanceof DepartmentData) {
+		employee[4].setIdEmployee("10004");
-		//				countt++;
+		employee[4].setNmEmployee("三宅武");
-		//			}
+		employee[4].setKnEmployee("ミヤケタケシ");
+		employee[4].setMailAddress("miya@hoge.jp");
+		employee[4].setPassword("eee");
+		employee[4].setIdDepartment("13");
+//		
 		
-		//		System.out.println("社員のデータ：" + count + "件");
-		//		System.out.println("部署のデータ：" + countt + "件");
 		
-		//			System.out.println(allData[i]);
+		for(int i=0;i<5;i++) {
-
+			if(employee[i].getNmEmployee()==null) {
-		//			employees[0] = new EmployeeData("10000", "山田龍也", "ヤマダタツヤ", "yamada@hoge.jp", "aaa", "10");
+				continue;
-		//			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");
-		//			//
-
-		//		for (int i = 0; i < employees.length; i++) {
-		//			System.out.println(allData[i]);
-		//		}
-		//		System.out.println("現在の社員データ件数：" + EmployeeData.getEmpCount() + "件");
-
-		if (allData[0] instanceof EmployeeData) {
-			EmployeeData sampleEmp = (EmployeeData) allData[0];
-			sampleEmp.setNmEmployee("");
 			}
-		if (allData[0] instanceof EmployeeData) {
+			System.out.println(employee[i]);
-			EmployeeData sampleEmp = (EmployeeData) allData[0];
-			sampleEmp.setIdEmployee("");
 		}
 		
-		//			String serchId1 = "10002";
-		//		System.out.println(serchId1 + "を検索します");
-		//		boolean bo = false;
-		//		for (int i = 0; i < employees.length; i++) {
-		//			if (((EmployeeData) employees[i]).isMatchId(serchId1)) {
-		//				bo = true;
-		//				break;
-		//			}
-		//
-		//		}
-		//		System.out.println(bo);
-		//			String serchId2 = "99999";
-		//		System.out.println(serchId2 + "を検索します");
-		//		boolean bl = false;
-		//		for (int i = 0; i < employees.length; i++) {
-		//			if (((EmployeeData) employees[i]).isMatchId(serchId2)) {
-		//				bl = true;
-		//				break;
-		//			}
-		//		}
-		//		System.out.println(bl);
 		
-		//			boolean a = false;
+		System.out.println("現在の社員データ数"+EmployeeData.getEmpCount());
-		//			for (int i = 0; i < employees.length; i++) {
+		
-		//				if (((EmployeeData) employees[i]).isMatchId(input)) {
+		System.out.println(EmployeeData.COMPANY_NAME);
-		//					a = true;
+		
-		//					System.out.println(employees[i]);
+//		System.out.println();
-		//					break;
+//		System.out.println(employee.nmEmployee);
-		//
+//		System.out.println(employee.knEmployee);
-		//				}
+//		System.out.println(employee.mailAddress);
-		//			}
+//		System.out.println(employee.password);
-		//			if (!a) {
+//		System.out.println(employee.idDepartment);
-		//				System.out.println("該当する社員が見つかりませんでした");
+		
-		//			}
-		//			if (input.equals("0")) {
-		//				System.out.println("システムを終了します");
-		//				break;
-		//			}
 		
-		//		System.out.println(employee.toCSV());
-		//		System.out.println(employee.getPrimaryKeyValue());
 	}
+	
+	
+	
+	
+
 }

em-oop/src/Rectangle.java

@@ -1,17 +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/Student.java

@@ -2,20 +2,20 @@
 public class Student {
 	int studentId;
 	String name;
-	
 	static int studentCount = 0;
 
-	public void printProfile () {
+	public void printProfile() {
 		System.out.println("学籍番号:" + this.studentId + " 名前:" + this.name);
 
 	}
+
 	public Student(int studentId, String name) {
 		this.studentId = studentId;
 		this.name = name;
 		studentCount++;
 	}
 	
-	static int getStudentCount() {
+	public static int getStudentCount() {
 		return studentCount;
 	}
 	

em-oop/src/day3_123/Circle.java

@@ -1,20 +1,22 @@
+package day3_123;
 
 public class Circle extends Shape {
 	private double radius;
 	
 	public Circle(double radius) {
 		super("円");
-		this.radius = radius;
+		this.radius=radius;
 	}
 	
 	@Override
 	public double area() {
-		return Math.PI * radius * radius;
+		return Math.PI*radius*radius;
 	}
 	
 	@Override
 	public void showInfo() {
 		super.showInfo();
-		System.out.println("(半径：" + this.radius + ")");
+		System.out.println("(半径:"+this.radius+")");
 	}
+
 }

em-oop/src/day3_123/Day3Check1.java

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

em-oop/src/day3_123/Shape.java

@@ -1,15 +1,15 @@
+package day3_123;
 
 public abstract class Shape {
 	private String name;
-
 	public Shape(String name) {
-		this.name = name;
+		this.name=name;
 	}
 	
 	public abstract double area();
 	
 	public void showInfo() {
-		System.out.println(this.name + "の面積は" + this.area() + "です");
+		System.out.println(this.name+"の面積は"+this.area()+"です");
 	}
 
 }