X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=Addressbook%2Fsrc%2Forg%2Fmxchange%2Faddressbook%2Fmanager%2Fcontact%2FContactManager.java;h=327069093a61a362cf94ca26676344a15daf2cea;hb=15bc8210e431a80105f59143aed37cd285214260;hp=0b4b47b11cd42a5441c6fe2b4e31033edfa80dfe;hpb=a754609aa28461bbd8c95337a5260e1ebc5629df;p=addressbook-swing.git

diff --git a/Addressbook/src/org/mxchange/addressbook/manager/contact/ContactManager.java b/Addressbook/src/org/mxchange/addressbook/manager/contact/ContactManager.java
index 0b4b47b..3270690 100644
--- a/Addressbook/src/org/mxchange/addressbook/manager/contact/ContactManager.java
+++ b/Addressbook/src/org/mxchange/addressbook/manager/contact/ContactManager.java
@@ -89,6 +89,56 @@ public class ContactManager extends BaseManager implements ManageableContact {
 	throw new UnsupportedOperationException("Not supported yet.");
     }
 
+    /**
+     * Let the user change other address
+     */
+    @Override
+    public void changeOtherAddress () {
+	throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    /**
+     * Allows the user to change his/her own data
+     */
+    @Override
+    public void changeOwnData () {
+	/*
+	 * First check if the user has registered own contact, before that
+	 * nothing can be changed.
+	 */
+	if (!this.isOwnContactAdded()) {
+	    // Not added
+	    this.getClient().outputMessage("Sie haben noch nicht Ihre Daten eingegeben.");
+	    
+	    // Skip any below code
+	    return;
+	}
+	
+	// Instance
+	Contact contact = this.getOwnContact();
+	
+	// It must be found
+	assert(contact instanceof Contact);
+	
+	// Display contact
+	contact.show(this.getClient());
+	
+	try {
+	    // Ask user what to change
+	    this.getClient().userChooseChangeContactData(contact);
+	} catch (final UnhandledUserChoiceException ex) {
+	    this.getLogger().catching(ex);
+	}
+    }
+
+    /**
+     * Let the user delete other address
+     */
+    @Override
+    public void deleteOtherAddress () {
+	throw new UnsupportedOperationException("Not supported yet.");
+    }
+
     /**
      * Let the user change address data
      * 
@@ -96,7 +146,7 @@ public class ContactManager extends BaseManager implements ManageableContact {
      * @param client Client instance to call back
      */
     @Override
-    public void changeAddressData (final Contact contact, final Client client) {
+    public void doChangeAddressData (final Contact contact, final Client client) {
 	// First display it again
 	client.displayAddressBox(contact);
 
@@ -129,7 +179,7 @@ public class ContactManager extends BaseManager implements ManageableContact {
      * @param client Client instance to call back
      */
     @Override
-    public void changeNameData (final Contact contact, final Client client) {
+    public void doChangeNameData (final Contact contact, final Client client) {
 	// First display them again
 	client.displayNameBox(contact);
 
@@ -156,14 +206,6 @@ public class ContactManager extends BaseManager implements ManageableContact {
 	}
     }
 
-    /**
-     * Let the user change other address
-     */
-    @Override
-    public void changeOtherAddress () {
-	throw new UnsupportedOperationException("Not supported yet.");
-    }
-
     /**
      * Let the user change other data
      *
@@ -171,49 +213,7 @@ public class ContactManager extends BaseManager implements ManageableContact {
      * @param client Client instance to call back
      */
     @Override
-    public void changeOtherData (final Contact contact, final Client client) {
-	throw new UnsupportedOperationException("Not supported yet.");
-    }
-
-    /**
-     * Allows the user to change his/her own data
-     */
-    @Override
-    public void changeOwnData () {
-	/*
-	 * First check if the user has registered own contact, before that 
-	 * nothing can be changed.
-	 */
-	if (!this.isOwnContactAdded()) {
-	    // Not added
-	    this.getClient().outputMessage("Sie haben noch nicht Ihre Daten eingegeben.");
-
-	    // Skip any below code
-	    return;
-	}
-
-	// Instance
-	Contact contact = this.getOwnContact();
-
-	// It must be found
-	assert(contact instanceof Contact);
-
-	// Display contact
-	contact.show(this.getClient());
-
-	try {
-	    // Ask user what to change
-	    this.getClient().doUserChangeAdressChoice(contact);
-	} catch (final UnhandledUserChoiceException ex) {
-	    this.getLogger().catching(ex);
-	}
-    }
-
-    /**
-     * Let the user delete other address
-     */
-    @Override
-    public void deleteOtherAddress () {
+    public void doChangeOtherData (final Contact contact, final Client client) {
 	throw new UnsupportedOperationException("Not supported yet.");
     }
 
@@ -221,7 +221,7 @@ public class ContactManager extends BaseManager implements ManageableContact {
      * Asks user for own data
      */
     @Override
-    public void enterOwnData () {
+    public void doEnterOwnData () {
 	// First ask for gender
 	char gender = this.enterOwnGender();
 
@@ -277,7 +277,7 @@ public class ContactManager extends BaseManager implements ManageableContact {
      * @return User's own country code
      */
     private String enterOwnCountryCode () {
-	return this.getClient().enterString(2, 2, "Bitte geben Sie den zweistelligen Ländercode von Ihrem Land ein: ", false);
+	return this.getClient().enterString(2, 2, "Bitte geben Sie den zweistelligen Ländercode von Ihrem Land ein: ", false).toUpperCase();
     }
 
     /**