diff --git a/src/fr/inrialpes/exmo/align/service/DBServiceImpl.java b/src/fr/inrialpes/exmo/align/service/DBServiceImpl.java
index d37226be92ff56bebbe4dbfbaa8ab10452c76417..9876b7405c9e2913d8752cb9b2d318a946f085da 100644
--- a/src/fr/inrialpes/exmo/align/service/DBServiceImpl.java
+++ b/src/fr/inrialpes/exmo/align/service/DBServiceImpl.java
@@ -1,101 +1,101 @@
-/*
- * $Id$
- *
- * Copyright (C) Seungkeun Lee, 2006
- * Copyright (C) INRIA Rh�ne-Alpes, 2007-2008
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * as published by the Free Software Foundation; either version 2.1
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- */
-
-package fr.inrialpes.exmo.align.service;
-
-import java.lang.ClassNotFoundException;
-import java.lang.IllegalAccessException;
-
-import java.sql.Connection;
-import java.sql.DriverManager;
-import java.sql.Statement;
-import java.sql.SQLException;
-
-
-public class DBServiceImpl implements DBService{
-    int id = 0;
-    Connection conn = null;
-    static String IPAddress = "localhost";
-    static String port = "3306";
-    static String user = "adminAServ";
+/*
+ * $Id$
+ *
+ * Copyright (C) Seungkeun Lee, 2006
+ * Copyright (C) INRIA, 2007-2009
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; either version 2.1
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+package fr.inrialpes.exmo.align.service;
+
+import java.lang.ClassNotFoundException;
+import java.lang.IllegalAccessException;
+
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.Statement;
+import java.sql.SQLException;
+
+
+public class DBServiceImpl implements DBService{
+    int id = 0;
+    Connection conn = null;
+    static String IPAddress = "localhost";
+    static String port = "3306";
+    static String user = "adminAServ";
     static String database = "AServDB";
      
     //To be used in reconnect()
-    static String dbpass = null;
+    static String dbpass = null;
     String driverPrefix = "jdbc:mysql";
-    //String driverPrefix = "jdbc:postgresql";
-    CacheImpl cache = null;
-	
-    public DBServiceImpl() throws ClassNotFoundException, InstantiationException, IllegalAccessException {
+    //String driverPrefix = "jdbc:postgresql";
+    CacheImpl cache = null;
+	
+    public DBServiceImpl() throws ClassNotFoundException, InstantiationException, IllegalAccessException {
 	Class.forName("com.mysql.jdbc.Driver").newInstance();
-	//Class.forName("org.postgresql.Driver").newInstance();
-    }
-
-    public DBServiceImpl( String driver, String prefix, String DBPort ) throws ClassNotFoundException, InstantiationException, IllegalAccessException {
-	Class.forName(driver).newInstance();
+	//Class.forName("org.postgresql.Driver").newInstance();
+    }
+
+    public DBServiceImpl( String driver, String prefix, String DBPort ) throws ClassNotFoundException, InstantiationException, IllegalAccessException {
+	Class.forName(driver).newInstance();
 	driverPrefix = prefix;
-	port = DBPort;
-    }
-
-    public void init() {
-    }
-	 	
-    public void connect( String password ) throws SQLException {
-	connect( IPAddress, port, user, password, database );
-    }
-    
-    public void connect( String user, String password ) throws SQLException {
-	connect( IPAddress, port, user, password, database );
-    }
-    
-    public void connect( String port, String user, String password ) throws SQLException {
-	connect( IPAddress, port, user, password, database );
-    }
-    
-    public void connect(String IPAddress, String port, String user, String password ) throws SQLException {
-	connect( IPAddress, port, user, password, database );
-	}
-
+	port = DBPort;
+    }
+
+    public void init() {
+    }
+	 	
+    public void connect( String password ) throws SQLException {
+	connect( IPAddress, port, user, password, database );
+    }
+    
+    public void connect( String user, String password ) throws SQLException {
+	connect( IPAddress, port, user, password, database );
+    }
+    
+    public void connect( String port, String user, String password ) throws SQLException {
+	connect( IPAddress, port, user, password, database );
+    }
+    
+    public void connect(String IPAddress, String port, String user, String password ) throws SQLException {
+	connect( IPAddress, port, user, password, database );
+	}
+
     public void connect(String IPAddress, String port, String user, String password, String database ) throws SQLException {
-	dbpass = password;
-	conn = DriverManager.getConnection(driverPrefix+"://"+IPAddress+":"+port+"/"+database, user, password);
-	}
+	dbpass = password;
+	conn = DriverManager.getConnection(driverPrefix+"://"+IPAddress+":"+port+"/"+database, user, password);
+	}
     //with "dbpass" given by "connect"
     public Connection reconnect() throws SQLException {
-	conn = DriverManager.getConnection(driverPrefix+"://"+IPAddress+":"+port+"/"+database, user, dbpass);
-	return conn;
+	conn = DriverManager.getConnection(driverPrefix+"://"+IPAddress+":"+port+"/"+database, user, dbpass);
+	return conn;
     }
-
+
     public Connection getConnection() throws SQLException {
 	if (conn==null || conn.isClosed())
-		return reconnect();
-	return conn;
+		return reconnect();
+	return conn;
+    }
+
+    public void close() {
+	try {
+	    conn.close();
+	} catch (Exception ex) {
+	    ex.printStackTrace();
+	}
     }
-
-    public void close() {
-	try {
-	    conn.close();
-	} catch (Exception ex) {
-	    ex.printStackTrace();
-	}
-    }
-    
-}
+    
+}