Added support for all current columns for reading from database file

Signed-off-by:Roland Häder <roland@mxchange.org>

diff --git a/Addressbook/src/org/mxchange/addressbook/contact/BaseContact.java b/Addressbook/src/org/mxchange/addressbook/contact/BaseContact.java
index bb7df122135e5c84138beab8a8cb81e1d3ecc487..2a1ecb73ffd0bbf9d1f3605b063a71355379bf39 100644 (file)
--- a/Addressbook/src/org/mxchange/addressbook/contact/BaseContact.java
+++ b/Addressbook/src/org/mxchange/addressbook/contact/BaseContact.java
@@ -107,7 +107,7 @@ public class BaseContact extends BaseFrameworkSystem {
     /**\r
      * ZIP code\r
      */\r
-    private int zipCode;\r
+    private long zipCode;\r
 \r
     /**\r
      * No instances can be created of this class\r
@@ -461,7 +461,7 @@ public class BaseContact extends BaseFrameworkSystem {
      *\r
      * @return the zipCode\r
      */\r
-    public int getZipCode () {\r
+    public long getZipCode () {\r
        return this.zipCode;\r
     }\r
 \r
@@ -470,7 +470,7 @@ public class BaseContact extends BaseFrameworkSystem {
      *\r
      * @param zipCode the zipCode to set\r
      */\r
-    public void setZipCode (final int zipCode) {\r
+    public void setZipCode (final long zipCode) {\r
        this.zipCode = zipCode;\r
     }\r
 \r
@@ -516,12 +516,12 @@ public class BaseContact extends BaseFrameworkSystem {
      * @param city City\r
      * @param countryCode Country code\r
      */\r
-    public void updateAddressData (final String street, final int zipCode, final String city, final String countryCode) {\r
+    public void updateAddressData (final String street, final long zipCode, final String city, final String countryCode) {\r
        // Set all\r
        if (street != null) {\r
            this.setStreet(street);\r
        }\r
-       if (city != null) {\r
+       if (zipCode > 0) {\r
            this.setZipCode(zipCode);\r
        }\r
        if (city != null) {\r
@@ -560,9 +560,10 @@ public class BaseContact extends BaseFrameworkSystem {
      * @param cellphoneNumber Cellphone number\r
      * @param faxNumber Fax number\r
      * @param emailAddress Email address\r
+     * @param birthday Birth day\r
      * @param comment Comments\r
      */\r
-    public void updateOtherData (final String phoneNumber, final String cellphoneNumber, final String faxNumber, final String emailAddress, final String comment) {\r
+    public void updateOtherData (final String phoneNumber, final String cellphoneNumber, final String faxNumber, final String emailAddress, final String birthday, final String comment) {\r
        // Set all\r
        if (phoneNumber != null) {\r
            this.setPhoneNumber(phoneNumber);\r
@@ -576,6 +577,9 @@ public class BaseContact extends BaseFrameworkSystem {
        if (emailAddress != null) {\r
            this.setEmailAddress(emailAddress);\r
        }\r
+       if (birthday != null) {\r
+           this.setBirthday(birthday);\r
+       }\r
        if (comment != null) {\r
            this.setComment(comment);\r
        }\r

diff --git a/Addressbook/src/org/mxchange/addressbook/contact/Contact.java b/Addressbook/src/org/mxchange/addressbook/contact/Contact.java
index 9b13801a411840dc550e884871ab89a3c6b86d15..2860ee209332ae0a29b5cf7876eca6d458a3b8b3 100644 (file)
--- a/Addressbook/src/org/mxchange/addressbook/contact/Contact.java
+++ b/Addressbook/src/org/mxchange/addressbook/contact/Contact.java
@@ -85,7 +85,7 @@ public interface Contact extends FrameworkInterface {
      *\r
      * @return the zipCode\r
      */\r
-    public int getZipCode();\r
+    public long getZipCode();\r
 \r
     /**\r
      * City\r
@@ -158,7 +158,7 @@ public interface Contact extends FrameworkInterface {
      * @param city City\r
      * @param countryCode Country code\r
      */\r
-    public void updateAddressData (final String street, final int zipCode, final String city, final String countryCode);\r
+    public void updateAddressData (final String street, final long zipCode, final String city, final String countryCode);\r
 \r
     /**\r
      * Updates name data in this Contact instance\r
@@ -177,7 +177,8 @@ public interface Contact extends FrameworkInterface {
      * @param cellNumber Cellphone number\r
      * @param faxNumber Fax number\r
      * @param email Email address\r
+     * @param birthday Birthday\r
      * @param comment Comments\r
      */\r
-    public void updateOtherData (final String phoneNumber, final String cellNumber, final String faxNumber, final String email, final String comment);\r
+    public void updateOtherData (final String phoneNumber, final String cellNumber, final String faxNumber, final String email, final String birthday, final String comment);\r
 }\r

diff --git a/Addressbook/src/org/mxchange/addressbook/database/backend/csv/CsvDatabaseBackend.java b/Addressbook/src/org/mxchange/addressbook/database/backend/csv/CsvDatabaseBackend.java
index 8a026e1372aa01698654873d3400b250140a40d1..b1d80126321850d07572d9d2a92a6f867c34bd71 100644 (file)
--- a/Addressbook/src/org/mxchange/addressbook/database/backend/csv/CsvDatabaseBackend.java
+++ b/Addressbook/src/org/mxchange/addressbook/database/backend/csv/CsvDatabaseBackend.java
@@ -304,8 +304,102 @@ public class CsvDatabaseBackend extends BaseDatabaseBackend implements CsvBacken
                        contact.updateNameData(gender, null, null, null);\r
                        break;\r
 \r
+                   case 2: // Surname\r
+                       assert(contact instanceof Contact) : "First token was not boolean";\r
+                       assert(gender != '?') : "Gender is not detected.";\r
+\r
+                       // Update data\r
+                       contact.updateNameData(gender, strippedToken, null, null);\r
+                       break;\r
+\r
+                   case 3: // Family name\r
+                       assert(contact instanceof Contact) : "First token was not boolean";\r
+                       assert(gender != '?') : "Gender is not detected.";\r
+\r
+                       // Update data\r
+                       contact.updateNameData(gender, null, strippedToken, null);\r
+                       break;\r
+\r
+                   case 4: // Company name\r
+                       assert(contact instanceof Contact) : "First token was not boolean";\r
+                       assert(gender != '?') : "Gender is not detected.";\r
+\r
+                       // Update data\r
+                       contact.updateNameData(gender, null, null, strippedToken);\r
+                       break;\r
+\r
+                   case 5: // Street number\r
+                       assert(contact instanceof Contact) : "First token was not boolean";\r
+\r
+                       // Update data\r
+                       contact.updateAddressData(strippedToken, 0, null, null);\r
+                       break;\r
+\r
+                   case 6: // ZIP code\r
+                       assert(contact instanceof Contact) : "First token was not boolean";\r
+\r
+                       // Update data\r
+                       contact.updateAddressData(null, num, null, null);\r
+                       break;\r
+\r
+                   case 7: // City name\r
+                       assert(contact instanceof Contact) : "First token was not boolean";\r
+\r
+                       // Update data\r
+                       contact.updateAddressData(null, 0, strippedToken, null);\r
+                       break;\r
+\r
+                   case 8: // Country code\r
+                       assert(contact instanceof Contact) : "First token was not boolean";\r
+\r
+                       // Update data\r
+                       contact.updateAddressData(null, 0, null, strippedToken);\r
+                       break;\r
+\r
+                   case 9: // Phone number\r
+                       assert(contact instanceof Contact) : "First token was not boolean";\r
+\r
+                       // Update data\r
+                       contact.updateOtherData(strippedToken, null, null, null, null, null);\r
+                       break;\r
+\r
+                   case 10: // Fax number\r
+                       assert(contact instanceof Contact) : "First token was not boolean";\r
+\r
+                       // Update data\r
+                       contact.updateOtherData(null, strippedToken, null, null, null, null);\r
+                       break;\r
+\r
+                   case 11: // Cellphone number\r
+                       assert(contact instanceof Contact) : "First token was not boolean";\r
+\r
+                       // Update data\r
+                       contact.updateOtherData(null, null, strippedToken, null, null, null);\r
+                       break;\r
+\r
+                   case 12: // Email address\r
+                       assert(contact instanceof Contact) : "First token was not boolean";\r
+\r
+                       // Update data\r
+                       contact.updateOtherData(null, null, null, strippedToken, null, null);\r
+                       break;\r
+\r
+                   case 13: // Birthday\r
+                       assert(contact instanceof Contact) : "First token was not boolean";\r
+\r
+                       // Update data\r
+                       contact.updateOtherData(null, null, null, null, strippedToken, null);\r
+                       break;\r
+\r
+                   case 14: // Birthday\r
+                       assert(contact instanceof Contact) : "First token was not boolean";\r
+\r
+                       // Update data\r
+                       contact.updateOtherData(null, null, null, null, null, strippedToken);\r
+                       break;\r
+\r
                    default: // New data entry\r
-                       this.getLogger().warn("Will not handle unknown data " + strippedToken + " at index " + count);\r
+                       this.getLogger().warn(MessageFormat.format("Will not handle unknown data {0} at index {1}", strippedToken, count));\r
                        break;\r
                }\r
 \r
@@ -330,7 +424,7 @@ public class CsvDatabaseBackend extends BaseDatabaseBackend implements CsvBacken
 \r
        try {\r
            input = this.storageFile.readLine();\r
-       } catch (IOException ex) {\r
+       } catch (final IOException ex) {\r
            this.getLogger().catching(ex);\r
        }\r
 \r

diff --git a/Addressbook/src/org/mxchange/addressbook/manager/contact/ContactManager.java b/Addressbook/src/org/mxchange/addressbook/manager/contact/ContactManager.java
index 3199f8182fe38e46b9b6eed0d2dde1dc080f809c..0b31e2f63d556037ae2e4438452737dce0d57946 100644 (file)
--- a/Addressbook/src/org/mxchange/addressbook/manager/contact/ContactManager.java
+++ b/Addressbook/src/org/mxchange/addressbook/manager/contact/ContactManager.java
@@ -235,6 +235,7 @@ public class ContactManager extends BaseManager implements ManageableContact {
      *\r
      * @param contact Instance to change data\r
      * @param client Client instance to call back\r
+     * @todo Didn't handle birthday\r
      */\r
     @Override\r
     public void doChangeOtherData (final Contact contact, final Client client) {\r
@@ -260,7 +261,7 @@ public class ContactManager extends BaseManager implements ManageableContact {
            String comment = this.enterOwnComment();\r
 \r
            // Update contact instance\r
-           contact.updateOtherData(phoneNumber, cellNumber, faxNumber, email, comment);\r
+           contact.updateOtherData(phoneNumber, cellNumber, faxNumber, email, null, comment);\r
        } else {\r
            // Then re-ask them ...\r
            throw new UnsupportedOperationException("Changing contact entries not finished.");\r