From c9f0f51fb9a00fe94d89b99c59592f06af890228 Mon Sep 17 00:00:00 2001 From: Miyeon Lee Date: Mon, 17 Apr 2023 21:53:10 +0900 Subject: [PATCH 1/5] Java Assignment3 upload by MiyeonLee --- Assignment3/.classpath | 10 ++ Assignment3/.gitignore | 1 + Assignment3/.project | 17 +++ .../org.eclipse.core.resources.prefs | 2 + .../.settings/org.eclipse.jdt.core.prefs | 14 +++ .../day05/practice/Practice01/AuthMethod.java | 3 + .../me/day05/practice/Practice01/Company.java | 3 + .../day05/practice/Practice01/Electronic.java | 91 ++++++++++++++ .../me/day05/practice/Practice01/User.java | 115 ++++++++++++++++++ .../me/day05/practice/Practice02/Users.java | 65 ++++++++++ .../practice/Practice03/Electronics.java | 88 ++++++++++++++ 11 files changed, 409 insertions(+) create mode 100644 Assignment3/.classpath create mode 100644 Assignment3/.gitignore create mode 100644 Assignment3/.project create mode 100644 Assignment3/.settings/org.eclipse.core.resources.prefs create mode 100644 Assignment3/.settings/org.eclipse.jdt.core.prefs create mode 100644 Assignment3/src/me/day05/practice/Practice01/AuthMethod.java create mode 100644 Assignment3/src/me/day05/practice/Practice01/Company.java create mode 100644 Assignment3/src/me/day05/practice/Practice01/Electronic.java create mode 100644 Assignment3/src/me/day05/practice/Practice01/User.java create mode 100644 Assignment3/src/me/day05/practice/Practice02/Users.java create mode 100644 Assignment3/src/me/day05/practice/Practice03/Electronics.java diff --git a/Assignment3/.classpath b/Assignment3/.classpath new file mode 100644 index 0000000..f029363 --- /dev/null +++ b/Assignment3/.classpath @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/Assignment3/.gitignore b/Assignment3/.gitignore new file mode 100644 index 0000000..ae3c172 --- /dev/null +++ b/Assignment3/.gitignore @@ -0,0 +1 @@ +/bin/ diff --git a/Assignment3/.project b/Assignment3/.project new file mode 100644 index 0000000..72f8601 --- /dev/null +++ b/Assignment3/.project @@ -0,0 +1,17 @@ + + + Assignment3 + + + + + + org.eclipse.jdt.core.javabuilder + + + + + + org.eclipse.jdt.core.javanature + + diff --git a/Assignment3/.settings/org.eclipse.core.resources.prefs b/Assignment3/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 0000000..1493deb --- /dev/null +++ b/Assignment3/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding/=x-windows-949 diff --git a/Assignment3/.settings/org.eclipse.jdt.core.prefs b/Assignment3/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 0000000..062ed70 --- /dev/null +++ b/Assignment3/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,14 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=19 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=19 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning +org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=19 diff --git a/Assignment3/src/me/day05/practice/Practice01/AuthMethod.java b/Assignment3/src/me/day05/practice/Practice01/AuthMethod.java new file mode 100644 index 0000000..7f3cc3c --- /dev/null +++ b/Assignment3/src/me/day05/practice/Practice01/AuthMethod.java @@ -0,0 +1,3 @@ +package me.day05.practice.Practice01; + +public enum AuthMethod { FINGERPRINT, PATTERN, PIN, FACE } //본인인증 방법 \ No newline at end of file diff --git a/Assignment3/src/me/day05/practice/Practice01/Company.java b/Assignment3/src/me/day05/practice/Practice01/Company.java new file mode 100644 index 0000000..f994059 --- /dev/null +++ b/Assignment3/src/me/day05/practice/Practice01/Company.java @@ -0,0 +1,3 @@ +package me.day05.practice.Practice01; + +public enum Company {SAMSUNG, LG, APPLE } //제조 회사명 \ No newline at end of file diff --git a/Assignment3/src/me/day05/practice/Practice01/Electronic.java b/Assignment3/src/me/day05/practice/Practice01/Electronic.java new file mode 100644 index 0000000..0ff0a8a --- /dev/null +++ b/Assignment3/src/me/day05/practice/Practice01/Electronic.java @@ -0,0 +1,91 @@ +package me.day05.practice.Practice01; + +import java.time.LocalDate; +import java.time.format.DateTimeFormatter; +import java.util.Arrays; +import java.util.Objects; + +public class Electronic { + private String productNo; //제품 일련번호 + private static int serialNum = 0; //제품 일련번호의 등록 순서 + private String modelName; //전자기기 모델명 + private Company companyName; //제조 회사명 + private String dateOfMade; //생산일자 + private AuthMethod[] authMethod; //본인인증 방법 + + //생성자 + public Electronic(){ + serialNum++; + productNo = LocalDate.now().format(DateTimeFormatter.ofPattern("yyMMdd")) + String.format("%04d",serialNum); + } + + public Electronic(String modelName, Company companyName, String dateOfMade, AuthMethod[] authMethod) { + serialNum++; + this.productNo = LocalDate.now().format(DateTimeFormatter.ofPattern("yyMMdd")) + String.format("%04d", serialNum); + this.modelName = modelName; + this.companyName = companyName; + this.dateOfMade = dateOfMade; + this.authMethod = authMethod; + + } + + @Override + public int hashCode() { + return Objects.hash(productNo, modelName, dateOfMade, companyName, authMethod); + } + + @Override + public boolean equals(Object obj) { + if (!(obj instanceof Electronic)) return false; + + Electronic electronic = (Electronic) obj; + return (this.productNo == electronic.productNo) || (this.modelName == electronic.modelName) + || (this.dateOfMade == electronic.dateOfMade) || (this.companyName == electronic.companyName) + || (this.authMethod.equals(electronic.authMethod)); + } + + @Override + public String toString() { + return "electronic{productNo:" + productNo + + ", modelName:" + modelName + + ", companyName:" + companyName + + ", dateOfMade:" + dateOfMade + + ", authMethod:" + Arrays.toString(authMethod) + "}"; + } + + //setter&getter + public String getProductNo() { + return productNo; + } + public void setProductNo(String productNo) { + this.productNo = productNo; + } + public String getModelName() { + return modelName; + } + public void setModelName(String modelName) { + this.modelName = modelName; + } + + public String getDateOfMade() { + return dateOfMade; + } + + public void setDateOfMade(String dateOfMade) { + this.dateOfMade = dateOfMade; + } + public void setCompanyName(Company companyName){ + this.companyName = companyName; + } + public Company getCompanyName(){ + return companyName; + } + + public AuthMethod[] getAuthMethod() { + return authMethod; + } + + public void setAuthMethod(AuthMethod[] authMethod) { + this.authMethod = authMethod; + } +} diff --git a/Assignment3/src/me/day05/practice/Practice01/User.java b/Assignment3/src/me/day05/practice/Practice01/User.java new file mode 100644 index 0000000..8349dfb --- /dev/null +++ b/Assignment3/src/me/day05/practice/Practice01/User.java @@ -0,0 +1,115 @@ +package me.day05.practice.Practice01; + +import java.time.LocalTime; +import java.util.Objects; + +public class User { + + private String userId; //회원 아이디 + private String userPassword; //회원 비밀번호 + private int userPhoneNumber; //회원 핸드폰번호 + private String userEmail; //회원 이메일 + private int userBirthDate; //회원 생년월일 + private String[] electronicDevices; //사용중인 전자 제품들 + public LocalTime registerTime; //회원 정보가 등록된 시스템 시간 + + //생성자 + public User(){ + registerTime = LocalTime.now(); //객체 생성시 시스템 시간으로 자동 설정됨 + } + + public User(String userId, String userPassword, int userPhoneNumber, String userEmail, int userBirthDate, + String[] electronicDevices) { + this.userId = userId; + this.userPassword = userPassword; + this.userPhoneNumber = userPhoneNumber; + this.userEmail = userEmail; + this.userBirthDate = userBirthDate; + this.electronicDevices = electronicDevices; + this.registerTime = LocalTime.now(); + } + + + @Override + public int hashCode() { + return Objects.hash(userId, userPassword, userPhoneNumber, userEmail, userBirthDate, electronicDevices, + registerTime); + } + + @Override + public boolean equals(Object obj) { + if (!(obj instanceof User)) + return false; + + User user = (User) obj; + return (this.userId == user.userId) || (this.userPassword == user.userPassword) + || (this.userPhoneNumber == user.userPhoneNumber) || (this.userEmail == user.userEmail) + || (this.userBirthDate == user.userBirthDate) || (this.electronicDevices == user.electronicDevices) + || (this.registerTime == user.registerTime); + } + + @Override + public String toString() { + return "User{userId:" + userId + + ", userPassword:" + userPassword + + ", userPhonNumber:" + userPhoneNumber + + ", userEmail:" + userEmail + + ", userBirthDat:" + userBirthDate + + ", electronicDevice:" + electronicDevices + + ", registerTime:" + registerTime + + "}"; + } + + //setter & getter + public String getUserId() { + return userId; + } + + public void setUserId(String userId) { + this.userId = userId; + } + + public String getUserPassword() { + return userPassword; + } + + public void setUserPassword(String userPassword) { + this.userPassword = userPassword; + } + + public int getUserPhoneNumber() { + return userPhoneNumber; + } + + public void setUserPhoneNumber(int userPhoneNumber) { + this.userPhoneNumber = userPhoneNumber; + } + + public String getUserEmail() { + return userEmail; + } + + public void setUserEmail(String userEmail) { + this.userEmail = userEmail; + } + + public int getUserBirthDate() { + return userBirthDate; + } + + public void setUserBirthDate(int userBirthDate) { + this.userBirthDate = userBirthDate; + } + + public String[] getElectronicDevices() { + return electronicDevices; + } + + public void setElectronicDevices(String[] electronicDevices) { + this.electronicDevices = electronicDevices; + } + + public LocalTime getTime() { + return this.registerTime; + } +} diff --git a/Assignment3/src/me/day05/practice/Practice02/Users.java b/Assignment3/src/me/day05/practice/Practice02/Users.java new file mode 100644 index 0000000..ee842b4 --- /dev/null +++ b/Assignment3/src/me/day05/practice/Practice02/Users.java @@ -0,0 +1,65 @@ +package me.day05.practice.Practice02; + +import me.day05.practice.Practice01.User; + +import java.util.Arrays; +import java.util.Objects; + +public class Users { + + User[] userList; //User 객체들을 모두 저장하는 배열 + + //1.Users 클래스의 객체를 싱글톤으로 생성하는 함수를 작성하시오. + private static Users instance; + + private Users() {} + + public static Users getInstance() { + if(instance == null) instance = new Users(); + + return instance; + } + + //2.회원 아이디 userId를 통해 인자로 주어진 회원번호에 해당하는 회원을 반환하는 함수를 작성하시오. + User findByUserId(String userId) { + for(User user : userList) { + if(user.getUserId().equals(userId)) + return user; + } + return null; + } + + //3.인자로 주어진 회원 정보를 깊은 복사 (deepCopy) 하는 함수를 작성하시오. + User copy(User user) { + User userCopy = new User(user.getUserId(), user.getUserPassword(), user.getUserPhoneNumber() + , user.getUserEmail(), user.getUserBirthDate(), user.getElectronicDevices()); + return userCopy; + } + + @Override + public int hashCode() { + return Objects.hash(userList); + } + + @Override + public boolean equals(Object obj) { + if(!(obj instanceof Users)) return false; + + Users list = (Users)obj; + return Arrays.equals(userList, list.userList); + } + + @Override + public String toString() { + return "{userList:" + Arrays.toString(userList) + "}"; + } + + //getter&setter + public User[] getUserList() { + return userList; + } + + public void setUserList(User[] userList) { + this.userList = userList; + } +} diff --git a/Assignment3/src/me/day05/practice/Practice03/Electronics.java b/Assignment3/src/me/day05/practice/Practice03/Electronics.java new file mode 100644 index 0000000..c49ef8f --- /dev/null +++ b/Assignment3/src/me/day05/practice/Practice03/Electronics.java @@ -0,0 +1,88 @@ +package me.day05.practice.Practice03; + +import me.day05.practice.Practice01.AuthMethod; +import me.day05.practice.Practice01.Company; +import me.day05.practice.Practice01.Electronic; + +import java.util.Arrays; +import java.util.Objects; + +public class Electronics { + + Electronic[] electronicList; //생성된 Electronic 객체들을 모두 저장 + + //1.Electronics 클래스의 객체를 싱글톤으로 생성하는 함수를 작성하시오. + private static Electronics instance; + + private Electronics() { + } + + private Electronics getInstance() { + if (!(instance == null)) return instance = new Electronics(); + return instance; + } + + //2.전자제품 일련번호 productNo를 통해 인자로 주어진 일련번호에 해당하는 전자제품을 반환하는 함수를 작성하시오. + public Electronic findByProductNo(String productNo) { + for (Electronic electronic : electronicList) { + if (electronic.getProductNo().equals(productNo)) + return electronic; + } + return null; + } + + //3.전자제품들 중 인자로 주어진 제조 회사를 찾아서 하나의 배열에 반환하는 함수를 작성하시오. + public Electronic[] groupByCompanyName(Company company) { + Electronic[] companyOfProduct = new Electronic[electronicList.length]; + + int j = 0; + for (int i = 0; i < electronicList.length; i++) { + if (electronicList[i].getCompanyName().equals(company)){ + companyOfProduct[j] = electronicList[i]; + j++; + } + } + return companyOfProduct; + } + + //4.전자제품들 중 인자로 주어진 인증 방법을 찾아서 하나의 배열에 반환하는 함수를 작성하시오. + public Electronic[] groupByAuthMethod(AuthMethod authMethod) { + Electronic[] authMethodOfProduct = new Electronic[electronicList.length]; + + int j = 0; + for (int i = 0; i < electronicList.length; i++) { + if (electronicList[i].getAuthMethod().equals(authMethod)){ + authMethodOfProduct[j] = electronicList[i]; + j++; + } + } + return authMethodOfProduct; + } + + @Override + public int hashCode() { + return Objects.hash(electronicList); + } + + @Override + public boolean equals(Object obj) { + if(!(obj instanceof Electronics)) return false; + + Electronics list = (Electronics) obj; + return Arrays.equals(this.electronicList, list.electronicList); + } + + @Override + public String toString() { + return "electronicList{" + Arrays.toString(electronicList) + "}"; + } + + //getter&setter + public Electronic[] getElectronicList() { + return electronicList; + } + + public void setElectronicList(Electronic[] electronicList) { + this.electronicList = electronicList; + } +} From cb76572f7c30fb93b4a197b72655d36c8ca6f865 Mon Sep 17 00:00:00 2001 From: Miyeon Lee Date: Mon, 17 Apr 2023 22:02:08 +0900 Subject: [PATCH 2/5] Java Assignment3 upload by MiyeonLee --- Assignment3/.settings/org.eclipse.core.resources.prefs | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 Assignment3/.settings/org.eclipse.core.resources.prefs diff --git a/Assignment3/.settings/org.eclipse.core.resources.prefs b/Assignment3/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 1493deb..0000000 --- a/Assignment3/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -encoding/=x-windows-949 From 614ff25a5a6684a804632fe6c3b609c47c22b451 Mon Sep 17 00:00:00 2001 From: Miyeon Lee Date: Tue, 18 Apr 2023 00:23:45 +0900 Subject: [PATCH 3/5] Java Assignment3 upload by MiyeonLee --- Assignment3/src/me/day05/practice/Practice01/AuthMethod.java | 2 +- Assignment3/src/me/day05/practice/Practice01/Company.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Assignment3/src/me/day05/practice/Practice01/AuthMethod.java b/Assignment3/src/me/day05/practice/Practice01/AuthMethod.java index 7f3cc3c..e8d95ae 100644 --- a/Assignment3/src/me/day05/practice/Practice01/AuthMethod.java +++ b/Assignment3/src/me/day05/practice/Practice01/AuthMethod.java @@ -1,3 +1,3 @@ package me.day05.practice.Practice01; -public enum AuthMethod { FINGERPRINT, PATTERN, PIN, FACE } //본인인증 방법 \ No newline at end of file +public enum AuthMethod { FINGERPRINT, PATTERN, PIN, FACE } \ No newline at end of file diff --git a/Assignment3/src/me/day05/practice/Practice01/Company.java b/Assignment3/src/me/day05/practice/Practice01/Company.java index f994059..f99c534 100644 --- a/Assignment3/src/me/day05/practice/Practice01/Company.java +++ b/Assignment3/src/me/day05/practice/Practice01/Company.java @@ -1,3 +1,3 @@ package me.day05.practice.Practice01; -public enum Company {SAMSUNG, LG, APPLE } //제조 회사명 \ No newline at end of file +public enum Company {SAMSUNG, LG, APPLE } \ No newline at end of file From 8ad6ae70612ace05676a10e61766843e870b764b Mon Sep 17 00:00:00 2001 From: Miyeon Lee Date: Tue, 18 Apr 2023 00:27:18 +0900 Subject: [PATCH 4/5] Java Assignment3 upload by MiyeonLee --- .../day05/practice/Practice01/Electronic.java | 18 +++++++-------- .../me/day05/practice/Practice01/User.java | 22 +++++++++---------- .../me/day05/practice/Practice02/Users.java | 6 +---- .../practice/Practice03/Electronics.java | 7 +----- 4 files changed, 22 insertions(+), 31 deletions(-) diff --git a/Assignment3/src/me/day05/practice/Practice01/Electronic.java b/Assignment3/src/me/day05/practice/Practice01/Electronic.java index 0ff0a8a..17e804a 100644 --- a/Assignment3/src/me/day05/practice/Practice01/Electronic.java +++ b/Assignment3/src/me/day05/practice/Practice01/Electronic.java @@ -6,14 +6,14 @@ import java.util.Objects; public class Electronic { - private String productNo; //제품 일련번호 - private static int serialNum = 0; //제품 일련번호의 등록 순서 - private String modelName; //전자기기 모델명 - private Company companyName; //제조 회사명 - private String dateOfMade; //생산일자 - private AuthMethod[] authMethod; //본인인증 방법 - - //생성자 + private String productNo; + private static int serialNum = 0; + private String modelName; + private Company companyName; + private String dateOfMade; + private AuthMethod[] authMethod; + + public Electronic(){ serialNum++; productNo = LocalDate.now().format(DateTimeFormatter.ofPattern("yyMMdd")) + String.format("%04d",serialNum); @@ -53,7 +53,7 @@ public String toString() { ", authMethod:" + Arrays.toString(authMethod) + "}"; } - //setter&getter + public String getProductNo() { return productNo; } diff --git a/Assignment3/src/me/day05/practice/Practice01/User.java b/Assignment3/src/me/day05/practice/Practice01/User.java index 8349dfb..ad06017 100644 --- a/Assignment3/src/me/day05/practice/Practice01/User.java +++ b/Assignment3/src/me/day05/practice/Practice01/User.java @@ -5,17 +5,17 @@ public class User { - private String userId; //회원 아이디 - private String userPassword; //회원 비밀번호 - private int userPhoneNumber; //회원 핸드폰번호 - private String userEmail; //회원 이메일 - private int userBirthDate; //회원 생년월일 - private String[] electronicDevices; //사용중인 전자 제품들 - public LocalTime registerTime; //회원 정보가 등록된 시스템 시간 - - //생성자 + private String userId; + private String userPassword; + private int userPhoneNumber; + private String userEmail; + private int userBirthDate; + private String[] electronicDevices; + public LocalTime registerTime; + + public User(){ - registerTime = LocalTime.now(); //객체 생성시 시스템 시간으로 자동 설정됨 + registerTime = LocalTime.now(); } public User(String userId, String userPassword, int userPhoneNumber, String userEmail, int userBirthDate, @@ -60,7 +60,7 @@ public String toString() { "}"; } - //setter & getter + public String getUserId() { return userId; } diff --git a/Assignment3/src/me/day05/practice/Practice02/Users.java b/Assignment3/src/me/day05/practice/Practice02/Users.java index ee842b4..83bb5e5 100644 --- a/Assignment3/src/me/day05/practice/Practice02/Users.java +++ b/Assignment3/src/me/day05/practice/Practice02/Users.java @@ -7,9 +7,8 @@ public class Users { - User[] userList; //User 객체들을 모두 저장하는 배열 + User[] userList; - //1.Users 클래스의 객체를 싱글톤으로 생성하는 함수를 작성하시오. private static Users instance; private Users() {} @@ -20,7 +19,6 @@ public static Users getInstance() { return instance; } - //2.회원 아이디 userId를 통해 인자로 주어진 회원번호에 해당하는 회원을 반환하는 함수를 작성하시오. User findByUserId(String userId) { for(User user : userList) { if(user.getUserId().equals(userId)) @@ -29,7 +27,6 @@ User findByUserId(String userId) { return null; } - //3.인자로 주어진 회원 정보를 깊은 복사 (deepCopy) 하는 함수를 작성하시오. User copy(User user) { User userCopy = new User(user.getUserId(), user.getUserPassword(), user.getUserPhoneNumber() , user.getUserEmail(), user.getUserBirthDate(), user.getElectronicDevices()); @@ -54,7 +51,6 @@ public String toString() { return "{userList:" + Arrays.toString(userList) + "}"; } - //getter&setter public User[] getUserList() { return userList; } diff --git a/Assignment3/src/me/day05/practice/Practice03/Electronics.java b/Assignment3/src/me/day05/practice/Practice03/Electronics.java index c49ef8f..ba46b83 100644 --- a/Assignment3/src/me/day05/practice/Practice03/Electronics.java +++ b/Assignment3/src/me/day05/practice/Practice03/Electronics.java @@ -9,9 +9,8 @@ public class Electronics { - Electronic[] electronicList; //생성된 Electronic 객체들을 모두 저장 + Electronic[] electronicList; - //1.Electronics 클래스의 객체를 싱글톤으로 생성하는 함수를 작성하시오. private static Electronics instance; private Electronics() { @@ -22,7 +21,6 @@ private Electronics getInstance() { return instance; } - //2.전자제품 일련번호 productNo를 통해 인자로 주어진 일련번호에 해당하는 전자제품을 반환하는 함수를 작성하시오. public Electronic findByProductNo(String productNo) { for (Electronic electronic : electronicList) { if (electronic.getProductNo().equals(productNo)) @@ -31,7 +29,6 @@ public Electronic findByProductNo(String productNo) { return null; } - //3.전자제품들 중 인자로 주어진 제조 회사를 찾아서 하나의 배열에 반환하는 함수를 작성하시오. public Electronic[] groupByCompanyName(Company company) { Electronic[] companyOfProduct = new Electronic[electronicList.length]; @@ -45,7 +42,6 @@ public Electronic[] groupByCompanyName(Company company) { return companyOfProduct; } - //4.전자제품들 중 인자로 주어진 인증 방법을 찾아서 하나의 배열에 반환하는 함수를 작성하시오. public Electronic[] groupByAuthMethod(AuthMethod authMethod) { Electronic[] authMethodOfProduct = new Electronic[electronicList.length]; @@ -77,7 +73,6 @@ public String toString() { return "electronicList{" + Arrays.toString(electronicList) + "}"; } - //getter&setter public Electronic[] getElectronicList() { return electronicList; } From 0a1f409c4748b1dadac86638ed9a9755e931e7f7 Mon Sep 17 00:00:00 2001 From: Miyeon Lee Date: Tue, 18 Apr 2023 00:45:38 +0900 Subject: [PATCH 5/5] Assignment3 --- Assignment3/src/me/day05/practice/Practice01/AuthMethod.java | 2 +- Assignment3/src/me/day05/practice/Practice01/Company.java | 2 +- Assignment3/src/me/day05/practice/Practice02/Users.java | 3 +-- Assignment3/src/me/day05/practice/Practice03/Electronics.java | 3 +-- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/Assignment3/src/me/day05/practice/Practice01/AuthMethod.java b/Assignment3/src/me/day05/practice/Practice01/AuthMethod.java index e8d95ae..60795fd 100644 --- a/Assignment3/src/me/day05/practice/Practice01/AuthMethod.java +++ b/Assignment3/src/me/day05/practice/Practice01/AuthMethod.java @@ -1,3 +1,3 @@ package me.day05.practice.Practice01; -public enum AuthMethod { FINGERPRINT, PATTERN, PIN, FACE } \ No newline at end of file +public enum AuthMethod { FINGERPRINT, PATTERN, PIN, FACE } //�젣�뭹 蹂몄씤�씤利� 諛⑸쾿 \ No newline at end of file diff --git a/Assignment3/src/me/day05/practice/Practice01/Company.java b/Assignment3/src/me/day05/practice/Practice01/Company.java index f99c534..ef496a3 100644 --- a/Assignment3/src/me/day05/practice/Practice01/Company.java +++ b/Assignment3/src/me/day05/practice/Practice01/Company.java @@ -1,3 +1,3 @@ package me.day05.practice.Practice01; -public enum Company {SAMSUNG, LG, APPLE } \ No newline at end of file +public enum Company {SAMSUNG, LG, APPLE } //�젣議� �쉶�궗紐� \ No newline at end of file diff --git a/Assignment3/src/me/day05/practice/Practice02/Users.java b/Assignment3/src/me/day05/practice/Practice02/Users.java index 83bb5e5..242a03d 100644 --- a/Assignment3/src/me/day05/practice/Practice02/Users.java +++ b/Assignment3/src/me/day05/practice/Practice02/Users.java @@ -7,8 +7,7 @@ public class Users { - User[] userList; - + private User[] userList; private static Users instance; private Users() {} diff --git a/Assignment3/src/me/day05/practice/Practice03/Electronics.java b/Assignment3/src/me/day05/practice/Practice03/Electronics.java index ba46b83..5807b7d 100644 --- a/Assignment3/src/me/day05/practice/Practice03/Electronics.java +++ b/Assignment3/src/me/day05/practice/Practice03/Electronics.java @@ -9,8 +9,7 @@ public class Electronics { - Electronic[] electronicList; - + private Electronic[] electronicList; private static Electronics instance; private Electronics() {