From 12f84a2a83c264bd5950b8f4e6cc195fad570f71 Mon Sep 17 00:00:00 2001
From: t-eguchi <26-t-eguchi-tmn@it-college.co.jp>
Date: Tue, 15 Sep 2026 14:50:24 +0900
Subject: [PATCH] =?UTF-8?q?=EF=BC=92=E6=AE=B5=E9=9A=8E=E7=9B=AE=E7=B5=82?=
 =?UTF-8?q?=E3=82=8F=E3=82=8A=E3=81=BE=E3=81=97=E3=81=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 em-oop/src/BasicCheck1.java |  6 +-----
 em-oop/src/BasicCheck3.java | 28 ++++++++++++-------------
 em-oop/src/Book.java        | 17 +++++++--------
 em-oop/src/Item.java        | 41 +++++++++++++++++++++++++++++++------
 4 files changed, 57 insertions(+), 35 deletions(-)

diff --git a/em-oop/src/BasicCheck1.java b/em-oop/src/BasicCheck1.java
index c1b9c30..c6e7bff 100644
--- a/em-oop/src/BasicCheck1.java
+++ b/em-oop/src/BasicCheck1.java
@@ -5,13 +5,9 @@ public class BasicCheck1 {
 
 		Book book1 = new Book();
 		Book book2 = new Book("銀河鉄道の夜", "宮沢賢治", 500);
-		
-		
+
 		System.out.println(book1.title + "\n" + book1.author + "\n" + book1.price);
 		System.out.println(book2.title + "\n" + book2.author + "\n" + book2.price);
-		
-			
-		
 
 	}
 
diff --git a/em-oop/src/BasicCheck3.java b/em-oop/src/BasicCheck3.java
index f3af7a4..f899708 100644
--- a/em-oop/src/BasicCheck3.java
+++ b/em-oop/src/BasicCheck3.java
@@ -6,26 +6,26 @@ public class BasicCheck3 {
 		items[1] = new Item();
 		items[2] = new Item();
 
-		items[0].name = "ノート";
-		items[1].name = "消しゴム";
-		items[2].name = "鉛筆";
+		items[0].setName("ノート");
+		items[1].setName("消しゴム");
+		items[2].setName("鉛筆");
 
-		items[0].price = 120;
-		items[1].price = 80;
-		items[2].price = 60;
+		items[0].setPrice(120);
+		items[1].setPrice(80);
+		items[2].setPrice(60);
 
-		items[0].stock = 50;
-		items[1].stock = 30;
-		items[2].stock = 100;
+		items[0].setStock(50);
+		items[1].setStock(30);
+		items[2].setStock(100);
 
 		for (int i = 0; i < items.length; i++) {
 			items[i].sell(5);
-			System.out.println(items[i].name + " " + items[i].price + "円 残り" + items[i].stock + "個 ");
-			System.out.println("合計金額　" + items[i].totalPrice() + "円");
-			System.out.println();
-			
+			System.out.println(items[i].getName() + " " + items[i].getPrice() + "円 (残り" + items[i].getStock() + "個) ");
+			//			System.out.println("合計金額　" + items[i].totalPrice() + "円");
+			//			System.out.println();
+
 		}
 
-	} 
+	}
 
 }
diff --git a/em-oop/src/Book.java b/em-oop/src/Book.java
index 101a1d3..4970892 100644
--- a/em-oop/src/Book.java
+++ b/em-oop/src/Book.java
@@ -1,25 +1,22 @@
 
 public class Book {
-	
-	
+
 	String title;
-	String author ;
+	String author;
 	int price;
-	
+
 	public Book() {
 		this.title = "タイトル未設定";
 		this.author = "著者未設定";
 		this.price = 0;
-		
+
 	}
-	
-	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;
-		
-	}
-	
 
+	}
 
 }
diff --git a/em-oop/src/Item.java b/em-oop/src/Item.java
index e1361de..11b6d7c 100644
--- a/em-oop/src/Item.java
+++ b/em-oop/src/Item.java
@@ -1,16 +1,45 @@
 
 public class Item {
-	String name;
-	int price;
-	int stock;
+	private String name;
+	private int price;
+	private int stock;
+
 	public void sell(int amount) {
-		this.stock = this.stock - amount;
+		this.setStock(this.getStock() - amount);
 	}
-	
+
 	public int totalPrice() {
 		return price * stock;
-		
+
 	}
 
+	@Override
+	public String toString() {
+		return (getName() + " " + getPrice() + "円 (残り" + getStock() + "個");
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	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;
+	}
 
 }