Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Watson2017-10-13 11:16:27 -0400
committerThomas Watson2017-10-13 11:16:27 -0400
commit33c7f929c6b197d6f853daf5517ff1ac870a4698 (patch)
tree2e7901bbd589a57995a5ed098fd928ca6259f14b
parent87ae297da2726821ac81be4cd16b25e0273d3306 (diff)
downloadrt.equinox.p2-33c7f929c6b197d6f853daf5517ff1ac870a4698.tar.gz
rt.equinox.p2-33c7f929c6b197d6f853daf5517ff1ac870a4698.tar.xz
rt.equinox.p2-33c7f929c6b197d6f853daf5517ff1ac870a4698.zip
Revert "Bug 506432 - [ui] p2 install dialog shouldn't be modal"
-rw-r--r--bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/ProvisioningUI.java13
1 files changed, 1 insertions, 12 deletions
diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/ProvisioningUI.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/ProvisioningUI.java
index 92e8f42b9..2309333f7 100644
--- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/ProvisioningUI.java
+++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/ProvisioningUI.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2009, 2016 IBM Corporation and others.
+ * Copyright (c) 2009, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -9,7 +9,6 @@
* IBM Corporation - initial API and implementation
* Sonatype, Inc. - ongoing development
* Red Hat Inc. - Bug 460967
- * Lars Vogel <Lars.Vogel@vogella.com> - Bug 506432
******************************************************************************/
package org.eclipse.equinox.p2.ui;
@@ -35,7 +34,6 @@ import org.eclipse.equinox.p2.repository.metadata.IMetadataRepository;
import org.eclipse.equinox.p2.repository.metadata.IMetadataRepositoryManager;
import org.eclipse.jface.dialogs.TitleAreaDialog;
import org.eclipse.jface.preference.PreferenceDialog;
-import org.eclipse.jface.window.Window;
import org.eclipse.jface.wizard.WizardDialog;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.widgets.*;
@@ -223,15 +221,6 @@ public class ProvisioningUI {
public int openInstallWizard(Collection<IInstallableUnit> initialSelections, InstallOperation operation, RemediationOperation remediationOperation, LoadMetadataRepositoryJob job) {
if (operation == null) {
InstallWizard wizard = new InstallWizard(this, operation, initialSelections, job);
- // check if provitiondialog is already open and give focus to it, if that is the case
- Shell[] shells = Display.getCurrent().getShells();
- for (Shell shell : shells) {
- if (shell.getData() instanceof ProvisioningWizardDialog) {
- shell.forceActive();
- shell.setFocus();
- return Window.OK;
- }
- }
WizardDialog dialog = new ProvisioningWizardDialog(ProvUI.getDefaultParentShell(), wizard);
dialog.create();
PlatformUI.getWorkbench().getHelpSystem().setHelp(dialog.getShell(), IProvHelpContextIds.INSTALL_WIZARD);

Back to the top