Merge commit '728147df5d63a3333daff3d8c0e9bfd4f5597e3a'

[simantics/platform.git] / bundles / org.simantics.project / src / org / simantics / project / management / ServerManagerFactory.java

diff --git a/bundles/org.simantics.project/src/org/simantics/project/management/ServerManagerFactory.java b/bundles/org.simantics.project/src/org/simantics/project/management/ServerManagerFactory.java
index 4a673b97dce934bf7165bdded2744db8382b63f8..8957a21679b45607a2daab8d235b7e90545c93c6 100644 (file)
--- a/bundles/org.simantics.project/src/org/simantics/project/management/ServerManagerFactory.java
+++ b/bundles/org.simantics.project/src/org/simantics/project/management/ServerManagerFactory.java
@@ -30,12 +30,12 @@ import org.simantics.db.exception.DatabaseException;
 import org.simantics.utils.FileUtils;\r
 \r
 public class ServerManagerFactory {\r
-    public static ServerManager create(String databaseId, String address) throws IOException, DatabaseException {\r
-        Driver driver = Manager.getDriver(databaseId);\r
+    public static ServerManager create(String databaseDriverId, String address) throws IOException, DatabaseException {\r
+        Driver driver = Manager.getDriver(databaseDriverId);\r
         if (driver == null)\r
-            throw new IllegalArgumentException("Database driver with ID " + databaseId + " could not be found!");\r
-        System.out.println("ServerManagerFactory.create called with id " + databaseId + ", driver is " + driver.toString());\r
-        DatabaseUserAgent agent = Manager.getUserAgent(databaseId);\r
+            throw new IllegalArgumentException("Database driver with ID " + databaseDriverId + " could not be found!");\r
+        System.out.println("ServerManagerFactory.create called with id " + databaseDriverId + ", driver is " + driver.toString());\r
+        DatabaseUserAgent agent = Manager.getUserAgent(databaseDriverId);\r
         if (agent != null)\r
             driver.setDatabaseUserAgent(address, agent);\r
         return new ServerManager(driver);\r