diff options
2 files changed, 14 insertions, 19 deletions
diff --git a/bundles/org.eclipse.equinox.p2.ui.importexport/src/org/eclipse/equinox/internal/p2/importexport/internal/wizard/ImportWizard.java b/bundles/org.eclipse.equinox.p2.ui.importexport/src/org/eclipse/equinox/internal/p2/importexport/internal/wizard/ImportWizard.java index d155c3f29..72c1fe03b 100644 --- a/bundles/org.eclipse.equinox.p2.ui.importexport/src/org/eclipse/equinox/internal/p2/importexport/internal/wizard/ImportWizard.java +++ b/bundles/org.eclipse.equinox.p2.ui.importexport/src/org/eclipse/equinox/internal/p2/importexport/internal/wizard/ImportWizard.java @@ -97,8 +97,8 @@ public class ImportWizard extends InstallWizard implements IImportWizard { if (planSelections.length == 0) { operation = new InstallOperation(new ProvisioningSession(AbstractPage.agent), new ArrayList<IInstallableUnit>()) { @Override - protected void computeProfileChangeRequest(MultiStatus status, IProgressMonitor monitor) { - monitor.done(); + protected void computeProfileChangeRequest(MultiStatus status, IProgressMonitor progressMonitor) { + progressMonitor.done(); } @Override @@ -117,18 +117,17 @@ public class ImportWizard extends InstallWizard implements IImportWizard { throw new InterruptedException(); if (operation.resolveModal(sub.newChild(200)).getSeverity() == IStatus.CANCEL) throw new InterruptedException(); - else { - if (withRemediation) { - IStatus status = operation.getResolutionResult(); - if (remediationPage != null && shouldRemediate(status)) { - computeRemediationOperation(operation, ui, monitor); - } + if (withRemediation) { + IStatus status = operation.getResolutionResult(); + if (remediationPage != null && shouldRemediate(status)) { + computeRemediationOperation(operation, ui, monitor); } } Display.getDefault().asyncExec(() -> planChanged()); }); } catch (InterruptedException e) { operation = new InstallOperation(new ProvisioningSession(AbstractPage.agent), new ArrayList<IInstallableUnit>()) { + @Override public IStatus getResolutionResult() { return Status.CANCEL_STATUS; diff --git a/bundles/org.eclipse.equinox.p2.ui.importexport/src/org/eclipse/equinox/internal/p2/importexport/internal/wizard/StyledErrorDialog.java b/bundles/org.eclipse.equinox.p2.ui.importexport/src/org/eclipse/equinox/internal/p2/importexport/internal/wizard/StyledErrorDialog.java index f062a0886..4a47dc9c6 100644 --- a/bundles/org.eclipse.equinox.p2.ui.importexport/src/org/eclipse/equinox/internal/p2/importexport/internal/wizard/StyledErrorDialog.java +++ b/bundles/org.eclipse.equinox.p2.ui.importexport/src/org/eclipse/equinox/internal/p2/importexport/internal/wizard/StyledErrorDialog.java @@ -23,8 +23,7 @@ import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.layout.GridDataFactory; import org.eclipse.jface.resource.JFaceResources; import org.eclipse.swt.SWT; -import org.eclipse.swt.accessibility.AccessibleAdapter; -import org.eclipse.swt.accessibility.AccessibleEvent; +import org.eclipse.swt.accessibility.AccessibleListener; import org.eclipse.swt.graphics.Image; import org.eclipse.swt.layout.FillLayout; import org.eclipse.swt.widgets.*; @@ -140,16 +139,13 @@ public class StyledErrorDialog extends MessageDialog { } private void addAccessibleListeners(Label label, final Image image) { - label.getAccessible().addAccessibleListener(new AccessibleAdapter() { - @Override - public void getName(AccessibleEvent event) { - final String accessibleMessage = getAccessibleMessageFor(image); - if (accessibleMessage == null) { - return; - } - event.result = accessibleMessage; + label.getAccessible().addAccessibleListener(AccessibleListener.getNameAdapter(event -> { + final String accessibleMessage = getAccessibleMessageFor(image); + if (accessibleMessage == null) { + return; } - }); + event.result = accessibleMessage; + })); } private String getAccessibleMessageFor(Image image) { |