From b03085242560ef2e45704950a738381802346a75 Mon Sep 17 00:00:00 2001 From: DuckWichTrust <68964814+AmirhosseinAghighi@users.noreply.github.com> Date: Sat, 20 Apr 2024 17:33:05 +0330 Subject: [PATCH 1/4] refactor new contact variables name --- src/com/phone/Main.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/com/phone/Main.java b/src/com/phone/Main.java index d445bb8..6e09444 100644 --- a/src/com/phone/Main.java +++ b/src/com/phone/Main.java @@ -12,14 +12,14 @@ public static void main(String[] args) { Scanner reader = new Scanner(System.in); System.out.println("enter user name:"); - String custName = reader.nextLine().strip(); + String newContactName = reader.nextLine().strip(); System.out.println("enter user phone:"); - String custPhone = reader.nextLine().strip(); + String newContactPhone = reader.nextLine().strip(); System.out.println("enter user address:"); - String custAddr = reader.nextLine(); + String newContactAddr = reader.nextLine(); System.out.println("enter user age:"); - int custAge = Integer.parseInt(reader.nextLine().strip()); - boolean isAddedCust = phonebook.addContact(custName, custPhone, custAddr, custAge); + int newContactAge = Integer.parseInt(reader.nextLine().strip()); + boolean isAddedCust = phonebook.addContact(newContactName, newContactPhone, newContactAddr, newContactAge); From 427a21993eefccc76c889e22f507d4d886bbf077 Mon Sep 17 00:00:00 2001 From: DuckWichTrust <68964814+AmirhosseinAghighi@users.noreply.github.com> Date: Sat, 20 Apr 2024 17:36:18 +0330 Subject: [PATCH 2/4] removed unused variables --- src/com/phone/Main.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/com/phone/Main.java b/src/com/phone/Main.java index 6e09444..86b9e1d 100644 --- a/src/com/phone/Main.java +++ b/src/com/phone/Main.java @@ -19,7 +19,7 @@ public static void main(String[] args) { String newContactAddr = reader.nextLine(); System.out.println("enter user age:"); int newContactAge = Integer.parseInt(reader.nextLine().strip()); - boolean isAddedCust = phonebook.addContact(newContactName, newContactPhone, newContactAddr, newContactAge); + phonebook.addContact(newContactName, newContactPhone, newContactAddr, newContactAge); @@ -27,8 +27,8 @@ public static void main(String[] args) { - Contact mahdiCont = phonebook.getContact("mahdi"); - Contact montezaCont = phonebook.getContact("morteza"); + phonebook.getContact("mahdi"); + phonebook.getContact("morteza"); int avgAge = phonebook.getAvgAge(); System.out.println("average age of contacts is: " + avgAge); From 9c2942489da05f439ba4899b035689da68df87ae Mon Sep 17 00:00:00 2001 From: DuckWichTrust <68964814+AmirhosseinAghighi@users.noreply.github.com> Date: Sat, 20 Apr 2024 17:36:57 +0330 Subject: [PATCH 3/4] removed unused variables --- src/com/phone/Main.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/com/phone/Main.java b/src/com/phone/Main.java index 86b9e1d..a860b02 100644 --- a/src/com/phone/Main.java +++ b/src/com/phone/Main.java @@ -5,9 +5,9 @@ public class Main { public static void main(String[] args) { Phonebook phonebook = new Phonebook(); - boolean isAddedMahdi = phonebook.addContact("mahdi", "09011234567", "Tehran", 29); - boolean isAddedAmir = phonebook.addContact("amir", "09021234567", "Tabriz", 22); - boolean isAddedPouya = phonebook.addContact("pouya", "09031234567", "Mashhad", 38); + phonebook.addContact("mahdi", "09011234567", "Tehran", 29); + phonebook.addContact("amir", "09021234567", "Tabriz", 22); + phonebook.addContact("pouya", "09031234567", "Mashhad", 38); Scanner reader = new Scanner(System.in); From 2e3b372ff11c7aa701616bbb355297e720b106d1 Mon Sep 17 00:00:00 2001 From: DuckWichTrust <68964814+AmirhosseinAghighi@users.noreply.github.com> Date: Sat, 20 Apr 2024 17:58:27 +0330 Subject: [PATCH 4/4] refactor and cleaning code --- src/com/phone/Main.java | 2 ++ src/com/phone/Phonebook.java | 7 +++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/com/phone/Main.java b/src/com/phone/Main.java index a860b02..2ae7d70 100644 --- a/src/com/phone/Main.java +++ b/src/com/phone/Main.java @@ -2,6 +2,8 @@ import java.util.Scanner; +// amirhossein aghighi | 40231038 + public class Main { public static void main(String[] args) { Phonebook phonebook = new Phonebook(); diff --git a/src/com/phone/Phonebook.java b/src/com/phone/Phonebook.java index f229034..52c4751 100644 --- a/src/com/phone/Phonebook.java +++ b/src/com/phone/Phonebook.java @@ -6,7 +6,7 @@ import java.util.HashSet; public class Phonebook { - private HashMap contactHashMap; + final private HashMap contactHashMap; private int numberOfContacts; Phonebook(){ @@ -16,8 +16,7 @@ public class Phonebook { public boolean addContact(String name, String phoneNumber, String address,int age){ Contact newContact = new Contact(name, phoneNumber, address, age); - ArrayList contacts = new ArrayList<>(contactHashMap.values()); - if (contacts.contains(newContact) ){ + if (contactHashMap.containsValue(newContact)){ return false; } contactHashMap.put(name, newContact); @@ -41,7 +40,7 @@ public Contact getContact(String name){ public int getAvgAge(){ ArrayList contacts = new ArrayList<>(contactHashMap.values()); - double sum = 0.00001; + double sum = 0f; for(Contact el : contacts){ System.out.println(el); sum += el.getAge();