2段階目

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

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

em-oop/src/BasicCheck2.java

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

em-oop/src/BasicCheck3.java

@@ -1,7 +1,11 @@
 
 public class BasicCheck3 {
+
 	public static void main(String[] args) {
+		// TODO 自動生成されたメソッド・スタブ
+
 		Item[] items = new Item[3];
+		
 		items[0] = new Item();
 		items[1] = new Item();
 		items[2] = new Item();
@@ -18,18 +22,14 @@ public class BasicCheck3 {
 		items[2].setPrice(60);
 		items[2].setStock(100);
 		
-		
-		
-		for(int i=0;i<3;i++) {
+		for (int i = 0; i < items.length; i++) {
 			items[i].sell(5);
+		}	
+		
+		for (int i = 0; i < items.length; i++) {
 			System.out.println(items[i]);
-//			System.out.println("合計金額："+items[i].totalPrice());
-		}
-		
-		
 			
 		}
-	
-	
+	}
 
 }

em-oop/src/Book.java

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

em-oop/src/DepartmentData.java

@@ -1,37 +0,0 @@
-
-public class DepartmentData extends BaseData {
-	private String idDepartment;
-	private String 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();
-	}
-
-	@Override
-	public String toCSV() {
-				return getIdDepartment() + "," + getNmDepartment();
-	}
-
-	@Override
-	public String getPrimaryKeyValue() {
-				return getIdDepartment();
-	}
-
-}

em-oop/src/EmployeeData.java

@@ -1,124 +1,23 @@
 
-public class EmployeeData extends BaseData {
-	private String idEmployee;
-	private String nmEmployee;
-	private String knEmployee;
-	private String mailAddress;
-	private String password;
-	private String idDepartment;
-	private static int empCount = 0;
+public class EmployeeData {
 
-	static final String COMPANY_NAME = "Rhizome";
+	String idEmployee;
+	String nmEmployee;
+	String knEmployee;
+	String mailAddress;
+	String password;
+	String idDepartment;
 	
-	public void showInfo() {
-		System.out.println(this.idEmployee + "\t" + this.nmEmployee + "\t" + this.knEmployee + "\t" + this.mailAddress
-				+ "\t" + this.mailAddress + "\t" + this.password + "\t" + this.idDepartment);
-	}
+	void showInfo() {
 		
-	@Override
-	public String toString() {
-		return getIdEmployee() + "\t" + getNmEmployee() + "　" + getKnEmployee() + "\t" + getMailAddress()
-				+ "\t" + getPassword() + "\t" + getIdDepartment();
-	}
-
-	@Override
-	public String toCSV() {
-		return getIdEmployee() + "," + getNmEmployee() + "," + getKnEmployee() + "," + getMailAddress() + ","
-				+ getPassword() + "," + getIdDepartment();
-	}
-
-	@Override
-	public String getPrimaryKeyValue() {
-		return idEmployee;
-
-	}
-
-	public boolean isMatchId(String id) {
-		return idEmployee.equals(id);
-	}
-
-	static int getEmpCount() {
-		return empCount;
-	}
-
-	//getNmEmployee.strip();
-
-	public EmployeeData() {
-		empCount++;
-
-	}
-
-	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);
-			empCount++;
-	}
-
-	public String getIdEmployee() {
-		return this.idEmployee;
-	}
-
-	public void setIdEmployee(String idEmployee) {
-		idEmployee = idEmployee.strip();
-		int idNum = idEmployee.length();
-
-		if (idNum == 0) {
-			System.out.println("社員IDが空のため設定できませんでした");
-		} else {
-			this.idEmployee = idEmployee;
-		}
-	}
-
-	public String getNmEmployee() {
-		return nmEmployee;
-	}
-
-	public void setNmEmployee(String nmEmployee) {
-		nmEmployee = nmEmployee.strip();
-		int nmNum = nmEmployee.length();
-		if (nmNum == 0) {
-			System.out.println("社員名が空のため設定できませんでした");
-
-		} else {
-			this.nmEmployee = nmEmployee;
-		}
-	}
-
-	public String getKnEmployee() {
-		return this.knEmployee;
-	}
-
-	public void setKnEmployee(String knEmployee) {
-		this.knEmployee = knEmployee;
-	}
-
-	public String getMailAddress() {
-		return this.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;
+		System.out.println(
+				this.idEmployee + "\t"
+				+ this.nmEmployee + "\t"
+				+ this.knEmployee + "\t"
+				+ this.mailAddress + "\t"
+				+ this.password + "\t"
+				+ this.idDepartment
+		);
 	}
 
 }

em-oop/src/Item.java

@@ -1,43 +1,43 @@
 
 public class Item {
+
 	private String name;
 	private int price;
 	private int stock;
 
-	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;
+	}
+
+	void sell(int amount) {
+		this.setStock(this.getStock() - amount);
+		
 	}
 	
 	@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/Main.java

