]> git.mxchange.org Git - addressbook-swing.git/commitdiff
updated jars
authorRoland Haeder <roland@mxchange.org>
Tue, 6 Oct 2015 12:10:44 +0000 (14:10 +0200)
committerRoland Haeder <roland@mxchange.org>
Tue, 6 Oct 2015 12:10:44 +0000 (14:10 +0200)
Signed-off-by:Roland Häder <roland@mxchange.org>

lib/jcontacts-core.jar
src/org/mxchange/addressbook/client/console/ConsoleClient.java

index 116c3511fbfe8d060114a5877f2f106b1b8c157b..5fd68dc8f80098600ff320c77eef156f7e79d9d2 100644 (file)
Binary files a/lib/jcontacts-core.jar and b/lib/jcontacts-core.jar differ
index f8cad4b2fce430d437638ec4b273d0bebd2d943b..d2c31ebba25a2aa73efedfc29883e5e46a41b515 100644 (file)
@@ -102,18 +102,8 @@ public class ConsoleClient extends BaseAddressbookClient implements AddressbookC
                // Get translated gender as the user may want to see "Mr.", "Mrs."
                String gender = GenderUtils.getTranslatedGender(contact);
 
-               // Get company name
-               String companyName = contact.getCompanyName();
-
-               // If it is empty/null, then assume private contact
-               if ((null == companyName) || (companyName.isEmpty())) {
-                       // Now put all together: gender, surname, family name
-                       // TODO Use mask
-                       this.outputMessage(MessageFormat.format("Anrede, Vorname, Name: {0} {1} {2}", gender, contact.getFirstName(), contact.getFamilyName()));
-               } else {
-                       // Company contact
-                       this.outputMessage(MessageFormat.format("Firma: {0}\nAnsprechpartner: {1} {2} {3}", companyName, gender, contact.getFirstName(), contact.getFamilyName()));
-               }
+               // Now put all together: gender, surname, family name
+               this.outputMessage(MessageFormat.format("Anrede, Vorname, Name: {0} {1} {2}", gender, contact.getFirstName(), contact.getFamilyName()));
 
                // Trace message
                this.getLogger().logTrace("EXIT!"); //NOI18N
@@ -208,14 +198,10 @@ public class ConsoleClient extends BaseAddressbookClient implements AddressbookC
                // Family name
                String familyName = manager.enterOwnFamilyName();
 
-               // And company
-               String companyName = manager.enterOwnCompanyName();
-
                // Update contact instance
                contact.setGender(gender);
                contact.setFirstName(firstName);
                contact.setFamilyName(familyName);
-               contact.setCompanyName(companyName);
 
                // Trace message
                this.getLogger().logTrace("EXIT!"); //NOI18N
@@ -284,11 +270,8 @@ public class ConsoleClient extends BaseAddressbookClient implements AddressbookC
                // And 3rd for family name
                String familyName = manager.enterOwnFamilyName();
 
-               // Company name ...
-               String companyName = manager.enterOwnCompanyName();
-
                // Construct UserContact instance
-               Contact contact = new UserContact(gender, firstName, familyName, companyName);
+               Contact contact = new UserContact(gender, firstName, familyName);
 
                // Trace message
                this.getLogger().logTrace(MessageFormat.format("contact={0} - EXIT!", contact)); //NOI18N