Merge remote-tracking branch 'origin/main' into s-sakiyama

em-oop/src/BasicCheck1.java

@@ -3,7 +3,17 @@ public class BasicCheck1 {
 
 	public static void main(String[] args) {
 		// TODO 自動生成されたメソッド・スタブ
+		Book book = new Book();
+		book.title = "吾輩は猫である";
+		book.author = "夏目漱石";
+		book.price = 800;
+		System.out.println(book.title);
+		System.out.println(book.author);
+		System.out.println(book.price);
 
+		System.out.println();
+
+		//9/15段階１
 		Book book1 = new Book();
 		System.out.println(book1.title);
 		System.out.println(book1.author);
@@ -13,5 +23,7 @@ public class BasicCheck1 {
 		System.out.println(book2.title);
 		System.out.println(book2.author);
 		System.out.println(book2.price);
+
 	}
+
 }

em-oop/src/BasicCheck2.java

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

em-oop/src/BasicCheck3.java

@@ -3,32 +3,24 @@ public class BasicCheck3 {
 
 	public static void main(String[] args) {
 		// TODO 自動生成されたメソッド・スタブ
-
 		Item[] items = new Item[3];
-		
+		for (int i = 0; i < items.length; i++) {
-		items[0] = new Item();
+			items[i] = 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 (Item i : items) {
-		items[1].sell(5);
+			i.sell(5);
-		items[2].sell(5);
+			System.out.println(i);
-		
-		for(int i= 0;i<3;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) {
 		this.title = title;
 		this.author = author;
 		this.price = price;
 	}
-
 }

em-oop/src/Circle.java

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

em-oop/src/Day3Check1.java

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

em-oop/src/Day3Check2.java

@@ -1,11 +0,0 @@
-
-public class Day3Check2 {
-
-	public static void main(String[] args) {
-		// TODO 自動生成されたメソッド・スタブ
-		Rectangle r = new Rectangle(3, 4);
-		r.showInfo();
-		Greeting gre = new JapaneseGreeting();
-		System.out.println(gre.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,17 +1,115 @@
 
 public class EmployeeData {
-	String idEmployee; 
+	private String idEmployee;
-	String nmEmployee;
+	private String nmEmployee;
-	String knEmployee;
+	private String knEmployee;
-	String mailAddress;
+	private String mailAddress;
-	String password;
+	private String password;
-	String idDepartment;
+	private String idDepartment;
+	private static int empCount = 0;
+	static final String COMPANY_NAME = "Rhizome";
 
-	void showInfo(){
+	//コンストラクタ
-	System.out.println(idEmployee + "\t" + nmEmployee +
+	public EmployeeData() {
-			"\t" +knEmployee + "\t" + mailAddress +
+		empCount++;
-			"\t" +password + "\t" + idDepartment );
+	}
+
+	//引数ありコンストラクタ
+	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++;
 
 	}
 
+	@Override
+	public String toString() {
+		return this.idEmployee + "\t" + this.nmEmployee
+				+ "\t" + this.knEmployee + "\t" + this.mailAddress
+				+ "\t" + this.password + "\t" + this.idDepartment;
+	}
+
+	public boolean isMatchId(String id) {
+		return getIdEmployee().equals(id);
+	}
+
+	public static boolean isMatchId(EmployeeData[] employees, String id) {
+		for (EmployeeData e : employees) {
+			if (e.isMatchId(id))
+				return true;
+
+		}
+		return false;
+	}
+
+	public String getIdEmployee() {
+		return idEmployee;
+	}
+
+	public void setIdEmployee(String idEmployee) {
+		if (!check(idEmployee, "社員ID"))
+			return;
+		this.idEmployee = idEmployee;
+	}
+
+	public String getNmEmployee() {
+		return nmEmployee;
+	}
+
+	public void setNmEmployee(String nmEmployee) {
+		if (!check(nmEmployee, "社員名"))
+			return;
+		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;
+	}
+
+	private boolean check(String str, String stringName) {
+		if (str == null || str.strip().length() == 0) {
+			System.out.println(stringName + "が空のため設定できませんでした");
+			return false;
+		}
+		return true;
+	}
+
 }

em-oop/src/Greeting.java

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

em-oop/src/Item.java

@@ -1,10 +1,22 @@
 
 public class Item {
-	//
+	private String name;
-	String name;
 	private int price;
 	private int stock;
 
+	void sell(int amount) {
+		this.setStock(this.getStock() - amount);
+	}
+
+	@Override
+	public String toString() {
+		return this.getName() + "　" + this.getPrice() + "円（残り" + this.getStock() + "個）";
+	}
+
+	int totalPrice() {
+		return this.price * this.stock;
+	}
+
 	public String getName() {
 		return name;
 	}
@@ -28,12 +40,4 @@ 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,10 +0,0 @@
-//
-public class JapaneseGreeting implements Greeting{
-	@Override
-	public String hello() {
-		// TODO 自動生成されたメソッド・スタブ
-		return "こんにちは";
-	}
-	
-
-}

em-oop/src/Main.java

@@ -1,57 +1,119 @@
+import java.util.Scanner;
 
 public class Main {
-
 	public static void main(String[] args) {
-		// TODO 自動生成されたメソッド・スタブ
+		System.out.println("会社名:" + EmployeeData.COMPANY_NAME);
 
-		//型、変数宣言しインスタンス化
+		//		EmployeeData employee = new EmployeeData("10000", "山田龍也", "ヤマダタツヤ",
-		EmployeeData employee = new EmployeeData();
+		//				"yamada@hoge.jp", "aaa", "10");
+		//		System.out.println(employee);
+		//
+		//		System.out.println();
 
 		EmployeeData[] employees = new EmployeeData[5];
-		employees[0] = new EmployeeData();
+		for (int i = 0; i < employees.length; i++) {
-		employees[1] = new EmployeeData();
+			employees[i] = new EmployeeData();
-		employees[2] = new EmployeeData();
+		}
-		employees[3] = new EmployeeData();
-		employees[4] = new EmployeeData();
 
-		//フィールドに代入
+		employees[0].setIdEmployee("10000");
-		employees[0].idEmployee = "10000";
+		employees[0].setNmEmployee("山田龍也");
-		employees[0].nmEmployee = "山田龍也";
+		employees[0].setKnEmployee("ヤマダタツヤ");
-		employees[0].knEmployee = "ヤマダタツヤ";
+		employees[0].setMailAddress("yamada@hoge.jp");
-		employees[0].mailAddress = "yamada@hoge.jp";
+		employees[0].setPassword("aaa");
-		employees[0].password = "aaa";
+		employees[0].setIdDepartment("10");
-		employees[0].idDepartment = "10";
 
-		employees[1].idEmployee = "10001";
+		employees[1].setIdEmployee("10001");
-		employees[1].nmEmployee = "高橋準";
+		employees[1].setNmEmployee("高橋準\t");
-		employees[1].knEmployee = "タカハシジュン";
+		employees[1].setKnEmployee("タカハシジュン");
-		employees[1].mailAddress = "jtaka@hoge.jp";
+		employees[1].setMailAddress("jtaka@hoge.jp");
-		employees[1].password = "bbb";
+		employees[1].setPassword("bbb");
-		employees[1].idDepartment = "10";
+		employees[1].setIdDepartment("10");
 
-		employees[2].idEmployee = "10002";
+		employees[2].setIdEmployee("10002");
-		employees[2].nmEmployee = "麻枝史明";
+		employees[2].setNmEmployee("麻枝史明");
-		employees[2].knEmployee = "マエダフミアキ";
+		employees[2].setKnEmployee("マエダフミアキ");
-		employees[2].mailAddress = "fumi@hoge.jp";
+		employees[2].setMailAddress("fmak@hoge.jp");
-		employees[2].password = "ccc";
+		employees[2].setPassword("ccc");
-		employees[2].idDepartment = "11";
+		employees[2].setIdDepartment("11");
 
-		employees[3].idEmployee = "10003";
+		employees[3].setIdEmployee("10003");
-		employees[3].nmEmployee = "丸戸章介";
+		employees[3].setNmEmployee("丸戸章介");
-		employees[3].knEmployee = "マルトショウスケ";
+		employees[3].setKnEmployee("マルトショウスケ");
-		employees[3].mailAddress = "marusyo@hoge.jp";
+		employees[3].setMailAddress("marusyo@hoge.jp");
-		employees[3].password = "ddd";
+		employees[3].setPassword("ddd");
-		employees[3].idDepartment = "12";
+		employees[3].setIdDepartment("12");
 
-		employees[4].idEmployee = "10004";
+		employees[4].setIdEmployee("10004");
-		employees[4].nmEmployee = "三宅武";
+		employees[4].setNmEmployee("三宅武\t");
-		employees[4].knEmployee = "ミヤケタケシ";
+		employees[4].setKnEmployee("ミヤケタケシ");
-		employees[4].mailAddress = "miya@hoge.jp";
+		employees[4].setMailAddress("miya@hoge.jp");
-		employees[4].password = "eee";
+		employees[4].setPassword("eee");
-		employees[4].idDepartment = "13";
+		employees[4].setIdDepartment("13");
 
-		for(int i= 0; i < 5 ; i++) {
+		for (EmployeeData e : employees) {
-			employees[i].showInfo();
+			System.out.println(e);
+			;
+		}
+		System.out.println("現在の社員のデータ件数：" + EmployeeData.getEmpCount() + "件");
+
+		System.out.println();
+
+		//nullおよび前後の空白を取り除いた結果が空文字チェック
+		EmployeeData emp = new EmployeeData("10000", "デフォルト", "ヤマダタツヤ", "yamada@hoge.jp", "aaa", "10");
+		System.out.println(emp);
+		emp.setNmEmployee(null);
+		System.out.println(emp);
+		emp.setNmEmployee("  　　");
+		System.out.println(emp);
+
+		System.out.println();
+
+		EmployeeData emptyEmployee = new EmployeeData("", "", "", "", "", "");
+		System.out.println(emptyEmployee);
+
+		System.out.println();
+
+		//IDが一致するか
+		boolean matchIdBool = false;
+		System.out.println("10002 を検索します");
+		for (EmployeeData e : employees) {
+			matchIdBool = e.isMatchId("10002");
+			if (matchIdBool)
+				break;
+		}
+		System.out.println(matchIdBool);
+
+		System.out.println("99999 を検索します");
+		System.out.println(EmployeeData.isMatchId(employees, "99999"));
+
+		System.out.println("10003 を検索します");
+		System.out.println(EmployeeData.isMatchId(employees, "10003"));
+
+		System.out.println();
+
+		Scanner scanner = new Scanner(System.in);
+		while (true) {
+			System.out.println("検索したい社員IDを入力してください（終了する場合は0）");
+			System.out.print(">>>>");
+			String findId = scanner.nextLine();
+			if (findId.equals("0")) {
+				System.out.println("システムを終了します");
+				return;
+			}
+
+			boolean matchFlag = false;
+
+			for (EmployeeData e : employees) {
+				if (e.isMatchId(findId)) {
+					System.out.println(e);
+					matchFlag = true;
+					break;
+				}
+			}
+			if (!matchFlag) {
+				System.out.println("該当する社員が見つかりませんでした");
+			}
+			System.out.println();
 		}
 
 	}

em-oop/src/Shape.java

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

em-oop/src/Student.java

@@ -1,25 +1,20 @@
 
 public class Student {
-		//変数を作る
+	int studentId;
-		int studentId;
+	String name;
-		String name;
+	static int studentCount = 0;
 
-		//フィールド追加
+	void printProfile() {
-		static int studentCount = 0;
-		//コンストラクタ追加
-		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 Student(int studentId, String name) {
+		this.studentId = studentId;
+		this.name = name;
+		studentCount++;
+	}
+
+	public static int getStudentCount() {
+		return studentCount;
+	}
 }