X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=Addressbook%2Fsrc%2Forg%2Fmxchange%2Faddressbook%2Fclient%2Fconsole%2FConsoleClient.java;h=176418b4f38849891d7cf7936bf4a40a467dff13;hb=fed8835173cbf96fceec08639f4a20d890fec23c;hp=f376ece22cbf3fce24fd915a9acde7d2998466fc;hpb=16289838616dbf25d96a20f82164415d40181e46;p=jaddressbook-lib.git

diff --git a/Addressbook/src/org/mxchange/addressbook/client/console/ConsoleClient.java b/Addressbook/src/org/mxchange/addressbook/client/console/ConsoleClient.java
index f376ece2..176418b4 100644
--- a/Addressbook/src/org/mxchange/addressbook/client/console/ConsoleClient.java
+++ b/Addressbook/src/org/mxchange/addressbook/client/console/ConsoleClient.java
@@ -16,24 +16,26 @@
  */
 package org.mxchange.addressbook.client.console;
 
+import java.sql.SQLException;
 import java.text.MessageFormat;
 import java.util.Arrays;
 import java.util.Scanner;
 import org.mxchange.addressbook.application.AddressbookApplication;
 import org.mxchange.addressbook.client.AddressbookClient;
 import org.mxchange.addressbook.client.BaseAddressbookClient;
-import org.mxchange.addressbook.contact.Contact;
-import org.mxchange.addressbook.contact.Gender;
 import org.mxchange.addressbook.contact.user.UserContact;
 import org.mxchange.addressbook.exceptions.ContactAlreadyAddedException;
-import org.mxchange.addressbook.manager.contact.ManageableContact;
+import org.mxchange.addressbook.manager.contact.ManageableAddressbookContact;
 import org.mxchange.addressbook.menu.Menu;
 import org.mxchange.addressbook.menu.MenuTools;
 import org.mxchange.addressbook.menu.console.ConsoleMenu;
 import org.mxchange.addressbook.menu.item.SelectableMenuItem;
 import org.mxchange.addressbook.menu.item.console.ConsoleMenuItem;
 import org.mxchange.jcore.application.Application;
+import org.mxchange.jcore.contact.Contact;
+import org.mxchange.jcore.contact.Gender;
 import org.mxchange.jcore.exceptions.UnhandledUserChoiceException;
