２日目 段階８ 小澤

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

@@ -1,9 +0,0 @@
-
-public abstract class BaseData {
-	//3-4
-	public abstract String toString();
-
-	public abstract String toCSV();
-
-	public abstract String getPrimaryKeyValue();
-}

em-oop/src/BasicCheck1.java

@@ -2,27 +2,22 @@
 public class BasicCheck1 {
 
 	public static void main(String[] args) {
-		//1-1
+		// 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);
-		//1-1
-
-		//2-1
 		Book book1 = new Book();
+		Book book2 = new Book("銀河鉄道の夜","宮沢賢治",500);
+		
+//		book.title = "吾輩は猫である";
+//		book.author = "夏目漱石";
+//		book.price = 800;
+		
 		System.out.println(book1.title);
 		System.out.println(book1.author);
 		System.out.println(book1.price);
 		
-		Book book2 = new Book("銀河鉄道の夜", "宮沢賢治", 500);
 		System.out.println(book2.title);
 		System.out.println(book2.author);
 		System.out.println(book2.price);
-		//2-1
+
 	}
+
 }

em-oop/src/BasicCheck2.java

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

em-oop/src/BasicCheck3.java

@@ -1,19 +1,35 @@
 
 public class BasicCheck3 {
 	public static void main(String[] args) {
-		//1-3
 		Item[] items = new Item[3];
-		items[0] = new Item("ノート", 120, 50);
+		items[0] = new Item();
-		items[1] = new Item("消しゴム", 80, 30);
+		items[1] = new Item();
-		items[2] = new Item("鉛筆", 60, 100);
+		items[2] = new Item();
 		
-		for (int i = 0; i < 3; i++) {
+		items[0].setName("ノート") ;
+		items[0].setPrice(120);
+		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<3;i++) {
 			items[i].sell(5);
-			//2-2
+			System.out.println(items[i]);
-			System.out.println(items[i].toString());
+//			System.out.println("合計金額："+items[i].totalPrice());
-			//2-2
 		}
-		//1-3
+		
+		
+		
 	}
 	
+	
+
 }

em-oop/src/Book.java

@@ -1,22 +1,20 @@
 
 public class Book {
-	//1-1
 	String title;
 	String author;
 	int price;
-	//1-1
 	
-	//2-1
 	public Book() {
-		title = "タイトル未設定";
+		this.title="タイトル未設定";
-		author = "著者未設定";
+		this.author="著者未設定";
-		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;
 	}
-	//2-1
 }
+	
+
+

em-oop/src/Circle.java

@@ -1,20 +0,0 @@
-
-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/Day3Check1.java

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

em-oop/src/Day3Check2.java

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

em-oop/src/DayCheck3.java

@@ -1,12 +0,0 @@
-
-public class DayCheck3 {
-
-	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,44 +0,0 @@
-
-public class DepartmentData extends BaseData {
-	//3-6
-	private String idDepartment;
-	private String nmDepartment;
-
-	//3-6
-	public DepartmentData(String idDepartment, String nmDepartment) {
-		this.idDepartment = idDepartment;
-		this.nmDepartment = nmDepartment;
-	}
-
-	@Override
-	public String toString() {
-		return getIdDepartment() + "\t" + getNmDepartment();
-	}
-
-	@Override
-	public String toCSV() {
-		return getIdDepartment() + "," + getNmDepartment();
-	}
-
-	@Override
-	public String getPrimaryKeyValue() {
-		return getIdDepartment();
-	}
-
-	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;
-	}
-	//3-6
-}

em-oop/src/EmployeeData.java

@@ -1,124 +1,75 @@
 
