X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=blobdiff_plain;f=bundles%2Forg.simantics%2Fsrc%2Forg%2Fsimantics%2FSimanticsPlatform.java;h=ba29a654a461370360c61ee399963363ff1e6e7f;hp=611cfa575843857d7f6b4e476d15641e6185d29d;hb=9b79343ca481f448a4bcdeb3c2b35af91c8dfb62;hpb=749a1ea2c0a66ae41aad617d1fd81b61cbdb7685

diff --git a/bundles/org.simantics/src/org/simantics/SimanticsPlatform.java b/bundles/org.simantics/src/org/simantics/SimanticsPlatform.java
index 611cfa575..ba29a654a 100644
--- a/bundles/org.simantics/src/org/simantics/SimanticsPlatform.java
+++ b/bundles/org.simantics/src/org/simantics/SimanticsPlatform.java
@@ -197,13 +197,13 @@ public class SimanticsPlatform implements LifecycleListener {
         return application != null ? application : UUID.randomUUID().toString();
     }
 
-    private Session setupDatabase(String databaseId, IProgressMonitor progressMonitor, RecoveryPolicy workspacePolicy, PlatformUserAgent userAgent) throws PlatformException {
+    private Session setupDatabase(String databaseDriverId, IProgressMonitor progressMonitor, RecoveryPolicy workspacePolicy, PlatformUserAgent userAgent) throws PlatformException {
         if (progressMonitor == null)
             progressMonitor = new NullProgressMonitor();
         File dbLocation = Platform.getLocation().append("db").toFile();
         ServerManager serverManager;
         try {
-            serverManager = ServerManagerFactory.create(databaseId, dbLocation.getAbsolutePath());
+            serverManager = ServerManagerFactory.create(databaseDriverId, dbLocation.getAbsolutePath());
         } catch (DatabaseException | IOException e) {
             throw new PlatformException("Failed to initialize Server Manager", e);
         }
@@ -702,7 +702,7 @@ public class SimanticsPlatform implements LifecycleListener {
      *        startup or <code>null</code> to resort to default measures
      * @throws PlatformException
      */
-    public SessionContext startUp(String databaseId, IProgressMonitor progressMonitor, RecoveryPolicy workspacePolicy,
+    public SessionContext startUp(String databaseDriverId, IProgressMonitor progressMonitor, RecoveryPolicy workspacePolicy,
             OntologyRecoveryPolicy ontologyPolicy, boolean requireSynchronize, PlatformUserAgent userAgent)
     throws PlatformException
     {
@@ -729,7 +729,7 @@ public class SimanticsPlatform implements LifecycleListener {
         VariableRepository.clear();
         
         // 1. Assert there is a database at <workspace>/db
-        session = setupDatabase(databaseId, progressMonitor, workspacePolicy, userAgent);
+        session = setupDatabase(databaseDriverId, progressMonitor, workspacePolicy, userAgent);
         TimeLogger.log("Database setup complete");
 
         // 2. Assert all graphs, and correct versions, are installed to the database
@@ -1014,9 +1014,9 @@ public class SimanticsPlatform implements LifecycleListener {
         return false;
     }
 
-    public void reconnect(String databaseId) throws Exception {
+    public void reconnect(String databaseDriverId) throws Exception {
         // Starts database server.
-        SimanticsPlatform.INSTANCE.startUp(databaseId, null, RecoveryPolicy.ThrowError, OntologyRecoveryPolicy.ThrowError, true, null);
+        SimanticsPlatform.INSTANCE.startUp(databaseDriverId, null, RecoveryPolicy.ThrowError, OntologyRecoveryPolicy.ThrowError, true, null);
     }
 
     private void dumpPlatformBundleState() {