[477237] Empty intermediate shell visible

https://bugs.eclipse.org/bugs/show_bug.cgi?id=477237

2 files changed, 10 insertions, 9 deletions

diff --git a/plugins/org.eclipse.emf.cdo.migrator/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.migrator/META-INF/MANIFEST.MF
index c35bbf8a5b..2ed6808ab2 100644
--- a/plugins/org.eclipse.emf.cdo.migrator/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.migrator/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.emf.cdo.migrator;singleton:=true
-Bundle-Version: 3.0.500.qualifier
+Bundle-Version: 3.0.600.qualifier
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -11,8 +11,9 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.core.resources;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.ui;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.emf.ecore.xmi;bundle-version="[2.5.0,3.0.0)",
- org.eclipse.emf.importer;bundle-version="[2.5.0,3.0.0)"
+ org.eclipse.emf.importer;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.net4j.util.ui;bundle-version="[3.6.0,4.0.0)"
 Export-Package: org.eclipse.emf.cdo.internal.messages;version="3.0.200";x-internal:=true,
- org.eclipse.emf.cdo.internal.migrator;version="3.0.500";x-internal:=true,
- org.eclipse.emf.cdo.internal.migrator.actions;version="3.0.500";x-internal:=true,
- org.eclipse.emf.cdo.internal.migrator.wizards;version="3.0.500";x-internal:=true
+ org.eclipse.emf.cdo.internal.migrator;version="3.0.600";x-internal:=true,
+ org.eclipse.emf.cdo.internal.migrator.actions;version="3.0.600";x-internal:=true,
+ org.eclipse.emf.cdo.internal.migrator.wizards;version="3.0.600";x-internal:=true
diff --git a/plugins/org.eclipse.emf.cdo.migrator/src/org/eclipse/emf/cdo/internal/migrator/actions/MigrateAction.java b/plugins/org.eclipse.emf.cdo.migrator/src/org/eclipse/emf/cdo/internal/migrator/actions/MigrateAction.java
index 6fef2489dc..2ff966cb1d 100644
--- a/plugins/org.eclipse.emf.cdo.migrator/src/org/eclipse/emf/cdo/internal/migrator/actions/MigrateAction.java
+++ b/plugins/org.eclipse.emf.cdo.migrator/src/org/eclipse/emf/cdo/internal/migrator/actions/MigrateAction.java
@@ -13,6 +13,8 @@ package org.eclipse.emf.cdo.internal.migrator.actions;
 import org.eclipse.emf.cdo.internal.messages.Messages;
 import org.eclipse.emf.cdo.internal.migrator.CDOMigratorUtil;
 
+import org.eclipse.net4j.util.ui.UIUtil;
+
 import org.eclipse.emf.codegen.ecore.genmodel.GenDelegationKind;
 import org.eclipse.emf.codegen.ecore.genmodel.GenModel;
 import org.eclipse.emf.common.util.EList;
@@ -33,7 +35,6 @@ import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Shell;
 import org.eclipse.ui.IObjectActionDelegate;
 import org.eclipse.ui.IWorkbenchPart;
 import org.eclipse.ui.PlatformUI;
@@ -165,14 +166,13 @@ public class MigrateAction implements IObjectActionDelegate
         {
           try
           {
-            final Shell shell = new Shell(display);
             if (error)
             {
-              MessageDialog.openError(shell, Messages.getString("MigrateAction_10"), msg); //$NON-NLS-1$
+              MessageDialog.openError(UIUtil.getShell(), Messages.getString("MigrateAction_10"), msg); //$NON-NLS-1$
             }
             else
             {
-              MessageDialog.openInformation(shell, Messages.getString("MigrateAction_10"), msg); //$NON-NLS-1$
+              MessageDialog.openInformation(UIUtil.getShell(), Messages.getString("MigrateAction_10"), msg); //$NON-NLS-1$
             }
           }
           catch (RuntimeException ignore)