From 86c3056bf2639a9c0f76af19ed8f945b2d951030 Mon Sep 17 00:00:00 2001 From: "alec.schmidt" <alec.schmidt@etu.hesge.ch> Date: Tue, 15 Nov 2022 13:45:44 +0100 Subject: [PATCH] refactored ContactsController class name because tanguy said so --- hepia/Main.java | 12 +++++------- .../utils/{Contacts.java => ContactController.java} | 10 +++++----- hepia/utils/Famille.java | 1 - 3 files changed, 10 insertions(+), 13 deletions(-) rename hepia/utils/{Contacts.java => ContactController.java} (96%) diff --git a/hepia/Main.java b/hepia/Main.java index d483061..6f83e02 100644 --- a/hepia/Main.java +++ b/hepia/Main.java @@ -1,7 +1,7 @@ package hepia; import hepia.utils.Amis; -import hepia.utils.Contacts; +import hepia.utils.ContactController; import hepia.utils.Professionel; public class Main { @@ -9,7 +9,7 @@ public class Main { // Makeshift code as example - // New contact with random values + // New contact "Amis" with random values Amis test = new Amis(); test.setName("Contact1"); test.addFirstName("Prenom1"); @@ -18,17 +18,15 @@ public class Main { test.addMail("test1@address.com"); test.addSocial("MrContact"); test.addPhone("0227865425"); - //test.setJob("Ingénieur Informaticien"); // Let's add the contact to our phone book - Contacts contacts = new Contacts(); + ContactController contacts = new ContactController(); contacts.append(test); // Was it correctly added ? contacts.printContacts(); - // Alright - // let's add another + // let's add another contact, but this time a "Professionnel" Professionel test2 = new Professionel(); test2.setName("Contact2"); test2.addFirstName("Prenom1"); @@ -55,7 +53,7 @@ public class Main { // contacts.printContacts(); // Search a contact based on a string. The method will scan every possible entry and returns a list of contacts containing the string. - Contacts search = contacts.search("Prenom1"); + ContactController search = contacts.search("Prenom1"); search.printContacts(); } } diff --git a/hepia/utils/Contacts.java b/hepia/utils/ContactController.java similarity index 96% rename from hepia/utils/Contacts.java rename to hepia/utils/ContactController.java index 8457aec..d276114 100644 --- a/hepia/utils/Contacts.java +++ b/hepia/utils/ContactController.java @@ -1,13 +1,13 @@ package hepia.utils; import java.util.Scanner; -public class Contacts { +public class ContactController { private Contact[] contacts; - public Contacts() { + public ContactController() { this.contacts = new Contact[0]; } - public Contacts(int size) { + public ContactController(int size) { this.contacts = new Contact[size]; } @@ -145,9 +145,9 @@ public class Contacts { System.out.println("***END***\n"); } - public Contacts search(String s) + public ContactController search(String s) { - Contacts result = new Contacts(); + ContactController result = new ContactController(); for (Contact contact : this.contacts) { if (contact instanceof Professionel) diff --git a/hepia/utils/Famille.java b/hepia/utils/Famille.java index b280211..ebcd0e2 100644 --- a/hepia/utils/Famille.java +++ b/hepia/utils/Famille.java @@ -16,7 +16,6 @@ public class Famille extends Contact{ this.relation = "Uninitialized"; } - public String toString() { return "=====================================\n" + "Name : " + this.getName() + "\n" + -- GitLab