From 73867e6ac8c87f853290680793bf889dffe7e450 Mon Sep 17 00:00:00 2001 From: "jonas.stirnema" <jonas.stirnemann@etu.hesge.ch> Date: Tue, 18 Oct 2022 10:28:57 +0200 Subject: [PATCH] Added show ers --- src/Contact.java | 86 ++++++++++++++++++++++++++++++++---------------- src/Main.java | 16 +++++---- 2 files changed, 68 insertions(+), 34 deletions(-) diff --git a/src/Contact.java b/src/Contact.java index af5348a..6fb6c10 100644 --- a/src/Contact.java +++ b/src/Contact.java @@ -1,32 +1,36 @@ +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; public class Contact { // Attributes private String fname; - private DynArray names; + private List<String> names; private String address; - private DynArray phoneNumbers; - private DynArray emails; - private DynArray socials; + private List<String> phoneNumbers; + private List<String> emails; + private List<String> socials; private String job; // CONSTRUCTORS public Contact() { setFname(new String("")); - setNames(new DynArray(new String[] { "" })); + setNames(Arrays.asList("")); setAddress(new String("")); - setPhoneNumbers(new DynArray(new String[] { "" })); - setEmails(new DynArray(new String[] { "" })); - setSocials(new DynArray(new String[] { "" })); + setPhoneNumbers(Arrays.asList("")); + setEmails(Arrays.asList("")); + setSocials(Arrays.asList("")); setJob(new String("")); } - public Contact(String name, DynArray names, String address, DynArray phone, DynArray email, DynArray socials, + public Contact(String name, List<String> names, String address, List<String> phones, List<String> emails, + List<String> socials, String job) { setFname(name); setNames(names); setAddress(address); - setPhoneNumbers(phone); + setPhoneNumbers(phones); setEmails(emails); setSocials(socials); setJob(job); @@ -45,15 +49,15 @@ public class Contact { } } - public DynArray getNames() { + public List<String> getNames() { return names; } - public void setNames(DynArray names) { - if (!names.isEmpty()) { + public void setNames(List<String> names) { + if (!names.isEmpty() || (names.contains("") && (names.size() == 1))) { this.names = names; } else { - this.names = new DynArray(new String[] { "Anon" }); + this.names = new ArrayList<String>(Arrays.asList("Anon")); } } @@ -69,35 +73,35 @@ public class Contact { } } - public DynArray getPhoneNumbers() { + public List<String> getPhoneNumbers() { return phoneNumbers; } - public void setPhoneNumbers(DynArray phoneNumbers) { - if (!phoneNumbers.isEmpty()) { - this.phoneNumbers = new DynArray(new String[] { "0102030405" }); + public void setPhoneNumbers(List<String> phoneNumbers) { + if (!phoneNumbers.isEmpty() || (phoneNumbers.contains("") && (phoneNumbers.size() == 1))) { + this.phoneNumbers = new ArrayList<String>(Arrays.asList("0102030405")); } } - public DynArray getEmails() { + public List<String> getEmails() { return emails; } - public void setEmails(DynArray emails) { + public void setEmails(List<String> emails) { if (!emails.isEmpty()) { - this.emails = new DynArray(new String[] { "none@none.com" }); + this.emails = new ArrayList<String>(Arrays.asList("none@none.com")); } } - public DynArray getSocials() { + public List<String> getSocials() { return socials; } - public void setSocials(DynArray socials) { + public void setSocials(List<String> socials) { if (!socials.isEmpty()) { this.socials = socials; } else { - this.socials = new DynArray(new String[] { "@anon" }); + this.socials = new ArrayList<String>(Arrays.asList("none@none.com")); } } @@ -115,16 +119,42 @@ public class Contact { // SHOW-ERS public void showFname() { - System.out.println("Family name: " + this.fname); + System.out.println("Last name : " + this.fname); } public void showNames() { - System.out.print("Names: "); - this.names.show_it(); + System.out.print("First names: "); + System.out.println(Arrays.toString(this.names.toArray())); } public void showAddress() { - System.out.println("Family name: " + this.fname); + System.out.println("Address : " + this.address); + } + + public void showPhoneNumbers() { + System.out.println("Numbers : " + Arrays.toString(this.phoneNumbers.toArray())); + } + + public void showEmails() { + System.out.println("Emails : " + Arrays.toString(this.emails.toArray())); + } + + public void showSocials() { + System.out.println("Socials : " + Arrays.toString(this.socials.toArray())); + } + + public void showJob() { + System.out.println("Job : " + this.job); + } + + public void show() { + showFname(); + showNames(); + showAddress(); + showPhoneNumbers(); + showEmails(); + showSocials(); + showJob(); } } diff --git a/src/Main.java b/src/Main.java index eb4a088..c2b78f5 100644 --- a/src/Main.java +++ b/src/Main.java @@ -1,11 +1,15 @@ +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + public class Main { public static void main(String[] args) { - DynArray ar1 = new DynArray(new String[] { "Test", "Test2", "Test3" }); - ar1.show_it(); - ar1.append(new String[] { "Test4", "Test5", "Test6" }); - ar1.show_it(); - ar1.pop(); - ar1.show_it(); + Contact c1 = new Contact("Stirnemann", Arrays.asList("Jonas", "Isaac"), "45 rue Abraham", Arrays.asList(""), + Arrays.asList(""), + Arrays.asList("@Jonas", "@TPO"), + "Eboueur"); + + c1.show(); } } -- GitLab