-public class EmployeeData extends BaseData {
+public class EmployeeData {
-	//1-4
+	private String idEmployee;
-	private String IdEmployee, nmEmployee, knEmployee, mailAddress, password, idDepartment;
+	private String nmEmployee;
-	//1-4 + 2-4
+	private String knEmployee;
+	private String mailAddress;
+	private String password;
+	private String idDepartment;
+	private static int empCount = 0;
+	
+	static final String COMPANY_NAME = "Rhizome";
 	
-	//1-6
-	//	public EmployeeData(String idEmployee, String nmEmployee, String knEmployee, String mailAddress, String password,
-	//			String idDepartment) {
-	//		this.IdEmployee = idEmployee;
-	//		this.nmEmployee = nmEmployee;
-	//		this.knEmployee = knEmployee;
-	//		this.mailAddress = mailAddress;
-	//		this.password = password;
-	//		this.idDepartment = idDepartment;
-	//	}
-	//1-6
 
-	//1-5
-	//2-4
-	//2-6
 	@Override
 	public String toString() {
-		//		System.out.println(getIdEmployee() + "\t" + getNmEmployee() + "\t" + getKnEmployee() + "\t" + getMailAddress()
+		return getIdEmployee() + "\t" + getNmEmployee() + "　" + getKnEmployee() + "\t" + getMailAddress()
-		//				+ "\t" + getPassword() + "\t" + getIdDepartment());
+				+ "\t" + getPassword() + "\t" + getIdDepartment();
-		return (getIdEmployee() + "\t" + getNmEmployee() + "\t" + getKnEmployee() + "\t" + getMailAddress()
-				+ "\t" + getPassword() + "\t" + getIdDepartment());
-	}
-	//2-6
-	//2-4
-	//1-5
-
-	//3-4
-	@Override
-	public String toCSV() {
-		return getIdEmployee() + "," + getNmEmployee() + "," + getKnEmployee() + "," + getMailAddress()
-				+ "," + getPassword() + "," + getIdDepartment();
 	}
 	
-	public String getPrimaryKeyValue() {
+	static int getEmpCount() {
-		return IdEmployee;
+		return empCount;
 	}
-	//3-4
 	
-	//1-7
+	//getNmEmployee.strip();
-	boolean isMatchId(String id) {
-		System.out.println(id + " を検索します");
-		if (id.equals(IdEmployee)) {
-			System.out.println(true);
-		} else {
-			System.out.println(false);
-		}
-		return false;
-	}
-	//1-7
 
-	//2-5
 	public EmployeeData() {
-		//2-7
 		empCount++;
-		//2-7
+
 	}
 
 	public EmployeeData(String idEmployee, String nmEmployee, String knEmployee, String mailAddress, String password,
 			String idDepartment) {
+		
+		nmEmployee=nmEmployee.strip();
+		int nmNum = nmEmployee.length();
+		
+		if(nmNum==0) {
+			System.out.println("社員名が空のため設定できませんでした");
+			
+		}
+		if(nmNum>0){
+		
+		
 		this.setIdEmployee(idEmployee);
 		this.setNmEmployee(nmEmployee);
 		this.setKnEmployee(knEmployee);
 		this.setMailAddress(mailAddress);
 		this.setPassword(password);
 		this.setIdDepartment(idDepartment);
-		//2-7
 		empCount++;
-		//2-7
+		}
 	}
-	//2-5
 
-	//2-7
-	private static int empCount = 0;
-
-	static int getEmpCount() {
-		return empCount;
-
-	}
-	//2-7
-
-	//2-4
 	public String getIdEmployee() {
-		return IdEmployee;
+		return this.idEmployee;
 	}
 
 	public void setIdEmployee(String idEmployee) {
-		//2-9
+		
-		idEmployee = idEmployee.strip();
+		this.idEmployee = idEmployee;
-		if (idEmployee.length() == 0) {
-			System.out.println("社員IDが空のため設定できませんでした");
-			return;
-		} else {
-			this.IdEmployee = idEmployee;
-		}
-		//2-9
 	}
 
 	public String getNmEmployee() {
 		return nmEmployee;
 	}
 
-	public void setNmEmployee(String nmEmployee) {
+	public void setNmEmployee(String nmEMployee) {
-		//2-8
+		this.nmEmployee = nmEMployee;
-		nmEmployee = nmEmployee.strip();
-		if (nmEmployee.length() == 0) {
-			System.out.println("社員名が空のため設定できませんでした");
-			return;
-		} else {
-			this.nmEmployee = nmEmployee;
-		}
-		//2-8
 	}
 
 	public String getKnEmployee() {
-		return knEmployee;
+		return this.knEmployee;
 	}
 
 	public void setKnEmployee(String knEmployee) {
@@ -126,7 +77,7 @@ public class EmployeeData extends BaseData {
 	}
 
 	public String getMailAddress() {
-		return mailAddress;
+		return this.mailAddress;
 	}
 
 	public void setMailAddress(String mailAddress) {
@@ -148,5 +99,9 @@ public class EmployeeData extends BaseData {
 	public void setIdDepartment(String idDepartment) {
 		this.idDepartment = idDepartment;
 	}
-	//2-4
+
+	
+	
+	
+
 }

em-oop/src/Greeting.java

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

em-oop/src/Item.java

@@ -1,51 +1,43 @@
 
 public class Item {
-	//1-3
 	private String name;
 	private int price;
 	private int stock;
 	
-	public Item(String name, int price, int stock) {
+	public void sell(int amount) {
-		this.name = name;
+		this.setStock(this.getStock()-amount) ;
-		this.price = price;
-		this.stock = stock;
 	}
 	
-	void sell(int amount) {
+	public int totalPrice() {
-		//		this.stock = this.stock - amount;
+		return this.price*this.stock;
-		this.setStock(this.getStock() - amount); //2-2
-		//System.out.println(name + " " + price + "円 残り" + stock + "個");
 	}
-	//1-3
 	
-	//2-2
 	@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;
 	}
 
-	public void setStock(int stock) {
-		this.stock = stock;
-	}
-	//2-2
 }

em-oop/src/JapaneseGreeting.java

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

em-oop/src/Main.java

@@ -1,168 +1,73 @@
-//import java.util.Scanner;//1-8
 
 public class Main {
 	public static void main(String[] args) {
-		//1-8
+		EmployeeData[] employee = new EmployeeData[5];
-		//		Scanner scanner = new Scanner(System.in);
+		employee[0] = new EmployeeData("10000"," ","ヤマダタツヤ","yamada@hoge.jp","aaa","10");
-		//		//1-9
+		employee[1] = new EmployeeData();
-		//		boolean end = false;
+		employee[2] = new EmployeeData();
-		//		while (!end) {
+		employee[3] = new EmployeeData();
-		//		//1-9
+		employee[4] = new EmployeeData();
-		//			System.out.println("検索したい社員IDを入力してください（終了するには0を入力）");
-		//			String num = scanner.nextLine().strip();
-		//			boolean found = false;
-		//1-8
-		//1-4
-		//		BaseData employee = new EmployeeData();
-		//		employee.setIdEmployee("10000");
-		//		employee.setNmEmployee("山田龍也");
-		//		employee.setKnEmployee("ヤマダタツヤ");
-		//		employee.setMailAddress("yamada@hoge.jp");
-		//		employee.setPassword("aaa");
-		//		employee.setIdDepartment("10");
 		
-		//				System.out.println(employee.getIdEmployee());
-		//				System.out.println(employee.getNmEmployee());
-		//				System.out.println(employee.getKnEmployee());
-		//				System.out.println(employee.getMailAddress());
-		//				System.out.println(employee.getPassword());
-		//				System.out.println(employee.getIdDepartment());
-		//1-4
 		
-		//3-4
-		//		System.out.println(employee.toCSV());
-		//		System.out.println(employee.getPrimaryKeyValue());
-		//3-4
 		
-		//2-5
+//		employee[0].setIdEmployee("10000");
-		//		EmployeeData emp1 = new EmployeeData("10000", "山田龍也", "ヤマダタツヤ", "yamada@hoge.jp", "aaa", "10");
+//		employee[0].setNmEmployee("山田龍也");
-		//		EmployeeData emp2 = new EmployeeData("10001", "高橋準", "タカハシジュン", "Jtaka@hoge.jp", "bbb", "11");
+//		employee[0].setKnEmployee("ヤマダタツヤ");
-		//		EmployeeData emp3 = new EmployeeData("10002", "麻枝史明", "マエダフミアキ", "fmak@hoge.jp", "ccc", "12");
+//		employee[0].setMailAddress("yamada@hoge.jp");
-		//		EmployeeData emp4 = new EmployeeData("10003", "丸戸章介", "マルトショウスケ", "marusyo@hoge.jp", "ddd", "13");
+//		employee[0].setPassword("aaa");
-		//		EmployeeData emp5 = new EmployeeData("10004", "三宅武", "ミヤケタケシ", "miya@hoge.jp", "eee", "14");
+//		employee[0].setIdDepartment("10");
-		//2-5
+//		
+		employee[1].setIdEmployee("10001");
+		employee[1].setNmEmployee("高橋準");
+		employee[1].setKnEmployee("タカハシジュン");
+		employee[1].setMailAddress("jtaka@hoge.jp");
+		employee[1].setPassword("bbb");
+		employee[1].setIdDepartment("10");
 		
-		//1-6
+		employee[2].setIdEmployee("10002");
-		BaseData[] employee = new EmployeeData[5];
+		employee[2].setNmEmployee("麻枝史明");
-		employee[0] = new EmployeeData("10000", "山田龍也", "ヤマダタツヤ", "yamada@hoge.jp", "aaa", "10");
+		employee[2].setKnEmployee("マエダフミアキ");
-		employee[1] = new EmployeeData("10001", "高橋準", "タカハシジュン", "Jtaka@hoge.jp", "bbb", "10");
+		employee[2].setMailAddress("fmak@hoge.jp");
-		employee[2] = new EmployeeData("10002", "麻枝史明", "マエダフミアキ", "fmak@hoge.jp", "ccc", "11");
+		employee[2].setPassword("ccc");
-		employee[3] = new EmployeeData("10003", "丸戸章介", "マルトショウスケ", "marusyo@hoge.jp", "ddd", "12");
+		employee[2].setIdDepartment("11");
-		employee[4] = new EmployeeData("10004", "三宅武", "ミヤケタケシ", "miya@hoge.jp", "eee", "13");
-		//1-5
-		//1-6
-		//2-5
-		//		System.out.println(emp1);
-		//		System.out.println(emp2);
-		//		System.out.println(emp3);
-		//		System.out.println(emp4);
-		//		System.out.println(emp5);
-		//			for (int i = 0; i < employee.length; i++) {
-		//				System.out.println(employee[i]);
-		//			}
-		//2-7
-		//		System.out.println("現在の社員データ件数:" + EmployeeData.getEmpCount() + "件");
-		//					for (int i = 0; i < 5; i++) {
-		//						employee[i].showInfo();
-		//					}
-		//2-7
-		//2-5
-		//1-6
-		//1-5
 		
-		//1-7
+		employee[3].setIdEmployee("10003");
-		//3-5
+		employee[3].setNmEmployee("丸戸章介");
-		//		System.out.println(employee[2].getPrimaryKeyValue().equals("10002"));
+		employee[3].setKnEmployee("マルトショウスケ");
-		//		System.out.println(employee[2].getPrimaryKeyValue().equals("99999"));
+		employee[3].setMailAddress("marusyo@hoge.jp");
-		//3-5
+		employee[3].setPassword("ddd");
-		//1-7
+		employee[3].setIdDepartment("12");
 		
-		//1-8
+		employee[4].setIdEmployee("10004");
-		//			for (int i = 0; i < employee.length; i++) {
+		employee[4].setNmEmployee("三宅武");
-		//				if (num.equals(employee[i].getIdEmployee())) {
+		employee[4].setKnEmployee("ミヤケタケシ");
-		//					//2-6
+		employee[4].setMailAddress("miya@hoge.jp");
-		//					System.out.println(employee[i]);
+		employee[4].setPassword("eee");
-		//					//2-6
+		employee[4].setIdDepartment("13");
-		////					employee[i].showInfo();
+//		
-		//					found = true;
-		//					break;
-		//				} else if (num.equals("0")) {
-		//					System.out.println("システムを終了します");
-		//					return;
-		//				}
-		//			}
-		//			if (!found) {
-		//				System.out.println("該当する社員が見つかりませんでした");
-		//			}
-		//1-8 isMatchIdメソッドを使っていない
-		//		}
 		
-		//3-6
-		BaseData[] allData = new BaseData[11];
-		allData[0] = employee[0];
-		allData[1] = employee[1];
-		allData[2] = employee[2];
-		allData[3] = employee[3];
-		allData[4] = employee[4];
 		
-		DepartmentData dept = new DepartmentData("10", "役員");
+		for(int i=0;i<5;i++) {
-		allData[5] = dept;
+			System.out.println(employee[i]);
-		DepartmentData dept2 = new DepartmentData("11", "人事・総務部");
-		allData[6] = dept2;
-		DepartmentData dept3 = new DepartmentData("12", "経理部");
-		allData[7] = dept3;
-		DepartmentData dept4 = new DepartmentData("13", "システム開発事業部");
-		allData[8] = dept4;
-		DepartmentData dept5 = new DepartmentData("14", "教育事業部");
-		allData[9] = dept5;
-		DepartmentData dept6 = new DepartmentData("15", "営業企画部");
-		allData[10] = dept6;
-
-		for (int i = 0; i < 11; i++) {
-			System.out.println(allData[i]);
 		}
-		//3-6
 		
-		//3-7
-		int Cou = 0;
-		int Cou2 = 0;
-		for (int i = 0; i < 11; i++) {
-			if (allData[i] instanceof EmployeeData) {
-				Cou = Cou + 1;
-			} else if (allData[i] instanceof DepartmentData) {
-				Cou2 = Cou2 + 1;
-			}
-		}
-		System.out.println("社員データ：" + Cou + "件");
-		System.out.println("部署データ：" + Cou2 + "件");
-		//3-7
 		
-		//3-8
+		System.out.println("現在の社員データ数"+EmployeeData.getEmpCount());
-		for (int i = 0; i < 11; i++) {
+		
-			if (allData[i] instanceof EmployeeData) {
+		System.out.println(EmployeeData.COMPANY_NAME);
-				EmployeeData emp = (EmployeeData) allData[i];
+		
-				System.out.println(emp.getMailAddress());
+//		System.out.println();
-			}
+//		System.out.println(employee.nmEmployee);
-		}
+//		System.out.println(employee.knEmployee);
-		//3-8
+//		System.out.println(employee.mailAddress);
+//		System.out.println(employee.password);
+//		System.out.println(employee.idDepartment);
 		
-		//3-9
-		for (int i = 0; i < 11; i++) {
-			if (allData[i] instanceof DepartmentData) {
-				DepartmentData bd = (DepartmentData) allData[i];
-				if (bd.getNmDepartment().equals("システム開発事業部")) {
-					for (int j = 0; j < 11; j++) {
-						if (allData[j] instanceof EmployeeData) {
-							EmployeeData emp = (EmployeeData) allData[j];
-							if (bd.getIdDepartment().equals(emp.getIdDepartment())) {
-								System.out.println(emp.getNmEmployee() + "\t" + emp.getMailAddress());
-							}
-						}
 		
-					}
-				}
-			}
-		}
-		//3-9
 	}
+	
+	
+	
+	
+
 }

em-oop/src/Rectangle.java

@@ -1,16 +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/Shape.java

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

em-oop/src/Student.java

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