From 3ba7f38d49f517b3e792c2375caf8880bba62c5e Mon Sep 17 00:00:00 2001
From: "zabiulla.ahmadi" <zabiullah.ahmadi@etu.hesge.ch>
Date: Tue, 1 Nov 2022 10:19:45 +0100
Subject: [PATCH] child class added, removed static notions
---
src/Contacts/family.java | 5 +++++
src/Contacts/friends.java | 8 ++++++++
src/Contacts/professional.java | 5 +++++
src/Helper/Helper.java | 32 ++++++++++++++++----------------
4 files changed, 34 insertions(+), 16 deletions(-)
create mode 100644 src/Contacts/family.java
create mode 100644 src/Contacts/friends.java
create mode 100644 src/Contacts/professional.java
diff --git a/src/Contacts/family.java b/src/Contacts/family.java
new file mode 100644
index 0000000..f0517e2
--- /dev/null
+++ b/src/Contacts/family.java
@@ -0,0 +1,5 @@
+package Contacts;
+
+public class family extends Contacts {
+
+}
diff --git a/src/Contacts/friends.java b/src/Contacts/friends.java
new file mode 100644
index 0000000..235cc0e
--- /dev/null
+++ b/src/Contacts/friends.java
@@ -0,0 +1,8 @@
+package Contacts;
+
+public class friends extends Contacts {
+
+ public friends() {
+ super();
+ }
+}
diff --git a/src/Contacts/professional.java b/src/Contacts/professional.java
new file mode 100644
index 0000000..f19de00
--- /dev/null
+++ b/src/Contacts/professional.java
@@ -0,0 +1,5 @@
+package Contacts;
+
+public class professional extends Contacts {
+
+}
diff --git a/src/Helper/Helper.java b/src/Helper/Helper.java
index 8b88238..308bf01 100644
--- a/src/Helper/Helper.java
+++ b/src/Helper/Helper.java
@@ -168,8 +168,8 @@ public class Helper extends Config {
Scanner scanner = new Scanner(System.in);
if (option == ASK_USER_INPUT) {
- Helper.PrintHeader();
- Helper.PrintInColor("Enter your option : ", WHITE);
+ PrintHeader();
+ PrintInColor("Enter your option : ", WHITE);
option = scanner.nextInt();
@@ -191,10 +191,10 @@ public class Helper extends Config {
if (option == SHOW_CONTACTS) {
- Helper.showContacts(contacts.getContacts());
- Helper.printFooter();
+ showContacts(contacts.getContacts());
+ printFooter();
- Helper.PrintInColor("Enter your option : ", WHITE);
+ PrintInColor("Enter your option : ", WHITE);
option = scanner.nextInt();
option = populateErrorOrReturnHome(option);
continue;
@@ -203,7 +203,7 @@ public class Helper extends Config {
// update contact
if (option == UPDATE_CONTACTS) {
- Helper.showContacts(contacts.getContacts());
+ showContacts(contacts.getContacts());
if (contacts.getContacts() != null) {
@@ -217,14 +217,14 @@ public class Helper extends Config {
} else {
System.out.println(String.format(
" Contact with id %d doesn't exists", id));
- Helper.PrintErrorAndReturn();
+ PrintErrorAndReturn();
option = scanner.nextInt();
option = populateErrorOrReturnHome(option);
}
} else {
- Helper.showContacts(contacts.getContacts());
- Helper.printFooter();
+ showContacts(contacts.getContacts());
+ printFooter();
option = scanner.nextInt();
option = populateErrorOrReturnHome(option);
}
@@ -232,10 +232,10 @@ public class Helper extends Config {
}
// delete contact
if (option == DELETE_CONTACT) {
- Helper.showContacts(contacts.getContacts());
+ showContacts(contacts.getContacts());
if (contacts.getContacts() != null) {
- Helper.deleteOption();
+ deleteOption();
System.out.print("Enter contact id to delete: ");
int id = scanner.nextInt();
@@ -246,13 +246,13 @@ public class Helper extends Config {
} else {
System.out.println(String.format(
" Contact with id %d doesn't exists", id));
- Helper.PrintErrorAndReturn();
+ PrintErrorAndReturn();
option = scanner.nextInt();
option = populateErrorOrReturnHome(option);
}
} else {
- Helper.printFooter();
+ printFooter();
option = scanner.nextInt();
option = populateErrorOrReturnHome(option);
}
@@ -263,13 +263,13 @@ public class Helper extends Config {
if (option < 1 || option > 4) {
- Helper.clearConsoleScreen();
- Helper.PrintErrorAndReturn();
+ clearConsoleScreen();
+ PrintErrorAndReturn();
option = scanner.nextInt();
option = populateErrorOrReturnHome(option);
}
-
+ scanner.close();// close scanner
}
}
--
GitLab