Opps, forgot to add fully read Contact object to list ...

[jbonuscard-lib.git] / Addressbook / src / org / mxchange / addressbook / database / backend / csv / CsvDatabaseBackend.java

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..b898e9be168303638282f077f8376c12c4d34c4f 100644 (file)
--- a/Addressbook/src/org/mxchange/addressbook/database/backend/csv/CsvDatabaseBackend.java
+++ b/Addressbook/src/org/mxchange/addressbook/database/backend/csv/CsvDatabaseBackend.java
@@ -286,11 +286,20 @@ public class CsvDatabaseBackend extends BaseDatabaseBackend implements CsvBacken
                    case 0: // isOwnContact\r
                        assert((bool instanceof Boolean));\r
 \r
+                       // Debug message\r
+                       this.getLogger().debug(MessageFormat.format("bool={0}", bool));\r
+\r
                        // Is it own contact?\r
                        if (true == bool) {\r
+                           // Debug message\r
+                           this.getLogger().debug("Creating UserContact object ...");\r
+\r
                            // Own entry\r
                            contact = new UserContact();\r
                        } else {\r
+                           // Debug message\r
+                           this.getLogger().debug("Creating BookContact object ...");\r
+\r
                            // Other contact\r
                            contact = new BookContact();\r
                        }\r
@@ -304,14 +313,114 @@ 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
                // Increment counter for next round\r
                count++;\r
            }\r
+\r
+           // Is the contact read?\r
+           if (contact instanceof Contact) {\r
+               // Then add it\r
+               assert(list.add(contact));\r
+           }\r
        }\r
 \r
        // Return finished list\r
@@ -330,7 +439,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