A lot more improvements:

[addressbook-lib.git] / Addressbook / src / org / mxchange / addressbook / database / frontend / contact / ContactDatabaseFrontend.java

diff --git a/Addressbook/src/org/mxchange/addressbook/database/frontend/contact/ContactDatabaseFrontend.java b/Addressbook/src/org/mxchange/addressbook/database/frontend/contact/ContactDatabaseFrontend.java
index 30535fd231b3490861fa08166f22f9f5572eddd2..85dcf153689a00b5c78318bca34fe6504e1793c8 100644 (file)
--- a/Addressbook/src/org/mxchange/addressbook/database/frontend/contact/ContactDatabaseFrontend.java
+++ b/Addressbook/src/org/mxchange/addressbook/database/frontend/contact/ContactDatabaseFrontend.java
@@ -21,10 +21,10 @@ import java.text.MessageFormat;
 import java.util.Iterator;
 import java.util.List;
 import org.mxchange.addressbook.contact.Contact;
-import org.mxchange.addressbook.database.backend.csv.CsvBackend;
 import org.mxchange.addressbook.database.frontend.BaseDatabaseFrontend;
 import org.mxchange.addressbook.database.storage.Storeable;
 import org.mxchange.addressbook.exceptions.BadTokenException;
+import org.mxchange.addressbook.exceptions.UnsupportedDatabaseBackendException;
 import org.mxchange.addressbook.manager.contact.ContactManager;
 
 /**
@@ -68,8 +68,13 @@ public class ContactDatabaseFrontend extends BaseDatabaseFrontend implements Con
                // Set "table" name
                this.setTableName("contacts"); //NOI18N
 
-               // Initalize backend
-               this.initBackend();
+               try {
+                       // Initalize backend
+                       this.initBackend();
+               } catch (final UnsupportedDatabaseBackendException ex) {
+                       // Abort program
+                       this.abortProgramWithException(ex);
+               }
        }
 
        /**
@@ -114,8 +119,7 @@ public class ContactDatabaseFrontend extends BaseDatabaseFrontend implements Con
                                this.getBackend().store((Storeable) contact);
                        } catch (final IOException ex) {
                                // Should not happen?
-                               this.getLogger().catching(ex);
-                               System.exit(1);
+                               this.abortProgramWithException(ex);
                        }
                }
 
@@ -132,19 +136,16 @@ public class ContactDatabaseFrontend extends BaseDatabaseFrontend implements Con
                // Trace message
                this.getLogger().trace("CALLED!"); //NOI18N
 
-               // Get iterator and case it
-               CsvBackend backend = (CsvBackend) this.getBackend();
-
                // First rewind to beginning
                this.getBackend().rewind();
 
                // Get backend iterator
                Iterator<Contact> iterator = null;
                try {
-                       iterator = backend.contactIterator();
+                       iterator = this.getBackend().contactIterator();
                } catch (final BadTokenException ex) {
-                       this.getLogger().catching(ex);
-                       System.exit(1);
+                       // Abort program
+                       this.abortProgramWithException(ex);
                }
 
                // Read all entries