mild fixes

[mir.git] / source / mir / storage / DatabaseAdaptorPostgresql.java

diff --git a/source/mir/storage/DatabaseAdaptorPostgresql.java b/source/mir/storage/DatabaseAdaptorPostgresql.java
index 7072741..59ea2b5 100755 (executable)
--- a/source/mir/storage/DatabaseAdaptorPostgresql.java
+++ b/source/mir/storage/DatabaseAdaptorPostgresql.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2001, 2002  The Mir-coders group
+ * Copyright (C) 2001, 2002 The Mir-coders group
  *
  * This file is part of Mir.
  *
@@ -18,54 +18,52 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  * In addition, as a special exception, The Mir-coders gives permission to link
- * the code of this program with the com.oreilly.servlet library, any library
- * licensed under the Apache Software License, The Sun (tm) Java Advanced
- * Imaging library (JAI), The Sun JIMI library (or with modified versions of
- * the above that use the same license as the above), and distribute linked
- * combinations including the two.  You must obey the GNU General Public
- * License in all respects for all of the code used other than the above
- * mentioned libraries.  If you modify this file, you may extend this exception
- * to your version of the file, but you are not obligated to do so.  If you do
- * not wish to do so, delete this exception statement from your version.
+ * the code of this program with  any library licensed under the Apache Software License, 
+ * The Sun (tm) Java Advanced Imaging library (JAI), The Sun JIMI library 
+ * (or with modified versions of the above that use the same license as the above), 
+ * and distribute linked combinations including the two.  You must obey the 
+ * GNU General Public License in all respects for all of the code used other than 
+ * the above mentioned libraries.  If you modify this file, you may extend this 
+ * exception to your version of the file, but you are not obligated to do so.  
+ * If you do not wish to do so, delete this exception statement from your version.
  */
-
 package mir.storage;
 
-import java.util.*;
-import mir.misc.*;
+import java.util.Properties;
+
+import mir.config.MirPropertiesConfiguration;
+import mir.config.MirPropertiesConfiguration.PropertiesConfigExc;
+
 
 /**
- * <b>Diese Klasse implementiert die abstrakte Klasse DatabaseAdaptor für Postgresql-Datenbanken
+ * <b>Diese Klasse implementiert die abstrakte Klasse DatabaseAdaptor f?r Postgresql-Datenbanken
  *
  * @author <RK>
  * @version 30.12.2000
  */
+public final class DatabaseAdaptorPostgresql implements DatabaseAdaptor {
+  public String getDriver() throws PropertiesConfigExc {
+    return MirPropertiesConfiguration.instance().getString("Adaptor.PostgreSQL.Driver");
+  }
 
-public final class DatabaseAdaptorPostgresql implements DatabaseAdaptor{
-
-    public String getDriver() {
-       return MirConfig.getProp("Adaptor.PostgreSQL.Driver");
-    }
+  public String getURL(String user, String pass, String host)
+    throws PropertiesConfigExc {
+    return MirPropertiesConfiguration.instance().getString("Adaptor.PostgreSQL.URL");
+  }
 
-    public String getURL(String user, String pass, String host) {
-           return MirConfig.getProp("Adaptor.PostgreSQL.URL");
-    }
+  public boolean hasLimit() {
+    return true;
+  }
 
-    public  boolean hasLimit() {
-      return true;
-    }
+  public boolean reverseLimit() {
+    return true;
+  }
 
-    public boolean reverseLimit() {
-      return true;
-    }
+  public Properties getProperties(String user, String password) {
+    return null;
+  }
 
-    public Properties getProperties(String user, String password) {
-      return null;
-    }
-
-    public String getLastInsertSQL(Database theDB) {
-           return "select currval('"+theDB.getCoreTable()+"_id_seq')";
-    }
+  public String getLastInsertSQL(Database theDB) {
+    return "select currval('" + theDB.getCoreTable() + "_id_seq')";
+  }
 }
-
-