+import org.mxchange.jcore.exceptions.UnsupportedDatabaseBackendException;
 
 /**
  * A client for the console
@@ -166,13 +168,13 @@ public class ConsoleClient extends BaseAddressbookClient implements AddressbookC
 		}
 
 		// Get manager and cast it
-		ManageableContact manager = (ManageableContact) this.getManager();
+		ManageableAddressbookContact manager = (ManageableAddressbookContact) this.getManager();
 
-		// Own address data
-		String street = manager.enterOwnStreet();
+		// Own street and number
+		String streetNumber = manager.enterOwnStreet();
 
 		// Get zip code
-		int zipCode = manager.enterOwnZipCode();
+		Long zipCode = (long) manager.enterOwnZipCode();
 
 		// Get city name
 		String city = manager.enterOwnCity();
@@ -181,7 +183,10 @@ public class ConsoleClient extends BaseAddressbookClient implements AddressbookC
 		String countryCode = manager.enterOwnCountryCode();
 
 		// Update address data
-		contact.updateAddressData(street, zipCode, city, countryCode);
+		contact.setStreet(streetNumber);
+		contact.setZipCode(zipCode);
+		contact.setCity(city);
+		contact.setCountryCode(countryCode);
 
 		// Trace message
 		this.getLogger().trace("EXIT!"); //NOI18N
@@ -205,7 +210,7 @@ public class ConsoleClient extends BaseAddressbookClient implements AddressbookC
 		}
 
 		// Get manager and cast it
-		ManageableContact manager = (ManageableContact) this.getManager();
+		ManageableAddressbookContact manager = (ManageableAddressbookContact) this.getManager();
 
 		// Gender:
 		Gender gender = manager.enterOwnGender();
@@ -220,7 +225,10 @@ public class ConsoleClient extends BaseAddressbookClient implements AddressbookC
 		String companyName = manager.enterOwnCompanyName();
 
 		// Update contact instance
-		contact.updateNameData(gender, surname, familyName, companyName);
+		contact.setGender(gender);
+		contact.setSurname(surname);
+		contact.setFamilyName(familyName);
+		contact.setCompanyName(companyName);
 
 		// Trace message
 		this.getLogger().trace("EXIT!"); //NOI18N
@@ -244,13 +252,13 @@ public class ConsoleClient extends BaseAddressbookClient implements AddressbookC
 		}
 
 		// Get manager and cast it
-		ManageableContact manager = (ManageableContact) this.getManager();
+		ManageableAddressbookContact manager = (ManageableAddressbookContact) this.getManager();
 
 		// Phone number
 		String phoneNumber = manager.enterOwnPhoneNumber();
 
 		// Phone number
-		String cellNumber = manager.enterOwnCellNumber();
+		String cellphonePhoneNumber = manager.enterOwnCellNumber();
 
 		// Fax number
 		String faxNumber = manager.enterOwnFaxNumber();
@@ -262,7 +270,11 @@ public class ConsoleClient extends BaseAddressbookClient implements AddressbookC
 		String comment = manager.enterOwnComment();
 
 		// Update contact instance
-		contact.updateOtherData(phoneNumber, cellNumber, faxNumber, email, null, comment);
+		contact.setPhoneNumber(phoneNumber);
+		contact.setCellphoneNumber(cellphonePhoneNumber);
+		contact.setFaxNumber(faxNumber);
+		contact.setEmailAddress(email);
+		contact.setComment(comment);
 
 		// Trace message
 		this.getLogger().trace("EXIT!"); //NOI18N
@@ -274,7 +286,7 @@ public class ConsoleClient extends BaseAddressbookClient implements AddressbookC
 		this.getLogger().trace("CALLED!"); //NOI18N
 
 		// Get manager and cast it
-		ManageableContact manager = (ManageableContact) this.getManager();
+		ManageableAddressbookContact manager = (ManageableAddressbookContact) this.getManager();
 
 		// First ask for gender
 		Gender gender = manager.enterOwnGender();
@@ -327,7 +339,7 @@ public class ConsoleClient extends BaseAddressbookClient implements AddressbookC
 		char choice = this.enterChar(accessKeys, "Bitte Auswahl eingeben (0=Programm beenden): ");
 
 		// Get manager and cast it
-		ManageableContact manager = (ManageableContact) this.getManager();
+		ManageableAddressbookContact manager = (ManageableAddressbookContact) this.getManager();
 
 		// @TODO Rewrite this ugly switch() block
 		switch (choice) {
@@ -538,7 +550,7 @@ public class ConsoleClient extends BaseAddressbookClient implements AddressbookC
 	}
 
 	/**
-	 * Inizializes this client
+	 * Initializes this client
 	 */
 	@Override
 	public void init () {
@@ -546,7 +558,12 @@ public class ConsoleClient extends BaseAddressbookClient implements AddressbookC
 		this.getLogger().trace("CALLED!"); //NOI18N
 
 		// Init contact manager here
-		this.initContactManager();
+		try {
+			this.initContactManager();
+		} catch (final UnsupportedDatabaseBackendException | SQLException ex) {
+			// End here
+			this.abortProgramWithException(ex);
+		}
 
 		// Fill menu map
 		this.fillMenuMap();
@@ -612,7 +629,7 @@ public class ConsoleClient extends BaseAddressbookClient implements AddressbookC
 		char choice = this.enterChar(new char[] {'n', 'a', 'o', 'x'}, "Welchen Daten möchten Sie ändern? (n=Namensdaten, a=Anschriftsdaten, o=Andere, x=Zurück zur Hauptauswahl) ");
 
 		// Get manager and cast it
-		ManageableContact manager = (ManageableContact) this.getManager();
+		ManageableAddressbookContact manager = (ManageableAddressbookContact) this.getManager();
 
 		// @TODO Get rid of this ugly switch block, too
 		switch (choice) {
@@ -705,6 +722,7 @@ public class ConsoleClient extends BaseAddressbookClient implements AddressbookC
 	/**
 	 * Fills menu map with menu entries
 	 */
+	@Override
 	protected final void fillMenuMap () {
 		// Trace message
 		this.getLogger().trace("CALLED!"); //NOI18N