@@ -1,202 +1,64 @@
-import java.util.ArrayList;
-import java.util.Scanner;
 
 public class Main {
+
 	public static void main(String[] args) {
+		// TODO 自動生成されたメソッド・スタブ
 
-		//		BaseData employee = new EmployeeData();
-		//		BaseData[] employees = new BaseData[];
-		//		BaseData[] allData = new BaseData();
-		ArrayList<BaseData> allData = new ArrayList<>();
+		EmployeeData[] Employees = new EmployeeData[5];
 		
-		allData.add(new EmployeeData("10000", "山田龍也", "ヤマダタツヤ", "yamada@hoge.jp", "aaa", "10"));
-		//		allData[1] = new EmployeeData("10001", "高橋準", "タカハシジュン", "jtaka@hoge.jp", "bbb", "10");
-		//		allData[2] = new EmployeeData("10002", "麻枝史明", "マエダフミアキ", "fmak@hoge.jp", "ccc", "11");
-		//		allData[3] = new EmployeeData("10003", "丸戸章介", "マルトショウスケ", "marusyo@hoge.jp", "ddd", "12");
-		//		allData[4] = new EmployeeData("10004", "三宅武", "ミヤケタケシ", "miya@hoge.jp", "eee", "13");
-		//		allData[11] = new EmployeeData("10005", "丸井悠", "マルイハルカ", "haru@hoge.jp", "fff", "13");
-		//		allData[12] = new EmployeeData("10006", "涼元香織", "スズモトカオリ", "suzumoto@hoge.jp", "ggg", "13");
-		//		allData[13] = new EmployeeData("10007", "葉山稔", "ハヤマミノル", "mhayama@hoge.jp", "hhh", "14");
-		//		allData[14] = new EmployeeData("10008", "川上朱里", "カワカミアカリ", "kawakami@hoge.jp", "iii", "14");
-		//		allData[15] = new EmployeeData("10009", "杉井肇", "スギイハジメ", "sugi@hoge.jp", "jjj", "15");
-		//
-		//		DepartmentData dept = new DepartmentData();
-		//		dept.setIdDepartment("10");
-		//		dept.setNmDepartment("役員");
-		//		allData[5] = dept;
-		//		dept = new DepartmentData();
-		//		dept.setIdDepartment("11");
-		//		dept.setNmDepartment("人事・総務部");
-		//		dept = new DepartmentData();
-		//		allData[6] = dept;
-		//		dept.setIdDepartment("12");
-		//		dept.setNmDepartment("経理部");
-		//		allData[7] = dept;
-		//		dept = new DepartmentData();
-		//		dept.setIdDepartment("13");
-		//		dept.setNmDepartment("システム開発事業部");
-		//		allData[8] = dept;
-		//		dept = new DepartmentData();
-		//		dept.setIdDepartment("14");
-		//		dept.setNmDepartment("教育事業部");
-		//		allData[9] = dept;
-		//		dept = new DepartmentData();
-		//		dept.setIdDepartment("15");
-		//		dept.setNmDepartment("営業企画部");
-		//		allData[10] = dept;
+		Employees[0] = new EmployeeData();
+		Employees[1] = new EmployeeData();
+		Employees[2] = new EmployeeData();
+		Employees[3] = new EmployeeData();
+		Employees[4] = new EmployeeData();
 		
-		Scanner scanner = new Scanner(System.in);
+		Employees[0].idEmployee = "10000";
+		Employees[0].nmEmployee = "山田龍也";
+		Employees[0].knEmployee = "ヤマダタツヤ";
+		Employees[0].mailAddress = "yamada@hoge.jp";
+		Employees[0].password = "aaa";
+		Employees[0].idDepartment = "10";
 		
-		while (true) {
-			System.out.println("1:検索 2:登録 3:更新 4:削除 0:終了");
-			String usertype = scanner.nextLine();
+		Employees[1].idEmployee = "10001";
+		Employees[1].nmEmployee = "高橋準";
+		Employees[1].knEmployee = "タカハシジュン";
+		Employees[1].mailAddress = "jtaka@hoge.jp";
+		Employees[1].password = "bbb";
+		Employees[1].idDepartment = "10";
 		
-			//0:終了
-			if (usertype.equals("0")) {
-				break;
-			}
+		Employees[2].idEmployee = "10002";
+		Employees[2].nmEmployee = "麻枝史明";
+		Employees[2].knEmployee = "マエダフミアキ";
+		Employees[2].mailAddress = "fmak@hoge.jp";
+		Employees[2].password = "ccc";
+		Employees[2].idDepartment = "11";
 		
-			//1:検索
-			if (usertype.equals("1")) {
-				System.out.println("1:全検索 2:条件検索 それ以外:戻る");
-				usertype = scanner.nextLine();
-				if (usertype.equals("1")) {
-					for (int i = 0; i < allData.size(); i++)
-						if (allData.get(i) instanceof EmployeeData) {
-							System.out.println(allData.get(i).toString());
-						}
+		Employees[3].idEmployee = "10003";
+		Employees[3].nmEmployee = "丸戸章介";
+		Employees[3].knEmployee = "マルトショウスケ";
+		Employees[3].mailAddress = "marusyo@hoge.jp";
+		Employees[3].password = "ddd";
+		Employees[3].idDepartment = "12";
 		
-				} else if (usertype.equals("2")) {
-					System.out.println("IDを入力してください");
-					usertype = scanner.nextLine();
+		Employees[4].idEmployee = "10004";
+		Employees[4].nmEmployee = "三宅武";
+		Employees[4].knEmployee = "ミヤケタケシ";
+		Employees[4].mailAddress = "miya@hoge.jp";
+		Employees[4].password = "eee";
+		Employees[4].idDepartment = "13";
 		
-					boolean result = false;
-					for (int i = 0; i < allData.size(); i++)
-						if (allData.get(i) instanceof EmployeeData) {
-							EmployeeData employee = (EmployeeData) allData.get(i);
-							if (employee.getIdEmployee().equals(usertype)) {
-								result = true;
-								System.out.println(employee.toString());
-								break;
-							}
 		
-						}
-					if (result == false) {
-						System.out.println("入力された値で情報がみつかりませんでした");
+//		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);
 		
-					}
-
-				} else {
-					continue;
-
-				}
-
-			}
-
-			//2:登録
-			if (usertype.equals("2")) {
-				System.out.println("社員IDを入力してください");
-			}
-
-		}
+		for (int i = 0; i < Employees.length; i++) {
+			Employees[i].showInfo();
 			
 		}
 	}
 
-//Day3.9---所属部署から従業員のメアドを検索する
-//		DepartmentData dep = null;
-//		EmployeeData emp;
-//		String nmD = null;
-//
-//		for (int i = 0; i < allData.length; i++) {
-//			if (allData[i] instanceof DepartmentData) {
-//				dep = (DepartmentData) allData[i];
-//				if (dep.getNmDepartment().equals("システム開発事業部")) {
-//					nmD = dep.getIdDepartment();
-//				}
-//			}
-//
-//		}
-//
-//		for (int i = 0; i < allData.length; i++) {
-//			if (allData[i] instanceof EmployeeData) {
-//				emp = (EmployeeData) allData[i];
-//				if (emp.getIdDepartment().equals(nmD)) {
-//					System.out.println(emp.getNmEmployee() + "\t" + emp.getMailAddress());
-//				}
-//
-//			}
-//
-//		}
-
-//		for (int i = 0; i < allData.length; i++) {
-//			if (allData[i] instanceof EmployeeData) {
-//				EmployeeData emp = (EmployeeData) allData[i];
-//				System.out.println(emp.getMailAddress());
-//			}
-//		}
-
-//		int emp=0;
-//		int dep=0;
-//		for(int i=0;i<allData.length;i++) {
-//			if(allData[i] instanceof EmployeeData) {
-//				emp++;
-//			}
-//			if(allData[i] instanceof DepartmentData) {
-//				dep++;
-//			}
-//		}
-//		System.out.println("社員データ："+emp+"件");
-//		System.out.println("部署データ："+dep+"件");
-
-//		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");
-
-//		System.out.println(employees[0].toCSV());
-//		System.out.println(employees[0].getPrimaryKeyValue());
-
-//		Scanner sc = new Scanner(System.in);
-//		//
-//		for (int i = 0; i < employees.length; i++) {
-//			System.out.println("1:検索 2:登録 3:更新 4:削除 0:終了");
-//			String id = sc.nextLine();
-//			boolean result = false;
-//
-//			if (id.equals("0")) {
-//				System.out.println("システムを終了します");
-//				break;
-//			}
-//			if (employees[i].getPrimaryKeyValue().equals(id)) {
-//				result = true;
-//				employees[i].toString();
-//
-//			}
-//
-//			if (result == false) {
-//				System.out.println("該当する社員が見つかりませんでした");
-//			}
-//
-//		}
-//
-//		for (int i = 0; i < 5; i++) {
-//			if (employee[i].getNmEmployee() == null) {
-//				continue;
-//			}
-//			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);
+}

em-oop/src/Student.java

@@ -2,23 +2,22 @@
 public class Student {
 	int studentId;
 	String name;
-	static int studentCount = 0;
-
-	public void printProfile() {
-		System.out.println("学籍番号:" + this.studentId + " 名前:" + this.name);
-
-	}
 		
 	public Student(int studentId, String name) {
 		this.studentId = studentId;
 		this.name = name;
-		studentCount++;
+		
 	}
 
-	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();
 		
+	//}
 	
 
 }
+

em-oop/src/day3_123/Circle.java

@@ -1,22 +0,0 @@
-package day3_123;
-
-public class Circle extends 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+")");
-	}
-
-}

em-oop/src/day3_123/Day3Check1.java

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

em-oop/src/day3_123/Day3Check2.java

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

em-oop/src/day3_123/Day3Check3.java

@@ -1,13 +0,0 @@
-package day3_123;
-
-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/day3_123/Greeting.java

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

em-oop/src/day3_123/JapaneseGreeting.java

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

em-oop/src/day3_123/Rectangle.java

@@ -1,18 +0,0 @@
-package day3_123;
-
-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/day3_123/Shape.java

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