diff options
Diffstat (limited to 'org.eclipse.m2e.discovery/src/org/eclipse/m2e/internal/discovery/wizards/MavenDiscoveryUi.java')
-rw-r--r-- | org.eclipse.m2e.discovery/src/org/eclipse/m2e/internal/discovery/wizards/MavenDiscoveryUi.java | 40 |
1 files changed, 21 insertions, 19 deletions
diff --git a/org.eclipse.m2e.discovery/src/org/eclipse/m2e/internal/discovery/wizards/MavenDiscoveryUi.java b/org.eclipse.m2e.discovery/src/org/eclipse/m2e/internal/discovery/wizards/MavenDiscoveryUi.java index 1912bcdd..96411213 100644 --- a/org.eclipse.m2e.discovery/src/org/eclipse/m2e/internal/discovery/wizards/MavenDiscoveryUi.java +++ b/org.eclipse.m2e.discovery/src/org/eclipse/m2e/internal/discovery/wizards/MavenDiscoveryUi.java @@ -9,6 +9,7 @@ * Tasktop Technologies - initial API and implementation * Sonatype, Inc. - Modified to use local installation operation *******************************************************************************/ + package org.eclipse.m2e.internal.discovery.wizards; import java.lang.reflect.InvocationTargetException; @@ -26,13 +27,14 @@ import org.eclipse.equinox.p2.ui.ProvisioningUI; import org.eclipse.jface.operation.IRunnableContext; import org.eclipse.jface.operation.IRunnableWithProgress; import org.eclipse.jface.wizard.WizardDialog; -import org.eclipse.m2e.internal.discovery.DiscoveryActivator; -import org.eclipse.m2e.internal.discovery.operation.MavenDiscoveryInstallOperation; -import org.eclipse.m2e.internal.discovery.operation.RestartInstallOperation; import org.eclipse.osgi.util.NLS; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.statushandlers.StatusManager; +import org.eclipse.m2e.internal.discovery.DiscoveryActivator; +import org.eclipse.m2e.internal.discovery.operation.MavenDiscoveryInstallOperation; +import org.eclipse.m2e.internal.discovery.operation.RestartInstallOperation; + /* * This is used to replace the typical discovery install operation with our own which allows us to change @@ -44,11 +46,11 @@ import org.eclipse.ui.statushandlers.StatusManager; public abstract class MavenDiscoveryUi { private MavenDiscoveryUi() { - // don't allow clients to instantiate - } + // don't allow clients to instantiate + } /** - * Installs specified + * Installs specified * * @param descriptors is the list of catalog items to install * @param postInstallHook additional operation to perform after installation has completed and before restart, can be @@ -58,23 +60,23 @@ public abstract class MavenDiscoveryUi { */ public static boolean install(List<CatalogItem> descriptors, IRunnableWithProgress postInstallHook, IRunnableContext context) throws CoreException { - try { + try { MavenDiscoveryInstallOperation runner = new MavenDiscoveryInstallOperation(descriptors, postInstallHook, true); - context.run(true, true, runner); + context.run(true, true, runner); openInstallWizard(runner.getOperation(), true); - } catch (InvocationTargetException e) { - if (e.getCause() instanceof CoreException) - throw (CoreException) e.getCause(); + } catch(InvocationTargetException e) { + if(e.getCause() instanceof CoreException) + throw (CoreException) e.getCause(); IStatus status = new Status(IStatus.ERROR, DiscoveryActivator.PLUGIN_ID, NLS.bind( Messages.ConnectorDiscoveryWizard_installProblems, new Object[] {e.getCause().getMessage()}), e.getCause()); - StatusManager.getManager().handle(status, StatusManager.SHOW | StatusManager.BLOCK | StatusManager.LOG); - return false; - } catch (InterruptedException e) { - // canceled - return false; - } - return true; - } + StatusManager.getManager().handle(status, StatusManager.SHOW | StatusManager.BLOCK | StatusManager.LOG); + return false; + } catch(InterruptedException e) { + // canceled + return false; + } + return true; + } public static int openInstallWizard(RestartInstallOperation operation, boolean blockOnOpen) { MavenDiscoveryInstallWizard wizard = new MavenDiscoveryInstallWizard(ProvisioningUI.getDefaultUI(), operation, |