[490164] Adapt waiting code according to change of bugzilla 490164. The internal method waitOtherJobs() has been removed. We must now explicitly join the family job AbstractRepresentationsFileJob.FAMILY to wait the end of the job. Bug: 490164 Change-Id: I1932c652b1d319c8ca3a2f79e02d1e90f45d4fe6 Signed-off-by: Laurent Redor <laurent.redor@obeo.fr>
diff --git a/org.eclipse.emf.ecoretools.design.ui/src/org/eclipse/emf/ecoretools/design/ui/action/EcoreInitDiagramFileAction.java b/org.eclipse.emf.ecoretools.design.ui/src/org/eclipse/emf/ecoretools/design/ui/action/EcoreInitDiagramFileAction.java index 8f33012..3da9e69 100644 --- a/org.eclipse.emf.ecoretools.design.ui/src/org/eclipse/emf/ecoretools/design/ui/action/EcoreInitDiagramFileAction.java +++ b/org.eclipse.emf.ecoretools.design.ui/src/org/eclipse/emf/ecoretools/design/ui/action/EcoreInitDiagramFileAction.java
@@ -15,6 +15,7 @@ import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.NullProgressMonitor; +import org.eclipse.core.runtime.jobs.Job; import org.eclipse.emf.common.util.URI; import org.eclipse.emf.ecore.resource.Resource; import org.eclipse.emf.ecore.resource.ResourceSet; @@ -25,6 +26,7 @@ import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.wizard.WizardDialog; +import org.eclipse.sirius.business.api.modelingproject.AbstractRepresentationsFileJob; import org.eclipse.sirius.business.api.modelingproject.ModelingProject; import org.eclipse.sirius.business.api.session.Session; import org.eclipse.sirius.business.api.session.SessionManager; @@ -108,7 +110,11 @@ if (OpenRepresentationsFileJob.shouldWaitOtherJobs()) { // We are loading session(s), wait loading is finished // before continuing. - OpenRepresentationsFileJob.waitOtherJobs(); + try { + Job.getJobManager().join(AbstractRepresentationsFileJob.FAMILY, new NullProgressMonitor()); + } catch (InterruptedException e) { + // Do nothing + } } existingSession = prj.get().getSession(); if (existingSession != null) {