Sync git svn branch with SVN repository r33199.

[simantics/platform.git] / bundles / org.simantics.workbench / src / org / simantics / workbench / internal / SimanticsWorkbenchAdvisor.java

diff --git a/bundles/org.simantics.workbench/src/org/simantics/workbench/internal/SimanticsWorkbenchAdvisor.java b/bundles/org.simantics.workbench/src/org/simantics/workbench/internal/SimanticsWorkbenchAdvisor.java
index 2d054eaa7d0d7a1fa2367fce88996772f4023f5a..67a8101cf7a87ff7e0a8e9d8e2b68bde52279bef 100644 (file)
--- a/bundles/org.simantics.workbench/src/org/simantics/workbench/internal/SimanticsWorkbenchAdvisor.java
+++ b/bundles/org.simantics.workbench/src/org/simantics/workbench/internal/SimanticsWorkbenchAdvisor.java
@@ -61,7 +61,6 @@ import org.eclipse.swt.widgets.Event;
 import org.eclipse.swt.widgets.Listener;\r
 import org.eclipse.swt.widgets.Shell;\r
 import org.eclipse.ui.IPerspectiveDescriptor;\r
-import org.eclipse.ui.IWorkbench;\r
 import org.eclipse.ui.PlatformUI;\r
 import org.eclipse.ui.application.IWorkbenchConfigurer;\r
 import org.eclipse.ui.application.IWorkbenchWindowConfigurer;\r
@@ -98,7 +97,6 @@ import org.simantics.db.common.Indexing;
 import org.simantics.db.indexing.DatabaseIndexing;\r
 import org.simantics.db.procore.server.environment.RebootRequiredException;\r
 import org.simantics.db.procore.server.environment.windows.Product;\r
-import org.simantics.db.procore.ui.ProCoreUserAgent;\r
 import org.simantics.internal.TimedSessionCache;\r
 import org.simantics.project.IProject;\r
 import org.simantics.project.ProjectKeys;\r
@@ -131,11 +129,6 @@ public class SimanticsWorkbenchAdvisor extends WorkbenchAdvisor {
      */\r
     private static final String INSTALLED_FEATURES = "installedFeatures"; //$NON-NLS-1$\r
 \r
-    /**\r
-     * Default database ID\r
-     */\r
-    private static final String DEFAULT_DATABASE_ID = "procore";\r
-    \r
     /**\r
      * The arguments received by the application.\r
      */\r
@@ -428,17 +421,16 @@ public class SimanticsWorkbenchAdvisor extends WorkbenchAdvisor {
                 throw new PlatformException("Argument not supported: " + SimanticsArguments.SERVER + " " + serverAddress);\r
             }\r
 \r
-            // TODO: Default to procore for now;\r
-            String databaseId = DEFAULT_DATABASE_ID;\r
+            String databaseDriverId = Simantics.getDefaultDatabaseDriver();\r
             if (args.contains(SimanticsArguments.DATABASE_ID)) {\r
-                databaseId = args.get(SimanticsArguments.DATABASE_ID);\r
+                databaseDriverId = args.get(SimanticsArguments.DATABASE_ID);\r
+                Simantics.setDefaultDatabaseDriver(databaseDriverId);\r
             }\r
             \r
             IProgressMonitor mon = null;\r
             if (PROFILE_PLATFORM_STARTUP)\r
                 mon = new TimingProgressMonitor();\r
-            IWorkbench wb = PlatformUI.getWorkbench();\r
-            SimanticsPlatform.INSTANCE.startUp(databaseId, mon, workspacePolicy, ontologyPolicy, requireSynchronize, new JFaceUserAgent());\r
+            SimanticsPlatform.INSTANCE.startUp(databaseDriverId, mon, workspacePolicy, ontologyPolicy, requireSynchronize, new JFaceUserAgent());\r
 \r
             // Make sure that the default perspective comes from the project if\r
             // the project has set ProjectKeys#DEFAULT_PERSPECTIVE.\r