Commit 20e4007d authored by Romain Bioteau's avatar Romain Bioteau
Browse files

Merge remote-tracking branch 'origin/master' into CoreProduct

parents 9136eb30 00c5764f
......@@ -47,6 +47,7 @@ import org.bonitasoft.studio.common.repository.CommonRepositoryPlugin;
import org.bonitasoft.studio.common.repository.Repository;
import org.bonitasoft.studio.common.repository.RepositoryAccessor;
import org.bonitasoft.studio.common.repository.RepositoryManager;
import org.bonitasoft.studio.common.repository.core.job.WorkspaceInitializationJob;
import org.bonitasoft.studio.common.repository.extension.IPostInitRepositoryJobContribution;
import org.bonitasoft.studio.common.repository.model.IRepository;
import org.bonitasoft.studio.common.repository.preferences.RepositoryPreferenceConstant;
......@@ -63,6 +64,7 @@ import org.eclipse.core.runtime.IConfigurationElement;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.MultiStatus;
import org.eclipse.core.runtime.OperationCanceledException;
import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.Platform;
import org.eclipse.core.runtime.Status;
......@@ -411,11 +413,7 @@ public class BonitaStudioWorkbenchAdvisor extends WorkbenchAdvisor implements IS
}
protected void doInitWorkspace() {
try {
repositoryAccessor.start(monitor);
} catch (final CoreException e) {
BonitaStudioLog.error(e);
}
new WorkspaceInitializationJob(repositoryAccessor).schedule();
}
private void checkCurrentRepository(final IProgressMonitor monitor) {
......@@ -691,6 +689,11 @@ public class BonitaStudioWorkbenchAdvisor extends WorkbenchAdvisor implements IS
@Override
public void postStartup() {
super.postStartup();
try {
Job.getJobManager().join(WorkspaceInitializationJob.WORKSPACE_INIT_FAMILY, monitor);
} catch (final OperationCanceledException | InterruptedException e) {
BonitaStudioLog.error(e);
}
if (PlatformUI.isWorkbenchRunning()) {
sendUserInfo();
openStartupDialog();
......
......@@ -14,7 +14,7 @@
<tychoExtrasVersion>0.22.0</tychoExtrasVersion>
<os-jvm-flags></os-jvm-flags>
<bundle.version>7.2.0-SNAPSHOT</bundle.version>
<ui.designer.version>1.2.8</ui.designer.version>
<ui.designer.version>1.2.9</ui.designer.version>
<engine.version>7.2.0-SNAPSHOT</engine.version>
<connector.version>6.1.1</connector.version>
<simulation.version>6.1.0</simulation.version>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment