1 files changed, 4 insertions, 17 deletions
diff --git a/src/uk/org/ury/database/DatabaseDriver.java b/src/uk/org/ury/database/DatabaseDriver.java
index 732714c..bd70c8f 100644
--- a/src/uk/org/ury/database/DatabaseDriver.java
+++ b/src/uk/org/ury/database/DatabaseDriver.java
@@ -46,29 +46,16 @@ public class DatabaseDriver
    */
   
   public
-  DatabaseDriver (UserClass userclass) throws MissingCredentialsException, ConnectionFailureException
+  DatabaseDriver (UserClass userclass) 
+    throws MissingCredentialsException, ConnectionFailureException
   { 
     DatabaseLogin login = null;
     
-    switch (userclass)
-    {
-    case READ_ONLY:
-      login = DatabaseLogin.getLoginFromFile ("read_only.txt");
-      break;
-    case READ_WRITE:
-      login = DatabaseLogin.getLoginFromFile ("read_write.txt");
-    default:
-      throw new IllegalArgumentException ("Unused user class.");
-    }
-
-
+    login = DatabaseLogin.getLoginFromFile (userclass.configName + ".txt");
+    
     try
       {
-        System.out.println ("Trying to acquire connection...");
-        
         connect (login);
-        
-        System.out.println ("...connection succeeded.");
       }
     catch (SQLException e)
       {