diff options
Diffstat (limited to 'bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs')
41 files changed, 209 insertions, 0 deletions
diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/AddRepositoryDialog.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/AddRepositoryDialog.java index e956b0427..13e436cbf 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/AddRepositoryDialog.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/AddRepositoryDialog.java @@ -51,6 +51,7 @@ public abstract class AddRepositoryDialog extends RepositoryNameAndLocationDialo PlatformUI.getWorkbench().getHelpSystem().setHelp(parentShell, IProvHelpContextIds.ADD_REPOSITORY_DIALOG); } + @Override protected Control createDialogArea(Composite parent) { Composite comp = new Composite(parent, SWT.NONE); initializeDialogUnits(comp); @@ -68,6 +69,7 @@ public abstract class AddRepositoryDialog extends RepositoryNameAndLocationDialo Button localButton = new Button(comp, SWT.PUSH); localButton.setText(ProvUIMessages.RepositoryGroup_LocalRepoBrowseButton); localButton.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent event) { DirectoryDialog dialog = new DirectoryDialog(getShell(), SWT.APPLICATION_MODAL); dialog.setMessage(ProvUIMessages.RepositoryGroup_SelectRepositoryDirectory); @@ -88,6 +90,7 @@ public abstract class AddRepositoryDialog extends RepositoryNameAndLocationDialo Button archiveButton = new Button(comp, SWT.PUSH); archiveButton.setText(ProvUIMessages.RepositoryGroup_ArchivedRepoBrowseButton); archiveButton.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent event) { FileDialog dialog = new FileDialog(getShell(), SWT.APPLICATION_MODAL); dialog.setText(ProvUIMessages.RepositoryGroup_RepositoryFile); @@ -116,6 +119,7 @@ public abstract class AddRepositoryDialog extends RepositoryNameAndLocationDialo } } + @Override protected boolean handleOk() { IStatus status = addRepository(); return status.isOK(); diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/ApplyProfileChangesDialog.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/ApplyProfileChangesDialog.java index 7e91542c3..9ee371dbb 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/ApplyProfileChangesDialog.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/ApplyProfileChangesDialog.java @@ -64,6 +64,7 @@ public class ApplyProfileChangesDialog extends MessageDialog { * * @see org.eclipse.jface.dialogs.Dialog#buttonPressed(int) */ + @Override protected void buttonPressed(int id) { if (id == 0) { // YES returnCode = PROFILE_RESTART; diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/AvailableIUGroup.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/AvailableIUGroup.java index f3747d482..d0b23ff82 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/AvailableIUGroup.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/AvailableIUGroup.java @@ -126,6 +126,7 @@ public class AvailableIUGroup extends StructuredIUGroup { createGroupComposite(parent); } + @Override protected StructuredViewer createViewer(Composite parent) { // Table of available IU's filteredTree = new DelayedFilterCheckboxTree(parent, SWT.MULTI | SWT.FULL_SELECTION | SWT.H_SCROLL | SWT.V_SCROLL | SWT.BORDER, filter, getPreFilterJobProvider()); @@ -139,10 +140,12 @@ public class AvailableIUGroup extends StructuredIUGroup { // a newly loaded visible and expanding it. Setting the load job to null // will take care of this. availableIUViewer.getTree().addTreeListener(new TreeListener() { + @Override public void treeCollapsed(TreeEvent e) { lastRequestedLoadJob = null; } + @Override public void treeExpanded(TreeEvent e) { lastRequestedLoadJob = null; } @@ -172,10 +175,12 @@ public class AvailableIUGroup extends StructuredIUGroup { filteredTree.contentProviderSet(contentProvider); final StructuredViewerProvisioningListener listener = new StructuredViewerProvisioningListener(getClass().getName(), availableIUViewer, ProvUIProvisioningListener.PROV_EVENT_METADATA_REPOSITORY, getProvisioningUI().getOperationRunner()) { + @Override protected void repositoryAdded(final RepositoryEvent event) { makeRepositoryVisible(event.getRepositoryLocation()); } + @Override protected void refreshViewer() { final TreeViewer treeViewer = filteredTree.getViewer(); final Tree tree = treeViewer.getTree(); @@ -191,6 +196,7 @@ public class AvailableIUGroup extends StructuredIUGroup { ProvUI.getProvisioningEventBus(getProvisioningUI().getSession()).addListener(listener); availableIUViewer.getControl().addDisposeListener(new DisposeListener() { + @Override public void widgetDisposed(DisposeEvent e) { ProvUI.getProvisioningEventBus(getProvisioningUI().getSession()).removeListener(listener); } @@ -217,6 +223,7 @@ public class AvailableIUGroup extends StructuredIUGroup { } else if (filterConstant == AVAILABLE_NONE) { // Dummy object that explains empty site list return new ProvElement(null) { + @Override public Object[] getChildren(Object o) { String description; String name; @@ -234,6 +241,7 @@ public class AvailableIUGroup extends StructuredIUGroup { return new Object[] {new EmptyElementExplanation(null, severity, name, description)}; } + @Override public String getLabel(Object o) { // Label not needed for input return null; @@ -260,6 +268,7 @@ public class AvailableIUGroup extends StructuredIUGroup { * Return the composite that contains the controls in this group. * @return the composite */ + @Override public Composite getComposite() { return super.getComposite(); } @@ -268,6 +277,7 @@ public class AvailableIUGroup extends StructuredIUGroup { * Get the viewer used to represent the available IU's * @return the viewer */ + @Override public StructuredViewer getStructuredViewer() { return super.getStructuredViewer(); } @@ -277,11 +287,13 @@ public class AvailableIUGroup extends StructuredIUGroup { * @return the array of selected IU's */ // overridden for visibility in the public package + @Override public java.util.List<IInstallableUnit> getSelectedIUs() { return super.getSelectedIUs(); } // overridden to weed out non-IU elements, such as repositories or empty explanations + @Override public Object[] getSelectedIUElements() { Object[] elements = ((IStructuredSelection) viewer.getSelection()).toArray(); ArrayList<Object> list = new ArrayList<Object>(elements.length); @@ -329,6 +341,7 @@ public class AvailableIUGroup extends StructuredIUGroup { if (!(queryContext.getViewType() == IUViewQueryContext.AVAILABLE_VIEW_BY_REPO)) { if (Display.getCurrent() == null) display.asyncExec(new Runnable() { + @Override public void run() { updateAvailableViewState(); } @@ -339,6 +352,7 @@ public class AvailableIUGroup extends StructuredIUGroup { } // First reset the input so that the new repo shows up Runnable runnable = new Runnable() { + @Override public void run() { final TreeViewer treeViewer = filteredTree.getViewer(); final Tree tree = treeViewer.getTree(); @@ -358,6 +372,7 @@ public class AvailableIUGroup extends StructuredIUGroup { // We do it in a job to be safe, and when it's done, we update // the UI. Job job = new Job(NLS.bind(ProvUIMessages.AvailableIUGroup_LoadingRepository, URIUtil.toUnencodedString(location))) { + @Override protected IStatus run(IProgressMonitor monitor) { try { getProvisioningUI().loadMetadataRepository(location, true, monitor); @@ -373,9 +388,11 @@ public class AvailableIUGroup extends StructuredIUGroup { job.setSystem(true); job.setUser(false); job.addJobChangeListener(new JobChangeAdapter() { + @Override public void done(final IJobChangeEvent event) { if (event.getResult().isOK()) display.asyncExec(new Runnable() { + @Override @SuppressWarnings("rawtypes") public void run() { final TreeViewer treeViewer = filteredTree.getViewer(); @@ -414,6 +431,7 @@ public class AvailableIUGroup extends StructuredIUGroup { setUseBoldFontForFilteredItems(queryContext.getViewType() != IUViewQueryContext.AVAILABLE_VIEW_FLAT); BusyIndicator.showWhile(display, new Runnable() { + @Override public void run() { parent.setRedraw(false); getCheckboxTreeViewer().setInput(getNewInput()); @@ -423,6 +441,7 @@ public class AvailableIUGroup extends StructuredIUGroup { }); } + @Override public Control getDefaultFocusControl() { if (filteredTree != null) return filteredTree.getFilterControl(); @@ -433,6 +452,7 @@ public class AvailableIUGroup extends StructuredIUGroup { return filteredTree.getFilterString(); } + @Override protected GridData getViewerGridData() { GridData data = super.getViewerGridData(); data.heightHint = convertHeightInCharsToPixels(ILayoutConstants.DEFAULT_TABLE_HEIGHT); @@ -488,6 +508,7 @@ public class AvailableIUGroup extends StructuredIUGroup { private IPreFilterJobProvider getPreFilterJobProvider() { return new IPreFilterJobProvider() { + @Override public Job getPreFilterJob() { switch (filterConstant) { case AVAILABLE_ALL : diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/AvailableIUPatternFilter.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/AvailableIUPatternFilter.java index 5dcdeb64b..c32364f9c 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/AvailableIUPatternFilter.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/AvailableIUPatternFilter.java @@ -52,6 +52,7 @@ public class AvailableIUPatternFilter extends PatternFilter { * (non-Javadoc) * @see org.eclipse.ui.internal.dialogs.PatternFilter#isElementSelectable(java.lang.Object) */ + @Override public boolean isElementSelectable(Object element) { return element instanceof IIUElement && !(element instanceof CategoryElement); } @@ -62,6 +63,7 @@ public class AvailableIUPatternFilter extends PatternFilter { * (non-Javadoc) * @see org.eclipse.ui.dialogs.PatternFilter#setPattern(java.lang.String) */ + @Override public void setPattern(String patternString) { super.setPattern(patternString); this.patternString = patternString; @@ -73,6 +75,7 @@ public class AvailableIUPatternFilter extends PatternFilter { * (non-Javadoc) * @see org.eclipse.ui.dialogs.PatternFilter#isParentMatch(org.eclipse.jface.viewers.Viewer, java.lang.Object) */ + @Override protected boolean isParentMatch(Viewer viewer, Object element) { if (patternString == null || patternString.length() == 0) return true; @@ -82,6 +85,7 @@ public class AvailableIUPatternFilter extends PatternFilter { /* (non-Javadoc) * @see org.eclipse.ui.dialogs.PatternFilter#isElementMatch(org.eclipse.jface.viewers.Viewer, java.lang.Object) */ + @Override protected boolean isLeafMatch(Viewer viewer, Object element) { if (element instanceof CategoryElement) { return false; diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/ComboAutoCompleteField.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/ComboAutoCompleteField.java index cb0d07c84..e60141e56 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/ComboAutoCompleteField.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/ComboAutoCompleteField.java @@ -49,6 +49,7 @@ public class ComboAutoCompleteField { IContentProposalProvider getProposalProvider() { return new IContentProposalProvider() { + @Override public IContentProposal[] getProposals(String contents, int position) { String[] items = getStringItems(); if (contents.length() == 0 || items.length == 0) @@ -75,18 +76,22 @@ public class ComboAutoCompleteField { final String proposal = matches.get(i); proposals[i] = new IContentProposal() { + @Override public String getContent() { return proposal; } + @Override public int getCursorPosition() { return proposal.length(); } + @Override public String getDescription() { return null; } + @Override public String getLabel() { return null; } diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/ContainerCheckedTreeViewer.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/ContainerCheckedTreeViewer.java index a523de852..10aca757b 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/ContainerCheckedTreeViewer.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/ContainerCheckedTreeViewer.java @@ -84,14 +84,17 @@ public class ContainerCheckedTreeViewer extends CheckboxTreeViewer { private void initViewer() { setUseHashlookup(true); addCheckStateListener(new ICheckStateListener() { + @Override public void checkStateChanged(CheckStateChangedEvent event) { doCheckStateChanged(event.getElement()); } }); addTreeListener(new ITreeViewerListener() { + @Override public void treeCollapsed(TreeExpansionEvent event) { } + @Override public void treeExpanded(TreeExpansionEvent event) { Widget item = findItem(event.getElement()); if (item instanceof TreeItem) { @@ -185,6 +188,7 @@ public class ContainerCheckedTreeViewer extends CheckboxTreeViewer { /* (non-Javadoc) * @see org.eclipse.jface.viewers.ICheckable#setChecked(java.lang.Object, boolean) */ + @Override public boolean setChecked(Object element, boolean state) { if (super.setChecked(element, state)) { doCheckStateChanged(element); @@ -196,6 +200,7 @@ public class ContainerCheckedTreeViewer extends CheckboxTreeViewer { /* (non-Javadoc) * @see org.eclipse.jface.viewers.CheckboxTreeViewer#setCheckedElements(java.lang.Object[]) */ + @Override public void setCheckedElements(Object[] elements) { super.setCheckedElements(elements); for (int i = 0; i < elements.length; i++) { @@ -206,6 +211,7 @@ public class ContainerCheckedTreeViewer extends CheckboxTreeViewer { /* (non-Javadoc) * @see org.eclipse.jface.viewers.AbstractTreeViewer#setExpanded(org.eclipse.swt.widgets.Item, boolean) */ + @Override protected void setExpanded(Item item, boolean expand) { super.setExpanded(item, expand); if (expand && item instanceof TreeItem) { @@ -216,6 +222,7 @@ public class ContainerCheckedTreeViewer extends CheckboxTreeViewer { /* (non-Javadoc) * @see org.eclipse.jface.viewers.CheckboxTreeViewer#getCheckedElements() */ + @Override public Object[] getCheckedElements() { Object[] checked = super.getCheckedElements(); // add all items that are children of a checked node but not created yet @@ -259,12 +266,14 @@ public class ContainerCheckedTreeViewer extends CheckboxTreeViewer { // won't be. The best we can do is at least turn off all the // rippling checks that happen during this method since we are going // to reset all the checkmarks anyway. + @Override protected void preservingSelection(Runnable updateCode) { rippleCheckMarks = false; super.preservingSelection(updateCode); rippleCheckMarks = true; } + @Override protected void internalRefresh(Object element, boolean updateLabels) { saveCheckedState(); super.internalRefresh(element, updateLabels); diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/CopyHandler.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/CopyHandler.java index 20253dfe1..1f89316b7 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/CopyHandler.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/CopyHandler.java @@ -30,6 +30,7 @@ public class CopyHandler extends AbstractHandler { /* (non-Javadoc) * @see org.eclipse.core.commands.IHandler#execute(org.eclipse.core.commands.ExecutionEvent) */ + @Override public Object execute(ExecutionEvent event) { Object control = HandlerUtil.getVariable(event, ISources.ACTIVE_FOCUS_CONTROL_NAME); if (control instanceof Control) diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/CopyPopup.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/CopyPopup.java index 14b63d7e9..a816d4662 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/CopyPopup.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/CopyPopup.java @@ -32,6 +32,7 @@ public class CopyPopup { /* * @see SelectionListener.widgetSelected (SelectionEvent) */ + @Override public void widgetSelected(SelectionEvent e) { copySource.copyToClipboard(control); } @@ -39,6 +40,7 @@ public class CopyPopup { /* * @see SelectionListener.widgetDefaultSelected(SelectionEvent) */ + @Override public void widgetDefaultSelected(SelectionEvent e) { copySource.copyToClipboard(control); } diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/CopyUtils.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/CopyUtils.java index 279580a1b..bc1524d2f 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/CopyUtils.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/CopyUtils.java @@ -58,16 +58,19 @@ public class CopyUtils { if (fs != null && hs != null) { fs.addFocusTracker(control, CONTROL_ID); final IHandlerActivation handlerActivation = hs.activateHandler(CopyHandler.ID, new CopyHandler(copyable), new Expression() { + @Override public EvaluationResult evaluate(IEvaluationContext context) { return context.getVariable(ISources.ACTIVE_FOCUS_CONTROL_NAME) == control ? EvaluationResult.TRUE : EvaluationResult.FALSE; } + @Override public void collectExpressionInfo(final ExpressionInfo info) { info.addVariableNameAccess(ISources.ACTIVE_FOCUS_CONTROL_NAME); } }); control.addDisposeListener(new DisposeListener() { + @Override public void widgetDisposed(DisposeEvent e) { hs.deactivateHandler(handlerActivation); } diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/DelayedFilterCheckboxTree.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/DelayedFilterCheckboxTree.java index f9101172d..62eb5005b 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/DelayedFilterCheckboxTree.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/DelayedFilterCheckboxTree.java @@ -366,6 +366,7 @@ public class DelayedFilterCheckboxTree extends FilteredTree { return new Object[0]; } + @Override protected String getFilterString() { return super.getFilterString(); } diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/IUCopyrightPropertyPage.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/IUCopyrightPropertyPage.java index 6eebf3e56..b749caf55 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/IUCopyrightPropertyPage.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/IUCopyrightPropertyPage.java @@ -30,6 +30,7 @@ import org.eclipse.swt.widgets.*; */ public class IUCopyrightPropertyPage extends IUPropertyPage { + @Override protected Control createIUPage(Composite parent, IInstallableUnit iu) { // Get the copyright in the current locale final ICopyright copyright = iu.getCopyright(null); @@ -60,6 +61,7 @@ public class IUCopyrightPropertyPage extends IUPropertyPage { gd.widthHint = computeWidthLimit(link, 80); link.setLayoutData(gd); link.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { try { showURL(copyright.getLocation().toURL()); diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/IUDetailsGroup.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/IUDetailsGroup.java index d63f4a81d..0d665e329 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/IUDetailsGroup.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/IUDetailsGroup.java @@ -138,6 +138,7 @@ public class IUDetailsGroup { link.setText(text); link.addListener(SWT.Selection, new Listener() { + @Override public void handleEvent(Event event) { IAction linkAction = getLinkAction(event.widget); if (linkAction != null) { diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/IUGeneralInfoPropertyPage.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/IUGeneralInfoPropertyPage.java index 9be99dd25..3af6f1e30 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/IUGeneralInfoPropertyPage.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/IUGeneralInfoPropertyPage.java @@ -29,6 +29,7 @@ import org.eclipse.swt.widgets.*; */ public class IUGeneralInfoPropertyPage extends IUPropertyPage { + @Override protected Control createIUPage(Composite parent, IInstallableUnit iu) { Composite composite = new Composite(parent, SWT.NONE); GridLayout layout = new GridLayout(); @@ -102,6 +103,7 @@ public class IUGeneralInfoPropertyPage extends IUPropertyPage { gd.widthHint = computeWidthLimit(link, 80); link.setLayoutData(gd); link.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { showURL(url); } diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/IULicensePropertyPage.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/IULicensePropertyPage.java index d5755af4e..797d60dac 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/IULicensePropertyPage.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/IULicensePropertyPage.java @@ -30,6 +30,7 @@ import org.eclipse.swt.widgets.*; */ public class IULicensePropertyPage extends IUPropertyPage { + @Override protected Control createIUPage(Composite parent, IInstallableUnit iu) { // Get the license in the default locale Iterator<ILicense> licenses = iu.getLicenses(null).iterator(); @@ -62,6 +63,7 @@ public class IULicensePropertyPage extends IUPropertyPage { gd.widthHint = computeWidthLimit(link, 80); link.setLayoutData(gd); link.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { try { showURL(license.getLocation().toURL()); diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/IUPropertyPage.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/IUPropertyPage.java index c4cbaf5ce..b014c8ca9 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/IUPropertyPage.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/IUPropertyPage.java @@ -33,6 +33,7 @@ import org.eclipse.ui.statushandlers.StatusManager; */ public abstract class IUPropertyPage extends PropertyPage { + @Override protected Control createContents(Composite parent) { noDefaultAndApplyButton(); IInstallableUnit iu = ProvUI.getAdapter(getElement(), IInstallableUnit.class); diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/InstallWizardPage.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/InstallWizardPage.java index b4f3bc5e2..b3f555fc4 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/InstallWizardPage.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/InstallWizardPage.java @@ -24,10 +24,12 @@ public class InstallWizardPage extends SizeComputingWizardPage { setDescription(ProvUIMessages.InstallWizardPage_NoCheckboxDescription); } + @Override protected String getOperationLabel() { return ProvUIMessages.InstallIUOperationLabel; } + @Override protected String getOperationTaskName() { return ProvUIMessages.InstallIUOperationTask; } diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/InstalledIUGroup.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/InstalledIUGroup.java index fda71560f..23c48fdb2 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/InstalledIUGroup.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/InstalledIUGroup.java @@ -51,6 +51,7 @@ public class InstalledIUGroup extends StructuredIUGroup { createGroupComposite(parent); } + @Override protected StructuredViewer createViewer(Composite parent) { // Table of installed IU's TreeViewer installedIUViewer = new TreeViewer(parent, SWT.MULTI | SWT.FULL_SELECTION | SWT.H_SCROLL | SWT.V_SCROLL | SWT.BORDER); @@ -74,6 +75,7 @@ public class InstalledIUGroup extends StructuredIUGroup { final StructuredViewerProvisioningListener listener = new StructuredViewerProvisioningListener(getClass().getName(), installedIUViewer, ProvUIProvisioningListener.PROV_EVENT_IU | ProvUIProvisioningListener.PROV_EVENT_PROFILE, getProvisioningUI().getOperationRunner()); ProvUI.getProvisioningEventBus(getProvisioningUI().getSession()).addListener(listener); installedIUViewer.getControl().addDisposeListener(new DisposeListener() { + @Override public void widgetDisposed(DisposeEvent e) { ProvUI.getProvisioningEventBus(getProvisioningUI().getSession()).removeListener(listener); } @@ -101,10 +103,12 @@ public class InstalledIUGroup extends StructuredIUGroup { /** * Get the viewer used to represent the installed IU's */ + @Override public StructuredViewer getStructuredViewer() { return super.getStructuredViewer(); } + @Override public Control getDefaultFocusControl() { return super.getDefaultFocusControl(); } diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/PreselectedIUInstallWizard.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/PreselectedIUInstallWizard.java index 83f09d7f0..9649d29ad 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/PreselectedIUInstallWizard.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/PreselectedIUInstallWizard.java @@ -48,6 +48,7 @@ public class PreselectedIUInstallWizard extends WizardWithLicenses { return super.getStartingPage(); } + @Override protected ISelectableIUsPage createMainPage(IUElementListRoot input, Object[] selections) { mainPage = new SelectableIUsPage(ui, this, input, selections); mainPage.setTitle(ProvUIMessages.PreselectedIUInstallWizard_Title); @@ -56,10 +57,12 @@ public class PreselectedIUInstallWizard extends WizardWithLicenses { return mainPage; } + @Override protected ResolutionResultsWizardPage createResolutionPage() { return new InstallWizardPage(ui, this, root, operation); } + @Override protected void initializeResolutionModelElements(Object[] selectedElements) { root = new IUElementListRoot(ui); ArrayList<AvailableIUElement> list = new ArrayList<AvailableIUElement>(selectedElements.length); @@ -82,6 +85,7 @@ public class PreselectedIUInstallWizard extends WizardWithLicenses { /* (non-Javadoc) * @see org.eclipse.equinox.internal.p2.ui.dialogs.ProvisioningOperationWizard#getErrorReportingPage() */ + @Override protected IResolutionErrorReportingPage createErrorReportingPage() { return (IResolutionErrorReportingPage) mainPage; } @@ -89,6 +93,7 @@ public class PreselectedIUInstallWizard extends WizardWithLicenses { /* (non-Javadoc) * @see org.eclipse.equinox.internal.p2.ui.dialogs.ProvisioningOperationWizard#getProfileChangeOperation(java.lang.Object[]) */ + @Override protected ProfileChangeOperation getProfileChangeOperation(Object[] elements) { InstallOperation op = new InstallOperation(ui.getSession(), ElementUtils.elementsToIUs(elements)); op.setProfileId(getProfileId()); diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/ProvisioningOperationWizard.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/ProvisioningOperationWizard.java index f1f467c7d..cfae642fb 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/ProvisioningOperationWizard.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/ProvisioningOperationWizard.java @@ -80,6 +80,7 @@ public abstract class ProvisioningOperationWizard extends Wizard { * (non-Javadoc) * @see org.eclipse.jface.wizard.Wizard#addPages() */ + @Override public void addPages() { mainPage = createMainPage(root, planSelections); addPage(mainPage); @@ -101,6 +102,7 @@ public abstract class ProvisioningOperationWizard extends Wizard { protected abstract ResolutionResultsWizardPage createResolutionPage(); + @Override public boolean performFinish() { return resolutionPage.performFinish(); } @@ -114,6 +116,7 @@ public abstract class ProvisioningOperationWizard extends Wizard { * @see org.eclipse.jface.wizard.Wizard#getPreviousPage(org.eclipse.jface.wizard.IWizardPage) * */ + @Override public IWizardPage getPreviousPage(IWizardPage page) { if (page == errorPage) { return mainPage; @@ -126,6 +129,7 @@ public abstract class ProvisioningOperationWizard extends Wizard { * @see org.eclipse.jface.wizard.Wizard#getNextPage(org.eclipse.jface.wizard.IWizardPage) * */ + @Override public IWizardPage getNextPage(IWizardPage page) { // If we are moving from the main page or error page, we may need to resolve before // advancing. @@ -133,6 +137,7 @@ public abstract class ProvisioningOperationWizard extends Wizard { if (page == remediationPage) { try { getContainer().run(true, true, new IRunnableWithProgress() { + @Override public void run(IProgressMonitor monitor) { remediationOperation.setCurrentRemedy(remediationPage.getRemediationGroup().getCurrentRemedy()); remediationOperation.resolveModal(monitor); @@ -285,6 +290,7 @@ public abstract class ProvisioningOperationWizard extends Wizard { operation.setProvisioningContext(provisioningContext); try { runnableContext.run(true, true, new IRunnableWithProgress() { + @Override public void run(IProgressMonitor monitor) { operation.resolveModal(monitor); if (withRemediation) { @@ -372,6 +378,7 @@ public abstract class ProvisioningOperationWizard extends Wizard { * (non-Javadoc) * @see org.eclipse.jface.wizard.Wizard#createPageControls(org.eclipse.swt.widgets.Composite) */ + @Override public void createPageControls(Composite pageContainer) { // We call this so that wizards ignore all repository eventing that occurs while the wizard is // open. Otherwise, we can get an add event when a repository loads its references that we @@ -387,6 +394,7 @@ public abstract class ProvisioningOperationWizard extends Wizard { // job has not been scheduled. Set a listener so we can report accumulated errors and // schedule it. repoPreloadJob.addJobChangeListener(new JobChangeAdapter() { + @Override public void done(IJobChangeEvent e) { asyncReportLoadFailures(); } @@ -402,6 +410,7 @@ public abstract class ProvisioningOperationWizard extends Wizard { // job is waiting, sleeping, running, report failures when // it's done repoPreloadJob.addJobChangeListener(new JobChangeAdapter() { + @Override public void done(IJobChangeEvent e) { asyncReportLoadFailures(); } @@ -416,6 +425,7 @@ public abstract class ProvisioningOperationWizard extends Wizard { * (non-Javadoc) * @see org.eclipse.jface.wizard.Wizard#dispose() */ + @Override public void dispose() { ui.signalRepositoryOperationComplete(null, false); super.dispose(); @@ -424,6 +434,7 @@ public abstract class ProvisioningOperationWizard extends Wizard { void asyncReportLoadFailures() { if (repoPreloadJob != null && getShell() != null && !getShell().isDisposed()) { getShell().getDisplay().asyncExec(new Runnable() { + @Override public void run() { if (PlatformUI.isWorkbenchRunning() && getShell() != null && !getShell().isDisposed()) repoPreloadJob.reportAccumulatedStatus(); diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/ProvisioningWizardDialog.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/ProvisioningWizardDialog.java index 706ffb9a9..77fb306f4 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/ProvisioningWizardDialog.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/ProvisioningWizardDialog.java @@ -34,6 +34,7 @@ public class ProvisioningWizardDialog extends WizardDialog { setBlockOnOpen(false); } + @Override protected IDialogSettings getDialogBoundsSettings() { IDialogSettings settings = ProvUIActivator.getDefault().getDialogSettings(); IDialogSettings section = settings.getSection(wizard.getDialogSettingsSectionName()); @@ -46,6 +47,7 @@ public class ProvisioningWizardDialog extends WizardDialog { /** * @see org.eclipse.jface.window.Window#close() */ + @Override public boolean close() { if (getShell() != null && !getShell().isDisposed()) { wizard.saveBoundsRelatedSettings(); diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/ProvisioningWizardPage.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/ProvisioningWizardPage.java index b5759fc0b..f79c85c99 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/ProvisioningWizardPage.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/ProvisioningWizardPage.java @@ -36,6 +36,7 @@ abstract class ProvisioningWizardPage extends WizardPage implements ICopyable { return wizard; } + @Override public void copyToClipboard(Control activeControl) { String text = getClipboardText(activeControl); if (text.length() == 0) diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/RemediationGroup.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/RemediationGroup.java index 87ee6df53..1dc16b2cf 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/RemediationGroup.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/RemediationGroup.java @@ -61,19 +61,23 @@ public class RemediationGroup { public class RemedyContentProvider implements ITreeContentProvider { + @Override public void dispose() { // not needed } + @Override public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { // not needed } + @Override public Object[] getElements(Object inputElement) { Object[] elements = ElementUtils.requestToRemedyElementsCategories((Remedy) inputElement); return elements; } + @Override public Object[] getChildren(Object parentElement) { if (parentElement instanceof RemedyElementCategory) { RemedyElementCategory category = (RemedyElementCategory) parentElement; @@ -82,10 +86,12 @@ public class RemediationGroup { return null; } + @Override public Object getParent(Object element) { return null; } + @Override public boolean hasChildren(Object element) { if (element instanceof RemedyElementCategory) { return true; @@ -115,6 +121,7 @@ public class RemediationGroup { descriptionLabel.setText(ProvUIMessages.RemediationPage_SubDescription); solutionslistener = new Listener() { + @Override public void handleEvent(Event e) { Button btn = (Button) e.widget; Remedy remedy = (btn.getData() == null ? null : (Remedy) btn.getData()); @@ -152,6 +159,7 @@ public class RemediationGroup { buildMyOwnSolution.addListener(SWT.Selection, solutionslistener); Listener checkboxListener = new Listener() { + @Override public void handleEvent(Event e) { currentRemedy = searchRemedyMatchingUserChoices(); refreshResultComposite(); @@ -221,6 +229,7 @@ public class RemediationGroup { nameColumn.getColumn().setMoveable(true); nameColumn.getColumn().addSelectionListener(columnChangeListener(0)); nameColumn.setLabelProvider(new ColumnLabelProvider() { + @Override public String getText(Object element) { if (element instanceof RemedyElementCategory) return ((RemedyElementCategory) element).getName(); @@ -234,6 +243,7 @@ public class RemediationGroup { return super.getText(element); } + @Override public Image getImage(Object element) { if (element instanceof RemedyElementCategory) { RemedyElementCategory category = (RemedyElementCategory) element; @@ -269,6 +279,7 @@ public class RemediationGroup { return super.getImage(element); } + @Override public String getToolTipText(Object element) { if (element instanceof RemedyIUDetail) { RemedyIUDetail iuDetail = (RemedyIUDetail) element; @@ -312,6 +323,7 @@ public class RemediationGroup { versionColumn.getColumn().setWidth(200); versionColumn.getColumn().addSelectionListener(columnChangeListener(1)); versionColumn.setLabelProvider(new ColumnLabelProvider() { + @Override public String getText(Object element) { if (element instanceof RemedyIUDetail) { RemedyIUDetail iu = (RemedyIUDetail) element; @@ -327,6 +339,7 @@ public class RemediationGroup { idColumn.getColumn().addSelectionListener(columnChangeListener(2)); idColumn.setLabelProvider(new ColumnLabelProvider() { + @Override public String getText(Object element) { if (element instanceof RemedyIUDetail) { RemedyIUDetail iu = (RemedyIUDetail) element; diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/RemediationPage.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/RemediationPage.java index 3309f13b6..12c90c676 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/RemediationPage.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/RemediationPage.java @@ -41,6 +41,7 @@ public class RemediationPage extends ResolutionStatusPage { } } + @Override public void createControl(Composite parent) { mainComposite = new Composite(parent, SWT.NONE); mainComposite.setLayout(new GridLayout()); @@ -61,6 +62,7 @@ public class RemediationPage extends ResolutionStatusPage { return remediationGroup; } + @Override public boolean canFlipToNextPage() { return isPageComplete() && remediationGroup.getCurrentRemedy() != null; } diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/RepositoryManipulatorDropTarget.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/RepositoryManipulatorDropTarget.java index 87d5b4752..a4f1cb751 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/RepositoryManipulatorDropTarget.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/RepositoryManipulatorDropTarget.java @@ -46,6 +46,7 @@ public class RepositoryManipulatorDropTarget extends URLDropAdapter { this.control = control; } + @Override protected void handleDrop(String urlText, final DropTargetEvent event) { event.detail = DND.DROP_NONE; final URI[] location = new URI[1]; @@ -60,6 +61,7 @@ public class RepositoryManipulatorDropTarget extends URLDropAdapter { Job job = new WorkbenchJob(ProvUIMessages.RepositoryManipulatorDropTarget_DragAndDropJobLabel) { + @Override public IStatus runInUIThread(IProgressMonitor monitor) { IStatus status = tracker.validateRepositoryLocation(ui.getSession(), location[0], false, monitor); if (status.isOK()) { diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/RepositoryNameAndLocationDialog.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/RepositoryNameAndLocationDialog.java index af9c7e542..02e554472 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/RepositoryNameAndLocationDialog.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/RepositoryNameAndLocationDialog.java @@ -49,11 +49,13 @@ public class RepositoryNameAndLocationDialog extends StatusDialog { setTitle(ProvUIMessages.RepositoryNameAndLocationDialog_Title); } + @Override protected void createButtonsForButtonBar(Composite parent) { okButton = createButton(parent, IDialogConstants.OK_ID, IDialogConstants.OK_LABEL, true); createButton(parent, IDialogConstants.CANCEL_ID, IDialogConstants.CANCEL_LABEL, false); } + @Override protected Control createDialogArea(Composite parent) { Composite comp = new Composite(parent, SWT.NONE); initializeDialogUnits(comp); @@ -82,6 +84,7 @@ public class RepositoryNameAndLocationDialog extends StatusDialog { return ui.getRepositoryTracker(); } + @Override protected void okPressed() { if (handleOk()) super.okPressed(); @@ -148,6 +151,7 @@ public class RepositoryNameAndLocationDialog extends StatusDialog { status[0] = Status.OK_STATUS; else BusyIndicator.showWhile(getShell().getDisplay(), new Runnable() { + @Override public void run() { status[0] = getRepositoryTracker().validateRepositoryLocation(ui.getSession(), userLocation, contactRepositories, null); } @@ -165,6 +169,7 @@ public class RepositoryNameAndLocationDialog extends StatusDialog { } + @Override protected void updateButtonsEnableState(IStatus status) { setOkEnablement(!status.matches(IStatus.ERROR)); } @@ -215,6 +220,7 @@ public class RepositoryNameAndLocationDialog extends StatusDialog { target.setTransfer(new Transfer[] {URLTransfer.getInstance(), FileTransfer.getInstance()}); target.addDropListener(new TextURLDropAdapter(url, true)); url.addModifyListener(new ModifyListener() { + @Override public void modifyText(ModifyEvent e) { validateRepositoryURL(false); } diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/RepositorySelectionGroup.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/RepositorySelectionGroup.java index 8d0810169..cef599241 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/RepositorySelectionGroup.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/RepositorySelectionGroup.java @@ -119,10 +119,12 @@ public class RepositorySelectionGroup { repoCombo = new Combo(comboComposite, SWT.DROP_DOWN); repoCombo.addSelectionListener(new SelectionListener() { + @Override public void widgetDefaultSelected(SelectionEvent e) { repoComboSelectionChanged(); } + @Override public void widgetSelected(SelectionEvent e) { repoComboSelectionChanged(); } @@ -133,6 +135,7 @@ public class RepositorySelectionGroup { repoCombo.setVisibleItemCount(COUNT_VISIBLE_ITEMS); repoCombo.addKeyListener(new KeyAdapter() { + @Override public void keyPressed(KeyEvent e) { if (e.keyCode == SWT.CR || e.keyCode == SWT.KEYPAD_CR) addRepository(false); @@ -142,6 +145,7 @@ public class RepositorySelectionGroup { // We don't ever want this to be interpreted as a default // button event repoCombo.addTraverseListener(new TraverseListener() { + @Override public void keyTraversed(TraverseEvent e) { if (e.detail == SWT.TRAVERSE_RETURN) { e.doit = false; @@ -155,6 +159,7 @@ public class RepositorySelectionGroup { repoCombo.setLayoutData(gd); repoCombo.setFont(comboComposite.getFont()); repoCombo.addModifyListener(new ModifyListener() { + @Override public void modifyText(ModifyEvent event) { URI location = null; IStatus status = null; @@ -185,6 +190,7 @@ public class RepositorySelectionGroup { /* (non-Javadoc) * @see org.eclipse.equinox.internal.provisional.p2.ui.dialogs.URLDropAdapter#handleURLString(java.lang.String, org.eclipse.swt.dnd.DropTargetEvent) */ + @Override protected void handleDrop(String urlText, DropTargetEvent event) { repoCombo.setText(urlText); event.detail = DND.DROP_LINK; @@ -195,10 +201,12 @@ public class RepositorySelectionGroup { Button button = new Button(comboComposite, SWT.PUSH); button.setText(ProvUIMessages.AvailableIUsPage_AddButton); button.addSelectionListener(new SelectionListener() { + @Override public void widgetDefaultSelected(SelectionEvent e) { addRepository(true); } + @Override public void widgetSelected(SelectionEvent e) { addRepository(true); } @@ -208,6 +216,7 @@ public class RepositorySelectionGroup { // Link to repository manipulator repoManipulatorLink = createLink(comboComposite, new Action() { + @Override public void runWithEvent(Event event) { if (repositoryManipulationHook != null) repositoryManipulationHook.preManipulateRepositories(); @@ -223,6 +232,7 @@ public class RepositorySelectionGroup { addComboProvisioningListeners(); parent.addDisposeListener(new DisposeListener() { + @Override public void widgetDisposed(DisposeEvent e) { removeProvisioningListeners(); } @@ -298,6 +308,7 @@ public class RepositorySelectionGroup { // use a delay to show the validation method because the very next // selection or keystroke might fix it repoCombo.getDisplay().timerExec(500, new Runnable() { + @Override public void run() { if (repoDec != null && repoDec.getImage() != info) repoDec.showHoverText(status.getMessage()); @@ -336,6 +347,7 @@ public class RepositorySelectionGroup { if (sites.length > 0) sortRepoItems(items, comboRepos, hasLocalSites); Runnable runnable = new Runnable() { + @Override public void run() { if (repoCombo == null || repoCombo.isDisposed()) return; @@ -386,6 +398,7 @@ public class RepositorySelectionGroup { link.setText(text); link.addListener(SWT.Selection, new Listener() { + @Override public void handleEvent(Event event) { IAction linkAction = getLinkAction(event.widget); if (linkAction != null) { @@ -417,11 +430,13 @@ public class RepositorySelectionGroup { } final Collator collator = Collator.getInstance(Locale.getDefault()); Comparator<String> stringComparator = new Comparator<String>() { + @Override public int compare(String a, String b) { return collator.compare(a, b); } }; Comparator<URI> uriComparator = new Comparator<URI>() { + @Override public int compare(URI a, URI b) { return collator.compare(uriToString.get(a), uriToString.get(b)); } @@ -493,14 +508,17 @@ public class RepositorySelectionGroup { void addComboProvisioningListeners() { // We need to monitor repository events so that we can adjust the repo combo. comboRepoListener = new ProvUIProvisioningListener(getClass().getName(), ProvUIProvisioningListener.PROV_EVENT_METADATA_REPOSITORY, ui.getOperationRunner()) { + @Override protected void repositoryAdded(RepositoryEvent e) { fillRepoCombo(getSiteString(e.getRepositoryLocation())); } + @Override protected void repositoryRemoved(RepositoryEvent e) { fillRepoCombo(null); } + @Override protected void refreshAll() { fillRepoCombo(null); } @@ -532,6 +550,7 @@ public class RepositorySelectionGroup { } else if (alwaysPrompt) { AddRepositoryDialog dialog = new AddRepositoryDialog(repoCombo.getShell(), ui) { + @Override protected String getInitialLocationText() { if (isNewText) { // see https://bugs.eclipse.org/bugs/show_bug.cgi?id=293068 @@ -565,6 +584,7 @@ public class RepositorySelectionGroup { } else if (isNewText) { try { container.run(false, false, new IRunnableWithProgress() { + @Override public void run(IProgressMonitor monitor) { URI location; IStatus status; diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/ResolutionResultsWizardPage.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/ResolutionResultsWizardPage.java index 4920d4ff2..ba7b09334 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/ResolutionResultsWizardPage.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/ResolutionResultsWizardPage.java @@ -68,6 +68,7 @@ public abstract class ResolutionResultsWizardPage extends ResolutionStatusPage { * (non-Javadoc) * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite) */ + @Override public void createControl(Composite parent) { display = parent.getDisplay(); sashForm = new SashForm(parent, SWT.VERTICAL); @@ -96,6 +97,7 @@ public abstract class ResolutionResultsWizardPage extends ResolutionStatusPage { nameColumn.getColumn().setWidth(400); nameColumn.getColumn().setMoveable(true); nameColumn.setLabelProvider(new ColumnLabelProvider() { + @Override public String getText(Object element) { IInstallableUnit iu = ProvUI.getAdapter(element, IInstallableUnit.class); String label = iu.getProperty(IInstallableUnit.PROP_NAME, null); @@ -104,6 +106,7 @@ public abstract class ResolutionResultsWizardPage extends ResolutionStatusPage { return label; } + @Override public Image getImage(Object element) { if (element instanceof ProvElement) return ((ProvElement) element).getImage(element); @@ -112,6 +115,7 @@ public abstract class ResolutionResultsWizardPage extends ResolutionStatusPage { return null; } + @Override public String getToolTipText(Object element) { if (element instanceof AvailableIUElement && ((AvailableIUElement) element).getImageOverlayId(null) == ProvUIImages.IMG_INFO) return ProvUIMessages.RemedyElementNotHighestVersion; @@ -122,6 +126,7 @@ public abstract class ResolutionResultsWizardPage extends ResolutionStatusPage { versionColumn.getColumn().setText(ProvUIMessages.ProvUI_VersionColumnTitle); versionColumn.getColumn().setWidth(200); versionColumn.setLabelProvider(new ColumnLabelProvider() { + @Override public String getText(Object element) { IInstallableUnit iu = ProvUI.getAdapter(element, IInstallableUnit.class); if (element instanceof IIUElement) { @@ -137,6 +142,7 @@ public abstract class ResolutionResultsWizardPage extends ResolutionStatusPage { idColumn.getColumn().setWidth(200); idColumn.setLabelProvider(new ColumnLabelProvider() { + @Override public String getText(Object element) { IInstallableUnit iu = ProvUI.getAdapter(element, IInstallableUnit.class); return iu.getId(); @@ -177,8 +183,10 @@ public abstract class ResolutionResultsWizardPage extends ResolutionStatusPage { controlsComposite.setLayoutData(gd); final Runnable runnable = new Runnable() { + @Override public void run() { treeViewer.addSelectionChangedListener(new ISelectionChangedListener() { + @Override public void selectionChanged(SelectionChangedEvent event) { setDetailText(resolvedOperation); } @@ -191,6 +199,7 @@ public abstract class ResolutionResultsWizardPage extends ResolutionStatusPage { if (resolvedOperation != null && !resolvedOperation.hasResolved()) { try { getContainer().run(true, false, new IRunnableWithProgress() { + @Override public void run(IProgressMonitor monitor) { resolvedOperation.resolveModal(monitor); display.asyncExec(runnable); @@ -231,10 +240,12 @@ public abstract class ResolutionResultsWizardPage extends ResolutionStatusPage { return null; } + @Override protected Object[] getSelectedElements() { return ((IStructuredSelection) treeViewer.getSelection()).toArray(); } + @Override protected IInstallableUnit getSelectedIU() { java.util.List<IInstallableUnit> units = ElementUtils.elementsToIUs(getSelectedElements()); if (units.size() == 0) @@ -242,6 +253,7 @@ public abstract class ResolutionResultsWizardPage extends ResolutionStatusPage { return units.get(0); } + @Override protected boolean shouldCompleteOnCancel() { return false; } @@ -292,18 +304,22 @@ public abstract class ResolutionResultsWizardPage extends ResolutionStatusPage { protected abstract IQueryable<IInstallableUnit> getQueryable(IProvisioningPlan plan); + @Override protected String getClipboardText(Control control) { return CopyUtils.getIndentedClipboardText(getSelectedElements(), labelProvider); } + @Override protected IUDetailsGroup getDetailsGroup() { return iuDetailsGroup; } + @Override protected boolean isCreated() { return treeViewer != null; } + @Override protected void updateCaches(IUElementListRoot newRoot, ProfileChangeOperation op) { resolvedOperation = op; if (newRoot != null) { @@ -318,14 +334,17 @@ public abstract class ResolutionResultsWizardPage extends ResolutionStatusPage { } } + @Override protected String getDialogSettingsName() { return getWizard().getClass().getName() + "." + DIALOG_SETTINGS_SECTION; //$NON-NLS-1$ } + @Override protected int getColumnWidth(int index) { return treeViewer.getTree().getColumn(index).getWidth(); } + @Override protected SashForm getSashForm() { return sashForm; } diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/ResolutionStatusPage.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/ResolutionStatusPage.java index 390a7feae..deca8e8b1 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/ResolutionStatusPage.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/ResolutionStatusPage.java @@ -278,6 +278,7 @@ public abstract class ResolutionStatusPage extends ProvisioningWizardPage { } } + @Override public void saveBoundsRelatedSettings() { if (!isCreated()) return; diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/SelectableIUsPage.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/SelectableIUsPage.java index 93cec8be5..856e11341 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/SelectableIUsPage.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/SelectableIUsPage.java @@ -71,6 +71,7 @@ public class SelectableIUsPage extends ResolutionStatusPage implements IResoluti * (non-Javadoc) * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite) */ + @Override public void createControl(Composite parent) { display = parent.getDisplay(); sashForm = new SashForm(parent, SWT.VERTICAL); @@ -103,12 +104,14 @@ public class SelectableIUsPage extends ResolutionStatusPage implements IResoluti } tableViewer.addSelectionChangedListener(new ISelectionChangedListener() { + @Override public void selectionChanged(SelectionChangedEvent event) { setDetailText(resolvedOperation); } }); tableViewer.addCheckStateListener(new ICheckStateListener() { + @Override public void checkStateChanged(CheckStateChangedEvent event) { // If the checkEvent is on a locked update element, uncheck it and select it. if (event.getElement() instanceof AvailableUpdateElement) { @@ -183,6 +186,7 @@ public class SelectableIUsPage extends ResolutionStatusPage implements IResoluti selectAll.setText(ProvUIMessages.SelectableIUsPage_Select_All); setButtonLayoutData(selectAll); selectAll.addListener(SWT.Selection, new Listener() { + @Override public void handleEvent(Event event) { tableViewer.setAllChecked(true); updateSelection(); @@ -193,6 +197,7 @@ public class SelectableIUsPage extends ResolutionStatusPage implements IResoluti deselectAll.setText(ProvUIMessages.SelectableIUsPage_Deselect_All); setButtonLayoutData(deselectAll); deselectAll.addListener(SWT.Selection, new Listener() { + @Override public void handleEvent(Event event) { tableViewer.setAllChecked(false); updateSelection(); @@ -218,16 +223,19 @@ public class SelectableIUsPage extends ResolutionStatusPage implements IResoluti return v; } + @Override public Object[] getCheckedIUElements() { if (tableViewer == null) return initialSelections; return tableViewer.getCheckedElements(); } + @Override public Object[] getSelectedIUElements() { return ((IStructuredSelection) tableViewer.getSelection()).toArray(); } + @Override protected Object[] getSelectedElements() { return ((IStructuredSelection) tableViewer.getSelection()).toArray(); } @@ -267,6 +275,7 @@ public class SelectableIUsPage extends ResolutionStatusPage implements IResoluti * (non-Javadoc) * @see org.eclipse.jface.wizard.WizardPage#canFlipToNextPage() */ + @Override public boolean canFlipToNextPage() { return isPageComplete(); } @@ -278,11 +287,13 @@ public class SelectableIUsPage extends ResolutionStatusPage implements IResoluti * (non-Javadoc) * @see org.eclipse.jface.wizard.WizardPage#getPreviousPage() */ + @Override public IWizardPage getPreviousPage() { setPreviousPage(null); return super.getPreviousPage(); } + @Override protected String getClipboardText(Control control) { StringBuffer buffer = new StringBuffer(); Object[] elements = getSelectedElements(); @@ -294,6 +305,7 @@ public class SelectableIUsPage extends ResolutionStatusPage implements IResoluti return buffer.toString(); } + @Override protected IInstallableUnit getSelectedIU() { java.util.List<IInstallableUnit> units = ElementUtils.elementsToIUs(getSelectedElements()); if (units.size() == 0) @@ -301,10 +313,12 @@ public class SelectableIUsPage extends ResolutionStatusPage implements IResoluti return units.get(0); } + @Override protected IUDetailsGroup getDetailsGroup() { return iuDetailsGroup; } + @Override protected boolean isCreated() { return tableViewer != null; } @@ -313,6 +327,7 @@ public class SelectableIUsPage extends ResolutionStatusPage implements IResoluti * (non-Javadoc) * @see org.eclipse.equinox.internal.p2.ui.dialogs.ResolutionStatusPage#updateCaches(org.eclipse.equinox.internal.p2.ui.model.IUElementListRoot, org.eclipse.equinox.p2.operations.ProfileChangeOperation) */ + @Override protected void updateCaches(IUElementListRoot newRoot, ProfileChangeOperation op) { resolvedOperation = op; if (newRoot != null && root != newRoot) { @@ -326,6 +341,7 @@ public class SelectableIUsPage extends ResolutionStatusPage implements IResoluti /* (non-Javadoc) * @see org.eclipse.equinox.internal.p2.ui.dialogs.ISelectableIUsPage#setCheckedElements(java.lang.Object[]) */ + @Override public void setCheckedElements(Object[] elements) { if (tableViewer == null) initialSelections = elements; @@ -333,14 +349,17 @@ public class SelectableIUsPage extends ResolutionStatusPage implements IResoluti tableViewer.setCheckedElements(elements); } + @Override protected SashForm getSashForm() { return sashForm; } + @Override protected String getDialogSettingsName() { return getWizard().getClass().getName() + "." + DIALOG_SETTINGS_SECTION; //$NON-NLS-1$ } + @Override protected int getColumnWidth(int index) { return tableViewer.getTable().getColumn(index).getWidth(); } diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/SizeComputingWizardPage.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/SizeComputingWizardPage.java index d1ee90da3..62ef390ea 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/SizeComputingWizardPage.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/SizeComputingWizardPage.java @@ -59,12 +59,14 @@ public abstract class SizeComputingWizardPage extends ResolutionResultsWizardPag if (sizingJob != null) sizingJob.cancel(); sizingJob = new Job(ProvUIMessages.SizeComputingWizardPage_SizeJobTitle) { + @Override protected IStatus run(IProgressMonitor monitor) { size = ProvUI.getSize(ProvUI.getEngine(getProvisioningUI().getSession()), plan, provisioningContext, monitor); if (monitor.isCanceled()) return Status.CANCEL_STATUS; if (display != null) { display.asyncExec(new Runnable() { + @Override public void run() { updateSizingInfo(); } @@ -80,6 +82,7 @@ public abstract class SizeComputingWizardPage extends ResolutionResultsWizardPag sizingJob.schedule(); } + @Override protected void createSizingInfo(Composite parent) { sizeInfo = new Label(parent, SWT.NONE); GridData data = new GridData(SWT.FILL, SWT.FILL, true, false); @@ -108,6 +111,7 @@ public abstract class SizeComputingWizardPage extends ResolutionResultsWizardPag return NLS.bind(ProvUIMessages.IUDetailsLabelProvider_Bytes, NumberFormat.getInstance().format(new Long(size))); } + @Override public void dispose() { if (sizingJob != null) { sizingJob.cancel(); @@ -115,12 +119,14 @@ public abstract class SizeComputingWizardPage extends ResolutionResultsWizardPag } } + @Override public void updateStatus(IUElementListRoot root, ProfileChangeOperation op) { super.updateStatus(root, op); if (op != null && op.getProvisioningPlan() != null) computeSizing(op.getProvisioningPlan(), op.getProvisioningContext()); } + @Override protected IQueryable<IInstallableUnit> getQueryable(IProvisioningPlan plan) { return plan.getAdditions(); } diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/TextURLDropAdapter.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/TextURLDropAdapter.java index f3eafc2f0..3733bdd46 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/TextURLDropAdapter.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/TextURLDropAdapter.java @@ -32,6 +32,7 @@ public class TextURLDropAdapter extends URLDropAdapter { /* (non-Javadoc) * @see org.eclipse.equinox.internal.provisional.p2.ui.dialogs.URLDropAdapter#handleURLString(java.lang.String, org.eclipse.swt.dnd.DropTargetEvent) */ + @Override protected void handleDrop(String urlText, DropTargetEvent event) { text.setText(urlText); event.detail = DND.DROP_LINK; diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/TrustCertificateDialog.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/TrustCertificateDialog.java index fe2d68036..7c36e5ac4 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/TrustCertificateDialog.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/TrustCertificateDialog.java @@ -44,6 +44,7 @@ public class TrustCertificateDialog extends ListSelectionDialog { detailsButton = new Button(composite, SWT.NONE); detailsButton.setText(ProvUIMessages.TrustCertificateDialog_Details); detailsButton.addSelectionListener(new SelectionListener() { + @Override public void widgetDefaultSelected(SelectionEvent e) { if (selectedCertificate != null) { X509Certificate cert = (X509Certificate) ((TreeNode) selectedCertificate).getValue(); @@ -52,12 +53,14 @@ public class TrustCertificateDialog extends ListSelectionDialog { } } + @Override public void widgetSelected(SelectionEvent e) { widgetDefaultSelected(e); } }); } + @Override protected Control createDialogArea(Composite parent) { Composite composite = (Composite) super.createDialogArea(parent); certificateChainViewer = new TreeViewer(composite, SWT.BORDER); @@ -89,6 +92,7 @@ public class TrustCertificateDialog extends ListSelectionDialog { private ISelectionChangedListener getChainSelectionListener() { return new ISelectionChangedListener() { + @Override public void selectionChanged(SelectionChangedEvent event) { ISelection selection = event.getSelection(); if (selection instanceof StructuredSelection) { @@ -104,6 +108,7 @@ public class TrustCertificateDialog extends ListSelectionDialog { private IDoubleClickListener getDoubleClickListener() { return new IDoubleClickListener() { + @Override public void doubleClick(DoubleClickEvent event) { StructuredSelection selection = (StructuredSelection) event.getSelection(); Object selectedElement = selection.getFirstElement(); @@ -119,6 +124,7 @@ public class TrustCertificateDialog extends ListSelectionDialog { private ISelectionChangedListener getParentSelectionListener() { return new ISelectionChangedListener() { + @Override public void selectionChanged(SelectionChangedEvent event) { ISelection selection = event.getSelection(); if (selection instanceof StructuredSelection) { diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/URLDropAdapter.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/URLDropAdapter.java index 924e28b60..faed6d8ce 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/URLDropAdapter.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/URLDropAdapter.java @@ -35,6 +35,7 @@ public abstract class URLDropAdapter extends DropTargetAdapter { this.convertFileToURL = convertFileToURL; } + @Override public void dragEnter(DropTargetEvent e) { if (!dropTargetIsValid(e)) { e.detail = DND.DROP_NONE; @@ -44,11 +45,13 @@ public abstract class URLDropAdapter extends DropTargetAdapter { e.detail = DND.DROP_LINK; } + @Override public void dragOperationChanged(DropTargetEvent e) { if (e.detail == DND.DROP_NONE) e.detail = DND.DROP_LINK; } + @Override public void drop(DropTargetEvent event) { if (dropTargetIsValid(event)) { String urlText = getURLText(event); diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/UninstallWizard.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/UninstallWizard.java index bfcb6334f..f5135fa26 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/UninstallWizard.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/UninstallWizard.java @@ -35,6 +35,7 @@ public class UninstallWizard extends ProvisioningOperationWizard { setDefaultPageImageDescriptor(ProvUIImages.getImageDescriptor(ProvUIImages.WIZARD_BANNER_UNINSTALL)); } + @Override protected ISelectableIUsPage createMainPage(IUElementListRoot input, Object[] selections) { mainPage = new SelectableIUsPage(ui, this, input, selections); mainPage.setTitle(ProvUIMessages.UninstallIUOperationLabel); @@ -43,10 +44,12 @@ public class UninstallWizard extends ProvisioningOperationWizard { return mainPage; } + @Override protected ResolutionResultsWizardPage createResolutionPage() { return new UninstallWizardPage(ui, this, root, (UninstallOperation) operation); } + @Override protected void initializeResolutionModelElements(Object[] selectedElements) { root = new IUElementListRoot(ui); ArrayList<InstalledIUElement> list = new ArrayList<InstalledIUElement>(selectedElements.length); @@ -63,6 +66,7 @@ public class UninstallWizard extends ProvisioningOperationWizard { planSelections = selections.toArray(); } + @Override protected IResolutionErrorReportingPage createErrorReportingPage() { return (SelectableIUsPage) mainPage; } @@ -71,6 +75,7 @@ public class UninstallWizard extends ProvisioningOperationWizard { * (non-Javadoc) * @see org.eclipse.jface.wizard.Wizard#getStartingPage() */ + @Override public IWizardPage getStartingPage() { if (getCurrentStatus().isOK()) { ((SelectableIUsPage) mainPage).setPageComplete(true); @@ -82,6 +87,7 @@ public class UninstallWizard extends ProvisioningOperationWizard { /* (non-Javadoc) * @see org.eclipse.equinox.internal.p2.ui.dialogs.ProvisioningOperationWizard#getProfileChangeOperation(java.lang.Object[]) */ + @Override protected ProfileChangeOperation getProfileChangeOperation(Object[] elements) { UninstallOperation op = new UninstallOperation(ui.getSession(), ElementUtils.elementsToIUs(elements)); op.setProfileId(getProfileId()); diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/UninstallWizardPage.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/UninstallWizardPage.java index 8dea4ef18..7f3351aab 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/UninstallWizardPage.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/UninstallWizardPage.java @@ -26,14 +26,17 @@ public class UninstallWizardPage extends ResolutionResultsWizardPage { setDescription(ProvUIMessages.UninstallWizardPage_Description); } + @Override protected String getOperationLabel() { return ProvUIMessages.UninstallIUOperationLabel; } + @Override protected String getOperationTaskName() { return ProvUIMessages.UninstallIUOperationTask; } + @Override protected IQueryable<IInstallableUnit> getQueryable(IProvisioningPlan plan) { return plan.getRemovals(); } diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/UpdateSingleIUPage.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/UpdateSingleIUPage.java index 5152bb53a..2bf698e3d 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/UpdateSingleIUPage.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/UpdateSingleIUPage.java @@ -43,6 +43,7 @@ public class UpdateSingleIUPage extends ProvisioningWizardPage { this.operation = operation; } + @Override public void createControl(Composite parent) { IInstallableUnit updateIU = getUpdate().replacement; String url = null; diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/UpdateSingleIUWizard.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/UpdateSingleIUWizard.java index 0f57d7384..6ff3382e4 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/UpdateSingleIUWizard.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/UpdateSingleIUWizard.java @@ -51,6 +51,7 @@ public class UpdateSingleIUWizard extends Wizard { * (non-Javadoc) * @see org.eclipse.jface.wizard.Wizard#addPages() */ + @Override public void addPages() { mainPage = createMainPage(); addPage(mainPage); diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/UpdateWizard.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/UpdateWizard.java index fa252f22c..6f25bd834 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/UpdateWizard.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/UpdateWizard.java @@ -101,6 +101,7 @@ public class UpdateWizard extends WizardWithLicenses { recomputePlan(getContainer()); } + @Override protected ISelectableIUsPage createMainPage(IUElementListRoot input, Object[] selections) { mainPage = new SelectableIUsPage(ui, this, getAllPossibleUpdatesRoot(), selections); mainPage.setTitle(ProvUIMessages.UpdateAction_UpdatesAvailableTitle); @@ -109,10 +110,12 @@ public class UpdateWizard extends WizardWithLicenses { return mainPage; } + @Override protected ResolutionResultsWizardPage createResolutionPage() { return new UpdateWizardPage(ui, this, root, (UpdateOperation) operation); } + @Override protected void initializeResolutionModelElements(Object[] selectedElements) { if (selectedElements == null) return; @@ -142,6 +145,7 @@ public class UpdateWizard extends WizardWithLicenses { } } + @Override protected IResolutionErrorReportingPage createErrorReportingPage() { return (SelectableIUsPage) mainPage; } @@ -150,6 +154,7 @@ public class UpdateWizard extends WizardWithLicenses { this.skipSelectionsPage = skipSelectionsPage; } + @Override public IWizardPage getStartingPage() { if (skipSelectionsPage) { // TODO see https://bugs.eclipse.org/bugs/show_bug.cgi?id=276963 @@ -163,6 +168,7 @@ public class UpdateWizard extends WizardWithLicenses { /* (non-Javadoc) * @see org.eclipse.equinox.internal.p2.ui.dialogs.ProvisioningOperationWizard#getProfileChangeOperation(java.lang.Object[]) */ + @Override protected ProfileChangeOperation getProfileChangeOperation(Object[] elements) { if (operation == null) { operation = new UpdateOperation(ui.getSession(), getIUsToReplace(elements)); diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/UpdateWizardPage.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/UpdateWizardPage.java index 81f34fcd3..089c2ea8b 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/UpdateWizardPage.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/UpdateWizardPage.java @@ -26,6 +26,7 @@ public class UpdateWizardPage extends SizeComputingWizardPage { setDescription(ProvUIMessages.UpdateWizardPage_Description); } + @Override protected String getIUDescription(IInstallableUnit iu) { if (iu != null) { IUpdateDescriptor updateDescriptor = iu.getUpdateDescriptor(); @@ -35,10 +36,12 @@ public class UpdateWizardPage extends SizeComputingWizardPage { return super.getIUDescription(iu); } + @Override protected String getOperationLabel() { return ProvUIMessages.UpdateIUOperationLabel; } + @Override protected String getOperationTaskName() { return ProvUIMessages.UpdateIUOperationTask; } diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/UserValidationDialog.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/UserValidationDialog.java index c2cda21b2..b60ab5fcf 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/UserValidationDialog.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/UserValidationDialog.java @@ -74,12 +74,14 @@ public class UserValidationDialog extends Dialog { this.dialogImageType = dialogImageType; } + @Override protected void configureShell(Shell newShell) { super.configureShell(newShell); newShell.setText(titleMessage); newShell.setImage(titleImage); } + @Override protected Control createDialogArea(Composite parent) { Composite composite = (Composite) super.createDialogArea(parent); @@ -139,6 +141,7 @@ public class UserValidationDialog extends Dialog { saveButton.setSelection(saveResult()); } + @Override protected void okPressed() { this.result = new AuthenticationInfo(username.getText(), password.getText(), saveButton.getSelection()); super.okPressed(); diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/WizardWithLicenses.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/WizardWithLicenses.java index 12b89fcc3..ea0b1901e 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/WizardWithLicenses.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/WizardWithLicenses.java @@ -46,6 +46,7 @@ public abstract class WizardWithLicenses extends ProvisioningOperationWizard { this.bypassLicencePage = bypassLicencePage; } + @Override public void addPages() { super.addPages(); @@ -72,6 +73,7 @@ public abstract class WizardWithLicenses extends ProvisioningOperationWizard { * (non-Javadoc) * @see org.eclipse.equinox.internal.p2.ui.dialogs.ProvisioningOperationWizard#getNextPage(org.eclipse.jface.wizard.IWizardPage) */ + @Override public IWizardPage getNextPage(IWizardPage page) { // If the license page is supposed to be the next page, // ensure there are actually licenses that need acceptance. @@ -90,6 +92,7 @@ public abstract class WizardWithLicenses extends ProvisioningOperationWizard { return proposedPage; } + @Override protected void planChanged() { super.planChanged(); if (!bypassLicencePage) { @@ -101,6 +104,7 @@ public abstract class WizardWithLicenses extends ProvisioningOperationWizard { * (non-Javadoc) * @see org.eclipse.equinox.internal.p2.ui.dialogs.ProvisioningOperationWizard#performFinish() */ + @Override public boolean performFinish() { if (!bypassLicencePage) { |