diff options
| author | Lars Vogel | 2014-03-27 11:48:15 +0000 |
|---|---|---|
| committer | Lars Vogel | 2014-03-27 11:48:15 +0000 |
| commit | 7e26a4a0bc4b7b490bd7ed01366e5114230596ce (patch) | |
| tree | d4421765ff26797656bfecb1ba255f24da1337f4 | |
| parent | 3a3b6e0e3dc59714f0f2f4b7ecd74b21f83cd132 (diff) | |
| download | eclipse.platform.ui-7e26a4a0bc4b7b490bd7ed01366e5114230596ce.tar.gz eclipse.platform.ui-7e26a4a0bc4b7b490bd7ed01366e5114230596ce.tar.xz eclipse.platform.ui-7e26a4a0bc4b7b490bd7ed01366e5114230596ce.zip | |
Bug 431179 - Add missing @Override and @Deprecate annotations to
org.eclipse.ui.workbench
Change-Id: I7a59eb6f206a8687d4c72a748554a969a7d9ef40
Signed-off-by: Lars Vogel <Lars.Vogel@gmail.com>
831 files changed, 7388 insertions, 1951 deletions
diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/e4/ui/workbench/addons/perspectiveswitcher/PerspectiveSwitcher.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/e4/ui/workbench/addons/perspectiveswitcher/PerspectiveSwitcher.java index b6479ab0b1f..570d155bccb 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/e4/ui/workbench/addons/perspectiveswitcher/PerspectiveSwitcher.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/e4/ui/workbench/addons/perspectiveswitcher/PerspectiveSwitcher.java @@ -126,6 +126,7 @@ public class PerspectiveSwitcher { IPropertyChangeListener propertyChangeListener; private EventHandler selectionHandler = new EventHandler() { + @Override public void handleEvent(Event event) { if (psTB.isDisposed()) { return; @@ -153,6 +154,7 @@ public class PerspectiveSwitcher { }; private EventHandler toBeRenderedHandler = new EventHandler() { + @Override public void handleEvent(Event event) { if (psTB.isDisposed()) { return; @@ -181,6 +183,7 @@ public class PerspectiveSwitcher { }; private EventHandler labelHandler = new EventHandler() { + @Override public void handleEvent(Event event) { if (psTB.isDisposed()) { return; @@ -227,6 +230,7 @@ public class PerspectiveSwitcher { }; private EventHandler childrenHandler = new EventHandler() { + @Override public void handleEvent(Event event) { if (psTB.isDisposed()) { return; @@ -311,6 +315,7 @@ public class PerspectiveSwitcher { psTB = new ToolBar(comp, SWT.FLAT | SWT.WRAP | SWT.RIGHT + orientation); comp.addPaintListener(new PaintListener() { + @Override public void paintControl(PaintEvent e) { paint(e); } @@ -318,6 +323,7 @@ public class PerspectiveSwitcher { toolParent = ((Control) toolControl.getParent().getWidget()); toolParent.addPaintListener(new PaintListener() { + @Override public void paintControl(PaintEvent e) { if (borderColor == null || borderColor.isDisposed()) { borderColor = e.display.getSystemColor(SWT.COLOR_BLACK); @@ -329,6 +335,7 @@ public class PerspectiveSwitcher { }); comp.addDisposeListener(new DisposeListener() { + @Override public void widgetDisposed(DisposeEvent e) { dispose(); } @@ -336,6 +343,7 @@ public class PerspectiveSwitcher { }); psTB.addMenuDetectListener(new MenuDetectListener() { + @Override public void menuDetected(MenuDetectEvent e) { ToolBar tb = (ToolBar) e.widget; Point p = new Point(e.x, e.y); @@ -354,6 +362,7 @@ public class PerspectiveSwitcher { }); psTB.addDisposeListener(new DisposeListener() { + @Override public void widgetDisposed(DisposeEvent e) { disposeTBImages(); } @@ -361,6 +370,7 @@ public class PerspectiveSwitcher { }); psTB.getAccessible().addAccessibleListener(new AccessibleAdapter() { + @Override public void getName(AccessibleEvent e) { if (0 <= e.childID && e.childID < psTB.getItemCount()) { ToolItem item = psTB.getItem(e.childID); @@ -377,10 +387,12 @@ public class PerspectiveSwitcher { createItem.setImage(getOpenPerspectiveImage()); createItem.setToolTipText(WorkbenchMessages.OpenPerspectiveDialogAction_tooltip); createItem.addSelectionListener(new SelectionListener() { + @Override public void widgetSelected(SelectionEvent e) { selectPerspective(); } + @Override public void widgetDefaultSelected(SelectionEvent e) { selectPerspective(); } @@ -438,6 +450,7 @@ public class PerspectiveSwitcher { private void hookupDnD(ToolBar bar) { bar.addMouseListener(new MouseListener() { + @Override public void mouseUp(MouseEvent e) { ToolBar bar = (ToolBar) e.widget; ToolItem curItem = bar.getItem(new Point(e.x, e.y)); @@ -481,6 +494,7 @@ public class PerspectiveSwitcher { dragShell = null; } + @Override public void mouseDown(MouseEvent e) { ToolBar bar = (ToolBar) e.widget; downPos = new Point(e.x, e.y); @@ -492,11 +506,13 @@ public class PerspectiveSwitcher { dragItem = downItem; } + @Override public void mouseDoubleClick(MouseEvent e) { } }); bar.addDragDetectListener(new DragDetectListener() { + @Override public void dragDetected(DragDetectEvent e) { if (dragItem != null) { dragging = true; @@ -506,6 +522,7 @@ public class PerspectiveSwitcher { }); bar.addMouseMoveListener(new MouseMoveListener() { + @Override public void mouseMove(MouseEvent e) { if (dragging) { track(e); @@ -549,6 +566,7 @@ public class PerspectiveSwitcher { psItem.setImage(image); psItem.addListener(SWT.Dispose, new Listener() { + @Override public void handleEvent(org.eclipse.swt.widgets.Event event) { image.dispose(); } @@ -568,11 +586,13 @@ public class PerspectiveSwitcher { psItem.setSelection(persp == persp.getParent().getSelectedElement()); psItem.addSelectionListener(new SelectionListener() { + @Override public void widgetSelected(SelectionEvent e) { MPerspective persp = (MPerspective) e.widget.getData(); persp.getParent().setSelectedElement(persp); } + @Override public void widgetDefaultSelected(SelectionEvent e) { MPerspective persp = (MPerspective) e.widget.getData(); persp.getParent().setSelectedElement(persp); @@ -580,6 +600,7 @@ public class PerspectiveSwitcher { }); psItem.addListener(SWT.MenuDetect, new Listener() { + @Override public void handleEvent(org.eclipse.swt.widgets.Event event) { MPerspective persp = (MPerspective) event.widget.getData(); openMenuFor(psItem, persp); @@ -632,9 +653,11 @@ public class PerspectiveSwitcher { menu.setVisible(true); menu.addMenuListener(new MenuListener() { + @Override public void menuHidden(MenuEvent e) { psTB.getDisplay().asyncExec(new Runnable() { + @Override public void run() { menu.dispose(); } @@ -642,6 +665,7 @@ public class PerspectiveSwitcher { }); } + @Override public void menuShown(MenuEvent e) { // Nothing to do } @@ -653,6 +677,7 @@ public class PerspectiveSwitcher { MenuItem menuItem = new MenuItem(menu, SWT.NONE); menuItem.setText(WorkbenchMessages.WorkbenchWindow_close); menuItem.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { MPerspective persp = (MPerspective) menu.getData(); if (persp != null) @@ -678,6 +703,7 @@ public class PerspectiveSwitcher { workbenchWindow.getWorkbench().getHelpSystem() .setHelp(saveAsMenuItem, IWorkbenchHelpContextIds.SAVE_PERSPECTIVE_ACTION); saveAsMenuItem.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent event) { if (psTB.isDisposed()) return; @@ -709,6 +735,7 @@ public class PerspectiveSwitcher { workbenchWindow.getWorkbench().getHelpSystem() .setHelp(resetMenuItem, IWorkbenchHelpContextIds.RESET_PERSPECTIVE_ACTION); resetMenuItem.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent event) { if (psTB.isDisposed()) return; @@ -737,6 +764,7 @@ public class PerspectiveSwitcher { final MenuItem showtextMenuItem = new MenuItem(menu, SWT.CHECK); showtextMenuItem.setText(WorkbenchMessages.PerspectiveBar_showText); showtextMenuItem.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { boolean preference = showtextMenuItem.getSelection(); if (preference != PrefUtil.getAPIPreferenceStore().getDefaultBoolean( @@ -756,6 +784,7 @@ public class PerspectiveSwitcher { private void setPropertyChangeListener() { propertyChangeListener = new IPropertyChangeListener() { + @Override public void propertyChange(PropertyChangeEvent propertyChangeEvent) { if (IWorkbenchPreferenceConstants.SHOW_TEXT_ON_PERSPECTIVE_BAR .equals(propertyChangeEvent.getProperty())) { diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/AbstractSourceProvider.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/AbstractSourceProvider.java index 796773614cb..36985899b2a 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/AbstractSourceProvider.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/AbstractSourceProvider.java @@ -43,6 +43,7 @@ public abstract class AbstractSourceProvider implements ISourceProvider { private final ListenerList listeners = new ListenerList(ListenerList.IDENTITY); + @Override public final void addSourceProviderListener( final ISourceProviderListener listener) { if (listener == null) { @@ -106,6 +107,7 @@ public abstract class AbstractSourceProvider implements ISourceProvider { } } + @Override public final void removeSourceProviderListener( final ISourceProviderListener listener) { if (listener == null) { diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/ActiveShellExpression.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/ActiveShellExpression.java index 4459e35337c..0c490544716 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/ActiveShellExpression.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/ActiveShellExpression.java @@ -66,15 +66,18 @@ public final class ActiveShellExpression extends Expression { * * @since 3.2 */ + @Override public final void collectExpressionInfo(final ExpressionInfo info) { info.addVariableNameAccess(ISources.ACTIVE_SHELL_NAME); info.addVariableNameAccess(ISources.ACTIVE_WORKBENCH_WINDOW_NAME); } + @Override protected final int computeHashCode() { return HASH_INITIAL * HASH_FACTOR + hashCode(activeShell); } + @Override public final boolean equals(final Object object) { if (object instanceof ActiveShellExpression) { final ActiveShellExpression that = (ActiveShellExpression) object; @@ -97,6 +100,7 @@ public final class ActiveShellExpression extends Expression { * @return <code>EvaluationResult.TRUE</code> if the shell is active; * <code>EvaluationResult.FALSE</code> otherwise. */ + @Override public final EvaluationResult evaluate(final IEvaluationContext context) { if (activeShell != null) { Object value = context.getVariable(ISources.ACTIVE_SHELL_NAME); @@ -112,6 +116,7 @@ public final class ActiveShellExpression extends Expression { return EvaluationResult.TRUE; } + @Override public final String toString() { final StringBuffer buffer = new StringBuffer(); buffer.append("ActiveShellExpression("); //$NON-NLS-1$ diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/BasicWorkingSetElementAdapter.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/BasicWorkingSetElementAdapter.java index 9cbdf6400bb..ebd1ba407c2 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/BasicWorkingSetElementAdapter.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/BasicWorkingSetElementAdapter.java @@ -86,6 +86,7 @@ public final class BasicWorkingSetElementAdapter implements * @see org.eclipse.core.runtime.IAdapterManager#getAdapter(Object, String) * @see org.osgi.service.packageadmin.PackageAdmin#getExportedPackage(String) */ + @Override public IAdaptable[] adaptElements(IWorkingSet ws, IAdaptable[] elements) { List adaptedElements = new ArrayList(); for (int i = 0; i < elements.length; i++) { @@ -180,6 +181,7 @@ public final class BasicWorkingSetElementAdapter implements * * @see org.eclipse.ui.IWorkingSetElementAdapter#dispose() */ + @Override public void dispose() { if (packageTracker != null) packageTracker.close(); @@ -191,6 +193,7 @@ public final class BasicWorkingSetElementAdapter implements * @see org.eclipse.core.runtime.IExecutableExtension#setInitializationData(org.eclipse.core.runtime.IConfigurationElement, * java.lang.String, java.lang.Object) */ + @Override public void setInitializationData(IConfigurationElement config, String propertyName, Object data) { diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/ExtensionFactory.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/ExtensionFactory.java index 0744e9323ea..b926bf6b3db 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/ExtensionFactory.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/ExtensionFactory.java @@ -143,6 +143,7 @@ public class ExtensionFactory implements IExecutableExtensionFactory, * Creates the object referenced by the factory id obtained from the * extension data. */ + @Override public Object create() throws CoreException { if (APPEARANCE_PREFERENCE_PAGE.equals(id)) { return configure(new ViewsPreferencePage()); @@ -198,6 +199,7 @@ public class ExtensionFactory implements IExecutableExtensionFactory, * @see org.eclipse.core.runtime.IExecutableExtension#setInitializationData(org.eclipse.core.runtime.IConfigurationElement, * java.lang.String, java.lang.Object) */ + @Override public void setInitializationData(IConfigurationElement config, String propertyName, Object data) throws CoreException { if (data instanceof String) { diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/IActionDelegateWithEvent.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/IActionDelegateWithEvent.java index 7a927764911..c687748bda0 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/IActionDelegateWithEvent.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/IActionDelegateWithEvent.java @@ -27,6 +27,7 @@ import org.eclipse.swt.widgets.Event; * @since 2.0 * @deprecated Use org.eclipse.ui.IActionDelegate2 instead. */ +@Deprecated public interface IActionDelegateWithEvent { /** @@ -43,6 +44,7 @@ public interface IActionDelegateWithEvent { * @since 2.0 * @deprecated Use org.eclipse.ui.IActionDelegate2 instead. */ - public void runWithEvent(IAction action, Event event); + @Deprecated + public void runWithEvent(IAction action, Event event); } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/IDecoratorManager.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/IDecoratorManager.java index 5347e9eb751..eac31a2d82a 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/IDecoratorManager.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/IDecoratorManager.java @@ -79,7 +79,8 @@ public interface IDecoratorManager extends IDelayedLabelDecorator{ * @return the lightweight label decorator * @deprecated use getBaseLabelProvider(String) instead. */ - ILightweightLabelDecorator getLightweightLabelDecorator(String decoratorId); + @Deprecated + ILightweightLabelDecorator getLightweightLabelDecorator(String decoratorId); /** * Returns whether the specified decorator is enabled. diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/IEditorDescriptor.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/IEditorDescriptor.java index 2b31546a698..5e7497a20a7 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/IEditorDescriptor.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/IEditorDescriptor.java @@ -41,21 +41,24 @@ public interface IEditorDescriptor extends IWorkbenchPartDescriptor { * * @return the id of the editor */ - public String getId(); + @Override + public String getId(); /** * Returns the descriptor of the image for this editor. * * @return the descriptor of the image to display next to this editor */ - public ImageDescriptor getImageDescriptor(); + @Override + public ImageDescriptor getImageDescriptor(); /** * Returns the label to show for this editor. * * @return the editor label */ - public String getLabel(); + @Override + public String getLabel(); /** * Returns whether this editor descriptor will open a regular editor diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/IEditorRegistry.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/IEditorRegistry.java index 2399c28e30b..fc9eef0c9c1 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/IEditorRegistry.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/IEditorRegistry.java @@ -100,7 +100,8 @@ public interface IEditorRegistry { * Use <code>findEditor(IEditorRegistry.SYSTEM_EXTERNAL_EDITOR_ID)</code> * instead. */ - public IEditorDescriptor getDefaultEditor(); + @Deprecated + public IEditorDescriptor getDefaultEditor(); /** * Returns the default editor for a given file name. This method assumes an diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/IKeyBindingService.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/IKeyBindingService.java index 96bb8b87cfd..845acff7271 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/IKeyBindingService.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/IKeyBindingService.java @@ -32,6 +32,7 @@ import org.eclipse.jface.action.IAction; * be proxied by org.eclipse.jface.commands.ActionHandler. * @noimplement This interface is not intended to be implemented by clients. */ +@Deprecated public interface IKeyBindingService { /** diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/INestableKeyBindingService.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/INestableKeyBindingService.java index d6e755e3f20..77c368849f8 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/INestableKeyBindingService.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/INestableKeyBindingService.java @@ -28,6 +28,7 @@ import org.eclipse.ui.services.IServiceLocator; * be nested. * @noimplement This interface is not intended to be implemented by clients. */ +@Deprecated public interface INestableKeyBindingService extends IKeyBindingService { /** diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/IPageLayout.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/IPageLayout.java index 8de5a15b102..5992cc8b40f 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/IPageLayout.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/IPageLayout.java @@ -83,7 +83,8 @@ public interface IPageLayout { * @deprecated this has been replaced by the Common Navigator Framework as * of release 3.5. */ - public static String ID_RES_NAV = "org.eclipse.ui.views.ResourceNavigator"; //$NON-NLS-1$ + @Deprecated + public static String ID_RES_NAV = "org.eclipse.ui.views.ResourceNavigator"; //$NON-NLS-1$ /** * The view id for the Project Explorer. @@ -406,7 +407,8 @@ public interface IPageLayout { * * @deprecated this always returns -1 as of Eclipse 2.1 */ - public int getEditorReuseThreshold(); + @Deprecated + public int getEditorReuseThreshold(); /** * Sets the number of open editors before reusing editors. @@ -416,7 +418,8 @@ public interface IPageLayout { * * @deprecated this method has no effect, as of Eclipse 2.1 */ - public void setEditorReuseThreshold(int openEditors); + @Deprecated + public void setEditorReuseThreshold(int openEditors); /** * Sets whether this layout is fixed. diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/ISharedImages.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/ISharedImages.java index 948430821e5..61a0d399420 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/ISharedImages.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/ISharedImages.java @@ -233,7 +233,8 @@ public interface ISharedImages { * only in IDE configurations. IDE-specific tools should use * <code>org.eclipse.ui.ide.IDE.SharedImages.IMG_OBJ_PROJECT</code> instead. */ - public final static String IMG_OBJ_PROJECT = "IMG_OBJ_PROJECT"; //$NON-NLS-1$ + @Deprecated + public final static String IMG_OBJ_PROJECT = "IMG_OBJ_PROJECT"; //$NON-NLS-1$ /** * Identifies a closed project image. @@ -242,7 +243,8 @@ public interface ISharedImages { * only in IDE configurations. IDE-specific tools should use * <code>org.eclipse.ui.ide.IDE.SharedImages.IMG_OBJ_PROJECT_CLOSED</code> instead. */ - public final static String IMG_OBJ_PROJECT_CLOSED = "IMG_OBJ_PROJECT_CLOSED"; //$NON-NLS-1$ + @Deprecated + public final static String IMG_OBJ_PROJECT_CLOSED = "IMG_OBJ_PROJECT_CLOSED"; //$NON-NLS-1$ /** * Identifies the default image used to indicate a bookmark. @@ -251,7 +253,8 @@ public interface ISharedImages { * only in IDE configurations. IDE-specific tools should use * <code>org.eclipse.ui.ide.IDE.SharedImages.IMG_OBJS_BKMRK_TSK</code> instead. */ - public final static String IMG_OBJS_BKMRK_TSK = "IMG_OBJS_BKMRK_TSK"; //$NON-NLS-1$ + @Deprecated + public final static String IMG_OBJS_BKMRK_TSK = "IMG_OBJS_BKMRK_TSK"; //$NON-NLS-1$ /** * Identifies the default image used to indicate errors. @@ -270,7 +273,8 @@ public interface ISharedImages { * only in IDE configurations. IDE-specific tools should use * <code>org.eclipse.ui.ide.IDE.SharedImages.IMG_OBJS_TASK_TSK</code> instead. */ - public final static String IMG_OBJS_TASK_TSK = "IMG_OBJS_TASK_TSK"; //$NON-NLS-1$ + @Deprecated + public final static String IMG_OBJS_TASK_TSK = "IMG_OBJS_TASK_TSK"; //$NON-NLS-1$ /** * Identifies the default image used to indicate warnings. @@ -284,7 +288,8 @@ public interface ISharedImages { * only in IDE configurations. IDE-specific tools should use * <code>org.eclipse.ui.ide.IDE.SharedImages.IMG_OPEN_MARKER</code> instead. */ - public final static String IMG_OPEN_MARKER = "IMG_OPEN_MARKER"; //$NON-NLS-1$ + @Deprecated + public final static String IMG_OPEN_MARKER = "IMG_OPEN_MARKER"; //$NON-NLS-1$ /** * Identifies the back image in the enabled state. @@ -302,7 +307,8 @@ public interface ISharedImages { * @deprecated in 3.0. This image is now the same as <code>IMG_TOOL_BACK</code>. * Enabled images are now in color. The workbench itself no longer uses the hover image variants. */ - public final static String IMG_TOOL_BACK_HOVER = "IMG_TOOL_BACK_HOVER"; //$NON-NLS-1$ + @Deprecated + public final static String IMG_TOOL_BACK_HOVER = "IMG_TOOL_BACK_HOVER"; //$NON-NLS-1$ /** * Identifies the copy image in the enabled state. @@ -320,7 +326,8 @@ public interface ISharedImages { * @deprecated in 3.0. This image is now the same as <code>IMG_TOOL_COPY</code>. * Enabled images are now in color. The workbench itself no longer uses the hover image variants. */ - public final static String IMG_TOOL_COPY_HOVER = "IMG_TOOL_COPY_HOVER"; //$NON-NLS-1$ + @Deprecated + public final static String IMG_TOOL_COPY_HOVER = "IMG_TOOL_COPY_HOVER"; //$NON-NLS-1$ /** * Identifies the cut image in the enabled state. @@ -338,7 +345,8 @@ public interface ISharedImages { * @deprecated in 3.0. This image is now the same as <code>IMG_TOOL_CUT</code>. * Enabled images are now in color. The workbench itself no longer uses the hover image variants. */ - public final static String IMG_TOOL_CUT_HOVER = "IMG_TOOL_CUT_HOVER"; //$NON-NLS-1$ + @Deprecated + public final static String IMG_TOOL_CUT_HOVER = "IMG_TOOL_CUT_HOVER"; //$NON-NLS-1$ /** * Identifies the delete image in the enabled state. @@ -358,7 +366,8 @@ public interface ISharedImages { * @deprecated in 3.0. This image is now the same as <code>IMG_TOOL_DELETE</code>. * Enabled images are now in color. The workbench itself no longer uses the hover image variants. */ - public final static String IMG_TOOL_DELETE_HOVER = "IMG_TOOL_DELETE_HOVER"; //$NON-NLS-1$ + @Deprecated + public final static String IMG_TOOL_DELETE_HOVER = "IMG_TOOL_DELETE_HOVER"; //$NON-NLS-1$ /** * Identifies the forward image in the enabled state. @@ -376,7 +385,8 @@ public interface ISharedImages { * @deprecated in 3.0. This image is now the same as <code>IMG_TOOL_FORWARD</code>. * Enabled images are now in color. The workbench itself no longer uses the hover image variants. */ - public final static String IMG_TOOL_FORWARD_HOVER = "IMG_TOOL_FORWARD_HOVER"; //$NON-NLS-1$ + @Deprecated + public final static String IMG_TOOL_FORWARD_HOVER = "IMG_TOOL_FORWARD_HOVER"; //$NON-NLS-1$ /** * Identifies the new wizard image in the enabled state. @@ -394,7 +404,8 @@ public interface ISharedImages { * @deprecated in 3.0. This image is now the same as <code>IMG_TOOL_NEW_WIZARD</code>. * Enabled images are now in color. The workbench itself no longer uses the hover image variants. */ - public final static String IMG_TOOL_NEW_WIZARD_HOVER = "IMG_TOOL_NEW_WIZARD_HOVER"; //$NON-NLS-1$ + @Deprecated + public final static String IMG_TOOL_NEW_WIZARD_HOVER = "IMG_TOOL_NEW_WIZARD_HOVER"; //$NON-NLS-1$ /** * Identifies the paste image in the enabled state. @@ -412,7 +423,8 @@ public interface ISharedImages { * @deprecated in 3.0. This image is now the same as <code>IMG_TOOL_PASTE</code>. * Enabled images are now in color. The workbench itself no longer uses the hover image variants. */ - public final static String IMG_TOOL_PASTE_HOVER = "IMG_TOOL_PASTE_HOVER"; //$NON-NLS-1$ + @Deprecated + public final static String IMG_TOOL_PASTE_HOVER = "IMG_TOOL_PASTE_HOVER"; //$NON-NLS-1$ /** * Identifies the redo image in the enabled state. @@ -430,7 +442,8 @@ public interface ISharedImages { * @deprecated in 3.0. This image is now the same as <code>IMG_TOOL_REDO</code>. * Enabled images are now in color. The workbench itself no longer uses the hover image variants. */ - public final static String IMG_TOOL_REDO_HOVER = "IMG_TOOL_REDO_HOVER"; //$NON-NLS-1$ + @Deprecated + public final static String IMG_TOOL_REDO_HOVER = "IMG_TOOL_REDO_HOVER"; //$NON-NLS-1$ /** * Identifies the undo image in the enabled state. @@ -448,7 +461,8 @@ public interface ISharedImages { * @deprecated in 3.0. This image is now the same as <code>IMG_TOOL_UNDO</code>. * Enabled images are now in color. The workbench itself no longer uses the hover image variants. */ - public final static String IMG_TOOL_UNDO_HOVER = "IMG_TOOL_UNDO_HOVER"; //$NON-NLS-1$ + @Deprecated + public final static String IMG_TOOL_UNDO_HOVER = "IMG_TOOL_UNDO_HOVER"; //$NON-NLS-1$ /** * Identifies the up image in the enabled state. @@ -466,7 +480,8 @@ public interface ISharedImages { * @deprecated in 3.0. This image is now the same as <code>IMG_TOOL_UP</code>. * Enabled images are now in color. The workbench itself no longer uses the hover image variants. */ - public final static String IMG_TOOL_UP_HOVER = "IMG_TOOL_UP_HOVER"; //$NON-NLS-1$ + @Deprecated + public final static String IMG_TOOL_UP_HOVER = "IMG_TOOL_UP_HOVER"; //$NON-NLS-1$ // The following set of constants represent the image pairs that are used // to construct cursors for drag and drop operations within the workbench diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/IViewPart.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/IViewPart.java index 2a2b11f56c3..691506ecc1b 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/IViewPart.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/IViewPart.java @@ -102,5 +102,6 @@ public interface IViewPart extends IWorkbenchPart, IPersistable { * * @param memento a memento to receive the object state */ - public void saveState(IMemento memento); + @Override + public void saveState(IMemento memento); } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/IWorkbench.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/IWorkbench.java index 207ac77d4f1..1b17a5b9418 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/IWorkbench.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/IWorkbench.java @@ -205,6 +205,7 @@ public interface IWorkbench extends IAdaptable, IServiceLocator { * method you should move them to your own plugin preference * store. */ + @Deprecated public IPreferenceStore getPreferenceStore(); /** @@ -480,6 +481,7 @@ public interface IWorkbench extends IAdaptable, IServiceLocator { * @see ICommandService * @see IHandlerService */ + @Deprecated IWorkbenchCommandSupport getCommandSupport(); /** @@ -491,6 +493,7 @@ public interface IWorkbench extends IAdaptable, IServiceLocator { * @deprecated Please use {@link IServiceLocator#getService(Class)} instead. * @see IContextService */ + @Deprecated IWorkbenchContextSupport getContextSupport(); /** diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/IWorkbenchActionConstants.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/IWorkbenchActionConstants.java index 76119461707..0013c67a1ae 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/IWorkbenchActionConstants.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/IWorkbenchActionConstants.java @@ -156,13 +156,15 @@ public interface IWorkbenchActionConstants { * Name of standard View menu (value <code>"view"</code>). * @deprecated Since 3.0. This is no longer used. */ - public static final String M_VIEW = MENU_PREFIX + "view"; //$NON-NLS-1$ + @Deprecated + public static final String M_VIEW = MENU_PREFIX + "view"; //$NON-NLS-1$ /** * Name of standard Workbench menu (value <code>"workbench"</code>). * @deprecated Since 3.0. This is no longer used. */ - public static final String M_WORKBENCH = MENU_PREFIX + "workbench"; //$NON-NLS-1$ + @Deprecated + public static final String M_WORKBENCH = MENU_PREFIX + "workbench"; //$NON-NLS-1$ // menu reorg @@ -225,7 +227,8 @@ public interface IWorkbenchActionConstants { * <code>org.eclipse.ui.ActionFactory.NEW.getId()</code> * instead. */ - public static final String NEW = "new"; //$NON-NLS-1$ + @Deprecated + public static final String NEW = "new"; //$NON-NLS-1$ /** * File menu: name of group for extra New-like actions (value <code>"new.ext"</code>). @@ -238,7 +241,8 @@ public interface IWorkbenchActionConstants { * @deprecated in 3.0. Use {@link org.eclipse.ui.actions.ActionFactory#CLOSE * ActionFactory.CLOSE.getId()} instead. */ - public static final String CLOSE = "close"; //$NON-NLS-1$ + @Deprecated + public static final String CLOSE = "close"; //$NON-NLS-1$ /** * File menu: name of standard Close All action (value <code>"closeAll"</code>). @@ -246,7 +250,8 @@ public interface IWorkbenchActionConstants { * @deprecated in 3.0. Use {@link org.eclipse.ui.actions.ActionFactory#CLOSE_ALL * ActionFactory.CLOSE_ALL.getId()} instead. */ - public static final String CLOSE_ALL = "closeAll"; //$NON-NLS-1$ + @Deprecated + public static final String CLOSE_ALL = "closeAll"; //$NON-NLS-1$ /** * File menu: name of group for extra Close-like actions (value <code>"close.ext"</code>). @@ -259,7 +264,8 @@ public interface IWorkbenchActionConstants { * @deprecated in 3.0. Use {@link org.eclipse.ui.actions.ActionFactory#SAVE * ActionFactory.SAVE.getId()} instead. */ - public static final String SAVE = "save"; //$NON-NLS-1$ + @Deprecated + public static final String SAVE = "save"; //$NON-NLS-1$ /** * File menu: name of standard Save As action (value <code>"saveAs"</code>). @@ -267,7 +273,8 @@ public interface IWorkbenchActionConstants { * @deprecated in 3.0. Use {@link org.eclipse.ui.actions.ActionFactory#SAVE_AS * ActionFactory.SAVE_AS.getId()} instead. */ - public static final String SAVE_AS = "saveAs"; //$NON-NLS-1$ + @Deprecated + public static final String SAVE_AS = "saveAs"; //$NON-NLS-1$ /** * File menu: name of standard Save All action (value <code>"saveAll"</code>). @@ -275,7 +282,8 @@ public interface IWorkbenchActionConstants { * @deprecated in 3.0. Use {@link org.eclipse.ui.actions.ActionFactory#SAVE_ALL * ActionFactory.SAVE_ALL.getId()} instead. */ - public static final String SAVE_ALL = "saveAll"; //$NON-NLS-1$ + @Deprecated + public static final String SAVE_ALL = "saveAll"; //$NON-NLS-1$ /** * File menu: name of group for extra Save-like actions (value <code>"save.ext"</code>). @@ -289,7 +297,8 @@ public interface IWorkbenchActionConstants { * @deprecated in 3.0. Use {@link org.eclipse.ui.actions.ActionFactory#PRINT * ActionFactory.PRINT.getId()} instead. */ - public static final String PRINT = "print"; // Global action. //$NON-NLS-1$ + @Deprecated + public static final String PRINT = "print"; // Global action. //$NON-NLS-1$ /** * File menu: name of group for extra Print-like actions (value <code>"print.ext"</code>). @@ -304,7 +313,8 @@ public interface IWorkbenchActionConstants { * <code>org.eclipse.ui.ActionFactory.IMPORT.getId()</code> * instead. */ - public static final String IMPORT = "import"; //$NON-NLS-1$ + @Deprecated + public static final String IMPORT = "import"; //$NON-NLS-1$ /** * File menu: name of standard Export action (value <code>"export"</code>). @@ -313,7 +323,8 @@ public interface IWorkbenchActionConstants { * <code>org.eclipse.ui.ActionFactory.EXPORT.getId()</code> * instead. */ - public static final String EXPORT = "export"; //$NON-NLS-1$ + @Deprecated + public static final String EXPORT = "export"; //$NON-NLS-1$ /** * File menu: name of group for extra Import-like actions (value <code>"import.ext"</code>). @@ -332,7 +343,8 @@ public interface IWorkbenchActionConstants { * @deprecated in 3.0. Use {@link org.eclipse.ui.actions.ActionFactory#QUIT * ActionFactory.QUIT.getId()} instead. */ - public static final String QUIT = "quit"; //$NON-NLS-1$ + @Deprecated + public static final String QUIT = "quit"; //$NON-NLS-1$ // Standard edit actions: /** @@ -352,7 +364,8 @@ public interface IWorkbenchActionConstants { * @deprecated in 3.0. Use {@link org.eclipse.ui.actions.ActionFactory#UNDO * ActionFactory.UNDO.getId()} instead. */ - public static final String UNDO = "undo"; // Global action. //$NON-NLS-1$ + @Deprecated + public static final String UNDO = "undo"; // Global action. //$NON-NLS-1$ /** * Edit menu: name of standard Redo global action @@ -361,7 +374,8 @@ public interface IWorkbenchActionConstants { * @deprecated in 3.0. Use {@link org.eclipse.ui.actions.ActionFactory#REDO * ActionFactory.REDO.getId()} instead. */ - public static final String REDO = "redo"; // Global action. //$NON-NLS-1$ + @Deprecated + public static final String REDO = "redo"; // Global action. //$NON-NLS-1$ /** * Edit menu: name of group for extra Undo-like actions (value <code>"undo.ext"</code>). @@ -375,7 +389,8 @@ public interface IWorkbenchActionConstants { * @deprecated in 3.0. Use {@link org.eclipse.ui.actions.ActionFactory#CUT * ActionFactory.CUT.getId()} instead. */ - public static final String CUT = "cut"; // Global action. //$NON-NLS-1$ + @Deprecated + public static final String CUT = "cut"; // Global action. //$NON-NLS-1$ /** * Edit menu: name of standard Copy global action @@ -384,7 +399,8 @@ public interface IWorkbenchActionConstants { * @deprecated in 3.0. Use {@link org.eclipse.ui.actions.ActionFactory#COPY * ActionFactory.COPY.getId()} instead. */ - public static final String COPY = "copy"; // Global action. //$NON-NLS-1$ + @Deprecated + public static final String COPY = "copy"; // Global action. //$NON-NLS-1$ /** * Edit menu: name of standard Paste global action @@ -393,7 +409,8 @@ public interface IWorkbenchActionConstants { * @deprecated in 3.0. Use {@link org.eclipse.ui.actions.ActionFactory#PASTE * ActionFactory.PASTE.getId()} instead. */ - public static final String PASTE = "paste"; // Global action. //$NON-NLS-1$ + @Deprecated + public static final String PASTE = "paste"; // Global action. //$NON-NLS-1$ /** * Edit menu: name of group for extra Cut-like actions (value <code>"cut.ext"</code>). @@ -407,7 +424,8 @@ public interface IWorkbenchActionConstants { * @deprecated in 3.0. Use {@link org.eclipse.ui.actions.ActionFactory#DELETE * ActionFactory.DELETE.getId()} instead. */ - public static final String DELETE = "delete"; // Global action. //$NON-NLS-1$ + @Deprecated + public static final String DELETE = "delete"; // Global action. //$NON-NLS-1$ /** * Edit menu: name of standard Find global action @@ -416,7 +434,8 @@ public interface IWorkbenchActionConstants { * @deprecated in 3.0. Use {@link org.eclipse.ui.actions.ActionFactory#FIND * ActionFactory.FIND.getId()} instead. */ - public static final String FIND = "find"; // Global action. //$NON-NLS-1$ + @Deprecated + public static final String FIND = "find"; // Global action. //$NON-NLS-1$ /** * Edit menu: name of group for extra Find-like actions (value <code>"find.ext"</code>). @@ -430,7 +449,8 @@ public interface IWorkbenchActionConstants { * @deprecated in 3.0. Use {@link org.eclipse.ui.actions.ActionFactory#SELECT_ALL * ActionFactory.SELECT_ALL.getId()} instead. */ - public static final String SELECT_ALL = "selectAll"; // Global action. //$NON-NLS-1$ + @Deprecated + public static final String SELECT_ALL = "selectAll"; // Global action. //$NON-NLS-1$ /** * Edit menu: name of standard Add Bookmark global action @@ -440,7 +460,8 @@ public interface IWorkbenchActionConstants { * <code>org.eclipse.ui.ide.IDEActionFactory.BOOKMARK.getId()</code> * instead. */ - public static final String BOOKMARK = "bookmark"; // Global action. //$NON-NLS-1$ + @Deprecated + public static final String BOOKMARK = "bookmark"; // Global action. //$NON-NLS-1$ /** * Edit menu: name of standard Add Task global action @@ -450,7 +471,8 @@ public interface IWorkbenchActionConstants { * <code>org.eclipse.ui.ide.IDEActionFactory.ADD_TASK.getId()</code> * instead. */ - public static final String ADD_TASK = "addTask"; // Global action. //$NON-NLS-1$ + @Deprecated + public static final String ADD_TASK = "addTask"; // Global action. //$NON-NLS-1$ /** * Edit menu: name of group for extra Add-like actions (value <code>"add.ext"</code>). @@ -484,7 +506,8 @@ public interface IWorkbenchActionConstants { * <code>org.eclipse.ui.ide.IDEActionFactory.BUILD.getId()</code> * instead. */ - public static final String BUILD = "build"; //$NON-NLS-1$ + @Deprecated + public static final String BUILD = "build"; //$NON-NLS-1$ /** * Workbench menu: name of standard Rebuild All action @@ -494,7 +517,8 @@ public interface IWorkbenchActionConstants { * <code>org.eclipse.ui.ide.IDEActionFactory.REBUILD_ALL.getId()</code> * instead. */ - public static final String REBUILD_ALL = "rebuildAll"; //$NON-NLS-1$ + @Deprecated + public static final String REBUILD_ALL = "rebuildAll"; //$NON-NLS-1$ // Workbench toolbar ids: /** @@ -631,7 +655,8 @@ public interface IWorkbenchActionConstants { * @deprecated in 3.0. Use {@link org.eclipse.ui.actions.ActionFactory#REVERT * ActionFactory.REVERT.getId()} instead. */ - public static final String REVERT = "revert"; // Global action. //$NON-NLS-1$ + @Deprecated + public static final String REVERT = "revert"; // Global action. //$NON-NLS-1$ /** * File menu: name of standard Refresh global action @@ -640,7 +665,8 @@ public interface IWorkbenchActionConstants { * @deprecated in 3.0. Use {@link org.eclipse.ui.actions.ActionFactory#REFRESH * ActionFactory.REFRESH.getId()} instead. */ - public static final String REFRESH = "refresh"; // Global action. //$NON-NLS-1$ + @Deprecated + public static final String REFRESH = "refresh"; // Global action. //$NON-NLS-1$ /** * File menu: name of standard Properties global action @@ -649,7 +675,8 @@ public interface IWorkbenchActionConstants { * @deprecated in 3.0. Use {@link org.eclipse.ui.actions.ActionFactory#PROPERTIES * ActionFactory.PROPERTIES.getId()} instead. */ - public static final String PROPERTIES = "properties"; // Global action. //$NON-NLS-1$ + @Deprecated + public static final String PROPERTIES = "properties"; // Global action. //$NON-NLS-1$ /** * Edit menu: name of standard Move global action @@ -658,7 +685,8 @@ public interface IWorkbenchActionConstants { * @deprecated in 3.0. Use {@link org.eclipse.ui.actions.ActionFactory#MOVE * ActionFactory.MOVE.getId()} instead. */ - public static final String MOVE = "move"; // Global action. //$NON-NLS-1$ + @Deprecated + public static final String MOVE = "move"; // Global action. //$NON-NLS-1$ /** * Edit menu: name of standard Rename global action @@ -667,7 +695,8 @@ public interface IWorkbenchActionConstants { * @deprecated in 3.0. Use {@link org.eclipse.ui.actions.ActionFactory#RENAME * ActionFactory.RENAME.getId()} instead. */ - public static final String RENAME = "rename"; // Global action. //$NON-NLS-1$ + @Deprecated + public static final String RENAME = "rename"; // Global action. //$NON-NLS-1$ /** * Edit menu: name of standard Add Task global action @@ -722,7 +751,8 @@ public interface IWorkbenchActionConstants { * * @deprecated this action will be removed soon; use SHOW_IN instead */ - public static final String SYNC_EDITOR = "syncEditor"; // Global action. //$NON-NLS-1$ + @Deprecated + public static final String SYNC_EDITOR = "syncEditor"; // Global action. //$NON-NLS-1$ /** * Navigate menu: name of standard Show In... action @@ -732,7 +762,8 @@ public interface IWorkbenchActionConstants { * * @deprecated */ - public static final String SHOW_IN = "showIn"; //$NON-NLS-1$ + @Deprecated + public static final String SHOW_IN = "showIn"; //$NON-NLS-1$ /** * Navigate menu: name of standard Back global action @@ -741,7 +772,8 @@ public interface IWorkbenchActionConstants { * @deprecated in 3.0. Use {@link org.eclipse.ui.actions.ActionFactory#BACK * ActionFactory.BACK.getId()} instead. */ - public static final String BACK = "back"; // Global action. //$NON-NLS-1$ + @Deprecated + public static final String BACK = "back"; // Global action. //$NON-NLS-1$ /** * Navigate menu: name of standard Forward global action @@ -750,7 +782,8 @@ public interface IWorkbenchActionConstants { * @deprecated in 3.0. Use {@link org.eclipse.ui.actions.ActionFactory#FORWARD * ActionFactory.FORWARD.getId()} instead. */ - public static final String FORWARD = "forward"; // Global action. //$NON-NLS-1$ + @Deprecated + public static final String FORWARD = "forward"; // Global action. //$NON-NLS-1$ /** * Navigate menu: name of standard Up global action @@ -765,7 +798,8 @@ public interface IWorkbenchActionConstants { * @deprecated in 3.0. Use {@link org.eclipse.ui.actions.ActionFactory#NEXT * ActionFactory.NEXT.getId()} instead. */ - public static final String NEXT = "next"; // Global action. //$NON-NLS-1$ + @Deprecated + public static final String NEXT = "next"; // Global action. //$NON-NLS-1$ /** * Navigate menu: name of standard Up global action @@ -774,7 +808,8 @@ public interface IWorkbenchActionConstants { * @deprecated in 3.0. Use {@link org.eclipse.ui.actions.ActionFactory#PREVIOUS * ActionFactory.PREVIOUS.getId()} instead. */ - public static final String PREVIOUS = "previous"; // Global action. //$NON-NLS-1$ + @Deprecated + public static final String PREVIOUS = "previous"; // Global action. //$NON-NLS-1$ /** * Project menu: name of group for start of menu @@ -796,7 +831,8 @@ public interface IWorkbenchActionConstants { * <code>org.eclipse.ui.ide.IDEActionFactory.BUILD_PROJECT.getId()</code> * instead. */ - public static final String BUILD_PROJECT = "buildProject"; // Global action. //$NON-NLS-1$ + @Deprecated + public static final String BUILD_PROJECT = "buildProject"; // Global action. //$NON-NLS-1$ /** * Project menu: name of standard Rebuild Project global action @@ -806,7 +842,8 @@ public interface IWorkbenchActionConstants { * <code>org.eclipse.ui.ide.IDEActionFactory.REBUILD_PROJECT.getId()</code> * instead. */ - public static final String REBUILD_PROJECT = "rebuildProject"; // Global action. //$NON-NLS-1$ + @Deprecated + public static final String REBUILD_PROJECT = "rebuildProject"; // Global action. //$NON-NLS-1$ /** * Project menu: name of standard Open Project global action @@ -816,7 +853,8 @@ public interface IWorkbenchActionConstants { * <code>org.eclipse.ui.ide.IDEActionFactory.OPEN_PROJECT.getId()</code> * instead. */ - public static final String OPEN_PROJECT = "openProject"; // Global action. //$NON-NLS-1$ + @Deprecated + public static final String OPEN_PROJECT = "openProject"; // Global action. //$NON-NLS-1$ /** * Project menu: name of standard Close Project global action @@ -826,7 +864,8 @@ public interface IWorkbenchActionConstants { * <code>org.eclipse.ui.ide.IDEActionFactory.CLOSE_PROJECT.getId()</code> * instead. */ - public static final String CLOSE_PROJECT = "closeProject"; // Global action. //$NON-NLS-1$ + @Deprecated + public static final String CLOSE_PROJECT = "closeProject"; // Global action. //$NON-NLS-1$ // end menu reorg // Standard help actions: @@ -849,13 +888,15 @@ public interface IWorkbenchActionConstants { * @deprecated in 3.0. Use {@link org.eclipse.ui.actions.ActionFactory#ABOUT * ActionFactory.ABOUT.getId()} instead. */ - public static final String ABOUT = "about"; //$NON-NLS-1$ + @Deprecated + public static final String ABOUT = "about"; //$NON-NLS-1$ /** * Standard global actions in a workbench window. * * @deprecated in 3.0 */ - public static final String[] GLOBAL_ACTIONS = { UNDO, REDO, CUT, COPY, + @Deprecated + public static final String[] GLOBAL_ACTIONS = { UNDO, REDO, CUT, COPY, PASTE, PRINT, DELETE, FIND, SELECT_ALL, BOOKMARK }; } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/IWorkbenchPage.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/IWorkbenchPage.java index 69dddca7e1e..4d7190740e8 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/IWorkbenchPage.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/IWorkbenchPage.java @@ -55,6 +55,7 @@ public interface IWorkbenchPage extends IPartService, ISelectionService, * applicable. Use the IDE-specific constant * <code>IDE.EDITOR_ID_ATTR</code>. */ + @Deprecated public static final String EDITOR_ID_ATTR = "org.eclipse.ui.editorID"; //$NON-NLS-1$ /** @@ -253,6 +254,7 @@ public interface IWorkbenchPage extends IPartService, ISelectionService, * {@link org.eclipse.ui.IWorkbench#getWorkingSetManager()} * instead. */ + @Deprecated public void addPropertyChangeListener(IPropertyChangeListener listener); /** @@ -424,6 +426,7 @@ public interface IWorkbenchPage extends IPartService, ISelectionService, * all the editors in the page which can cause plug-in * activation. */ + @Deprecated public IEditorPart[] getEditors(); /** @@ -493,6 +496,7 @@ public interface IWorkbenchPage extends IPartService, ISelectionService, * instead. Calling this method has the side effect of restoring * all the views in the page which can cause plug-in activation. */ + @Deprecated public IViewPart[] getViews(); /** @@ -509,6 +513,7 @@ public interface IWorkbenchPage extends IPartService, ISelectionService, * @since 2.0 * @deprecated individual views should store a working set if needed */ + @Deprecated public IWorkingSet getWorkingSet(); /** @@ -869,6 +874,7 @@ public interface IWorkbenchPage extends IPartService, ISelectionService, * * @deprecated */ + @Deprecated public int getEditorReuseThreshold(); /** @@ -880,6 +886,7 @@ public interface IWorkbenchPage extends IPartService, ISelectionService, * @deprecated use IPageLayout.setEditorReuseThreshold(int openEditors) * instead. */ + @Deprecated public void setEditorReuseThreshold(int openEditors); /** diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/IWorkbenchPartSite.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/IWorkbenchPartSite.java index ab0e1ca142e..e684a69fbbf 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/IWorkbenchPartSite.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/IWorkbenchPartSite.java @@ -122,7 +122,8 @@ public interface IWorkbenchPartSite extends IWorkbenchSite { * @see IContextService * @see IHandlerService */ - public IKeyBindingService getKeyBindingService(); + @Deprecated + public IKeyBindingService getKeyBindingService(); /** * Returns the part associated with this site diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/IWorkbenchPreferenceConstants.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/IWorkbenchPreferenceConstants.java index 4ff97df3823..17cdc1dcca4 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/IWorkbenchPreferenceConstants.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/IWorkbenchPreferenceConstants.java @@ -105,6 +105,7 @@ public interface IWorkbenchPreferenceConstants { * <code>org.eclipse.ui.ide.IDE.Preferences.PROJECT_OPEN_NEW_PERSPECTIVE</code> * instead. */ + @Deprecated public static final String PROJECT_OPEN_NEW_PERSPECTIVE = "PROJECT_OPEN_NEW_PERSPECTIVE"; //$NON-NLS-1$ /** @@ -123,6 +124,7 @@ public interface IWorkbenchPreferenceConstants { * @deprecated Opening a Perspective in a new page is no longer supported * functionality as of 2.0. */ + @Deprecated public static final String OPEN_PERSPECTIVE_PAGE = "OPEN_PERSPECTIVE_PAGE"; //$NON-NLS-1$ /** diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/IWorkbenchSite.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/IWorkbenchSite.java index 443b7eb6fe2..b926b63f10b 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/IWorkbenchSite.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/IWorkbenchSite.java @@ -75,6 +75,7 @@ public interface IWorkbenchSite extends IAdaptable, IShellProvider, * * @return the shell for this workbench site */ + @Override public Shell getShell(); /** diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/IWorkbenchWindow.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/IWorkbenchWindow.java index 12f5fea9f16..b45e66806f9 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/IWorkbenchWindow.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/IWorkbenchWindow.java @@ -72,7 +72,8 @@ public interface IWorkbenchWindow extends IPageService, IRunnableContext, * * @return the active page, or <code>null</code> if none */ - public IWorkbenchPage getActivePage(); + @Override + public IWorkbenchPage getActivePage(); /** * Returns a list of the pages in this workbench window. @@ -107,7 +108,8 @@ public interface IWorkbenchWindow extends IPageService, IRunnableContext, * @return the shell containing this window's controls or <code>null</code> * if the shell has not been created yet or if the window has been closed */ - public Shell getShell(); + @Override + public Shell getShell(); /** * Returns the workbench for this window. @@ -195,7 +197,8 @@ public interface IWorkbenchWindow extends IPageService, IRunnableContext, * * @since 3.2 */ - public void run(boolean fork, boolean cancelable, IRunnableWithProgress runnable) throws InvocationTargetException, InterruptedException; + @Override + public void run(boolean fork, boolean cancelable, IRunnableWithProgress runnable) throws InvocationTargetException, InterruptedException; /** * Sets or clears the currently active page for this workbench window. diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/IWorkingSet.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/IWorkingSet.java index fbd50f65cc3..7186c53f6f7 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/IWorkingSet.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/IWorkingSet.java @@ -61,7 +61,8 @@ public interface IWorkingSet extends IPersistableElement, IAdaptable { * @since 2.1 * @deprecated use {@link #getImageDescriptor()} instead */ - public ImageDescriptor getImage(); + @Deprecated + public ImageDescriptor getImage(); /** * Returns the working set icon. diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/IWorkingSetManager.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/IWorkingSetManager.java index 79a2d924db6..eebe0e876a7 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/IWorkingSetManager.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/IWorkingSetManager.java @@ -232,7 +232,8 @@ public interface IWorkingSetManager { * @return the dialog * @deprecated use createWorkingSetSelectionDialog(parent, true) instead */ - public IWorkingSetSelectionDialog createWorkingSetSelectionDialog( + @Deprecated + public IWorkingSetSelectionDialog createWorkingSetSelectionDialog( Shell parent); /** diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/LegacyHandlerSubmissionExpression.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/LegacyHandlerSubmissionExpression.java index 01b7e25e7f0..dde8f258d9b 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/LegacyHandlerSubmissionExpression.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/LegacyHandlerSubmissionExpression.java @@ -83,6 +83,7 @@ public final class LegacyHandlerSubmissionExpression extends Expression { * * @since 3.2 */ + @Override public final void collectExpressionInfo(final ExpressionInfo info) { if (activePartId != null) { info.addVariableNameAccess(ISources.ACTIVE_PART_ID_NAME); @@ -97,6 +98,7 @@ public final class LegacyHandlerSubmissionExpression extends Expression { } } + @Override protected final int computeHashCode() { int hashCode = HASH_INITIAL * HASH_FACTOR + hashCode(activePartId); hashCode = hashCode * HASH_FACTOR + hashCode(activeShell); @@ -104,6 +106,7 @@ public final class LegacyHandlerSubmissionExpression extends Expression { return hashCode; } + @Override public final boolean equals(final Object object) { if (object instanceof LegacyHandlerSubmissionExpression) { final LegacyHandlerSubmissionExpression that = (LegacyHandlerSubmissionExpression) object; @@ -127,6 +130,7 @@ public final class LegacyHandlerSubmissionExpression extends Expression { * @return <code>EvaluationResult.TRUE</code> if the conditions all * matches; <code>EvaluationResult.FALSE</code> otherwise. */ + @Override public final EvaluationResult evaluate(final IEvaluationContext context) { if (activePartId != null) { final Object value = context @@ -157,6 +161,7 @@ public final class LegacyHandlerSubmissionExpression extends Expression { return EvaluationResult.TRUE; } + @Override public final String toString() { final StringBuffer buffer = new StringBuffer(); buffer.append("LegacyHandlerSubmission("); //$NON-NLS-1$ diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/NavigationLocation.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/NavigationLocation.java index 7c28a0380b8..c5432f87251 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/NavigationLocation.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/NavigationLocation.java @@ -48,7 +48,8 @@ public abstract class NavigationLocation implements INavigationLocation { * (non-Javadoc) * Method declared on INavigationLocation. */ - public Object getInput() { + @Override + public Object getInput() { return input; } @@ -56,7 +57,8 @@ public abstract class NavigationLocation implements INavigationLocation { * (non-Javadoc) * Method declared on INavigationLocation. */ - public String getText() { + @Override + public String getText() { IEditorPart part = getEditorPart(); if (part == null) { return new String(); @@ -68,7 +70,8 @@ public abstract class NavigationLocation implements INavigationLocation { * (non-Javadoc) * Method declared on INavigationLocation. */ - public void setInput(Object input) { + @Override + public void setInput(Object input) { this.input = (IEditorInput) input; } @@ -77,7 +80,8 @@ public abstract class NavigationLocation implements INavigationLocation { * * @see org.eclipse.ui.INavigationLocation#dispose() */ - public void dispose() { + @Override + public void dispose() { releaseState(); } @@ -86,7 +90,8 @@ public abstract class NavigationLocation implements INavigationLocation { * * @see org.eclipse.ui.INavigationLocation#releaseState() */ - public void releaseState() { + @Override + public void releaseState() { input = null; } } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/OpenAndLinkWithEditorHelper.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/OpenAndLinkWithEditorHelper.java index 9db40b15d15..b5221d70f62 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/OpenAndLinkWithEditorHelper.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/OpenAndLinkWithEditorHelper.java @@ -42,6 +42,7 @@ public abstract class OpenAndLinkWithEditorHelper { /* * @see org.eclipse.jface.viewers.IOpenListener#open(org.eclipse.jface.viewers.OpenEvent) */ + @Override public final void open(OpenEvent event) { lastOpenSelection = event.getSelection(); OpenAndLinkWithEditorHelper.this.open(lastOpenSelection, OpenStrategy.activateOnOpen()); @@ -50,6 +51,7 @@ public abstract class OpenAndLinkWithEditorHelper { /* * @see org.eclipse.jface.viewers.ISelectionChangedListener#selectionChanged(org.eclipse.jface.viewers.SelectionChangedEvent) */ + @Override public void selectionChanged(SelectionChangedEvent event) { final ISelection selection = event.getSelection(); if (isLinkingEnabled && !selection.equals(lastOpenSelection) && viewer.getControl().isFocusControl()) @@ -60,6 +62,7 @@ public abstract class OpenAndLinkWithEditorHelper { /* * @see org.eclipse.jface.viewers.IDoubleClickListener#doubleClick(org.eclipse.jface.viewers.DoubleClickEvent) */ + @Override public void doubleClick(DoubleClickEvent event) { if (!OpenStrategy.activateOnOpen()) activate(event.getSelection()); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/PerspectiveAdapter.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/PerspectiveAdapter.java index e15a0d67d4c..b964ce12205 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/PerspectiveAdapter.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/PerspectiveAdapter.java @@ -34,6 +34,7 @@ public class PerspectiveAdapter implements IPerspectiveListener4 { * @see org.eclipse.ui.IPerspectiveListener3#perspectiveOpened(org.eclipse.ui.IWorkbenchPage, * org.eclipse.ui.IPerspectiveDescriptor) */ + @Override public void perspectiveOpened(IWorkbenchPage page, IPerspectiveDescriptor perspective) { // do nothing @@ -45,6 +46,7 @@ public class PerspectiveAdapter implements IPerspectiveListener4 { * @see org.eclipse.ui.IPerspectiveListener3#perspectiveClosed(org.eclipse.ui.IWorkbenchPage, * org.eclipse.ui.IPerspectiveDescriptor) */ + @Override public void perspectiveClosed(IWorkbenchPage page, IPerspectiveDescriptor perspective) { // do nothing @@ -57,6 +59,7 @@ public class PerspectiveAdapter implements IPerspectiveListener4 { * org.eclipse.ui.IPerspectiveDescriptor, * org.eclipse.ui.IWorkbenchPartReference, java.lang.String) */ + @Override public void perspectiveChanged(IWorkbenchPage page, IPerspectiveDescriptor perspective, IWorkbenchPartReference partRef, String changeId) { @@ -69,6 +72,7 @@ public class PerspectiveAdapter implements IPerspectiveListener4 { * @see org.eclipse.ui.IPerspectiveListener#perspectiveActivated(org.eclipse.ui.IWorkbenchPage, * org.eclipse.ui.IPerspectiveDescriptor) */ + @Override public void perspectiveActivated(IWorkbenchPage page, IPerspectiveDescriptor perspective) { // do nothing @@ -80,6 +84,7 @@ public class PerspectiveAdapter implements IPerspectiveListener4 { * @see org.eclipse.ui.IPerspectiveListener#perspectiveChanged(org.eclipse.ui.IWorkbenchPage, * org.eclipse.ui.IPerspectiveDescriptor, java.lang.String) */ + @Override public void perspectiveChanged(IWorkbenchPage page, IPerspectiveDescriptor perspective, String changeId) { // do nothing @@ -91,6 +96,7 @@ public class PerspectiveAdapter implements IPerspectiveListener4 { * @see org.eclipse.ui.IPerspectiveListener3#perspectiveDeactivated(org.eclipse.ui.IWorkbenchPage, * org.eclipse.ui.IPerspectiveDescriptor) */ + @Override public void perspectiveDeactivated(IWorkbenchPage page, IPerspectiveDescriptor perspective) { // do nothing @@ -103,6 +109,7 @@ public class PerspectiveAdapter implements IPerspectiveListener4 { * org.eclipse.ui.IPerspectiveDescriptor, * org.eclipse.ui.IPerspectiveDescriptor) */ + @Override public void perspectiveSavedAs(IWorkbenchPage page, IPerspectiveDescriptor oldPerspective, IPerspectiveDescriptor newPerspective) { @@ -113,6 +120,7 @@ public class PerspectiveAdapter implements IPerspectiveListener4 { * {@inheritDoc} * @since 3.2 */ + @Override public void perspectivePreDeactivate(IWorkbenchPage page, IPerspectiveDescriptor perspective) { // do nothing diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/Saveable.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/Saveable.java index 14a055325bc..e5e9726d278 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/Saveable.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/Saveable.java @@ -134,6 +134,7 @@ public abstract class Saveable extends InternalSaveable implements IAdaptable { * @param object * @return true if this Saveable is equal to the given object */ + @Override public abstract boolean equals(Object object); /** @@ -158,6 +159,7 @@ public abstract class Saveable extends InternalSaveable implements IAdaptable { * * @return a hash code */ + @Override public abstract int hashCode(); /** @@ -301,6 +303,7 @@ public abstract class Saveable extends InternalSaveable implements IAdaptable { * * @since 3.3 */ + @Override public Object getAdapter(Class adapter) { return null; } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/SelectionEnabler.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/SelectionEnabler.java index 36e9def5538..79270caa431 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/SelectionEnabler.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/SelectionEnabler.java @@ -197,6 +197,7 @@ public final class SelectionEnabler { parseClasses(configElement); } + @Override public final boolean equals(final Object object) { if (object instanceof SelectionEnabler) { final SelectionEnabler that = (SelectionEnabler) object; @@ -214,6 +215,7 @@ public final class SelectionEnabler { * * @return The hash code for this object. */ + @Override public final int hashCode() { if (hashCode == HASH_CODE_NOT_COMPUTED) { hashCode = HASH_INITIAL * HASH_FACTOR + Util.hashCode(classes); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/SubActionBars.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/SubActionBars.java index 9c4fc43ba8f..41bc6e5f7d6 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/SubActionBars.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/SubActionBars.java @@ -54,10 +54,12 @@ public class SubActionBars extends EventManager implements IActionBars { * over handlers contributed to the {@link IHandlerService}. */ private static final Expression EXPRESSION = new Expression() { + @Override public final EvaluationResult evaluate(final IEvaluationContext context) { return EvaluationResult.TRUE; } + @Override public final void collectExpressionInfo(final ExpressionInfo info) { info .addVariableNameAccess(SourcePriorityNameMapping.LEGACY_LEGACY_NAME); @@ -173,6 +175,7 @@ public class SubActionBars extends EventManager implements IActionBars { /** * Clear the global action handlers. */ + @Override public void clearGlobalActionHandlers() { if (actionHandlers != null) { actionHandlers.clear(); @@ -307,6 +310,7 @@ public class SubActionBars extends EventManager implements IActionBars { * @return an action handler which implements the action ID, or * <code>null</code> if none is registered. */ + @Override public IAction getGlobalActionHandler(String actionID) { if (actionHandlers == null) { return null; @@ -328,6 +332,7 @@ public class SubActionBars extends EventManager implements IActionBars { * * @return the menu manager */ + @Override public IMenuManager getMenuManager() { if (menuMgr == null) { menuMgr = createSubMenuManager(parent.getMenuManager()); @@ -351,6 +356,7 @@ public class SubActionBars extends EventManager implements IActionBars { * * @since 3.2 */ + @Override public final IServiceLocator getServiceLocator() { if (serviceLocator != null) { return serviceLocator; @@ -365,6 +371,7 @@ public class SubActionBars extends EventManager implements IActionBars { * * @return the status line manager */ + @Override public IStatusLineManager getStatusLineManager() { if (statusLineMgr == null) { statusLineMgr = new SubStatusLineManager(parent @@ -380,6 +387,7 @@ public class SubActionBars extends EventManager implements IActionBars { * * @return the tool bar manager */ + @Override public IToolBarManager getToolBarManager() { if (toolBarMgr == null) { toolBarMgr = createSubToolBarManager(parent.getToolBarManager()); @@ -453,6 +461,7 @@ public class SubActionBars extends EventManager implements IActionBars { * an action which implements the action ID. <code>null</code> * may be passed to deregister a handler. */ + @Override public void setGlobalActionHandler(String actionID, IAction handler) { if (actionID == null) { /* @@ -607,6 +616,7 @@ public class SubActionBars extends EventManager implements IActionBars { * Commits all UI changes. This should be called after additions or * subtractions have been made to a menu, status line, or toolbar. */ + @Override public void updateActionBars() { parent.updateActionBars(); fireActionHandlersChanged(); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/SubActionBars2.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/SubActionBars2.java index f7988695f7b..035c9eb198b 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/SubActionBars2.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/SubActionBars2.java @@ -76,6 +76,7 @@ public class SubActionBars2 extends SubActionBars implements IActionBars2 { * * @see org.eclipse.ui.IActionBars2#getCoolBarManager() */ + @Override public ICoolBarManager getCoolBarManager() { if (coolBarMgr == null) { coolBarMgr = createSubCoolBarManager(getCastedParent() @@ -90,6 +91,7 @@ public class SubActionBars2 extends SubActionBars implements IActionBars2 { * * @see org.eclipse.ui.SubActionBars#setActive(boolean) */ + @Override protected void setActive(boolean value) { super.setActive(value); if (coolBarMgr != null) { @@ -102,6 +104,7 @@ public class SubActionBars2 extends SubActionBars implements IActionBars2 { * * @see org.eclipse.ui.SubActionBars#dispose() */ + @Override public void dispose() { super.dispose(); if (coolBarMgr != null) { diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/WorkbenchEncoding.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/WorkbenchEncoding.java index 6cd8160c206..caaa2887d8f 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/WorkbenchEncoding.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/WorkbenchEncoding.java @@ -68,6 +68,7 @@ public class WorkbenchEncoding { * * @see org.eclipse.ui.internal.registry.RegistryReader#readElement(org.eclipse.core.runtime.IConfigurationElement) */ + @Override protected boolean readElement(IConfigurationElement element) { String name = element.getAttribute(IWorkbenchRegistryConstants.ATT_NAME); if (name != null) { diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/XMLMemento.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/XMLMemento.java index 0ec08a22f8f..8fa8b2442d9 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/XMLMemento.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/XMLMemento.java @@ -98,6 +98,7 @@ public final class XMLMemento implements IMemento { /** * @throws SAXException */ + @Override public void warning(SAXParseException exception) throws SAXException { // ignore } @@ -105,10 +106,12 @@ public final class XMLMemento implements IMemento { /** * @throws SAXException */ + @Override public void error(SAXParseException exception) throws SAXException { // ignore } + @Override public void fatalError(SAXParseException exception) throws SAXException { throw exception; } @@ -198,6 +201,7 @@ public final class XMLMemento implements IMemento { * @throws DOMException * if the child cannot be created */ + @Override public IMemento createChild(String type) throws DOMException { Element child = factory.createElement(type); element.appendChild(child); @@ -222,6 +226,7 @@ public final class XMLMemento implements IMemento { * @throws DOMException * if the child cannot be created */ + @Override public IMemento createChild(String type, String id) throws DOMException { Element child = factory.createElement(type); child.setAttribute(TAG_ID, id == null ? "" : id); //$NON-NLS-1$ @@ -247,7 +252,8 @@ public final class XMLMemento implements IMemento { /* (non-Javadoc) * Method declared in IMemento. */ - public IMemento getChild(String type) { + @Override + public IMemento getChild(String type) { // Get the nodes. NodeList nodes = element.getChildNodes(); @@ -274,6 +280,7 @@ public final class XMLMemento implements IMemento { /* * (non-Javadoc) Method declared in IMemento. */ + @Override public IMemento[] getChildren() { // Get the nodes. @@ -303,7 +310,8 @@ public final class XMLMemento implements IMemento { /* (non-Javadoc) * Method declared in IMemento. */ - public IMemento[] getChildren(String type) { + @Override + public IMemento[] getChildren(String type) { // Get the nodes. NodeList nodes = element.getChildNodes(); @@ -336,7 +344,8 @@ public final class XMLMemento implements IMemento { /* (non-Javadoc) * Method declared in IMemento. */ - public Float getFloat(String key) { + @Override + public Float getFloat(String key) { Attr attr = element.getAttributeNode(key); if (attr == null) { return null; @@ -354,6 +363,7 @@ public final class XMLMemento implements IMemento { /** * @since 3.4 */ + @Override public String getType() { return element.getNodeName(); } @@ -361,14 +371,16 @@ public final class XMLMemento implements IMemento { /* (non-Javadoc) * Method declared in IMemento. */ - public String getID() { + @Override + public String getID() { return element.getAttribute(TAG_ID); } /* (non-Javadoc) * Method declared in IMemento. */ - public Integer getInteger(String key) { + @Override + public Integer getInteger(String key) { Attr attr = element.getAttributeNode(key); if (attr == null) { return null; @@ -387,7 +399,8 @@ public final class XMLMemento implements IMemento { /* (non-Javadoc) * Method declared in IMemento. */ - public String getString(String key) { + @Override + public String getString(String key) { Attr attr = element.getAttributeNode(key); if (attr == null) { return null; @@ -398,6 +411,7 @@ public final class XMLMemento implements IMemento { /** * @since 3.4 */ + @Override public Boolean getBoolean(String key) { Attr attr = element.getAttributeNode(key); if (attr == null) { @@ -416,6 +430,7 @@ public final class XMLMemento implements IMemento { * @throws DOMException * if the text node is too big */ + @Override public String getTextData() throws DOMException { Text textNode = getTextNode(); if (textNode != null) { @@ -427,6 +442,7 @@ public final class XMLMemento implements IMemento { /** * @since 3.4 */ + @Override public String[] getAttributeKeys() { NamedNodeMap map = element.getAttributes(); int size = map.getLength(); @@ -505,6 +521,7 @@ public final class XMLMemento implements IMemento { * @throws DOMException * if the attribute cannot be set */ + @Override public void putFloat(String key, float f) throws DOMException { element.setAttribute(key, String.valueOf(f)); } @@ -519,6 +536,7 @@ public final class XMLMemento implements IMemento { * @throws DOMException * if the attribute cannot be set */ + @Override public void putInteger(String key, int n) throws DOMException { element.setAttribute(key, String.valueOf(n)); } @@ -532,6 +550,7 @@ public final class XMLMemento implements IMemento { * @throws DOMException * if the attributes or children cannot be copied to this node. */ + @Override public void putMemento(IMemento memento) throws DOMException { // Do not copy the element's top level text node (this would overwrite the existing text). // Text nodes of children are copied. @@ -548,6 +567,7 @@ public final class XMLMemento implements IMemento { * @throws DOMException * if the attribute cannot be set */ + @Override public void putString(String key, String value) throws DOMException { if (value == null) { return; @@ -566,6 +586,7 @@ public final class XMLMemento implements IMemento { * @throws DOMException * if the attribute cannot be set */ + @Override public void putBoolean(String key, boolean value) throws DOMException { element.setAttribute(key, value ? "true" : "false"); //$NON-NLS-1$ //$NON-NLS-2$ } @@ -581,6 +602,7 @@ public final class XMLMemento implements IMemento { * @throws DOMException * if the text node cannot be created under this node. */ + @Override public void putTextData(String data) throws DOMException { Text textNode = getTextNode(); if (textNode == null) { diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/about/InstallationPage.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/about/InstallationPage.java index 84e6682f36b..82c4af1c96f 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/about/InstallationPage.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/about/InstallationPage.java @@ -51,6 +51,7 @@ public abstract class InstallationPage extends DialogPage { * @param newMessage * the message, or <code>null</code> to clear the message */ + @Override public void setMessage(String newMessage) { super.setMessage(newMessage); } @@ -72,6 +73,7 @@ public abstract class InstallationPage extends DialogPage { * @param newType * the message type */ + @Override public void setMessage(String newMessage, int newType) { super.setMessage(newMessage, newType); } @@ -129,6 +131,7 @@ public abstract class InstallationPage extends DialogPage { button.setText(label); button.setData(new Integer(id)); button.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent event) { buttonPressed(((Integer) event.widget.getData()).intValue()); } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/actions/ActionDelegate.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/actions/ActionDelegate.java index bd3a8a56112..dd2614db50d 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/actions/ActionDelegate.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/actions/ActionDelegate.java @@ -34,7 +34,8 @@ public abstract class ActionDelegate implements IActionDelegate2 { * by the default implementation of <code>runWithEvent</code> of this * abstract class. */ - public void run(IAction action) { + @Override + public void run(IAction action) { } /** @@ -42,7 +43,8 @@ public abstract class ActionDelegate implements IActionDelegate2 { * <code>IActionDelegate</code> method does nothing. Subclasses may * reimplement. */ - public void selectionChanged(IAction action, ISelection selection) { + @Override + public void selectionChanged(IAction action, ISelection selection) { } /** @@ -50,7 +52,8 @@ public abstract class ActionDelegate implements IActionDelegate2 { * <code>IActionDelegate2</code> method does nothing. Subclasses may * reimplement. */ - public void init(IAction action) { + @Override + public void init(IAction action) { } /** @@ -58,7 +61,8 @@ public abstract class ActionDelegate implements IActionDelegate2 { * <code>IActionDelegate2</code> method does nothing. Subclasses may * reimplement. */ - public void dispose() { + @Override + public void dispose() { } /** @@ -66,7 +70,8 @@ public abstract class ActionDelegate implements IActionDelegate2 { * <code>IActionDelegate2</code> method redirects to the <code>run</code> * method. Subclasses may reimplement. */ - public void runWithEvent(IAction action, Event event) { + @Override + public void runWithEvent(IAction action, Event event) { run(action); } } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/actions/ActionFactory.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/actions/ActionFactory.java index 735959c8b54..7d7475c6415 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/actions/ActionFactory.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/actions/ActionFactory.java @@ -92,6 +92,7 @@ public abstract class ActionFactory { * * @see org.eclipse.ui.actions.ActionFactory#create(org.eclipse.ui.IWorkbenchWindow) */ + @Override public IWorkbenchAction create(IWorkbenchWindow window) { if (window == null) { throw new IllegalArgumentException(); @@ -130,7 +131,8 @@ public abstract class ActionFactory { /* (non-Javadoc) * @see org.eclipse.ui.actions.ActionFactory#create(org.eclipse.ui.IWorkbenchWindow) */ - public IWorkbenchAction create(IWorkbenchWindow window) { + @Override + public IWorkbenchAction create(IWorkbenchWindow window) { if (window == null) { throw new IllegalArgumentException(); } @@ -153,7 +155,8 @@ public abstract class ActionFactory { /* (non-Javadoc) * @see org.eclipse.ui.actions.ActionFactory#create(org.eclipse.ui.IWorkbenchWindow) */ - public IWorkbenchAction create(IWorkbenchWindow window) { + @Override + public IWorkbenchAction create(IWorkbenchWindow window) { if (window == null) { throw new IllegalArgumentException(); } @@ -174,7 +177,8 @@ public abstract class ActionFactory { /* (non-Javadoc) * @see org.eclipse.ui.actions.ActionFactory#create(org.eclipse.ui.IWorkbenchWindow) */ - public IWorkbenchAction create(IWorkbenchWindow window) { + @Override + public IWorkbenchAction create(IWorkbenchWindow window) { if (window == null) { throw new IllegalArgumentException(); } @@ -193,7 +197,8 @@ public abstract class ActionFactory { /* (non-Javadoc) * @see org.eclipse.ui.actions.ActionFactory#create(org.eclipse.ui.IWorkbenchWindow) */ - public IWorkbenchAction create(IWorkbenchWindow window) { + @Override + public IWorkbenchAction create(IWorkbenchWindow window) { if (window == null) { throw new IllegalArgumentException(); } @@ -215,7 +220,8 @@ public abstract class ActionFactory { /* (non-Javadoc) * @see org.eclipse.ui.actions.ActionFactory#create(org.eclipse.ui.IWorkbenchWindow) */ - public IWorkbenchAction create(IWorkbenchWindow window) { + @Override + public IWorkbenchAction create(IWorkbenchWindow window) { if (window == null) { throw new IllegalArgumentException(); } @@ -239,7 +245,8 @@ public abstract class ActionFactory { /* (non-Javadoc) * @see org.eclipse.ui.actions.ActionFactory#create(org.eclipse.ui.IWorkbenchWindow) */ - public IWorkbenchAction create(IWorkbenchWindow window) { + @Override + public IWorkbenchAction create(IWorkbenchWindow window) { if (window == null) { throw new IllegalArgumentException(); } @@ -261,7 +268,8 @@ public abstract class ActionFactory { /* (non-Javadoc) * @see org.eclipse.ui.actions.ActionFactory#create(org.eclipse.ui.IWorkbenchWindow) */ - public IWorkbenchAction create(IWorkbenchWindow window) { + @Override + public IWorkbenchAction create(IWorkbenchWindow window) { if (window == null) { throw new IllegalArgumentException(); } @@ -286,7 +294,8 @@ public abstract class ActionFactory { /* (non-Javadoc) * @see org.eclipse.ui.actions.ActionFactory#create(org.eclipse.ui.IWorkbenchWindow) */ - public IWorkbenchAction create(IWorkbenchWindow window) { + @Override + public IWorkbenchAction create(IWorkbenchWindow window) { if (window == null) { throw new IllegalArgumentException(); } @@ -307,7 +316,8 @@ public abstract class ActionFactory { * * @see org.eclipse.ui.actions.ActionFactory#create(org.eclipse.ui.IWorkbenchWindow) */ - public IWorkbenchAction create(IWorkbenchWindow window) { + @Override + public IWorkbenchAction create(IWorkbenchWindow window) { if (window == null) { throw new IllegalArgumentException(); } @@ -342,7 +352,8 @@ public abstract class ActionFactory { /* (non-Javadoc) * @see org.eclipse.ui.actions.ActionFactory#create(org.eclipse.ui.IWorkbenchWindow) */ - public IWorkbenchAction create(IWorkbenchWindow window) { + @Override + public IWorkbenchAction create(IWorkbenchWindow window) { if (window == null) { throw new IllegalArgumentException(); } @@ -372,7 +383,8 @@ public abstract class ActionFactory { /* (non-Javadoc) * @see org.eclipse.ui.actions.ActionFactory#create(org.eclipse.ui.IWorkbenchWindow) */ - public IWorkbenchAction create(IWorkbenchWindow window) { + @Override + public IWorkbenchAction create(IWorkbenchWindow window) { if (window == null) { throw new IllegalArgumentException(); } @@ -400,7 +412,8 @@ public abstract class ActionFactory { /* (non-Javadoc) * @see org.eclipse.ui.actions.ActionFactory#create(org.eclipse.ui.IWorkbenchWindow) */ - public IWorkbenchAction create(IWorkbenchWindow window) { + @Override + public IWorkbenchAction create(IWorkbenchWindow window) { if (window == null) { throw new IllegalArgumentException(); } @@ -428,7 +441,8 @@ public abstract class ActionFactory { /* (non-Javadoc) * @see org.eclipse.ui.actions.ActionFactory#create(org.eclipse.ui.IWorkbenchWindow) */ - public IWorkbenchAction create(IWorkbenchWindow window) { + @Override + public IWorkbenchAction create(IWorkbenchWindow window) { if (window == null) { throw new IllegalArgumentException(); } @@ -460,7 +474,8 @@ public abstract class ActionFactory { /* (non-Javadoc) * @see org.eclipse.ui.actions.ActionFactory#create(org.eclipse.ui.IWorkbenchWindow) */ - public IWorkbenchAction create(IWorkbenchWindow window) { + @Override + public IWorkbenchAction create(IWorkbenchWindow window) { if (window == null) { throw new IllegalArgumentException(); } @@ -486,7 +501,8 @@ public abstract class ActionFactory { /* (non-Javadoc) * @see org.eclipse.ui.actions.ActionFactory#create(org.eclipse.ui.IWorkbenchWindow) */ - public IWorkbenchAction create(IWorkbenchWindow window) { + @Override + public IWorkbenchAction create(IWorkbenchWindow window) { if (window == null) { throw new IllegalArgumentException(); } @@ -516,7 +532,8 @@ public abstract class ActionFactory { /* (non-Javadoc) * @see org.eclipse.ui.actions.ActionFactory#create(org.eclipse.ui.IWorkbenchWindow) */ - public IWorkbenchAction create(IWorkbenchWindow window) { + @Override + public IWorkbenchAction create(IWorkbenchWindow window) { if (window == null) { throw new IllegalArgumentException(); } @@ -543,7 +560,8 @@ public abstract class ActionFactory { /* (non-Javadoc) * @see org.eclipse.ui.actions.ActionFactory#create(org.eclipse.ui.IWorkbenchWindow) */ - public IWorkbenchAction create(IWorkbenchWindow window) { + @Override + public IWorkbenchAction create(IWorkbenchWindow window) { if (window == null) { throw new IllegalArgumentException(); } @@ -565,7 +583,8 @@ public abstract class ActionFactory { /* (non-Javadoc) * @see org.eclipse.ui.actions.ActionFactory#create(org.eclipse.ui.IWorkbenchWindow) */ - public IWorkbenchAction create(IWorkbenchWindow window) { + @Override + public IWorkbenchAction create(IWorkbenchWindow window) { if (window == null) { throw new IllegalArgumentException(); } @@ -586,7 +605,8 @@ public abstract class ActionFactory { /* (non-Javadoc) * @see org.eclipse.ui.actions.ActionFactory#create(org.eclipse.ui.IWorkbenchWindow) */ - public IWorkbenchAction create(IWorkbenchWindow window) { + @Override + public IWorkbenchAction create(IWorkbenchWindow window) { if (window == null) { throw new IllegalArgumentException(); } @@ -608,7 +628,8 @@ public abstract class ActionFactory { /* (non-Javadoc) * @see org.eclipse.ui.actions.ActionFactory#create(org.eclipse.ui.IWorkbenchWindow) */ - public IWorkbenchAction create(IWorkbenchWindow window) { + @Override + public IWorkbenchAction create(IWorkbenchWindow window) { if (window == null) { throw new IllegalArgumentException(); } @@ -637,6 +658,7 @@ public abstract class ActionFactory { /* (non-Javadoc) * @see org.eclipse.ui.actions.ActionFactory#create(org.eclipse.ui.IWorkbenchWindow) */ + @Override public IWorkbenchAction create(IWorkbenchWindow window) { if (window == null) { throw new IllegalArgumentException(); @@ -660,7 +682,8 @@ public abstract class ActionFactory { /* (non-Javadoc) * @see org.eclipse.ui.actions.ActionFactory#create(org.eclipse.ui.IWorkbenchWindow) */ - public IWorkbenchAction create(IWorkbenchWindow window) { + @Override + public IWorkbenchAction create(IWorkbenchWindow window) { if (window == null) { throw new IllegalArgumentException(); } @@ -687,7 +710,8 @@ public abstract class ActionFactory { /* (non-Javadoc) * @see org.eclipse.ui.actions.ActionFactory#create(org.eclipse.ui.IWorkbenchWindow) */ - public IWorkbenchAction create(IWorkbenchWindow window) { + @Override + public IWorkbenchAction create(IWorkbenchWindow window) { if (window == null) { throw new IllegalArgumentException(); } @@ -711,7 +735,8 @@ public abstract class ActionFactory { /* (non-Javadoc) * @see org.eclipse.ui.actions.ActionFactory#create(org.eclipse.ui.IWorkbenchWindow) */ - public IWorkbenchAction create(IWorkbenchWindow window) { + @Override + public IWorkbenchAction create(IWorkbenchWindow window) { if (window == null) { throw new IllegalArgumentException(); } @@ -733,7 +758,8 @@ public abstract class ActionFactory { /* (non-Javadoc) * @see org.eclipse.ui.actions.ActionFactory#create(org.eclipse.ui.IWorkbenchWindow) */ - public IWorkbenchAction create(IWorkbenchWindow window) { + @Override + public IWorkbenchAction create(IWorkbenchWindow window) { if (window == null) { throw new IllegalArgumentException(); } @@ -766,7 +792,8 @@ public abstract class ActionFactory { /* (non-Javadoc) * @see org.eclipse.ui.actions.ActionFactory#create(org.eclipse.ui.IWorkbenchWindow) */ - public IWorkbenchAction create(IWorkbenchWindow window) { + @Override + public IWorkbenchAction create(IWorkbenchWindow window) { if (window == null) { throw new IllegalArgumentException(); } @@ -786,7 +813,8 @@ public abstract class ActionFactory { /* (non-Javadoc) * @see org.eclipse.ui.actions.ActionFactory#create(org.eclipse.ui.IWorkbenchWindow) */ - public IWorkbenchAction create(IWorkbenchWindow window) { + @Override + public IWorkbenchAction create(IWorkbenchWindow window) { if (window == null) { throw new IllegalArgumentException(); } @@ -813,7 +841,8 @@ public abstract class ActionFactory { /* (non-Javadoc) * @see org.eclipse.ui.actions.ActionFactory#create(org.eclipse.ui.IWorkbenchWindow) */ - public IWorkbenchAction create(IWorkbenchWindow window) { + @Override + public IWorkbenchAction create(IWorkbenchWindow window) { if (window == null) { throw new IllegalArgumentException(); } @@ -846,7 +875,8 @@ public abstract class ActionFactory { /* (non-Javadoc) * @see org.eclipse.ui.actions.ActionFactory#create(org.eclipse.ui.IWorkbenchWindow) */ - public IWorkbenchAction create(IWorkbenchWindow window) { + @Override + public IWorkbenchAction create(IWorkbenchWindow window) { if (window == null) { throw new IllegalArgumentException(); } @@ -877,7 +907,8 @@ public abstract class ActionFactory { /* (non-Javadoc) * @see org.eclipse.ui.actions.ActionFactory#create(org.eclipse.ui.IWorkbenchWindow) */ - public IWorkbenchAction create(IWorkbenchWindow window) { + @Override + public IWorkbenchAction create(IWorkbenchWindow window) { if (window == null) { throw new IllegalArgumentException(); } @@ -904,7 +935,8 @@ public abstract class ActionFactory { /* (non-Javadoc) * @see org.eclipse.ui.actions.ActionFactory#create(org.eclipse.ui.IWorkbenchWindow) */ - public IWorkbenchAction create(IWorkbenchWindow window) { + @Override + public IWorkbenchAction create(IWorkbenchWindow window) { if (window == null) { throw new IllegalArgumentException(); } @@ -930,7 +962,8 @@ public abstract class ActionFactory { /* (non-Javadoc) * @see org.eclipse.ui.actions.ActionFactory#create(org.eclipse.ui.IWorkbenchWindow) */ - public IWorkbenchAction create(IWorkbenchWindow window) { + @Override + public IWorkbenchAction create(IWorkbenchWindow window) { if (window == null) { throw new IllegalArgumentException(); } @@ -958,7 +991,8 @@ public abstract class ActionFactory { /* (non-Javadoc) * @see org.eclipse.ui.actions.ActionFactory#create(org.eclipse.ui.IWorkbenchWindow) */ - public IWorkbenchAction create(IWorkbenchWindow window) { + @Override + public IWorkbenchAction create(IWorkbenchWindow window) { if (window == null) { throw new IllegalArgumentException(); } @@ -979,7 +1013,8 @@ public abstract class ActionFactory { /* (non-Javadoc) * @see org.eclipse.ui.actions.ActionFactory#create(org.eclipse.ui.IWorkbenchWindow) */ - public IWorkbenchAction create(IWorkbenchWindow window) { + @Override + public IWorkbenchAction create(IWorkbenchWindow window) { if (window == null) { throw new IllegalArgumentException(); } @@ -1006,7 +1041,8 @@ public abstract class ActionFactory { /* (non-Javadoc) * @see org.eclipse.ui.actions.ActionFactory#create(org.eclipse.ui.IWorkbenchWindow) */ - public IWorkbenchAction create(IWorkbenchWindow window) { + @Override + public IWorkbenchAction create(IWorkbenchWindow window) { if (window == null) { throw new IllegalArgumentException(); } @@ -1038,7 +1074,8 @@ public abstract class ActionFactory { /* (non-Javadoc) * @see org.eclipse.ui.actions.ActionFactory#create(org.eclipse.ui.IWorkbenchWindow) */ - public IWorkbenchAction create(IWorkbenchWindow window) { + @Override + public IWorkbenchAction create(IWorkbenchWindow window) { if (window == null) { throw new IllegalArgumentException(); } @@ -1069,7 +1106,8 @@ public abstract class ActionFactory { /* (non-Javadoc) * @see org.eclipse.ui.actions.ActionFactory#create(org.eclipse.ui.IWorkbenchWindow) */ - public IWorkbenchAction create(IWorkbenchWindow window) { + @Override + public IWorkbenchAction create(IWorkbenchWindow window) { if (window == null) { throw new IllegalArgumentException(); } @@ -1095,7 +1133,8 @@ public abstract class ActionFactory { /* (non-Javadoc) * @see org.eclipse.ui.actions.ActionFactory#create(org.eclipse.ui.IWorkbenchWindow) */ - public IWorkbenchAction create(IWorkbenchWindow window) { + @Override + public IWorkbenchAction create(IWorkbenchWindow window) { if (window == null) { throw new IllegalArgumentException(); } @@ -1124,7 +1163,8 @@ public abstract class ActionFactory { /* (non-Javadoc) * @see org.eclipse.ui.actions.ActionFactory#create(org.eclipse.ui.IWorkbenchWindow) */ - public IWorkbenchAction create(IWorkbenchWindow window) { + @Override + public IWorkbenchAction create(IWorkbenchWindow window) { if (window == null) { throw new IllegalArgumentException(); } @@ -1146,7 +1186,8 @@ public abstract class ActionFactory { /* (non-Javadoc) * @see org.eclipse.ui.actions.ActionFactory#create(org.eclipse.ui.IWorkbenchWindow) */ - public IWorkbenchAction create(IWorkbenchWindow window) { + @Override + public IWorkbenchAction create(IWorkbenchWindow window) { if (window == null) { throw new IllegalArgumentException(); } @@ -1171,7 +1212,8 @@ public abstract class ActionFactory { /* (non-Javadoc) * @see org.eclipse.ui.actions.ActionFactory#create(org.eclipse.ui.IWorkbenchWindow) */ - public IWorkbenchAction create(IWorkbenchWindow window) { + @Override + public IWorkbenchAction create(IWorkbenchWindow window) { if (window == null) { throw new IllegalArgumentException(); } @@ -1200,7 +1242,8 @@ public abstract class ActionFactory { /* (non-Javadoc) * @see org.eclipse.ui.actions.ActionFactory#create(org.eclipse.ui.IWorkbenchWindow) */ - public IWorkbenchAction create(IWorkbenchWindow window) { + @Override + public IWorkbenchAction create(IWorkbenchWindow window) { if (window == null) { throw new IllegalArgumentException(); } @@ -1222,7 +1265,8 @@ public abstract class ActionFactory { /* (non-Javadoc) * @see org.eclipse.ui.actions.ActionFactory#create(org.eclipse.ui.IWorkbenchWindow) */ - public IWorkbenchAction create(IWorkbenchWindow window) { + @Override + public IWorkbenchAction create(IWorkbenchWindow window) { if (window == null) { throw new IllegalArgumentException(); } @@ -1244,7 +1288,8 @@ public abstract class ActionFactory { /* (non-Javadoc) * @see org.eclipse.ui.actions.ActionFactory#create(org.eclipse.ui.IWorkbenchWindow) */ - public IWorkbenchAction create(IWorkbenchWindow window) { + @Override + public IWorkbenchAction create(IWorkbenchWindow window) { if (window == null) { throw new IllegalArgumentException(); } @@ -1269,7 +1314,8 @@ public abstract class ActionFactory { /* (non-Javadoc) * @see org.eclipse.ui.actions.ActionFactory#create(org.eclipse.ui.IWorkbenchWindow) */ - public IWorkbenchAction create(IWorkbenchWindow window) { + @Override + public IWorkbenchAction create(IWorkbenchWindow window) { if (window == null) { throw new IllegalArgumentException(); } @@ -1291,7 +1337,8 @@ public abstract class ActionFactory { /* (non-Javadoc) * @see org.eclipse.ui.actions.ActionFactory#create(org.eclipse.ui.IWorkbenchWindow) */ - public IWorkbenchAction create(IWorkbenchWindow window) { + @Override + public IWorkbenchAction create(IWorkbenchWindow window) { if (window == null) { throw new IllegalArgumentException(); } @@ -1315,7 +1362,8 @@ public abstract class ActionFactory { /* (non-Javadoc) * @see org.eclipse.ui.actions.ActionFactory#create(org.eclipse.ui.IWorkbenchWindow) */ - public IWorkbenchAction create(IWorkbenchWindow window) { + @Override + public IWorkbenchAction create(IWorkbenchWindow window) { if (window == null) { throw new IllegalArgumentException(); } @@ -1339,7 +1387,8 @@ public abstract class ActionFactory { /* (non-Javadoc) * @see org.eclipse.ui.actions.ActionFactory#create(org.eclipse.ui.IWorkbenchWindow) */ - public IWorkbenchAction create(IWorkbenchWindow window) { + @Override + public IWorkbenchAction create(IWorkbenchWindow window) { if (window == null) { throw new IllegalArgumentException(); } @@ -1363,7 +1412,8 @@ public abstract class ActionFactory { /* (non-Javadoc) * @see org.eclipse.ui.actions.ActionFactory#create(org.eclipse.ui.IWorkbenchWindow) */ - public IWorkbenchAction create(IWorkbenchWindow window) { + @Override + public IWorkbenchAction create(IWorkbenchWindow window) { if (window == null) { throw new IllegalArgumentException(); } @@ -1389,7 +1439,8 @@ public abstract class ActionFactory { /* (non-Javadoc) * @see org.eclipse.ui.actions.ActionFactory#create(org.eclipse.ui.IWorkbenchWindow) */ - public IWorkbenchAction create(IWorkbenchWindow window) { + @Override + public IWorkbenchAction create(IWorkbenchWindow window) { if (window == null) { throw new IllegalArgumentException(); } @@ -1411,7 +1462,8 @@ public abstract class ActionFactory { /* (non-Javadoc) * @see org.eclipse.ui.actions.ActionFactory#create(org.eclipse.ui.IWorkbenchWindow) */ - public IWorkbenchAction create(IWorkbenchWindow window) { + @Override + public IWorkbenchAction create(IWorkbenchWindow window) { if (window == null) { throw new IllegalArgumentException(); } @@ -1431,7 +1483,8 @@ public abstract class ActionFactory { /* (non-Javadoc) * @see org.eclipse.ui.actions.ActionFactory#create(org.eclipse.ui.IWorkbenchWindow) */ - public IWorkbenchAction create(IWorkbenchWindow window) { + @Override + public IWorkbenchAction create(IWorkbenchWindow window) { if (window == null) { throw new IllegalArgumentException(); } @@ -1455,7 +1508,8 @@ public abstract class ActionFactory { /* (non-Javadoc) * @see org.eclipse.ui.actions.ActionFactory#create(org.eclipse.ui.IWorkbenchWindow) */ - public IWorkbenchAction create(IWorkbenchWindow window) { + @Override + public IWorkbenchAction create(IWorkbenchWindow window) { if (window == null) { throw new IllegalArgumentException(); } @@ -1482,6 +1536,7 @@ public abstract class ActionFactory { * * @see org.eclipse.ui.actions.ActionFactory#create(org.eclipse.ui.IWorkbenchWindow) */ + @Override public IWorkbenchAction create(IWorkbenchWindow window) { WorkbenchCommandAction action = new WorkbenchCommandAction("org.eclipse.ui.window.quickAccess", window); //$NON-NLS-1$ action.setId(getId()); @@ -1502,7 +1557,8 @@ public abstract class ActionFactory { /* (non-Javadoc) * @see org.eclipse.ui.actions.ActionFactory#create(org.eclipse.ui.IWorkbenchWindow) */ - public IWorkbenchAction create(IWorkbenchWindow window) { + @Override + public IWorkbenchAction create(IWorkbenchWindow window) { if (window == null) { throw new IllegalArgumentException(); } @@ -1524,7 +1580,8 @@ public abstract class ActionFactory { /* (non-Javadoc) * @see org.eclipse.ui.actions.ActionFactory#create(org.eclipse.ui.IWorkbenchWindow) */ - public IWorkbenchAction create(IWorkbenchWindow window) { + @Override + public IWorkbenchAction create(IWorkbenchWindow window) { if (window == null) { throw new IllegalArgumentException(); } @@ -1547,7 +1604,8 @@ public abstract class ActionFactory { /* (non-Javadoc) * @see org.eclipse.ui.actions.ActionFactory#create(org.eclipse.ui.IWorkbenchWindow) */ - public IWorkbenchAction create(IWorkbenchWindow window) { + @Override + public IWorkbenchAction create(IWorkbenchWindow window) { if (window == null) { throw new IllegalArgumentException(); } @@ -1575,7 +1633,8 @@ public abstract class ActionFactory { /* (non-Javadoc) * @see org.eclipse.ui.actions.ActionFactory#create(org.eclipse.ui.IWorkbenchWindow) */ - public IWorkbenchAction create(IWorkbenchWindow window) { + @Override + public IWorkbenchAction create(IWorkbenchWindow window) { if (window == null) { throw new IllegalArgumentException(); } @@ -1597,7 +1656,8 @@ public abstract class ActionFactory { /* (non-Javadoc) * @see org.eclipse.ui.actions.ActionFactory#create(org.eclipse.ui.IWorkbenchWindow) */ - public IWorkbenchAction create(IWorkbenchWindow window) { + @Override + public IWorkbenchAction create(IWorkbenchWindow window) { if (window == null) { throw new IllegalArgumentException(); } @@ -1619,7 +1679,8 @@ public abstract class ActionFactory { /* (non-Javadoc) * @see org.eclipse.ui.actions.ActionFactory#create(org.eclipse.ui.IWorkbenchWindow) */ - public IWorkbenchAction create(IWorkbenchWindow window) { + @Override + public IWorkbenchAction create(IWorkbenchWindow window) { if (window == null) { throw new IllegalArgumentException(); } @@ -1641,7 +1702,8 @@ public abstract class ActionFactory { /* (non-Javadoc) * @see org.eclipse.ui.actions.ActionFactory#create(org.eclipse.ui.IWorkbenchWindow) */ - public IWorkbenchAction create(IWorkbenchWindow window) { + @Override + public IWorkbenchAction create(IWorkbenchWindow window) { if (window == null) { throw new IllegalArgumentException(); } @@ -1663,7 +1725,8 @@ public abstract class ActionFactory { /* (non-Javadoc) * @see org.eclipse.ui.actions.ActionFactory#create(org.eclipse.ui.IWorkbenchWindow) */ - public IWorkbenchAction create(IWorkbenchWindow window) { + @Override + public IWorkbenchAction create(IWorkbenchWindow window) { if (window == null) { throw new IllegalArgumentException(); } @@ -1692,7 +1755,8 @@ public abstract class ActionFactory { /* (non-Javadoc) * @see org.eclipse.ui.actions.ActionFactory#create(org.eclipse.ui.IWorkbenchWindow) */ - public IWorkbenchAction create(IWorkbenchWindow window) { + @Override + public IWorkbenchAction create(IWorkbenchWindow window) { if (window == null) { throw new IllegalArgumentException(); } @@ -1717,6 +1781,7 @@ public abstract class ActionFactory { public static final ActionFactory TOGGLE_COOLBAR = new ActionFactory( "toggleCoolbar") { //$NON-NLS-1$ + @Override public IWorkbenchAction create(IWorkbenchWindow window) { if (window == null) { throw new IllegalArgumentException(); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/actions/BaseNewWizardMenu.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/actions/BaseNewWizardMenu.java index e19f9fea185..f09ec9bfc53 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/actions/BaseNewWizardMenu.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/actions/BaseNewWizardMenu.java @@ -64,7 +64,8 @@ public class BaseNewWizardMenu extends CompoundContributionItem { /* (non-Javadoc) * @see org.eclipse.core.runtime.dynamicHelpers.IExtensionChangeHandler#removeExtension(org.eclipse.core.runtime.IExtension, java.lang.Object[]) */ - public void removeExtension(IExtension source, Object[] objects) { + @Override + public void removeExtension(IExtension source, Object[] objects) { for (int i = 0; i < objects.length; i++) { if (objects[i] instanceof NewWizardShortcutAction) { actions.values().remove(objects[i]); @@ -75,7 +76,8 @@ public class BaseNewWizardMenu extends CompoundContributionItem { /* (non-Javadoc) * @see org.eclipse.core.runtime.dynamicHelpers.IExtensionChangeHandler#addExtension(org.eclipse.core.runtime.dynamicHelpers.IExtensionTracker, org.eclipse.core.runtime.IExtension) */ - public void addExtension(IExtensionTracker tracker, IExtension extension) { + @Override + public void addExtension(IExtensionTracker tracker, IExtension extension) { // Do nothing } }; @@ -85,7 +87,8 @@ public class BaseNewWizardMenu extends CompoundContributionItem { */ private final IRegistryChangeListener registryListener = new IRegistryChangeListener() { - public void registryChanged(IRegistryChangeEvent event) { + @Override + public void registryChanged(IRegistryChangeEvent event) { // reset the reader. // TODO This is expensive. Can we be more selective? if (getParent() != null) { @@ -164,7 +167,8 @@ public class BaseNewWizardMenu extends CompoundContributionItem { * * @see org.eclipse.jface.action.IContributionItem#dispose() */ - public void dispose() { + @Override + public void dispose() { if (workbenchWindow != null) { super.dispose(); unregisterListeners(); @@ -206,7 +210,8 @@ public class BaseNewWizardMenu extends CompoundContributionItem { * * @see org.eclipse.ui.actions.CompoundContributionItem#getContributionItems() */ - protected IContributionItem[] getContributionItems() { + @Override + protected IContributionItem[] getContributionItems() { ArrayList list = new ArrayList(); if (workbenchWindow != null && workbenchWindow.getActivePage() != null && workbenchWindow.getActivePage().getPerspective() != null) { diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/actions/BaseSelectionListenerAction.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/actions/BaseSelectionListenerAction.java index aa4a718ccd6..948daceaa90 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/actions/BaseSelectionListenerAction.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/actions/BaseSelectionListenerAction.java @@ -131,7 +131,8 @@ public abstract class BaseSelectionListenerAction extends Action implements * a structured one. Subclasses should override the <code>updateSelection</code> * method to react to selection changes. */ - public final void selectionChanged(SelectionChangedEvent event) { + @Override + public final void selectionChanged(SelectionChangedEvent event) { ISelection selection = event.getSelection(); if (selection instanceof IStructuredSelection) { selectionChanged((IStructuredSelection) selection); @@ -160,7 +161,8 @@ public abstract class BaseSelectionListenerAction extends Action implements /* (non-Javadoc) * @see org.eclipse.jface.action.Action#runWithEvent(org.eclipse.swt.widgets.Event) */ - public void runWithEvent(Event event) { + @Override + public void runWithEvent(Event event) { // Set the running flag during the run so that selection changes are deferred. // See selectionChanged(IStructuredSelection) for more details. running = true; diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/actions/CompoundContributionItem.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/actions/CompoundContributionItem.java index aadf87fcbdb..e3485bed416 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/actions/CompoundContributionItem.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/actions/CompoundContributionItem.java @@ -26,7 +26,8 @@ import org.eclipse.swt.widgets.Menu; public abstract class CompoundContributionItem extends ContributionItem { private IMenuListener menuListener = new IMenuListener() { - public void menuAboutToShow(IMenuManager manager) { + @Override + public void menuAboutToShow(IMenuManager manager) { manager.markDirty(); } }; @@ -52,7 +53,8 @@ public abstract class CompoundContributionItem extends ContributionItem { /* (non-Javadoc) * @see org.eclipse.jface.action.ContributionItem#fill(org.eclipse.swt.widgets.Menu, int) */ - public void fill(Menu menu, int index) { + @Override + public void fill(Menu menu, int index) { if (index == -1) { index = menu.getItemCount(); } @@ -101,14 +103,16 @@ public abstract class CompoundContributionItem extends ContributionItem { /* (non-Javadoc) * @see org.eclipse.jface.action.ContributionItem#isDirty() */ - public boolean isDirty() { + @Override + public boolean isDirty() { return true; } /* (non-Javadoc) * @see org.eclipse.jface.action.ContributionItem#isDynamic() */ - public boolean isDynamic() { + @Override + public boolean isDynamic() { return true; } @@ -116,7 +120,8 @@ public abstract class CompoundContributionItem extends ContributionItem { /* (non-Javadoc) * @see org.eclipse.jface.action.ContributionItem#setParent(org.eclipse.jface.action.IContributionManager) */ - public void setParent(IContributionManager parent) { + @Override + public void setParent(IContributionManager parent) { if (getParent() instanceof IMenuManager) { IMenuManager menuMgr = (IMenuManager) getParent(); menuMgr.removeMenuListener(menuListener); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/actions/ContributedAction.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/actions/ContributedAction.java index 419b12f4207..af2b029f44e 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/actions/ContributedAction.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/actions/ContributedAction.java @@ -188,6 +188,7 @@ public final class ContributedAction extends CommandAction { * * @see org.eclipse.ui.internal.actions.CommandAction#runWithEvent(org.eclipse.swt.widgets.Event) */ + @Override public void runWithEvent(Event event) { if (partHandler != null && getParameterizedCommand() != null) { IHandler oldHandler = getParameterizedCommand().getCommand() @@ -216,6 +217,7 @@ public final class ContributedAction extends CommandAction { * * @see org.eclipse.jface.action.Action#isEnabled() */ + @Override public boolean isEnabled() { if (partHandler != null) { if (partHandler instanceof IHandler2) { @@ -239,21 +241,26 @@ public final class ContributedAction extends CommandAction { } partListener = new IPartListener() { + @Override public void partActivated(IWorkbenchPart part) { } + @Override public void partBroughtToTop(IWorkbenchPart part) { } + @Override public void partClosed(IWorkbenchPart part) { if (part == currentPart) { ContributedAction.this.disposeAction(); } } + @Override public void partDeactivated(IWorkbenchPart part) { } + @Override public void partOpened(IWorkbenchPart part) { } }; diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/actions/ContributionItemFactory.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/actions/ContributionItemFactory.java index 90b8d70b569..15a7c3ccb81 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/actions/ContributionItemFactory.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/actions/ContributionItemFactory.java @@ -105,6 +105,7 @@ public abstract class ContributionItemFactory { private static final String COMMAND_ID = IWorkbenchCommandConstants.WINDOW_PIN_EDITOR; /* (non-javadoc) method declared on ContributionItemFactory */ + @Override public IContributionItem create(final IWorkbenchWindow window) { if (window == null) { throw new IllegalArgumentException(); @@ -124,15 +125,19 @@ public abstract class ContributionItemFactory { final IPropertyChangeListener[] perfs = new IPropertyChangeListener[1]; final IPartListener partListener = new IPartListener() { + @Override public void partOpened(IWorkbenchPart part) { } + @Override public void partDeactivated(IWorkbenchPart part) { } + @Override public void partClosed(IWorkbenchPart part) { } + @Override public void partBroughtToTop(IWorkbenchPart part) { if (!(part instanceof IEditorPart)) { return; @@ -143,12 +148,14 @@ public abstract class ContributionItemFactory { commandService.refreshElements(COMMAND_ID, null); } + @Override public void partActivated(IWorkbenchPart part) { } }; window.getPartService().addPartListener(partListener); final CommandContributionItem action = new CommandContributionItem( parameter) { + @Override public void dispose() { WorkbenchPlugin.getDefault().getPreferenceStore() .removePropertyChangeListener(perfs[0]); @@ -158,6 +165,7 @@ public abstract class ContributionItemFactory { }; perfs[0] = new IPropertyChangeListener() { + @Override public void propertyChange(PropertyChangeEvent event) { if (event.getProperty().equals( IPreferenceConstants.REUSE_EDITORS_BOOLEAN)) { @@ -174,6 +182,7 @@ public abstract class ContributionItemFactory { // from a non-ui thread window.getShell().getDisplay().syncExec( new Runnable() { + @Override public void run() { action.getParent() .update(false); @@ -202,7 +211,8 @@ public abstract class ContributionItemFactory { public static final ContributionItemFactory OPEN_WINDOWS = new ContributionItemFactory( "openWindows") { //$NON-NLS-1$ /* (non-javadoc) method declared on ContributionItemFactory */ - public IContributionItem create(IWorkbenchWindow window) { + @Override + public IContributionItem create(IWorkbenchWindow window) { if (window == null) { throw new IllegalArgumentException(); } @@ -220,7 +230,8 @@ public abstract class ContributionItemFactory { public static final ContributionItemFactory VIEWS_SHORTLIST = new ContributionItemFactory( "viewsShortlist") { //$NON-NLS-1$ /* (non-javadoc) method declared on ContributionItemFactory */ - public IContributionItem create(IWorkbenchWindow window) { + @Override + public IContributionItem create(IWorkbenchWindow window) { if (window == null) { throw new IllegalArgumentException(); } @@ -238,7 +249,8 @@ public abstract class ContributionItemFactory { public static final ContributionItemFactory VIEWS_SHOW_IN = new ContributionItemFactory( "viewsShowIn") { //$NON-NLS-1$ /* (non-javadoc) method declared on ContributionItemFactory */ - public IContributionItem create(IWorkbenchWindow window) { + @Override + public IContributionItem create(IWorkbenchWindow window) { if (window == null) { throw new IllegalArgumentException(); } @@ -259,7 +271,8 @@ public abstract class ContributionItemFactory { public static final ContributionItemFactory REOPEN_EDITORS = new ContributionItemFactory( "reopenEditors") { //$NON-NLS-1$ /* (non-javadoc) method declared on ContributionItemFactory */ - public IContributionItem create(IWorkbenchWindow window) { + @Override + public IContributionItem create(IWorkbenchWindow window) { if (window == null) { throw new IllegalArgumentException(); } @@ -279,7 +292,8 @@ public abstract class ContributionItemFactory { public static final ContributionItemFactory PERSPECTIVES_SHORTLIST = new ContributionItemFactory( "perspectivesShortlist") { //$NON-NLS-1$ /* (non-javadoc) method declared on ContributionItemFactory */ - public IContributionItem create(IWorkbenchWindow window) { + @Override + public IContributionItem create(IWorkbenchWindow window) { if (window == null) { throw new IllegalArgumentException(); } @@ -298,7 +312,8 @@ public abstract class ContributionItemFactory { public static final ContributionItemFactory NEW_WIZARD_SHORTLIST = new ContributionItemFactory( "newWizardShortlist") { //$NON-NLS-1$ /* (non-javadoc) method declared on ContributionItemFactory */ - public IContributionItem create(IWorkbenchWindow window) { + @Override + public IContributionItem create(IWorkbenchWindow window) { if (window == null) { throw new IllegalArgumentException(); } @@ -313,7 +328,8 @@ public abstract class ContributionItemFactory { */ public static final ContributionItemFactory HELP_SEARCH = new ContributionItemFactory( "helpSearch") {//$NON-NLS-1$ - public IContributionItem create(IWorkbenchWindow window) { + @Override + public IContributionItem create(IWorkbenchWindow window) { if (window == null) { throw new IllegalArgumentException(); } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/actions/ExportResourcesAction.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/actions/ExportResourcesAction.java index 38842825485..6cf0920c9e2 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/actions/ExportResourcesAction.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/actions/ExportResourcesAction.java @@ -90,7 +90,8 @@ public class ExportResourcesAction extends BaseSelectionListenerAction * @param workbench the workbench * @deprecated use the constructor <code>ExportResourcesAction(IWorkbenchWindow)</code> */ - public ExportResourcesAction(IWorkbench workbench) { + @Deprecated + public ExportResourcesAction(IWorkbench workbench) { this(workbench.getActiveWorkbenchWindow()); } @@ -101,14 +102,16 @@ public class ExportResourcesAction extends BaseSelectionListenerAction * @param label the label * @deprecated use the constructor <code>ExportResourcesAction(IWorkbenchWindow, String)</code> */ - public ExportResourcesAction(IWorkbench workbench, String label) { + @Deprecated + public ExportResourcesAction(IWorkbench workbench, String label) { this(workbench.getActiveWorkbenchWindow(), label); } /** * Invoke the Export wizards selection Wizard. */ - public void run() { + @Override + public void run() { if (workbenchWindow == null) { // action has been disposed return; @@ -122,13 +125,15 @@ public class ExportResourcesAction extends BaseSelectionListenerAction * @param selection the new selection * @deprecated */ - public void setSelection(IStructuredSelection selection) { + @Deprecated + public void setSelection(IStructuredSelection selection) { selectionChanged(selection); } /* (non-Javadoc) * @see org.eclipse.ui.actions.ActionFactory.IWorkbenchAction#dispose() */ + @Override public void dispose() { workbenchWindow = null; if (action!=null) { diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/actions/ImportResourcesAction.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/actions/ImportResourcesAction.java index 5439c7ef3d5..41e4fe978cc 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/actions/ImportResourcesAction.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/actions/ImportResourcesAction.java @@ -81,14 +81,16 @@ public class ImportResourcesAction extends BaseSelectionListenerAction * @param workbench the workbench * @deprecated use the constructor <code>ImportResourcesAction(IWorkbenchWindow)</code> */ - public ImportResourcesAction(IWorkbench workbench) { + @Deprecated + public ImportResourcesAction(IWorkbench workbench) { this(workbench.getActiveWorkbenchWindow()); } /** * Invoke the Import wizards selection Wizard. */ - public void run() { + @Override + public void run() { if (workbenchWindow == null) { // action has been disposed return; @@ -103,7 +105,8 @@ public class ImportResourcesAction extends BaseSelectionListenerAction * @param selection the new selection * @deprecated */ - public void setSelection(IStructuredSelection selection) { + @Deprecated + public void setSelection(IStructuredSelection selection) { selectionChanged(selection); } @@ -111,7 +114,8 @@ public class ImportResourcesAction extends BaseSelectionListenerAction * Method declared on ActionFactory.IWorkbenchAction. * @since 3.0 */ - public void dispose() { + @Override + public void dispose() { workbenchWindow = null; if (action!=null) { action.dispose(); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/actions/LabelRetargetAction.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/actions/LabelRetargetAction.java index cf7fa3e25eb..6d1c191598d 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/actions/LabelRetargetAction.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/actions/LabelRetargetAction.java @@ -69,7 +69,8 @@ public class LabelRetargetAction extends RetargetAction { /** * The action handler has changed. Update self. */ - protected void propagateChange(PropertyChangeEvent event) { + @Override + protected void propagateChange(PropertyChangeEvent event) { super.propagateChange(event); String prop = event.getProperty(); if (prop.equals(IAction.TEXT)) { @@ -86,7 +87,8 @@ public class LabelRetargetAction extends RetargetAction { /** * Sets the action handler. Update self. */ - protected void setActionHandler(IAction handler) { + @Override + protected void setActionHandler(IAction handler) { // Run the default behavior. super.setActionHandler(handler); @@ -109,7 +111,8 @@ public class LabelRetargetAction extends RetargetAction { /* (non-Javadoc) * Method declared on IAction. */ - public void setDisabledImageDescriptor(ImageDescriptor image) { + @Override + public void setDisabledImageDescriptor(ImageDescriptor image) { super.setDisabledImageDescriptor(image); defaultDisabledImage = image; } @@ -117,7 +120,8 @@ public class LabelRetargetAction extends RetargetAction { /* (non-Javadoc) * Method declared on IAction. */ - public void setHoverImageDescriptor(ImageDescriptor image) { + @Override + public void setHoverImageDescriptor(ImageDescriptor image) { super.setHoverImageDescriptor(image); defaultHoverImage = image; } @@ -125,7 +129,8 @@ public class LabelRetargetAction extends RetargetAction { /* (non-Javadoc) * Method declared on IAction. */ - public void setImageDescriptor(ImageDescriptor image) { + @Override + public void setImageDescriptor(ImageDescriptor image) { super.setImageDescriptor(image); defaultImage = image; } @@ -133,7 +138,8 @@ public class LabelRetargetAction extends RetargetAction { /** * Sets the action's label text to the given value. */ - public void setText(String text) { + @Override + public void setText(String text) { super.setText(text); acceleratorText = LegacyActionTools.extractAcceleratorText(text); defaultText = text; @@ -143,7 +149,8 @@ public class LabelRetargetAction extends RetargetAction { * Sets the tooltip text to the given text. * The value <code>null</code> clears the tooltip text. */ - public void setToolTipText(String text) { + @Override + public void setToolTipText(String text) { super.setToolTipText(text); defaultToolTipText = text; } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/actions/NewWizardAction.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/actions/NewWizardAction.java index 761858f680b..538e2baeec0 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/actions/NewWizardAction.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/actions/NewWizardAction.java @@ -112,7 +112,8 @@ public class NewWizardAction extends Action implements * * @deprecated use the constructor <code>NewWizardAction(IWorkbenchWindow)</code> */ - public NewWizardAction() { + @Deprecated + public NewWizardAction() { this(PlatformUI.getWorkbench().getActiveWorkbenchWindow()); } @@ -157,7 +158,8 @@ public class NewWizardAction extends Action implements /* (non-Javadoc) * Method declared on IAction. */ - public void run() { + @Override + public void run() { if (workbenchWindow == null) { // action has been disposed return; @@ -215,7 +217,8 @@ public class NewWizardAction extends Action implements * Method declared on ActionFactory.IWorkbenchAction. * @since 3.0 */ - public void dispose() { + @Override + public void dispose() { if (workbenchWindow == null) { // action has already been disposed return; diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/actions/NewWizardDropDownAction.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/actions/NewWizardDropDownAction.java index 5e9bdd7c976..6b7c4af3ac7 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/actions/NewWizardDropDownAction.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/actions/NewWizardDropDownAction.java @@ -69,7 +69,8 @@ public class NewWizardDropDownAction extends Action implements /* (non-Javadoc) * @see org.eclipse.jface.action.IMenuCreator#getMenu(org.eclipse.swt.widgets.Control) */ - public Menu getMenu(Control parent) { + @Override + public Menu getMenu(Control parent) { createDropDownMenuMgr(); return dropDownMenuMgr.createContextMenu(parent); } @@ -77,7 +78,8 @@ public class NewWizardDropDownAction extends Action implements /* (non-Javadoc) * @see org.eclipse.jface.action.IMenuCreator#getMenu(org.eclipse.swt.widgets.Menu) */ - public Menu getMenu(Menu parent) { + @Override + public Menu getMenu(Menu parent) { createDropDownMenuMgr(); Menu menu = new Menu(parent); IContributionItem[] items = dropDownMenuMgr.getItems(); @@ -96,7 +98,8 @@ public class NewWizardDropDownAction extends Action implements /* (non-Javadoc) * @see org.eclipse.jface.action.IMenuCreator#dispose() */ - public void dispose() { + @Override + public void dispose() { if (dropDownMenuMgr != null) { // remove the wizard menu before disposing the menu manager, the // wizard menu is a workbench action and it should only be @@ -160,7 +163,8 @@ public class NewWizardDropDownAction extends Action implements /* (non-Javadoc) * @see org.eclipse.ui.actions.ActionFactory.IWorkbenchAction#dispose() */ - public void dispose() { + @Override + public void dispose() { if (workbenchWindow == null) { // action has already been disposed return; @@ -175,7 +179,8 @@ public class NewWizardDropDownAction extends Action implements /** * Runs the action, which opens the New wizard dialog. */ - public void run() { + @Override + public void run() { if (workbenchWindow == null) { // action has been disposed return; diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/actions/OpenInNewWindowAction.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/actions/OpenInNewWindowAction.java index 3d31017d474..ebcf2f1806f 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/actions/OpenInNewWindowAction.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/actions/OpenInNewWindowAction.java @@ -89,7 +89,8 @@ public class OpenInNewWindowAction extends Action implements * the active perspective in the window which this * action is running in. */ - public void run() { + @Override + public void run() { if (workbenchWindow == null) { // action has been disposed return; @@ -119,7 +120,8 @@ public class OpenInNewWindowAction extends Action implements * Method declared on ActionFactory.IWorkbenchAction. * @since 3.0 */ - public void dispose() { + @Override + public void dispose() { workbenchWindow = null; } } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/actions/OpenNewPageMenu.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/actions/OpenNewPageMenu.java index 9247b44ced5..357b8f1c6b5 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/actions/OpenNewPageMenu.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/actions/OpenNewPageMenu.java @@ -39,6 +39,7 @@ import org.eclipse.ui.statushandlers.StatusManager; * user ui model. See IWorkbench.showPerspective methods. * @noextend This class is not intended to be subclassed by clients. */ +@Deprecated public class OpenNewPageMenu extends PerspectiveMenu { private IAdaptable pageInput; @@ -74,7 +75,8 @@ public class OpenNewPageMenu extends PerspectiveMenu { /* (non-Javadoc) * Opens a new page with a particular perspective and input. */ - protected void run(IPerspectiveDescriptor desc) { + @Override + protected void run(IPerspectiveDescriptor desc) { // Verify page input. if (pageInput == null) { StatusUtil.handleStatus( diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/actions/OpenNewWindowMenu.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/actions/OpenNewWindowMenu.java index 423be00fe34..66b48dd8bb6 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/actions/OpenNewWindowMenu.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/actions/OpenNewWindowMenu.java @@ -38,6 +38,7 @@ import org.eclipse.ui.statushandlers.StatusManager; * @deprecated See IWorkbench.showPerspective methods. * @noextend This class is not intended to be subclassed by clients. */ +@Deprecated public class OpenNewWindowMenu extends PerspectiveMenu { private IAdaptable pageInput; @@ -73,7 +74,8 @@ public class OpenNewWindowMenu extends PerspectiveMenu { /* (non-Javadoc) * Opens a new window with a particular perspective and input. */ - protected void run(IPerspectiveDescriptor desc) { + @Override + protected void run(IPerspectiveDescriptor desc) { // Verify page input. if (pageInput == null) { StatusUtil.handleStatus( diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/actions/OpenPerspectiveAction.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/actions/OpenPerspectiveAction.java index 5d3c37f8fb6..0c8be33a7a4 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/actions/OpenPerspectiveAction.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/actions/OpenPerspectiveAction.java @@ -74,7 +74,8 @@ public final class OpenPerspectiveAction extends Action implements /* (non-Javadoc) * @see org.eclipse.jface.action.IAction#runWithEvent(org.eclipse.swt.widgets.Event) */ - public final void runWithEvent(final Event event) { + @Override + public final void runWithEvent(final Event event) { callback.run(descriptor, new SelectionEvent(event)); } @@ -83,7 +84,8 @@ public final class OpenPerspectiveAction extends Action implements * * @see org.eclipse.ui.activities.support.IPluginContribution#getLocalId() */ - public String getLocalId() { + @Override + public String getLocalId() { return descriptor.getId(); } @@ -92,7 +94,8 @@ public final class OpenPerspectiveAction extends Action implements * * @see org.eclipse.ui.activities.support.IPluginContribution#getPluginId() */ - public String getPluginId() { + @Override + public String getPluginId() { return descriptor instanceof IPluginContribution ? ((IPluginContribution) descriptor) .getPluginId() : null; diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/actions/OpenPerspectiveMenu.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/actions/OpenPerspectiveMenu.java index 00e92148564..19af64c426c 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/actions/OpenPerspectiveMenu.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/actions/OpenPerspectiveMenu.java @@ -44,6 +44,7 @@ import org.eclipse.ui.statushandlers.StatusManager; * @deprecated See IWorkbench.showPerspective methods. * @noextend This class is not intended to be subclassed by clients. */ +@Deprecated public class OpenPerspectiveMenu extends PerspectiveMenu { private IAdaptable pageInput; @@ -119,7 +120,8 @@ public class OpenPerspectiveMenu extends PerspectiveMenu { * * @param desc the selected perspective */ - protected void run(IPerspectiveDescriptor desc) { + @Override + protected void run(IPerspectiveDescriptor desc) { openPage(desc, 0); } @@ -130,7 +132,8 @@ public class OpenPerspectiveMenu extends PerspectiveMenu { * @param desc the selected perspective * @param event the event sent along with the selection callback */ - protected void run(IPerspectiveDescriptor desc, SelectionEvent event) { + @Override + protected void run(IPerspectiveDescriptor desc, SelectionEvent event) { openPage(desc, event.stateMask); } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/actions/PartEventAction.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/actions/PartEventAction.java index 69a542a4aac..c1d86c25281 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/actions/PartEventAction.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/actions/PartEventAction.java @@ -85,7 +85,8 @@ public abstract class PartEventAction extends Action implements IPartListener { * Subclasses may extend this method if action availability has to be * recalculated. */ - public void partActivated(IWorkbenchPart part) { + @Override + public void partActivated(IWorkbenchPart part) { activePart = part; } @@ -94,7 +95,8 @@ public abstract class PartEventAction extends Action implements IPartListener { * <code>IPartListener</code> method does nothing. Subclasses should extend * this method if action availability has to be recalculated. */ - public void partBroughtToTop(IWorkbenchPart part) { + @Override + public void partBroughtToTop(IWorkbenchPart part) { // do nothing } @@ -104,7 +106,8 @@ public abstract class PartEventAction extends Action implements IPartListener { * Subclasses may extend this method if action availability has to be * recalculated. */ - public void partClosed(IWorkbenchPart part) { + @Override + public void partClosed(IWorkbenchPart part) { if (part == activePart) { activePart = null; } @@ -116,7 +119,8 @@ public abstract class PartEventAction extends Action implements IPartListener { * Subclasses may extend this method if action availability has to be * recalculated. */ - public void partDeactivated(IWorkbenchPart part) { + @Override + public void partDeactivated(IWorkbenchPart part) { activePart = null; } @@ -125,7 +129,8 @@ public abstract class PartEventAction extends Action implements IPartListener { * <code>IPartListener</code> method does nothing. Subclasses should extend * this method if action availability has to be recalculated. */ - public void partOpened(IWorkbenchPart part) { + @Override + public void partOpened(IWorkbenchPart part) { // do nothing } } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/actions/PerspectiveMenu.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/actions/PerspectiveMenu.java index bcd1ecffe39..10de7d98656 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/actions/PerspectiveMenu.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/actions/PerspectiveMenu.java @@ -77,6 +77,7 @@ public abstract class PerspectiveMenu extends ContributionItem { * @since 3.4 * @deprecated As of 3.5, replaced by {@link IWorkbenchCommandConstants#PERSPECTIVES_SHOW_PERSPECTIVE} */ + @Deprecated protected static final String SHOW_PERSP_ID = IWorkbenchCommandConstants.PERSPECTIVES_SHOW_PERSPECTIVE; private IPerspectiveRegistry reg; @@ -88,7 +89,8 @@ public abstract class PerspectiveMenu extends ContributionItem { private boolean dirty = true; private IMenuListener menuListener = new IMenuListener() { - public void menuAboutToShow(IMenuManager manager) { + @Override + public void menuAboutToShow(IMenuManager manager) { manager.markDirty(); dirty = true; } @@ -97,7 +99,8 @@ public abstract class PerspectiveMenu extends ContributionItem { private Comparator comparator = new Comparator() { private Collator collator = Collator.getInstance(); - public int compare(Object ob1, Object ob2) { + @Override + public int compare(Object ob1, Object ob2) { IPerspectiveDescriptor d1 = (IPerspectiveDescriptor) ob1; IPerspectiveDescriptor d2 = (IPerspectiveDescriptor) ob2; return collator.compare(d1.getLabel(), d2.getLabel()); @@ -126,7 +129,8 @@ public abstract class PerspectiveMenu extends ContributionItem { * @since 3.1 */ private Action openOtherAction = new Action(WorkbenchMessages.PerspectiveMenu_otherItem) { - public final void runWithEvent(final Event event) { + @Override + public final void runWithEvent(final Event event) { runOther(new SelectionEvent(event)); } }; @@ -149,7 +153,8 @@ public abstract class PerspectiveMenu extends ContributionItem { /* * (non-Javadoc) Fills the menu with perspective items. */ - public void fill(Menu menu, int index) { + @Override + public void fill(Menu menu, int index) { if (getParent() instanceof MenuManager) { ((MenuManager) getParent()).addMenuListener(menuListener); } @@ -328,14 +333,16 @@ public abstract class PerspectiveMenu extends ContributionItem { /* (non-Javadoc) * Returns whether this menu is dynamic. */ - public boolean isDirty() { + @Override + public boolean isDirty() { return dirty; } /* (non-Javadoc) * Returns whether this menu is dynamic. */ - public boolean isDynamic() { + @Override + public boolean isDynamic() { return true; } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/actions/QuickMenuCreator.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/actions/QuickMenuCreator.java index 188cec6640a..6a60e24c657 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/actions/QuickMenuCreator.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/actions/QuickMenuCreator.java @@ -64,9 +64,11 @@ public abstract class QuickMenuCreator { } quickMenu.setLocation(location); quickMenu.addListener(SWT.Hide, new Listener() { + @Override public void handleEvent(Event event) { if (!display.isDisposed()) { display.asyncExec(new Runnable() { + @Override public void run() { if (!quickMenu.isDisposed()) { quickMenu.dispose(); @@ -299,6 +301,7 @@ public abstract class QuickMenuCreator { * {@link #createMenu()} will be disposed shortly after the * SWT.Hide event. */ + @Deprecated public void dispose() { } } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/actions/RetargetAction.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/actions/RetargetAction.java index a13563d2eb0..d4ce1de870d 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/actions/RetargetAction.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/actions/RetargetAction.java @@ -57,7 +57,8 @@ public class RetargetAction extends PartEventAction implements private IAction handler; private IPropertyChangeListener propertyChangeListener = new IPropertyChangeListener() { - public void propertyChange(PropertyChangeEvent event) { + @Override + public void propertyChange(PropertyChangeEvent event) { RetargetAction.this.propagateChange(event); } }; @@ -87,7 +88,8 @@ public class RetargetAction extends PartEventAction implements setId(actionID); setEnabled(false); super.setHelpListener(new HelpListener() { - public void helpRequested(HelpEvent e) { + @Override + public void helpRequested(HelpEvent e) { HelpListener listener = null; if (handler != null) { // if we have a handler, see if it has a help listener @@ -108,7 +110,8 @@ public class RetargetAction extends PartEventAction implements /** * Disposes of the action and any resources held. */ - public void dispose() { + @Override + public void dispose() { if (handler != null) { handler.removePropertyChangeListener(propertyChangeListener); handler = null; @@ -134,7 +137,8 @@ public class RetargetAction extends PartEventAction implements * Retaget actions do not have accelerators. It is up to the * part to hook the accelerator. */ - public int getAccelerator() { + @Override + public int getAccelerator() { if (enableAccelerator) { return super.getAccelerator(); } @@ -147,7 +151,8 @@ public class RetargetAction extends PartEventAction implements * * @param part the workbench part that has been activated */ - public void partActivated(IWorkbenchPart part) { + @Override + public void partActivated(IWorkbenchPart part) { super.partActivated(part); IWorkbenchPartSite site = part.getSite(); SubActionBars bars = (SubActionBars) ((PartSite) site).getActionBars(); @@ -160,7 +165,8 @@ public class RetargetAction extends PartEventAction implements * * @param part the workbench part that has been closed */ - public void partClosed(IWorkbenchPart part) { + @Override + public void partClosed(IWorkbenchPart part) { IWorkbenchPart activePart = part.getSite().getPage().getActivePart(); if (activePart != null) { // We are going to get a part activated message so don't bother setting the @@ -178,7 +184,8 @@ public class RetargetAction extends PartEventAction implements * * @param part the workbench part that has been deactivated */ - public void partDeactivated(IWorkbenchPart part) { + @Override + public void partDeactivated(IWorkbenchPart part) { super.partDeactivated(part); IWorkbenchPartSite site = part.getSite(); SubActionBars bars = (SubActionBars) ((PartSite) site).getActionBars(); @@ -216,7 +223,8 @@ public class RetargetAction extends PartEventAction implements /** * Invoked when an action occurs. */ - public void run() { + @Override + public void run() { if (handler != null) { handler.run(); } @@ -225,7 +233,8 @@ public class RetargetAction extends PartEventAction implements /** * Invoked when an action occurs. */ - public void runWithEvent(Event event) { + @Override + public void runWithEvent(Event event) { if (handler != null) { handler.runWithEvent(event); } @@ -242,7 +251,8 @@ public class RetargetAction extends PartEventAction implements return handler; } - public final boolean isHandled() { + @Override + public final boolean isHandled() { return (handler != null); } @@ -285,7 +295,8 @@ public class RetargetAction extends PartEventAction implements /* (non-Javadoc) * Method declared on IAction. */ - public void setChecked(boolean checked) { + @Override + public void setChecked(boolean checked) { super.setChecked(checked); // This call may come from the SWT control event handler // itself, so notify the handler action to keep things @@ -300,7 +311,8 @@ public class RetargetAction extends PartEventAction implements * <code>IAction</code> stores the help listener in a local field. The * supplied listener is only used if there is no hanlder. */ - public void setHelpListener(HelpListener listener) { + @Override + public void setHelpListener(HelpListener listener) { localHelpListener = listener; } @@ -311,6 +323,7 @@ public class RetargetAction extends PartEventAction implements * * @since 3.2 */ + @Override public final String toString() { final StringBuffer buffer = new StringBuffer(); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/actions/SelectionProviderAction.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/actions/SelectionProviderAction.java index 5180cea6617..a28091e1191 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/actions/SelectionProviderAction.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/actions/SelectionProviderAction.java @@ -137,7 +137,8 @@ public abstract class SelectionProviderAction extends Action implements * not. Subclasses should override either of those methods method to react to * selection changes. */ - public final void selectionChanged(SelectionChangedEvent event) { + @Override + public final void selectionChanged(SelectionChangedEvent event) { ISelection selection = event.getSelection(); if (selection instanceof IStructuredSelection) { selectionChanged((IStructuredSelection) selection); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/actions/WorkingSetFilterActionGroup.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/actions/WorkingSetFilterActionGroup.java index 39d562a2bea..5e5335ab71b 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/actions/WorkingSetFilterActionGroup.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/actions/WorkingSetFilterActionGroup.java @@ -102,6 +102,7 @@ public class WorkingSetFilterActionGroup extends ActionGroup { editWorkingSetAction = new EditWorkingSetAction(this, shell); mruList = new CompoundContributionItem() { + @Override protected IContributionItem[] getContributionItems() { IWorkingSet[] workingSets = PlatformUI.getWorkbench() .getWorkingSetManager().getRecentWorkingSets(); @@ -139,7 +140,8 @@ public class WorkingSetFilterActionGroup extends ActionGroup { /* (non-Javadoc) * @see org.eclipse.ui.actions.ActionGroup#fillActionBars(org.eclipse.ui.IActionBars) */ - public void fillActionBars(IActionBars actionBars) { + @Override + public void fillActionBars(IActionBars actionBars) { menuManager = actionBars.getMenuManager(); if(menuManager.find(IWorkbenchActionConstants.MB_ADDITIONS) != null) @@ -159,6 +161,7 @@ public class WorkingSetFilterActionGroup extends ActionGroup { /* (non-Javadoc) * @see org.eclipse.ui.actions.ActionGroup#fillContextMenu(org.eclipse.jface.action.IMenuManager) */ + @Override public void fillContextMenu(IMenuManager menuManager) { menuManager.add(selectWorkingSetAction); menuManager.add(clearWorkingSetAction); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/activities/ActivitiesPreferencePage.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/activities/ActivitiesPreferencePage.java index a84b7ffe024..cd2a6e7577f 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/activities/ActivitiesPreferencePage.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/activities/ActivitiesPreferencePage.java @@ -94,7 +94,8 @@ public final class ActivitiesPreferencePage extends PreferencePage implements /* (non-Javadoc) * @see org.eclipse.jface.preference.PreferencePage#createContents(org.eclipse.swt.widgets.Composite) */ - protected Control createContents(Composite parent) { + @Override + protected Control createContents(Composite parent) { initializeDialogUnits(parent); Composite composite = new Composite(parent, SWT.NONE); @@ -122,7 +123,8 @@ public final class ActivitiesPreferencePage extends PreferencePage implements /* (non-Javadoc) * @see org.eclipse.ui.IWorkbenchPreferencePage#init(org.eclipse.ui.IWorkbench) */ - public void init(IWorkbench aWorkbench) { + @Override + public void init(IWorkbench aWorkbench) { this.workbench = aWorkbench; setPreferenceStore(WorkbenchPlugin.getDefault().getPreferenceStore()); } @@ -130,7 +132,8 @@ public final class ActivitiesPreferencePage extends PreferencePage implements /* (non-Javadoc) * @see org.eclipse.jface.preference.IPreferencePage#performOk() */ - public boolean performOk() { + @Override + public boolean performOk() { enabler.updateActivityStates(); workbench.getActivitySupport().setEnabledActivityIds(workingCopy.getEnabledActivityIds()); @@ -144,7 +147,8 @@ public final class ActivitiesPreferencePage extends PreferencePage implements /* (non-Javadoc) * @see org.eclipse.jface.preference.PreferencePage#performDefaults() */ - protected void performDefaults() { + @Override + protected void performDefaults() { enabler.restoreDefaults(); activityPromptButton.setSelection(getPreferenceStore() .getDefaultBoolean( @@ -155,6 +159,7 @@ public final class ActivitiesPreferencePage extends PreferencePage implements /* (non-Javadoc) * @see org.eclipse.core.runtime.IExecutableExtension#setInitializationData(org.eclipse.core.runtime.IConfigurationElement, java.lang.String, java.lang.Object) */ + @Override public void setInitializationData(IConfigurationElement config, String propertyName, Object data) { if (data instanceof Hashtable) { strings.putAll((Hashtable)data); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/activities/WorkbenchActivityHelper.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/activities/WorkbenchActivityHelper.java index e802149eb7e..ee6089c0f07 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/activities/WorkbenchActivityHelper.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/activities/WorkbenchActivityHelper.java @@ -72,6 +72,7 @@ public final class WorkbenchActivityHelper { * @deprecated * @see #allowUseOf(ITriggerPoint, Object) */ + @Deprecated public static boolean allowUseOf(Object object) { return allowUseOf(PlatformUI.getWorkbench().getActivitySupport() .getTriggerPointManager().getTriggerPoint( diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/activities/WorkbenchTriggerPointAdvisor.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/activities/WorkbenchTriggerPointAdvisor.java index 95b346cf4b0..9b1ae2df22f 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/activities/WorkbenchTriggerPointAdvisor.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/activities/WorkbenchTriggerPointAdvisor.java @@ -81,6 +81,7 @@ public class WorkbenchTriggerPointAdvisor implements ITriggerPointAdvisor, /* (non-Javadoc) * @see org.eclipse.ui.activities.ITriggerPointAdvisor#allow(org.eclipse.ui.activities.ITriggerPoint, org.eclipse.ui.activities.IIdentifier) */ + @Override public Set allow(ITriggerPoint triggerPoint, IIdentifier identifier) { if (triggerPoint.getBooleanHint(ITriggerPoint.HINT_PRE_UI)) { @@ -133,6 +134,7 @@ public class WorkbenchTriggerPointAdvisor implements ITriggerPointAdvisor, /* (non-Javadoc) * @see org.eclipse.core.runtime.IExecutableExtension#setInitializationData(org.eclipse.core.runtime.IConfigurationElement, java.lang.String, java.lang.Object) */ + @Override public void setInitializationData(IConfigurationElement config, String propertyName, Object data) { if (data instanceof Hashtable) { strings.putAll((Hashtable)data); @@ -164,6 +166,7 @@ public class WorkbenchTriggerPointAdvisor implements ITriggerPointAdvisor, * @see WorkbenchTriggerPointAdvisor#doComputeEnablement(IActivityManager, * IIdentifier, boolean) */ + @Override public boolean computeEnablement(IActivityManager activityManager, IIdentifier identifier) { return doComputeEnablement(activityManager, identifier, false); } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/application/WorkbenchAdvisor.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/application/WorkbenchAdvisor.java index a9c4cd11335..43c5273ce4a 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/application/WorkbenchAdvisor.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/application/WorkbenchAdvisor.java @@ -123,6 +123,7 @@ public abstract class WorkbenchAdvisor { * * @deprecated use {@link ActionBarAdvisor#FILL_PROXY instead} */ + @Deprecated public static final int FILL_PROXY = ActionBarAdvisor.FILL_PROXY; /** @@ -132,6 +133,7 @@ public abstract class WorkbenchAdvisor { * * @deprecated use {@link ActionBarAdvisor#FILL_MENU_BAR instead} */ + @Deprecated public static final int FILL_MENU_BAR = ActionBarAdvisor.FILL_MENU_BAR; /** @@ -141,6 +143,7 @@ public abstract class WorkbenchAdvisor { * * @deprecated use {@link ActionBarAdvisor#FILL_COOL_BAR instead} */ + @Deprecated public static final int FILL_COOL_BAR = ActionBarAdvisor.FILL_COOL_BAR; /** @@ -150,6 +153,7 @@ public abstract class WorkbenchAdvisor { * * @deprecated use {@link ActionBarAdvisor#FILL_STATUS_LINE instead} */ + @Deprecated public static final int FILL_STATUS_LINE = ActionBarAdvisor.FILL_STATUS_LINE; /** @@ -406,6 +410,7 @@ public abstract class WorkbenchAdvisor { * {@link WorkbenchWindowAdvisor#preWindowOpen()} instead * @see #createWorkbenchWindowAdvisor(IWorkbenchWindowConfigurer) */ + @Deprecated public void preWindowOpen(IWorkbenchWindowConfigurer configurer) { // do nothing } @@ -456,6 +461,7 @@ public abstract class WorkbenchAdvisor { * @see #createWorkbenchWindowAdvisor(IWorkbenchWindowConfigurer) * @see WorkbenchWindowAdvisor#createActionBarAdvisor(IActionBarConfigurer) */ + @Deprecated public void fillActionBars(IWorkbenchWindow window, IActionBarConfigurer configurer, int flags) { // do nothing by default @@ -482,6 +488,7 @@ public abstract class WorkbenchAdvisor { * {@link WorkbenchWindowAdvisor#postWindowRestore()} instead * @see #createWorkbenchWindowAdvisor(IWorkbenchWindowConfigurer) */ + @Deprecated public void postWindowRestore(IWorkbenchWindowConfigurer configurer) throws WorkbenchException { // do nothing @@ -508,6 +515,7 @@ public abstract class WorkbenchAdvisor { * {@link WorkbenchWindowAdvisor#openIntro()} instead * @see #createWorkbenchWindowAdvisor(IWorkbenchWindowConfigurer) */ + @Deprecated public void openIntro(IWorkbenchWindowConfigurer configurer) { if (introOpened) { return; @@ -552,6 +560,7 @@ public abstract class WorkbenchAdvisor { * {@link WorkbenchWindowAdvisor#postWindowCreate()} instead * @see #createWorkbenchWindowAdvisor(IWorkbenchWindowConfigurer) */ + @Deprecated public void postWindowCreate(IWorkbenchWindowConfigurer configurer) { // do nothing } @@ -575,6 +584,7 @@ public abstract class WorkbenchAdvisor { * {@link WorkbenchWindowAdvisor#postWindowOpen()} instead * @see #createWorkbenchWindowAdvisor(IWorkbenchWindowConfigurer) */ + @Deprecated public void postWindowOpen(IWorkbenchWindowConfigurer configurer) { // do nothing } @@ -605,6 +615,7 @@ public abstract class WorkbenchAdvisor { * {@link WorkbenchWindowAdvisor#preWindowShellClose()} instead * @see #createWorkbenchWindowAdvisor(IWorkbenchWindowConfigurer) */ + @Deprecated public boolean preWindowShellClose(IWorkbenchWindowConfigurer configurer) { // do nothing, but allow the close() to proceed return true; @@ -628,6 +639,7 @@ public abstract class WorkbenchAdvisor { * {@link WorkbenchWindowAdvisor#postWindowClose()} instead * @see #createWorkbenchWindowAdvisor(IWorkbenchWindowConfigurer) */ + @Deprecated public void postWindowClose(IWorkbenchWindowConfigurer configurer) { // do nothing } @@ -652,6 +664,7 @@ public abstract class WorkbenchAdvisor { * {@link ActionBarAdvisor#isApplicationMenu(String)} instead * @see WorkbenchWindowAdvisor#createActionBarAdvisor(IActionBarConfigurer) */ + @Deprecated public boolean isApplicationMenu(IWorkbenchWindowConfigurer configurer, String menuId) { // default: not an application menu @@ -736,6 +749,7 @@ public abstract class WorkbenchAdvisor { * instead * @see #createWorkbenchWindowAdvisor(IWorkbenchWindowConfigurer) */ + @Deprecated public void createWindowContents(IWorkbenchWindowConfigurer configurer, Shell shell) { ((WorkbenchWindowConfigurer) configurer).createDefaultContents(shell); @@ -766,6 +780,7 @@ public abstract class WorkbenchAdvisor { /* (non-Javadoc) * @see java.lang.Thread#run() */ + @Override public void run() { try { //declare us to be a startup thread so that our syncs will be executed @@ -773,6 +788,7 @@ public abstract class WorkbenchAdvisor { final IWorkbenchConfigurer [] myConfigurer = new IWorkbenchConfigurer[1]; StartupThreading.runWithoutExceptions(new StartupRunnable() { + @Override public void runWithException() throws Throwable { myConfigurer[0] = getWorkbenchConfigurer(); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/branding/IProductConstants.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/branding/IProductConstants.java index b8ca915d406..29d0552b87e 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/branding/IProductConstants.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/branding/IProductConstants.java @@ -85,7 +85,8 @@ public interface IProductConstants { * </p> * @deprecated use WINDOW_IMAGES instead (see recommendations there) */ - public static final String WINDOW_IMAGE = "windowImage"; //$NON-NLS-1$ + @Deprecated + public static final String WINDOW_IMAGE = "windowImage"; //$NON-NLS-1$ /** * An array of one or more images to be used for this product. The diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/browser/AbstractWebBrowser.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/browser/AbstractWebBrowser.java index 69049262d20..b124205ede9 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/browser/AbstractWebBrowser.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/browser/AbstractWebBrowser.java @@ -35,6 +35,7 @@ public abstract class AbstractWebBrowser implements IWebBrowser { * * @see org.eclipse.ui.browser.IWebBrowser#getId() */ + @Override public String getId() { return id; } @@ -44,6 +45,7 @@ public abstract class AbstractWebBrowser implements IWebBrowser { * * @see org.eclipse.ui.browser.IWebBrowser#close() */ + @Override public boolean close() { return false; } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/browser/AbstractWorkbenchBrowserSupport.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/browser/AbstractWorkbenchBrowserSupport.java index eba58c6387d..88bf844696f 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/browser/AbstractWorkbenchBrowserSupport.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/browser/AbstractWorkbenchBrowserSupport.java @@ -35,6 +35,7 @@ public abstract class AbstractWorkbenchBrowserSupport implements * * @see org.eclipse.ui.browser.IWorkbenchBrowserSupport#getExternalBrowser() */ + @Override public IWebBrowser getExternalBrowser() throws PartInitException { return createBrowser(AS_EXTERNAL, SHARED_EXTERNAL_BROWSER_ID, null, null); @@ -43,6 +44,7 @@ public abstract class AbstractWorkbenchBrowserSupport implements /* (non-Javadoc) * @see org.eclipse.ui.browser.IWorkbenchBrowserSupport#isInternalWebBrowserAvailable() */ + @Override public boolean isInternalWebBrowserAvailable() { return false; } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/commands/AbstractHandler.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/commands/AbstractHandler.java index dd7b5ef5c21..8f4b6eba95f 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/commands/AbstractHandler.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/commands/AbstractHandler.java @@ -51,6 +51,7 @@ public abstract class AbstractHandler extends /** * @see IHandler#addHandlerListener(IHandlerListener) */ + @Override @Deprecated public void addHandlerListener( org.eclipse.ui.commands.IHandlerListener handlerListener) { @@ -71,11 +72,13 @@ public abstract class AbstractHandler extends * * @see org.eclipse.ui.commands.IHandler#dispose() */ + @Override @Deprecated public void dispose() { // Do nothing. } + @Override @Deprecated public Object execute(final ExecutionEvent event) throws ExecutionException { try { @@ -93,6 +96,7 @@ public abstract class AbstractHandler extends * the event describing changes to this instance. Must not be * <code>null</code>. */ + @Override @Deprecated protected void fireHandlerChanged(HandlerEvent handlerEvent) { super.fireHandlerChanged(handlerEvent); @@ -178,6 +182,7 @@ public abstract class AbstractHandler extends * * @see IHandler#getAttributeValuesByName() */ + @Override @Deprecated public Map getAttributeValuesByName() { return Collections.EMPTY_MAP; @@ -191,11 +196,13 @@ public abstract class AbstractHandler extends * AbstractHandler * @since 3.1 */ + @Override @Deprecated protected final boolean hasListeners() { return super.hasListeners() || handlerListeners != null; } + @Override @Deprecated public boolean isEnabled() { final Object handled = getAttributeValuesByName().get("enabled"); //$NON-NLS-1$ @@ -206,6 +213,7 @@ public abstract class AbstractHandler extends return false; } + @Override @Deprecated public boolean isHandled() { final Object handled = getAttributeValuesByName().get( @@ -220,6 +228,7 @@ public abstract class AbstractHandler extends /** * @see IHandler#removeHandlerListener(IHandlerListener) */ + @Override @Deprecated public void removeHandlerListener( org.eclipse.ui.commands.IHandlerListener handlerListener) { diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/commands/ActionHandler.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/commands/ActionHandler.java index d5e6a536dfb..96b891aae19 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/commands/ActionHandler.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/commands/ActionHandler.java @@ -107,6 +107,7 @@ public final class ActionHandler extends AbstractHandler { * @see org.eclipse.ui.commands.IHandler#addHandlerListener(org.eclipse.ui.commands.IHandlerListener) * @since 3.1 */ + @Override @Deprecated public void addHandlerListener(IHandlerListener handlerListener) { if (!hasListeners()) { @@ -127,7 +128,8 @@ public final class ActionHandler extends AbstractHandler { attributeValuesByName = getAttributeValuesByNameFromAction(); propertyChangeListener = new IPropertyChangeListener() { - public void propertyChange( + @Override + public void propertyChange( PropertyChangeEvent propertyChangeEvent) { String property = propertyChangeEvent.getProperty(); if (IAction.ENABLED.equals(property) @@ -169,6 +171,7 @@ public final class ActionHandler extends AbstractHandler { * * @see org.eclipse.ui.commands.IHandler#dispose() */ + @Override @Deprecated public void dispose() { if (hasListeners()) { @@ -180,6 +183,7 @@ public final class ActionHandler extends AbstractHandler { /* (non-Javadoc) * @see org.eclipse.ui.commands.IHandler#execute(java.util.Map) */ + @Override @Deprecated public Object execute(Map parameterValuesByName) throws ExecutionException { if ((action.getStyle() == IAction.AS_CHECK_BOX) @@ -209,6 +213,7 @@ public final class ActionHandler extends AbstractHandler { /* (non-Javadoc) * @see org.eclipse.ui.commands.IHandler#getAttributeValuesByName() */ + @Override @Deprecated public Map getAttributeValuesByName() { if (attributeValuesByName == null) { @@ -247,6 +252,7 @@ public final class ActionHandler extends AbstractHandler { * @see org.eclipse.ui.commands.IHandler#removeHandlerListener(org.eclipse.ui.commands.IHandlerListener) * @since 3.1 */ + @Override @Deprecated public void removeHandlerListener(IHandlerListener handlerListener) { super.removeHandlerListener(handlerListener); @@ -259,6 +265,7 @@ public final class ActionHandler extends AbstractHandler { /* (non-Javadoc) * @see java.lang.Object#toString() */ + @Override @Deprecated public final String toString() { final StringBuffer buffer = new StringBuffer(); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/commands/CommandException.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/commands/CommandException.java index fb1f372e9d3..3902159d2c1 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/commands/CommandException.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/commands/CommandException.java @@ -69,6 +69,7 @@ public abstract class CommandException extends Exception { * @return the cause or <code>null</code> * @since 3.1 */ + @Override @Deprecated public Throwable getCause() { return cause; diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/commands/ExtensionParameterValues.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/commands/ExtensionParameterValues.java index d70b101062c..7749ba0536a 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/commands/ExtensionParameterValues.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/commands/ExtensionParameterValues.java @@ -62,10 +62,12 @@ public final class ExtensionParameterValues implements IParameterValues, */ private Map parameterValues = null; + @Override public Map getParameterValues() { return parameterValues; } + @Override public final void setInitializationData(final IConfigurationElement config, final String propertyName, final Object data) { if (data == null) { diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/commands/HandlerSubmission.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/commands/HandlerSubmission.java index 6ab8de51b56..fe6c330fcda 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/commands/HandlerSubmission.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/commands/HandlerSubmission.java @@ -129,6 +129,7 @@ public final class HandlerSubmission implements Comparable { /** * @see Comparable#compareTo(java.lang.Object) */ + @Override @Deprecated public int compareTo(Object object) { HandlerSubmission castedObject = (HandlerSubmission) object; @@ -229,7 +230,8 @@ public final class HandlerSubmission implements Comparable { /** * @see Object#toString() */ - public String toString() { + @Override + public String toString() { if (string == null) { final StringBuffer stringBuffer = new StringBuffer(); stringBuffer.append("[activePartId="); //$NON-NLS-1$ diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/commands/Priority.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/commands/Priority.java index 8b1fba97664..52335556436 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/commands/Priority.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/commands/Priority.java @@ -89,6 +89,7 @@ public final class Priority implements Comparable { /** * @see Comparable#compareTo(java.lang.Object) */ + @Override @Deprecated public int compareTo(Object object) { Priority castedObject = (Priority) object; @@ -110,6 +111,7 @@ public final class Priority implements Comparable { /** * @see Object#toString() */ + @Override @Deprecated public String toString() { if (string == null) { diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/contexts/ContextEvent.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/contexts/ContextEvent.java index b4e1c634a66..6a419cff9a3 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/contexts/ContextEvent.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/contexts/ContextEvent.java @@ -23,6 +23,7 @@ package org.eclipse.ui.contexts; * @deprecated Please use the "org.eclipse.core.commands" plug-in instead. * @see org.eclipse.core.commands.contexts.ContextEvent */ +@Deprecated public final class ContextEvent { /** diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/contexts/ContextException.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/contexts/ContextException.java index d96dd236f06..d28b60b2c49 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/contexts/ContextException.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/contexts/ContextException.java @@ -21,6 +21,7 @@ package org.eclipse.ui.contexts; * @see org.eclipse.core.commands.common.CommandException * @noextend This class is not intended to be subclassed by clients. */ +@Deprecated public abstract class ContextException extends Exception { /** @@ -65,7 +66,8 @@ public abstract class ContextException extends Exception { * @return the cause or <code>null</code> * @since 3.1 */ - public Throwable getCause() { + @Override + public Throwable getCause() { return cause; } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/contexts/ContextManagerEvent.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/contexts/ContextManagerEvent.java index 55f31bf9c26..b184d76a9a5 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/contexts/ContextManagerEvent.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/contexts/ContextManagerEvent.java @@ -27,6 +27,7 @@ import org.eclipse.ui.internal.util.Util; * @deprecated Please use the "org.eclipse.core.commands" plug-in instead. * @see org.eclipse.core.commands.contexts.ContextManagerEvent */ +@Deprecated public final class ContextManagerEvent { /** diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/contexts/EnabledSubmission.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/contexts/EnabledSubmission.java index fa6bf845393..edeadb439a6 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/contexts/EnabledSubmission.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/contexts/EnabledSubmission.java @@ -40,6 +40,7 @@ import org.eclipse.ui.internal.util.Util; * instead. * @see org.eclipse.ui.contexts.IContextService */ +@Deprecated public final class EnabledSubmission implements Comparable { /** @@ -106,7 +107,8 @@ public final class EnabledSubmission implements Comparable { /** * @see Comparable#compareTo(java.lang.Object) */ - public int compareTo(Object object) { + @Override + public int compareTo(Object object) { EnabledSubmission castedObject = (EnabledSubmission) object; int compareTo = Util.compare(activeWorkbenchPartSite, castedObject.activeWorkbenchPartSite); @@ -171,7 +173,8 @@ public final class EnabledSubmission implements Comparable { /** * @see Object#toString() */ - public String toString() { + @Override + public String toString() { if (string == null) { final StringBuffer stringBuffer = new StringBuffer(); stringBuffer.append("[activePartId="); //$NON-NLS-1$ diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/contexts/IContext.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/contexts/IContext.java index 114334affe5..ebef548773a 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/contexts/IContext.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/contexts/IContext.java @@ -37,6 +37,7 @@ package org.eclipse.ui.contexts; * @deprecated Please use the "org.eclipse.core.commands" plug-in instead. * @noimplement This interface is not intended to be implemented by clients. */ +@Deprecated public interface IContext extends Comparable { /** diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/contexts/IContextActivation.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/contexts/IContextActivation.java index d6f43d5d2c9..ca5bac6d8fc 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/contexts/IContextActivation.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/contexts/IContextActivation.java @@ -39,6 +39,7 @@ public interface IContextActivation extends IEvaluationResultCache { * * @deprecated Use {@link IEvaluationResultCache#clearResult()} instead. */ + @Deprecated public void clearActive(); /** @@ -71,5 +72,6 @@ public interface IContextActivation extends IEvaluationResultCache { * {@link IEvaluationResultCache#evaluate(IEvaluationContext)} * instead. */ + @Deprecated public boolean isActive(IEvaluationContext context); } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/contexts/IContextListener.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/contexts/IContextListener.java index 8ae7db8b6a1..3f5361228f5 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/contexts/IContextListener.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/contexts/IContextListener.java @@ -24,6 +24,7 @@ package org.eclipse.ui.contexts; * @deprecated Please use the "org.eclipse.core.commands" plug-in instead. * @see org.eclipse.core.commands.contexts.IContextListener */ +@Deprecated public interface IContextListener { /** diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/contexts/IContextManager.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/contexts/IContextManager.java index 5f157055826..65fd6356cf8 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/contexts/IContextManager.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/contexts/IContextManager.java @@ -29,6 +29,7 @@ import java.util.SortedSet; * @see org.eclipse.core.commands.contexts.ContextManager * @noimplement This interface is not intended to be implemented by clients. */ +@Deprecated public interface IContextManager { /** diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/contexts/IContextManagerListener.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/contexts/IContextManagerListener.java index 543b808b272..42ed64e180a 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/contexts/IContextManagerListener.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/contexts/IContextManagerListener.java @@ -24,6 +24,7 @@ package org.eclipse.ui.contexts; * @deprecated Please use the "org.eclipse.core.commands" plug-in instead. * @see org.eclipse.core.commands.contexts.IContextManagerListener */ +@Deprecated public interface IContextManagerListener { /** diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/contexts/IContextService.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/contexts/IContextService.java index 4398a4aace9..93fa09528fd 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/contexts/IContextService.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/contexts/IContextService.java @@ -211,6 +211,7 @@ public interface IContextService extends IServiceWithSources { * {@link IContextService#activateContext(String, Expression)} * instead. */ + @Deprecated public IContextActivation activateContext(String contextId, Expression expression, int sourcePriorities); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/contexts/IWorkbenchContextSupport.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/contexts/IWorkbenchContextSupport.java index c393fa6f0cf..9414267ff2d 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/contexts/IWorkbenchContextSupport.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/contexts/IWorkbenchContextSupport.java @@ -31,6 +31,7 @@ import org.eclipse.swt.widgets.Shell; * @see org.eclipse.ui.keys.IBindingService * @noimplement This interface is not intended to be implemented by clients. */ +@Deprecated public interface IWorkbenchContextSupport { /** diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/contexts/NotDefinedException.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/contexts/NotDefinedException.java index 8fafbce3186..b9469819202 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/contexts/NotDefinedException.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/contexts/NotDefinedException.java @@ -21,6 +21,7 @@ package org.eclipse.ui.contexts; * @deprecated Please use the "org.eclipse.core.commands" plug-in instead. * @see org.eclipse.core.commands.common.NotDefinedException */ +@Deprecated public final class NotDefinedException extends ContextException { /** diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/databinding/WorkbenchProperties.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/databinding/WorkbenchProperties.java index f5798c631a4..94adf20ca96 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/databinding/WorkbenchProperties.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/databinding/WorkbenchProperties.java @@ -146,20 +146,24 @@ public class WorkbenchProperties { this.adapterManager = adapterManager; } + @Override public Object getValueType() { return adapter; } + @Override protected Object doGetValue(Object source) { if (adapter.isInstance(source)) return source; return adapterManager.getAdapter(source, adapter); } + @Override protected void doSetValue(Object source, Object value) { throw new UnsupportedOperationException(); } + @Override public INativePropertyListener adaptListener( ISimplePropertyListener listener) { return null; @@ -175,11 +179,13 @@ public class WorkbenchProperties { this.post = post; } + @Override public INativePropertyListener adaptListener( ISimplePropertyListener listener) { return new SelectionServiceListener(this, listener, partId, post); } + @Override protected Object doGetValue(Object source) { ISelection selection; if (partId != null) { @@ -193,10 +199,12 @@ public class WorkbenchProperties { return null; } + @Override protected void doSetValue(Object source, Object value) { throw new UnsupportedOperationException(); } + @Override public Object getValueType() { return Object.class; } @@ -211,15 +219,18 @@ public class WorkbenchProperties { this.post = post; } + @Override public INativePropertyListener adaptListener( ISimplePropertyListener listener) { return new SelectionServiceListener(this, listener, partId, post); } + @Override public Object getElementType() { return Object.class; } + @Override protected List doGetList(Object source) { ISelection selection; if (partId != null) { @@ -234,6 +245,7 @@ public class WorkbenchProperties { return Collections.EMPTY_LIST; } + @Override protected void doSetList(Object source, List list, ListDiff diff) { throw new UnsupportedOperationException(); } @@ -251,6 +263,7 @@ public class WorkbenchProperties { this.post = post; } + @Override protected void doAddTo(Object source) { ISelectionService selectionService = (ISelectionService) source; if (post) { @@ -268,6 +281,7 @@ public class WorkbenchProperties { } } + @Override protected void doRemoveFrom(Object source) { ISelectionService selectionService = (ISelectionService) source; if (post) { @@ -285,6 +299,7 @@ public class WorkbenchProperties { } } + @Override public void selectionChanged(IWorkbenchPart part, ISelection selection) { fireChange(part, null); } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/dialogs/AbstractElementListSelectionDialog.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/dialogs/AbstractElementListSelectionDialog.java index 46ad03a5319..cfc57d21bb1 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/dialogs/AbstractElementListSelectionDialog.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/dialogs/AbstractElementListSelectionDialog.java @@ -275,7 +275,8 @@ public abstract class AbstractElementListSelectionDialog extends SelectionStatus * Creates the message text widget and sets layout data. * @param composite the parent composite of the message area. */ - protected Label createMessageArea(Composite composite) { + @Override + protected Label createMessageArea(Composite composite) { Label label = super.createMessageArea(composite); GridData data = new GridData(); @@ -336,7 +337,8 @@ public abstract class AbstractElementListSelectionDialog extends SelectionStatus /* * @see Dialog#cancelPressed */ - protected void cancelPressed() { + @Override + protected void cancelPressed() { setResult(null); super.cancelPressed(); } @@ -365,11 +367,13 @@ public abstract class AbstractElementListSelectionDialog extends SelectionStatus list.setFilter((fFilter == null ? "" : fFilter)); //$NON-NLS-1$ list.addSelectionListener(new SelectionListener() { - public void widgetDefaultSelected(SelectionEvent e) { + @Override + public void widgetDefaultSelected(SelectionEvent e) { handleDefaultSelected(); } - public void widgetSelected(SelectionEvent e) { + @Override + public void widgetSelected(SelectionEvent e) { handleWidgetSelected(); } }); @@ -411,20 +415,23 @@ public abstract class AbstractElementListSelectionDialog extends SelectionStatus text.setText((fFilter == null ? "" : fFilter)); //$NON-NLS-1$ Listener listener = new Listener() { - public void handleEvent(Event e) { + @Override + public void handleEvent(Event e) { fFilteredList.setFilter(fFilterText.getText()); } }; text.addListener(SWT.Modify, listener); text.addKeyListener(new KeyListener() { - public void keyPressed(KeyEvent e) { + @Override + public void keyPressed(KeyEvent e) { if (e.keyCode == SWT.ARROW_DOWN) { fFilteredList.setFocus(); } } - public void keyReleased(KeyEvent e) { + @Override + public void keyReleased(KeyEvent e) { } }); @@ -437,7 +444,8 @@ public abstract class AbstractElementListSelectionDialog extends SelectionStatus * (non-Javadoc) * @see org.eclipse.jface.window.Window#open() */ - public int open() { + @Override + public int open() { super.open(); return getReturnCode(); } @@ -450,10 +458,12 @@ public abstract class AbstractElementListSelectionDialog extends SelectionStatus * (non-Javadoc) * @see org.eclipse.jface.window.Window#create() */ - public void create() { + @Override + public void create() { BusyIndicator.showWhile(null, new Runnable() { - public void run() { + @Override + public void run() { access$superCreate(); Assert.isNotNull(fFilteredList); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/dialogs/CheckedTreeSelectionDialog.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/dialogs/CheckedTreeSelectionDialog.java index da157db7827..eebdad2097d 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/dialogs/CheckedTreeSelectionDialog.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/dialogs/CheckedTreeSelectionDialog.java @@ -161,7 +161,8 @@ public class CheckedTreeSelectionDialog extends SelectionStatusDialog { * {@link CheckedTreeSelectionDialog#setComparator(ViewerComparator)} * instead */ - public void setSorter(ViewerSorter sorter) { + @Deprecated + public void setSorter(ViewerSorter sorter) { fComparator = sorter; } @@ -269,7 +270,8 @@ public class CheckedTreeSelectionDialog extends SelectionStatusDialog { * (non-Javadoc) * @see org.eclipse.jface.window.Window#open() */ - public int open() { + @Override + public int open() { fIsEmpty = evaluateIfTreeEmpty(fInput); super.open(); return getReturnCode(); @@ -282,7 +284,8 @@ public class CheckedTreeSelectionDialog extends SelectionStatusDialog { /** * Handles cancel button pressed event. */ - protected void cancelPressed() { + @Override + protected void cancelPressed() { setResult(null); super.cancelPressed(); } @@ -290,7 +293,8 @@ public class CheckedTreeSelectionDialog extends SelectionStatusDialog { /* * @see SelectionStatusDialog#computeResult() */ - protected void computeResult() { + @Override + protected void computeResult() { setResult(Arrays.asList(fViewer.getCheckedElements())); } @@ -298,9 +302,11 @@ public class CheckedTreeSelectionDialog extends SelectionStatusDialog { * (non-Javadoc) * @see org.eclipse.jface.window.Window#create() */ - public void create() { + @Override + public void create() { BusyIndicator.showWhile(null, new Runnable() { - public void run() { + @Override + public void run() { access$superCreate(); fViewer.setCheckedElements(getInitialElementSelections() .toArray()); @@ -316,7 +322,8 @@ public class CheckedTreeSelectionDialog extends SelectionStatusDialog { * (non-Javadoc) * @see org.eclipse.jface.dialogs.Dialog#createDialogArea(org.eclipse.swt.widgets.Composite) */ - protected Control createDialogArea(Composite parent) { + @Override + protected Control createDialogArea(Composite parent) { Composite composite = (Composite) super.createDialogArea(parent); Label messageLabel = createMessageArea(composite); CheckboxTreeViewer treeViewer = createTreeViewer(composite); @@ -351,7 +358,8 @@ public class CheckedTreeSelectionDialog extends SelectionStatusDialog { fViewer.setContentProvider(fContentProvider); fViewer.setLabelProvider(fLabelProvider); fViewer.addCheckStateListener(new ICheckStateListener() { - public void checkStateChanged(CheckStateChangedEvent event) { + @Override + public void checkStateChanged(CheckStateChangedEvent event) { updateOKStatus(); } }); @@ -397,7 +405,8 @@ public class CheckedTreeSelectionDialog extends SelectionStatusDialog { IDialogConstants.SELECT_ALL_ID, WorkbenchMessages.CheckedTreeSelectionDialog_select_all, false); SelectionListener listener = new SelectionAdapter() { - public void widgetSelected(SelectionEvent e) { + @Override + public void widgetSelected(SelectionEvent e) { Object[] viewerElements = fContentProvider.getElements(fInput); if (fContainerMode) { fViewer.setCheckedElements(viewerElements); @@ -414,7 +423,8 @@ public class CheckedTreeSelectionDialog extends SelectionStatusDialog { IDialogConstants.DESELECT_ALL_ID, WorkbenchMessages.CheckedTreeSelectionDialog_deselect_all, false); listener = new SelectionAdapter() { - public void widgetSelected(SelectionEvent e) { + @Override + public void widgetSelected(SelectionEvent e) { fViewer.setCheckedElements(new Object[0]); updateOKStatus(); } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/dialogs/ContainerCheckedTreeViewer.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/dialogs/ContainerCheckedTreeViewer.java index be647a0bcdd..8f36678c486 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/dialogs/ContainerCheckedTreeViewer.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/dialogs/ContainerCheckedTreeViewer.java @@ -63,15 +63,18 @@ public class ContainerCheckedTreeViewer extends CheckboxTreeViewer { private void initViewer() { setUseHashlookup(true); addCheckStateListener(new ICheckStateListener() { - public void checkStateChanged(CheckStateChangedEvent event) { + @Override + public void checkStateChanged(CheckStateChangedEvent event) { doCheckStateChanged(event.getElement()); } }); addTreeListener(new ITreeViewerListener() { - public void treeCollapsed(TreeExpansionEvent event) { + @Override + public void treeCollapsed(TreeExpansionEvent event) { } - public void treeExpanded(TreeExpansionEvent event) { + @Override + public void treeExpanded(TreeExpansionEvent event) { Widget item = findItem(event.getElement()); if (item instanceof TreeItem) { initializeItem((TreeItem) item); @@ -143,7 +146,8 @@ public class ContainerCheckedTreeViewer extends CheckboxTreeViewer { /* (non-Javadoc) * @see org.eclipse.jface.viewers.ICheckable#setChecked(java.lang.Object, boolean) */ - public boolean setChecked(Object element, boolean state) { + @Override + public boolean setChecked(Object element, boolean state) { if (super.setChecked(element, state)) { doCheckStateChanged(element); return true; @@ -155,7 +159,8 @@ public class ContainerCheckedTreeViewer extends CheckboxTreeViewer { /* (non-Javadoc) * @see org.eclipse.jface.viewers.CheckboxTreeViewer#setCheckedElements(java.lang.Object[]) */ - public void setCheckedElements(Object[] elements) { + @Override + public void setCheckedElements(Object[] elements) { super.setCheckedElements(elements); for (int i = 0; i < elements.length; i++) { doCheckStateChanged(elements[i]); @@ -166,7 +171,8 @@ public class ContainerCheckedTreeViewer extends CheckboxTreeViewer { /* (non-Javadoc) * @see org.eclipse.jface.viewers.AbstractTreeViewer#setExpanded(org.eclipse.swt.widgets.Item, boolean) */ - protected void setExpanded(Item item, boolean expand) { + @Override + protected void setExpanded(Item item, boolean expand) { super.setExpanded(item, expand); if (expand && item instanceof TreeItem) { initializeItem((TreeItem) item); @@ -177,7 +183,8 @@ public class ContainerCheckedTreeViewer extends CheckboxTreeViewer { /* (non-Javadoc) * @see org.eclipse.jface.viewers.CheckboxTreeViewer#getCheckedElements() */ - public Object[] getCheckedElements() { + @Override + public Object[] getCheckedElements() { Object[] checked = super.getCheckedElements(); // add all items that are children of a checked node but not created yet ArrayList result = new ArrayList(); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/dialogs/EditorSelectionDialog.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/dialogs/EditorSelectionDialog.java index 989d5373b47..8d2debdb285 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/dialogs/EditorSelectionDialog.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/dialogs/EditorSelectionDialog.java @@ -118,6 +118,7 @@ public final class EditorSelectionDialog extends Dialog { /** * This method is called if a button has been pressed. */ + @Override protected void buttonPressed(int buttonId) { if (buttonId == IDialogConstants.OK_ID) { saveWidgetValues(); @@ -128,6 +129,7 @@ public final class EditorSelectionDialog extends Dialog { /** * Close the window. */ + @Override public boolean close() { boolean result = super.close(); resourceManager.dispose(); @@ -138,6 +140,7 @@ public final class EditorSelectionDialog extends Dialog { /* * (non-Javadoc) Method declared in Window. */ + @Override protected void configureShell(Shell shell) { super.configureShell(shell); shell.setText(WorkbenchMessages.EditorSelection_title); @@ -155,6 +158,7 @@ public final class EditorSelectionDialog extends Dialog { * the parent composite to contain the dialog area * @return the dialog area control */ + @Override protected Control createDialogArea(Composite parent) { Font font = parent.getFont(); // create main group @@ -202,11 +206,13 @@ public final class EditorSelectionDialog extends Dialog { editorTableViewer = new TableViewer(editorTable); editorTableViewer.setContentProvider(ArrayContentProvider.getInstance()); editorTableViewer.setLabelProvider(new LabelProvider() { + @Override public String getText(Object element) { IEditorDescriptor d = (IEditorDescriptor) element; return TextProcessor.process(d.getLabel(), "."); //$NON-NLS-1$ } + @Override public Image getImage(Object element) { IEditorDescriptor d = (IEditorDescriptor) element; return (Image) resourceManager.get(d.getImageDescriptor()); @@ -453,6 +459,7 @@ public final class EditorSelectionDialog extends Dialog { updateOkButton(); } + @Override protected void createButtonsForButtonBar(Composite parent) { okButton = createButton(parent, IDialogConstants.OK_ID, IDialogConstants.OK_LABEL, true); @@ -487,6 +494,7 @@ public final class EditorSelectionDialog extends Dialog { * * @see org.eclipse.swt.widgets.Listener#handleEvent(org.eclipse.swt.widgets.Event) */ + @Override public void handleEvent(Event event) { if (event.type == SWT.MouseDoubleClick) { handleDoubleClickEvent(); @@ -514,6 +522,7 @@ public final class EditorSelectionDialog extends Dialog { * @see org.eclipse.jface.dialogs.Dialog#isResizable() * @since 3.4 */ + @Override protected boolean isResizable() { return true; } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/dialogs/ElementListSelectionDialog.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/dialogs/ElementListSelectionDialog.java index b22221e92a2..f462788980f 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/dialogs/ElementListSelectionDialog.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/dialogs/ElementListSelectionDialog.java @@ -47,14 +47,16 @@ public class ElementListSelectionDialog extends /* * @see SelectionStatusDialog#computeResult() */ - protected void computeResult() { + @Override + protected void computeResult() { setResult(Arrays.asList(getSelectedElements())); } /* * @see Dialog#createDialogArea(Composite) */ - protected Control createDialogArea(Composite parent) { + @Override + protected Control createDialogArea(Composite parent) { Composite contents = (Composite) super.createDialogArea(parent); createMessageArea(contents); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/dialogs/ElementTreeSelectionDialog.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/dialogs/ElementTreeSelectionDialog.java index 09ab92e1339..c13f2885db8 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/dialogs/ElementTreeSelectionDialog.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/dialogs/ElementTreeSelectionDialog.java @@ -156,7 +156,8 @@ public class ElementTreeSelectionDialog extends SelectionStatusDialog { * @param sorter * @deprecated as of 3.3, use {@link ElementTreeSelectionDialog#setComparator(ViewerComparator)} instead */ - public void setSorter(ViewerSorter sorter) { + @Deprecated + public void setSorter(ViewerSorter sorter) { fComparator = sorter; } @@ -233,7 +234,8 @@ public class ElementTreeSelectionDialog extends SelectionStatusDialog { * (non-Javadoc) * @see org.eclipse.jface.window.Window#open() */ - public int open() { + @Override + public int open() { fIsEmpty = evaluateIfTreeEmpty(fInput); super.open(); return getReturnCode(); @@ -246,7 +248,8 @@ public class ElementTreeSelectionDialog extends SelectionStatusDialog { /** * Handles cancel button pressed event. */ - protected void cancelPressed() { + @Override + protected void cancelPressed() { setResult(null); super.cancelPressed(); } @@ -254,7 +257,8 @@ public class ElementTreeSelectionDialog extends SelectionStatusDialog { /* * @see SelectionStatusDialog#computeResult() */ - protected void computeResult() { + @Override + protected void computeResult() { setResult(((IStructuredSelection) fViewer.getSelection()).toList()); } @@ -262,9 +266,11 @@ public class ElementTreeSelectionDialog extends SelectionStatusDialog { * (non-Javadoc) * @see org.eclipse.jface.window.Window#create() */ - public void create() { + @Override + public void create() { BusyIndicator.showWhile(null, new Runnable() { - public void run() { + @Override + public void run() { access$superCreate(); fViewer.setSelection(new StructuredSelection( getInitialElementSelections()), true); @@ -276,7 +282,8 @@ public class ElementTreeSelectionDialog extends SelectionStatusDialog { /* * @see Dialog#createDialogArea(Composite) */ - protected Control createDialogArea(Composite parent) { + @Override + protected Control createDialogArea(Composite parent) { Composite composite = (Composite) super.createDialogArea(parent); Label messageLabel = createMessageArea(composite); @@ -312,7 +319,8 @@ public class ElementTreeSelectionDialog extends SelectionStatusDialog { fViewer.setContentProvider(fContentProvider); fViewer.setLabelProvider(fLabelProvider); fViewer.addSelectionChangedListener(new ISelectionChangedListener() { - public void selectionChanged(SelectionChangedEvent event) { + @Override + public void selectionChanged(SelectionChangedEvent event) { access$setResult(((IStructuredSelection) event.getSelection()) .toList()); updateOKStatus(); @@ -329,7 +337,8 @@ public class ElementTreeSelectionDialog extends SelectionStatusDialog { if (fDoubleClickSelects) { Tree tree = fViewer.getTree(); tree.addSelectionListener(new SelectionAdapter() { - public void widgetDefaultSelected(SelectionEvent e) { + @Override + public void widgetDefaultSelected(SelectionEvent e) { updateOKStatus(); if (fCurrStatus.isOK()) { access$superButtonPressed(IDialogConstants.OK_ID); @@ -338,7 +347,8 @@ public class ElementTreeSelectionDialog extends SelectionStatusDialog { }); } fViewer.addDoubleClickListener(new IDoubleClickListener() { - public void doubleClick(DoubleClickEvent event) { + @Override + public void doubleClick(DoubleClickEvent event) { updateOKStatus(); //If it is not OK or if double click does not @@ -420,7 +430,8 @@ public class ElementTreeSelectionDialog extends SelectionStatusDialog { /** * @see org.eclipse.jface.window.Window#handleShellCloseEvent() */ - protected void handleShellCloseEvent() { + @Override + protected void handleShellCloseEvent() { super.handleShellCloseEvent(); //Handle the closing of the shell by selecting the close icon diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/dialogs/FileEditorMappingContentProvider.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/dialogs/FileEditorMappingContentProvider.java index 0b7eee5cbb8..4f0dfbf0dbd 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/dialogs/FileEditorMappingContentProvider.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/dialogs/FileEditorMappingContentProvider.java @@ -44,13 +44,15 @@ public class FileEditorMappingContentProvider implements /* (non-Javadoc) * Method declared on IContentProvider. */ - public void dispose() { + @Override + public void dispose() { } /* (non-Javadoc) * Method declared on IStructuredContentProvider. */ - public Object[] getElements(Object element) { + @Override + public Object[] getElements(Object element) { IFileEditorMapping[] array = (IFileEditorMapping[]) element; return array == null ? new Object[0] : array; } @@ -58,6 +60,7 @@ public class FileEditorMappingContentProvider implements /* (non-Javadoc) * Method declared on IContentProvider. */ - public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { + @Override + public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { } } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/dialogs/FileEditorMappingLabelProvider.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/dialogs/FileEditorMappingLabelProvider.java index c92b0d97747..7449b87800f 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/dialogs/FileEditorMappingLabelProvider.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/dialogs/FileEditorMappingLabelProvider.java @@ -59,7 +59,8 @@ public class FileEditorMappingLabelProvider extends LabelProvider implements /* (non-Javadoc) * Method declared on ILabelProvider. */ - public void dispose() { + @Override + public void dispose() { super.dispose(); for (Iterator e = imagesToDispose.iterator(); e.hasNext();) { ((Image) e.next()).dispose(); @@ -73,14 +74,16 @@ public class FileEditorMappingLabelProvider extends LabelProvider implements * image is remembered internally and will be deallocated by * <code>dispose</code>. */ - public Image getColumnImage(Object element, int row) { + @Override + public Image getColumnImage(Object element, int row) { return getImage(element); } /* (non-Javadoc) * Method declared on ITableLabelProvider. */ - public String getColumnText(Object element, int row) { + @Override + public String getColumnText(Object element, int row) { return getText(element); } @@ -89,7 +92,8 @@ public class FileEditorMappingLabelProvider extends LabelProvider implements * <code>ILabelProvider</code> method creates and returns an new image. The image * is remembered internally and will be deallocated by <code>dispose</code>. */ - public Image getImage(Object element) { + @Override + public Image getImage(Object element) { if (element instanceof IFileEditorMapping) { Image image = ((IFileEditorMapping) element).getImageDescriptor() .createImage(); @@ -102,7 +106,8 @@ public class FileEditorMappingLabelProvider extends LabelProvider implements /* (non-Javadoc) * Method declared on ILabelProvider. */ - public String getText(Object element) { + @Override + public String getText(Object element) { if (element instanceof IFileEditorMapping) { return TextProcessor.process(((IFileEditorMapping) element) .getLabel(), "*."); //$NON-NLS-1$ diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/dialogs/FileSystemElement.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/dialogs/FileSystemElement.java index bb3e78c5b67..a98ebd11d51 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/dialogs/FileSystemElement.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/dialogs/FileSystemElement.java @@ -55,28 +55,32 @@ public class FileSystemElement implements IAdaptable { /** * Answer the children property of this element */ - public Object[] getChildren(Object o) { + @Override + public Object[] getChildren(Object o) { return getFolders().getChildren(o); } /** * Returns the parent of this element */ - public Object getParent(Object o) { + @Override + public Object getParent(Object o) { return parent; } /** * Returns an appropriate label for this file system element. */ - public String getLabel(Object o) { + @Override + public String getLabel(Object o) { return name; } /** * Returns an image descriptor for this file system element */ - public ImageDescriptor getImageDescriptor(Object object) { + @Override + public ImageDescriptor getImageDescriptor(Object object) { if (isDirectory()) { return WorkbenchImages .getImageDescriptor(ISharedImages.IMG_OBJ_FOLDER); @@ -133,7 +137,8 @@ public class FileSystemElement implements IAdaptable { /** * Returns the adapter */ - public Object getAdapter(Class adapter) { + @Override + public Object getAdapter(Class adapter) { if (adapter == IWorkbenchAdapter.class) { return workbenchAdapter; } @@ -242,7 +247,8 @@ public class FileSystemElement implements IAdaptable { /** * For debugging purposes only. */ - public String toString() { + @Override + public String toString() { StringBuffer buf = new StringBuffer(); if (isDirectory()) { buf.append("Folder(");//$NON-NLS-1$ diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/dialogs/FilteredItemsSelectionDialog.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/dialogs/FilteredItemsSelectionDialog.java index 4abbd446736..dbc00a90f30 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/dialogs/FilteredItemsSelectionDialog.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/dialogs/FilteredItemsSelectionDialog.java @@ -353,6 +353,7 @@ public abstract class FilteredItemsSelectionDialog extends * * @see org.eclipse.jface.window.Window#create() */ + @Override public void create() { super.create(); pattern.setFocus(); @@ -402,6 +403,7 @@ public abstract class FilteredItemsSelectionDialog extends * * @see org.eclipse.jface.window.Window#close() */ + @Override public boolean close() { this.filterJob.cancel(); this.refreshCacheJob.cancel(); @@ -470,6 +472,7 @@ public abstract class FilteredItemsSelectionDialog extends .length() > 0) ? getMessage() : WorkbenchMessages.FilteredItemsSelectionDialog_patternLabel); headerLabel.addTraverseListener(new TraverseListener() { + @Override public void keyTraversed(TraverseEvent e) { if (e.detail == SWT.TRAVERSE_MNEMONIC && e.doit) { e.detail = SWT.TRAVERSE_NONE; @@ -506,6 +509,7 @@ public abstract class FilteredItemsSelectionDialog extends .setText(WorkbenchMessages.FilteredItemsSelectionDialog_listLabel); listLabel.addTraverseListener(new TraverseListener() { + @Override public void keyTraversed(TraverseEvent e) { if (e.detail == SWT.TRAVERSE_MNEMONIC && e.doit) { e.detail = SWT.TRAVERSE_NONE; @@ -533,6 +537,7 @@ public abstract class FilteredItemsSelectionDialog extends toolBar.setLayoutData(data); toolBar.addMouseListener(new MouseAdapter() { + @Override public void mouseDown(MouseEvent e) { showViewMenu(); } @@ -543,6 +548,7 @@ public abstract class FilteredItemsSelectionDialog extends toolItem .setToolTipText(WorkbenchMessages.FilteredItemsSelectionDialog_menu); toolItem.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { showViewMenu(); } @@ -555,6 +561,7 @@ public abstract class FilteredItemsSelectionDialog extends IHandlerService service = (IHandlerService) PlatformUI.getWorkbench() .getService(IHandlerService.class); IHandler handler = new AbstractHandler() { + @Override public Object execute(ExecutionEvent event) { showViewMenu(); return null; @@ -621,6 +628,7 @@ public abstract class FilteredItemsSelectionDialog extends contextMenuManager = new MenuManager(); contextMenuManager.setRemoveAllWhenShown(true); contextMenuManager.addMenuListener(new IMenuListener() { + @Override public void menuAboutToShow(IMenuManager manager) { fillContextMenu(manager); } @@ -645,6 +653,7 @@ public abstract class FilteredItemsSelectionDialog extends * * @see org.eclipse.jface.dialogs.Dialog#createDialogArea(org.eclipse.swt.widgets.Composite) */ + @Override protected Control createDialogArea(Composite parent) { Composite dialogArea = (Composite) super.createDialogArea(parent); @@ -662,6 +671,7 @@ public abstract class FilteredItemsSelectionDialog extends pattern = new Text(content, SWT.SINGLE | SWT.BORDER | SWT.SEARCH | SWT.ICON_CANCEL); pattern.getAccessible().addAccessibleListener(new AccessibleAdapter() { + @Override public void getName(AccessibleEvent e) { e.result = LegacyActionTools.removeMnemonics(headerLabel .getText()); @@ -676,6 +686,7 @@ public abstract class FilteredItemsSelectionDialog extends | SWT.BORDER | SWT.V_SCROLL | SWT.VIRTUAL); list.getTable().getAccessible().addAccessibleListener( new AccessibleAdapter() { + @Override public void getName(AccessibleEvent e) { if (e.childID == ACC.CHILDID_SELF) { e.result = LegacyActionTools @@ -695,12 +706,14 @@ public abstract class FilteredItemsSelectionDialog extends createPopupMenu(); pattern.addModifyListener(new ModifyListener() { + @Override public void modifyText(ModifyEvent e) { applyFilter(); } }); pattern.addKeyListener(new KeyAdapter() { + @Override public void keyPressed(KeyEvent e) { if (e.keyCode == SWT.ARROW_DOWN) { if (list.getTable().getItemCount() > 0) { @@ -711,6 +724,7 @@ public abstract class FilteredItemsSelectionDialog extends }); list.addSelectionChangedListener(new ISelectionChangedListener() { + @Override public void selectionChanged(SelectionChangedEvent event) { StructuredSelection selection = (StructuredSelection) event .getSelection(); @@ -719,12 +733,14 @@ public abstract class FilteredItemsSelectionDialog extends }); list.addDoubleClickListener(new IDoubleClickListener() { + @Override public void doubleClick(DoubleClickEvent event) { handleDoubleClick(); } }); list.getTable().addKeyListener(new KeyAdapter() { + @Override public void keyPressed(KeyEvent e) { if (e.keyCode == SWT.DEL) { @@ -925,6 +941,7 @@ public abstract class FilteredItemsSelectionDialog extends * * @see org.eclipse.jface.window.Dialog#getDialogBoundsSettings() */ + @Override protected IDialogSettings getDialogBoundsSettings() { IDialogSettings settings = getDialogSettings(); IDialogSettings section = settings.getSection(DIALOG_BOUNDS_SETTINGS); @@ -981,6 +998,7 @@ public abstract class FilteredItemsSelectionDialog extends * * @deprecated */ + @Deprecated public void updateProgressLabel() { scheduleProgressMessageRefresh(); } @@ -1029,6 +1047,7 @@ public abstract class FilteredItemsSelectionDialog extends * * @see org.eclipse.ui.dialogs.SelectionStatusDialog#computeResult() */ + @Override protected void computeResult() { List selectedElements = ((StructuredSelection) list.getSelection()) @@ -1053,6 +1072,7 @@ public abstract class FilteredItemsSelectionDialog extends /* * @see org.eclipse.ui.dialogs.SelectionStatusDialog#updateStatus(org.eclipse.core.runtime.IStatus) */ + @Override protected void updateStatus(IStatus status) { this.status = status; super.updateStatus(status); @@ -1061,6 +1081,7 @@ public abstract class FilteredItemsSelectionDialog extends /* * @see Dialog#okPressed() */ + @Override protected void okPressed() { if (status != null && (status.isOK() || status.getCode() == IStatus.INFO)) { @@ -1335,6 +1356,7 @@ public abstract class FilteredItemsSelectionDialog extends IAction.AS_CHECK_BOX); } + @Override public void run() { details.setVisible(isChecked()); } @@ -1388,6 +1410,7 @@ public abstract class FilteredItemsSelectionDialog extends * * @see org.eclipse.ui.progress.UIJob#runInUIThread(org.eclipse.core.runtime.IProgressMonitor) */ + @Override public IStatus runInUIThread(IProgressMonitor monitor) { if (monitor.isCanceled()) return new Status(IStatus.OK, WorkbenchPlugin.PI_WORKBENCH, @@ -1429,6 +1452,7 @@ public abstract class FilteredItemsSelectionDialog extends * * @see org.eclipse.ui.progress.UIJob#runInUIThread(org.eclipse.core.runtime.IProgressMonitor) */ + @Override public IStatus runInUIThread(IProgressMonitor monitor) { if (!progressLabel.isDisposed()) @@ -1496,6 +1520,7 @@ public abstract class FilteredItemsSelectionDialog extends * * @see org.eclipse.core.runtime.jobs.Job#run(org.eclipse.core.runtime.IProgressMonitor) */ + @Override protected IStatus run(IProgressMonitor monitor) { if (monitor.isCanceled()) { return new Status(IStatus.CANCEL, WorkbenchPlugin.PI_WORKBENCH, @@ -1523,6 +1548,7 @@ public abstract class FilteredItemsSelectionDialog extends * * @see org.eclipse.core.runtime.jobs.Job#canceling() */ + @Override protected void canceling() { super.canceling(); contentProvider.stopReloadingCache(); @@ -1545,6 +1571,7 @@ public abstract class FilteredItemsSelectionDialog extends * * @see org.eclipse.jface.action.Action#run() */ + @Override public void run() { List selectedElements = ((StructuredSelection) list.getSelection()) .toList(); @@ -1688,6 +1715,7 @@ public abstract class FilteredItemsSelectionDialog extends return string; } + @Override public void update(ViewerCell cell) { Object element = cell.getElement(); @@ -1747,6 +1775,7 @@ public abstract class FilteredItemsSelectionDialog extends * * @see org.eclipse.jface.viewers.IBaseLabelProvider#addListener(org.eclipse.jface.viewers.ILabelProviderListener) */ + @Override public void addListener(ILabelProviderListener listener) { listeners.add(listener); } @@ -1756,6 +1785,7 @@ public abstract class FilteredItemsSelectionDialog extends * * @see org.eclipse.jface.viewers.IBaseLabelProvider#dispose() */ + @Override public void dispose() { provider.removeListener(this); provider.dispose(); @@ -1774,6 +1804,7 @@ public abstract class FilteredItemsSelectionDialog extends * @see org.eclipse.jface.viewers.IBaseLabelProvider#isLabelProperty(java.lang.Object, * java.lang.String) */ + @Override public boolean isLabelProperty(Object element, String property) { if (provider.isLabelProperty(element, property)) { return true; @@ -1790,6 +1821,7 @@ public abstract class FilteredItemsSelectionDialog extends * * @see org.eclipse.jface.viewers.IBaseLabelProvider#removeListener(org.eclipse.jface.viewers.ILabelProviderListener) */ + @Override public void removeListener(ILabelProviderListener listener) { listeners.remove(listener); } @@ -1830,6 +1862,7 @@ public abstract class FilteredItemsSelectionDialog extends * * @see org.eclipse.jface.viewers.ILabelProviderListener#labelProviderChanged(org.eclipse.jface.viewers.LabelProviderChangedEvent) */ + @Override public void labelProviderChanged(LabelProviderChangedEvent event) { Object[] l = listeners.getListeners(); for (int i = 0; i < listeners.size(); i++) { @@ -1909,6 +1942,7 @@ public abstract class FilteredItemsSelectionDialog extends * * @see org.eclipse.core.runtime.ProgressMonitorWrapper#setTaskName(java.lang.String) */ + @Override public void setTaskName(String name) { super.setTaskName(name); this.name = name; @@ -1920,6 +1954,7 @@ public abstract class FilteredItemsSelectionDialog extends * * @see org.eclipse.core.runtime.ProgressMonitorWrapper#subTask(java.lang.String) */ + @Override public void subTask(String name) { super.subTask(name); this.subName = name; @@ -1931,6 +1966,7 @@ public abstract class FilteredItemsSelectionDialog extends * @see org.eclipse.core.runtime.ProgressMonitorWrapper#beginTask(java.lang.String, * int) */ + @Override public void beginTask(String name, int totalWork) { super.beginTask(name, totalWork); if (this.name == null) @@ -1944,6 +1980,7 @@ public abstract class FilteredItemsSelectionDialog extends * * @see org.eclipse.core.runtime.ProgressMonitorWrapper#worked(int) */ + @Override public void worked(int work) { super.worked(work); internalWorked(work); @@ -1954,6 +1991,7 @@ public abstract class FilteredItemsSelectionDialog extends * * @see org.eclipse.core.runtime.ProgressMonitorWrapper#done() */ + @Override public void done() { done = true; super.done(); @@ -1964,6 +2002,7 @@ public abstract class FilteredItemsSelectionDialog extends * * @see org.eclipse.core.runtime.ProgressMonitorWrapper#setCanceled(boolean) */ + @Override public void setCanceled(boolean b) { done = b; super.setCanceled(b); @@ -1974,6 +2013,7 @@ public abstract class FilteredItemsSelectionDialog extends * * @see org.eclipse.core.runtime.ProgressMonitorWrapper#internalWorked(double) */ + @Override public void internalWorked(double work) { worked = worked + work; } @@ -2031,6 +2071,7 @@ public abstract class FilteredItemsSelectionDialog extends * * @see org.eclipse.core.runtime.jobs.Job#run(org.eclipse.core.runtime.IProgressMonitor) */ + @Override protected IStatus run(IProgressMonitor monitor) { this.itemsFilter = filter; @@ -2084,6 +2125,7 @@ public abstract class FilteredItemsSelectionDialog extends * * @see org.eclipse.core.runtime.jobs.Job#run(org.eclipse.core.runtime.IProgressMonitor) */ + @Override protected final IStatus run(IProgressMonitor parent) { GranualProgressMonitor monitor = new GranualProgressMonitor(parent); return doRun(monitor); @@ -2231,6 +2273,7 @@ public abstract class FilteredItemsSelectionDialog extends * * @see java.util.LinkedList#add(java.lang.Object) */ + @Override public boolean add(Object arg0) { if (this.size() >= MAX_HISTORY_SIZE) { Iterator iterator = this.iterator(); @@ -2683,6 +2726,7 @@ public abstract class FilteredItemsSelectionDialog extends * @param item * @param itemsFilter */ + @Override public void add(Object item, ItemsFilter itemsFilter) { if (itemsFilter == filter) { if (itemsFilter != null) { @@ -2869,6 +2913,7 @@ public abstract class FilteredItemsSelectionDialog extends * * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object) */ + @Override public Object[] getElements(Object inputElement) { return lastFilteredItems.toArray(); } @@ -2882,6 +2927,7 @@ public abstract class FilteredItemsSelectionDialog extends * * @see org.eclipse.jface.viewers.IContentProvider#dispose() */ + @Override public void dispose() { } @@ -2891,6 +2937,7 @@ public abstract class FilteredItemsSelectionDialog extends * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer, * java.lang.Object, java.lang.Object) */ + @Override public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { } @@ -2899,6 +2946,7 @@ public abstract class FilteredItemsSelectionDialog extends * * @see org.eclipse.jface.viewers.ILazyContentProvider#updateElement(int) */ + @Override public void updateElement(int index) { FilteredItemsSelectionDialog.this.list.replace((lastFilteredItems @@ -3100,6 +3148,7 @@ public abstract class FilteredItemsSelectionDialog extends * * @see org.eclipse.jface.viewers.IContentProvider#dispose() */ + @Override public void dispose() { } @@ -3109,6 +3158,7 @@ public abstract class FilteredItemsSelectionDialog extends * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer, * java.lang.Object, java.lang.Object) */ + @Override public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { } @@ -3169,6 +3219,7 @@ public abstract class FilteredItemsSelectionDialog extends * @see org.eclipse.jface.viewers.Viewer#inputChanged(java.lang.Object, * java.lang.Object) */ + @Override protected void inputChanged(Object input, Object oldInput) { if (oldInput == null) { if (input == null) { @@ -3187,6 +3238,7 @@ public abstract class FilteredItemsSelectionDialog extends * * @see org.eclipse.jface.viewers.ContentViewer#handleLabelProviderChanged(org.eclipse.jface.viewers.LabelProviderChangedEvent) */ + @Override protected void handleLabelProviderChanged( LabelProviderChangedEvent event) { if (event != null) { @@ -3199,6 +3251,7 @@ public abstract class FilteredItemsSelectionDialog extends * * @see org.eclipse.jface.viewers.Viewer#getControl() */ + @Override public Control getControl() { return label; } @@ -3208,6 +3261,7 @@ public abstract class FilteredItemsSelectionDialog extends * * @see org.eclipse.jface.viewers.Viewer#getSelection() */ + @Override public ISelection getSelection() { // not supported return null; @@ -3218,6 +3272,7 @@ public abstract class FilteredItemsSelectionDialog extends * * @see org.eclipse.jface.viewers.Viewer#refresh() */ + @Override public void refresh() { Object input = this.getInput(); if (input != null) { @@ -3251,6 +3306,7 @@ public abstract class FilteredItemsSelectionDialog extends * @see org.eclipse.jface.viewers.Viewer#setSelection(org.eclipse.jface.viewers.ISelection, * boolean) */ + @Override public void setSelection(ISelection selection, boolean reveal) { // not supported } @@ -3285,6 +3341,7 @@ public abstract class FilteredItemsSelectionDialog extends * * @see java.util.Comparator#compare(java.lang.Object, java.lang.Object) */ + @Override public int compare(Object o1, Object o2) { boolean h1 = isHistoryElement(o1); boolean h2 = isHistoryElement(o2); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/dialogs/FilteredList.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/dialogs/FilteredList.java index 39c3b256a8f..2465255384b 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/dialogs/FilteredList.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/dialogs/FilteredList.java @@ -80,12 +80,14 @@ public class FilteredList extends Composite { private class DefaultFilterMatcher implements FilterMatcher { private StringMatcher fMatcher; + @Override public void setFilter(String pattern, boolean ignoreCase, boolean ignoreWildCards) { fMatcher = new StringMatcher(pattern + '*', ignoreCase, ignoreWildCards); } + @Override public boolean match(Object element) { return fMatcher.match(fLabelProvider.getText(element)); } @@ -186,6 +188,7 @@ public class FilteredList extends Composite { labelIgnoreCase = ignoreCase; } + @Override public int compare(Object left, Object right) { Label leftLabel = (Label) left; Label rightLabel = (Label) right; @@ -242,6 +245,7 @@ public class FilteredList extends Composite { fList.setLayoutData(new GridData(GridData.FILL_BOTH)); fList.setFont(parent.getFont()); fList.addDisposeListener(new DisposeListener() { + @Override public void widgetDisposed(DisposeEvent e) { fLabelProvider.dispose(); if (fUpdateJob != null) { @@ -572,6 +576,7 @@ public class FilteredList extends Composite { * * @see org.eclipse.ui.progress.UIJob#runInUIThread(org.eclipse.core.runtime.IProgressMonitor) */ +@Override public IStatus runInUIThread(IProgressMonitor monitor) { if (fTable.isDisposed()) { return Status.CANCEL_STATUS; @@ -773,6 +778,7 @@ public IStatus runInUIThread(IProgressMonitor monitor) { * * @since 3.3 */ + @Override public Accessible getAccessible() { return fList.getAccessible(); } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/dialogs/FilteredTree.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/dialogs/FilteredTree.java index 1a635d01312..c5869e9aa68 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/dialogs/FilteredTree.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/dialogs/FilteredTree.java @@ -220,6 +220,7 @@ public class FilteredTree extends Composite { * {@link #FilteredTree(Composite, int, PatternFilter, boolean)} where using the new * look is encouraged */ + @Deprecated public FilteredTree(Composite parent, int treeStyle, PatternFilter filter) { super(parent, SWT.NONE); this.parent = parent; @@ -260,6 +261,7 @@ public class FilteredTree extends Composite { * @deprecated As of 3.5, replaced by {@link #FilteredTree(Composite, boolean)} where using the * look is encouraged */ + @Deprecated protected FilteredTree(Composite parent) { super(parent, SWT.NONE); this.parent = parent; @@ -419,6 +421,7 @@ public class FilteredTree extends Composite { * * @see org.eclipse.swt.events.DisposeListener#widgetDisposed(org.eclipse.swt.events.DisposeEvent) */ + @Override public void widgetDisposed(DisposeEvent e) { refreshJob.cancel(); } @@ -484,6 +487,7 @@ public class FilteredTree extends Composite { */ protected WorkbenchJob doCreateRefreshJob() { return new WorkbenchJob("Refresh Filter") {//$NON-NLS-1$ + @Override public IStatus runInUIThread(IProgressMonitor monitor) { if (treeViewer.getControl().isDisposed()) { return Status.CANCEL_STATUS; @@ -639,6 +643,7 @@ public class FilteredTree extends Composite { * * @see org.eclipse.swt.accessibility.AccessibleListener#getName(org.eclipse.swt.accessibility.AccessibleEvent) */ + @Override public void getName(AccessibleEvent e) { String filterTextString = filterText.getText(); if (filterTextString.length() == 0 @@ -691,6 +696,7 @@ public class FilteredTree extends Composite { * * @see org.eclipse.swt.events.FocusListener#focusLost(org.eclipse.swt.events.FocusEvent) */ + @Override public void focusGained(FocusEvent e) { if (!useNewLook) { /* @@ -699,6 +705,7 @@ public class FilteredTree extends Composite { */ Display display= filterText.getDisplay(); display.asyncExec(new Runnable() { + @Override public void run() { if (!filterText.isDisposed()) { if (getInitialText().equals( @@ -717,6 +724,7 @@ public class FilteredTree extends Composite { * * @see org.eclipse.swt.events.FocusAdapter#focusLost(org.eclipse.swt.events.FocusEvent) */ + @Override public void focusLost(FocusEvent e) { if (!useNewLook) { return; @@ -736,6 +744,7 @@ public class FilteredTree extends Composite { * @see * org.eclipse.swt.events.MouseAdapter#mouseDown(org.eclipse.swt.events.MouseEvent) */ + @Override public void mouseDown(MouseEvent e) { if (filterText.getText().equals(initialText)) { // XXX: We cannot call clearText() due to https://bugs.eclipse.org/bugs/show_bug.cgi?id=260664 @@ -752,6 +761,7 @@ public class FilteredTree extends Composite { * * @see org.eclipse.swt.events.KeyAdapter#keyReleased(org.eclipse.swt.events.KeyEvent) */ + @Override public void keyPressed(KeyEvent e) { // on a CR we want to transfer focus to the list boolean hasItems = getViewer().getTree().getItemCount() > 0; @@ -764,6 +774,7 @@ public class FilteredTree extends Composite { // enter key set focus to tree filterText.addTraverseListener(new TraverseListener() { + @Override public void keyTraversed(TraverseEvent e) { if (quickSelectionMode) { return; @@ -781,6 +792,7 @@ public class FilteredTree extends Composite { * * @see org.eclipse.swt.events.ModifyListener#modifyText(org.eclipse.swt.events.ModifyEvent) */ + @Override public void modifyText(ModifyEvent e) { textChanged(); } @@ -796,6 +808,7 @@ public class FilteredTree extends Composite { * * @see org.eclipse.swt.events.SelectionAdapter#widgetDefaultSelected(org.eclipse.swt.events.SelectionEvent) */ + @Override public void widgetDefaultSelected(SelectionEvent e) { if (e.detail == SWT.ICON_CANCEL) clearText(); @@ -898,6 +911,7 @@ public class FilteredTree extends Composite { * @param background * background <code>Color</code> to set */ + @Override public void setBackground(Color background) { super.setBackground(background); if (filterComposite != null && (!useNewLook || useNativeSearchField(filterComposite))) { @@ -927,6 +941,7 @@ public class FilteredTree extends Composite { * * @see org.eclipse.jface.action.Action#run() */ + @Override public void run() { clearText(); } @@ -964,11 +979,13 @@ public class FilteredTree extends Composite { clearButton.addMouseListener(new MouseAdapter() { private MouseMoveListener fMoveListener; + @Override public void mouseDown(MouseEvent e) { clearButton.setImage(pressedImage); fMoveListener= new MouseMoveListener() { private boolean fMouseInButton= true; + @Override public void mouseMove(MouseEvent e) { boolean mouseInButton= isMouseInButton(e); if (mouseInButton != fMouseInButton) { @@ -980,6 +997,7 @@ public class FilteredTree extends Composite { clearButton.addMouseMoveListener(fMoveListener); } + @Override public void mouseUp(MouseEvent e) { if (fMoveListener != null) { clearButton.removeMouseMoveListener(fMoveListener); @@ -999,18 +1017,22 @@ public class FilteredTree extends Composite { } }); clearButton.addMouseTrackListener(new MouseTrackListener() { + @Override public void mouseEnter(MouseEvent e) { clearButton.setImage(activeImage); } + @Override public void mouseExit(MouseEvent e) { clearButton.setImage(inactiveImage); } + @Override public void mouseHover(MouseEvent e) { } }); clearButton.addDisposeListener(new DisposeListener() { + @Override public void widgetDisposed(DisposeEvent e) { inactiveImage.dispose(); activeImage.dispose(); @@ -1019,12 +1041,14 @@ public class FilteredTree extends Composite { }); clearButton.getAccessible().addAccessibleListener( new AccessibleAdapter() { + @Override public void getName(AccessibleEvent e) { e.result= WorkbenchMessages.FilteredTree_AccessibleListenerClearButton; } }); clearButton.getAccessible().addAccessibleControlListener( new AccessibleControlAdapter() { + @Override public void getRole(AccessibleControlEvent e) { e.detail= ACC.ROLE_PUSHBUTTON; } @@ -1108,6 +1132,7 @@ public class FilteredTree extends Composite { textChanged(); } else { getDisplay().asyncExec(new Runnable() { + @Override public void run() { if (!filterText.isDisposed() && filterText.isFocusControl()) { setFilterText(initialText); @@ -1218,78 +1243,93 @@ public class FilteredTree extends Composite { super(parent, style); } + @Override public void add(Object parentElementOrTreePath, Object childElement) { getPatternFilter().clearCaches(); super.add(parentElementOrTreePath, childElement); } + @Override public void add(Object parentElementOrTreePath, Object[] childElements) { getPatternFilter().clearCaches(); super.add(parentElementOrTreePath, childElements); } + @Override protected void inputChanged(Object input, Object oldInput) { getPatternFilter().clearCaches(); super.inputChanged(input, oldInput); } + @Override public void insert(Object parentElementOrTreePath, Object element, int position) { getPatternFilter().clearCaches(); super.insert(parentElementOrTreePath, element, position); } + @Override public void refresh() { getPatternFilter().clearCaches(); super.refresh(); } + @Override public void refresh(boolean updateLabels) { getPatternFilter().clearCaches(); super.refresh(updateLabels); } + @Override public void refresh(Object element) { getPatternFilter().clearCaches(); super.refresh(element); } + @Override public void refresh(Object element, boolean updateLabels) { getPatternFilter().clearCaches(); super.refresh(element, updateLabels); } + @Override public void remove(Object elementsOrTreePaths) { getPatternFilter().clearCaches(); super.remove(elementsOrTreePaths); } + @Override public void remove(Object parent, Object[] elements) { getPatternFilter().clearCaches(); super.remove(parent, elements); } + @Override public void remove(Object[] elementsOrTreePaths) { getPatternFilter().clearCaches(); super.remove(elementsOrTreePaths); } + @Override public void replace(Object parentElementOrTreePath, int index, Object element) { getPatternFilter().clearCaches(); super.replace(parentElementOrTreePath, index, element); } + @Override public void setChildCount(Object elementOrTreePath, int count) { getPatternFilter().clearCaches(); super.setChildCount(elementOrTreePath, count); } + @Override public void setContentProvider(IContentProvider provider) { getPatternFilter().clearCaches(); super.setContentProvider(provider); } + @Override public void setHasChildren(Object elementOrTreePath, boolean hasChildren) { getPatternFilter().clearCaches(); super.setHasChildren(elementOrTreePath, hasChildren); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/dialogs/ListDialog.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/dialogs/ListDialog.java index c8ba1f33087..089735e3546 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/dialogs/ListDialog.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/dialogs/ListDialog.java @@ -93,7 +93,8 @@ public class ListDialog extends SelectionDialog { return fTableViewer; } - protected void createButtonsForButtonBar(Composite parent) { + @Override + protected void createButtonsForButtonBar(Composite parent) { if (!fAddCancelButton) { createButton(parent, IDialogConstants.OK_ID, IDialogConstants.OK_LABEL, true); @@ -102,7 +103,8 @@ public class ListDialog extends SelectionDialog { } } - protected Control createDialogArea(Composite container) { + @Override + protected Control createDialogArea(Composite container) { Composite parent = (Composite) super.createDialogArea(container); createMessageArea(parent); fTableViewer = new TableViewer(parent, getTableStyle()); @@ -110,7 +112,8 @@ public class ListDialog extends SelectionDialog { fTableViewer.setLabelProvider(fLabelProvider); fTableViewer.setInput(fInput); fTableViewer.addDoubleClickListener(new IDoubleClickListener() { - public void doubleClick(DoubleClickEvent event) { + @Override + public void doubleClick(DoubleClickEvent event) { if (fAddCancelButton) { okPressed(); } @@ -141,7 +144,8 @@ public class ListDialog extends SelectionDialog { /* * Overrides method from Dialog */ - protected void okPressed() { + @Override + protected void okPressed() { // Build a list of selected children. IStructuredSelection selection = (IStructuredSelection) fTableViewer .getSelection(); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/dialogs/ListSelectionDialog.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/dialogs/ListSelectionDialog.java index 8765686064c..e37db16a4d0 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/dialogs/ListSelectionDialog.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/dialogs/ListSelectionDialog.java @@ -118,7 +118,8 @@ public class ListSelectionDialog extends SelectionDialog { IDialogConstants.SELECT_ALL_ID, SELECT_ALL_TITLE, false); SelectionListener listener = new SelectionAdapter() { - public void widgetSelected(SelectionEvent e) { + @Override + public void widgetSelected(SelectionEvent e) { listViewer.setAllChecked(true); } }; @@ -128,7 +129,8 @@ public class ListSelectionDialog extends SelectionDialog { IDialogConstants.DESELECT_ALL_ID, DESELECT_ALL_TITLE, false); listener = new SelectionAdapter() { - public void widgetSelected(SelectionEvent e) { + @Override + public void widgetSelected(SelectionEvent e) { listViewer.setAllChecked(false); } }; @@ -151,7 +153,8 @@ public class ListSelectionDialog extends SelectionDialog { * (non-Javadoc) * @see org.eclipse.jface.window.Window#configureShell(org.eclipse.swt.widgets.Shell) */ - protected void configureShell(Shell shell) { + @Override + protected void configureShell(Shell shell) { super.configureShell(shell); PlatformUI.getWorkbench().getHelpSystem().setHelp(shell, IWorkbenchHelpContextIds.LIST_SELECTION_DIALOG); @@ -160,7 +163,8 @@ public class ListSelectionDialog extends SelectionDialog { /* (non-Javadoc) * Method declared on Dialog. */ - protected Control createDialogArea(Composite parent) { + @Override + protected Control createDialogArea(Composite parent) { // page group Composite composite = (Composite) super.createDialogArea(parent); @@ -212,7 +216,8 @@ public class ListSelectionDialog extends SelectionDialog { * <code>Dialog</code> method builds a list of the selected elements for later * retrieval by the client and closes this dialog. */ - protected void okPressed() { + @Override + protected void okPressed() { // Get the input children. Object[] children = contentProvider.getElements(inputElement); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/dialogs/PatternFilter.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/dialogs/PatternFilter.java index f63de998401..16a1d318f94 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/dialogs/PatternFilter.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/dialogs/PatternFilter.java @@ -67,7 +67,8 @@ public class PatternFilter extends ViewerFilter { /* (non-Javadoc) * @see org.eclipse.jface.viewers.ViewerFilter#filter(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object[]) */ - public Object[] filter(Viewer viewer, Object parent, Object[] elements) { + @Override + public Object[] filter(Viewer viewer, Object parent, Object[] elements) { // we don't want to optimize if we've extended the filter ... this // needs to be addressed in 3.4 // https://bugs.eclipse.org/bugs/show_bug.cgi?id=186404 @@ -142,7 +143,8 @@ public class PatternFilter extends ViewerFilter { /* (non-Javadoc) * @see org.eclipse.jface.viewers.ViewerFilter#select(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object) */ - public final boolean select(Viewer viewer, Object parentElement, + @Override + public final boolean select(Viewer viewer, Object parentElement, Object element) { return isElementVisible(viewer, element); } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/dialogs/PreferenceLinkArea.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/dialogs/PreferenceLinkArea.java index aa504afcac8..873e40fb061 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/dialogs/PreferenceLinkArea.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/dialogs/PreferenceLinkArea.java @@ -74,7 +74,8 @@ public class PreferenceLinkArea extends Object { * * @see org.eclipse.swt.events.SelectionListener#widgetSelected(org.eclipse.swt.events.SelectionEvent) */ - public void widgetSelected(SelectionEvent e) { + @Override + public void widgetSelected(SelectionEvent e) { pageContainer.openPage(pageId, pageData); } }); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/dialogs/PropertyDialogAction.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/dialogs/PropertyDialogAction.java index 3260e9ff9dd..cc3c28db39f 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/dialogs/PropertyDialogAction.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/dialogs/PropertyDialogAction.java @@ -70,6 +70,7 @@ public class PropertyDialogAction extends SelectionProviderAction { * describe * @deprecated use PropertyDialogAction(IShellProvider, ISelectionProvider) */ + @Deprecated public PropertyDialogAction(Shell shell, ISelectionProvider provider) { this(new SameShellProvider(shell), provider); } @@ -151,6 +152,7 @@ public class PropertyDialogAction extends SelectionProviderAction { /* (non-Javadoc) * @see org.eclipse.jface.action.IAction#run() */ + @Override public void run() { PreferenceDialog dialog = createDialog(); @@ -179,6 +181,7 @@ public class PropertyDialogAction extends SelectionProviderAction { /* (non-Javadoc) * @see org.eclipse.ui.actions.SelectionProviderAction#selectionChanged(org.eclipse.jface.viewers.IStructuredSelection) */ + @Override public void selectionChanged(IStructuredSelection selection) { setEnabled(!selection.isEmpty()); } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/dialogs/PropertyPage.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/dialogs/PropertyPage.java index 65926305ba8..c50537debab 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/dialogs/PropertyPage.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/dialogs/PropertyPage.java @@ -60,7 +60,8 @@ public abstract class PropertyPage extends PreferencePage implements IWorkbenchP * (non-Javadoc) * @see org.eclipse.ui.IWorkbenchPropertyPage#getElement() */ - public IAdaptable getElement() { + @Override + public IAdaptable getElement() { return element; } @@ -70,7 +71,8 @@ public abstract class PropertyPage extends PreferencePage implements IWorkbenchP * @param element * the element */ - public void setElement(IAdaptable element) { + @Override + public void setElement(IAdaptable element) { this.element = element; } } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/dialogs/SelectionDialog.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/dialogs/SelectionDialog.java index 47c00dc7cca..590d35571d0 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/dialogs/SelectionDialog.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/dialogs/SelectionDialog.java @@ -70,6 +70,7 @@ public abstract class SelectionDialog extends TrayDialog { /* * (non-Javadoc) Method declared in Window. */ + @Override protected void configureShell(Shell shell) { super.configureShell(shell); if (title != null) { @@ -80,6 +81,7 @@ public abstract class SelectionDialog extends TrayDialog { /* * (non-Javadoc) Method declared on Dialog. */ + @Override protected void createButtonsForButtonBar(Composite parent) { createButton(parent, IDialogConstants.OK_ID, IDialogConstants.OK_LABEL, true); @@ -113,6 +115,7 @@ public abstract class SelectionDialog extends TrayDialog { * @deprecated use getInitialElementSelections() instead * @return the list of initial selected elements or null */ + @Deprecated protected List getInitialSelections() { if (initialSelections.isEmpty()) { return null; @@ -276,6 +279,7 @@ public abstract class SelectionDialog extends TrayDialog { * @see Dialog#getDialogBoundsStrategy() * @see #setDialogBoundsSettings(IDialogSettings, int) */ + @Override protected IDialogSettings getDialogBoundsSettings() { return dialogBoundsSettings; } @@ -294,6 +298,7 @@ public abstract class SelectionDialog extends TrayDialog { * @see Dialog#getDialogBoundsSettings() * @see #setDialogBoundsSettings(IDialogSettings, int) */ + @Override protected int getDialogBoundsStrategy() { return dialogBoundsStrategy; } @@ -301,7 +306,8 @@ public abstract class SelectionDialog extends TrayDialog { /** * @since 3.4 */ - protected boolean isResizable() { + @Override + protected boolean isResizable() { return true; } } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/dialogs/SelectionStatusDialog.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/dialogs/SelectionStatusDialog.java index fd9b5e63fc9..c258a95c78f 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/dialogs/SelectionStatusDialog.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/dialogs/SelectionStatusDialog.java @@ -106,7 +106,8 @@ public abstract class SelectionStatusDialog extends SelectionDialog { /* * @see Window#configureShell(shell) */ - protected void configureShell(Shell shell) { + @Override + protected void configureShell(Shell shell) { super.configureShell(shell); if (fImage != null) { shell.setImage(fImage); @@ -141,7 +142,8 @@ public abstract class SelectionStatusDialog extends SelectionDialog { /* * @see Dialog#okPressed() */ - protected void okPressed() { + @Override + protected void okPressed() { computeResult(); super.okPressed(); } @@ -149,7 +151,8 @@ public abstract class SelectionStatusDialog extends SelectionDialog { /* * @see Window#create() */ - public void create() { + @Override + public void create() { super.create(); if (fLastStatus != null) { updateStatus(fLastStatus); @@ -159,7 +162,8 @@ public abstract class SelectionStatusDialog extends SelectionDialog { /* * @see Dialog#createButtonBar(Composite) */ - protected Control createButtonBar(Composite parent) { + @Override + protected Control createButtonBar(Composite parent) { Font font = parent.getFont(); Composite composite = new Composite(parent, SWT.NULL); GridLayout layout = new GridLayout(); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/dialogs/TwoArrayQuickSorter.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/dialogs/TwoArrayQuickSorter.java index c9507b98133..a429d5d100f 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/dialogs/TwoArrayQuickSorter.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/dialogs/TwoArrayQuickSorter.java @@ -34,7 +34,8 @@ import org.eclipse.core.runtime.Assert; fIgnoreCase = ignoreCase; } - public int compare(Object left, Object right) { + @Override + public int compare(Object left, Object right) { return fIgnoreCase ? ((String) left) .compareToIgnoreCase((String) right) : ((String) left) .compareTo((String) right); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/dialogs/TwoPaneElementSelector.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/dialogs/TwoPaneElementSelector.java index 07b48986add..6d518b5a0c7 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/dialogs/TwoPaneElementSelector.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/dialogs/TwoPaneElementSelector.java @@ -130,7 +130,8 @@ public class TwoPaneElementSelector extends AbstractElementListSelectionDialog { /* * @see Dialog#createDialogArea(Composite) */ - public Control createDialogArea(Composite parent) { + @Override + public Control createDialogArea(Composite parent) { Composite contents = (Composite) super.createDialogArea(parent); createMessageArea(contents); createFilterText(contents); @@ -178,17 +179,20 @@ public class TwoPaneElementSelector extends AbstractElementListSelectionDialog { protected Table createLowerList(Composite parent) { Table list = new Table(parent, SWT.BORDER | SWT.V_SCROLL | SWT.H_SCROLL); list.addListener(SWT.Selection, new Listener() { - public void handleEvent(Event evt) { + @Override + public void handleEvent(Event evt) { handleLowerSelectionChanged(); } }); list.addListener(SWT.MouseDoubleClick, new Listener() { - public void handleEvent(Event evt) { + @Override + public void handleEvent(Event evt) { handleDefaultSelected(); } }); list.addDisposeListener(new DisposeListener() { - public void widgetDisposed(DisposeEvent e) { + @Override + public void widgetDisposed(DisposeEvent e) { fQualifierRenderer.dispose(); } }); @@ -208,7 +212,8 @@ public class TwoPaneElementSelector extends AbstractElementListSelectionDialog { /** * @see SelectionStatusDialog#computeResult() */ - protected void computeResult() { + @Override + protected void computeResult() { Object[] results = new Object[] { getLowerSelectedElement() }; setResult(Arrays.asList(results)); } @@ -216,7 +221,8 @@ public class TwoPaneElementSelector extends AbstractElementListSelectionDialog { /** * @see AbstractElementListSelectionDialog#handleDefaultSelected() */ - protected void handleDefaultSelected() { + @Override + protected void handleDefaultSelected() { if (validateCurrentSelection() && (getLowerSelectedElement() != null)) { buttonPressed(IDialogConstants.OK_ID); } @@ -225,7 +231,8 @@ public class TwoPaneElementSelector extends AbstractElementListSelectionDialog { /** * @see AbstractElementListSelectionDialog#handleSelectionChanged() */ - protected void handleSelectionChanged() { + @Override + protected void handleSelectionChanged() { handleUpperSelectionChanged(); } @@ -328,7 +335,8 @@ public class TwoPaneElementSelector extends AbstractElementListSelectionDialog { /* * @see AbstractElementListSelectionDialog#handleEmptyList() */ - protected void handleEmptyList() { + @Override + protected void handleEmptyList() { super.handleEmptyList(); fLowerList.setEnabled(false); } @@ -337,7 +345,8 @@ public class TwoPaneElementSelector extends AbstractElementListSelectionDialog { * @see AbstractElementListSelectionDialog#validateCurrentSelection() * @since 3.5 */ - protected boolean validateCurrentSelection() { + @Override + protected boolean validateCurrentSelection() { ISelectionStatusValidator validator = getValidator(); Object lowerSelection = getLowerSelectedElement(); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/dialogs/TypeFilteringDialog.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/dialogs/TypeFilteringDialog.java index dcadcfc9edc..72bdc85c98f 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/dialogs/TypeFilteringDialog.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/dialogs/TypeFilteringDialog.java @@ -119,7 +119,8 @@ public class TypeFilteringDialog extends SelectionDialog { Button selectButton = createButton(buttonComposite, IDialogConstants.SELECT_ALL_ID, WorkbenchMessages.WizardTransferPage_selectAll, false); SelectionListener listener = new SelectionAdapter() { - public void widgetSelected(SelectionEvent e) { + @Override + public void widgetSelected(SelectionEvent e) { listViewer.setAllChecked(true); } }; @@ -127,7 +128,8 @@ public class TypeFilteringDialog extends SelectionDialog { Button deselectButton = createButton(buttonComposite, IDialogConstants.DESELECT_ALL_ID, WorkbenchMessages.WizardTransferPage_deselectAll, false); listener = new SelectionAdapter() { - public void widgetSelected(SelectionEvent e) { + @Override + public void widgetSelected(SelectionEvent e) { listViewer.setAllChecked(false); } }; @@ -198,7 +200,8 @@ public class TypeFilteringDialog extends SelectionDialog { * (non-Javadoc) * @see org.eclipse.jface.window.Window#configureShell(org.eclipse.swt.widgets.Shell) */ - protected void configureShell(Shell shell) { + @Override + protected void configureShell(Shell shell) { super.configureShell(shell); PlatformUI.getWorkbench().getHelpSystem().setHelp(shell, IWorkbenchHelpContextIds.TYPE_FILTERING_DIALOG); @@ -208,7 +211,8 @@ public class TypeFilteringDialog extends SelectionDialog { * (non-Javadoc) * @see org.eclipse.jface.dialogs.Dialog#createDialogArea(org.eclipse.swt.widgets.Composite) */ - protected Control createDialogArea(Composite parent) { + @Override + protected Control createDialogArea(Composite parent) { // page group Composite composite = (Composite) super.createDialogArea(parent); createMessageArea(composite); @@ -290,7 +294,8 @@ public class TypeFilteringDialog extends SelectionDialog { * <code>Dialog</code> method builds a list of the selected elements for * later retrieval by the client and closes this dialog. */ - protected void okPressed() { + @Override + protected void okPressed() { // Get the input children. IFileEditorMapping[] children = getInput(); List list = new ArrayList(); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/dialogs/WorkingSetConfigurationBlock.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/dialogs/WorkingSetConfigurationBlock.java index 555bcae33c1..bcad0798575 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/dialogs/WorkingSetConfigurationBlock.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/dialogs/WorkingSetConfigurationBlock.java @@ -171,6 +171,7 @@ public class WorkingSetConfigurationBlock { * {@link #setWorkingSets(IWorkingSet[])} and {@link #findApplicableWorkingSets(IStructuredSelection)} * instead. */ + @Deprecated public void setSelection(IStructuredSelection selection) { selectedWorkingSets = findApplicableWorkingSets(selection); @@ -292,6 +293,7 @@ public class WorkingSetConfigurationBlock { setButtonLayoutData(selectButton); selectButton.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { SimpleWorkingSetSelectionDialog dialog = new SimpleWorkingSetSelectionDialog( parent.getShell(), workingSetTypeIds, @@ -314,6 +316,7 @@ public class WorkingSetConfigurationBlock { }); enableButton.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { updateEnableState(enableButton.getSelection()); } @@ -321,6 +324,7 @@ public class WorkingSetConfigurationBlock { updateEnableState(enableButton.getSelection()); workingSetCombo.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { updateSelectedWorkingSets(); } @@ -375,6 +379,7 @@ public class WorkingSetConfigurationBlock { String[] history = (String[]) selectionHistory .toArray(new String[selectionHistory.size()]); Arrays.sort(history, new Comparator() { + @Override public int compare(Object o1, Object o2) { return Collator.getInstance().compare(o1, o2); } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/dialogs/YesNoCancelListSelectionDialog.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/dialogs/YesNoCancelListSelectionDialog.java index 26eae61fccc..025c62bd44f 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/dialogs/YesNoCancelListSelectionDialog.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/dialogs/YesNoCancelListSelectionDialog.java @@ -24,6 +24,7 @@ import org.eclipse.ui.internal.IWorkbenchHelpContextIds; * to subclass the regular ListSelectionDialog, which uses * OK/Cancel, and provide a separate checkbox if necessary. */ +@Deprecated public class YesNoCancelListSelectionDialog extends ListSelectionDialog { /** * @@ -36,7 +37,8 @@ public class YesNoCancelListSelectionDialog extends ListSelectionDialog { * @param message * @deprecated see class comment */ - public YesNoCancelListSelectionDialog( + @Deprecated + public YesNoCancelListSelectionDialog( org.eclipse.swt.widgets.Shell parentShell, Object input, org.eclipse.jface.viewers.IStructuredContentProvider contentProvider, @@ -48,7 +50,8 @@ public class YesNoCancelListSelectionDialog extends ListSelectionDialog { /* * (non-Javadoc) Method declared on Dialog. */ - protected void buttonPressed(int buttonId) { + @Override + protected void buttonPressed(int buttonId) { switch (buttonId) { case IDialogConstants.YES_ID: { yesPressed(); @@ -68,7 +71,8 @@ public class YesNoCancelListSelectionDialog extends ListSelectionDialog { /* * (non-Javadoc) Method declared in Window. */ - protected void configureShell(Shell shell) { + @Override + protected void configureShell(Shell shell) { super.configureShell(shell); PlatformUI.getWorkbench().getHelpSystem().setHelp(shell, IWorkbenchHelpContextIds.YES_NO_CANCEL_LIST_SELECTION_DIALOG); @@ -77,7 +81,8 @@ public class YesNoCancelListSelectionDialog extends ListSelectionDialog { /* * (non-Javadoc) Method declared on Dialog. */ - protected void createButtonsForButtonBar(Composite parent) { + @Override + protected void createButtonsForButtonBar(Composite parent) { createButton(parent, IDialogConstants.YES_ID, IDialogConstants.YES_LABEL, true); createButton(parent, IDialogConstants.NO_ID, IDialogConstants.NO_LABEL, diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/fieldassist/ContentAssistCommandAdapter.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/fieldassist/ContentAssistCommandAdapter.java index 32805cf6c05..5e9e51bc591 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/fieldassist/ContentAssistCommandAdapter.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/fieldassist/ContentAssistCommandAdapter.java @@ -60,6 +60,7 @@ public class ContentAssistCommandAdapter extends ContentProposalAdapter { * * @deprecated As of 3.5, replaced by {@link IWorkbenchCommandConstants#EDIT_CONTENT_ASSIST} */ + @Deprecated public static final String CONTENT_PROPOSAL_COMMAND= IWorkbenchCommandConstants.EDIT_CONTENT_ASSIST; // Default autoactivation delay in milliseconds @@ -72,6 +73,7 @@ public class ContentAssistCommandAdapter extends ContentProposalAdapter { private IHandlerActivation activeHandler; private IHandler proposalHandler = new AbstractHandler() { + @Override public Object execute(ExecutionEvent event) { openProposalPopup(); return null; @@ -197,10 +199,12 @@ public class ContentAssistCommandAdapter extends ContentProposalAdapter { */ private void addListeners(Control control) { control.addFocusListener(new FocusListener() { + @Override public void focusLost(FocusEvent e) { deactivateHandler(); } + @Override public void focusGained(FocusEvent e) { if (isEnabled()) { activateHandler(); @@ -210,6 +214,7 @@ public class ContentAssistCommandAdapter extends ContentProposalAdapter { } }); control.addDisposeListener(new DisposeListener() { + @Override public void widgetDisposed(DisposeEvent e) { deactivateHandler(); } @@ -274,6 +279,7 @@ public class ContentAssistCommandAdapter extends ContentProposalAdapter { * @see org.eclipse.jface.fieldassist.ContentProposalAdapter#setEnabled(boolean) * @since 3.3 */ + @Override public void setEnabled(boolean enabled) { super.setEnabled(enabled); if (decoration != null) { diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/fieldassist/ContentAssistField.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/fieldassist/ContentAssistField.java index 9ea4c4e96e1..e08c409cd4c 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/fieldassist/ContentAssistField.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/fieldassist/ContentAssistField.java @@ -37,6 +37,7 @@ import org.eclipse.ui.keys.IBindingService; * {@link org.eclipse.jface.fieldassist.ControlDecoration} and * {@link ContentAssistCommandAdapter} instead of this class. */ +@Deprecated public class ContentAssistField extends DecoratedField { private ContentAssistCommandAdapter adapter; diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/handlers/CollapseAllHandler.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/handlers/CollapseAllHandler.java index 1aa894519d3..8819782bc25 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/handlers/CollapseAllHandler.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/handlers/CollapseAllHandler.java @@ -66,6 +66,7 @@ public class CollapseAllHandler extends AbstractHandler { * * @see org.eclipse.core.commands.IHandler#execute(org.eclipse.core.commands.ExecutionEvent) */ + @Override public Object execute(ExecutionEvent event) { treeViewer.collapseAll(); return null; @@ -76,6 +77,7 @@ public class CollapseAllHandler extends AbstractHandler { * * @see org.eclipse.core.commands.AbstractHandler#dispose() */ + @Override public void dispose() { treeViewer = null; } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/handlers/ExpandAllHandler.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/handlers/ExpandAllHandler.java index 7d9b29a45db..26af88059fe 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/handlers/ExpandAllHandler.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/handlers/ExpandAllHandler.java @@ -64,6 +64,7 @@ public class ExpandAllHandler extends AbstractHandler { * * @see org.eclipse.core.commands.IHandler#execute(org.eclipse.core.commands.ExecutionEvent) */ + @Override public Object execute(ExecutionEvent event) { treeViewer.expandAll(); return null; @@ -74,6 +75,7 @@ public class ExpandAllHandler extends AbstractHandler { * * @see org.eclipse.core.commands.AbstractHandler#dispose() */ + @Override public void dispose() { treeViewer = null; } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/handlers/IHandlerActivation.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/handlers/IHandlerActivation.java index 4f34642803a..6a9abfbd7bb 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/handlers/IHandlerActivation.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/handlers/IHandlerActivation.java @@ -47,6 +47,7 @@ public interface IHandlerActivation extends IEvaluationResultCache, Comparable { * * @deprecated Use {@link IEvaluationResultCache#clearResult()} instead. */ + @Deprecated public void clearActive(); /** @@ -98,5 +99,6 @@ public interface IHandlerActivation extends IEvaluationResultCache, Comparable { * {@link IEvaluationResultCache#evaluate(IEvaluationContext)} * instead. */ + @Deprecated public boolean isActive(IEvaluationContext context); } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/handlers/IHandlerService.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/handlers/IHandlerService.java index 7628fe088df..cb950eb46ae 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/handlers/IHandlerService.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/handlers/IHandlerService.java @@ -205,6 +205,7 @@ public interface IHandlerService extends IServiceWithSources { * {@link IHandlerService#activateHandler(String, IHandler, Expression)} * instead. */ + @Deprecated public IHandlerActivation activateHandler(String commandId, IHandler handler, Expression expression, int sourcePriorities); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/handlers/RadioState.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/handlers/RadioState.java index 58b229bd92a..b8870c2b850 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/handlers/RadioState.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/handlers/RadioState.java @@ -56,6 +56,7 @@ public final class RadioState extends PersistentState implements setShouldPersist(true); } + @Override public void setInitializationData(IConfigurationElement config, String propertyName, Object data) { @@ -85,6 +86,7 @@ public final class RadioState extends PersistentState implements * org.eclipse.jface.commands.PersistentState#load(org.eclipse.jface.preference * .IPreferenceStore, java.lang.String) */ + @Override public void load(IPreferenceStore store, String preferenceKey) { if (!shouldPersist()) return; @@ -100,6 +102,7 @@ public final class RadioState extends PersistentState implements * org.eclipse.jface.commands.PersistentState#save(org.eclipse.jface.preference * .IPreferenceStore, java.lang.String) */ + @Override public void save(IPreferenceStore store, String preferenceKey) { if (!shouldPersist()) return; @@ -114,6 +117,7 @@ public final class RadioState extends PersistentState implements * * @see org.eclipse.core.commands.State#setValue(java.lang.Object) */ + @Override public void setValue(Object value) { if (!(value instanceof String)) return; // we set only String values diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/handlers/RegistryRadioState.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/handlers/RegistryRadioState.java index 3d81b9a104d..f2749078d6c 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/handlers/RegistryRadioState.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/handlers/RegistryRadioState.java @@ -75,6 +75,7 @@ public final class RegistryRadioState extends RadioState implements setShouldPersist(true); } + @Override public final void setInitializationData( final IConfigurationElement configurationElement, final String propertyName, final Object data) { diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/handlers/RegistryToggleState.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/handlers/RegistryToggleState.java index 063d5b2646a..0b7aff0f264 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/handlers/RegistryToggleState.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/handlers/RegistryToggleState.java @@ -78,6 +78,7 @@ public final class RegistryToggleState extends ToggleState implements } } + @Override public final void setInitializationData( final IConfigurationElement configurationElement, final String propertyName, final Object data) { diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/handlers/ShowPerspectiveHandler.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/handlers/ShowPerspectiveHandler.java index a71aebff5ac..8c0cc223aef 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/handlers/ShowPerspectiveHandler.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/handlers/ShowPerspectiveHandler.java @@ -41,6 +41,7 @@ import org.eclipse.ui.internal.dialogs.SelectPerspectiveDialog; public final class ShowPerspectiveHandler extends AbstractHandler { + @Override public final Object execute(final ExecutionEvent event) throws ExecutionException { IWorkbenchWindow window = HandlerUtil diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/handlers/ShowViewHandler.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/handlers/ShowViewHandler.java index 6fa20055be9..cbf95d12727 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/handlers/ShowViewHandler.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/handlers/ShowViewHandler.java @@ -53,6 +53,7 @@ public final class ShowViewHandler extends AbstractHandler { } + @Override public final Object execute(final ExecutionEvent event) throws ExecutionException { IWorkbenchWindow window = HandlerUtil diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/help/DialogPageContextComputer.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/help/DialogPageContextComputer.java index e59fdfe718b..513ba25f7a6 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/help/DialogPageContextComputer.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/help/DialogPageContextComputer.java @@ -26,6 +26,7 @@ import org.eclipse.swt.widgets.Control; * @deprecated nested contexts are no longer supported by the help support system * @noextend This class is not intended to be subclassed by clients. */ +@Deprecated public class DialogPageContextComputer implements IContextComputer { private IDialogPage page; @@ -98,7 +99,8 @@ public class DialogPageContextComputer implements IContextComputer { /* (non-Javadoc) * Method declared on IContextComputer. */ - public Object[] computeContexts(HelpEvent event) { + @Override + public Object[] computeContexts(HelpEvent event) { contextList = new ArrayList(); // Add the local context @@ -117,7 +119,8 @@ public class DialogPageContextComputer implements IContextComputer { /* (non-Javadoc) * Method declared on IContextComputer. */ - public Object[] getLocalContexts(HelpEvent event) { + @Override + public Object[] getLocalContexts(HelpEvent event) { return new Object[] { context }; } } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/help/IContextComputer.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/help/IContextComputer.java index 49c793843bc..32f16559945 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/help/IContextComputer.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/help/IContextComputer.java @@ -21,6 +21,7 @@ import org.eclipse.swt.events.HelpEvent; * @deprecated nested contexts are no longer supported by the help support system * */ +@Deprecated public interface IContextComputer { /** * Computes contexts for the help system. diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/help/ViewContextComputer.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/help/ViewContextComputer.java index c22e7dc9dc8..8c008b75fdc 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/help/ViewContextComputer.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/help/ViewContextComputer.java @@ -26,6 +26,7 @@ import org.eclipse.ui.IViewPart; * @deprecated nested contexts are no longer supported by the help support system * @noextend This class is not intended to be subclassed by clients. */ +@Deprecated public class ViewContextComputer implements IContextComputer { private IViewPart view; @@ -98,7 +99,8 @@ public class ViewContextComputer implements IContextComputer { /* (non-Javadoc) * Method declared on IContextComputer. */ - public Object[] computeContexts(HelpEvent event) { + @Override + public Object[] computeContexts(HelpEvent event) { contextList = new ArrayList(); // Add the local context @@ -114,7 +116,8 @@ public class ViewContextComputer implements IContextComputer { /* (non-Javadoc) * Method declared on IContextComputer. */ - public Object[] getLocalContexts(HelpEvent event) { + @Override + public Object[] getLocalContexts(HelpEvent event) { return new Object[] { context }; } } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/help/WorkbenchHelp.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/help/WorkbenchHelp.java index 0f1d4d429f1..a30c367d4e1 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/help/WorkbenchHelp.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/help/WorkbenchHelp.java @@ -53,6 +53,7 @@ import org.eclipse.ui.internal.help.WorkbenchHelpSystem; * @noinstantiate This class is not intended to be instantiated by clients. * @noextend This class is not intended to be subclassed by clients. */ +@Deprecated public class WorkbenchHelp { /** @@ -172,7 +173,8 @@ public class WorkbenchHelp { * <code>null</code> if no contexts have been set. * @deprecated as context computers are no longer supported */ - public static Object getHelp(Control control) { + @Deprecated + public static Object getHelp(Control control) { return control.getData(WorkbenchHelpSystem.HELP_KEY); } @@ -190,7 +192,8 @@ public class WorkbenchHelp { * <code>null</code> if no contexts have been set. * @deprecated as context computers are no longer supported */ - public static Object getHelp(Menu menu) { + @Deprecated + public static Object getHelp(Menu menu) { return menu.getData(WorkbenchHelpSystem.HELP_KEY); } @@ -208,7 +211,8 @@ public class WorkbenchHelp { * <code>null</code> if no contexts have been set. * @deprecated as context computers are no longer supported */ - public static Object getHelp(MenuItem menuItem) { + @Deprecated + public static Object getHelp(MenuItem menuItem) { return menuItem.getData(WorkbenchHelpSystem.HELP_KEY); } @@ -220,7 +224,8 @@ public class WorkbenchHelp { * {@link org.eclipse.help.HelpSystem HelpSystem} instead of the IHelp methods * on the object returned by this method. */ - public static IHelp getHelpSupport() { + @Deprecated + public static IHelp getHelpSupport() { return WorkbenchHelpSystem.getInstance().getHelpSupport(); } @@ -251,7 +256,8 @@ public class WorkbenchHelp { * <code>IContext</code>) * @deprecated use setHelp with a single context id parameter */ - public static void setHelp(IAction action, final Object[] contexts) { + @Deprecated + public static void setHelp(IAction action, final Object[] contexts) { WorkbenchHelpSystem.getInstance().setHelp(action, contexts); } @@ -269,7 +275,8 @@ public class WorkbenchHelp { * @deprecated context computers are no longer supported, clients should implement * their own help listener */ - public static void setHelp(IAction action, final IContextComputer computer) { + @Deprecated + public static void setHelp(IAction action, final IContextComputer computer) { WorkbenchHelpSystem.getInstance().setHelp(action, computer); } @@ -287,7 +294,8 @@ public class WorkbenchHelp { * <code>IContext</code>) * @deprecated use setHelp with single context id parameter */ - public static void setHelp(Control control, Object[] contexts) { + @Deprecated + public static void setHelp(Control control, Object[] contexts) { WorkbenchHelpSystem.getInstance().setHelp(control, contexts); } @@ -305,7 +313,8 @@ public class WorkbenchHelp { * @deprecated context computers are no longer supported, clients should implement * their own help listener */ - public static void setHelp(Control control, IContextComputer computer) { + @Deprecated + public static void setHelp(Control control, IContextComputer computer) { WorkbenchHelpSystem.getInstance().setHelp(control, computer); } @@ -323,7 +332,8 @@ public class WorkbenchHelp { * <code>IContext</code>) * @deprecated use setHelp with single context id parameter */ - public static void setHelp(Menu menu, Object[] contexts) { + @Deprecated + public static void setHelp(Menu menu, Object[] contexts) { WorkbenchHelpSystem.getInstance().setHelp(menu, contexts); } @@ -341,7 +351,8 @@ public class WorkbenchHelp { * @deprecated context computers are no longer supported, clients should implement * their own help listener */ - public static void setHelp(Menu menu, IContextComputer computer) { + @Deprecated + public static void setHelp(Menu menu, IContextComputer computer) { WorkbenchHelpSystem.getInstance().setHelp(menu, computer); } @@ -359,7 +370,8 @@ public class WorkbenchHelp { * <code>IContext</code>) * @deprecated use setHelp with single context id parameter */ - public static void setHelp(MenuItem item, Object[] contexts) { + @Deprecated + public static void setHelp(MenuItem item, Object[] contexts) { WorkbenchHelpSystem.getInstance().setHelp(item, contexts); } @@ -377,7 +389,8 @@ public class WorkbenchHelp { * @deprecated context computers are no longer supported, clients should implement * their own help listener */ - public static void setHelp(MenuItem item, IContextComputer computer) { + @Deprecated + public static void setHelp(MenuItem item, IContextComputer computer) { WorkbenchHelpSystem.getInstance().setHelp(item, computer); } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/AbstractEnabledHandler.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/AbstractEnabledHandler.java index 3597734c870..c59963c3940 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/AbstractEnabledHandler.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/AbstractEnabledHandler.java @@ -29,6 +29,7 @@ public abstract class AbstractEnabledHandler extends AbstractHandler { * * @see org.eclipse.core.commands.AbstractHandler#isEnabled() */ + @Override public boolean isEnabled() { return enabled; } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/AbstractEvaluationHandler.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/AbstractEvaluationHandler.java index 4b6fcbeec1a..2f113130ea9 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/AbstractEvaluationHandler.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/AbstractEvaluationHandler.java @@ -52,6 +52,7 @@ public abstract class AbstractEvaluationHandler extends AbstractEnabledHandler { private IPropertyChangeListener getEnablementListener() { if (enablementListener == null) { enablementListener = new IPropertyChangeListener() { + @Override public void propertyChange(PropertyChangeEvent event) { if (event.getProperty() == PROP_ENABLED) { if (event.getNewValue() instanceof Boolean) { @@ -72,6 +73,7 @@ public abstract class AbstractEvaluationHandler extends AbstractEnabledHandler { * * @see org.eclipse.core.commands.AbstractHandler#dispose() */ + @Override public void dispose() { if (enablementRef != null) { evaluationService.removeEvaluationListener(enablementRef); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/AbstractPartSelectionTracker.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/AbstractPartSelectionTracker.java index f0dd61fee42..154a7e9ddad 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/AbstractPartSelectionTracker.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/AbstractPartSelectionTracker.java @@ -115,7 +115,8 @@ public abstract class AbstractPartSelectionTracker { if ((part != null && sel != null) || l instanceof INullSelectionListener) { Platform.run(new SafeRunnable() { - public void run() { + @Override + public void run() { l.selectionChanged(part, sel); } }); @@ -138,7 +139,8 @@ public abstract class AbstractPartSelectionTracker { if ((part != null && sel != null) || l instanceof INullSelectionListener) { Platform.run(new SafeRunnable() { - public void run() { + @Override + public void run() { l.selectionChanged(part, sel); } }); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/AbstractSelectionService.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/AbstractSelectionService.java index 590614482b8..d8ed9b6b9fb 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/AbstractSelectionService.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/AbstractSelectionService.java @@ -58,7 +58,8 @@ public abstract class AbstractSelectionService implements ISelectionService { * The JFace selection listener to hook on the active part's selection provider. */ private ISelectionChangedListener selListener = new ISelectionChangedListener() { - public void selectionChanged(SelectionChangedEvent event) { + @Override + public void selectionChanged(SelectionChangedEvent event) { fireSelection(activePart, event.getSelection()); } }; @@ -67,7 +68,8 @@ public abstract class AbstractSelectionService implements ISelectionService { * The JFace post selection listener to hook on the active part's selection provider. */ private ISelectionChangedListener postSelListener = new ISelectionChangedListener() { - public void selectionChanged(SelectionChangedEvent event) { + @Override + public void selectionChanged(SelectionChangedEvent event) { firePostSelection(activePart, event.getSelection()); } }; @@ -81,28 +83,32 @@ public abstract class AbstractSelectionService implements ISelectionService { /* (non-Javadoc) * Method declared on ISelectionService. */ - public void addSelectionListener(ISelectionListener l) { + @Override + public void addSelectionListener(ISelectionListener l) { listeners.add(l); } /* (non-Javadoc) * Method declared on ISelectionService. */ - public void addSelectionListener(String partId, ISelectionListener listener) { + @Override + public void addSelectionListener(String partId, ISelectionListener listener) { getPerPartTracker(partId).addSelectionListener(listener); } /* (non-Javadoc) * Method declared on ISelectionService. */ - public void addPostSelectionListener(ISelectionListener l) { + @Override + public void addPostSelectionListener(ISelectionListener l) { postListeners.add(l); } /* (non-Javadoc) * Method declared on ISelectionService. */ - public void addPostSelectionListener(String partId, + @Override + public void addPostSelectionListener(String partId, ISelectionListener listener) { getPerPartTracker(partId).addPostSelectionListener(listener); } @@ -110,7 +116,8 @@ public abstract class AbstractSelectionService implements ISelectionService { /* (non-Javadoc) * Method declared on ISelectionService. */ - public void removeSelectionListener(ISelectionListener l) { + @Override + public void removeSelectionListener(ISelectionListener l) { listeners.remove(l); } @@ -118,7 +125,8 @@ public abstract class AbstractSelectionService implements ISelectionService { * (non-Javadoc) * Method declared on ISelectionListener. */ - public void removePostSelectionListener(String partId, + @Override + public void removePostSelectionListener(String partId, ISelectionListener listener) { getPerPartTracker(partId).removePostSelectionListener(listener); } @@ -126,7 +134,8 @@ public abstract class AbstractSelectionService implements ISelectionService { /* (non-Javadoc) * Method declared on ISelectionService. */ - public void removePostSelectionListener(ISelectionListener l) { + @Override + public void removePostSelectionListener(ISelectionListener l) { postListeners.remove(l); } @@ -134,7 +143,8 @@ public abstract class AbstractSelectionService implements ISelectionService { * (non-Javadoc) * Method declared on ISelectionListener. */ - public void removeSelectionListener(String partId, + @Override + public void removeSelectionListener(String partId, ISelectionListener listener) { getPerPartTracker(partId).removeSelectionListener(listener); } @@ -215,7 +225,8 @@ public abstract class AbstractSelectionService implements ISelectionService { /** * Returns the selection. */ - public ISelection getSelection() { + @Override + public ISelection getSelection() { if (activeProvider != null) { return activeProvider.getSelection(); } else { @@ -226,7 +237,8 @@ public abstract class AbstractSelectionService implements ISelectionService { /* * @see ISelectionService#getSelection(String) */ - public ISelection getSelection(String partId) { + @Override + public ISelection getSelection(String partId) { return getPerPartTracker(partId).getSelection(); } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/AbstractWorkingSet.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/AbstractWorkingSet.java index 350e740b6aa..35a2d27003c 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/AbstractWorkingSet.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/AbstractWorkingSet.java @@ -77,6 +77,7 @@ public abstract class AbstractWorkingSet implements IAdaptable, IWorkingSet { * @return the receiver if the requested type is either IWorkingSet * or IPersistableElement. */ + @Override public Object getAdapter(Class adapter) { if (adapter == IWorkingSet.class || adapter == IPersistableElement.class) { @@ -85,10 +86,12 @@ public abstract class AbstractWorkingSet implements IAdaptable, IWorkingSet { return Platform.getAdapterManager().getAdapter(this, adapter); } + @Override public String getName() { return name; } + @Override public void setName(String newName) { Assert.isNotNull(newName, "Working set name must not be null"); //$NON-NLS-1$ if (manager != null) { @@ -148,6 +151,7 @@ public abstract class AbstractWorkingSet implements IAdaptable, IWorkingSet { } } + @Override public IAdaptable[] getElements() { ArrayList list = getElementsArray(); return (IAdaptable[]) list.toArray(new IAdaptable[list.size()]); @@ -173,14 +177,17 @@ public abstract class AbstractWorkingSet implements IAdaptable, IWorkingSet { return manager; } + @Override public String getFactoryId() { return FACTORY_ID; } + @Override public String getLabel() { return label; } + @Override public void setLabel(String label) { this.label = label == null ? getName() : label; labelBoundToName = Util.equals(label, name); // rebind the label to the name @@ -189,6 +196,7 @@ public abstract class AbstractWorkingSet implements IAdaptable, IWorkingSet { IWorkingSetManager.CHANGE_WORKING_SET_LABEL_CHANGE, null); } + @Override public boolean isEmpty() { return getElementsArray().isEmpty(); } @@ -197,7 +205,8 @@ public abstract class AbstractWorkingSet implements IAdaptable, IWorkingSet { * (non-Javadoc) * @see org.eclipse.ui.IWorkingSet#getImage() */ - public final ImageDescriptor getImage() { + @Override + public final ImageDescriptor getImage() { return getImageDescriptor(); } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/AbstractWorkingSetManager.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/AbstractWorkingSetManager.java index fd3d8f2fa72..557f489879e 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/AbstractWorkingSetManager.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/AbstractWorkingSetManager.java @@ -86,6 +86,7 @@ public abstract class AbstractWorkingSetManager extends EventManager implements /* (non-Javadoc) * @see org.eclipse.core.runtime.ISafeRunnable#handleException(java.lang.Throwable) */ + @Override public void handleException(Throwable exception) { StatusManager.getManager().handle( StatusUtil.newStatus(PlatformUI.PLUGIN_ID, exception)); @@ -93,6 +94,7 @@ public abstract class AbstractWorkingSetManager extends EventManager implements } private SortedSet workingSets = new TreeSet(new Comparator() { + @Override public int compare(Object o1, Object o2) { // Cast and compare directly return ((AbstractWorkingSet) o1).getUniqueId().compareTo( @@ -108,24 +110,30 @@ public abstract class AbstractWorkingSetManager extends EventManager implements private Map/*<String, IWorkingSetElementAdapter>*/ elementAdapters = new HashMap(); private static final IWorkingSetUpdater NULL_UPDATER= new IWorkingSetUpdater() { + @Override public void add(IWorkingSet workingSet) { } + @Override public boolean remove(IWorkingSet workingSet) { return true; } + @Override public boolean contains(IWorkingSet workingSet) { return true; } + @Override public void dispose() { } }; private static final IWorkingSetElementAdapter IDENTITY_ADAPTER = new IWorkingSetElementAdapter() { + @Override public IAdaptable[] adaptElements(IWorkingSet ws, IAdaptable[] elements) { return elements; } + @Override public void dispose() { } }; @@ -180,11 +188,13 @@ public abstract class AbstractWorkingSetManager extends EventManager implements IWorkbenchRegistryConstants.PL_WORKINGSETS); } - public void dispose() { + @Override + public void dispose() { bundleContext.removeBundleListener(this); for (final Iterator iter= updaters.values().iterator(); iter.hasNext();) { SafeRunner.run(new WorkingSetRunnable() { + @Override public void run() throws Exception { ((IWorkingSetUpdater) iter.next()).dispose(); } @@ -194,6 +204,7 @@ public abstract class AbstractWorkingSetManager extends EventManager implements for (final Iterator iter= elementAdapters.values().iterator(); iter.hasNext();) { SafeRunner.run(new WorkingSetRunnable() { + @Override public void run() throws Exception { ((IWorkingSetElementAdapter)iter.next()).dispose(); } @@ -206,11 +217,13 @@ public abstract class AbstractWorkingSetManager extends EventManager implements /* (non-Javadoc) * @see org.eclipse.ui.IWorkingSetManager */ - public IWorkingSet createWorkingSet(String name, IAdaptable[] elements) { + @Override + public IWorkingSet createWorkingSet(String name, IAdaptable[] elements) { return new WorkingSet(name, name, elements); } - public IWorkingSet createAggregateWorkingSet(String name, String label, + @Override + public IWorkingSet createAggregateWorkingSet(String name, String label, IWorkingSet[] components) { return new AggregateWorkingSet(name, label, components); } @@ -220,7 +233,8 @@ public abstract class AbstractWorkingSetManager extends EventManager implements * * @see org.eclipse.ui.IWorkingSetManager */ - public IWorkingSet createWorkingSet(IMemento memento) { + @Override + public IWorkingSet createWorkingSet(IMemento memento) { return restoreWorkingSet(memento); } @@ -229,7 +243,8 @@ public abstract class AbstractWorkingSetManager extends EventManager implements /* (non-Javadoc) * @see org.eclipse.ui.IWorkingSetManager */ - public void addWorkingSet(IWorkingSet workingSet) { + @Override + public void addWorkingSet(IWorkingSet workingSet) { IWorkingSet wSet=getWorkingSet(workingSet.getName()); Assert.isTrue(wSet==null,"working set with same name already registered"); //$NON-NLS-1$ internalAddWorkingSet(workingSet); @@ -260,7 +275,8 @@ public abstract class AbstractWorkingSetManager extends EventManager implements /* (non-Javadoc) * @see org.eclipse.ui.IWorkingSetManager */ - public IWorkingSet[] getWorkingSets() { + @Override + public IWorkingSet[] getWorkingSets() { SortedSet visibleSubset = new TreeSet(WorkingSetComparator .getInstance()); for (Iterator i = workingSets.iterator(); i.hasNext();) { @@ -272,6 +288,7 @@ public abstract class AbstractWorkingSetManager extends EventManager implements return (IWorkingSet[]) visibleSubset.toArray(new IWorkingSet[visibleSubset.size()]); } + @Override public IWorkingSet[] getAllWorkingSets() { IWorkingSet[] sets = (IWorkingSet[]) workingSets .toArray(new IWorkingSet[workingSets.size()]); @@ -282,7 +299,8 @@ public abstract class AbstractWorkingSetManager extends EventManager implements /* (non-Javadoc) * @see org.eclipse.ui.IWorkingSetManager */ - public IWorkingSet getWorkingSet(String name) { + @Override + public IWorkingSet getWorkingSet(String name) { if (name == null || workingSets == null) { return null; } @@ -302,7 +320,8 @@ public abstract class AbstractWorkingSetManager extends EventManager implements /* (non-Javadoc) * @see org.eclipse.ui.IWorkingSetManager */ - public IWorkingSet[] getRecentWorkingSets() { + @Override + public IWorkingSet[] getRecentWorkingSets() { return (IWorkingSet[]) recentWorkingSets.toArray(new IWorkingSet[recentWorkingSets.size()]); } @@ -331,7 +350,8 @@ public abstract class AbstractWorkingSetManager extends EventManager implements * @return true=the object equals the receiver, it has the same * working sets. false otherwise */ - public boolean equals(Object object) { + @Override + public boolean equals(Object object) { if (this == object) { return true; } @@ -347,7 +367,8 @@ public abstract class AbstractWorkingSetManager extends EventManager implements * * @return the hash code. */ - public int hashCode() { + @Override + public int hashCode() { return workingSets.hashCode(); } @@ -356,14 +377,16 @@ public abstract class AbstractWorkingSetManager extends EventManager implements /* (non-Javadoc) * @see org.eclipse.ui.IWorkingSetManager */ - public void addPropertyChangeListener(IPropertyChangeListener listener) { + @Override + public void addPropertyChangeListener(IPropertyChangeListener listener) { addListenerObject(listener); } /* (non-Javadoc) * @see org.eclipse.ui.IWorkingSetManager */ - public void removePropertyChangeListener(IPropertyChangeListener listener) { + @Override + public void removePropertyChangeListener(IPropertyChangeListener listener) { removeListenerObject(listener); } @@ -392,15 +415,18 @@ public abstract class AbstractWorkingSetManager extends EventManager implements final PropertyChangeEvent event = new PropertyChangeEvent(this, changeId, oldValue, newValue); Runnable notifier = new Runnable() { + @Override public void run() { for (int i = 0; i < listeners.length; i++) { final IPropertyChangeListener listener = (IPropertyChangeListener) listeners[i]; ISafeRunnable safetyWrapper = new ISafeRunnable() { + @Override public void run() throws Exception { listener.propertyChange(event); } + @Override public void handleException(Throwable exception) { // logged by the runner } @@ -477,6 +503,7 @@ public abstract class AbstractWorkingSetManager extends EventManager implements final IPersistableElement persistable = (IWorkingSet) i.next(); SafeRunner.run(new WorkingSetRunnable() { + @Override public void run() throws Exception { // create a dummy node to write too - the write could fail so we // shouldn't soil the final memento until we're sure it succeeds. @@ -539,6 +566,7 @@ public abstract class AbstractWorkingSetManager extends EventManager implements final IAdaptable[] adaptable = new IAdaptable[1]; SafeRunner.run(new WorkingSetRunnable() { + @Override public void run() throws Exception { adaptable[0] = factory.createElement(memento); } @@ -603,7 +631,8 @@ public abstract class AbstractWorkingSetManager extends EventManager implements * @see org.eclipse.ui.IWorkingSetManager#createWorkingSetEditWizard(org.eclipse.ui.IWorkingSet) * @since 2.1 */ - public IWorkingSetEditWizard createWorkingSetEditWizard( + @Override + public IWorkingSetEditWizard createWorkingSetEditWizard( IWorkingSet workingSet) { String editPageId = workingSet.getId(); WorkingSetRegistry registry = WorkbenchPlugin.getDefault() @@ -632,7 +661,9 @@ public abstract class AbstractWorkingSetManager extends EventManager implements /** * @deprecated use createWorkingSetSelectionDialog(parent, true) instead */ - public IWorkingSetSelectionDialog createWorkingSetSelectionDialog( + @Deprecated + @Override + public IWorkingSetSelectionDialog createWorkingSetSelectionDialog( Shell parent) { return createWorkingSetSelectionDialog(parent, true); } @@ -640,7 +671,8 @@ public abstract class AbstractWorkingSetManager extends EventManager implements /* (non-Javadoc) * @see org.eclipse.ui.IWorkingSetManager */ - public IWorkingSetSelectionDialog createWorkingSetSelectionDialog( + @Override + public IWorkingSetSelectionDialog createWorkingSetSelectionDialog( Shell parent, boolean multi) { return createWorkingSetSelectionDialog(parent, multi, null); } @@ -648,7 +680,8 @@ public abstract class AbstractWorkingSetManager extends EventManager implements /** * {@inheritDoc} */ - public IWorkingSetNewWizard createWorkingSetNewWizard(String[] workingSetIds) { + @Override + public IWorkingSetNewWizard createWorkingSetNewWizard(String[] workingSetIds) { WorkingSetDescriptor[] descriptors= getSupportedEditableDescriptors(workingSetIds); if (descriptors.length == 0) { return null; @@ -658,6 +691,7 @@ public abstract class AbstractWorkingSetManager extends EventManager implements //---- working set delta handling ------------------------------------------------- + @Override public void bundleChanged(BundleEvent event) { String symbolicName = event.getBundle().getSymbolicName(); if (symbolicName == null) @@ -678,6 +712,7 @@ public abstract class AbstractWorkingSetManager extends EventManager implements WorkbenchMessages.AbstractWorkingSetManager_updatersActivating, symbolicName)) { + @Override public IStatus runInUIThread(IProgressMonitor monitor) { synchronized (updaters) { for (int i = 0; i < descriptors.length; i++) { @@ -694,6 +729,7 @@ public abstract class AbstractWorkingSetManager extends EventManager implements .next(); SafeRunner.run(new WorkingSetRunnable() { + @Override public void run() throws Exception { if (!updater.contains(workingSet)) { updater.add(workingSet); @@ -732,6 +768,7 @@ public abstract class AbstractWorkingSetManager extends EventManager implements final IWorkingSetUpdater updater= getUpdater(descriptor); SafeRunner.run(new WorkingSetRunnable() { + @Override public void run() throws Exception { if (!updater.contains(workingSet)) { updater.add(workingSet); @@ -780,6 +817,7 @@ public abstract class AbstractWorkingSetManager extends EventManager implements if (updater != null) { SafeRunner.run(new WorkingSetRunnable() { + @Override public void run() throws Exception { updater.remove(workingSet); }}); @@ -791,7 +829,8 @@ public abstract class AbstractWorkingSetManager extends EventManager implements /* (non-Javadoc) * @see org.eclipse.ui.IWorkingSetManager#createWorkingSetSelectionDialog(org.eclipse.swt.widgets.Shell, boolean, java.lang.String[]) */ - public IWorkingSetSelectionDialog createWorkingSetSelectionDialog(Shell parent, boolean multi, String[] workingsSetIds) { + @Override + public IWorkingSetSelectionDialog createWorkingSetSelectionDialog(Shell parent, boolean multi, String[] workingsSetIds) { return new WorkingSetSelectionDialog(parent, multi, workingsSetIds); } @@ -817,6 +856,7 @@ public abstract class AbstractWorkingSetManager extends EventManager implements /* (non-Javadoc) * @see org.eclipse.core.runtime.dynamichelpers.IExtensionChangeHandler#addExtension(org.eclipse.core.runtime.dynamichelpers.IExtensionTracker, org.eclipse.core.runtime.IExtension) */ + @Override public void addExtension(IExtensionTracker tracker, IExtension extension) { // nothing - this is handled lazily. These items are only created as needed by the getUpdater() and getElementAdapter() methods @@ -825,6 +865,7 @@ public abstract class AbstractWorkingSetManager extends EventManager implements /* (non-Javadoc) * @see org.eclipse.core.runtime.dynamichelpers.IExtensionChangeHandler#removeExtension(org.eclipse.core.runtime.IExtension, java.lang.Object[]) */ + @Override public void removeExtension(IExtension extension, Object[] objects) { for (int i = 0; i < objects.length; i++) { Object object = objects[i]; @@ -848,6 +889,7 @@ public abstract class AbstractWorkingSetManager extends EventManager implements final IWorkingSetElementAdapter elementAdapter) { SafeRunner.run(new WorkingSetRunnable() { + @Override public void run() throws Exception { elementAdapter.dispose(); @@ -867,6 +909,7 @@ public abstract class AbstractWorkingSetManager extends EventManager implements private void removeUpdater(final IWorkingSetUpdater updater) { SafeRunner.run(new WorkingSetRunnable() { + @Override public void run() throws Exception { updater.dispose(); @@ -884,6 +927,7 @@ public abstract class AbstractWorkingSetManager extends EventManager implements * @see org.eclipse.ui.IWorkingSetManager#addToWorkingSets(org.eclipse.core.runtime.IAdaptable, * org.eclipse.ui.IWorkingSet[]) */ + @Override public void addToWorkingSets(final IAdaptable element, IWorkingSet[] workingSets) { // ideally this method would be in a static util class of some kind but // we dont have any such beast for working sets and making one for one @@ -892,6 +936,7 @@ public abstract class AbstractWorkingSetManager extends EventManager implements final IWorkingSet workingSet = workingSets[i]; SafeRunner.run(new WorkingSetRunnable() { + @Override public void run() throws Exception { IAdaptable[] adaptedNewElements = workingSet .adaptElements(new IAdaptable[] { element }); @@ -907,6 +952,7 @@ public abstract class AbstractWorkingSetManager extends EventManager implements } } + @Override public void setRecentWorkingSetsLength(int length) { if (length < 1 || length > 99) throw new IllegalArgumentException("Invalid recent working sets length: " + length); //$NON-NLS-1$ @@ -924,6 +970,7 @@ public abstract class AbstractWorkingSetManager extends EventManager implements } } + @Override public int getRecentWorkingSetsLength() { IPreferenceStore store = PrefUtil.getAPIPreferenceStore(); return store.getInt(IWorkbenchPreferenceConstants.RECENTLY_USED_WORKINGSETS_SIZE); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ActionDescriptor.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ActionDescriptor.java index 4911904c324..69a4881ec67 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ActionDescriptor.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ActionDescriptor.java @@ -337,7 +337,8 @@ public class ActionDescriptor implements IPluginContribution { /** * For debugging only. */ - public String toString() { + @Override + public String toString() { return "ActionDescriptor(" + id + ")";//$NON-NLS-2$//$NON-NLS-1$ } @@ -368,14 +369,16 @@ public class ActionDescriptor implements IPluginContribution { /* (non-Javadoc) * @see org.eclipse.ui.IPluginContribution#getLocalId() */ - public String getLocalId() { + @Override + public String getLocalId() { return getId(); } /* (non-Javadoc) * @see org.eclipse.ui.IPluginContribution#getPluginId() */ - public String getPluginId() { + @Override + public String getPluginId() { return pluginId; } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ActionExpression.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ActionExpression.java index ac2e59f5825..3ac66e66dd9 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ActionExpression.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ActionExpression.java @@ -113,6 +113,7 @@ public class ActionExpression { super(element); } + @Override public final boolean equals(final Object object) { if (object instanceof AndExpression) { final AndExpression that = (AndExpression) object; @@ -125,6 +126,7 @@ public class ActionExpression { /* * (non-Javadoc) Method declared on AbstractExpression. */ + @Override public boolean isEnabledFor(Object object) { Iterator iter = list.iterator(); while (iter.hasNext()) { @@ -180,6 +182,7 @@ public class ActionExpression { * * @see org.eclipse.ui.internal.ActionExpression.AbstractExpression#extractObjectClasses() */ + @Override public String[] extractObjectClasses() { Iterator iterator = list.iterator(); List classNames = null; @@ -209,6 +212,7 @@ public class ActionExpression { * * @return The hash code for this object. */ + @Override public final int hashCode() { if (expressionHashCode == HASH_CODE_NOT_COMPUTED) { expressionHashCode = HASH_INITIAL * HASH_FACTOR + Util.hashCode(list); @@ -222,6 +226,7 @@ public class ActionExpression { /* * (non-Javadoc) Method declared on AbstractExpression. */ + @Override public boolean isEnabledForExpression(Object object, String expressionType) { Iterator iterator = list.iterator(); @@ -239,6 +244,7 @@ public class ActionExpression { * * @see org.eclipse.ui.internal.ActionExpression.AbstractExpression#valuesForExpression(java.lang.String) */ + @Override public Collection valuesForExpression(String expressionType) { Iterator iterator = list.iterator(); Collection allValues = null; @@ -278,6 +284,7 @@ public class ActionExpression { /* * (non-Javadoc) Method declared on AbstractExpression. */ + @Override public boolean isEnabledFor(Object object) { return !super.isEnabledFor(object); } @@ -348,6 +355,7 @@ public class ActionExpression { return false; } + @Override public final boolean equals(final Object object) { if (object instanceof ObjectClassExpression) { final ObjectClassExpression that = (ObjectClassExpression) object; @@ -363,6 +371,7 @@ public class ActionExpression { * * @see org.eclipse.ui.internal.ActionExpression.AbstractExpression#extractObjectClasses() */ + @Override public String[] extractObjectClasses() { extracted = true; return new String[] { className }; @@ -373,6 +382,7 @@ public class ActionExpression { * * @return The hash code for this object. */ + @Override public final int hashCode() { if (expressionHashCode == HASH_CODE_NOT_COMPUTED) { expressionHashCode = HASH_INITIAL * HASH_FACTOR @@ -388,6 +398,7 @@ public class ActionExpression { /* * (non-Javadoc) Method declared on AbstractExpression. */ + @Override public boolean isEnabledFor(Object object) { if (object == null) { return false; @@ -421,6 +432,7 @@ public class ActionExpression { /* * (non-Javadoc) Method declared on AbstractExpression. */ + @Override public boolean isEnabledForExpression(Object object, String expressionType) { if (expressionType.equals(EXP_TYPE_OBJECT_CLASS)) { @@ -457,6 +469,7 @@ public class ActionExpression { } } + @Override public final boolean equals(final Object object) { if (object instanceof ObjectStateExpression) { final ObjectStateExpression that = (ObjectStateExpression) object; @@ -476,6 +489,7 @@ public class ActionExpression { * * @return The hash code for this object. */ + @Override public final int hashCode() { if (expressionHashCode == HASH_CODE_NOT_COMPUTED) { expressionHashCode = HASH_INITIAL * HASH_FACTOR + Util.hashCode(name); @@ -490,6 +504,7 @@ public class ActionExpression { /* * (non-Javadoc) Method declared on AbstractExpression. */ + @Override public boolean isEnabledFor(Object object) { if (object == null) { return false; @@ -535,6 +550,7 @@ public class ActionExpression { * * @see org.eclipse.ui.internal.ActionExpression.AbstractExpression#valuesForExpression(java.lang.String) */ + @Override public Collection valuesForExpression(String expressionType) { if (expressionType.equals(name)) { Collection returnValue = new HashSet(); @@ -563,6 +579,7 @@ public class ActionExpression { super(element); } + @Override public final boolean equals(final Object object) { if (object instanceof OrExpression) { final OrExpression that = (OrExpression) object; @@ -575,6 +592,7 @@ public class ActionExpression { /* * (non-Javadoc) Method declared on AbstractExpression. */ + @Override public boolean isEnabledFor(Object object) { Iterator iter = list.iterator(); while (iter.hasNext()) { @@ -614,6 +632,7 @@ public class ActionExpression { } } + @Override public final boolean equals(final Object object) { if (object instanceof PluginStateExpression) { final PluginStateExpression that = (PluginStateExpression) object; @@ -629,6 +648,7 @@ public class ActionExpression { * * @return The hash code for this object. */ + @Override public final int hashCode() { if (expressionHashCode == HASH_CODE_NOT_COMPUTED) { expressionHashCode = HASH_INITIAL * HASH_FACTOR + Util.hashCode(id); @@ -643,6 +663,7 @@ public class ActionExpression { /* * (non-Javadoc) Method declared on AbstractExpression. */ + @Override public boolean isEnabledFor(Object object) { Bundle bundle = Platform.getBundle(id); if (!BundleUtility.isReady(bundle)) { @@ -703,6 +724,7 @@ public class ActionExpression { child = createExpression(children[0]); } + @Override public final boolean equals(final Object object) { if (object instanceof SingleExpression) { final SingleExpression that = (SingleExpression) object; @@ -717,6 +739,7 @@ public class ActionExpression { * * @see org.eclipse.ui.internal.ActionExpression.AbstractExpression#extractObjectClasses() */ + @Override public String[] extractObjectClasses() { return child.extractObjectClasses(); } @@ -726,6 +749,7 @@ public class ActionExpression { * * @return The hash code for this object. */ + @Override public final int hashCode() { if (expressionHashCode == HASH_CODE_NOT_COMPUTED) { expressionHashCode = HASH_INITIAL * HASH_FACTOR + Util.hashCode(child); @@ -739,6 +763,7 @@ public class ActionExpression { /* * (non-Javadoc) Method declared on AbstractExpression. */ + @Override public boolean isEnabledFor(Object object) { return child.isEnabledFor(object); } @@ -746,6 +771,7 @@ public class ActionExpression { /* * (non-Javadoc) Method declared on AbstractExpression. */ + @Override public boolean isEnabledForExpression(Object object, String expressionType) { return child.isEnabledForExpression(object, expressionType); @@ -756,6 +782,7 @@ public class ActionExpression { * * @see org.eclipse.ui.internal.ActionExpression.AbstractExpression#valuesForExpression(java.lang.String) */ + @Override public Collection valuesForExpression(String expressionType) { return child.valuesForExpression(expressionType); } @@ -792,6 +819,7 @@ public class ActionExpression { /* * (non-Javadoc) Method declared on AbstractExpression. */ + @Override public boolean isEnabledFor(Object object) { String str = System.getProperty(name); if (str == null) { @@ -800,6 +828,7 @@ public class ActionExpression { return value.equals(str); } + @Override public final boolean equals(final Object object) { if (object instanceof SystemPropertyExpression) { final SystemPropertyExpression that = (SystemPropertyExpression) object; @@ -815,6 +844,7 @@ public class ActionExpression { * * @return The hash code for this object. */ + @Override public final int hashCode() { if (expressionHashCode == HASH_CODE_NOT_COMPUTED) { expressionHashCode = HASH_INITIAL * HASH_FACTOR + Util.hashCode(name); @@ -976,6 +1006,7 @@ public class ActionExpression { } } + @Override public final boolean equals(final Object object) { if (object instanceof ActionExpression) { final ActionExpression that = (ActionExpression) object; @@ -1003,6 +1034,7 @@ public class ActionExpression { * * @return The hash code for this object. */ + @Override public final int hashCode() { if (hashCode == HASH_CODE_NOT_COMPUTED) { hashCode = HASH_INITIAL * HASH_FACTOR + Util.hashCode(root); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ActionSetActionBars.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ActionSetActionBars.java index b5807137a7b..cc64a3d6e75 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ActionSetActionBars.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ActionSetActionBars.java @@ -67,6 +67,7 @@ public class ActionSetActionBars extends SubActionBars2 { /* * (non-Javadoc) Inherited from SubActionBars. */ + @Override protected SubMenuManager createSubMenuManager(IMenuManager parent) { return new ActionSetMenuManager(parent, actionSetId); } @@ -74,6 +75,7 @@ public class ActionSetActionBars extends SubActionBars2 { /* * (non-Javadoc) Inherited from SubActionBars. */ + @Override protected SubToolBarManager createSubToolBarManager(IToolBarManager parent) { // return null, action sets are managed by CoolItemToolBarManagers return null; @@ -82,6 +84,7 @@ public class ActionSetActionBars extends SubActionBars2 { /** * Dispose the contributions. */ + @Override public void dispose() { super.dispose(); if (coolItemToolBarMgr == null) { @@ -182,6 +185,7 @@ public class ActionSetActionBars extends SubActionBars2 { * * @return the tool bar manager */ + @Override public IToolBarManager getToolBarManager() { ICoolBarManager coolBarManager = getCastedParent().getCoolBarManager(); if (coolBarManager == null) { @@ -275,6 +279,7 @@ public class ActionSetActionBars extends SubActionBars2 { /** * Activate / Deactivate the contributions. */ + @Override protected void setActive(boolean set) { super.setActive(set); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ActionSetContributionItem.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ActionSetContributionItem.java index d53c5cfd36a..46761a14125 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ActionSetContributionItem.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ActionSetContributionItem.java @@ -36,14 +36,16 @@ public class ActionSetContributionItem extends SubContributionItem implements /** * Returns the action set id. */ - public String getActionSetId() { + @Override + public String getActionSetId() { return actionSetId; } /** * Sets the action set id. */ - public void setActionSetId(String newActionSetId) { + @Override + public void setActionSetId(String newActionSetId) { actionSetId = newActionSetId; } } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ActionSetManager.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ActionSetManager.java index ece57f88d87..1d565e69ac1 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ActionSetManager.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ActionSetManager.java @@ -80,6 +80,7 @@ public class ActionSetManager { private IPropertyListener getContextListener() { if (contextListener == null) { contextListener = new IPropertyListener() { + @Override public void propertyChanged(Object source, int propId) { if (source instanceof IActionSetDescriptor) { IActionSetDescriptor desc = (IActionSetDescriptor) source; diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ActionSetMenuManager.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ActionSetMenuManager.java index fdc8e726fd5..b3218ad6b8e 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ActionSetMenuManager.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ActionSetMenuManager.java @@ -37,7 +37,8 @@ public class ActionSetMenuManager extends SubMenuManager { * In the case of menu's not added by this manager, * ensure that we return a wrapper for the menu. */ - public IContributionItem find(String id) { + @Override + public IContributionItem find(String id) { IContributionItem item = getParentMenuManager().find(id); if (item instanceof SubContributionItem) { // Return the item passed to us, not the wrapper. @@ -62,21 +63,24 @@ public class ActionSetMenuManager extends SubMenuManager { /* (non-Javadoc) * Method declared on IContributionManager. */ - public IContributionItem[] getItems() { + @Override + public IContributionItem[] getItems() { return getParentMenuManager().getItems(); } /* (non-Javadoc) * Method declared on SubContributionManager. */ - protected SubContributionItem wrap(IContributionItem item) { + @Override + protected SubContributionItem wrap(IContributionItem item) { return new ActionSetContributionItem(item, actionSetId); } /* (non-Javadoc) * Method declared on SubMenuManager. */ - protected SubMenuManager wrapMenu(IMenuManager menu) { + @Override + protected SubMenuManager wrapMenu(IMenuManager menu) { return new ActionSetMenuManager(menu, actionSetId); } } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ActionSetSeparator.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ActionSetSeparator.java index 18ab9fa948b..99826b2fa88 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ActionSetSeparator.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ActionSetSeparator.java @@ -38,7 +38,8 @@ public class ActionSetSeparator extends ContributionItem implements * Method declared on IContributionItem. * Fills the given menu with a SWT separator MenuItem. */ - public void fill(Menu menu, int index) { + @Override + public void fill(Menu menu, int index) { if (index >= 0) { new MenuItem(menu, SWT.SEPARATOR, index); } else { @@ -50,7 +51,8 @@ public class ActionSetSeparator extends ContributionItem implements * Method declared on IContributionItem. * Fills the given tool bar with a SWT separator ToolItem. */ - public void fill(ToolBar toolbar, int index) { + @Override + public void fill(ToolBar toolbar, int index) { if (index >= 0) { new ToolItem(toolbar, SWT.SEPARATOR, index); } else { @@ -61,7 +63,8 @@ public class ActionSetSeparator extends ContributionItem implements /** * Returns the action set id. */ - public String getActionSetId() { + @Override + public String getActionSetId() { return actionSetId; } @@ -69,14 +72,16 @@ public class ActionSetSeparator extends ContributionItem implements * The <code>Separator</code> implementation of this <code>IContributionItem</code> * method returns <code>true</code> */ - public boolean isSeparator() { + @Override + public boolean isSeparator() { return true; } /** * Sets the action set id. */ - public void setActionSetId(String newActionSetId) { + @Override + public void setActionSetId(String newActionSetId) { actionSetId = newActionSetId; } } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ActivateEditorHandler.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ActivateEditorHandler.java index 2c2af0be28f..771d9218b74 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ActivateEditorHandler.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ActivateEditorHandler.java @@ -47,6 +47,7 @@ public class ActivateEditorHandler extends AbstractEvaluationHandler { * * @see org.eclipse.core.commands.IHandler#execute(org.eclipse.core.commands.ExecutionEvent) */ + @Override public Object execute(ExecutionEvent event) throws ExecutionException { IWorkbenchWindow window = HandlerUtil .getActiveWorkbenchWindowChecked(event); @@ -74,9 +75,11 @@ public class ActivateEditorHandler extends AbstractEvaluationHandler { * * @see org.eclipse.ui.internal.AbstractEvaluationHandler#getEnabledWhenExpression() */ + @Override protected Expression getEnabledWhenExpression() { if (enabledWhen == null) { enabledWhen = new Expression() { + @Override public EvaluationResult evaluate(IEvaluationContext context) throws CoreException { IWorkbenchWindow window = InternalHandlerUtil @@ -94,6 +97,7 @@ public class ActivateEditorHandler extends AbstractEvaluationHandler { * * @see org.eclipse.core.expressions.Expression#collectExpressionInfo(org.eclipse.core.expressions.ExpressionInfo) */ + @Override public void collectExpressionInfo(ExpressionInfo info) { info .addVariableNameAccess(ISources.ACTIVE_WORKBENCH_WINDOW_NAME); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ActiveEditorAction.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ActiveEditorAction.java index 81242bac04b..9516972b31f 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ActiveEditorAction.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ActiveEditorAction.java @@ -106,7 +106,8 @@ public abstract class ActiveEditorAction extends PageEventAction { /* (non-Javadoc) * Method declared on PageEventAction. */ - public void pageActivated(IWorkbenchPage page) { + @Override + public void pageActivated(IWorkbenchPage page) { super.pageActivated(page); updateActiveEditor(); updateState(); @@ -115,7 +116,8 @@ public abstract class ActiveEditorAction extends PageEventAction { /* (non-Javadoc) * Method declared on PageEventAction. */ - public void pageClosed(IWorkbenchPage page) { + @Override + public void pageClosed(IWorkbenchPage page) { super.pageClosed(page); updateActiveEditor(); updateState(); @@ -124,7 +126,8 @@ public abstract class ActiveEditorAction extends PageEventAction { /* (non-Javadoc) * Method declared on PartEventAction. */ - public void partActivated(IWorkbenchPart part) { + @Override + public void partActivated(IWorkbenchPart part) { super.partActivated(part); if (part instanceof IEditorPart) { updateActiveEditor(); @@ -135,7 +138,8 @@ public abstract class ActiveEditorAction extends PageEventAction { /* (non-Javadoc) * Method declared on PartEventAction. */ - public void partBroughtToTop(IWorkbenchPart part) { + @Override + public void partBroughtToTop(IWorkbenchPart part) { super.partBroughtToTop(part); if (part instanceof IEditorPart) { updateActiveEditor(); @@ -146,7 +150,8 @@ public abstract class ActiveEditorAction extends PageEventAction { /* (non-Javadoc) * Method declared on PartEventAction. */ - public void partClosed(IWorkbenchPart part) { + @Override + public void partClosed(IWorkbenchPart part) { super.partClosed(part); if (part instanceof IEditorPart) { updateActiveEditor(); @@ -157,7 +162,8 @@ public abstract class ActiveEditorAction extends PageEventAction { /* (non-Javadoc) * Method declared on PartEventAction. */ - public void partDeactivated(IWorkbenchPart part) { + @Override + public void partDeactivated(IWorkbenchPart part) { super.partDeactivated(part); if (part instanceof IEditorPart) { updateActiveEditor(); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ActivityPersistanceHelper.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ActivityPersistanceHelper.java index d98f06f1a31..5c63789712b 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ActivityPersistanceHelper.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ActivityPersistanceHelper.java @@ -54,7 +54,8 @@ final class ActivityPersistanceHelper { * * @see org.eclipse.ui.activities.IActivityManagerListener#activityManagerChanged(org.eclipse.ui.activities.ActivityManagerEvent) */ - public void activityManagerChanged( + @Override + public void activityManagerChanged( ActivityManagerEvent activityManagerEvent) { //process newly defined activities. if (activityManagerEvent.haveDefinedActivityIdsChanged()) { @@ -83,7 +84,8 @@ final class ActivityPersistanceHelper { * * @see org.eclipse.jface.util.IPropertyChangeListener#propertyChange(org.eclipse.jface.util.PropertyChangeEvent) */ - public void propertyChange(PropertyChangeEvent event) { + @Override + public void propertyChange(PropertyChangeEvent event) { // dont process property events if we're in the process of // serializing state. if (!saving && event.getProperty().startsWith(PREFIX)) { diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/AggregateWorkingSet.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/AggregateWorkingSet.java index 14e0b29dfaf..c69086d20c2 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/AggregateWorkingSet.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/AggregateWorkingSet.java @@ -127,10 +127,12 @@ public class AggregateWorkingSet extends AbstractWorkingSet implements } } + @Override public String getId() { return null; } + @Override public ImageDescriptor getImageDescriptor() { return WorkbenchImages .getImageDescriptor(IWorkbenchGraphicConstants.IMG_OBJ_WORKING_SETS); @@ -139,9 +141,11 @@ public class AggregateWorkingSet extends AbstractWorkingSet implements /** * A no-op for aggregates - their contents should be derived. */ + @Override public void setElements(IAdaptable[] elements) { } + @Override public void setId(String id) { } @@ -149,6 +153,7 @@ public class AggregateWorkingSet extends AbstractWorkingSet implements /** * Aggregates are not editable. */ + @Override public boolean isEditable() { return false; } @@ -156,10 +161,12 @@ public class AggregateWorkingSet extends AbstractWorkingSet implements /** * Aggregates should not generally be visible in the UI. */ + @Override public boolean isVisible() { return false; } + @Override public void saveState(IMemento memento) { if (workingSetMemento != null) { // just re-save the previous memento if the working set has @@ -181,11 +188,13 @@ public class AggregateWorkingSet extends AbstractWorkingSet implements } } + @Override public void connect(IWorkingSetManager manager) { manager.addPropertyChangeListener(this); super.connect(manager); } + @Override public void disconnect() { IWorkingSetManager connectedManager = getManager(); if (connectedManager != null) @@ -198,6 +207,7 @@ public class AggregateWorkingSet extends AbstractWorkingSet implements * * @return the component working sets */ + @Override public IWorkingSet[] getComponents() { IWorkingSet[] localComponents = getComponentsInternal(); IWorkingSet[] copiedArray = new IWorkingSet[localComponents.length]; @@ -213,6 +223,7 @@ public class AggregateWorkingSet extends AbstractWorkingSet implements return components; } + @Override public void propertyChange(PropertyChangeEvent event) { String property = event.getProperty(); if (property.equals(IWorkingSetManager.CHANGE_WORKING_SET_REMOVE)) { @@ -240,6 +251,7 @@ public class AggregateWorkingSet extends AbstractWorkingSet implements } } + @Override void restoreWorkingSet() { IWorkingSetManager manager = getManager(); if (manager == null) { @@ -262,6 +274,7 @@ public class AggregateWorkingSet extends AbstractWorkingSet implements constructElements(false); } + @Override public boolean equals(Object object) { if (this == object) { return true; @@ -275,11 +288,13 @@ public class AggregateWorkingSet extends AbstractWorkingSet implements return false; } + @Override public int hashCode() { int hashCode = getName().hashCode() & getComponentsInternal().hashCode(); return hashCode; } + @Override public boolean isSelfUpdating() { IWorkingSet[] localComponents = getComponentsInternal(); if (localComponents == null || localComponents.length == 0) { @@ -293,6 +308,7 @@ public class AggregateWorkingSet extends AbstractWorkingSet implements return true; } + @Override public boolean isAggregateWorkingSet() { return true; } @@ -300,6 +316,7 @@ public class AggregateWorkingSet extends AbstractWorkingSet implements /* (non-Javadoc) * @see org.eclipse.ui.IWorkingSet#adaptElements(org.eclipse.core.runtime.IAdaptable[]) */ + @Override public IAdaptable[] adaptElements(IAdaptable[] objects) { return new IAdaptable[0]; } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/AnimatedTabFeedback.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/AnimatedTabFeedback.java index 25eaacd4fd7..0b04d746d59 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/AnimatedTabFeedback.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/AnimatedTabFeedback.java @@ -40,20 +40,24 @@ public class AnimatedTabFeedback extends ImageCycleFeedbackBase { /* (non-Javadoc) * @see org.eclipse.ui.internal.AnimationFeedbackBase#initialize(org.eclipse.ui.internal.AnimationEngine) */ + @Override public void initialize(AnimationEngine engine) { // TODO Auto-generated method stub background = tabItem.getParent().getBackground(); display = tabItem.getParent().getDisplay(); } + @Override public void saveStoppedImage() { stoppedImage = tabItem.getImage(); } + @Override public void setStoppedImage(Image image) { tabItem.setImage(image); } + @Override public void showImage(Image image) { if (tabItem.isDisposed()) return; diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/AnimationEngine.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/AnimationEngine.java index f3d8263aac5..b5d11b4ba80 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/AnimationEngine.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/AnimationEngine.java @@ -83,6 +83,7 @@ public class AnimationEngine extends Job { display = feedbackRenderer.getAnimationShell().getDisplay(); animationFeedback.getAnimationShell().addDisposeListener(new DisposeListener() { + @Override public void widgetDisposed(DisposeEvent e) { cancelAnimation(); } @@ -108,6 +109,7 @@ public class AnimationEngine extends Job { private Runnable animationStep = new Runnable() { + @Override public void run() { if (animationCanceled) return; @@ -165,6 +167,7 @@ public class AnimationEngine extends Job { return amount; } + @Override protected IStatus run(IProgressMonitor monitor) { // We use preference value to indicate that the animation should be skipped on this platform. if (!enableAnimations) { @@ -173,6 +176,7 @@ public class AnimationEngine extends Job { // We're starting, initialize display.syncExec(new Runnable() { + @Override public void run() { // 'jobInit' returns 'false' if it doesn't want to run... if (!animationCanceled) @@ -201,6 +205,7 @@ public class AnimationEngine extends Job { // We're done, clean up display.syncExec(new Runnable() { + @Override public void run() { feedbackRenderer.dispose(); } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/AnimationFeedbackBase.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/AnimationFeedbackBase.java index 736d76216ed..46483b4987a 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/AnimationFeedbackBase.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/AnimationFeedbackBase.java @@ -38,6 +38,7 @@ public abstract class AnimationFeedbackBase { baseShell = parentShell; baseShell.addDisposeListener(new DisposeListener() { + @Override public void widgetDisposed(DisposeEvent e) { if (engine != null) engine.cancelAnimation(); @@ -96,6 +97,7 @@ public abstract class AnimationFeedbackBase { animationShell = new Shell(getBaseShell(), SWT.NO_TRIM | SWT.ON_TOP); animationShell.addDisposeListener(new DisposeListener() { + @Override public void widgetDisposed(DisposeEvent e) { if (engine != null) engine.cancelAnimation(); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/BaseSaveAction.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/BaseSaveAction.java index ce8155dbc30..9536067485f 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/BaseSaveAction.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/BaseSaveAction.java @@ -40,7 +40,8 @@ public abstract class BaseSaveAction extends ActiveEditorAction { private List partsWithListeners = new ArrayList(1); private final IPropertyListener propListener = new IPropertyListener() { - public void propertyChanged(Object source, int propId) { + @Override + public void propertyChanged(Object source, int propId) { if (source == getActiveEditor()) { if (propId == IEditorPart.PROP_DIRTY) { updateState(); @@ -64,7 +65,8 @@ public abstract class BaseSaveAction extends ActiveEditorAction { /* (non-Javadoc) * Method declared on ActiveEditorAction. */ - protected void editorActivated(IEditorPart part) { + @Override + protected void editorActivated(IEditorPart part) { if (part != null) { part.addPropertyListener(propListener); partsWithListeners.add(part); @@ -74,7 +76,8 @@ public abstract class BaseSaveAction extends ActiveEditorAction { /* (non-Javadoc) * Method declared on ActiveEditorAction. */ - protected void editorDeactivated(IEditorPart part) { + @Override + protected void editorDeactivated(IEditorPart part) { if (part != null) { part.removePropertyListener(propListener); partsWithListeners.remove(part); @@ -84,7 +87,8 @@ public abstract class BaseSaveAction extends ActiveEditorAction { private IViewPart activeView; private final IPropertyListener propListener2 = new IPropertyListener() { - public void propertyChanged(Object source, int propId) { + @Override + public void propertyChanged(Object source, int propId) { if (source == activeView) { if (propId == IEditorPart.PROP_DIRTY) { updateState(); @@ -97,7 +101,8 @@ public abstract class BaseSaveAction extends ActiveEditorAction { private ISaveablePart activeSaveablePart; private final IPropertyListener propListener3 = new IPropertyListener() { - public void propertyChanged(Object source, int propId) { + @Override + public void propertyChanged(Object source, int propId) { if (source == activeSaveablePart) { if (propId == IEditorPart.PROP_DIRTY) { updateState(); @@ -109,7 +114,8 @@ public abstract class BaseSaveAction extends ActiveEditorAction { /* (non-Javadoc) * Method declared on PageEventAction. */ - public void pageActivated(IWorkbenchPage page) { + @Override + public void pageActivated(IWorkbenchPage page) { super.pageActivated(page); updateActiveView(); updateState(); @@ -118,7 +124,8 @@ public abstract class BaseSaveAction extends ActiveEditorAction { /* (non-Javadoc) * Method declared on PageEventAction. */ - public void pageClosed(IWorkbenchPage page) { + @Override + public void pageClosed(IWorkbenchPage page) { super.pageClosed(page); updateActiveView(); updateState(); @@ -127,7 +134,8 @@ public abstract class BaseSaveAction extends ActiveEditorAction { /* (non-Javadoc) * Method declared on PartEventAction. */ - public void partActivated(IWorkbenchPart part) { + @Override + public void partActivated(IWorkbenchPart part) { super.partActivated(part); if (part instanceof IViewPart) { updateActiveView(); @@ -138,7 +146,8 @@ public abstract class BaseSaveAction extends ActiveEditorAction { /* (non-Javadoc) * Method declared on PartEventAction. */ - public void partClosed(IWorkbenchPart part) { + @Override + public void partClosed(IWorkbenchPart part) { super.partClosed(part); if (part instanceof IViewPart) { updateActiveView(); @@ -149,7 +158,8 @@ public abstract class BaseSaveAction extends ActiveEditorAction { /* (non-Javadoc) * Method declared on PartEventAction. */ - public void partDeactivated(IWorkbenchPart part) { + @Override + public void partDeactivated(IWorkbenchPart part) { super.partDeactivated(part); if (part instanceof IViewPart) { updateActiveView(); @@ -222,7 +232,8 @@ public abstract class BaseSaveAction extends ActiveEditorAction { /* (non-Javadoc) * Method declared on PageEventAction. */ - public void dispose() { + @Override + public void dispose() { super.dispose(); for (Iterator it = partsWithListeners.iterator(); it.hasNext();) { IWorkbenchPart part = (IWorkbenchPart) it.next(); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ChangeToPerspectiveMenu.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ChangeToPerspectiveMenu.java index 1e6475c6512..8db4dfbc3b5 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ChangeToPerspectiveMenu.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ChangeToPerspectiveMenu.java @@ -57,7 +57,8 @@ public class ChangeToPerspectiveMenu extends PerspectiveMenu { /* (non-Javadoc) * @see PerspectiveMenu#run(IPerspectiveDescriptor) */ - protected void run(IPerspectiveDescriptor desc) { + @Override + protected void run(IPerspectiveDescriptor desc) { IPreferenceStore store = PrefUtil.getInternalPreferenceStore(); int mode = store.getInt(IPreferenceConstants.OPEN_PERSP_MODE); IWorkbenchPage page = getWindow().getActivePage(); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/CloseAllHandler.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/CloseAllHandler.java index 52405301460..c1e1309444a 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/CloseAllHandler.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/CloseAllHandler.java @@ -41,6 +41,7 @@ public class CloseAllHandler extends AbstractEvaluationHandler { registerEnablement(); } + @Override public Object execute(ExecutionEvent event) throws ExecutionException { IWorkbenchWindow window = HandlerUtil .getActiveWorkbenchWindowChecked(event); @@ -57,9 +58,11 @@ public class CloseAllHandler extends AbstractEvaluationHandler { * * @see org.eclipse.ui.internal.AbstractEvaluationHandler#getEnabledWhenExpression() */ + @Override protected Expression getEnabledWhenExpression() { if (enabledWhen == null) { enabledWhen = new Expression() { + @Override public EvaluationResult evaluate(IEvaluationContext context) throws CoreException { IWorkbenchPart part = InternalHandlerUtil.getActivePart(context); @@ -82,6 +85,7 @@ public class CloseAllHandler extends AbstractEvaluationHandler { * * @see org.eclipse.core.expressions.Expression#collectExpressionInfo(org.eclipse.core.expressions.ExpressionInfo) */ + @Override public void collectExpressionInfo(ExpressionInfo info) { info.addVariableNameAccess(ISources.ACTIVE_PART_NAME); info.addVariableNameAccess(ISources.ACTIVE_WORKBENCH_WINDOW_ACTIVE_PERSPECTIVE_NAME); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/CloseAllSavedAction.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/CloseAllSavedAction.java index a6c3fbc34b8..70b2f538c13 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/CloseAllSavedAction.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/CloseAllSavedAction.java @@ -51,7 +51,8 @@ public class CloseAllSavedAction extends PageEventAction implements /* (non-Javadoc) * Method declared on PageEventAction. */ - public void pageActivated(IWorkbenchPage page) { + @Override + public void pageActivated(IWorkbenchPage page) { super.pageActivated(page); updateState(); } @@ -59,7 +60,8 @@ public class CloseAllSavedAction extends PageEventAction implements /* (non-Javadoc) * Method declared on PageEventAction. */ - public void pageClosed(IWorkbenchPage page) { + @Override + public void pageClosed(IWorkbenchPage page) { super.pageClosed(page); updateState(); } @@ -67,7 +69,8 @@ public class CloseAllSavedAction extends PageEventAction implements /* (non-Javadoc) * Method declared on PartEventAction. */ - public void partClosed(IWorkbenchPart part) { + @Override + public void partClosed(IWorkbenchPart part) { super.partClosed(part); if (part instanceof IEditorPart) { part.removePropertyListener(this); @@ -79,7 +82,8 @@ public class CloseAllSavedAction extends PageEventAction implements /* (non-Javadoc) * Method declared on PartEventAction. */ - public void partOpened(IWorkbenchPart part) { + @Override + public void partOpened(IWorkbenchPart part) { super.partOpened(part); if (part instanceof IEditorPart) { part.addPropertyListener(this); @@ -91,7 +95,8 @@ public class CloseAllSavedAction extends PageEventAction implements /* (non-Javadoc) * Method declared on IPropertyListener. */ - public void propertyChanged(Object source, int propID) { + @Override + public void propertyChanged(Object source, int propID) { if (source instanceof IEditorPart) { if (propID == IEditorPart.PROP_DIRTY) { updateState(); @@ -102,7 +107,8 @@ public class CloseAllSavedAction extends PageEventAction implements /* (non-Javadoc) * Method declared on Action. */ - public void run() { + @Override + public void run() { if (getWorkbenchWindow() == null) { // action has been dispose return; @@ -135,7 +141,8 @@ public class CloseAllSavedAction extends PageEventAction implements /* (non-Javadoc) * Method declared on PageEventAction. */ - public void dispose() { + @Override + public void dispose() { super.dispose(); for (Iterator it = partsWithListeners.iterator(); it.hasNext();) { IWorkbenchPart part = (IWorkbenchPart) it.next(); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/CloseEditorHandler.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/CloseEditorHandler.java index 34f1ca68cb3..4e1ad590137 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/CloseEditorHandler.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/CloseEditorHandler.java @@ -40,6 +40,7 @@ public class CloseEditorHandler extends AbstractEvaluationHandler { registerEnablement(); } + @Override public Object execute(ExecutionEvent event) throws ExecutionException { IWorkbenchWindow window = HandlerUtil .getActiveWorkbenchWindowChecked(event); @@ -54,9 +55,11 @@ public class CloseEditorHandler extends AbstractEvaluationHandler { * * @see org.eclipse.ui.internal.AbstractEvaluationHandler#getEnabledWhenExpression() */ + @Override protected Expression getEnabledWhenExpression() { if (enabledWhen == null) { enabledWhen = new Expression() { + @Override public EvaluationResult evaluate(IEvaluationContext context) throws CoreException { IEditorPart part = InternalHandlerUtil @@ -73,6 +76,7 @@ public class CloseEditorHandler extends AbstractEvaluationHandler { * * @see org.eclipse.core.expressions.Expression#collectExpressionInfo(org.eclipse.core.expressions.ExpressionInfo) */ + @Override public void collectExpressionInfo(ExpressionInfo info) { info.addVariableNameAccess(ISources.ACTIVE_EDITOR_NAME); } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/CloseOthersHandler.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/CloseOthersHandler.java index b43095d13b9..3b4e4eebd79 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/CloseOthersHandler.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/CloseOthersHandler.java @@ -40,6 +40,7 @@ public class CloseOthersHandler extends AbstractEvaluationHandler { registerEnablement(); } + @Override public Object execute(ExecutionEvent event) throws ExecutionException { IWorkbenchWindow window = HandlerUtil .getActiveWorkbenchWindowChecked(event); @@ -70,9 +71,11 @@ public class CloseOthersHandler extends AbstractEvaluationHandler { * * @see org.eclipse.ui.internal.AbstractEvaluationHandler#getEnabledWhenExpression() */ + @Override protected Expression getEnabledWhenExpression() { if (enabledWhen == null) { enabledWhen = new Expression() { + @Override public EvaluationResult evaluate(IEvaluationContext context) throws CoreException { IWorkbenchWindow window = InternalHandlerUtil @@ -96,6 +99,7 @@ public class CloseOthersHandler extends AbstractEvaluationHandler { * * @see org.eclipse.core.expressions.Expression#collectExpressionInfo(org.eclipse.core.expressions.ExpressionInfo) */ + @Override public void collectExpressionInfo(ExpressionInfo info) { info .addVariableNameAccess(ISources.ACTIVE_WORKBENCH_WINDOW_NAME); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ConfigurationInfo.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ConfigurationInfo.java index 037db8bbeee..e5e098d4651 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ConfigurationInfo.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ConfigurationInfo.java @@ -116,6 +116,7 @@ public final class ConfigurationInfo { Arrays.sort(configElements, new Comparator() { Collator collator = Collator.getInstance(Locale.getDefault()); + @Override public int compare(Object a, Object b) { IConfigurationElement element1 = (IConfigurationElement) a; IConfigurationElement element2 = (IConfigurationElement) b; diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/CoolBarToTrimManager.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/CoolBarToTrimManager.java index a2ddee9587e..41e7b337784 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/CoolBarToTrimManager.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/CoolBarToTrimManager.java @@ -99,6 +99,7 @@ public class CoolBarToTrimManager extends ContributionManager implements ICoolBa * org.eclipse.jface.action.IContributionManager#add(org.eclipse.jface.action * .IAction) */ + @Override public void add(IAction action) { // TODO Auto-generated method stub @@ -111,6 +112,7 @@ public class CoolBarToTrimManager extends ContributionManager implements ICoolBa * org.eclipse.jface.action.IContributionManager#add(org.eclipse.jface.action * .IContributionItem) */ + @Override public void add(IContributionItem item) { add(topTrim, -1, item); } @@ -199,6 +201,7 @@ public class CoolBarToTrimManager extends ContributionManager implements ICoolBa * org.eclipse.jface.action.ICoolBarManager#add(org.eclipse.jface.action * .IToolBarManager) */ + @Override public void add(final IToolBarManager toolBarManager) { if (toolBarManager instanceof ToolBarManager) { add(new ToolBarContributionItem(toolBarManager)); @@ -212,6 +215,7 @@ public class CoolBarToTrimManager extends ContributionManager implements ICoolBa * org.eclipse.jface.action.IContributionManager#appendToGroup(java.lang * .String, org.eclipse.jface.action.IAction) */ + @Override public void appendToGroup(String groupName, IAction action) { } @@ -222,6 +226,7 @@ public class CoolBarToTrimManager extends ContributionManager implements ICoolBa * org.eclipse.jface.action.IContributionManager#appendToGroup(java.lang * .String, org.eclipse.jface.action.IContributionItem) */ + @Override public void appendToGroup(String groupName, IContributionItem item) { List<MToolBar> toolBars = modelService .findElements(window, groupName, MToolBar.class, null); @@ -243,6 +248,7 @@ public class CoolBarToTrimManager extends ContributionManager implements ICoolBa * org.eclipse.jface.internal.provisional.action.ICoolBarManager2#createControl2 * (org.eclipse.swt.widgets.Composite) */ + @Override public Control createControl2(Composite parent) { new Exception("CBTTM:createControl2()").printStackTrace(); //$NON-NLS-1$ return null; @@ -254,6 +260,7 @@ public class CoolBarToTrimManager extends ContributionManager implements ICoolBa * @see * org.eclipse.jface.internal.provisional.action.ICoolBarManager2#dispose() */ + @Override public void dispose() { // TODO Auto-generated method stub @@ -264,6 +271,7 @@ public class CoolBarToTrimManager extends ContributionManager implements ICoolBa * * @see org.eclipse.jface.action.IContributionManager#find(java.lang.String) */ + @Override public IContributionItem find(String id) { List<MToolBar> toolbars = modelService.findElements(window, id, MToolBar.class, null); if (toolbars.isEmpty()) { @@ -302,6 +310,7 @@ public class CoolBarToTrimManager extends ContributionManager implements ICoolBa * * @see org.eclipse.jface.action.ICoolBarManager#getContextMenuManager() */ + @Override public IMenuManager getContextMenuManager() { new Exception("CBTTM:getContextMenuManager()").printStackTrace(); //$NON-NLS-1$ return null; @@ -314,6 +323,7 @@ public class CoolBarToTrimManager extends ContributionManager implements ICoolBa * org.eclipse.jface.internal.provisional.action.ICoolBarManager2#getControl2 * () */ + @Override public Control getControl2() { new Exception("CBTTM:getControl2()").printStackTrace(); //$NON-NLS-1$ return null; @@ -324,6 +334,7 @@ public class CoolBarToTrimManager extends ContributionManager implements ICoolBa * * @see org.eclipse.jface.action.IContributionManager#getItems() */ + @Override public IContributionItem[] getItems() { ArrayList<IContributionItem> items = new ArrayList<IContributionItem>(); @@ -364,6 +375,7 @@ public class CoolBarToTrimManager extends ContributionManager implements ICoolBa * * @see org.eclipse.jface.action.ICoolBarManager#getLockLayout() */ + @Override public boolean getLockLayout() { // TODO Auto-generated method stub return false; @@ -374,6 +386,7 @@ public class CoolBarToTrimManager extends ContributionManager implements ICoolBa * * @see org.eclipse.jface.action.IContributionManager#getOverrides() */ + @Override public IContributionManagerOverrides getOverrides() { return toolbarOverrides; } @@ -383,6 +396,7 @@ public class CoolBarToTrimManager extends ContributionManager implements ICoolBa * * @see org.eclipse.jface.action.ICoolBarManager#getStyle() */ + @Override public int getStyle() { // TODO Auto-generated method stub return 0; @@ -395,6 +409,7 @@ public class CoolBarToTrimManager extends ContributionManager implements ICoolBa * org.eclipse.jface.action.IContributionManager#insertAfter(java.lang.String * , org.eclipse.jface.action.IAction) */ + @Override public void insertAfter(String id, IAction action) { // TODO Auto-generated method stub @@ -423,6 +438,7 @@ public class CoolBarToTrimManager extends ContributionManager implements ICoolBa * org.eclipse.jface.action.IContributionManager#insertAfter(java.lang.String * , org.eclipse.jface.action.IContributionItem) */ + @Override public void insertAfter(String id, IContributionItem item) { MToolBar afterElement = getToolBar(id); if (afterElement == null || getTrim(afterElement) == null) @@ -441,6 +457,7 @@ public class CoolBarToTrimManager extends ContributionManager implements ICoolBa * org.eclipse.jface.action.IContributionManager#insertBefore(java.lang. * String, org.eclipse.jface.action.IAction) */ + @Override public void insertBefore(String id, IAction action) { } @@ -451,6 +468,7 @@ public class CoolBarToTrimManager extends ContributionManager implements ICoolBa * org.eclipse.jface.action.IContributionManager#insertBefore(java.lang. * String, org.eclipse.jface.action.IContributionItem) */ + @Override public void insertBefore(String id, IContributionItem item) { MToolBar beforeElement = getToolBar(id); if (beforeElement == null || getTrim(beforeElement) == null) @@ -466,6 +484,7 @@ public class CoolBarToTrimManager extends ContributionManager implements ICoolBa * * @see org.eclipse.jface.action.IContributionManager#isDirty() */ + @Override public boolean isDirty() { // TODO Auto-generated method stub return false; @@ -476,6 +495,7 @@ public class CoolBarToTrimManager extends ContributionManager implements ICoolBa * * @see org.eclipse.jface.action.IContributionManager#isEmpty() */ + @Override public boolean isEmpty() { return topTrim.getChildren().isEmpty(); } @@ -485,6 +505,7 @@ public class CoolBarToTrimManager extends ContributionManager implements ICoolBa * * @see org.eclipse.jface.action.IContributionManager#markDirty() */ + @Override public void markDirty() { // TODO Auto-generated method stub @@ -497,6 +518,7 @@ public class CoolBarToTrimManager extends ContributionManager implements ICoolBa * org.eclipse.jface.action.IContributionManager#prependToGroup(java.lang * .String, org.eclipse.jface.action.IAction) */ + @Override public void prependToGroup(String groupName, IAction action) { // TODO Auto-generated method stub @@ -509,6 +531,7 @@ public class CoolBarToTrimManager extends ContributionManager implements ICoolBa * org.eclipse.jface.action.IContributionManager#prependToGroup(java.lang * .String, org.eclipse.jface.action.IContributionItem) */ + @Override public void prependToGroup(String groupName, IContributionItem item) { MUIElement gnElement = modelService.find(groupName, window); if (gnElement instanceof MToolBar) { @@ -525,6 +548,7 @@ public class CoolBarToTrimManager extends ContributionManager implements ICoolBa * @see * org.eclipse.jface.internal.provisional.action.ICoolBarManager2#refresh() */ + @Override public void refresh() { // TODO Auto-generated method stub @@ -537,6 +561,7 @@ public class CoolBarToTrimManager extends ContributionManager implements ICoolBa * org.eclipse.jface.action.IContributionManager#remove(org.eclipse.jface * .action.IContributionItem) */ + @Override public IContributionItem remove(IContributionItem item) { final List<MToolBar> children = modelService.findElements(window, null, MToolBar.class, null); @@ -574,6 +599,7 @@ public class CoolBarToTrimManager extends ContributionManager implements ICoolBa * @see * org.eclipse.jface.action.IContributionManager#remove(java.lang.String) */ + @Override public IContributionItem remove(String id) { new Exception("CBTTM:remove(String id) " + id).printStackTrace(); //$NON-NLS-1$ return null; @@ -584,6 +610,7 @@ public class CoolBarToTrimManager extends ContributionManager implements ICoolBa * * @see org.eclipse.jface.action.IContributionManager#removeAll() */ + @Override public void removeAll() { new Exception("CBTTM:removeAll").printStackTrace(); //$NON-NLS-1$ } @@ -595,6 +622,7 @@ public class CoolBarToTrimManager extends ContributionManager implements ICoolBa * org.eclipse.jface.internal.provisional.action.ICoolBarManager2#resetItemOrder * () */ + @Override public void resetItemOrder() { updateAll(true); } @@ -606,6 +634,7 @@ public class CoolBarToTrimManager extends ContributionManager implements ICoolBa * org.eclipse.jface.action.ICoolBarManager#setContextMenuManager(org.eclipse * .jface.action.IMenuManager) */ + @Override public void setContextMenuManager(IMenuManager menuManager) { // TODO Auto-generated method stub @@ -618,6 +647,7 @@ public class CoolBarToTrimManager extends ContributionManager implements ICoolBa * org.eclipse.jface.internal.provisional.action.ICoolBarManager2#setItems * (org.eclipse.jface.action.IContributionItem[]) */ + @Override public void setItems(IContributionItem[] newItems) { new Exception("CBTTM:setItems(IContributionItem[] newItems)").printStackTrace(); //$NON-NLS-1$ } @@ -627,6 +657,7 @@ public class CoolBarToTrimManager extends ContributionManager implements ICoolBa * * @see org.eclipse.jface.action.ICoolBarManager#setLockLayout(boolean) */ + @Override public void setLockLayout(boolean value) { // TODO Auto-generated method stub @@ -639,6 +670,7 @@ public class CoolBarToTrimManager extends ContributionManager implements ICoolBa * org.eclipse.jface.internal.provisional.action.ICoolBarManager2#setOverrides * (org.eclipse.jface.action.IContributionManagerOverrides) */ + @Override public void setOverrides(IContributionManagerOverrides newOverrides) { this.toolbarOverrides = newOverrides; // this is required when we need to set the overrides for the @@ -651,6 +683,7 @@ public class CoolBarToTrimManager extends ContributionManager implements ICoolBa * * @see org.eclipse.jface.action.IContributionManager#update(boolean) */ + @Override public void update(boolean force) { final List<MToolBar> children = modelService.findElements(window, null, MToolBar.class, null); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/CycleBaseHandler.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/CycleBaseHandler.java index c079b6e2a22..0e0f0ca2dec 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/CycleBaseHandler.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/CycleBaseHandler.java @@ -109,6 +109,7 @@ public abstract class CycleBaseHandler extends AbstractHandler implements */ protected abstract ParameterizedCommand getForwardCommand(); + @Override public Object execute(ExecutionEvent event) throws ExecutionException { window = HandlerUtil.getActiveWorkbenchWindowChecked(event); @@ -183,10 +184,12 @@ public abstract class CycleBaseHandler extends AbstractHandler implements tc.setWidth(table.getClientArea().width); table.setFocus(); table.addFocusListener(new FocusListener() { + @Override public void focusGained(FocusEvent e) { // Do nothing } + @Override public void focusLost(FocusEvent e) { cancel(dialog); } @@ -195,6 +198,7 @@ public abstract class CycleBaseHandler extends AbstractHandler implements table.addMouseMoveListener(new MouseMoveListener() { TableItem fLastItem = null; + @Override public void mouseMove(MouseEvent e) { if (table.equals(e.getSource())) { Object o = table.getItem(new Point(e.x, e.y)); @@ -304,6 +308,7 @@ public abstract class CycleBaseHandler extends AbstractHandler implements private boolean quickReleaseMode = false; + @Override public void keyPressed(KeyEvent e) { int keyCode = e.keyCode; char character = e.character; @@ -383,6 +388,7 @@ public abstract class CycleBaseHandler extends AbstractHandler implements firstKey = false; } + @Override public void keyReleased(KeyEvent e) { int keyCode = e.keyCode; int stateMask = e.stateMask; @@ -414,6 +420,7 @@ public abstract class CycleBaseHandler extends AbstractHandler implements * @param event * The trigger event; must not be <code>null</code>. */ + @Override public final void keyTraversed(final TraverseEvent event) { event.doit = false; } @@ -474,14 +481,17 @@ public abstract class CycleBaseHandler extends AbstractHandler implements */ protected void addMouseListener(final Table table, final Shell dialog) { table.addMouseListener(new MouseListener() { + @Override public void mouseDoubleClick(MouseEvent e) { ok(dialog, table); } + @Override public void mouseDown(MouseEvent e) { ok(dialog, table); } + @Override public void mouseUp(MouseEvent e) { ok(dialog, table); } @@ -514,6 +524,7 @@ public abstract class CycleBaseHandler extends AbstractHandler implements * @see org.eclipse.core.runtime.IExecutableExtension#setInitializationData(org.eclipse.core.runtime.IConfigurationElement, * java.lang.String, java.lang.Object) */ + @Override public void setInitializationData(IConfigurationElement config, String propertyName, Object data) throws CoreException { gotoDirection = "true".equals(data); //$NON-NLS-1$ diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/CycleEditorHandler.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/CycleEditorHandler.java index 702f58198db..6a614a1992e 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/CycleEditorHandler.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/CycleEditorHandler.java @@ -34,6 +34,7 @@ public class CycleEditorHandler extends CycleBaseHandler { /* (non-Javadoc) * @see org.eclipse.ui.internal.CycleBaseHandler#addItems(org.eclipse.swt.widgets.Table, org.eclipse.ui.internal.WorkbenchPage) */ + @Override protected void addItems(Table table, WorkbenchPage page) { List<EditorReference> refs = page.getSortedEditorReferences(); for (EditorReference ref : refs) { @@ -52,6 +53,7 @@ public class CycleEditorHandler extends CycleBaseHandler { /* (non-Javadoc) * @see org.eclipse.ui.internal.CycleBaseHandler#getBackwardCommand() */ + @Override protected ParameterizedCommand getBackwardCommand() { final ICommandService commandService = (ICommandService) window.getWorkbench().getService(ICommandService.class); final Command command = commandService.getCommand(IWorkbenchCommandConstants.WINDOW_PREVIOUS_EDITOR); @@ -62,6 +64,7 @@ public class CycleEditorHandler extends CycleBaseHandler { /* (non-Javadoc) * @see org.eclipse.ui.internal.CycleBaseHandler#getForwardCommand() */ + @Override protected ParameterizedCommand getForwardCommand() { final ICommandService commandService = (ICommandService) window.getWorkbench().getService(ICommandService.class); final Command command = commandService.getCommand(IWorkbenchCommandConstants.WINDOW_NEXT_EDITOR); @@ -72,6 +75,7 @@ public class CycleEditorHandler extends CycleBaseHandler { /* (non-Javadoc) * @see org.eclipse.ui.internal.CycleBaseHandler#getTableHeader() */ + @Override protected String getTableHeader(IWorkbenchPart activePart) { // TODO Auto-generated method stub return WorkbenchMessages.CycleEditorAction_header; diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/CyclePerspectiveHandler.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/CyclePerspectiveHandler.java index a94ded3071f..f0790fb28f4 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/CyclePerspectiveHandler.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/CyclePerspectiveHandler.java @@ -37,6 +37,7 @@ public class CyclePerspectiveHandler extends CycleBaseHandler { /* (non-Javadoc) * @see org.eclipse.ui.internal.CycleBaseHandler#addItems(org.eclipse.swt.widgets.Table, org.eclipse.ui.internal.WorkbenchPage) */ + @Override protected void addItems(Table table, WorkbenchPage page) { IPerspectiveDescriptor perspectives[] = page.getSortedPerspectives(); for (int i = perspectives.length - 1; i >= 0; i--) { @@ -56,6 +57,7 @@ public class CyclePerspectiveHandler extends CycleBaseHandler { /* (non-Javadoc) * @see org.eclipse.ui.internal.CycleBaseHandler#getBackwardCommand() */ + @Override protected ParameterizedCommand getBackwardCommand() { final ICommandService commandService = (ICommandService) window.getWorkbench().getService(ICommandService.class); final Command command = commandService.getCommand(IWorkbenchCommandConstants.WINDOW_PREVIOUS_PERSPECTIVE); @@ -66,6 +68,7 @@ public class CyclePerspectiveHandler extends CycleBaseHandler { /* (non-Javadoc) * @see org.eclipse.ui.internal.CycleBaseHandler#getForwardCommand() */ + @Override protected ParameterizedCommand getForwardCommand() { final ICommandService commandService = (ICommandService) window.getWorkbench().getService(ICommandService.class); final Command command = commandService.getCommand(IWorkbenchCommandConstants.WINDOW_NEXT_PERSPECTIVE); @@ -76,6 +79,7 @@ public class CyclePerspectiveHandler extends CycleBaseHandler { /* (non-Javadoc) * @see org.eclipse.ui.internal.CycleBaseHandler#getTableHeader() */ + @Override protected String getTableHeader(IWorkbenchPart activePart) { return WorkbenchMessages.CyclePerspectiveAction_header; } @@ -83,6 +87,7 @@ public class CyclePerspectiveHandler extends CycleBaseHandler { /* (non-Javadoc) * @see org.eclipse.core.commands.AbstractHandler#dispose() */ + @Override public void dispose() { if (labelProvider!=null) { labelProvider.dispose(); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/CycleViewHandler.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/CycleViewHandler.java index 3c14149cf27..315a342568b 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/CycleViewHandler.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/CycleViewHandler.java @@ -36,6 +36,7 @@ public class CycleViewHandler extends CycleBaseHandler { /* (non-Javadoc) * @see org.eclipse.ui.internal.CycleBaseHandler#addItems(org.eclipse.swt.widgets.Table, org.eclipse.ui.internal.WorkbenchPage) */ + @Override protected void addItems(Table table, WorkbenchPage page) { IWorkbenchPartReference refs[] = page.getSortedParts(); boolean includeEditor = true; @@ -62,6 +63,7 @@ public class CycleViewHandler extends CycleBaseHandler { /* (non-Javadoc) * @see org.eclipse.ui.internal.CycleBaseHandler#getBackwardCommand() */ + @Override protected ParameterizedCommand getBackwardCommand() { // TODO Auto-generated method stub final ICommandService commandService = (ICommandService) window.getWorkbench().getService(ICommandService.class); @@ -73,6 +75,7 @@ public class CycleViewHandler extends CycleBaseHandler { /* (non-Javadoc) * @see org.eclipse.ui.internal.CycleBaseHandler#getForwardCommand() */ + @Override protected ParameterizedCommand getForwardCommand() { // TODO Auto-generated method stub final ICommandService commandService = (ICommandService) window.getWorkbench().getService(ICommandService.class); @@ -84,6 +87,7 @@ public class CycleViewHandler extends CycleBaseHandler { /* (non-Javadoc) * @see org.eclipse.ui.internal.CycleBaseHandler#getTableHeader() */ + @Override protected String getTableHeader(IWorkbenchPart activePart) { // TODO Auto-generated method stub return WorkbenchMessages.CyclePartAction_header; diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/DefaultSaveable.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/DefaultSaveable.java index ed85b6d6a2f..4e3db5a521d 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/DefaultSaveable.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/DefaultSaveable.java @@ -48,6 +48,7 @@ public class DefaultSaveable extends Saveable { * * @see org.eclipse.ui.Saveable#doSave(org.eclipse.core.runtime.IProgressMonitor) */ + @Override public void doSave(IProgressMonitor monitor) { if (part instanceof ISaveablePart) { ISaveablePart saveable = (ISaveablePart) part; @@ -60,6 +61,7 @@ public class DefaultSaveable extends Saveable { * * @see org.eclipse.ui.Saveable#getName() */ + @Override public String getName() { if (part instanceof IWorkbenchPart2) { return ((IWorkbenchPart2) part).getPartName(); @@ -72,6 +74,7 @@ public class DefaultSaveable extends Saveable { * * @see org.eclipse.ui.Saveable#getImageDescriptor() */ + @Override public ImageDescriptor getImageDescriptor() { Image image = part.getTitleImage(); if (image == null) { @@ -85,6 +88,7 @@ public class DefaultSaveable extends Saveable { * * @see org.eclipse.ui.Saveable#getToolTipText() */ + @Override public String getToolTipText() { return part.getTitleToolTip(); } @@ -94,6 +98,7 @@ public class DefaultSaveable extends Saveable { * * @see org.eclipse.ui.Saveable#isDirty() */ + @Override public boolean isDirty() { if (part instanceof ISaveablePart) { return ((ISaveablePart) part).isDirty(); @@ -104,6 +109,7 @@ public class DefaultSaveable extends Saveable { /* (non-Javadoc) * @see java.lang.Object#hashCode() */ + @Override public int hashCode() { return part.hashCode(); } @@ -111,6 +117,7 @@ public class DefaultSaveable extends Saveable { /* (non-Javadoc) * @see java.lang.Object#equals(java.lang.Object) */ + @Override public boolean equals(Object obj) { if (this == obj) return true; @@ -130,6 +137,7 @@ public class DefaultSaveable extends Saveable { /* (non-Javadoc) * @see org.eclipse.ui.Saveable#show(org.eclipse.ui.IWorkbenchPage) */ + @Override public boolean show(IWorkbenchPage page) { IWorkbenchPartReference reference = page.getReference(part); if (reference != null) { diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/DefaultStackPresentationSite.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/DefaultStackPresentationSite.java index 9fb2670cf8a..c020c6da70f 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/DefaultStackPresentationSite.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/DefaultStackPresentationSite.java @@ -44,7 +44,8 @@ public abstract class DefaultStackPresentationSite implements return presentation; } - public int getState() { + @Override + public int getState() { return state; } @@ -64,7 +65,8 @@ public abstract class DefaultStackPresentationSite implements /* (non-Javadoc) * @see org.eclipse.ui.internal.skins.IStackPresentationSite#selectPart(org.eclipse.ui.internal.skins.IPresentablePart) */ - public void selectPart(IPresentablePart toSelect) { + @Override + public void selectPart(IPresentablePart toSelect) { if (presentation != null) { presentation.selectPart(toSelect); @@ -81,7 +83,8 @@ public abstract class DefaultStackPresentationSite implements /* (non-Javadoc) * @see org.eclipse.ui.internal.skins.IPresentationSite#setState(int) */ - public void setState(int newState) { + @Override + public void setState(int newState) { setPresentationState(newState); } @@ -95,14 +98,16 @@ public abstract class DefaultStackPresentationSite implements /* (non-Javadoc) * @see org.eclipse.ui.internal.skins.IPresentablePart#isClosable() */ - public boolean isCloseable(IPresentablePart part) { + @Override + public boolean isCloseable(IPresentablePart part) { return part.isCloseable(); } /* (non-Javadoc) * @see org.eclipse.ui.internal.skins.IPresentationSite#dragStart(org.eclipse.ui.internal.skins.IPresentablePart, boolean) */ - public void dragStart(IPresentablePart beingDragged, Point initialPosition, + @Override + public void dragStart(IPresentablePart beingDragged, Point initialPosition, boolean keyboard) { } @@ -115,27 +120,33 @@ public abstract class DefaultStackPresentationSite implements /* (non-Javadoc) * @see org.eclipse.ui.internal.skins.IPresentationSite#dragStart(boolean) */ - public void dragStart(Point initialPosition, boolean keyboard) { + @Override + public void dragStart(Point initialPosition, boolean keyboard) { } /* (non-Javadoc) * @see org.eclipse.ui.presentations.IStackPresentationSite#supportsState(int) */ - public boolean supportsState(int state) { + @Override + public boolean supportsState(int state) { return true; } /* (non-Javadoc) * @see org.eclipse.ui.presentations.IStackPresentationSite#getSelectedPart() */ - public abstract IPresentablePart getSelectedPart(); + @Override + public abstract IPresentablePart getSelectedPart(); - public void addSystemActions(IMenuManager menuManager) { + @Override + public void addSystemActions(IMenuManager menuManager) { } - public abstract boolean isPartMoveable(IPresentablePart toMove); + @Override + public abstract boolean isPartMoveable(IPresentablePart toMove); - public abstract boolean isStackMoveable(); + @Override + public abstract boolean isStackMoveable(); } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/DirtyPerspectiveMarker.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/DirtyPerspectiveMarker.java index d8881b9e65a..ed8a3cecad0 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/DirtyPerspectiveMarker.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/DirtyPerspectiveMarker.java @@ -26,6 +26,7 @@ public class DirtyPerspectiveMarker { /* (non-Javadoc) * @see java.lang.Object#hashCode() */ + @Override public int hashCode() { return perspectiveId.hashCode(); } @@ -33,6 +34,7 @@ public class DirtyPerspectiveMarker { /* (non-Javadoc) * @see java.lang.Object#equals(java.lang.Object) */ + @Override public boolean equals(Object o) { if (o instanceof DirtyPerspectiveMarker) { return perspectiveId diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/DragHandle.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/DragHandle.java index ffecd6b4404..dfc28670597 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/DragHandle.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/DragHandle.java @@ -74,6 +74,7 @@ public DragHandle(Composite parent) { setCursor(dragCursor); } +@Override public void paintControl(PaintEvent e) { Point size = getSize(); @@ -100,6 +101,7 @@ public void paintControl(PaintEvent e) { } } } +@Override public Point computeSize(int wHint, int hHint, boolean changed) { Point result = new Point(wHint, hHint); @@ -120,6 +122,7 @@ public void setHorizontal(boolean isHorizontal) { this.isHorizontal = isHorizontal; } +@Override public void dispose() { if (isDisposed()) { return; diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/EarlyStartupRunnable.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/EarlyStartupRunnable.java index 6d4afc2cc43..888c94addbf 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/EarlyStartupRunnable.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/EarlyStartupRunnable.java @@ -52,7 +52,8 @@ public class EarlyStartupRunnable extends SafeRunnable { this.extension = extension; } - public void run() throws Exception { + @Override + public void run() throws Exception { IConfigurationElement[] configElements = extension .getConfigurationElements(); @@ -74,7 +75,8 @@ public class EarlyStartupRunnable extends SafeRunnable { } } - public void handleException(Throwable exception) { + @Override + public void handleException(Throwable exception) { IStatus status = new Status(IStatus.ERROR, extension.getNamespace(), 0, "Unable to execute early startup code for an extension", //$NON-NLS-1$ exception); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/EditorActionBars.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/EditorActionBars.java index c385ad1a725..b2ab84cadfd 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/EditorActionBars.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/EditorActionBars.java @@ -47,14 +47,17 @@ public class EditorActionBars extends SubActionBars2 { private class Overrides implements IContributionManagerOverrides { + @Override public Integer getAccelerator(IContributionItem item) { return null; } + @Override public String getAcceleratorText(IContributionItem item) { return null; } + @Override public Boolean getEnabled(IContributionItem item) { if (((item instanceof ActionContributionItem) && (((ActionContributionItem) item) .getAction() instanceof RetargetAction)) @@ -65,6 +68,7 @@ public class EditorActionBars extends SubActionBars2 { } } + @Override public String getText(IContributionItem item) { return null; } @@ -76,6 +80,7 @@ public class EditorActionBars extends SubActionBars2 { * org.eclipse.jface.action.IContributionManagerOverrides#getVisible * (org.eclipse.jface.action.IContributionItem) */ + @Override public Boolean getVisible(IContributionItem item) { return null; } @@ -121,6 +126,7 @@ public class EditorActionBars extends SubActionBars2 { /** * Activate the contributions. */ + @Override public void activate(boolean forceVisibility) { setActive(true, forceVisibility); } @@ -135,6 +141,7 @@ public class EditorActionBars extends SubActionBars2 { /* * (non-Javadoc) Method declared on SubActionBars. */ + @Override protected SubMenuManager createSubMenuManager(IMenuManager parent) { return new EditorMenuManager(parent); } @@ -142,6 +149,7 @@ public class EditorActionBars extends SubActionBars2 { /* * (non-Javadoc) Method declared on SubActionBars. */ + @Override protected SubToolBarManager createSubToolBarManager(IToolBarManager parent) { // return null, editor actions are managed by CoolItemToolBarManagers return null; @@ -150,6 +158,7 @@ public class EditorActionBars extends SubActionBars2 { /** * Deactivate the contributions. */ + @Override public void deactivate(boolean forceVisibility) { setActive(false, forceVisibility); } @@ -157,6 +166,7 @@ public class EditorActionBars extends SubActionBars2 { /** * Dispose the contributions. */ + @Override public void dispose() { super.dispose(); if (editorContributor != null) { @@ -249,6 +259,7 @@ public class EditorActionBars extends SubActionBars2 { * * @return the tool bar manager */ + @Override public IToolBarManager getToolBarManager() { // by pass the sub coolBar and use the real cool bar. @@ -334,6 +345,7 @@ public class EditorActionBars extends SubActionBars2 { * important because the action vector is shared by editors of the same * type. */ + @Override public void partChanged(IWorkbenchPart part) { super.partChanged(part); if (part instanceof IEditorPart) { diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/EditorActionBuilder.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/EditorActionBuilder.java index 42130b1fb8a..be2a879083a 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/EditorActionBuilder.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/EditorActionBuilder.java @@ -36,7 +36,8 @@ public class EditorActionBuilder extends PluginActionBuilder { /* (non-Javadoc) * Method declared on PluginActionBuilder. */ - protected ActionDescriptor createActionDescriptor( + @Override + protected ActionDescriptor createActionDescriptor( IConfigurationElement element) { return new ActionDescriptor(element, ActionDescriptor.T_EDITOR); } @@ -44,7 +45,8 @@ public class EditorActionBuilder extends PluginActionBuilder { /* (non-Javadoc) * Method declared on PluginActionBuilder. */ - protected BasicContribution createContribution() { + @Override + protected BasicContribution createContribution() { return new EditorContribution(); } @@ -69,7 +71,8 @@ public class EditorActionBuilder extends PluginActionBuilder { * contribution element. */ private static class EditorContribution extends BasicContribution { - public void dispose() { + @Override + public void dispose() { disposeActions(); super.dispose(); } @@ -98,7 +101,8 @@ public class EditorActionBuilder extends PluginActionBuilder { this.cache = cache; } - public void dispose() { + @Override + public void dispose() { for (int i = 0; i < cache.size(); i++) { ((EditorContribution) cache.get(i)).dispose(); } @@ -116,7 +120,8 @@ public class EditorActionBuilder extends PluginActionBuilder { .toArray(new ActionDescriptor[results.size()]); } - public void init(IActionBars bars, IWorkbenchPage page) { + @Override + public void init(IActionBars bars, IWorkbenchPage page) { for (int i = 0; i < cache.size(); i++) { ((EditorContribution) cache.get(i)).contribute(bars .getMenuManager(), false, bars.getToolBarManager(), @@ -124,7 +129,8 @@ public class EditorActionBuilder extends PluginActionBuilder { } } - public void setActiveEditor(IEditorPart editor) { + @Override + public void setActiveEditor(IEditorPart editor) { for (int i = 0; i < cache.size(); i++) { ((EditorContribution) cache.get(i)).editorChanged(editor); } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/EditorMenuManager.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/EditorMenuManager.java index 265fc8d3580..b82dd3f70cd 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/EditorMenuManager.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/EditorMenuManager.java @@ -53,7 +53,8 @@ public class EditorMenuManager extends SubMenuManager { } } - public Boolean getEnabled(IContributionItem item) { + @Override + public Boolean getEnabled(IContributionItem item) { if (((item instanceof ActionContributionItem) && (((ActionContributionItem) item) .getAction() instanceof RetargetAction)) || enabledAllowed) { @@ -63,7 +64,8 @@ public class EditorMenuManager extends SubMenuManager { } } - public Integer getAccelerator(IContributionItem item) { + @Override + public Integer getAccelerator(IContributionItem item) { if (getEnabled(item) == null) { return getParentMenuManager().getOverrides().getAccelerator( item); @@ -73,19 +75,22 @@ public class EditorMenuManager extends SubMenuManager { } } - public String getAcceleratorText(IContributionItem item) { + @Override + public String getAcceleratorText(IContributionItem item) { return getParentMenuManager().getOverrides().getAcceleratorText( item); } - public String getText(IContributionItem item) { + @Override + public String getText(IContributionItem item) { return getParentMenuManager().getOverrides().getText(item); } /* (non-Javadoc) * @see org.eclipse.jface.action.IContributionManagerOverrides#getVisible(org.eclipse.jface.action.IContributionItem) */ - public Boolean getVisible(IContributionItem item) { + @Override + public Boolean getVisible(IContributionItem item) { return getParentMenuManager().getOverrides().getVisible(item); } } @@ -102,14 +107,16 @@ public class EditorMenuManager extends SubMenuManager { /* (non-Javadoc) * Method declared on IContributionManager. */ - public IContributionItem[] getItems() { + @Override + public IContributionItem[] getItems() { return getParentMenuManager().getItems(); } /* (non-Javadoc) * Method declared on IContributionManager. */ - public IContributionManagerOverrides getOverrides() { + @Override + public IContributionManagerOverrides getOverrides() { return overrides; } @@ -118,7 +125,8 @@ public class EditorMenuManager extends SubMenuManager { * Inserts the new item after any action set contributions which may * exist within the toolbar to ensure a consistent order for actions. */ - public void prependToGroup(String groupName, IContributionItem item) { + @Override + public void prependToGroup(String groupName, IContributionItem item) { insertAfter(groupName, item); } @@ -196,7 +204,8 @@ public class EditorMenuManager extends SubMenuManager { /* (non-Javadoc) * Method declared on SubMenuManager. */ - protected SubMenuManager wrapMenu(IMenuManager menu) { + @Override + protected SubMenuManager wrapMenu(IMenuManager menu) { if (wrappers == null) { wrappers = new ArrayList(); } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/EditorPluginAction.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/EditorPluginAction.java index aa6e64794bd..6c34750e67a 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/EditorPluginAction.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/EditorPluginAction.java @@ -38,7 +38,8 @@ public final class EditorPluginAction extends PartPluginAction { /* (non-Javadoc) * Method declared on PluginAction. */ - protected IActionDelegate validateDelegate(Object obj) + @Override + protected IActionDelegate validateDelegate(Object obj) throws WorkbenchException { if (obj instanceof IEditorActionDelegate) { return (IEditorActionDelegate) obj; @@ -51,7 +52,8 @@ public final class EditorPluginAction extends PartPluginAction { /* (non-Javadoc) * Method declared on PluginAction. */ - protected void initDelegate() { + @Override + protected void initDelegate() { super.initDelegate(); ((IEditorActionDelegate) getDelegate()).setActiveEditor(this, currentEditor); @@ -83,6 +85,7 @@ public final class EditorPluginAction extends PartPluginAction { /* (non-Javadoc) * @see org.eclipse.ui.internal.PluginAction#dispose() */ + @Override public void dispose() { if (currentEditor != null) { unregisterSelectionListener(currentEditor); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/EditorReference.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/EditorReference.java index 7a25e0ee782..ac1039c4096 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/EditorReference.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/EditorReference.java @@ -191,6 +191,7 @@ public class EditorReference extends WorkbenchPartReference implements IEditorRe return descriptorId; } + @Override public String getFactoryId() { IEditorPart editor = getEditor(false); if (editor == null) { @@ -219,6 +220,7 @@ public class EditorReference extends WorkbenchPartReference implements IEditorRe return persistable == null ? null : persistable.getFactoryId(); } + @Override public String getName() { IEditorPart editor = getEditor(false); if (input == null) { @@ -228,6 +230,7 @@ public class EditorReference extends WorkbenchPartReference implements IEditorRe return editor == null ? input.getName() : editor.getEditorInput().getName(); } + @Override public String getTitle() { String label = Util.safeString(getModel().getLocalizedLabel()); if (label.length() == 0) { @@ -290,6 +293,7 @@ public class EditorReference extends WorkbenchPartReference implements IEditorRe * * @see org.eclipse.ui.IEditorReference#getEditor(boolean) */ + @Override public IEditorPart getEditor(boolean restore) { return (IEditorPart) getPart(restore); } @@ -299,6 +303,7 @@ public class EditorReference extends WorkbenchPartReference implements IEditorRe * * @see org.eclipse.ui.IEditorReference#getEditorInput() */ + @Override public IEditorInput getEditorInput() throws PartInitException { IEditorPart editor = getEditor(false); if (editor != null) { diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/EditorSite.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/EditorSite.java index 04ac2845879..70e20f61beb 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/EditorSite.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/EditorSite.java @@ -58,7 +58,8 @@ public class EditorSite extends PartSite implements IEditorSite { serviceLocator.registerService(IEditorPart.class, (IEditorPart) getPart()); } - public void setActionBars(SubActionBars bars) { + @Override + public void setActionBars(SubActionBars bars) { super.setActionBars(bars); if (bars instanceof IActionBars2) { @@ -68,14 +69,16 @@ public class EditorSite extends PartSite implements IEditorSite { } } - public void activateActionBars(boolean forceVisibility) { + @Override + public void activateActionBars(boolean forceVisibility) { if (ab != null) { ab.activate(forceVisibility); } super.activateActionBars(forceVisibility); } - public void deactivateActionBars(boolean forceHide) { + @Override + public void deactivateActionBars(boolean forceHide) { if (ab != null) { ab.deactivate(forceHide); } @@ -93,7 +96,8 @@ public class EditorSite extends PartSite implements IEditorSite { * * @return the editor action bar contributor */ - public IEditorActionBarContributor getActionBarContributor() { + @Override + public IEditorActionBarContributor getActionBarContributor() { EditorActionBars bars = (EditorActionBars) getActionBars(); if (bars != null) { return bars.getEditorContributor(); @@ -121,11 +125,13 @@ public class EditorSite extends PartSite implements IEditorSite { return (IEditorPart) getPart(); } - protected String getInitialScopeId() { + @Override + protected String getInitialScopeId() { return "org.eclipse.ui.textEditorScope"; //$NON-NLS-1$ } - public void dispose() { + @Override + public void dispose() { super.dispose(); if (ab != null) { @@ -134,14 +140,16 @@ public class EditorSite extends PartSite implements IEditorSite { } } - public final void registerContextMenu(final MenuManager menuManager, + @Override + public final void registerContextMenu(final MenuManager menuManager, final ISelectionProvider selectionProvider, final boolean includeEditorInput) { registerContextMenu(getId(), menuManager, selectionProvider, includeEditorInput); } - public final void registerContextMenu(final String menuId, + @Override + public final void registerContextMenu(final String menuId, final MenuManager menuManager, final ISelectionProvider selectionProvider, final boolean includeEditorInput) { diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/EditorSiteDragAndDropServiceImpl.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/EditorSiteDragAndDropServiceImpl.java index ee80111b851..1fc83a9bea4 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/EditorSiteDragAndDropServiceImpl.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/EditorSiteDragAndDropServiceImpl.java @@ -100,21 +100,27 @@ public class EditorSiteDragAndDropServiceImpl implements IDragAndDropService, ID // Create a listener that will delegate to the appropriate listener // NOTE: the -editor- wins (i.e. it can over-ride WB behaviour if it wants realDropTarget.addDropListener(new DropTargetListener() { + @Override public void dragEnter(DropTargetEvent event) { getAppropriateListener(event, true).dragEnter(event); } + @Override public void dragLeave(DropTargetEvent event) { getAppropriateListener(event, false).dragLeave(event); } + @Override public void dragOperationChanged(DropTargetEvent event) { getAppropriateListener(event, true).dragOperationChanged(event); } + @Override public void dragOver(DropTargetEvent event) { getAppropriateListener(event, true).dragOver(event); } + @Override public void drop(DropTargetEvent event) { getAppropriateListener(event, true).drop(event); } + @Override public void dropAccept(DropTargetEvent event) { getAppropriateListener(event, true).dropAccept(event); } @@ -153,6 +159,7 @@ public class EditorSiteDragAndDropServiceImpl implements IDragAndDropService, ID /* (non-Javadoc) * @see org.eclipse.ui.dnd.IEditorDropTargetService#addDropTarget(org.eclipse.swt.widgets.Control, int, org.eclipse.swt.dnd.Transfer[], org.eclipse.swt.dnd.DropTargetListener) */ + @Override public void addMergedDropTarget(Control control, int ops, Transfer[] transfers, DropTargetListener listener) { // First we have to remove any existing drop target from the control @@ -173,6 +180,7 @@ public class EditorSiteDragAndDropServiceImpl implements IDragAndDropService, ID addedListeners.add(newTarget); newTarget.realDropTarget.addDisposeListener(new DisposeListener() { + @Override public void widgetDisposed(DisposeEvent e) { Object mdt = e.widget.getData(MDT_KEY); addedListeners.remove(mdt); @@ -198,6 +206,7 @@ public class EditorSiteDragAndDropServiceImpl implements IDragAndDropService, ID /* (non-Javadoc) * @see org.eclipse.ui.dnd.IDragAndDropService#removeMergedDropTarget(org.eclipse.swt.widgets.Control) */ + @Override public void removeMergedDropTarget(Control control) { DropTarget targetForControl = getCurrentDropTarget(control); if (targetForControl != null) { @@ -209,6 +218,7 @@ public class EditorSiteDragAndDropServiceImpl implements IDragAndDropService, ID /* (non-Javadoc) * @see org.eclipse.ui.services.IDisposable#dispose() */ + @Override public void dispose() { addedListeners.clear(); } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ErrorEditorPart.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ErrorEditorPart.java index dab9a2f2c46..3af54666e48 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ErrorEditorPart.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ErrorEditorPart.java @@ -48,6 +48,7 @@ public class ErrorEditorPart extends EditorPart { * * @see org.eclipse.ui.part.EditorPart#doSave(org.eclipse.core.runtime.IProgressMonitor) */ + @Override public void doSave(IProgressMonitor monitor) { } @@ -56,6 +57,7 @@ public class ErrorEditorPart extends EditorPart { * * @see org.eclipse.ui.part.EditorPart#doSaveAs() */ + @Override public void doSaveAs() { } @@ -64,6 +66,7 @@ public class ErrorEditorPart extends EditorPart { * * @see org.eclipse.ui.part.WorkbenchPart#createPartControl(org.eclipse.swt.widgets.Composite) */ + @Override public void createPartControl(Composite parent) { this.parentControl = parent; if (error != null) { @@ -77,6 +80,7 @@ public class ErrorEditorPart extends EditorPart { * @see org.eclipse.ui.part.EditorPart#init(org.eclipse.ui.IEditorSite, * org.eclipse.ui.IEditorInput) */ + @Override public void init(IEditorSite site, IEditorInput input) { setSite(site); setInput(input); @@ -88,6 +92,7 @@ public class ErrorEditorPart extends EditorPart { * * @see org.eclipse.ui.part.EditorPart#isDirty() */ + @Override public boolean isDirty() { return false; } @@ -97,6 +102,7 @@ public class ErrorEditorPart extends EditorPart { * * @see org.eclipse.ui.part.EditorPart#isSaveAsAllowed() */ + @Override public boolean isSaveAsAllowed() { return false; } @@ -106,6 +112,7 @@ public class ErrorEditorPart extends EditorPart { * * @see org.eclipse.ui.part.WorkbenchPart#setFocus() */ + @Override public void setFocus() { parentControl.setFocus(); } @@ -115,6 +122,7 @@ public class ErrorEditorPart extends EditorPart { * * @see org.eclipse.ui.part.EditorPart#setPartName(java.lang.String) */ + @Override public void setPartName(String newName) { super.setPartName(newName); } @@ -124,6 +132,7 @@ public class ErrorEditorPart extends EditorPart { * * @see org.eclipse.ui.part.WorkbenchPart#dispose() */ + @Override public void dispose() { super.dispose(); parentControl = null; diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ErrorViewPart.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ErrorViewPart.java index 7cd586d2897..c5c3e0ec47a 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ErrorViewPart.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ErrorViewPart.java @@ -47,6 +47,7 @@ public class ErrorViewPart extends ViewPart { * * @see org.eclipse.ui.part.WorkbenchPart#createPartControl(org.eclipse.swt.widgets.Composite) */ + @Override public void createPartControl(Composite parent) { parentControl = parent; if (error != null) { @@ -59,6 +60,7 @@ public class ErrorViewPart extends ViewPart { * * @see org.eclipse.ui.part.ViewPart#setPartName(java.lang.String) */ + @Override public void setPartName(String newName) { super.setPartName(newName); } @@ -68,6 +70,7 @@ public class ErrorViewPart extends ViewPart { * * @see org.eclipse.ui.part.WorkbenchPart#setFocus() */ + @Override public void setFocus() { parentControl.setFocus(); } @@ -77,6 +80,7 @@ public class ErrorViewPart extends ViewPart { * * @see org.eclipse.ui.part.WorkbenchPart#dispose() */ + @Override public void dispose() { super.dispose(); parentControl = null; diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ExceptionHandler.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ExceptionHandler.java index 790f5751b31..cf7854dc118 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ExceptionHandler.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ExceptionHandler.java @@ -40,7 +40,8 @@ public final class ExceptionHandler implements Window.IExceptionHandler { /* (non-javadoc) * @see org.eclipse.jface.window.Window.IExceptionHandler#handleException */ - public void handleException(Throwable t) { + @Override + public void handleException(Throwable t) { try { // Ignore ThreadDeath error as its normal to get this when thread dies if (t instanceof ThreadDeath) { diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ExtensionEventHandler.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ExtensionEventHandler.java index 74c2d60cf76..d876136ea41 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ExtensionEventHandler.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ExtensionEventHandler.java @@ -49,7 +49,8 @@ class ExtensionEventHandler implements IRegistryChangeListener { this.workbench = workbench; } - public void registryChanged(IRegistryChangeEvent event) { + @Override + public void registryChanged(IRegistryChangeEvent event) { try { IExtensionDelta delta[] = event .getExtensionDeltas(WorkbenchPlugin.PI_WORKBENCH); @@ -127,7 +128,8 @@ class ExtensionEventHandler implements IRegistryChangeListener { private void asyncAppear(Display display, final IExtensionPoint extpt, final IExtension ext) { Runnable run = new Runnable() { - public void run() { + @Override + public void run() { appear(extpt, ext); } }; @@ -211,7 +213,8 @@ class ExtensionEventHandler implements IRegistryChangeListener { message.append(ExtensionEventHandlerMessages.ExtensionEventHandler_need_to_reset); display.asyncExec(new Runnable() { - public void run() { + @Override + public void run() { Shell parentShell = null; IWorkbenchWindow window = workbench.getActiveWorkbenchWindow(); if (window == null) { diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/FaderAnimationFeedback.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/FaderAnimationFeedback.java index b18df8b3088..f9a7cd12d55 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/FaderAnimationFeedback.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/FaderAnimationFeedback.java @@ -35,6 +35,7 @@ public class FaderAnimationFeedback extends AnimationFeedbackBase { super(parentShell); } + @Override public void dispose() { super.dispose(); @@ -42,6 +43,7 @@ public class FaderAnimationFeedback extends AnimationFeedbackBase { backingStore.dispose(); } + @Override public void initialize(AnimationEngine engine) { Rectangle psRect = getBaseShell().getBounds(); getAnimationShell().setBounds(psRect); @@ -59,6 +61,7 @@ public class FaderAnimationFeedback extends AnimationFeedbackBase { getAnimationShell().setVisible(true); } + @Override public void renderStep(AnimationEngine engine) { getAnimationShell().setAlpha((int) (255 - (engine.amount()*255))); } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/HeapStatus.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/HeapStatus.java index c8fb21e25d0..c3f3628bcbb 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/HeapStatus.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/HeapStatus.java @@ -71,7 +71,8 @@ public class HeapStatus extends Composite { protected volatile boolean isInGC = false; private final Runnable timer = new Runnable() { - public void run() { + @Override + public void run() { if (!isDisposed()) { updateStats(); if (hasChanged) { @@ -87,6 +88,7 @@ public class HeapStatus extends Composite { }; private final IPropertyChangeListener prefListener = new IPropertyChangeListener() { + @Override public void propertyChange(PropertyChangeEvent event) { if (IHeapStatusConstants.PREF_UPDATE_INTERVAL.equals(event.getProperty())) { setUpdateIntervalInMS(prefStore.getInt(IHeapStatusConstants.PREF_UPDATE_INTERVAL)); @@ -139,7 +141,8 @@ public class HeapStatus extends Composite { Listener listener = new Listener() { - public void handleEvent(Event event) { + @Override + public void handleEvent(Event event) { switch (event.type) { case SWT.Dispose: doDispose(); @@ -204,6 +207,7 @@ public class HeapStatus extends Composite { updateStats(); getDisplay().asyncExec(new Runnable() { + @Override public void run() { if (!isDisposed()) { getDisplay().timerExec(updateInterval, timer); @@ -255,6 +259,7 @@ public class HeapStatus extends Composite { /* (non-Javadoc) * @see org.eclipse.swt.widgets.Composite#computeSize(int, int, boolean) */ + @Override public Point computeSize(int wHint, int hHint, boolean changed) { GC gc = new GC(this); Point p = gc.textExtent(WorkbenchMessages.HeapStatus_widthStr); @@ -294,6 +299,7 @@ public class HeapStatus extends Composite { MenuManager menuMgr = new MenuManager(); menuMgr.setRemoveAllWhenShown(true); menuMgr.addMenuListener(new IMenuListener() { + @Override public void menuAboutToShow(IMenuManager menuMgr) { fillMenu(menuMgr); } @@ -334,9 +340,11 @@ public class HeapStatus extends Composite { private void gc() { gcRunning(true); Thread t = new Thread() { + @Override public void run() { busyGC(); getDisplay().asyncExec(new Runnable() { + @Override public void run() { if (!isDisposed()) { gcRunning(false); @@ -537,7 +545,8 @@ public class HeapStatus extends Composite { super(WorkbenchMessages.SetMarkAction_text); } - public void run() { + @Override + public void run() { setMark(); } } @@ -547,7 +556,8 @@ public class HeapStatus extends Composite { super(WorkbenchMessages.ClearMarkAction_text); } - public void run() { + @Override + public void run() { clearMark(); } } @@ -559,7 +569,8 @@ public class HeapStatus extends Composite { setChecked(showMax); } - public void run() { + @Override + public void run() { prefStore.setValue(IHeapStatusConstants.PREF_SHOW_MAX, isChecked()); redraw(); } @@ -574,7 +585,8 @@ public class HeapStatus extends Composite { /* (non-Javadoc) * @see org.eclipse.jface.action.IAction#run() */ - public void run(){ + @Override + public void run(){ dispose(); } } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/IWorkbenchConstants.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/IWorkbenchConstants.java index a92858d292e..ed6063c8413 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/IWorkbenchConstants.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/IWorkbenchConstants.java @@ -21,19 +21,22 @@ public interface IWorkbenchConstants { /** * @deprecated */ - public static final String ACCELERATOR_CONFIGURATION_ID = "acceleratorConfigurationId"; //$NON-NLS-1$ + @Deprecated + public static final String ACCELERATOR_CONFIGURATION_ID = "acceleratorConfigurationId"; //$NON-NLS-1$ public static final String DEFAULT_PRESENTATION_ID = "org.eclipse.ui.presentations.default"; //$NON-NLS-1$ /** * @deprecated */ - public static final String DEFAULT_ACCELERATOR_CONFIGURATION_ID = "org.eclipse.ui.defaultAcceleratorConfiguration"; //$NON-NLS-1$ + @Deprecated + public static final String DEFAULT_ACCELERATOR_CONFIGURATION_ID = "org.eclipse.ui.defaultAcceleratorConfiguration"; //$NON-NLS-1$ /** * @deprecated */ - public static final String DEFAULT_ACCELERATOR_SCOPE_ID = "org.eclipse.ui.globalScope"; //$NON-NLS-1$ + @Deprecated + public static final String DEFAULT_ACCELERATOR_SCOPE_ID = "org.eclipse.ui.globalScope"; //$NON-NLS-1$ //mappings for type/extension to an editor - backward compatibility only. public final static String EDITOR_FILE_NAME = "editors.xml"; //$NON-NLS-1$ diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ImageCycleFeedbackBase.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ImageCycleFeedbackBase.java index 4a337ddd78c..1fe108333b2 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ImageCycleFeedbackBase.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ImageCycleFeedbackBase.java @@ -78,6 +78,7 @@ public abstract class ImageCycleFeedbackBase extends AnimationFeedbackBase { */ public abstract void setStoppedImage(Image image); + @Override public void dispose() { // TODO Auto-generated method stub if (stoppedImage == null || stoppedImage.isDisposed()) @@ -91,10 +92,12 @@ public abstract class ImageCycleFeedbackBase extends AnimationFeedbackBase { offScreenImage.dispose(); } + @Override public boolean jobInit(AnimationEngine engine) { return super.jobInit(engine); } + @Override public void renderStep(AnimationEngine engine) { // TODO Auto-generated method stub if (offScreenImage == null) { @@ -118,6 +121,7 @@ public abstract class ImageCycleFeedbackBase extends AnimationFeedbackBase { * * @see java.lang.Runnable#run() */ + @Override public void run() { showImage(finalImage); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/JFaceUtil.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/JFaceUtil.java index 14bc42675bc..d44fa7f0749 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/JFaceUtil.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/JFaceUtil.java @@ -45,6 +45,7 @@ final class JFaceUtil { public static void initializeJFace() { // Set the SafeRunner to run all SafeRunnables SafeRunnable.setRunner(new ISafeRunnableRunner() { + @Override public void run(ISafeRunnable code) { SafeRunner.run(code); } @@ -53,6 +54,7 @@ final class JFaceUtil { // Pass all errors and warnings to the status handling facility // and the rest to the main runtime log Policy.setLog(new ILogger() { + @Override public void log(IStatus status) { if (status.getSeverity() == IStatus.WARNING || status.getSeverity() == IStatus.ERROR) { @@ -64,6 +66,7 @@ final class JFaceUtil { }); Policy.setStatusHandler(new StatusHandler() { + @Override public void show(IStatus status, String title) { StatusAdapter statusAdapter = new StatusAdapter(status); statusAdapter.setProperty(StatusAdapter.TITLE_PROPERTY, title); @@ -95,6 +98,7 @@ final class JFaceUtil { * * @see org.eclipse.core.runtime.preferences.IEclipsePreferences.INodeChangeListener#added(org.eclipse.core.runtime.preferences.IEclipsePreferences.NodeChangeEvent) */ + @Override public void added(NodeChangeEvent event) { if (!event.getChild().name().equals(workbenchName)) { return; @@ -107,6 +111,7 @@ final class JFaceUtil { * * @see org.eclipse.core.runtime.preferences.IEclipsePreferences.INodeChangeListener#removed(org.eclipse.core.runtime.preferences.IEclipsePreferences.NodeChangeEvent) */ + @Override public void removed(NodeChangeEvent event) { // Nothing to do here diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/KeyBindingService.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/KeyBindingService.java index 7eebbc843c9..42dcff63447 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/KeyBindingService.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/KeyBindingService.java @@ -104,7 +104,8 @@ public final class KeyBindingService implements INestableKeyBindingService { * * @see org.eclipse.ui.INestableKeyBindingService#activateKeyBindingService(org.eclipse.ui.IWorkbenchSite) */ - public boolean activateKeyBindingService(IWorkbenchSite nestedSite) { + @Override + public boolean activateKeyBindingService(IWorkbenchSite nestedSite) { if (disposed) { return false; } @@ -265,6 +266,7 @@ public final class KeyBindingService implements INestableKeyBindingService { * * @see org.eclipse.ui.INestableKeyBindingService#getKeyBindingService(org.eclipse.ui.IWorkbenchSite) */ + @Override public IKeyBindingService getKeyBindingService(IWorkbenchSite nestedSite) { if (disposed) { return null; @@ -290,7 +292,8 @@ public final class KeyBindingService implements INestableKeyBindingService { return service; } - public String[] getScopes() { + @Override + public String[] getScopes() { if (disposed) { return null; } @@ -305,7 +308,8 @@ public final class KeyBindingService implements INestableKeyBindingService { return activeScopes.toArray(new String[activeScopes.size()]); } - public void registerAction(IAction action) { + @Override + public void registerAction(IAction action) { if (disposed) { return; } @@ -359,6 +363,7 @@ public final class KeyBindingService implements INestableKeyBindingService { * * @see org.eclipse.ui.INestableKeyBindingService#removeKeyBindingService(org.eclipse.ui.IWorkbenchSite) */ + @Override public boolean removeKeyBindingService(IWorkbenchSite nestedSite) { if (disposed) { return false; @@ -376,7 +381,8 @@ public final class KeyBindingService implements INestableKeyBindingService { return true; } - public void setScopes(String[] scopes) { + @Override + public void setScopes(String[] scopes) { if (disposed) { return; } @@ -418,6 +424,7 @@ public final class KeyBindingService implements INestableKeyBindingService { } } + @Override public void unregisterAction(IAction action) { if (disposed) { return; diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/LegacyAnimationFeedback.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/LegacyAnimationFeedback.java index e796ce9ace8..008103c3947 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/LegacyAnimationFeedback.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/LegacyAnimationFeedback.java @@ -36,6 +36,7 @@ public class LegacyAnimationFeedback extends RectangleAnimationFeedbackBase { super(parentShell, start, end); } + @Override public void renderStep(AnimationEngine engine) { if (shellRegion != null) { shellRegion.dispose(); @@ -63,6 +64,7 @@ public class LegacyAnimationFeedback extends RectangleAnimationFeedbackBase { /* (non-Javadoc) * @see org.eclipse.ui.internal.AnimationFeedbackBase#initialize(org.eclipse.ui.internal.AnimationEngine) */ + @Override public void initialize(AnimationEngine engine) { Color color = getAnimationShell().getDisplay().getSystemColor(SWT.COLOR_WIDGET_DARK_SHADOW); getAnimationShell().setBackground(color); @@ -75,6 +77,7 @@ public class LegacyAnimationFeedback extends RectangleAnimationFeedbackBase { /* (non-Javadoc) * @see org.eclipse.ui.internal.AnimationFeedbackBase#dispose() */ + @Override public void dispose() { super.dispose(); @@ -86,6 +89,7 @@ public class LegacyAnimationFeedback extends RectangleAnimationFeedbackBase { * Perform any initialization you want to have happen -before- the * amination starts */ + @Override public boolean jobInit(AnimationEngine engine) { if (!super.jobInit(engine)) return false; diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/LocalWorkingSetManager.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/LocalWorkingSetManager.java index bd729c8fed4..8156cb8a38c 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/LocalWorkingSetManager.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/LocalWorkingSetManager.java @@ -26,6 +26,7 @@ public class LocalWorkingSetManager extends AbstractWorkingSetManager implements /** * {@inheritDoc} */ + @Override public void removeWorkingSet(IWorkingSet workingSet) { internalRemoveWorkingSet(workingSet); } @@ -33,6 +34,7 @@ public class LocalWorkingSetManager extends AbstractWorkingSetManager implements /** * {@inheritDoc} */ + @Override public void addRecentWorkingSet(IWorkingSet workingSet) { internalAddRecentWorkingSet(workingSet); } @@ -40,6 +42,7 @@ public class LocalWorkingSetManager extends AbstractWorkingSetManager implements /** * {@inheritDoc} */ + @Override public void saveState(IMemento memento) { saveWorkingSetState(memento); saveMruList(memento); @@ -48,6 +51,7 @@ public class LocalWorkingSetManager extends AbstractWorkingSetManager implements /** * {@inheritDoc} */ + @Override public void restoreState(IMemento memento) { Assert.isNotNull(memento); Assert.isTrue(getWorkingSets().length == 0); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/NavigationHistory.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/NavigationHistory.java index e9286b0b77d..aee740a554b 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/NavigationHistory.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/NavigationHistory.java @@ -64,25 +64,32 @@ public class NavigationHistory implements INavigationHistory { public NavigationHistory(final IWorkbenchPage page) { this.page = page; page.addPartListener(new IPartListener2() { - public void partActivated(IWorkbenchPartReference partRef) { + @Override + public void partActivated(IWorkbenchPartReference partRef) { } - public void partBroughtToTop(IWorkbenchPartReference partRef) { + @Override + public void partBroughtToTop(IWorkbenchPartReference partRef) { } - public void partDeactivated(IWorkbenchPartReference partRef) { + @Override + public void partDeactivated(IWorkbenchPartReference partRef) { } - public void partOpened(IWorkbenchPartReference partRef) { + @Override + public void partOpened(IWorkbenchPartReference partRef) { } - public void partHidden(IWorkbenchPartReference partRef) { + @Override + public void partHidden(IWorkbenchPartReference partRef) { } - public void partVisible(IWorkbenchPartReference partRef) { + @Override + public void partVisible(IWorkbenchPartReference partRef) { } - public void partClosed(IWorkbenchPartReference partRef) { + @Override + public void partClosed(IWorkbenchPartReference partRef) { if (isPerTabHistoryEnabled() && partRef instanceof EditorReference) { if (!((EditorReference)partRef).isDisposed()) { Object editorTabCookie = ((EditorReference) partRef).getModel().getWidget(); @@ -93,6 +100,7 @@ public class NavigationHistory implements INavigationHistory { updateNavigationHistory(partRef, true); } + @Override public void partInputChanged(IWorkbenchPartReference partRef) { updateNavigationHistory(partRef, false); } @@ -183,7 +191,8 @@ public class NavigationHistory implements INavigationHistory { * extra entry when using Open Declaration (F3) that opens another editor. */ ignoreEntries++; getDisplay().asyncExec(new Runnable() { - public void run() { + @Override + public void run() { if (--ignoreEntries == 0) { if (part.getEditorSite() instanceof EditorSite) { EditorSite site = (EditorSite) part.getEditorSite(); @@ -207,7 +216,8 @@ public class NavigationHistory implements INavigationHistory { * (non-Javadoc) * Method declared on INavigationHistory. */ - public void markLocation(IEditorPart part) { + @Override + public void markLocation(IEditorPart part) { addEntry(part); } @@ -256,7 +266,8 @@ public class NavigationHistory implements INavigationHistory { * (non-Javadoc) * Method declared on INavigationHistory. */ - public INavigationLocation[] getLocations() { + @Override + public INavigationLocation[] getLocations() { INavigationLocation result[] = new INavigationLocation[history.size()]; for (int i = 0; i < result.length; i++) { NavigationHistoryEntry e = (NavigationHistoryEntry) history.get(i); @@ -269,7 +280,8 @@ public class NavigationHistory implements INavigationHistory { * (non-Javadoc) * Method declared on INavigationHistory. */ - public INavigationLocation getCurrentLocation() { + @Override + public INavigationLocation getCurrentLocation() { NavigationHistoryEntry entry = getEntry(activeEntry); return entry == null ? null : entry.location; } @@ -625,6 +637,7 @@ public class NavigationHistory implements INavigationHistory { .findEditor(entry.editorInfo.editorInput)) { StartupThreading.runWithoutExceptions(new StartupRunnable() { + @Override public void runWithException() throws Throwable { gotoEntry(entry); }}); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/NavigationHistoryAction.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/NavigationHistoryAction.java index eb3a1067b51..7c3cd22bed2 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/NavigationHistoryAction.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/NavigationHistoryAction.java @@ -44,17 +44,20 @@ public class NavigationHistoryAction extends PageEventAction { private int MAX_HISTORY_LENGTH = 9; private class MenuCreator implements IMenuCreator { - public void dispose() { + @Override + public void dispose() { } - public Menu getMenu(Menu parent) { + @Override + public Menu getMenu(Menu parent) { setMenu(new Menu(parent)); fillMenu(historyMenu); initMenu(); return historyMenu; } - public Menu getMenu(Control parent) { + @Override + public Menu getMenu(Control parent) { setMenu(new Menu(parent)); fillMenu(historyMenu); initMenu(); @@ -69,7 +72,8 @@ public class NavigationHistoryAction extends PageEventAction { private void initMenu() { historyMenu.addMenuListener(new MenuAdapter() { - public void menuShown(MenuEvent e) { + @Override + public void menuShown(MenuEvent e) { if (recreateMenu) { Menu m = (Menu) e.widget; MenuItem[] items = m.getItems(); @@ -114,7 +118,8 @@ public class NavigationHistoryAction extends PageEventAction { } item.setText(text); item.addSelectionListener(new SelectionAdapter() { - public void widgetSelected(SelectionEvent e) { + @Override + public void widgetSelected(SelectionEvent e) { history .shiftCurrentEntry( (NavigationHistoryEntry) e.widget @@ -126,7 +131,8 @@ public class NavigationHistoryAction extends PageEventAction { recreateMenu = false; } - public void dispose() { + @Override + public void dispose() { super.dispose(); if (historyMenu != null) { for (int i = 0; i < historyMenu.getItemCount(); i++) { @@ -181,7 +187,8 @@ public class NavigationHistoryAction extends PageEventAction { /* (non-Javadoc) * Method declared on PageEventAction. */ - public void pageClosed(IWorkbenchPage page) { + @Override + public void pageClosed(IWorkbenchPage page) { super.pageClosed(page); setEnabled(false); } @@ -214,7 +221,8 @@ public class NavigationHistoryAction extends PageEventAction { /* (non-Javadoc) * Method declared on PageEventAction. */ - public void pageActivated(IWorkbenchPage page) { + @Override + public void pageActivated(IWorkbenchPage page) { super.pageActivated(page); NavigationHistory nh = (NavigationHistory) page.getNavigationHistory(); if (forward) { @@ -227,7 +235,8 @@ public class NavigationHistoryAction extends PageEventAction { /* (non-Javadoc) * Method declared on IAction. */ - public void run() { + @Override + public void run() { if (getWorkbenchWindow() == null) { // action has been disposed return; diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/NavigationHistoryEntry.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/NavigationHistoryEntry.java index 86480bf5726..abf7faf9d79 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/NavigationHistoryEntry.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/NavigationHistoryEntry.java @@ -153,7 +153,8 @@ public class NavigationHistoryEntry { * (non-Javadoc) * Method declared on Object. */ - public String toString() { + @Override + public String toString() { return "Input<" + editorInfo.editorInput + "> Details<" + location + ">"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ObjectActionContributor.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ObjectActionContributor.java index a87fad5ef17..29803d1e3f2 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ObjectActionContributor.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ObjectActionContributor.java @@ -66,7 +66,8 @@ public class ObjectActionContributor extends PluginActionBuilder implements /* (non-Javadoc) * Method declared on IObjectContributor. */ - public boolean canAdapt() { + @Override + public boolean canAdapt() { return adaptable; } @@ -82,7 +83,8 @@ public class ObjectActionContributor extends PluginActionBuilder implements /* (non-Javadoc) * Method declared on IObjectActionContributor. */ - public void contributeObjectActionIdOverrides(List actionIdOverrides) { + @Override + public void contributeObjectActionIdOverrides(List actionIdOverrides) { if (!configRead) { readConfigElement(); } @@ -103,7 +105,8 @@ public class ObjectActionContributor extends PluginActionBuilder implements /** * Contributes actions applicable for the current selection. */ - public boolean contributeObjectActions(final IWorkbenchPart part, + @Override + public boolean contributeObjectActions(final IWorkbenchPart part, IMenuManager menu, ISelectionProvider selProv, List actionIdOverrides) { if (!configRead) { @@ -147,11 +150,13 @@ public class ObjectActionContributor extends PluginActionBuilder implements final ObjectPluginAction action = (ObjectPluginAction) ad .getAction(); ISafeRunnable runnable = new ISafeRunnable() { + @Override public void handleException(Throwable exception) { WorkbenchPlugin.log("Failed to update action " //$NON-NLS-1$ + action.getId(), exception); } + @Override public void run() throws Exception { action.setActivePart(part); action.selectionChanged(selection); @@ -167,7 +172,8 @@ public class ObjectActionContributor extends PluginActionBuilder implements /** * Contributes menus applicable for the current selection. */ - public boolean contributeObjectMenus(IMenuManager menu, + @Override + public boolean contributeObjectMenus(IMenuManager menu, ISelectionProvider selProv) { if (!configRead) { readConfigElement(); @@ -196,7 +202,8 @@ public class ObjectActionContributor extends PluginActionBuilder implements /* (non-Javadoc) * Method declared on PluginActionBuilder. */ - protected ActionDescriptor createActionDescriptor( + @Override + protected ActionDescriptor createActionDescriptor( IConfigurationElement element) { return new ActionDescriptor(element, ActionDescriptor.T_POPUP); } @@ -204,7 +211,8 @@ public class ObjectActionContributor extends PluginActionBuilder implements /* (non-Javadoc) * Method declared on PluginActionBuilder. */ - protected BasicContribution createContribution() { + @Override + protected BasicContribution createContribution() { return new ObjectContribution(); } @@ -212,7 +220,8 @@ public class ObjectActionContributor extends PluginActionBuilder implements * Returns true if name filter is not specified for the contribution * or the current selection matches the filter. */ - public boolean isApplicableTo(Object object) { + @Override + public boolean isApplicableTo(Object object) { if (!configRead) { readConfigElement(); } @@ -255,7 +264,8 @@ public class ObjectActionContributor extends PluginActionBuilder implements /* (non-Javadoc) * Method declared on PluginActionBuilder. */ - protected boolean readElement(IConfigurationElement element) { + @Override + protected boolean readElement(IConfigurationElement element) { String tag = element.getName(); // Found visibility sub-element @@ -389,7 +399,8 @@ public class ObjectActionContributor extends PluginActionBuilder implements * Debugging helper that will print out the contribution names for this * contributor. */ - public String toString() { + @Override + public String toString() { StringBuffer buffer = new StringBuffer(); IConfigurationElement[] children = config.getChildren(); for (int i = 0; i < children.length; i++) { @@ -406,6 +417,7 @@ public class ObjectActionContributor extends PluginActionBuilder implements /* (non-Javadoc) * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class) */ + @Override public Object getAdapter(Class adapter) { if (adapter.equals(IConfigurationElement.class)) { return config; diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ObjectActionContributorManager.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ObjectActionContributorManager.java index d19ef86c85f..9b0a6c7474b 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ObjectActionContributorManager.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ObjectActionContributorManager.java @@ -124,6 +124,7 @@ public class ObjectActionContributorManager extends ObjectContributorManager { /* (non-Javadoc) * @see org.eclipse.core.runtime.dynamicHelpers.IExtensionChangeHandler#addExtension(org.eclipse.core.runtime.dynamicHelpers.IExtensionTracker, org.eclipse.core.runtime.IExtension) */ + @Override public void addExtension(IExtensionTracker tracker, IExtension addedExtension) { IConfigurationElement[] addedElements = addedExtension.getConfigurationElements(); for (int i = 0; i < addedElements.length; i++) { @@ -136,6 +137,7 @@ public class ObjectActionContributorManager extends ObjectContributorManager { /* (non-Javadoc) * @see org.eclipse.ui.internal.ObjectContributorManager#getExtensionPointFilter() */ + @Override protected String getExtensionPointFilter() { return IWorkbenchRegistryConstants.PL_POPUP_MENU; } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ObjectActionContributorReader.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ObjectActionContributorReader.java index e278da2b5c6..4cb7b7536db 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ObjectActionContributorReader.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ObjectActionContributorReader.java @@ -42,7 +42,8 @@ public class ObjectActionContributorReader extends RegistryReader { /** * Implements abstract method to handle configuration elements. */ - protected boolean readElement(IConfigurationElement element) { + @Override + protected boolean readElement(IConfigurationElement element) { String tagName = element.getName(); if (tagName.equals(IWorkbenchRegistryConstants.TAG_OBJECT_CONTRIBUTION)) { processObjectContribution(element); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ObjectContributorManager.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ObjectContributorManager.java index 7aa60275a5d..e885599d303 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ObjectContributorManager.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ObjectContributorManager.java @@ -554,7 +554,8 @@ public abstract class ObjectContributorManager implements IExtensionChangeHandle /* (non-Javadoc) * @see org.eclipse.core.runtime.dynamicHelpers.IExtensionChangeHandler#removeExtension(org.eclipse.core.runtime.IExtension, java.lang.Object[]) */ - public void removeExtension(IExtension source, Object[] objects) { + @Override + public void removeExtension(IExtension source, Object[] objects) { for (int i = 0; i < objects.length; i++) { if (objects[i] instanceof ContributorRecord) { ContributorRecord contributorRecord = (ContributorRecord) objects[i]; diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ObjectPluginAction.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ObjectPluginAction.java index 04d0ea8dde0..e99f8979c6b 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ObjectPluginAction.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ObjectPluginAction.java @@ -38,12 +38,15 @@ public class ObjectPluginAction extends PluginAction implements IPartListener2 { private IWorkbenchPart activePart; + @Override public void partActivated(IWorkbenchPartReference partRef) { } + @Override public void partBroughtToTop(IWorkbenchPartReference partRef) { } + @Override public void partClosed(IWorkbenchPartReference partRef) { if (activePart != null && partRef.getPart(false) == activePart) { selectionChanged(StructuredSelection.EMPTY); @@ -52,18 +55,23 @@ public class ObjectPluginAction extends PluginAction implements IPartListener2 { } } + @Override public void partDeactivated(IWorkbenchPartReference partRef) { } + @Override public void partHidden(IWorkbenchPartReference partRef) { } + @Override public void partInputChanged(IWorkbenchPartReference partRef) { } + @Override public void partOpened(IWorkbenchPartReference partRef) { } + @Override public void partVisible(IWorkbenchPartReference partRef) { } @@ -87,18 +95,21 @@ public class ObjectPluginAction extends PluginAction implements IPartListener2 { /* (non-Javadoc) * Method declared on PluginAction. */ - protected void initDelegate() { + @Override + protected void initDelegate() { super.initDelegate(); final IActionDelegate actionDelegate = getDelegate(); if (actionDelegate instanceof IObjectActionDelegate && activePart != null) { final IObjectActionDelegate objectActionDelegate = (IObjectActionDelegate) actionDelegate; final ISafeRunnable runnable = new ISafeRunnable() { + @Override public void run() throws Exception { objectActionDelegate.setActivePart(ObjectPluginAction.this, activePart); } + @Override public void handleException(Throwable exception) { // Do nothing. } @@ -131,11 +142,13 @@ public class ObjectPluginAction extends PluginAction implements IPartListener2 { if (delegate instanceof IObjectActionDelegate && activePart != null) { final IObjectActionDelegate objectActionDelegate = (IObjectActionDelegate) delegate; final ISafeRunnable runnable = new ISafeRunnable() { + @Override public void run() throws Exception { objectActionDelegate.setActivePart(ObjectPluginAction.this, activePart); } + @Override public void handleException(Throwable exception) { // Do nothing. } @@ -149,14 +162,16 @@ public class ObjectPluginAction extends PluginAction implements IPartListener2 { * * @return the action identifier to override or <code>null</code> */ - public String getOverrideActionId() { + @Override + public String getOverrideActionId() { return overrideActionId; } /* (non-Javadoc) * @see org.eclipse.ui.internal.PluginAction#dispose() */ - public void dispose() { + @Override + public void dispose() { if (activePart!=null) { activePart.getSite().getPage().removePartListener(this); activePart = null; diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/OpenPerspectivePropertyTester.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/OpenPerspectivePropertyTester.java index d3686bfafd6..7ad8aa49e90 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/OpenPerspectivePropertyTester.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/OpenPerspectivePropertyTester.java @@ -30,6 +30,7 @@ public class OpenPerspectivePropertyTester extends PropertyTester { * @see org.eclipse.core.expressions.IPropertyTester#test(java.lang.Object, * java.lang.String, java.lang.Object[], java.lang.Object) */ + @Override public boolean test(Object receiver, String property, Object[] args, Object expectedValue) { if (args.length == 0 && receiver instanceof WorkbenchWindow) { diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/OpenPreferencesAction.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/OpenPreferencesAction.java index 678ccc737d7..dbc9806af39 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/OpenPreferencesAction.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/OpenPreferencesAction.java @@ -56,6 +56,7 @@ public class OpenPreferencesAction extends Action implements ActionFactory.IWork /* (non-Javadoc) * Method declared on Action. */ + @Override public void run() { if (workbenchWindow == null) { // action has been dispose @@ -68,6 +69,7 @@ public class OpenPreferencesAction extends Action implements ActionFactory.IWork /* (non-Javadoc) * Method declared on ActionFactory.IWorkbenchAction. */ + @Override public void dispose() { workbenchWindow = null; } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/OverlayIcon.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/OverlayIcon.java index 5743fe585d1..77d4fbd6383 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/OverlayIcon.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/OverlayIcon.java @@ -44,7 +44,8 @@ public class OverlayIcon extends CompositeImageDescriptor { /* (non-Javadoc) * @see org.eclipse.jface.resource.CompositeImageDescriptor#drawCompositeImage(int, int) */ - protected void drawCompositeImage(int width, int height) { + @Override + protected void drawCompositeImage(int width, int height) { ImageData bg; if (fBase == null || (bg = fBase.getImageData()) == null) { bg = DEFAULT_IMAGE_DATA; @@ -73,7 +74,8 @@ public class OverlayIcon extends CompositeImageDescriptor { /* (non-Javadoc) * @see org.eclipse.jface.resource.CompositeImageDescriptor#getSize() */ - protected Point getSize() { + @Override + protected Point getSize() { return fSize; } @@ -81,14 +83,16 @@ public class OverlayIcon extends CompositeImageDescriptor { * (non-Javadoc) * @see java.lang.Object#hashCode() */ - public int hashCode() { + @Override + public int hashCode() { return Util.hashCode(fBase) * 17 + Util.hashCode(fOverlay); } /* (non-Javadoc) * @see java.lang.Object#equals(java.lang.Object) */ - public boolean equals(Object obj) { + @Override + public boolean equals(Object obj) { if (!(obj instanceof OverlayIcon)) { return false; } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/PageEventAction.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/PageEventAction.java index 085a2961ba4..a6d5edc04ad 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/PageEventAction.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/PageEventAction.java @@ -118,7 +118,8 @@ public abstract class PageEventAction extends PartEventAction implements * Subclasses may extend this method if action availability has to be * recalculated. */ - public void pageActivated(IWorkbenchPage page) { + @Override + public void pageActivated(IWorkbenchPage page) { this.activePage = page; } @@ -128,7 +129,8 @@ public abstract class PageEventAction extends PartEventAction implements * Subclasses may extend this method if action availability has to be * recalculated. */ - public void pageClosed(IWorkbenchPage page) { + @Override + public void pageClosed(IWorkbenchPage page) { if (page == activePage) { activePage = null; } @@ -139,7 +141,8 @@ public abstract class PageEventAction extends PartEventAction implements * <code>IPageListener</code> method does nothing. Subclasses should extend * this method if action availability has to be recalculated. */ - public void pageOpened(IWorkbenchPage page) { + @Override + public void pageOpened(IWorkbenchPage page) { // do nothing } @@ -152,7 +155,8 @@ public abstract class PageEventAction extends PartEventAction implements * * @since 3.0 */ - public void dispose() { + @Override + public void dispose() { if (workbenchWindow == null) { // action has already been disposed return; diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/PageListenerList.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/PageListenerList.java index bf99dbb3612..d7b8e1a6c9b 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/PageListenerList.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/PageListenerList.java @@ -64,7 +64,8 @@ public class PageListenerList extends EventManager { for (int i = 0; i < array.length; i++) { final IPageListener l = (IPageListener) array[i]; fireEvent(new SafeRunnable() { - public void run() { + @Override + public void run() { l.pageActivated(page); } }, l, page, "activated::"); //$NON-NLS-1$ @@ -79,7 +80,8 @@ public class PageListenerList extends EventManager { for (int i = 0; i < array.length; i++) { final IPageListener l = (IPageListener) array[i]; fireEvent(new SafeRunnable() { - public void run() { + @Override + public void run() { l.pageClosed(page); } }, l, page, "closed::"); //$NON-NLS-1$ @@ -94,7 +96,8 @@ public class PageListenerList extends EventManager { for (int i = 0; i < listeners.length; i++) { final IPageListener l = (IPageListener) listeners[i]; fireEvent(new SafeRunnable() { - public void run() { + @Override + public void run() { l.pageOpened(page); } }, l, page, "opened::"); //$NON-NLS-1$ diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/PagePartSelectionTracker.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/PagePartSelectionTracker.java index c2de3077d8a..92c28587b55 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/PagePartSelectionTracker.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/PagePartSelectionTracker.java @@ -45,13 +45,15 @@ public class PagePartSelectionTracker extends AbstractPartSelectionTracker private IWorkbenchPart fPart; private ISelectionChangedListener selectionListener = new ISelectionChangedListener() { - public void selectionChanged(SelectionChangedEvent event) { + @Override + public void selectionChanged(SelectionChangedEvent event) { fireSelection(getPart(), event.getSelection()); } }; private ISelectionChangedListener postSelectionListener = new ISelectionChangedListener() { - public void selectionChanged(SelectionChangedEvent event) { + @Override + public void selectionChanged(SelectionChangedEvent event) { firePostSelection(getPart(), event.getSelection()); } }; @@ -77,7 +79,8 @@ public class PagePartSelectionTracker extends AbstractPartSelectionTracker * Disposes this selection provider - removes all listeners * currently registered. */ - public void dispose() { + @Override + public void dispose() { IWorkbenchPage page = getPage(); page.getWorkbenchWindow().removePerspectiveListener(this); page.removePartListener(this); @@ -89,19 +92,22 @@ public class PagePartSelectionTracker extends AbstractPartSelectionTracker /* * @see IPartListener#partActivated(IWorkbenchPart) */ - public void partActivated(IWorkbenchPart part) { + @Override + public void partActivated(IWorkbenchPart part) { } /* * @see IPartListener#partBroughtToTop(IWorkbenchPart) */ - public void partBroughtToTop(IWorkbenchPart part) { + @Override + public void partBroughtToTop(IWorkbenchPart part) { } /** * @see IPartListener#partClosed(IWorkbenchPart) */ - public void partClosed(IWorkbenchPart part) { + @Override + public void partClosed(IWorkbenchPart part) { if (getPartId(part).equals(getPartId())) { setPart(null, true); } @@ -110,13 +116,15 @@ public class PagePartSelectionTracker extends AbstractPartSelectionTracker /* * @see IPartListener#partDeactivated(IWorkbenchPart) */ - public void partDeactivated(IWorkbenchPart part) { + @Override + public void partDeactivated(IWorkbenchPart part) { } /** * @see IPartListener#partOpened(IWorkbenchPart) */ - public void partOpened(IWorkbenchPart part) { + @Override + public void partOpened(IWorkbenchPart part) { if (getPartId(part).equals(getPartId())) { setPart(part, true); } @@ -146,7 +154,8 @@ public class PagePartSelectionTracker extends AbstractPartSelectionTracker * * @see ISelectionChangedListener#selectionChanged */ - public void selectionChanged(SelectionChangedEvent event) { + @Override + public void selectionChanged(SelectionChangedEvent event) { fireSelection(getPart(), event.getSelection()); } @@ -181,7 +190,8 @@ public class PagePartSelectionTracker extends AbstractPartSelectionTracker /* * @see AbstractPartSelectionTracker#getSelection() */ - public ISelection getSelection() { + @Override + public ISelection getSelection() { IWorkbenchPart part = getPart(); if (part != null) { ISelectionProvider sp = part.getSite().getSelectionProvider(); @@ -247,14 +257,17 @@ public class PagePartSelectionTracker extends AbstractPartSelectionTracker } } + @Override public void perspectiveActivated(IWorkbenchPage page, IPerspectiveDescriptor perspective) { // nothing to do } + @Override public void perspectiveChanged(IWorkbenchPage page, IPerspectiveDescriptor perspective, String changeId) { // nothing to do } + @Override public void perspectiveChanged(IWorkbenchPage page, IPerspectiveDescriptor perspective, IWorkbenchPartReference partRef, String changeId) { if (partRef == null) diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/PageSelectionService.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/PageSelectionService.java index 6550ee1ca3e..fe949dc5b68 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/PageSelectionService.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/PageSelectionService.java @@ -44,7 +44,8 @@ class PageSelectionService extends AbstractSelectionService { /* * @see AbstractSelectionService#createPartTracker(String) */ - protected AbstractPartSelectionTracker createPartTracker(String partId) { + @Override + protected AbstractPartSelectionTracker createPartTracker(String partId) { return new PagePartSelectionTracker(getPage(), partId); } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/PartListenerList.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/PartListenerList.java index 125306982de..af2b28ff3da 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/PartListenerList.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/PartListenerList.java @@ -68,7 +68,8 @@ public class PartListenerList extends EventManager { for (int i = 0; i < array.length; i++) { final IPartListener l = (IPartListener) array[i]; fireEvent(new SafeRunnable() { - public void run() { + @Override + public void run() { l.partActivated(part); } }, l, part, "activated::"); //$NON-NLS-1$ @@ -83,7 +84,8 @@ public class PartListenerList extends EventManager { for (int i = 0; i < array.length; i++) { final IPartListener l = (IPartListener) array[i]; fireEvent(new SafeRunnable() { - public void run() { + @Override + public void run() { l.partBroughtToTop(part); } }, l, part, "broughtToTop::"); //$NON-NLS-1$ @@ -98,7 +100,8 @@ public class PartListenerList extends EventManager { for (int i = 0; i < array.length; i++) { final IPartListener l = (IPartListener) array[i]; fireEvent(new SafeRunnable() { - public void run() { + @Override + public void run() { l.partClosed(part); } }, l, part, "closed::"); //$NON-NLS-1$ @@ -113,7 +116,8 @@ public class PartListenerList extends EventManager { for (int i = 0; i < array.length; i++) { final IPartListener l = (IPartListener) array[i]; fireEvent(new SafeRunnable() { - public void run() { + @Override + public void run() { l.partDeactivated(part); } }, l, part, "deactivated::"); //$NON-NLS-1$ @@ -128,7 +132,8 @@ public class PartListenerList extends EventManager { for (int i = 0; i < array.length; i++) { final IPartListener l = (IPartListener) array[i]; fireEvent(new SafeRunnable() { - public void run() { + @Override + public void run() { l.partOpened(part); } }, l, part, "opened::"); //$NON-NLS-1$ diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/PartListenerList2.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/PartListenerList2.java index 9cf85bed182..bd7f56164a2 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/PartListenerList2.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/PartListenerList2.java @@ -66,7 +66,8 @@ public class PartListenerList2 extends EventManager { for (int i = 0; i < array.length; i++) { final IPartListener2 l = (IPartListener2) array[i]; fireEvent(new SafeRunnable() { - public void run() { + @Override + public void run() { l.partActivated(ref); } }, l, ref, "activated::"); //$NON-NLS-1$ @@ -81,7 +82,8 @@ public class PartListenerList2 extends EventManager { for (int i = 0; i < array.length; i++) { final IPartListener2 l = (IPartListener2) array[i]; fireEvent(new SafeRunnable() { - public void run() { + @Override + public void run() { l.partBroughtToTop(ref); } }, l, ref, "broughtToTop::"); //$NON-NLS-1$ @@ -96,7 +98,8 @@ public class PartListenerList2 extends EventManager { for (int i = 0; i < array.length; i++) { final IPartListener2 l = (IPartListener2) array[i]; fireEvent(new SafeRunnable() { - public void run() { + @Override + public void run() { l.partClosed(ref); } }, l, ref, "closed::"); //$NON-NLS-1$ @@ -111,7 +114,8 @@ public class PartListenerList2 extends EventManager { for (int i = 0; i < array.length; i++) { final IPartListener2 l = (IPartListener2) array[i]; fireEvent(new SafeRunnable() { - public void run() { + @Override + public void run() { l.partDeactivated(ref); } }, l, ref, "deactivated::"); //$NON-NLS-1$ @@ -126,7 +130,8 @@ public class PartListenerList2 extends EventManager { for (int i = 0; i < array.length; i++) { final IPartListener2 l = (IPartListener2) array[i]; fireEvent(new SafeRunnable() { - public void run() { + @Override + public void run() { l.partOpened(ref); } }, l, ref, "opened::"); //$NON-NLS-1$ @@ -147,7 +152,8 @@ public class PartListenerList2 extends EventManager { } fireEvent(new SafeRunnable() { - public void run() { + @Override + public void run() { l.partHidden(ref); } }, l, ref, "hidden::"); //$NON-NLS-1$ @@ -168,7 +174,8 @@ public class PartListenerList2 extends EventManager { } fireEvent(new SafeRunnable() { - public void run() { + @Override + public void run() { l.partVisible(ref); } }, l, ref, "visible::"); //$NON-NLS-1$ @@ -189,7 +196,8 @@ public class PartListenerList2 extends EventManager { } fireEvent(new SafeRunnable() { - public void run() { + @Override + public void run() { l.partInputChanged(ref); } }, l, ref, "inputChanged::"); //$NON-NLS-1$ @@ -214,7 +222,8 @@ public class PartListenerList2 extends EventManager { } SafeRunnable.run(new SafeRunnable() { - public void run() { + @Override + public void run() { l.pageChanged(event); } }); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/PartService.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/PartService.java index b198221342d..d26562bbba6 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/PartService.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/PartService.java @@ -44,34 +44,42 @@ public class PartService implements IPageChangedListener, IPartListener, IPartLi this.page = page; } + @Override public void addPartListener(IPartListener listener) { partListeners.add(listener); } + @Override public void addPartListener(IPartListener2 listener) { partListeners2.add(listener); } + @Override public IWorkbenchPart getActivePart() { return page == null ? null : page.getActivePart(); } + @Override public IWorkbenchPartReference getActivePartReference() { return page == null ? null : page.getActivePartReference(); } + @Override public void removePartListener(IPartListener listener) { partListeners.remove(listener); } + @Override public void removePartListener(IPartListener2 listener) { partListeners2.remove(listener); } + @Override public void partActivated(final IWorkbenchPart part) { Object[] listeners = partListeners.getListeners(); for (final Object listener : listeners) { SafeRunner.run(new SafeRunnable() { + @Override public void run() throws Exception { ((IPartListener) listener).partActivated(part); } @@ -79,10 +87,12 @@ public class PartService implements IPageChangedListener, IPartListener, IPartLi } } + @Override public void partBroughtToTop(final IWorkbenchPart part) { Object[] listeners = partListeners.getListeners(); for (final Object listener : listeners) { SafeRunner.run(new SafeRunnable() { + @Override public void run() throws Exception { ((IPartListener) listener).partBroughtToTop(part); } @@ -90,10 +100,12 @@ public class PartService implements IPageChangedListener, IPartListener, IPartLi } } + @Override public void partClosed(final IWorkbenchPart part) { Object[] listeners = partListeners.getListeners(); for (final Object listener : listeners) { SafeRunner.run(new SafeRunnable() { + @Override public void run() throws Exception { ((IPartListener) listener).partClosed(part); } @@ -101,10 +113,12 @@ public class PartService implements IPageChangedListener, IPartListener, IPartLi } } + @Override public void partDeactivated(final IWorkbenchPart part) { Object[] listeners = partListeners.getListeners(); for (final Object listener : listeners) { SafeRunner.run(new SafeRunnable() { + @Override public void run() throws Exception { ((IPartListener) listener).partDeactivated(part); } @@ -112,10 +126,12 @@ public class PartService implements IPageChangedListener, IPartListener, IPartLi } } + @Override public void partOpened(final IWorkbenchPart part) { Object[] listeners = partListeners.getListeners(); for (final Object listener : listeners) { SafeRunner.run(new SafeRunnable() { + @Override public void run() throws Exception { ((IPartListener) listener).partOpened(part); } @@ -123,10 +139,12 @@ public class PartService implements IPageChangedListener, IPartListener, IPartLi } } + @Override public void partActivated(final IWorkbenchPartReference partRef) { Object[] listeners = partListeners2.getListeners(); for (final Object listener : listeners) { SafeRunner.run(new SafeRunnable() { + @Override public void run() throws Exception { ((IPartListener2) listener).partActivated(partRef); } @@ -134,10 +152,12 @@ public class PartService implements IPageChangedListener, IPartListener, IPartLi } } + @Override public void partBroughtToTop(final IWorkbenchPartReference partRef) { Object[] listeners = partListeners2.getListeners(); for (final Object listener : listeners) { SafeRunner.run(new SafeRunnable() { + @Override public void run() throws Exception { ((IPartListener2) listener).partBroughtToTop(partRef); } @@ -145,10 +165,12 @@ public class PartService implements IPageChangedListener, IPartListener, IPartLi } } + @Override public void partClosed(final IWorkbenchPartReference partRef) { Object[] listeners = partListeners2.getListeners(); for (final Object listener : listeners) { SafeRunner.run(new SafeRunnable() { + @Override public void run() throws Exception { ((IPartListener2) listener).partClosed(partRef); } @@ -156,10 +178,12 @@ public class PartService implements IPageChangedListener, IPartListener, IPartLi } } + @Override public void partDeactivated(final IWorkbenchPartReference partRef) { Object[] listeners = partListeners2.getListeners(); for (final Object listener : listeners) { SafeRunner.run(new SafeRunnable() { + @Override public void run() throws Exception { ((IPartListener2) listener).partDeactivated(partRef); } @@ -167,10 +191,12 @@ public class PartService implements IPageChangedListener, IPartListener, IPartLi } } + @Override public void partOpened(final IWorkbenchPartReference partRef) { Object[] listeners = partListeners2.getListeners(); for (final Object listener : listeners) { SafeRunner.run(new SafeRunnable() { + @Override public void run() throws Exception { ((IPartListener2) listener).partOpened(partRef); } @@ -178,10 +204,12 @@ public class PartService implements IPageChangedListener, IPartListener, IPartLi } } + @Override public void partHidden(final IWorkbenchPartReference partRef) { Object[] listeners = partListeners2.getListeners(); for (final Object listener : listeners) { SafeRunner.run(new SafeRunnable() { + @Override public void run() throws Exception { ((IPartListener2) listener).partHidden(partRef); } @@ -189,10 +217,12 @@ public class PartService implements IPageChangedListener, IPartListener, IPartLi } } + @Override public void partVisible(final IWorkbenchPartReference partRef) { Object[] listeners = partListeners2.getListeners(); for (final Object listener : listeners) { SafeRunner.run(new SafeRunnable() { + @Override public void run() throws Exception { ((IPartListener2) listener).partVisible(partRef); } @@ -200,10 +230,12 @@ public class PartService implements IPageChangedListener, IPartListener, IPartLi } } + @Override public void partInputChanged(final IWorkbenchPartReference partRef) { Object[] listeners = partListeners2.getListeners(); for (final Object listener : listeners) { SafeRunner.run(new SafeRunnable() { + @Override public void run() throws Exception { ((IPartListener2) listener).partInputChanged(partRef); } @@ -211,11 +243,13 @@ public class PartService implements IPageChangedListener, IPartListener, IPartLi } } + @Override public void pageChanged(final PageChangedEvent event) { Object[] listeners = partListeners2.getListeners(); for (final Object listener : listeners) { if (listener instanceof IPageChangedListener) { SafeRunner.run(new SafeRunnable() { + @Override public void run() throws Exception { ((IPageChangedListener) listener).pageChanged(event); } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/PartSite.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/PartSite.java index 89bbc6936c1..47da728914d 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/PartSite.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/PartSite.java @@ -198,6 +198,7 @@ public abstract class PartSite implements IWorkbenchPartSite { IWorkbenchWindow workbenchWindow = getWorkbenchWindow(); this.serviceLocator = (ServiceLocator) slc.createServiceLocator(workbenchWindow, null, new IDisposable() { + @Override public void dispose() { // not sure what to do here } @@ -386,6 +387,7 @@ public abstract class PartSite implements IWorkbenchPartSite { * * @see org.eclipse.ui.IWorkbenchPartSite#getId() */ + @Override public String getId() { return extensionId == null ? element == null ? model.getElementId() : element .getAttribute(IWorkbenchRegistryConstants.ATT_ID) @@ -397,6 +399,7 @@ public abstract class PartSite implements IWorkbenchPartSite { * * @see org.eclipse.ui.IWorkbenchPartSite#getPluginId() */ + @Override public String getPluginId() { return element == null ? model.getElementId() : element.getNamespaceIdentifier(); } @@ -406,6 +409,7 @@ public abstract class PartSite implements IWorkbenchPartSite { * * @see org.eclipse.ui.IWorkbenchPartSite#getRegisteredName() */ + @Override public String getRegisteredName() { return element == null ? model.getLocalizedLabel() : element .getAttribute(IWorkbenchRegistryConstants.ATT_NAME); @@ -416,6 +420,7 @@ public abstract class PartSite implements IWorkbenchPartSite { * * @return the page containing this part */ + @Override public IWorkbenchPage getPage() { return getWorkbenchWindow().getActivePage(); } @@ -424,6 +429,7 @@ public abstract class PartSite implements IWorkbenchPartSite { /** * Returns the part. */ + @Override public IWorkbenchPart getPart() { return part; } @@ -438,6 +444,7 @@ public abstract class PartSite implements IWorkbenchPartSite { /** * Returns the selection provider for a part. */ + @Override public ISelectionProvider getSelectionProvider() { return selectionProvider; } @@ -447,6 +454,7 @@ public abstract class PartSite implements IWorkbenchPartSite { * * @return the shell containing this part */ + @Override public Shell getShell() { // Compatibility: This method should not be used outside the UI @@ -493,6 +501,7 @@ public abstract class PartSite implements IWorkbenchPartSite { * * @return the workbench window containing this part */ + @Override public IWorkbenchWindow getWorkbenchWindow() { return workbenchWindow; } @@ -500,6 +509,7 @@ public abstract class PartSite implements IWorkbenchPartSite { /** * Register a popup menu for extension. */ + @Override public void registerContextMenu(String menuID, MenuManager menuMgr, ISelectionProvider selProvider) { if (menuExtenders == null) { @@ -512,6 +522,7 @@ public abstract class PartSite implements IWorkbenchPartSite { /** * Register a popup menu with the default id for extension. */ + @Override public void registerContextMenu(MenuManager menuMgr, ISelectionProvider selProvider) { registerContextMenu(getId(), menuMgr, selProvider); @@ -552,6 +563,7 @@ public abstract class PartSite implements IWorkbenchPartSite { /** * Set the selection provider for a part. */ + @Override public void setSelectionProvider(ISelectionProvider provider) { selectionProvider = provider; } @@ -559,6 +571,7 @@ public abstract class PartSite implements IWorkbenchPartSite { /* * @see IWorkbenchPartSite#getKeyBindingService() */ + @Override public IKeyBindingService getKeyBindingService() { return (IKeyBindingService) e4Context.get(IKeyBindingService.class.getName()); } @@ -573,6 +586,7 @@ public abstract class PartSite implements IWorkbenchPartSite { * @param adapter * @return */ + @Override public final Object getAdapter(Class adapter) { if (IWorkbenchSiteProgressService.class == adapter) { @@ -615,10 +629,12 @@ public abstract class PartSite implements IWorkbenchPartSite { .getName()); } + @Override public final Object getService(final Class key) { return serviceLocator.getService(key); } + @Override public final boolean hasService(final Class key) { return serviceLocator.hasService(key); } @@ -629,6 +645,7 @@ public abstract class PartSite implements IWorkbenchPartSite { * * @since 3.2 */ + @Override public String toString() { final StringBuffer buffer = new StringBuffer(); buffer.append("PartSite(id="); //$NON-NLS-1$ diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/PartTester.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/PartTester.java index e93bdca3ea5..74cd13c25f6 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/PartTester.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/PartTester.java @@ -77,7 +77,8 @@ public class PartTester { */ private static void testWorkbenchPart(IWorkbenchPart part) throws Exception { IPropertyListener testListener = new IPropertyListener() { - public void propertyChanged(Object source, int propId) { + @Override + public void propertyChanged(Object source, int propId) { } }; diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/PerspectiveAction.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/PerspectiveAction.java index 007d33a243d..b2e97d55027 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/PerspectiveAction.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/PerspectiveAction.java @@ -60,7 +60,8 @@ public abstract class PerspectiveAction extends Action implements ActionFactory. /* (non-Javadoc) * Method declared on IAction. */ - public void run() { + @Override + public void run() { if (workbenchWindow == null) { // action has been disposed return; @@ -82,7 +83,8 @@ public abstract class PerspectiveAction extends Action implements ActionFactory. /* (non-Javadoc) * Method declared on ActionFactory.IWorkbenchAction. */ - public void dispose() { + @Override + public void dispose() { if (workbenchWindow == null) { // already disposed return; diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/PerspectiveBarContributionItem.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/PerspectiveBarContributionItem.java index 951c55fe463..00596ef7783 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/PerspectiveBarContributionItem.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/PerspectiveBarContributionItem.java @@ -60,7 +60,8 @@ public class PerspectiveBarContributionItem extends ContributionItem { /* (non-Javadoc) * @see org.eclipse.jface.action.ContributionItem#dispose() */ - public void dispose() { + @Override + public void dispose() { super.dispose(); if (image != null && !image.isDisposed()) { image.dispose(); @@ -72,7 +73,8 @@ public class PerspectiveBarContributionItem extends ContributionItem { } - public void fill(ToolBar parent, int index) { + @Override + public void fill(ToolBar parent, int index) { if (toolItem == null && parent != null && !parent.isDisposed()) { if (index >= 0) { @@ -89,7 +91,8 @@ public class PerspectiveBarContributionItem extends ContributionItem { toolItem.setToolTipText(NLS.bind(WorkbenchMessages.PerspectiveBarContributionItem_toolTip, perspective.getLabel())); toolItem.addSelectionListener(new SelectionAdapter() { - public void widgetSelected(SelectionEvent event) { + @Override + public void widgetSelected(SelectionEvent event) { select(); } }); @@ -127,7 +130,8 @@ public class PerspectiveBarContributionItem extends ContributionItem { } } - public void update() { + @Override + public void update() { if (toolItem != null && !toolItem.isDisposed()) { toolItem .setSelection(workbenchPage.getPerspective() == perspective); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/PerspectiveBarManager.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/PerspectiveBarManager.java index 4401f6de225..6e35d8d8cee 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/PerspectiveBarManager.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/PerspectiveBarManager.java @@ -36,7 +36,8 @@ public class PerspectiveBarManager extends ToolBarManager { super(style); } - public ToolBar createControl(Composite parent) { + @Override + public ToolBar createControl(Composite parent) { ToolBar control = super.createControl(parent); return control; @@ -118,7 +119,8 @@ public class PerspectiveBarManager extends ToolBarManager { menuItem.setData("IContributionItem", tool.getData()); //$NON-NLS-1$ menuItem.addSelectionListener(new SelectionAdapter() { - public void widgetSelected(SelectionEvent e) { + @Override + public void widgetSelected(SelectionEvent e) { //rotate the selected item in and the other items right // don't touch the "Open" item MenuItem menuItem = (MenuItem) e.widget; @@ -145,7 +147,8 @@ public class PerspectiveBarManager extends ToolBarManager { /* (non-Javadoc) * @see org.eclipse.jface.action.ToolBarManager#relayout(org.eclipse.swt.widgets.ToolBar, int, int) */ - protected void relayout(ToolBar toolBar, int oldCount, int newCount) { + @Override + protected void relayout(ToolBar toolBar, int oldCount, int newCount) { super.relayout(toolBar, oldCount, newCount); if (getControl() != null) { diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/PerspectiveBarNewContributionItem.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/PerspectiveBarNewContributionItem.java index 43afbbe592d..abe960014ca 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/PerspectiveBarNewContributionItem.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/PerspectiveBarNewContributionItem.java @@ -44,7 +44,8 @@ public class PerspectiveBarNewContributionItem extends ContributionItem { /* (non-Javadoc) * @see org.eclipse.jface.action.ContributionItem#dispose() */ - public void dispose() { + @Override + public void dispose() { super.dispose(); if (image != null && !image.isDisposed()) { image.dispose(); @@ -52,10 +53,12 @@ public class PerspectiveBarNewContributionItem extends ContributionItem { } } - public void fill(final ToolBar parent, int index) { + @Override + public void fill(final ToolBar parent, int index) { if (toolItem == null && parent != null) { parent.addDisposeListener(new DisposeListener() { - public void widgetDisposed(DisposeEvent e) { + @Override + public void widgetDisposed(DisposeEvent e) { //toolItem.getImage().dispose(); toolItem.dispose(); toolItem = null; @@ -74,7 +77,8 @@ public class PerspectiveBarNewContributionItem extends ContributionItem { toolItem.setToolTipText(WorkbenchMessages.PerspectiveBarNewContributionItem_toolTip); toolItem.addSelectionListener(new SelectionAdapter() { - public void widgetSelected(SelectionEvent event) { + @Override + public void widgetSelected(SelectionEvent event) { menuManager.update(true); Point point = new Point(event.x, event.y); if (event.widget instanceof ToolItem) { diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/PerspectiveExtensionReader.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/PerspectiveExtensionReader.java index 78cd90f6ef3..000b430db09 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/PerspectiveExtensionReader.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/PerspectiveExtensionReader.java @@ -338,7 +338,8 @@ public class PerspectiveExtensionReader extends RegistryReader { return true; } - protected boolean readElement(IConfigurationElement element) { + @Override + protected boolean readElement(IConfigurationElement element) { String type = element.getName(); if (type.equals(IWorkbenchRegistryConstants.TAG_PERSPECTIVE_EXTENSION)) { String id = element.getAttribute(IWorkbenchRegistryConstants.ATT_TARGET_ID); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/PerspectiveListenerList.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/PerspectiveListenerList.java index aefd4d2755a..e396fd21da3 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/PerspectiveListenerList.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/PerspectiveListenerList.java @@ -70,7 +70,8 @@ public class PerspectiveListenerList extends EventManager { for (int nX = 0; nX < array.length; nX++) { final IPerspectiveListener l = (IPerspectiveListener) array[nX]; fireEvent(new SafeRunnable() { - public void run() { + @Override + public void run() { l.perspectiveActivated(page, perspective); } }, l, perspective, "activated::"); //$NON-NLS-1$ @@ -89,7 +90,8 @@ public class PerspectiveListenerList extends EventManager { if (array[nX] instanceof IPerspectiveListener4) { final IPerspectiveListener4 l4 = (IPerspectiveListener4) array[nX]; fireEvent(new SafeRunnable() { - public void run() { + @Override + public void run() { l4.perspectivePreDeactivate(page, perspective); } }, l4, perspective, "pre-deactivate::"); //$NON-NLS-1$ @@ -109,7 +111,8 @@ public class PerspectiveListenerList extends EventManager { if (array[nX] instanceof IPerspectiveListener3) { final IPerspectiveListener3 l3 = (IPerspectiveListener3) array[nX]; fireEvent(new SafeRunnable() { - public void run() { + @Override + public void run() { l3.perspectiveDeactivated(page, perspective); } }, l3, perspective, "deactivated::"); //$NON-NLS-1$ @@ -126,7 +129,8 @@ public class PerspectiveListenerList extends EventManager { for (int nX = 0; nX < array.length; nX++) { final IPerspectiveListener l = (IPerspectiveListener) array[nX]; fireEvent(new SafeRunnable() { - public void run() { + @Override + public void run() { l.perspectiveChanged(page, perspective, changeId); } }, l, perspective, "changed::"); //$NON-NLS-1$ @@ -147,7 +151,8 @@ public class PerspectiveListenerList extends EventManager { if (array[nX] instanceof IPerspectiveListener2) { final IPerspectiveListener2 l2 = (IPerspectiveListener2) array[nX]; fireEvent(new SafeRunnable() { - public void run() { + @Override + public void run() { l2.perspectiveChanged(page, perspective, partRef, changeId); } @@ -168,7 +173,8 @@ public class PerspectiveListenerList extends EventManager { if (array[nX] instanceof IPerspectiveListener3) { final IPerspectiveListener3 l3 = (IPerspectiveListener3) array[nX]; fireEvent(new SafeRunnable() { - public void run() { + @Override + public void run() { l3.perspectiveClosed(page, perspective); } }, l3, perspective, "closed::"); //$NON-NLS-1$ @@ -188,7 +194,8 @@ public class PerspectiveListenerList extends EventManager { if (array[nX] instanceof IPerspectiveListener3) { final IPerspectiveListener3 l3 = (IPerspectiveListener3) array[nX]; fireEvent(new SafeRunnable() { - public void run() { + @Override + public void run() { l3.perspectiveOpened(page, perspective); } }, l3, perspective, "opened::"); //$NON-NLS-1$ @@ -209,7 +216,8 @@ public class PerspectiveListenerList extends EventManager { if (array[nX] instanceof IPerspectiveListener3) { final IPerspectiveListener3 l3 = (IPerspectiveListener3) array[nX]; fireEvent(new SafeRunnable() { - public void run() { + @Override + public void run() { l3.perspectiveSavedAs(page, oldPerspective, newPerspective); } }, l3, newPerspective, "saveAs::"); //$NON-NLS-1$ diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/PerspectiveSwitcher.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/PerspectiveSwitcher.java index 9bbddac69db..ec0933b160d 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/PerspectiveSwitcher.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/PerspectiveSwitcher.java @@ -151,7 +151,8 @@ public class PerspectiveSwitcher implements IWindowTrim { private IPropertyChangeListener propertyChangeListener; private Listener popupListener = new Listener() { - public void handleEvent(Event event) { + @Override + public void handleEvent(Event event) { if (event.type == SWT.MenuDetect) { showPerspectiveBarPopup(new Point(event.x, event.y)); } @@ -159,13 +160,15 @@ public class PerspectiveSwitcher implements IWindowTrim { }; class ChangeListener extends PerspectiveAdapter implements IPageListener { - public void perspectiveOpened(IWorkbenchPage page, + @Override + public void perspectiveOpened(IWorkbenchPage page, IPerspectiveDescriptor perspective) { if (findPerspectiveShortcut(perspective, page) == null) { addPerspectiveShortcut(perspective, page); } } - public void perspectiveClosed(IWorkbenchPage page, + @Override + public void perspectiveClosed(IWorkbenchPage page, IPerspectiveDescriptor perspective) { // Don't remove the shortcut if the workbench is // closing. This causes a spurious 'layout' on the @@ -174,23 +177,29 @@ public class PerspectiveSwitcher implements IWindowTrim { removePerspectiveShortcut(perspective, page); } } - public void perspectiveActivated(IWorkbenchPage page, IPerspectiveDescriptor perspective) { + @Override + public void perspectiveActivated(IWorkbenchPage page, IPerspectiveDescriptor perspective) { selectPerspectiveShortcut(perspective, page, true); } - public void perspectiveDeactivated(IWorkbenchPage page, IPerspectiveDescriptor perspective) { + @Override + public void perspectiveDeactivated(IWorkbenchPage page, IPerspectiveDescriptor perspective) { selectPerspectiveShortcut(perspective, page, false); } - public void perspectiveSavedAs(IWorkbenchPage page, + @Override + public void perspectiveSavedAs(IWorkbenchPage page, IPerspectiveDescriptor oldPerspective, IPerspectiveDescriptor newPerspective) { updatePerspectiveShortcut(oldPerspective, newPerspective, page); } + @Override public void pageActivated(IWorkbenchPage page) { } + @Override public void pageClosed(IWorkbenchPage page) { } + @Override public void pageOpened(IWorkbenchPage page) { } } @@ -219,6 +228,7 @@ public class PerspectiveSwitcher implements IWindowTrim { // this listener will only be run when the Shell is being disposed // and each WorkbenchWindow has its own PerspectiveSwitcher toolBarListener = new DisposeListener() { + @Override public void widgetDisposed(DisposeEvent e) { dispose(); } @@ -578,6 +588,7 @@ public class PerspectiveSwitcher implements IWindowTrim { /* (non-Javadoc) * @see org.eclipse.swt.widgets.Listener#handleEvent(org.eclipse.swt.widgets.Event) */ + @Override public void handleEvent(Event event) { ToolBar toolbar = perspectiveBar.getControl(); ToolItem item = toolbar.getItem(new Point(event.x, event.y)); @@ -638,6 +649,7 @@ public class PerspectiveSwitcher implements IWindowTrim { * * @see org.eclipse.ui.internal.dnd.IDropTarget#drop() */ + @Override public void drop() { ToolBar toolBar = perspectiveBar.getControl(); ToolItem item = toolBar.getItem(toolBar.getDisplay().map( @@ -673,6 +685,7 @@ public class PerspectiveSwitcher implements IWindowTrim { * * @see org.eclipse.ui.internal.dnd.IDropTarget#getCursor() */ + @Override public Cursor getCursor() { return DragCursors.getCursor(DragCursors.CENTER); } @@ -681,6 +694,7 @@ public class PerspectiveSwitcher implements IWindowTrim { return perspective.getToolItem().getParent().getShell().equals(perspectiveBar.getControl().getShell()); } + @Override public Rectangle getSnapRectangle() { ToolBar toolBar = perspectiveBar.getControl(); ToolItem item = toolBar.getItem(toolBar.getDisplay().map( @@ -696,6 +710,7 @@ public class PerspectiveSwitcher implements IWindowTrim { } } + @Override public IDropTarget drag(Control currentControl, Object draggedObject, Point position, Rectangle dragRectangle) { @@ -729,7 +744,8 @@ public class PerspectiveSwitcher implements IWindowTrim { private void setPropertyChangeListener() { propertyChangeListener = new IPropertyChangeListener() { - public void propertyChange(PropertyChangeEvent propertyChangeEvent) { + @Override + public void propertyChange(PropertyChangeEvent propertyChangeEvent) { if (IWorkbenchPreferenceConstants.SHOW_TEXT_ON_PERSPECTIVE_BAR .equals(propertyChangeEvent.getProperty())) { if (perspectiveBar == null) { @@ -782,13 +798,15 @@ public class PerspectiveSwitcher implements IWindowTrim { // adjust the toolbar size to display as many items as possible perspectiveCoolBar.addControlListener(new ControlAdapter() { - public void controlResized(ControlEvent e) { + @Override + public void controlResized(ControlEvent e) { setCoolItemSize(coolItem); } }); coolItem.addSelectionListener(new SelectionAdapter() { - public void widgetSelected(SelectionEvent e) { + @Override + public void widgetSelected(SelectionEvent e) { if (e.detail == SWT.ARROW) { if (perspectiveBar != null) { perspectiveBar.handleChevron(e); @@ -946,6 +964,7 @@ public class PerspectiveSwitcher implements IWindowTrim { IWorkbenchHelpContextIds.CLOSE_PAGE_ACTION); menuItem.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { ToolItem perspectiveToolItem = (ToolItem) popupMenu .getData(); @@ -1063,7 +1082,8 @@ public class PerspectiveSwitcher implements IWindowTrim { IWorkbenchHelpContextIds.DOCK_ON_PERSPECTIVE_ACTION); SelectionListener listener = new SelectionAdapter() { - public void widgetSelected(SelectionEvent e) { + @Override + public void widgetSelected(SelectionEvent e) { MenuItem item = (MenuItem) e.widget; String pref = null; if (item.equals(menuItemLeft)) { @@ -1103,7 +1123,8 @@ public class PerspectiveSwitcher implements IWindowTrim { IWorkbenchHelpContextIds.SHOW_TEXT_PERSPECTIVE_ACTION); showtextMenuItem.addSelectionListener(new SelectionAdapter() { - public void widgetSelected(SelectionEvent e) { + @Override + public void widgetSelected(SelectionEvent e) { if (perspectiveBar == null) { return; } @@ -1136,6 +1157,7 @@ public class PerspectiveSwitcher implements IWindowTrim { window.getWorkbench().getHelpSystem().setHelp(customizeMenuItem, IWorkbenchHelpContextIds.EDIT_ACTION_SETS_ACTION); customizeMenuItem.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { if (perspectiveBar == null) { return; @@ -1160,6 +1182,7 @@ public class PerspectiveSwitcher implements IWindowTrim { window.getWorkbench().getHelpSystem().setHelp(saveasMenuItem, IWorkbenchHelpContextIds.SAVE_PERSPECTIVE_ACTION); saveasMenuItem.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent event) { if (perspectiveBar == null) { return; @@ -1191,6 +1214,7 @@ public class PerspectiveSwitcher implements IWindowTrim { window.getWorkbench().getHelpSystem().setHelp(resetMenuItem, IWorkbenchHelpContextIds.RESET_PERSPECTIVE_ACTION); resetMenuItem.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent event) { if (perspectiveBar == null) { return; @@ -1254,6 +1278,7 @@ public class PerspectiveSwitcher implements IWindowTrim { final Integer x = size.getInteger(IWorkbenchConstants.TAG_X); StartupThreading.runWithoutExceptions(new StartupRunnable() { + @Override public void runWithException() { if (x != null) { topBar.setRightWidth(x.intValue()); @@ -1322,12 +1347,14 @@ public class PerspectiveSwitcher implements IWindowTrim { /* (non-Javadoc) * @see org.eclipse.ui.internal.IWindowTrim#dock(int) */ + @Override public void dock(int dropSide) { } /* (non-Javadoc) * @see org.eclipse.ui.internal.IWindowTrim#getControl() */ + @Override public Control getControl() { return trimControl; } @@ -1335,6 +1362,7 @@ public class PerspectiveSwitcher implements IWindowTrim { /* (non-Javadoc) * @see org.eclipse.ui.internal.IWindowTrim#getId() */ + @Override public String getId() { return "org.eclipse.ui.internal.PerspectiveSwitcher"; //$NON-NLS-1$ } @@ -1342,6 +1370,7 @@ public class PerspectiveSwitcher implements IWindowTrim { /* (non-Javadoc) * @see org.eclipse.ui.internal.IWindowTrim#getDisplayName() */ + @Override public String getDisplayName() { return WorkbenchMessages.TrimCommon_PerspectiveSwitcher_TrimName; } @@ -1349,6 +1378,7 @@ public class PerspectiveSwitcher implements IWindowTrim { /* (non-Javadoc) * @see org.eclipse.ui.internal.IWindowTrim#getValidSides() */ + @Override public int getValidSides() { return SWT.NONE; } @@ -1356,6 +1386,7 @@ public class PerspectiveSwitcher implements IWindowTrim { /* (non-Javadoc) * @see org.eclipse.ui.internal.IWindowTrim#isCloseable() */ + @Override public boolean isCloseable() { return false; } @@ -1363,6 +1394,7 @@ public class PerspectiveSwitcher implements IWindowTrim { /* (non-Javadoc) * @see org.eclipse.ui.internal.IWindowTrim#handleClose() */ + @Override public void handleClose() { // nothing to do... } @@ -1370,6 +1402,7 @@ public class PerspectiveSwitcher implements IWindowTrim { /* (non-Javadoc) * @see org.eclipse.ui.IWindowTrim#getWidthHint() */ + @Override public int getWidthHint() { return SWT.DEFAULT; } @@ -1377,6 +1410,7 @@ public class PerspectiveSwitcher implements IWindowTrim { /* (non-Javadoc) * @see org.eclipse.ui.IWindowTrim#getHeightHint() */ + @Override public int getHeightHint() { return SWT.DEFAULT; } @@ -1384,6 +1418,7 @@ public class PerspectiveSwitcher implements IWindowTrim { /* (non-Javadoc) * @see org.eclipse.ui.IWindowTrim#isResizeable() */ + @Override public boolean isResizeable() { return false; } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/PerspectiveTracker.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/PerspectiveTracker.java index 481f7abbb8a..5bc2971fdd5 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/PerspectiveTracker.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/PerspectiveTracker.java @@ -68,19 +68,23 @@ public class PerspectiveTracker extends PerspectiveAdapter implements } } - public void pageActivated(IWorkbenchPage page) { + @Override + public void pageActivated(IWorkbenchPage page) { update(); } - public void pageClosed(IWorkbenchPage page) { + @Override + public void pageClosed(IWorkbenchPage page) { update(); } - public void pageOpened(IWorkbenchPage page) { + @Override + public void pageOpened(IWorkbenchPage page) { // ignore } - public void perspectiveActivated(IWorkbenchPage page, + @Override + public void perspectiveActivated(IWorkbenchPage page, IPerspectiveDescriptor perspective) { update(); } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/PlaceholderContributionItem.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/PlaceholderContributionItem.java index 0cbb5c0fb89..be3cee8c3d1 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/PlaceholderContributionItem.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/PlaceholderContributionItem.java @@ -78,7 +78,8 @@ final class PlaceholderContributionItem implements IContributionItem { * * @see org.eclipse.jface.action.IContributionItem#dispose() */ - public void dispose() { + @Override + public void dispose() { // Do nothing } @@ -87,7 +88,8 @@ final class PlaceholderContributionItem implements IContributionItem { * * @see org.eclipse.jface.action.IContributionItem#fill(org.eclipse.swt.widgets.Composite) */ - public void fill(Composite parent) { + @Override + public void fill(Composite parent) { throw new UnsupportedOperationException(); } @@ -97,7 +99,8 @@ final class PlaceholderContributionItem implements IContributionItem { * @see org.eclipse.jface.action.IContributionItem#fill(org.eclipse.swt.widgets.CoolBar, * int) */ - public void fill(CoolBar parent, int index) { + @Override + public void fill(CoolBar parent, int index) { throw new UnsupportedOperationException(); } @@ -108,7 +111,8 @@ final class PlaceholderContributionItem implements IContributionItem { * @see org.eclipse.jface.action.IContributionItem#fill(org.eclipse.swt.widgets.Menu, * int) */ - public void fill(Menu parent, int index) { + @Override + public void fill(Menu parent, int index) { throw new UnsupportedOperationException(); } @@ -119,7 +123,8 @@ final class PlaceholderContributionItem implements IContributionItem { * @see org.eclipse.jface.action.IContributionItem#fill(org.eclipse.swt.widgets.ToolBar, * int) */ - public void fill(ToolBar parent, int index) { + @Override + public void fill(ToolBar parent, int index) { throw new UnsupportedOperationException(); } @@ -138,7 +143,8 @@ final class PlaceholderContributionItem implements IContributionItem { * * @see org.eclipse.jface.action.IContributionItem#getId() */ - public String getId() { + @Override + public String getId() { return id; } @@ -179,7 +185,8 @@ final class PlaceholderContributionItem implements IContributionItem { * * @see org.eclipse.jface.action.IContributionItem#isDirty() */ - public boolean isDirty() { + @Override + public boolean isDirty() { return false; } @@ -188,7 +195,8 @@ final class PlaceholderContributionItem implements IContributionItem { * * @see org.eclipse.jface.action.IContributionItem#isDynamic() */ - public boolean isDynamic() { + @Override + public boolean isDynamic() { return false; } @@ -197,7 +205,8 @@ final class PlaceholderContributionItem implements IContributionItem { * * @see org.eclipse.jface.action.IContributionItem#isEnabled() */ - public boolean isEnabled() { + @Override + public boolean isEnabled() { // XXX Auto-generated method stub return false; } @@ -207,7 +216,8 @@ final class PlaceholderContributionItem implements IContributionItem { * * @see org.eclipse.jface.action.IContributionItem#isGroupMarker() */ - public boolean isGroupMarker() { + @Override + public boolean isGroupMarker() { return false; } @@ -216,7 +226,8 @@ final class PlaceholderContributionItem implements IContributionItem { * * @see org.eclipse.jface.action.IContributionItem#isSeparator() */ - public boolean isSeparator() { + @Override + public boolean isSeparator() { return false; } @@ -225,7 +236,8 @@ final class PlaceholderContributionItem implements IContributionItem { * * @see org.eclipse.jface.action.IContributionItem#isVisible() */ - public boolean isVisible() { + @Override + public boolean isVisible() { return false; } @@ -234,7 +246,8 @@ final class PlaceholderContributionItem implements IContributionItem { * * @see org.eclipse.jface.action.IContributionItem#saveWidgetState() */ - public void saveWidgetState() { + @Override + public void saveWidgetState() { // Do nothing. } @@ -244,7 +257,8 @@ final class PlaceholderContributionItem implements IContributionItem { * * @see org.eclipse.jface.action.IContributionItem#setParent(org.eclipse.jface.action.IContributionManager) */ - public void setParent(IContributionManager parent) { + @Override + public void setParent(IContributionManager parent) { // Do nothing } @@ -254,7 +268,8 @@ final class PlaceholderContributionItem implements IContributionItem { * * @see org.eclipse.jface.action.IContributionItem#setVisible(boolean) */ - public void setVisible(boolean visible) { + @Override + public void setVisible(boolean visible) { // Do nothing. } @@ -262,7 +277,8 @@ final class PlaceholderContributionItem implements IContributionItem { * Displays a string representation of this contribution item, which is * really just a function of its identifier. */ - public String toString() { + @Override + public String toString() { return "PlaceholderContributionItem(" + id + ")"; //$NON-NLS-1$//$NON-NLS-2$ } @@ -271,7 +287,8 @@ final class PlaceholderContributionItem implements IContributionItem { * * @see org.eclipse.jface.action.IContributionItem#update() */ - public void update() { + @Override + public void update() { update(null); } @@ -281,7 +298,8 @@ final class PlaceholderContributionItem implements IContributionItem { * * @see org.eclipse.jface.action.IContributionItem#update(java.lang.String) */ - public void update(String identifier) { + @Override + public void update(String identifier) { // Do nothing } } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/PlatformUIPreferenceListener.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/PlatformUIPreferenceListener.java index 15eb084fc41..3cd6e8f9044 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/PlatformUIPreferenceListener.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/PlatformUIPreferenceListener.java @@ -54,6 +54,7 @@ public class PlatformUIPreferenceListener implements * * @see org.eclipse.core.runtime.preferences.IEclipsePreferences.IPreferenceChangeListener#preferenceChange(org.eclipse.core.runtime.preferences.IEclipsePreferences.PreferenceChangeEvent) */ + @Override public void preferenceChange(PreferenceChangeEvent event) { String propertyName = event.getKey(); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/PluginAction.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/PluginAction.java index e40be347eb5..a86ae54efee 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/PluginAction.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/PluginAction.java @@ -210,14 +210,16 @@ public abstract class PluginAction extends Action implements /* (non-Javadoc) * Method declared on IAction. */ - public void run() { + @Override + public void run() { runWithEvent(null); } /* (non-Javadoc) * Method declared on IAction. */ - public void runWithEvent(Event event) { + @Override + public void runWithEvent(Event event) { // this message dialog is problematic. if (delegate == null) { createDelegate(); @@ -284,7 +286,8 @@ public abstract class PluginAction extends Action implements * <code>selectionChanged(IStructuredSelection)</code> when the selection is * a structured one. */ - public void selectionChanged(SelectionChangedEvent event) { + @Override + public void selectionChanged(SelectionChangedEvent event) { ISelection sel = event.getSelection(); selectionChanged(sel); } @@ -295,7 +298,8 @@ public abstract class PluginAction extends Action implements * <code>selectionChanged(IStructuredSelection)</code> when the selection is * a structured one. Subclasses may extend this method to react to the change. */ - public void selectionChanged(IWorkbenchPart part, ISelection sel) { + @Override + public void selectionChanged(IWorkbenchPart part, ISelection sel) { selectionChanged(sel); } @@ -331,14 +335,16 @@ public abstract class PluginAction extends Action implements /* (non-Javadoc) * @see org.eclipse.ui.IPluginContribution#getLocalId() */ - public String getLocalId() { + @Override + public String getLocalId() { return getId(); } /* (non-Javadoc) * @see org.eclipse.ui.IPluginContribution#getPluginId() */ - public String getPluginId() { + @Override + public String getPluginId() { return pluginId; } @@ -372,7 +378,8 @@ public abstract class PluginAction extends Action implements /* (non-Javadoc) * @see org.eclipse.jface.action.Action#getMenuCreator() */ - public IMenuCreator getMenuCreator() { + @Override + public IMenuCreator getMenuCreator() { // now that action contribution item defers asking for the menu // creator until its ready o show the menu, asking for the menu // creator is time to instantiate the delegate diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/PluginActionBuilder.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/PluginActionBuilder.java index 5d8e965dbdf..164c6855655 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/PluginActionBuilder.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/PluginActionBuilder.java @@ -120,7 +120,8 @@ public abstract class PluginActionBuilder extends RegistryReader { * Implements abstract method to handle the provided XML element * in the registry. */ - protected boolean readElement(IConfigurationElement element) { + @Override + protected boolean readElement(IConfigurationElement element) { String tag = element.getName(); // Ignore all object contributions element as these diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/PluginActionContributionItem.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/PluginActionContributionItem.java index cc7bc2e9c6b..e1a99a6a58b 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/PluginActionContributionItem.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/PluginActionContributionItem.java @@ -78,7 +78,8 @@ public class PluginActionContributionItem extends ActionContributionItem /* (non-Javadoc) * @see org.eclipse.jface.action.IContributionItem#setParent(org.eclipse.jface.action.IContributionManager) */ - public void setParent(IContributionManager parent) { + @Override + public void setParent(IContributionManager parent) { IContributionManager oldParent = getParent(); super.setParent(parent); if (oldParent == parent) { @@ -130,7 +131,8 @@ public class PluginActionContributionItem extends ActionContributionItem * method notifies the delegate if loaded and implements the <code>IActionDelegate2</code> * interface. */ - public void dispose() { + @Override + public void dispose() { unhookListeners(); disposeIdentifier(); } @@ -140,7 +142,8 @@ public class PluginActionContributionItem extends ActionContributionItem * * @see org.eclipse.jface.action.ActionContributionItem#isVisible() */ - public boolean isVisible() { + @Override + public boolean isVisible() { if (identifier != null && !identifier.isEnabled()) { return false; } @@ -150,7 +153,8 @@ public class PluginActionContributionItem extends ActionContributionItem /* (non-Javadoc) * @see org.eclipse.ui.activities.IIdentifierListener#identifierChanged(org.eclipse.ui.activities.IdentifierEvent) */ - public void identifierChanged(IdentifierEvent identifierEvent) { + @Override + public void identifierChanged(IdentifierEvent identifierEvent) { invalidateParent(); } @@ -169,7 +173,8 @@ public class PluginActionContributionItem extends ActionContributionItem /* (non-Javadoc) * @see org.eclipse.ui.activities.IActivityManagerListener#activityManagerChanged(org.eclipse.ui.activities.ActivityManagerEvent) */ - public void activityManagerChanged(ActivityManagerEvent activityManagerEvent) { + @Override + public void activityManagerChanged(ActivityManagerEvent activityManagerEvent) { // ensure that if we're going from a non-filtering state that we get an identifier // and vice versa. if (WorkbenchActivityHelper.isFiltering() && identifier == null) { diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/PluginActionCoolBarContributionItem.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/PluginActionCoolBarContributionItem.java index 8ee37ad8055..2bf97d59932 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/PluginActionCoolBarContributionItem.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/PluginActionCoolBarContributionItem.java @@ -34,11 +34,13 @@ public class PluginActionCoolBarContributionItem extends setActionSetId(((WWinPluginAction) action).getActionSetId()); } - public String getActionSetId() { + @Override + public String getActionSetId() { return actionSetId; } - public void setActionSetId(String id) { + @Override + public void setActionSetId(String id) { this.actionSetId = id; } @@ -61,6 +63,7 @@ public class PluginActionCoolBarContributionItem extends } private static Runnable updater = new Runnable() { + @Override public void run() { IContributionManager[] managers = managersToUpdate .toArray(new IContributionManager[managersToUpdate.size()]); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/PluginActionSet.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/PluginActionSet.java index 667c2d5a909..654d9a58da1 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/PluginActionSet.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/PluginActionSet.java @@ -68,7 +68,8 @@ public class PluginActionSet implements IActionSet { /** * Disposes of this action set. */ - public void dispose() { + @Override + public void dispose() { Iterator iter = pluginActions.iterator(); while (iter.hasNext()) { WWinPluginAction action = (WWinPluginAction) iter.next(); @@ -113,7 +114,8 @@ public class PluginActionSet implements IActionSet { * @param window the workbench window * @param bars the action bars */ - public void init(IWorkbenchWindow window, IActionBars bars) { + @Override + public void init(IWorkbenchWindow window, IActionBars bars) { this.bars = (ActionSetActionBars) bars; } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/PluginActionSetBuilder.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/PluginActionSetBuilder.java index 56892c3fabf..029a24924a3 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/PluginActionSetBuilder.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/PluginActionSetBuilder.java @@ -60,6 +60,7 @@ public class PluginActionSetBuilder extends PluginActionBuilder { * * @see org.eclipse.ui.services.IDisposable#dispose() */ + @Override public void dispose() { if (tracker != null) { tracker.unregisterObject(set.getConfigElement() @@ -120,7 +121,8 @@ public class PluginActionSetBuilder extends PluginActionBuilder { /* (non-Javadoc) * Method declared on PluginActionBuilder. */ - protected ActionDescriptor createActionDescriptor( + @Override + protected ActionDescriptor createActionDescriptor( IConfigurationElement element) { // As of 2.1, the "pulldown" attribute was deprecated and replaced by // the attribute "style". See doc for more details. @@ -150,7 +152,8 @@ public class PluginActionSetBuilder extends PluginActionBuilder { /* (non-Javadoc) * Method declared on PluginActionBuilder. */ - protected BasicContribution createContribution() { + @Override + protected BasicContribution createContribution() { return new ActionSetContribution(actionSet.getDesc().getId(), window); } @@ -331,7 +334,8 @@ public class PluginActionSetBuilder extends PluginActionBuilder { /** * This implementation inserts the group into the action set additions group. */ - protected void addGroup(IContributionManager mgr, String name) { + @Override + protected void addGroup(IContributionManager mgr, String name) { IContributionItem refItem = findInsertionPoint( IWorkbenchActionConstants.MB_ADDITIONS, actionSetId, mgr, true); @@ -493,7 +497,8 @@ public class PluginActionSetBuilder extends PluginActionBuilder { /* (non-Javadoc) * Method declared on Basic Contribution. */ - protected void insertMenuGroup(IMenuManager menu, + @Override + protected void insertMenuGroup(IMenuManager menu, AbstractGroupMarker marker) { if (actionSetId != null) { IContributionItem[] items = menu.getItems(); @@ -573,7 +578,8 @@ public class PluginActionSetBuilder extends PluginActionBuilder { /* (non-Javadoc) * Method declared on Basic Contribution. */ - protected void insertAfter(IContributionManager mgr, String refId, + @Override + protected void insertAfter(IContributionManager mgr, String refId, IContributionItem item) { IContributionItem refItem = findInsertionPoint(refId, actionSetId, mgr, true); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/PopupMenuExtender.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/PopupMenuExtender.java index f9b4a5bb127..fb43592ab35 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/PopupMenuExtender.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/PopupMenuExtender.java @@ -271,7 +271,8 @@ public class PopupMenuExtender implements IMenuListener2, /* (non-Javadoc) * @see org.eclipse.jface.viewers.ISelectionProvider#addSelectionChangedListener(org.eclipse.jface.viewers.ISelectionChangedListener) */ - public void addSelectionChangedListener( + @Override + public void addSelectionChangedListener( ISelectionChangedListener listener) { throw new UnsupportedOperationException( "This ISelectionProvider is static, and cannot be modified."); //$NON-NLS-1$ @@ -280,7 +281,8 @@ public class PopupMenuExtender implements IMenuListener2, /* (non-Javadoc) * @see org.eclipse.jface.viewers.ISelectionProvider#getSelection() */ - public ISelection getSelection() { + @Override + public ISelection getSelection() { if (part instanceof IEditorPart) { final IEditorPart editorPart = (IEditorPart) part; return new StructuredSelection(new Object[] { editorPart @@ -293,7 +295,8 @@ public class PopupMenuExtender implements IMenuListener2, /* (non-Javadoc) * @see org.eclipse.jface.viewers.ISelectionProvider#removeSelectionChangedListener(org.eclipse.jface.viewers.ISelectionChangedListener) */ - public void removeSelectionChangedListener( + @Override + public void removeSelectionChangedListener( ISelectionChangedListener listener) { throw new UnsupportedOperationException( "This ISelectionProvider is static, and cannot be modified."); //$NON-NLS-1$ @@ -302,7 +305,8 @@ public class PopupMenuExtender implements IMenuListener2, /* (non-Javadoc) * @see org.eclipse.jface.viewers.ISelectionProvider#setSelection(org.eclipse.jface.viewers.ISelection) */ - public void setSelection(ISelection selection) { + @Override + public void setSelection(ISelection selection) { throw new UnsupportedOperationException( "This ISelectionProvider is static, and cannot be modified."); //$NON-NLS-1$ } @@ -359,7 +363,8 @@ public class PopupMenuExtender implements IMenuListener2, /** * Notifies the listener that the menu is about to be shown. */ - public void menuAboutToShow(IMenuManager mgr) { + @Override + public void menuAboutToShow(IMenuManager mgr) { registerE4Support(); // Add this menu as a visible menu. @@ -422,7 +427,8 @@ public class PopupMenuExtender implements IMenuListener2, /** * Notifies the listener that the menu is about to be hidden. */ - public final void menuAboutToHide(final IMenuManager mgr) { + @Override + public final void menuAboutToHide(final IMenuManager mgr) { gatherContributions(mgr); cleanupNeeded = true; // Remove this menu as a visible menu. @@ -435,6 +441,7 @@ public class PopupMenuExtender implements IMenuListener2, // This is less threatening if the popup: menu // contributions aren't tied to the evaluation service workbench.getDisplay().asyncExec(new Runnable() { + @Override public void run() { final Workbench realWorkbench = (Workbench) workbench; runCleanUp(realWorkbench); @@ -594,6 +601,7 @@ public class PopupMenuExtender implements IMenuListener2, * * @see org.eclipse.core.runtime.IRegistryChangeListener#registryChanged(org.eclipse.core.runtime.IRegistryChangeEvent) */ + @Override public void registryChanged(final IRegistryChangeEvent event) { Display display = Display.getDefault(); if (part != null) { @@ -620,6 +628,7 @@ public class PopupMenuExtender implements IMenuListener2, if (clearPopups) { display.syncExec(new Runnable() { + @Override public void run() { clearStaticActions(); } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/RadioMenu.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/RadioMenu.java index 4a04a8ea6e8..bef2090c801 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/RadioMenu.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/RadioMenu.java @@ -36,7 +36,8 @@ public class RadioMenu implements IChangeListener { private List items = new ArrayList(); SelectionAdapter selectionAdapter = new SelectionAdapter() { - public void widgetSelected(SelectionEvent e) { + @Override + public void widgetSelected(SelectionEvent e) { Object newState = e.widget.getData(); data.setState(newState, RadioMenu.this); @@ -126,7 +127,8 @@ public class RadioMenu implements IChangeListener { /* (non-Javadoc) * @see org.eclipse.ui.internal.controls.IView#changed() */ - public void update(boolean changed) { + @Override + public void update(boolean changed) { refreshSelection(); } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/RectangleAnimationFeedbackBase.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/RectangleAnimationFeedbackBase.java index 214061110e9..4923d4363d0 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/RectangleAnimationFeedbackBase.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/RectangleAnimationFeedbackBase.java @@ -51,6 +51,7 @@ public abstract class RectangleAnimationFeedbackBase extends AnimationFeedbackBa * * Prevent execution if there are no rects to draw or there's a mismatch in the count */ + @Override public boolean jobInit(AnimationEngine engine) { if (!super.jobInit(engine)) return false; diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/RectangleAnimationImageFeedback.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/RectangleAnimationImageFeedback.java index 27beed9c346..d274d5df138 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/RectangleAnimationImageFeedback.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/RectangleAnimationImageFeedback.java @@ -49,6 +49,7 @@ public class RectangleAnimationImageFeedback extends this.image = image; addPaintListener(new PaintListener() { + @Override public void paintControl(PaintEvent e) { paintImage(e.gc); } @@ -67,6 +68,7 @@ public class RectangleAnimationImageFeedback extends /* (non-Javadoc) * @see org.eclipse.swt.widgets.Widget#dispose() */ + @Override public void dispose() { super.dispose(); image.dispose(); @@ -84,6 +86,7 @@ public class RectangleAnimationImageFeedback extends super(parentShell, start, end); } + @Override public void dispose() { backingStore.dispose(); for (Iterator ctrlIter = controls.iterator(); ctrlIter.hasNext();) { @@ -95,6 +98,7 @@ public class RectangleAnimationImageFeedback extends theShell.dispose(); } + @Override public void initialize(AnimationEngine engine) { display = getAnimationShell().getDisplay(); @@ -118,12 +122,14 @@ public class RectangleAnimationImageFeedback extends /* (non-Javadoc) * @see org.eclipse.ui.internal.RectangleAnimationFeedbackBase#jobInit(org.eclipse.ui.internal.AnimationEngine) */ + @Override public boolean jobInit(AnimationEngine engine) { changeCoordinates(); captureImages(); return super.jobInit(engine); } + @Override public void addStartRect(Rectangle rect) { if (rect == null) return; @@ -133,6 +139,7 @@ public class RectangleAnimationImageFeedback extends } + @Override public void addEndRect(Rectangle rect) { if (rect != null) { // Rectangle end = Geometry.toControl(getAnimationShell(), rect); @@ -140,6 +147,7 @@ public class RectangleAnimationImageFeedback extends } } + @Override public void renderStep(AnimationEngine engine) { Iterator ctrlIter = controls.iterator(); Iterator currentRects = getCurrentRects(engine.amount()).iterator(); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ReopenEditorMenu.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ReopenEditorMenu.java index 355f4530b2d..221f2ce58e8 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ReopenEditorMenu.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ReopenEditorMenu.java @@ -191,7 +191,8 @@ public class ReopenEditorMenu extends ContributionItem { * Fills the given menu with * menu items for all windows. */ - public void fill(final Menu menu, int index) { + @Override + public void fill(final Menu menu, int index) { if (window.getActivePage() == null || window.getActivePage().getPerspective() == null) { return; @@ -222,19 +223,22 @@ public class ReopenEditorMenu extends ContributionItem { final EditorHistoryItem item = historyItems[i]; final int historyIndex = i; SafeRunner.run(new SafeRunnable() { - public void run() throws Exception { + @Override + public void run() throws Exception { String text = calcText(historyIndex, item); MenuItem mi = new MenuItem(menu, SWT.PUSH, menuIndex[0]); ++menuIndex[0]; mi.setText(text); mi.addSelectionListener(new SelectionAdapter() { - public void widgetSelected(SelectionEvent e) { + @Override + public void widgetSelected(SelectionEvent e) { open(item); } }); } - public void handleException(Throwable e) { + @Override + public void handleException(Throwable e) { // just skip the item if there's an error, // e.g. in the calculation of the shortened name WorkbenchPlugin.log(getClass(), "fill", e); //$NON-NLS-1$ @@ -246,7 +250,8 @@ public class ReopenEditorMenu extends ContributionItem { /** * Overridden to always return true and force dynamic menu building. */ - public boolean isDynamic() { + @Override + public boolean isDynamic() { return true; } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ResetPerspectiveAction.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ResetPerspectiveAction.java index 96e59efabbf..35f146501be 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ResetPerspectiveAction.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ResetPerspectiveAction.java @@ -48,7 +48,8 @@ public class ResetPerspectiveAction extends PerspectiveAction { /* (non-Javadoc) * Method declared on PerspectiveAction. */ - protected void run(IWorkbenchPage page, IPerspectiveDescriptor persp) { + @Override + protected void run(IWorkbenchPage page, IPerspectiveDescriptor persp) { String message = NLS.bind(WorkbenchMessages.ResetPerspective_message, persp.getLabel() ); String[] buttons = new String[] { IDialogConstants.OK_LABEL, IDialogConstants.CANCEL_LABEL }; diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/SaveAction.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/SaveAction.java index 86283c273dd..0868f9b3bc0 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/SaveAction.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/SaveAction.java @@ -45,7 +45,8 @@ public class SaveAction extends BaseSaveAction implements IBackgroundSaveListene ((WorkbenchWindow)window).addBackgroundSaveListener(this); } - public void dispose() { + @Override + public void dispose() { ((WorkbenchWindow)getWorkbenchWindow()).removeBackgroundSaveListener(this); super.dispose(); } @@ -55,7 +56,8 @@ public class SaveAction extends BaseSaveAction implements IBackgroundSaveListene * Performs the <code>Save</code> action by calling the * <code>IEditorPart.doSave</code> method on the active editor. */ - public void run() { + @Override + public void run() { if (getWorkbenchWindow() == null) { // action has been disposed return; @@ -87,7 +89,8 @@ public class SaveAction extends BaseSaveAction implements IBackgroundSaveListene /* (non-Javadoc) * Method declared on ActiveEditorAction. */ - protected void updateState() { + @Override + protected void updateState() { /* ********************************************************************************** * The code below was added to track the view with focus * in order to support save actions from a view (see bug 10234). @@ -105,10 +108,12 @@ public class SaveAction extends BaseSaveAction implements IBackgroundSaveListene setEnabled(saveable != null && saveable.isDirty()); } + @Override public void handleBackgroundSaveStarted() { updateState(); } + @Override public void setEnabled(boolean enabled) { super.setEnabled(enabled); IWorkbenchWindow window = getWorkbenchWindow(); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/SaveAllAction.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/SaveAllAction.java index 8e6bc2a6c86..de43e2a334a 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/SaveAllAction.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/SaveAllAction.java @@ -65,7 +65,8 @@ public class SaveAllAction extends PageEventAction implements IPropertyListener /* (non-Javadoc) * Method declared on PageEventAction. */ - public void pageActivated(IWorkbenchPage page) { + @Override + public void pageActivated(IWorkbenchPage page) { super.pageActivated(page); updateState(); } @@ -73,7 +74,8 @@ public class SaveAllAction extends PageEventAction implements IPropertyListener /* (non-Javadoc) * Method declared on PageEventAction. */ - public void pageClosed(IWorkbenchPage page) { + @Override + public void pageClosed(IWorkbenchPage page) { super.pageClosed(page); updateState(); } @@ -81,7 +83,8 @@ public class SaveAllAction extends PageEventAction implements IPropertyListener /* (non-Javadoc) * Method declared on PartEventAction. */ - public void partClosed(IWorkbenchPart part) { + @Override + public void partClosed(IWorkbenchPart part) { super.partClosed(part); if (part instanceof ISaveablePart) { part.removePropertyListener(this); @@ -93,7 +96,8 @@ public class SaveAllAction extends PageEventAction implements IPropertyListener /* (non-Javadoc) * Method declared on PartEventAction. */ - public void partOpened(IWorkbenchPart part) { + @Override + public void partOpened(IWorkbenchPart part) { super.partOpened(part); if (part instanceof ISaveablePart) { part.addPropertyListener(this); @@ -114,7 +118,8 @@ public class SaveAllAction extends PageEventAction implements IPropertyListener /* (non-Javadoc) * Method declared on IPropertyListener. */ - public void propertyChanged(Object source, int propID) { + @Override + public void propertyChanged(Object source, int propID) { if (source instanceof ISaveablePart) { if (propID == ISaveablePart.PROP_DIRTY) { updateState(); @@ -125,7 +130,8 @@ public class SaveAllAction extends PageEventAction implements IPropertyListener /* (non-Javadoc) * Method declared on Action. */ - public void run() { + @Override + public void run() { if (getWorkbenchWindow() == null) { // action has been disposed return; @@ -163,7 +169,8 @@ public class SaveAllAction extends PageEventAction implements IPropertyListener /* (non-Javadoc) * Method declared on PageEventAction. */ - public void dispose() { + @Override + public void dispose() { super.dispose(); for (Iterator it = partsWithListeners.iterator(); it.hasNext();) { IWorkbenchPart part = (IWorkbenchPart) it.next(); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/SaveAsAction.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/SaveAsAction.java index caaafadec7c..b6e2eb31d0e 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/SaveAsAction.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/SaveAsAction.java @@ -43,7 +43,8 @@ public class SaveAsAction extends BaseSaveAction { /* (non-Javadoc) * Method declared on Action. */ - public void run() { + @Override + public void run() { if (getWorkbenchWindow() == null) { // action has been disposed return; @@ -68,7 +69,8 @@ public class SaveAsAction extends BaseSaveAction { /* (non-Javadoc) * Method declared on ActiveEditorAction. */ - protected void updateState() { + @Override + protected void updateState() { /* ********************************************************************************** * The code below was added to track the view with focus * in order to support save actions from a view (see bug 10234). diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/SavePerspectiveAction.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/SavePerspectiveAction.java index e55d487c801..94343569b46 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/SavePerspectiveAction.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/SavePerspectiveAction.java @@ -39,7 +39,8 @@ public class SavePerspectiveAction extends PerspectiveAction { /* (non-Javadoc) * Method declared on PerspectiveAction. */ - protected void run(IWorkbenchPage page, IPerspectiveDescriptor persp) { + @Override + protected void run(IWorkbenchPage page, IPerspectiveDescriptor persp) { PerspectiveDescriptor desc = (PerspectiveDescriptor) persp; if (desc != null) { // saveNonSingleton(page, desc); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/SaveableHelper.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/SaveableHelper.java index eb5b0144be9..a158257250b 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/SaveableHelper.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/SaveableHelper.java @@ -120,6 +120,7 @@ public class SaveableHelper { MessageDialog d = new MessageDialog(window.getShell(), WorkbenchMessages.Save_Resource, null, message, MessageDialog.QUESTION, buttons, 0) { + @Override protected int getShellStyle() { return super.getShellStyle() | SWT.SHEET; } @@ -147,6 +148,7 @@ public class SaveableHelper { // Create save block. IRunnableWithProgress progressOp = new IRunnableWithProgress() { + @Override public void run(IProgressMonitor monitor) { IProgressMonitor monitorWrap = new EventLoopProgressMonitor(monitor); saveable.doSave(monitorWrap); @@ -181,6 +183,7 @@ public class SaveableHelper { // Create save block. IRunnableWithProgress progressOp = new IRunnableWithProgress() { + @Override public void run(IProgressMonitor monitor) { IProgressMonitor monitorWrap = new EventLoopProgressMonitor(monitor); monitorWrap.beginTask(WorkbenchMessages.Save, dirtyModels.size()); @@ -243,6 +246,7 @@ public class SaveableHelper { // Create save block. IRunnableWithProgress progressOp = new IRunnableWithProgress() { + @Override public void run(IProgressMonitor monitor) { IProgressMonitor monitorWrap = new EventLoopProgressMonitor(monitor); saveable.doSave(monitorWrap); @@ -274,6 +278,7 @@ public class SaveableHelper { final IRunnableContext runnableContext, final IShellProvider shellProvider) { final boolean[] success = new boolean[] { false }; IRunnableWithProgress runnable = new IRunnableWithProgress() { + @Override public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException { progressOp.run(monitor); // Only indicate success if the monitor wasn't canceled @@ -371,6 +376,7 @@ public class SaveableHelper { Job saveJob = new Job(NLS.bind( WorkbenchMessages.EditorManager_backgroundSaveJobName, model.getName())) { + @Override public boolean belongsTo(Object family) { if (family instanceof DynamicFamily) { return ((DynamicFamily)family).contains(model); @@ -378,6 +384,7 @@ public class SaveableHelper { return family.equals(model); } + @Override protected IStatus run(IProgressMonitor monitor) { return backgroundSaveRunnable[0].run(monitor); } @@ -403,10 +410,12 @@ public class SaveableHelper { // finished, and for displaying an error dialog if // necessary. saveJob.addJobChangeListener(new JobChangeAdapter() { + @Override public void done(final IJobChangeEvent event) { ((InternalSaveable) model).setBackgroundSaveJob(null); shellProvider.getShell().getDisplay().asyncExec( new Runnable() { + @Override public void run() { notifySaveAction(parts); model.enableUI(parts); @@ -465,6 +474,7 @@ public class SaveableHelper { // block if any of the saveables is still saving in the background try { PlatformUI.getWorkbench().getProgressService().busyCursorWhile(new IRunnableWithProgress() { + @Override public void run(IProgressMonitor monitor) throws InterruptedException { Job.getJobManager().join(new DynamicFamily(modelsToSave), monitor); } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/SaveablesList.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/SaveablesList.java index b2398bdc6f0..d09fa949b9e 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/SaveablesList.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/SaveablesList.java @@ -208,6 +208,7 @@ public class SaveablesList implements ISaveablesLifecycleListener { * This method must be called on the UI thread. * </p> */ + @Override public void handleLifecycleEvent(SaveablesLifecycleEvent event) { if (!(event.getSource() instanceof IWorkbenchPart)) { // just update the set of non-part sources. No prompting necessary. @@ -499,6 +500,7 @@ public class SaveablesList implements ISaveablesLifecycleListener { MessageDialogWithToggle dialogWithToggle = new MessageDialogWithToggle(shellProvider.getShell(), WorkbenchMessages.Save_Resource, null, message, MessageDialog.QUESTION, buttons, 0, WorkbenchMessages.EditorManager_closeWithoutPromptingOption, false) { + @Override protected int getShellStyle() { return (canCancel ? SWT.CLOSE : SWT.NONE) | SWT.TITLE | SWT.BORDER @@ -515,6 +517,7 @@ public class SaveablesList implements ISaveablesLifecycleListener { dialog = new MessageDialog(shellProvider.getShell(), WorkbenchMessages.Save_Resource, null, message, MessageDialog.QUESTION, buttons, 0) { + @Override protected int getShellStyle() { return (canCancel ? SWT.CLOSE : SWT.NONE) | SWT.TITLE | SWT.BORDER @@ -606,6 +609,7 @@ public class SaveablesList implements ISaveablesLifecycleListener { */ public boolean saveModels(final List finalModels, final IShellProvider shellProvider, IRunnableContext runnableContext) { IRunnableWithProgress progressOp = new IRunnableWithProgress() { + @Override public void run(IProgressMonitor monitor) { IProgressMonitor monitorWrap = new EventLoopProgressMonitor( monitor); @@ -751,6 +755,7 @@ public class SaveablesList implements ISaveablesLifecycleListener { return dontPromptSelection; } + @Override protected void createButtonsForButtonBar(Composite parent) { createButton(parent, IDialogConstants.OK_ID, IDialogConstants.OK_LABEL, true); @@ -760,6 +765,7 @@ public class SaveablesList implements ISaveablesLifecycleListener { } } + @Override protected Control createDialogArea(Composite parent) { Composite dialogAreaComposite = (Composite) super.createDialogArea(parent); @@ -769,6 +775,7 @@ public class SaveablesList implements ISaveablesLifecycleListener { checkbox = new Button(checkboxComposite, SWT.CHECK); checkbox.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { dontPromptSelection = checkbox.getSelection(); } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/SelectionAdapterFactory.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/SelectionAdapterFactory.java index cee1933b450..b94f3964702 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/SelectionAdapterFactory.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/SelectionAdapterFactory.java @@ -34,6 +34,7 @@ public class SelectionAdapterFactory implements IAdapterFactory { * * @see org.eclipse.core.expressions.ICountable#count() */ + @Override public int count() { return 0; } @@ -44,6 +45,7 @@ public class SelectionAdapterFactory implements IAdapterFactory { * * @see org.eclipse.core.expressions.ICountable#count() */ + @Override public int count() { return 1; } @@ -54,6 +56,7 @@ public class SelectionAdapterFactory implements IAdapterFactory { * * @see org.eclipse.core.expressions.IIterable#iterator() */ + @Override public Iterator iterator() { return Collections.EMPTY_LIST.iterator(); } @@ -65,6 +68,7 @@ public class SelectionAdapterFactory implements IAdapterFactory { private static final Class[] CLASSES = new Class[] { IIterable.class, ICountable.class }; + @Override public Object getAdapter(Object adaptableObject, Class adapterType) { if (adaptableObject instanceof ISelection) { if (adapterType == IIterable.class) { @@ -82,6 +86,7 @@ public class SelectionAdapterFactory implements IAdapterFactory { } if (sel instanceof IStructuredSelection) { return new IIterable() { + @Override public Iterator iterator() { return ((IStructuredSelection) sel).iterator(); } @@ -90,6 +95,7 @@ public class SelectionAdapterFactory implements IAdapterFactory { final List list = Arrays.asList(new Object[] { sel }); return new IIterable() { + @Override public Iterator iterator() { return list.iterator(); } @@ -103,6 +109,7 @@ public class SelectionAdapterFactory implements IAdapterFactory { if (sel instanceof IStructuredSelection) { final IStructuredSelection ss = (IStructuredSelection) sel; return new ICountable() { + @Override public int count() { return ss.size(); } @@ -111,6 +118,7 @@ public class SelectionAdapterFactory implements IAdapterFactory { return ICOUNT_1; } + @Override public Class[] getAdapterList() { return CLASSES; } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/SelectionConversionService.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/SelectionConversionService.java index 758763984f1..13334440da6 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/SelectionConversionService.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/SelectionConversionService.java @@ -45,6 +45,7 @@ public class SelectionConversionService implements ISelectionConversionService { * the original selection * @return the converted selection or an empty selection. */ + @Override public IStructuredSelection convertToResources( IStructuredSelection originalSelection) { // @issue resource-specific code should be pushed into IDE diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/Semaphore.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/Semaphore.java index 928061478a8..1d4c5a156e9 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/Semaphore.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/Semaphore.java @@ -45,7 +45,8 @@ public class Semaphore { } } - public boolean equals(Object obj) { + @Override + public boolean equals(Object obj) { return (runnable == ((Semaphore) obj).runnable); } @@ -57,7 +58,8 @@ public class Semaphore { return runnable; } - public int hashCode() { + @Override + public int hashCode() { return runnable == null ? 0 : runnable.hashCode(); } @@ -71,7 +73,8 @@ public class Semaphore { } // for debug only - public String toString() { + @Override + public String toString() { return "Semaphore(" + runnable + ")"; //$NON-NLS-1$ //$NON-NLS-2$ } } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/SharedImages.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/SharedImages.java index 4514095af53..29e55154dd0 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/SharedImages.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/SharedImages.java @@ -23,7 +23,8 @@ public class SharedImages implements ISharedImages { * * @see ISharedImages */ - public Image getImage(String symbolicName) { + @Override + public Image getImage(String symbolicName) { Image image = WorkbenchImages.getImage(symbolicName); if (image != null) { return image; @@ -43,7 +44,8 @@ public class SharedImages implements ISharedImages { * * @see ISharedImages */ - public ImageDescriptor getImageDescriptor(String symbolicName) { + @Override + public ImageDescriptor getImageDescriptor(String symbolicName) { return WorkbenchImages.getImageDescriptor(symbolicName); } } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ShellPool.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ShellPool.java index fc8e1a09ecb..af42d73fa66 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ShellPool.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ShellPool.java @@ -46,14 +46,16 @@ public class ShellPool { private boolean isDisposed = false; private DisposeListener disposeListener = new DisposeListener() { - public void widgetDisposed(DisposeEvent e) { + @Override + public void widgetDisposed(DisposeEvent e) { WorkbenchPlugin.log(new RuntimeException("Widget disposed too early!")); //$NON-NLS-1$ } }; private ShellListener closeListener = new ShellAdapter() { - public void shellClosed(ShellEvent e) { + @Override + public void shellClosed(ShellEvent e) { if (isDisposed) { return; } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ShowFastViewContribution.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ShowFastViewContribution.java index d29e1dd8856..46863843621 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ShowFastViewContribution.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ShowFastViewContribution.java @@ -82,6 +82,7 @@ public class ShowFastViewContribution extends ContributionItem { * The default implementation of this <code>IContributionItem</code> method * does nothing. Subclasses may override. */ + @Override public void fill(ToolBar parent, int index) { // Get page. WorkbenchPage page = (WorkbenchPage) window.getActivePage(); @@ -101,6 +102,7 @@ public class ShowFastViewContribution extends ContributionItem { final IPropertyListener propertyListener = new IPropertyListener() { + @Override public void propertyChanged(Object source, int propId) { if (propId == IWorkbenchPartConstants.PROP_TITLE) { if (!item.isDisposed()) { @@ -121,6 +123,7 @@ public class ShowFastViewContribution extends ContributionItem { * org.eclipse.swt.events.DisposeListener#widgetDisposed(org * .eclipse.swt.events.DisposeEvent) */ + @Override public void widgetDisposed(DisposeEvent e) { ref.removePropertyListener(propertyListener); } @@ -130,6 +133,7 @@ public class ShowFastViewContribution extends ContributionItem { item.setSelection(false); item.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { showView(ref); } @@ -141,6 +145,7 @@ public class ShowFastViewContribution extends ContributionItem { /** * Returns whether the contribution is dynamic. */ + @Override public boolean isDynamic() { return true; } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ShowInHandler.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ShowInHandler.java index 5fe7f1333e6..735aaeb609a 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ShowInHandler.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ShowInHandler.java @@ -48,6 +48,7 @@ public class ShowInHandler extends AbstractHandler implements IElementUpdater { * * @see org.eclipse.core.commands.IHandler#execute(org.eclipse.core.commands.ExecutionEvent) */ + @Override public Object execute(ExecutionEvent event) throws ExecutionException { IWorkbenchPage p = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage(); WorkbenchPartReference r = (WorkbenchPartReference) p.getActivePartReference(); @@ -128,6 +129,7 @@ public class ShowInHandler extends AbstractHandler implements IElementUpdater { * @see org.eclipse.ui.commands.IElementUpdater#updateElement(org.eclipse.ui.menus.UIElement, * java.util.Map) */ + @Override public void updateElement(UIElement element, Map parameters) { String targetId = (String) parameters .get(IWorkbenchCommandConstants.NAVIGATE_SHOW_IN_PARM_TARGET); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ShowInMenu.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ShowInMenu.java index 6a093608e3d..496e9ad16c0 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ShowInMenu.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ShowInMenu.java @@ -79,6 +79,7 @@ public class ShowInMenu extends ContributionItem implements private boolean dirty = true; private IMenuListener menuListener = new IMenuListener() { + @Override public void menuAboutToShow(IMenuManager manager) { manager.markDirty(); dirty = true; @@ -106,6 +107,7 @@ public class ShowInMenu extends ContributionItem implements this.window = window; } + @Override public boolean isDirty() { return dirty; } @@ -113,10 +115,12 @@ public class ShowInMenu extends ContributionItem implements /** * Overridden to always return true and force dynamic menu building. */ + @Override public boolean isDynamic() { return true; } + @Override public void fill(Menu menu, int index) { if (getParent() instanceof MenuManager) { ((MenuManager) getParent()).addMenuListener(menuListener); @@ -403,6 +407,7 @@ public class ShowInMenu extends ContributionItem implements * * @see org.eclipse.ui.menus.IWorkbenchContribution#initialize(org.eclipse.ui.services.IServiceLocator) */ + @Override public void initialize(IServiceLocator serviceLocator) { locator = serviceLocator; } @@ -430,6 +435,7 @@ public class ShowInMenu extends ContributionItem implements * * @see org.eclipse.jface.action.ContributionItem#dispose() */ + @Override public void dispose() { if (currentManager != null && currentManager.getSize() > 0) { // IMenuService service = (IMenuService) locator diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ShowPartPaneMenuHandler.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ShowPartPaneMenuHandler.java index 22e21ea3790..6d18d8b31f0 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ShowPartPaneMenuHandler.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ShowPartPaneMenuHandler.java @@ -47,6 +47,7 @@ public class ShowPartPaneMenuHandler extends AbstractEvaluationHandler { registerEnablement(); } + @Override public Object execute(ExecutionEvent event) throws ExecutionException { IWorkbenchPart part = HandlerUtil.getActivePart(event); if (part != null) { @@ -89,9 +90,11 @@ public class ShowPartPaneMenuHandler extends AbstractEvaluationHandler { * org.eclipse.ui.internal.AbstractEvaluationHandler#getEnabledWhenExpression * () */ + @Override protected Expression getEnabledWhenExpression() { if (enabledWhen == null) { enabledWhen = new Expression() { + @Override public EvaluationResult evaluate(IEvaluationContext context) throws CoreException { IWorkbenchPart part = InternalHandlerUtil.getActivePart(context); @@ -108,6 +111,7 @@ public class ShowPartPaneMenuHandler extends AbstractEvaluationHandler { * org.eclipse.core.expressions.Expression#collectExpressionInfo * (org.eclipse.core.expressions.ExpressionInfo) */ + @Override public void collectExpressionInfo(ExpressionInfo info) { info.addVariableNameAccess(ISources.ACTIVE_PART_NAME); } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ShowViewAction.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ShowViewAction.java index fb2900355b6..ae3c00cbfe3 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ShowViewAction.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ShowViewAction.java @@ -48,7 +48,8 @@ public class ShowViewAction extends Action implements IPluginContribution { /** * Implementation of method defined on <code>IAction</code>. */ - public void run() { + @Override + public void run() { IWorkbenchPage page = window.getActivePage(); if (page != null) { try { @@ -67,7 +68,8 @@ public class ShowViewAction extends Action implements IPluginContribution { * * @see org.eclipse.ui.activities.support.IPluginContribution#getLocalId() */ - public String getLocalId() { + @Override + public String getLocalId() { return desc.getId(); } @@ -76,7 +78,8 @@ public class ShowViewAction extends Action implements IPluginContribution { * * @see org.eclipse.ui.activities.support.IPluginContribution#getPluginId() */ - public String getPluginId() { + @Override + public String getPluginId() { return desc instanceof IPluginContribution ? ((IPluginContribution) desc) .getPluginId() : null; diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ShowViewMenu.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ShowViewMenu.java index 6ff47364da7..9e37f8aa432 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ShowViewMenu.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ShowViewMenu.java @@ -62,11 +62,13 @@ public class ShowViewMenu extends ContributionItem { /** * @deprecated As of 3.5, replaced by {@link IWorkbenchCommandConstants#VIEWS_SHOW_VIEW} */ + @Deprecated public static final String SHOW_VIEW_ID= IWorkbenchCommandConstants.VIEWS_SHOW_VIEW; /** * @deprecated As of 3.6, replaced by * {@link IWorkbenchCommandConstants#VIEWS_SHOW_VIEW_PARM_ID} */ + @Deprecated public static final String VIEW_ID_PARM = IWorkbenchCommandConstants.VIEWS_SHOW_VIEW_PARM_ID; private IWorkbenchWindow window; @@ -74,6 +76,7 @@ public class ShowViewMenu extends ContributionItem { private static final String NO_TARGETS_MSG = WorkbenchMessages.Workbench_showInNoTargets; private Comparator actionComparator = new Comparator() { + @Override public int compare(Object o1, Object o2) { if (collator == null) { collator = Collator.getInstance(); @@ -94,6 +97,7 @@ public class ShowViewMenu extends ContributionItem { private MenuManager menuManager; private IMenuListener menuListener = new IMenuListener() { + @Override public void menuAboutToShow(IMenuManager manager) { manager.markDirty(); } @@ -136,6 +140,7 @@ public class ShowViewMenu extends ContributionItem { final ParameterizedCommand cmd = getCommand(commandService, makeFast); showDlgAction = new Action(WorkbenchMessages.ShowView_title) { + @Override public void run() { try { handlerService.executeCommand(cmd, null); @@ -166,6 +171,7 @@ public class ShowViewMenu extends ContributionItem { /** * Overridden to always return true and force dynamic menu building. */ + @Override public boolean isDynamic() { return true; } @@ -244,6 +250,7 @@ public class ShowViewMenu extends ContributionItem { * * @see org.eclipse.ui.IPluginContribution#getLocalId() */ + @Override public String getLocalId() { return localId; } @@ -253,6 +260,7 @@ public class ShowViewMenu extends ContributionItem { * * @see org.eclipse.ui.IPluginContribution#getPluginId() */ + @Override public String getPluginId() { return pluginId; } @@ -311,6 +319,7 @@ public class ShowViewMenu extends ContributionItem { return parts; } + @Override public void fill(Menu menu, int index) { if (getParent() instanceof MenuManager) { ((MenuManager) getParent()).addMenuListener(menuListener); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ShowViewMenuHandler.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ShowViewMenuHandler.java index 92107109e6e..883016df20a 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ShowViewMenuHandler.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ShowViewMenuHandler.java @@ -65,6 +65,7 @@ public class ShowViewMenuHandler extends AbstractEvaluationHandler { * org.eclipse.core.commands.AbstractHandler#execute(org.eclipse.core.commands * .ExecutionEvent) */ + @Override public Object execute(ExecutionEvent event) throws ExecutionException { IWorkbenchPart part = HandlerUtil.getActivePart(event); if (part != null) { @@ -117,6 +118,7 @@ public class ShowViewMenuHandler extends AbstractEvaluationHandler { if (menu != null) { final Menu tmpMenu = menu; partContainer.addDisposeListener(new DisposeListener() { + @Override public void widgetDisposed(DisposeEvent e) { tmpMenu.dispose(); } @@ -147,10 +149,12 @@ public class ShowViewMenuHandler extends AbstractEvaluationHandler { * org.eclipse.ui.internal.AbstractEvaluationHandler#getEnabledWhenExpression * () */ + @Override protected Expression getEnabledWhenExpression() { // TODO Auto-generated method stub if (enabledWhen == null) { enabledWhen = new Expression() { + @Override public EvaluationResult evaluate(IEvaluationContext context) throws CoreException { // IWorkbenchPart part = InternalHandlerUtil // .getActivePart(context); @@ -171,6 +175,7 @@ public class ShowViewMenuHandler extends AbstractEvaluationHandler { * org.eclipse.core.expressions.Expression#collectExpressionInfo * (org.eclipse.core.expressions.ExpressionInfo) */ + @Override public void collectExpressionInfo(ExpressionInfo info) { info.addVariableNameAccess(ISources.ACTIVE_PART_NAME); } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/SlavePageService.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/SlavePageService.java index b0c7bf948b7..7933f66877c 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/SlavePageService.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/SlavePageService.java @@ -37,30 +37,36 @@ public class SlavePageService implements IPageService, IDisposable { this.parent = parent; } + @Override public void addPageListener(IPageListener listener) { pageListeners.add(listener); parent.addPageListener(listener); } + @Override public void addPerspectiveListener(IPerspectiveListener listener) { perspectiveListeners.add(listener); parent.addPerspectiveListener(listener); } + @Override public IWorkbenchPage getActivePage() { return parent.getActivePage(); } + @Override public void removePageListener(IPageListener listener) { pageListeners.remove(listener); parent.removePageListener(listener); } + @Override public void removePerspectiveListener(IPerspectiveListener listener) { perspectiveListeners.remove(listener); parent.removePerspectiveListener(listener); } + @Override public void dispose() { Object[] listeners = pageListeners.getListeners(); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/SlavePartService.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/SlavePartService.java index 8e29b88920b..fb4e980945e 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/SlavePartService.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/SlavePartService.java @@ -56,34 +56,41 @@ public class SlavePartService implements IPartService, IDisposable { this.parent = parentPartService; } + @Override public void addPartListener(IPartListener listener) { listeners.add(listener); parent.addPartListener(listener); } + @Override public void addPartListener(IPartListener2 listener) { listeners.add(listener); parent.addPartListener(listener); } + @Override public IWorkbenchPart getActivePart() { return parent.getActivePart(); } + @Override public IWorkbenchPartReference getActivePartReference() { return parent.getActivePartReference(); } + @Override public void removePartListener(IPartListener listener) { listeners.remove(listener); parent.removePartListener(listener); } + @Override public void removePartListener(IPartListener2 listener) { listeners.remove(listener); parent.removePartListener(listener); } + @Override public void dispose() { Object list[] = listeners.getListeners(); for (int i = 0; i < list.length; i++) { diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/SlaveSelectionService.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/SlaveSelectionService.java index 2f5f280697b..5cb307fcdbc 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/SlaveSelectionService.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/SlaveSelectionService.java @@ -45,57 +45,68 @@ public class SlaveSelectionService implements ISelectionService, IDisposable { this.parentSelectionService = parentSelectionService; } + @Override public void addPostSelectionListener(ISelectionListener listener) { postListeners.add(listener); parentSelectionService.addPostSelectionListener(listener); } + @Override public void addPostSelectionListener(String partId, ISelectionListener listener) { listenersToPartId.put(listener, partId); parentSelectionService.addPostSelectionListener(partId, listener); } + @Override public void addSelectionListener(ISelectionListener listener) { listeners.add(listener); parentSelectionService.addSelectionListener(listener); } + @Override public void addSelectionListener(String partId, ISelectionListener listener) { postListenersToPartId.put(listener, partId); parentSelectionService.addPostSelectionListener(partId, listener); } + @Override public ISelection getSelection() { return parentSelectionService.getSelection(); } + @Override public ISelection getSelection(String partId) { return parentSelectionService.getSelection(partId); } + @Override public void removePostSelectionListener(ISelectionListener listener) { postListeners.remove(listener); parentSelectionService.removePostSelectionListener(listener); } + @Override public void removePostSelectionListener(String partId, ISelectionListener listener) { postListenersToPartId.remove(listener); parentSelectionService.removePostSelectionListener(partId, listener); } + @Override public void removeSelectionListener(ISelectionListener listener) { listeners.remove(listener); parentSelectionService.removeSelectionListener(listener); } + @Override public void removeSelectionListener(String partId, ISelectionListener listener) { listenersToPartId.remove(listener); parentSelectionService.removeSelectionListener(partId, listener); } + @Override public void dispose() { Object list[] = listeners.getListeners(); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/SplitHandler.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/SplitHandler.java index f5c9c84ce71..30fa7a93928 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/SplitHandler.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/SplitHandler.java @@ -40,6 +40,7 @@ public class SplitHandler extends AbstractHandler { public SplitHandler() { } + @Override public Object execute(ExecutionEvent event) throws ExecutionException { // Only works for the active editor IEditorPart activeEditor = HandlerUtil.getActiveEditor(event); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/SplitValues.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/SplitValues.java index eabdcc85373..e6a47800b39 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/SplitValues.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/SplitValues.java @@ -28,6 +28,7 @@ public class SplitValues implements IParameterValues { values.put(WorkbenchMessages.SplitValues_Vertical, "false"); //$NON-NLS-1$ } + @Override public Map getParameterValues() { return values; } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/StartupThreading.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/StartupThreading.java index c9276fc63fd..b15d7013e77 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/StartupThreading.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/StartupThreading.java @@ -26,6 +26,7 @@ public final class StartupThreading { public static abstract class StartupRunnable implements Runnable { private Throwable throwable; + @Override public final void run() { try { runWithException(); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/SwitchToWindowMenu.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/SwitchToWindowMenu.java index f3a9582eba8..67d9262a1fd 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/SwitchToWindowMenu.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/SwitchToWindowMenu.java @@ -72,7 +72,8 @@ public class SwitchToWindowMenu extends ContributionItem { * Fills the given menu with menu items for all * opened workbench windows. */ - public void fill(Menu menu, int index) { + @Override + public void fill(Menu menu, int index) { // Get workbench windows. IWorkbench workbench = workbenchWindow.getWorkbench(); @@ -101,7 +102,8 @@ public class SwitchToWindowMenu extends ContributionItem { count++; mi.setText(name); mi.addSelectionListener(new SelectionAdapter() { - public void widgetSelected(SelectionEvent e) { + @Override + public void widgetSelected(SelectionEvent e) { Shell windowShell = window.getShell(); if (windowShell.getMinimized()) { windowShell.setMinimized(false); @@ -119,14 +121,16 @@ public class SwitchToWindowMenu extends ContributionItem { /** * Overridden to always return true and force dynamic menu building. */ - public boolean isDirty() { + @Override + public boolean isDirty() { return true; } /** * Overridden to always return true and force dynamic menu building. */ - public boolean isDynamic() { + @Override + public boolean isDynamic() { return true; } } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ToggleEditorsVisibilityAction.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ToggleEditorsVisibilityAction.java index 7ead7a97c26..8193e6d061b 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ToggleEditorsVisibilityAction.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ToggleEditorsVisibilityAction.java @@ -25,7 +25,8 @@ public class ToggleEditorsVisibilityAction extends PerspectiveAction implements /* (non-Javadoc) * Method declared on IPerspectiveListener */ - public void perspectiveActivated(IWorkbenchPage page, + @Override + public void perspectiveActivated(IWorkbenchPage page, IPerspectiveDescriptor perspective) { if (page.isEditorAreaVisible()) { setText(WorkbenchMessages.ToggleEditor_hideEditors); @@ -37,7 +38,8 @@ public class ToggleEditorsVisibilityAction extends PerspectiveAction implements /* (non-Javadoc) * Method declared on IPerspectiveListener */ - public void perspectiveChanged(IWorkbenchPage page, + @Override + public void perspectiveChanged(IWorkbenchPage page, IPerspectiveDescriptor perspective, String changeId) { if (changeId == IWorkbenchPage.CHANGE_RESET || changeId == IWorkbenchPage.CHANGE_EDITOR_AREA_HIDE @@ -69,7 +71,8 @@ public class ToggleEditorsVisibilityAction extends PerspectiveAction implements /* (non-Javadoc) * Method declared on PerspectiveAction. */ - protected void run(IWorkbenchPage page, IPerspectiveDescriptor persp) { + @Override + protected void run(IWorkbenchPage page, IPerspectiveDescriptor persp) { boolean visible = page.isEditorAreaVisible(); if (visible) { page.setEditorAreaVisible(false); @@ -83,7 +86,8 @@ public class ToggleEditorsVisibilityAction extends PerspectiveAction implements /* (non-Javadoc) * Method declared on ActionFactory.IWorkbenchAction. */ - public void dispose() { + @Override + public void dispose() { if (getWindow() != null) { getWindow().removePerspectiveListener(this); } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/TrimDropTarget.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/TrimDropTarget.java index 5178474e430..8bfe6c4428b 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/TrimDropTarget.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/TrimDropTarget.java @@ -340,7 +340,8 @@ import org.eclipse.ui.internal.layout.TrimToolBarBase; /* (non-Javadoc) * @see org.eclipse.ui.internal.dnd.IDropTarget#drop() */ - public void drop() { + @Override + public void drop() { // If we aren't docked then restore the initial location if (dockedArea == SWT.NONE) { redock(); @@ -392,7 +393,8 @@ import org.eclipse.ui.internal.layout.TrimToolBarBase; /* (non-Javadoc) * @see org.eclipse.ui.internal.dnd.IDropTarget#getCursor() */ - public Cursor getCursor() { + @Override + public Cursor getCursor() { // If the trim isn't docked then show the 'no smoking' sign if (cursorAreaId == SWT.NONE) { return windowComposite.getDisplay().getSystemCursor(SWT.CURSOR_NO); @@ -405,7 +407,8 @@ import org.eclipse.ui.internal.layout.TrimToolBarBase; /* (non-Javadoc) * @see org.eclipse.ui.internal.dnd.IDropTarget#getSnapRectangle() */ - public Rectangle getSnapRectangle() { + @Override + public Rectangle getSnapRectangle() { // TODO: KLUDGE!! We don't want to show -any- snap rect // but Tracker won't allow that so place it where it won't be visible return new Rectangle(100000, 0,0,0); @@ -414,6 +417,7 @@ import org.eclipse.ui.internal.layout.TrimToolBarBase; /* (non-Javadoc) * @see org.eclipse.ui.internal.dnd.IDropTarget2#dragFinished(boolean) */ + @Override public void dragFinished(boolean dropPerformed) { // If we didn't perform a drop then restore the original position if (!dropPerformed && dockedArea == SWT.NONE) { @@ -450,7 +454,8 @@ import org.eclipse.ui.internal.layout.TrimToolBarBase; /* (non-Javadoc) * @see org.eclipse.ui.internal.dnd.IDragOverListener#drag(org.eclipse.swt.widgets.Control, java.lang.Object, org.eclipse.swt.graphics.Point, org.eclipse.swt.graphics.Rectangle) */ - public IDropTarget drag(Control currentControl, Object draggedObject, + @Override + public IDropTarget drag(Control currentControl, Object draggedObject, Point position, final Rectangle dragRectangle) { // Have to be dragging trim diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/TrimFrame.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/TrimFrame.java index 1b89fc4a3f1..f391a5b3926 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/TrimFrame.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/TrimFrame.java @@ -66,7 +66,8 @@ public class TrimFrame { gc.drawLine(x1, y1, x2, y2); } - public void paintControl(PaintEvent e) { + @Override + public void paintControl(PaintEvent e) { Canvas canvas = (Canvas)e.widget; Control child = canvas.getChildren ()[0]; @@ -138,6 +139,7 @@ public class TrimFrame { // correct location canvas.setLayout(new Layout() { + @Override protected Point computeSize(Composite composite, int wHint, int hHint, boolean changed) { Control[] children = composite.getChildren(); @@ -158,7 +160,8 @@ public class TrimFrame { return innerSize; } - protected void layout(Composite composite, boolean flushCache) { + @Override + protected void layout(Composite composite, boolean flushCache) { Control[] children = composite.getChildren(); if (children.length == 0) return; diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/UILockListener.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/UILockListener.java index 1d8456a0248..7e80fc6d020 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/UILockListener.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/UILockListener.java @@ -107,13 +107,15 @@ public class UILockListener extends LockListener { this.display = display; } - public void aboutToRelease() { + @Override + public void aboutToRelease() { if (isUI()) { ui = null; } } - public boolean aboutToWait(Thread lockOwner) { + @Override + public boolean aboutToWait(Thread lockOwner) { if (isUI()) { // If a syncExec was executed from the current operation, it // has already acquired the lock. So, just return true. @@ -142,6 +144,7 @@ public class UILockListener extends LockListener { * * @see org.eclipse.core.runtime.jobs.LockListener#canBlock() */ + @Override public boolean canBlock() { return !isUI(); } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/UISynchronizer.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/UISynchronizer.java index 6a01d754f9a..7fbc198832c 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/UISynchronizer.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/UISynchronizer.java @@ -52,6 +52,7 @@ public class UISynchronizer extends Synchronizer { * * @see java.lang.ThreadLocal#initialValue() */ + @Override protected Object initialValue() { return Boolean.FALSE; } @@ -59,6 +60,7 @@ public class UISynchronizer extends Synchronizer { /* (non-Javadoc) * @see java.lang.ThreadLocal#set(java.lang.Object) */ + @Override public void set(Object value) { if (value != Boolean.TRUE && value != Boolean.FALSE) throw new IllegalArgumentException(); @@ -67,9 +69,11 @@ public class UISynchronizer extends Synchronizer { }; public static final ThreadLocal overrideThread = new ThreadLocal() { + @Override protected Object initialValue() { return Boolean.FALSE; } + @Override public void set(Object value) { if (value != Boolean.TRUE && value != Boolean.FALSE) throw new IllegalArgumentException(); @@ -112,7 +116,8 @@ public class UISynchronizer extends Synchronizer { /* (non-Javadoc) * @see org.eclipse.swt.widgets.Synchronizer#asyncExec(java.lang.Runnable) */ - protected void asyncExec(Runnable runnable) { + @Override + protected void asyncExec(Runnable runnable) { // the following block should not be invoked if we're using 3.2 threading. if (runnable != null && !use32Threading) { synchronized (this) { @@ -129,6 +134,7 @@ public class UISynchronizer extends Synchronizer { super.asyncExec(runnable); } + @Override public void syncExec(Runnable runnable) { synchronized (this) { @@ -154,7 +160,8 @@ public class UISynchronizer extends Synchronizer { work.setOperationThread(Thread.currentThread()); lockListener.addPendingWork(work); asyncExec(new Runnable() { - public void run() { + @Override + public void run() { lockListener.doPendingWork(); } }); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ViewActionBars.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ViewActionBars.java index 5a5049afaf3..01408609e9f 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ViewActionBars.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ViewActionBars.java @@ -38,6 +38,7 @@ public class ViewActionBars extends SubActionBars { * * @return the menu manager */ + @Override public IMenuManager getMenuManager() { E4Util.unsupported("ViewActionBars"); //$NON-NLS-1$ return null; @@ -49,6 +50,7 @@ public class ViewActionBars extends SubActionBars { * * @return the tool bar manager */ + @Override public IToolBarManager getToolBarManager() { E4Util.unsupported("ViewActionBars"); //$NON-NLS-1$ return null; @@ -58,6 +60,7 @@ public class ViewActionBars extends SubActionBars { * Commits all UI changes. This should be called after additions or * subtractions have been made to a menu, status line, or toolbar. */ + @Override public void updateActionBars() { E4Util.unsupported("ViewActionBars"); //$NON-NLS-1$ getStatusLineManager().update(false); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ViewActionBuilder.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ViewActionBuilder.java index f1fb9cad4f2..2601bca8eb8 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ViewActionBuilder.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ViewActionBuilder.java @@ -42,7 +42,8 @@ public class ViewActionBuilder extends PluginActionBuilder { /* (non-Javadoc) * Method declared on PluginActionBuilder. */ - protected ActionDescriptor createActionDescriptor( + @Override + protected ActionDescriptor createActionDescriptor( org.eclipse.core.runtime.IConfigurationElement element) { return new ActionDescriptor(element, ActionDescriptor.T_VIEW, targetPart); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ViewIntroAdapterPart.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ViewIntroAdapterPart.java index 8ca092829bf..edfd280666e 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ViewIntroAdapterPart.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ViewIntroAdapterPart.java @@ -52,6 +52,7 @@ public final class ViewIntroAdapterPart extends ViewPart { private IEventBroker eventBroker; private EventHandler zoomChangeListener = new EventHandler() { + @Override public void handleEvent(Event event) { if (!handleZoomEvents) return; @@ -108,7 +109,8 @@ public final class ViewIntroAdapterPart extends ViewPart { public void setStandby(final boolean standby) { final Control control = (Control) ((PartSite) getSite()).getModel().getWidget(); BusyIndicator.showWhile(control.getDisplay(), new Runnable() { - public void run() { + @Override + public void run() { try { control.setRedraw(false); introPart.standbyStateChanged(standby); @@ -133,7 +135,8 @@ public final class ViewIntroAdapterPart extends ViewPart { /* (non-Javadoc) * @see org.eclipse.ui.IWorkbenchPart#createPartControl(org.eclipse.swt.widgets.Composite) */ - public void createPartControl(Composite parent) { + @Override + public void createPartControl(Composite parent) { addZoomListener(); introPart.createPartControl(parent); @@ -150,7 +153,8 @@ public final class ViewIntroAdapterPart extends ViewPart { /* (non-Javadoc) * @see org.eclipse.ui.IWorkbenchPart#dispose() */ - public void dispose() { + @Override + public void dispose() { eventBroker.unsubscribe(zoomChangeListener); setBarVisibility(true); @@ -163,21 +167,24 @@ public final class ViewIntroAdapterPart extends ViewPart { /* (non-Javadoc) * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class) */ - public Object getAdapter(Class adapter) { + @Override + public Object getAdapter(Class adapter) { return introPart.getAdapter(adapter); } /* (non-Javadoc) * @see org.eclipse.ui.IWorkbenchPart#getTitleImage() */ - public Image getTitleImage() { + @Override + public Image getTitleImage() { return introPart.getTitleImage(); } /* (non-Javadoc) * @see org.eclipse.ui.part.WorkbenchPart#getTitle() */ - public String getTitle() { + @Override + public String getTitle() { // this method is called eagerly before our init method is called (and // therefore before our intropart is created). By default return // the view title from the view declaration. We will fire a property @@ -188,7 +195,8 @@ public final class ViewIntroAdapterPart extends ViewPart { /* (non-Javadoc) * @see org.eclipse.ui.IViewPart#init(org.eclipse.ui.IViewSite, org.eclipse.ui.IMemento) */ - public void init(IViewSite site, IMemento memento) throws PartInitException { + @Override + public void init(IViewSite site, IMemento memento) throws PartInitException { super.init(site); Workbench workbench = (Workbench) site.getWorkbenchWindow() .getWorkbench(); @@ -198,7 +206,8 @@ public final class ViewIntroAdapterPart extends ViewPart { // reset the part name of this view to be that of the intro title setPartName(introPart.getTitle()); introPart.addPropertyListener(new IPropertyListener() { - public void propertyChanged(Object source, int propId) { + @Override + public void propertyChanged(Object source, int propId) { firePropertyChange(propId); } }); @@ -218,14 +227,16 @@ public final class ViewIntroAdapterPart extends ViewPart { * * @see org.eclipse.ui.IWorkbenchPart#setFocus() */ - public void setFocus() { + @Override + public void setFocus() { introPart.setFocus(); } /* (non-Javadoc) * @see org.eclipse.ui.IViewPart#saveState(org.eclipse.ui.IMemento) */ - public void saveState(IMemento memento) { + @Override + public void saveState(IMemento memento) { introPart.saveState(memento); } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ViewIntroAdapterSite.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ViewIntroAdapterSite.java index 06eb11b3cc7..428a562254d 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ViewIntroAdapterSite.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ViewIntroAdapterSite.java @@ -39,70 +39,81 @@ final class ViewIntroAdapterSite implements IIntroSite { /* (non-Javadoc) * @see org.eclipse.ui.intro.IIntroSite#getActionBars() */ - public IActionBars getActionBars() { + @Override + public IActionBars getActionBars() { return viewSite.getActionBars(); } /* (non-Javadoc) * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class) */ - public Object getAdapter(Class adapter) { + @Override + public Object getAdapter(Class adapter) { return viewSite.getAdapter(adapter); } /* (non-Javadoc) * @see org.eclipse.ui.IWorkbenchPartSite#getId() */ - public String getId() { + @Override + public String getId() { return descriptor.getId(); } /* (non-Javadoc) * @see org.eclipse.ui.IWorkbenchPartSite#getKeyBindingService() */ - public IKeyBindingService getKeyBindingService() { + @Override + public IKeyBindingService getKeyBindingService() { return viewSite.getKeyBindingService(); } /* (non-Javadoc) * @see org.eclipse.ui.IWorkbenchSite#getPage() */ - public IWorkbenchPage getPage() { + @Override + public IWorkbenchPage getPage() { return viewSite.getPage(); } /* (non-Javadoc) * @see org.eclipse.ui.IWorkbenchPartSite#getPluginId() */ - public String getPluginId() { + @Override + public String getPluginId() { return descriptor.getPluginId(); } /* (non-Javadoc) * @see org.eclipse.ui.IWorkbenchSite#getSelectionProvider() */ - public ISelectionProvider getSelectionProvider() { + @Override + public ISelectionProvider getSelectionProvider() { return viewSite.getSelectionProvider(); } - public final Object getService(final Class key) { + @Override + public final Object getService(final Class key) { return viewSite.getService(key); } /* (non-Javadoc) * @see org.eclipse.ui.IWorkbenchSite#getShell() */ - public Shell getShell() { + @Override + public Shell getShell() { return viewSite.getShell(); } /* (non-Javadoc) * @see org.eclipse.ui.IWorkbenchSite#getWorkbenchWindow() */ - public IWorkbenchWindow getWorkbenchWindow() { + @Override + public IWorkbenchWindow getWorkbenchWindow() { return viewSite.getWorkbenchWindow(); } + @Override public final boolean hasService(final Class key) { return viewSite.hasService(key); } @@ -110,14 +121,16 @@ final class ViewIntroAdapterSite implements IIntroSite { /* (non-Javadoc) * @see org.eclipse.ui.IWorkbenchSite#setSelectionProvider(org.eclipse.jface.viewers.ISelectionProvider) */ - public void setSelectionProvider(ISelectionProvider provider) { + @Override + public void setSelectionProvider(ISelectionProvider provider) { viewSite.setSelectionProvider(provider); } /* (non-Javadoc) * @see java.lang.Object#toString() */ - public String toString() { + @Override + public String toString() { return viewSite.toString(); } } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ViewPluginAction.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ViewPluginAction.java index 8fec7964654..5aaade1bb6b 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ViewPluginAction.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ViewPluginAction.java @@ -41,7 +41,8 @@ public final class ViewPluginAction extends PartPluginAction { /* (non-Javadoc) * Method declared on PluginAction. */ - protected IActionDelegate validateDelegate(Object obj) + @Override + protected IActionDelegate validateDelegate(Object obj) throws WorkbenchException { if (obj instanceof IViewActionDelegate) { return (IViewActionDelegate) obj; @@ -54,7 +55,8 @@ public final class ViewPluginAction extends PartPluginAction { /* (non-Javadoc) * Method declared on PluginAction. */ - protected void initDelegate() { + @Override + protected void initDelegate() { super.initDelegate(); ((IViewActionDelegate) getDelegate()).init(viewPart); } @@ -65,13 +67,15 @@ public final class ViewPluginAction extends PartPluginAction { * before the view is stored. We cannot create the delegate * at that time. */ - public boolean isOkToCreateDelegate() { + @Override + public boolean isOkToCreateDelegate() { return super.isOkToCreateDelegate() && viewPart != null; } /* (non-Javadoc) * @see org.eclipse.ui.internal.PluginAction#dispose() */ + @Override public void dispose() { unregisterSelectionListener(viewPart); super.dispose(); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ViewReference.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ViewReference.java index 8a4b86558e3..053eb7208cd 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ViewReference.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ViewReference.java @@ -64,10 +64,12 @@ public class ViewReference extends WorkbenchPartReference implements IViewRefere } } + @Override public String getPartName() { return descriptor.getLabel(); } + @Override public String getSecondaryId() { MPart part = getModel(); @@ -78,10 +80,12 @@ public class ViewReference extends WorkbenchPartReference implements IViewRefere return part.getElementId().substring(colonIndex + 1); } + @Override public IViewPart getView(boolean restore) { return (IViewPart) getPart(restore); } + @Override public boolean isFastView() { // TODO Auto-generated method stub return false; diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ViewSite.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ViewSite.java index 55779f29987..d3029dc6c0a 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ViewSite.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ViewSite.java @@ -42,6 +42,7 @@ public class ViewSite extends PartSite implements IViewSite { * * @see org.eclipse.ui.IViewSite#getSecondaryId() */ + @Override public String getSecondaryId() { MPart part = getModel(); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ViewerActionBuilder.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ViewerActionBuilder.java index 3139668453f..7d738cd8887 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ViewerActionBuilder.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ViewerActionBuilder.java @@ -45,7 +45,8 @@ public class ViewerActionBuilder extends PluginActionBuilder { /* (non-Javadoc) * Method declared on PluginActionBuilder. */ - protected ActionDescriptor createActionDescriptor( + @Override + protected ActionDescriptor createActionDescriptor( IConfigurationElement element) { if (part instanceof IViewPart) { return new ActionDescriptor(element, ActionDescriptor.T_VIEW, part); @@ -56,7 +57,8 @@ public class ViewerActionBuilder extends PluginActionBuilder { /* (non-Javadoc) * Method declared on PluginActionBuilder. */ - protected BasicContribution createContribution() { + @Override + protected BasicContribution createContribution() { return new ViewerContribution(provider); } @@ -75,7 +77,8 @@ public class ViewerActionBuilder extends PluginActionBuilder { /* (non-Javadoc) * Method declared on PluginActionBuilder. */ - protected boolean readElement(IConfigurationElement element) { + @Override + protected boolean readElement(IConfigurationElement element) { String tag = element.getName(); // Found visibility sub-element @@ -142,7 +145,8 @@ public class ViewerActionBuilder extends PluginActionBuilder { /* (non-Javadoc) * Method declared on BasicContribution. */ - public void contribute(IMenuManager menu, boolean menuAppendIfMissing, + @Override + public void contribute(IMenuManager menu, boolean menuAppendIfMissing, IToolBarManager toolbar, boolean toolAppendIfMissing) { boolean visible = true; @@ -165,6 +169,7 @@ public class ViewerActionBuilder extends PluginActionBuilder { /* (non-Javadoc) * @see org.eclipse.ui.internal.PluginActionBuilder.BasicContribution#dispose() */ + @Override public void dispose() { if (selProvider != null) { selProvider.removeSelectionChangedListener(this); @@ -182,6 +187,7 @@ public class ViewerActionBuilder extends PluginActionBuilder { * @see ISelectionChangedListener * @since 3.1 */ + @Override public void selectionChanged(SelectionChangedEvent event) { if (actions != null) { if (actions != null) { diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WWinActionBars.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WWinActionBars.java index c3d5a8e006a..04257f1d547 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WWinActionBars.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WWinActionBars.java @@ -33,14 +33,16 @@ public class WWinActionBars implements IActionBars2 { /** * Clears the global action handler list. */ - public void clearGlobalActionHandlers() { + @Override + public void clearGlobalActionHandlers() { } /** * Returns the cool bar manager. * */ - public ICoolBarManager getCoolBarManager() { + @Override + public ICoolBarManager getCoolBarManager() { return window.getCoolBarManager2(); } @@ -51,7 +53,8 @@ public class WWinActionBars implements IActionBars2 { * @return an action handler which implements the action ID, or * <code>null</code> if none is registered. */ - public IAction getGlobalActionHandler(String actionID) { + @Override + public IAction getGlobalActionHandler(String actionID) { return null; } @@ -61,10 +64,12 @@ public class WWinActionBars implements IActionBars2 { * * @return the menu manager */ - public IMenuManager getMenuManager() { + @Override + public IMenuManager getMenuManager() { return window.getMenuManager(); } + @Override public final IServiceLocator getServiceLocator() { return window; } @@ -75,7 +80,8 @@ public class WWinActionBars implements IActionBars2 { * * @return the status line manager */ - public IStatusLineManager getStatusLineManager() { + @Override + public IStatusLineManager getStatusLineManager() { return window.getStatusLineManager(); } @@ -83,7 +89,8 @@ public class WWinActionBars implements IActionBars2 { * Returns the tool bar manager. * */ - public IToolBarManager getToolBarManager() { + @Override + public IToolBarManager getToolBarManager() { // This should never be called Assert.isTrue(false); return null; @@ -101,7 +108,8 @@ public class WWinActionBars implements IActionBars2 { * @param handler an action which implements the action ID. * <code>null</code> may be passed to deregister a handler. */ - public void setGlobalActionHandler(String actionID, IAction handler) { + @Override + public void setGlobalActionHandler(String actionID, IAction handler) { } /** @@ -109,7 +117,8 @@ public class WWinActionBars implements IActionBars2 { * after additions or subtractions have been made to a * menu, status line, or toolbar. */ - public void updateActionBars() { + @Override + public void updateActionBars() { window.updateActionBars(); } } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WWinPluginAction.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WWinPluginAction.java index d655c5c2a81..2b15e1a237e 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WWinPluginAction.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WWinPluginAction.java @@ -82,7 +82,8 @@ public class WWinPluginAction extends PluginAction implements } retargetAction .addPropertyChangeListener(new IPropertyChangeListener() { - public void propertyChange(PropertyChangeEvent event) { + @Override + public void propertyChange(PropertyChangeEvent event) { if (event.getProperty().equals(IAction.ENABLED)) { Object val = event.getNewValue(); if (val instanceof Boolean) { @@ -123,7 +124,8 @@ public class WWinPluginAction extends PluginAction implements addToActionList(this); super.setHelpListener(new HelpListener() { - public void helpRequested(HelpEvent e) { + @Override + public void helpRequested(HelpEvent e) { HelpListener listener = null; if (retargetAction != null) { listener = retargetAction.getHelpListener(); @@ -171,7 +173,8 @@ public class WWinPluginAction extends PluginAction implements /* (non-Javadoc) * Method declared on PluginAction. */ - protected IActionDelegate validateDelegate(Object obj) + @Override + protected IActionDelegate validateDelegate(Object obj) throws WorkbenchException { if (obj instanceof IWorkbenchWindowActionDelegate) { return (IWorkbenchWindowActionDelegate) obj; @@ -184,7 +187,8 @@ public class WWinPluginAction extends PluginAction implements /* (non-Javadoc) * Method declared on PluginAction. */ - protected void initDelegate() { + @Override + protected void initDelegate() { super.initDelegate(); ((IWorkbenchWindowActionDelegate) getDelegate()).init(window); } @@ -192,7 +196,8 @@ public class WWinPluginAction extends PluginAction implements /** * Disposes of the action and any resources held. */ - public void dispose() { + @Override + public void dispose() { removeFromActionList(this); if (retargetAction != null) { window.getPartService().removePartListener(retargetAction); @@ -206,7 +211,8 @@ public class WWinPluginAction extends PluginAction implements /** * Returns the action set id. */ - public String getActionSetId() { + @Override + public String getActionSetId() { return actionSetId; } @@ -216,7 +222,8 @@ public class WWinPluginAction extends PluginAction implements * before the window is stored. We cannot create the delegate * at that time. */ - public boolean isOkToCreateDelegate() { + @Override + public boolean isOkToCreateDelegate() { return super.isOkToCreateDelegate() && window != null && retargetAction == null; } @@ -224,7 +231,8 @@ public class WWinPluginAction extends PluginAction implements /* (non-Javadoc) * Method declared on IActionDelegate2. */ - public void runWithEvent(Event event) { + @Override + public void runWithEvent(Event event) { if (retargetAction == null) { super.runWithEvent(event); return; @@ -240,7 +248,8 @@ public class WWinPluginAction extends PluginAction implements /** * Sets the action set id. */ - public void setActionSetId(String newActionSetId) { + @Override + public void setActionSetId(String newActionSetId) { actionSetId = newActionSetId; } @@ -250,14 +259,16 @@ public class WWinPluginAction extends PluginAction implements * a local field. The supplied listener is only used if there is * no retarget action. */ - public void setHelpListener(HelpListener listener) { + @Override + public void setHelpListener(HelpListener listener) { localHelpListener = listener; } /* (non-Javadoc) * Method declared on IAction. */ - public void setChecked(boolean checked) { + @Override + public void setChecked(boolean checked) { super.setChecked(checked); // This call may come from the SWT control event handler // itself, so notify the retarget action to keep things diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WWinPluginPulldown.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WWinPluginPulldown.java index b724ba1578d..44bd05ea2e8 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WWinPluginPulldown.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WWinPluginPulldown.java @@ -113,6 +113,7 @@ public class WWinPluginPulldown extends WWinPluginAction { /** * @see ISafeRunnable#handleException(java.lang.Throwable) */ + @Override public void handleException(Throwable exception) { // Do nothing } @@ -120,6 +121,7 @@ public class WWinPluginPulldown extends WWinPluginAction { /** * @see ISafeRunnable#run() */ + @Override public void run() throws Exception { if (parent == null) { menu = delegate.getMenu(control); @@ -133,6 +135,7 @@ public class WWinPluginPulldown extends WWinPluginAction { /** * @see IMenuCreator#getMenu(Control) */ + @Override public Menu getMenu(Control parent) { IWorkbenchWindowPulldownDelegate delegate = getPulldownDelegate(); if (delegate != null) { @@ -147,6 +150,7 @@ public class WWinPluginPulldown extends WWinPluginAction { /** * @see IMenuCreator#getMenu(Menu) */ + @Override public Menu getMenu(Menu parent) { IWorkbenchWindowPulldownDelegate delegate = getPulldownDelegate(); @@ -163,6 +167,7 @@ public class WWinPluginPulldown extends WWinPluginAction { /** * @see IMenuCreator#dispose() */ + @Override public void dispose() { // do nothing } @@ -193,6 +198,7 @@ public class WWinPluginPulldown extends WWinPluginAction { /* * (non-Javadoc) Method declared on PluginAction. */ + @Override protected IActionDelegate validateDelegate(Object obj) throws WorkbenchException { if (obj instanceof IWorkbenchWindowPulldownDelegate) { diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WindowPartSelectionTracker.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WindowPartSelectionTracker.java index f16189fb4f4..e886c9f08e8 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WindowPartSelectionTracker.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WindowPartSelectionTracker.java @@ -34,7 +34,8 @@ public class WindowPartSelectionTracker extends AbstractPartSelectionTracker * Part selection listener. */ private final INullSelectionListener selListener = new INullSelectionListener() { - public void selectionChanged(IWorkbenchPart part, ISelection selection) { + @Override + public void selectionChanged(IWorkbenchPart part, ISelection selection) { fireSelection(part, selection); } }; @@ -43,7 +44,8 @@ public class WindowPartSelectionTracker extends AbstractPartSelectionTracker * Part post selection listener */ private final INullSelectionListener postSelListener = new INullSelectionListener() { - public void selectionChanged(IWorkbenchPart part, ISelection selection) { + @Override + public void selectionChanged(IWorkbenchPart part, ISelection selection) { firePostSelection(part, selection); } }; @@ -67,13 +69,15 @@ public class WindowPartSelectionTracker extends AbstractPartSelectionTracker /* * @see IPageListener#pageActivated(IWorkbenchPage) */ - public void pageActivated(IWorkbenchPage page) { + @Override + public void pageActivated(IWorkbenchPage page) { } /* * @see IPageListener#pageClosed(IWorkbenchPage) */ - public void pageClosed(IWorkbenchPage page) { + @Override + public void pageClosed(IWorkbenchPage page) { page.removeSelectionListener(getPartId(), selListener); page.removePostSelectionListener(getPartId(), postSelListener); } @@ -81,7 +85,8 @@ public class WindowPartSelectionTracker extends AbstractPartSelectionTracker /* * @see IPageListener#pageOpened(IWorkbenchPage) */ - public void pageOpened(IWorkbenchPage page) { + @Override + public void pageOpened(IWorkbenchPage page) { page.addSelectionListener(getPartId(), selListener); page.addPostSelectionListener(getPartId(), postSelListener); } @@ -107,7 +112,8 @@ public class WindowPartSelectionTracker extends AbstractPartSelectionTracker /** * @see AbstractPartSelectionTracker#dispose() */ - public void dispose() { + @Override + public void dispose() { super.dispose(); fWindow = null; } @@ -115,7 +121,8 @@ public class WindowPartSelectionTracker extends AbstractPartSelectionTracker /* * @see AbstractPartSelectionTracker#getSelection() */ - public ISelection getSelection() { + @Override + public ISelection getSelection() { IWorkbenchPage page = getWindow().getActivePage(); if (page != null) { return page.getSelection(getPartId()); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WindowSelectionService.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WindowSelectionService.java index 5995bd1e3f0..accf8a4efbf 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WindowSelectionService.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WindowSelectionService.java @@ -47,7 +47,8 @@ class WindowSelectionService extends AbstractSelectionService { /* * @see AbstractSelectionService#createPartTracker(String) */ - protected AbstractPartSelectionTracker createPartTracker(String partId) { + @Override + protected AbstractPartSelectionTracker createPartTracker(String partId) { return new WindowPartSelectionTracker(getWindow(), partId); } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WindowTrimProxy.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WindowTrimProxy.java index 58638acf166..f8b3a72bc5b 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WindowTrimProxy.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WindowTrimProxy.java @@ -79,6 +79,7 @@ public class WindowTrimProxy implements IWindowTrim { * * @see org.eclipse.ui.internal.IWindowTrim#getControl() */ + @Override public Control getControl() { return fTrimControl; } @@ -88,6 +89,7 @@ public class WindowTrimProxy implements IWindowTrim { * * @see org.eclipse.ui.internal.IWindowTrim#getValidSides() */ + @Override public int getValidSides() { return fValidSides; } @@ -98,6 +100,7 @@ public class WindowTrimProxy implements IWindowTrim { * * @see org.eclipse.ui.internal.layout.IWindowTrim#dock(int) */ + @Override public void dock(int dropSide) { } @@ -106,6 +109,7 @@ public class WindowTrimProxy implements IWindowTrim { * * @see org.eclipse.ui.internal.IWindowTrim#getId() */ + @Override public String getId() { return fId; } @@ -115,6 +119,7 @@ public class WindowTrimProxy implements IWindowTrim { * * @see org.eclipse.ui.internal.IWindowTrim#getDisplayName() */ + @Override public String getDisplayName() { return fDisplayName; } @@ -124,6 +129,7 @@ public class WindowTrimProxy implements IWindowTrim { * * @see org.eclipse.ui.internal.IWindowTrim#isCloseable() */ + @Override public boolean isCloseable() { return false; } @@ -133,6 +139,7 @@ public class WindowTrimProxy implements IWindowTrim { * * @see org.eclipse.ui.internal.IWindowTrim#handleClose() */ + @Override public void handleClose() { // nothing to do... } @@ -142,6 +149,7 @@ public class WindowTrimProxy implements IWindowTrim { * * @see org.eclipse.ui.IWindowTrim#getWidthHint() */ + @Override public int getWidthHint() { return fWidthHint; } @@ -159,6 +167,7 @@ public class WindowTrimProxy implements IWindowTrim { * * @see org.eclipse.ui.IWindowTrim#getHeightHint() */ + @Override public int getHeightHint() { return fHeightHint; } @@ -176,6 +185,7 @@ public class WindowTrimProxy implements IWindowTrim { * * @see org.eclipse.ui.IWindowTrim#isResizeable() */ + @Override public boolean isResizeable() { return fIsResizeable; } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/Workbench.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/Workbench.java index 56128228431..0d1ffb18564 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/Workbench.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/Workbench.java @@ -297,6 +297,7 @@ public final class Workbench extends EventManager implements IWorkbench, this.starting = new ArrayList(); } + @Override public void bundleChanged(BundleEvent event) { int eventType = event.getType(); String bundleName; @@ -491,10 +492,12 @@ public final class Workbench extends EventManager implements IWorkbench, appContext.set(getClass().getName(), this); appContext.set(IWorkbench.class.getName(), this); appContext.set(IEventLoopAdvisor.class, new IEventLoopAdvisor() { + @Override public void eventLoopIdle(Display display) { advisor.eventLoopIdle(display); } + @Override public void eventLoopException(Throwable exception) { advisor.eventLoopException(exception); } @@ -518,6 +521,7 @@ public final class Workbench extends EventManager implements IWorkbench, Platform.getExtensionRegistry().addRegistryChangeListener(extensionEventHandler); IServiceLocatorCreator slc = new ServiceLocatorCreator(); serviceLocator = (ServiceLocator) slc.createServiceLocator(null, null, new IDisposable() { + @Override public void dispose() { final Display display = getDisplay(); if (display != null && !display.isDisposed()) { @@ -572,6 +576,7 @@ public final class Workbench extends EventManager implements IWorkbench, final WorkbenchAdvisor advisor) { final int[] returnCode = new int[1]; Realm.runWithDefault(SWTObservables.getRealm(display), new Runnable() { + @Override public void run() { final String nlExtensions = Platform.getNLExtensions(); if (nlExtensions.length() > 0) { @@ -751,6 +756,7 @@ public final class Workbench extends EventManager implements IWorkbench, SafeRunnable run = new SafeRunnable() { + @Override public void run() throws Exception { if (!WorkbenchPlugin.isSplashHandleSpecified()) { createSplash = false; @@ -780,6 +786,7 @@ public final class Workbench extends EventManager implements IWorkbench, final ServiceRegistration registration[] = new ServiceRegistration[1]; StartupMonitor startupMonitor = new StartupMonitor() { + @Override public void applicationRunning() { if (background != null) background.dispose(); @@ -797,6 +804,7 @@ public final class Workbench extends EventManager implements IWorkbench, } } + @Override public void update() { // do nothing - we come into the picture far too late // for this to be relevant @@ -815,6 +823,7 @@ public final class Workbench extends EventManager implements IWorkbench, * org.eclipse.jface.util.SafeRunnable#handleException(java.lang * .Throwable) */ + @Override public void handleException(Throwable e) { StatusManager.getManager().handle( StatusUtil.newStatus(WorkbenchPlugin.PI_WORKBENCH, @@ -904,6 +913,7 @@ public final class Workbench extends EventManager implements IWorkbench, * * @since 3.2 */ + @Override public void addWorkbenchListener(IWorkbenchListener listener) { workbenchListeners.add(listener); } @@ -913,6 +923,7 @@ public final class Workbench extends EventManager implements IWorkbench, * * @since 3.2 */ + @Override public void removeWorkbenchListener(IWorkbenchListener listener) { workbenchListeners.remove(listener); } @@ -932,6 +943,7 @@ public final class Workbench extends EventManager implements IWorkbench, final IWorkbenchListener l = (IWorkbenchListener) list[i]; final boolean[] result = new boolean[] { false }; SafeRunnable.run(new SafeRunnable() { + @Override public void run() { result[0] = l.preShutdown(Workbench.this, forced); } @@ -953,6 +965,7 @@ public final class Workbench extends EventManager implements IWorkbench, for (int i = 0; i < list.length; i++) { final IWorkbenchListener l = (IWorkbenchListener) list[i]; SafeRunnable.run(new SafeRunnable() { + @Override public void run() { l.postShutdown(Workbench.this); } @@ -963,6 +976,7 @@ public final class Workbench extends EventManager implements IWorkbench, /* * (non-Javadoc) Method declared on IWorkbench. */ + @Override public void addWindowListener(IWindowListener l) { addListenerObject(l); } @@ -970,6 +984,7 @@ public final class Workbench extends EventManager implements IWorkbench, /* * (non-Javadoc) Method declared on IWorkbench. */ + @Override public void removeWindowListener(IWindowListener l) { removeListenerObject(l); } @@ -985,6 +1000,7 @@ public final class Workbench extends EventManager implements IWorkbench, for (int i = 0; i < list.length; i++) { final IWindowListener l = (IWindowListener) list[i]; SafeRunner.run(new SafeRunnable() { + @Override public void run() { l.windowOpened(window); } @@ -1003,6 +1019,7 @@ public final class Workbench extends EventManager implements IWorkbench, for (int i = 0; i < list.length; i++) { final IWindowListener l = (IWindowListener) list[i]; SafeRunner.run(new SafeRunnable() { + @Override public void run() { l.windowClosed(window); } @@ -1022,6 +1039,7 @@ public final class Workbench extends EventManager implements IWorkbench, for (int i = 0; i < list.length; i++) { final IWindowListener l = (IWindowListener) list[i]; SafeRunner.run(new SafeRunnable() { + @Override public void run() { l.windowActivated(window); } @@ -1041,6 +1059,7 @@ public final class Workbench extends EventManager implements IWorkbench, for (int i = 0; i < list.length; i++) { final IWindowListener l = (IWindowListener) list[i]; SafeRunner.run(new SafeRunnable() { + @Override public void run() { l.windowDeactivated(window); } @@ -1090,6 +1109,7 @@ public final class Workbench extends EventManager implements IWorkbench, IWorkbenchPreferenceConstants.CLOSE_EDITORS_ON_EXIT); if (closeEditors) { SafeRunner.run(new SafeRunnable() { + @Override public void run() { IWorkbenchWindow windows[] = getWorkbenchWindows(); for (int i = 0; i < windows.length; i++) { @@ -1114,6 +1134,7 @@ public final class Workbench extends EventManager implements IWorkbench, } SafeRunner.run(new SafeRunnable(WorkbenchMessages.ErrorClosing) { + @Override public void run() { if (isClosing || force) { // isClosing = windowManager.close(); @@ -1165,6 +1186,7 @@ public final class Workbench extends EventManager implements IWorkbench, private void persist(final boolean shutdown) { // persist editors that can be and possibly close the others SafeRunner.run(new SafeRunnable() { + @Override public void run() { IWorkbenchWindow windows[] = getWorkbenchWindows(); for (int i = 0; i < windows.length; i++) { @@ -1192,10 +1214,12 @@ public final class Workbench extends EventManager implements IWorkbench, // persist workbench state if (getWorkbenchConfigurer().getSaveAndRestore()) { SafeRunner.run(new SafeRunnable() { + @Override public void run() { persistWorkbenchState(); } + @Override public void handleException(Throwable e) { String message; if (e.getMessage() == null) { @@ -1213,6 +1237,7 @@ public final class Workbench extends EventManager implements IWorkbench, // persist view states SafeRunner.run(new SafeRunnable() { + @Override public void run() { IWorkbenchWindow windows[] = getWorkbenchWindows(); for (int i = 0; i < windows.length; i++) { @@ -1313,6 +1338,7 @@ public final class Workbench extends EventManager implements IWorkbench, * * @see org.eclipse.ui.IWorkbench#saveAllEditors(boolean) */ + @Override public boolean saveAllEditors(boolean confirm) { return saveAllEditors(confirm, false); } @@ -1332,6 +1358,7 @@ public final class Workbench extends EventManager implements IWorkbench, /* * (non-Javadoc) Method declared on IWorkbench. */ + @Override public boolean close() { return close(PlatformUI.RETURN_OK, false); } @@ -1361,6 +1388,7 @@ public final class Workbench extends EventManager implements IWorkbench, this.returnCode = returnCode; final boolean[] ret = new boolean[1]; BusyIndicator.showWhile(null, new Runnable() { + @Override public void run() { ret[0] = busyClose(force); } @@ -1371,6 +1399,7 @@ public final class Workbench extends EventManager implements IWorkbench, /* * (non-Javadoc) Method declared on IWorkbench. */ + @Override public IWorkbenchWindow getActiveWorkbenchWindow() { // Return null if called from a non-UI thread. // This is not spec'ed behaviour and is misleading, however this is how @@ -1461,6 +1490,7 @@ public final class Workbench extends EventManager implements IWorkbench, /* * (non-Javadoc) Method declared on IWorkbench. */ + @Override public IEditorRegistry getEditorRegistry() { return WorkbenchPlugin.getDefault().getEditorRegistry(); } @@ -1468,6 +1498,7 @@ public final class Workbench extends EventManager implements IWorkbench, /* * (non-Javadoc) Method declared on IWorkbench. */ + @Override public IWorkbenchOperationSupport getOperationSupport() { return WorkbenchPlugin.getDefault().getOperationSupport(); } @@ -1475,6 +1506,7 @@ public final class Workbench extends EventManager implements IWorkbench, /* * (non-Javadoc) Method declared on IWorkbench. */ + @Override public IPerspectiveRegistry getPerspectiveRegistry() { return WorkbenchPlugin.getDefault().getPerspectiveRegistry(); } @@ -1482,6 +1514,7 @@ public final class Workbench extends EventManager implements IWorkbench, /* * (non-Javadoc) Method declared on IWorkbench. */ + @Override public PreferenceManager getPreferenceManager() { return WorkbenchPlugin.getDefault().getPreferenceManager(); } @@ -1489,6 +1522,7 @@ public final class Workbench extends EventManager implements IWorkbench, /* * (non-Javadoc) Method declared on IWorkbench. */ + @Override public IPreferenceStore getPreferenceStore() { return WorkbenchPlugin.getDefault().getPreferenceStore(); } @@ -1496,6 +1530,7 @@ public final class Workbench extends EventManager implements IWorkbench, /* * (non-Javadoc) Method declared on IWorkbench. */ + @Override public ISharedImages getSharedImages() { return WorkbenchPlugin.getDefault().getSharedImages(); } @@ -1505,6 +1540,7 @@ public final class Workbench extends EventManager implements IWorkbench, /* * (non-Javadoc) Method declared on IWorkbench. */ + @Override public int getWorkbenchWindowCount() { return getWorkbenchWindows().length; } @@ -1512,6 +1548,7 @@ public final class Workbench extends EventManager implements IWorkbench, /* * (non-Javadoc) Method declared on IWorkbench. */ + @Override public IWorkbenchWindow[] getWorkbenchWindows() { List<IWorkbenchWindow> windows = new ArrayList<IWorkbenchWindow>(); for (MWindow window : application.getChildren()) { @@ -1530,6 +1567,7 @@ public final class Workbench extends EventManager implements IWorkbench, /* * (non-Javadoc) Method declared on IWorkbench. */ + @Override public IWorkingSetManager getWorkingSetManager() { return WorkbenchPlugin.getDefault().getWorkingSetManager(); } @@ -1537,6 +1575,7 @@ public final class Workbench extends EventManager implements IWorkbench, /** * {@inheritDoc} */ + @Override public ILocalWorkingSetManager createLocalWorkingSetManager() { return new LocalWorkingSetManager(WorkbenchPlugin.getDefault().getBundleContext()); } @@ -1568,6 +1607,7 @@ public final class Workbench extends EventManager implements IWorkbench, StartupThreading.runWithoutExceptions(new StartupRunnable() { + @Override public void runWithException() { serviceLocator.registerService(IEvaluationService.class, evaluationService); } @@ -1580,6 +1620,7 @@ public final class Workbench extends EventManager implements IWorkbench, activityHelper = ActivityPersistanceHelper.getInstance(); StartupThreading.runWithoutExceptions(new StartupRunnable() { + @Override public void runWithException() { WorkbenchImages.getImageRegistry(); } @@ -1602,6 +1643,7 @@ public final class Workbench extends EventManager implements IWorkbench, // have a turn. StartupThreading.runWithoutExceptions(new StartupRunnable() { + @Override public void runWithException() { advisor.internalBasicInitialize(getWorkbenchConfigurer()); } @@ -1622,6 +1664,7 @@ public final class Workbench extends EventManager implements IWorkbench, StartupThreading.runWithoutExceptions(new StartupRunnable() { + @Override public void runWithException() { ((GrabFocus) Tweaklets.get(GrabFocus.KEY)).init(getDisplay()); } @@ -1634,6 +1677,7 @@ public final class Workbench extends EventManager implements IWorkbench, final boolean bail[] = new boolean[1]; StartupThreading.runWithoutExceptions(new StartupRunnable() { + @Override public void runWithException() throws Throwable { advisor.preStartup(); // TODO compat: open the windows here/instantiate the model @@ -1665,6 +1709,7 @@ public final class Workbench extends EventManager implements IWorkbench, */ private void initializeWorkbenchImages() { StartupThreading.runWithoutExceptions(new StartupRunnable() { + @Override public void runWithException() { WorkbenchImages.getDescriptors(); } @@ -1678,11 +1723,13 @@ public final class Workbench extends EventManager implements IWorkbench, private void initializeCommandResolver() { ExternalActionManager.getInstance().setCallback( new CommandCallback(bindingManager, commandManager, new IActiveChecker() { + @Override public final boolean isActive(final String commandId) { return workbenchActivitySupport.getActivityManager().getIdentifier( commandId).isEnabled(); } }, new IExecuteApplicable() { + @Override public boolean isApplicable(IAction action) { return !(action instanceof CommandAction); } @@ -1698,6 +1745,7 @@ public final class Workbench extends EventManager implements IWorkbench, private void initializeApplicationColors() { StartupThreading.runWithoutExceptions(new StartupRunnable() { + @Override public void runWithException() { ColorDefinition[] colorDefinitions = WorkbenchPlugin.getDefault() .getThemeRegistry().getColors(); @@ -1751,6 +1799,7 @@ public final class Workbench extends EventManager implements IWorkbench, private void initializeFonts() { StartupThreading.runWithoutExceptions(new StartupRunnable() { + @Override public void runWithException() { FontDefinition[] fontDefinitions = WorkbenchPlugin.getDefault().getThemeRegistry() .getFonts(); @@ -1805,6 +1854,7 @@ public final class Workbench extends EventManager implements IWorkbench, */ private void initializeColors() { StartupThreading.runWithoutExceptions(new StartupRunnable() { + @Override public void runWithException() { WorkbenchColors.startup(); } @@ -1814,6 +1864,7 @@ public final class Workbench extends EventManager implements IWorkbench, /* * (non-Javadoc) Method declared on IWorkbench. */ + @Override public boolean isClosing() { return isClosing; } @@ -1823,6 +1874,7 @@ public final class Workbench extends EventManager implements IWorkbench, // the new value IPreferenceStore preferenceStore = PrefUtil.getAPIPreferenceStore(); preferenceStore.addPropertyChangeListener(new IPropertyChangeListener() { + @Override public void propertyChange(PropertyChangeEvent event) { if (IWorkbenchPreferenceConstants.ENABLE_ANIMATIONS.equals(event.getProperty())) { Object o = event.getNewValue(); @@ -1840,6 +1892,7 @@ public final class Workbench extends EventManager implements IWorkbench, }); eventBroker.subscribe(UIEvents.ElementContainer.TOPIC_CHILDREN, new EventHandler() { + @Override public void handleEvent(org.osgi.service.event.Event event) { if (application == event.getProperty(UIEvents.EventTags.ELEMENT)) { if (UIEvents.isREMOVE(event)) { @@ -1860,6 +1913,7 @@ public final class Workbench extends EventManager implements IWorkbench, } }); eventBroker.subscribe(UIEvents.ElementContainer.TOPIC_SELECTEDELEMENT, new EventHandler() { + @Override public void handleEvent(org.osgi.service.event.Event event) { if (application == event.getProperty(UIEvents.EventTags.ELEMENT)) { if (UIEvents.EventTypes.SET.equals(event @@ -1884,6 +1938,7 @@ public final class Workbench extends EventManager implements IWorkbench, // reference eventBroker.subscribe( UIEvents.UIElement.TOPIC_TOBERENDERED, new EventHandler() { + @Override public void handleEvent(org.osgi.service.event.Event event) { if (Boolean.TRUE.equals(event.getProperty(UIEvents.EventTags.NEW_VALUE))) { Object element = event.getProperty(UIEvents.EventTags.ELEMENT); @@ -1900,6 +1955,7 @@ UIEvents.UIElement.TOPIC_TOBERENDERED, new EventHandler() { eventBroker.subscribe( UIEvents.Context.TOPIC_CONTEXT, new EventHandler() { + @Override public void handleEvent(org.osgi.service.event.Event event) { Object element = event.getProperty(UIEvents.EventTags.ELEMENT); if (element instanceof MPart) { @@ -2070,6 +2126,7 @@ UIEvents.Context.TOPIC_CONTEXT, private final void initializeLazyServices() { e4Context.set(IExtensionTracker.class.getName(), new ContextFunction() { + @Override public Object compute(IEclipseContext context, String contextKey) { if (tracker == null) { tracker = new UIExtensionTracker(getDisplay()); @@ -2079,6 +2136,7 @@ UIEvents.Context.TOPIC_CONTEXT, }); e4Context.set(IWorkbenchActivitySupport.class.getName(), new ContextFunction() { + @Override public Object compute(IEclipseContext context, String contextKey) { if (workbenchActivitySupport == null) { workbenchActivitySupport = new WorkbenchActivitySupport(); @@ -2191,6 +2249,7 @@ UIEvents.Context.TOPIC_CONTEXT, StartupThreading.runWithoutExceptions(new StartupRunnable() { + @Override public void runWithException() { serviceLocator.registerService(ISaveablesLifecycleListener.class, new SaveablesList()); @@ -2204,6 +2263,7 @@ UIEvents.Context.TOPIC_CONTEXT, */ StartupThreading.runWithoutExceptions(new StartupRunnable() { + @Override public void runWithException() { Command.DEBUG_COMMAND_EXECUTION = Policy.DEBUG_COMMANDS; commandManager = e4Context.get(CommandManager.class); @@ -2213,6 +2273,7 @@ UIEvents.Context.TOPIC_CONTEXT, final CommandService[] commandService = new CommandService[1]; StartupThreading.runWithoutExceptions(new StartupRunnable() { + @Override public void runWithException() { commandService[0] = initializeCommandService(e4Context); @@ -2221,6 +2282,7 @@ UIEvents.Context.TOPIC_CONTEXT, StartupThreading.runWithoutExceptions(new StartupRunnable() { + @Override public void runWithException() { ContextManager.DEBUG = Policy.DEBUG_CONTEXTS; contextManager = e4Context.get(ContextManager.class); @@ -2234,8 +2296,10 @@ UIEvents.Context.TOPIC_CONTEXT, StartupThreading.runWithoutExceptions(new StartupRunnable() { + @Override public void runWithException() { contextManager.addContextManagerListener(new IContextManagerListener() { + @Override public void contextManagerChanged(ContextManagerEvent contextManagerEvent) { if (contextManagerEvent.isContextChanged()) { String id = contextManagerEvent.getContextId(); @@ -2256,6 +2320,7 @@ UIEvents.Context.TOPIC_CONTEXT, StartupThreading.runWithoutExceptions(new StartupRunnable() { + @Override public void runWithException() { BindingManager.DEBUG = Policy.DEBUG_KEY_BINDINGS; bindingManager = e4Context.get(BindingManager.class); @@ -2281,6 +2346,7 @@ UIEvents.Context.TOPIC_CONTEXT, // the menu service StartupThreading.runWithoutExceptions(new StartupRunnable() { + @Override public void runWithException() { menuService.readRegistry(); } @@ -2297,6 +2363,7 @@ UIEvents.Context.TOPIC_CONTEXT, serviceLocator.registerService(ISourceProviderService.class, sourceProviderService); StartupThreading.runWithoutExceptions(new StartupRunnable() { + @Override public void runWithException() { // this currently instantiates all players ... sigh sourceProviderService.readRegistry(); @@ -2312,6 +2379,7 @@ UIEvents.Context.TOPIC_CONTEXT, StartupThreading.runWithoutExceptions(new StartupRunnable() { + @Override public void runWithException() { // these guys are need to provide the variables they say // they source @@ -2333,6 +2401,7 @@ UIEvents.Context.TOPIC_CONTEXT, final IHandlerService[] handlerService = new IHandlerService[1]; StartupThreading.runWithoutExceptions(new StartupRunnable() { + @Override public void runWithException() { handlerService[0] = new LegacyHandlerService(e4Context); e4Context.set(IHandlerService.class.getName(), handlerService[0]); @@ -2352,6 +2421,7 @@ UIEvents.Context.TOPIC_CONTEXT, backForwardListener = createBackForwardListener(); StartupThreading.runWithoutExceptions(new StartupRunnable() { + @Override public void runWithException() { getDisplay().addFilter(SWT.MouseDown, backForwardListener); } @@ -2360,6 +2430,7 @@ UIEvents.Context.TOPIC_CONTEXT, private Listener createBackForwardListener() { return new Listener() { + @Override public void handleEvent(Event event) { String commandId; switch (event.button) { @@ -2399,6 +2470,7 @@ UIEvents.Context.TOPIC_CONTEXT, * @return <code>true</code> if the Workbench is starting, but not yet * running the event loop. */ + @Override public boolean isStarting() { return isStarting && isRunning(); } @@ -2437,6 +2509,7 @@ UIEvents.Context.TOPIC_CONTEXT, final String threadPerspId = perspId; final IWorkbenchWindow threadWin = win; StartupThreading.runWithoutExceptions(new StartupRunnable() { + @Override public void runWithException() throws Throwable { try { showPerspective(threadPerspId, threadWin); @@ -2467,6 +2540,7 @@ UIEvents.Context.TOPIC_CONTEXT, .getBundleCount() / 10); runStartupWithProgress(expectedProgressCount, new Runnable() { + @Override public void run() { doOpenFirstTimeWindow(); } @@ -2479,6 +2553,7 @@ UIEvents.Context.TOPIC_CONTEXT, final IAdaptable input[] = new IAdaptable[1]; StartupThreading.runWithoutExceptions(new StartupRunnable() { + @Override public void runWithException() throws Throwable { input[0] = getDefaultPageInput(); } @@ -2490,6 +2565,7 @@ UIEvents.Context.TOPIC_CONTEXT, // as the window is not open yet (bug 76724). StartupThreading.runWithoutExceptions(new StartupRunnable() { + @Override public void runWithException() throws Throwable { ErrorDialog.openError(null, WorkbenchMessages.Problems_Opening_Page, e .getMessage(), e.getStatus()); @@ -2532,6 +2608,7 @@ UIEvents.Context.TOPIC_CONTEXT, /* * (non-Javadoc) Method declared on IWorkbench. */ + @Override public IWorkbenchWindow openWorkbenchWindow(IAdaptable input) throws WorkbenchException { return openWorkbenchWindow(getDefaultPerspectiveId(), input); } @@ -2539,6 +2616,7 @@ UIEvents.Context.TOPIC_CONTEXT, /* * (non-Javadoc) Method declared on IWorkbench. */ + @Override public IWorkbenchWindow openWorkbenchWindow(String perspectiveId, IAdaptable input) throws WorkbenchException { IPerspectiveDescriptor descriptor = getPerspectiveRegistry().findPerspectiveWithId( @@ -2559,6 +2637,7 @@ UIEvents.Context.TOPIC_CONTEXT, /* * (non-Javadoc) Method declared on IWorkbench. */ + @Override public boolean restart() { return close(PlatformUI.RETURN_RESTART, false); } @@ -2623,6 +2702,7 @@ UIEvents.Context.TOPIC_CONTEXT, return; } Job job = new Job("Workbench early startup") { //$NON-NLS-1$ + @Override protected IStatus run(IProgressMonitor monitor) { HashSet disabledPlugins = new HashSet(Arrays .asList(getDisabledEarlyActivatedPlugins())); @@ -2645,6 +2725,7 @@ UIEvents.Context.TOPIC_CONTEXT, return Status.OK_STATUS; } + @Override public boolean belongsTo(Object family) { return EARLY_STARTUP_FAMILY.equals(family); } @@ -2714,6 +2795,7 @@ UIEvents.Context.TOPIC_CONTEXT, // run while starting the Workbench, log a warning. if (WorkbenchPlugin.getDefault().isDebugging()) { display.asyncExec(new Runnable() { + @Override public void run() { if (isStarting()) { WorkbenchPlugin.log(StatusUtil.newStatus(IStatus.WARNING, @@ -2725,6 +2807,7 @@ UIEvents.Context.TOPIC_CONTEXT, } Listener closeListener = new Listener() { + @Override public void handleEvent(Event event) { event.doit = close(); } @@ -2752,6 +2835,7 @@ UIEvents.Context.TOPIC_CONTEXT, * * @see java.lang.Thread#run() */ + @Override public void run() { try { // declare us to be a startup thread so that our @@ -2809,6 +2893,7 @@ UIEvents.Context.TOPIC_CONTEXT, this, properties); Runnable earlyStartup = new Runnable() { + @Override public void run() { // start eager plug-ins startPlugins(); @@ -2857,6 +2942,7 @@ UIEvents.Context.TOPIC_CONTEXT, // WWinPluginAction.refreshActionList(); display.asyncExec(new Runnable() { + @Override public void run() { UIStats.end(UIStats.START_WORKBENCH, this, "Workbench"); //$NON-NLS-1$ UIStats.startupComplete(); @@ -2904,6 +2990,7 @@ UIEvents.Context.TOPIC_CONTEXT, /* * (non-Javadoc) Method declared on IWorkbench. */ + @Override public IWorkbenchPage showPerspective(String perspectiveId, IWorkbenchWindow window) throws WorkbenchException { return showPerspective(perspectiveId, window, advisor.getDefaultPageInput()); @@ -2929,6 +3016,7 @@ UIEvents.Context.TOPIC_CONTEXT, /* * (non-Javadoc) Method declared on IWorkbench. */ + @Override public IWorkbenchPage showPerspective(String perspectiveId, IWorkbenchWindow targetWindow, IAdaptable input) throws WorkbenchException { Assert.isNotNull(perspectiveId); @@ -3045,6 +3133,7 @@ UIEvents.Context.TOPIC_CONTEXT, /* * (non-Javadoc) Method declared on IWorkbench. */ + @Override public IDecoratorManager getDecoratorManager() { return WorkbenchPlugin.getDefault().getDecoratorManager(); } @@ -3084,6 +3173,7 @@ UIEvents.Context.TOPIC_CONTEXT, /* * (non-Javadoc) Method declared on IWorkbench. */ + @Override public Display getDisplay() { return display; } @@ -3124,6 +3214,7 @@ UIEvents.Context.TOPIC_CONTEXT, * * @since 3.0 */ + @Override public IElementFactory getElementFactory(String factoryId) { Assert.isNotNull(factoryId); return WorkbenchPlugin.getDefault().getElementFactory(factoryId); @@ -3134,6 +3225,7 @@ UIEvents.Context.TOPIC_CONTEXT, * * @see org.eclipse.ui.IWorkbench#getProgressService() */ + @Override public IProgressService getProgressService() { return (IProgressService) e4Context.get(IProgressService.class.getName()); } @@ -3174,14 +3266,17 @@ UIEvents.Context.TOPIC_CONTEXT, */ private ContextManager contextManager; + @Override public IWorkbenchActivitySupport getActivitySupport() { return (IWorkbenchActivitySupport) e4Context.get(IWorkbenchActivitySupport.class.getName()); } + @Override public IWorkbenchCommandSupport getCommandSupport() { return workbenchCommandSupport; } + @Override public IWorkbenchContextSupport getContextSupport() { return workbenchContextSupport; } @@ -3197,6 +3292,7 @@ UIEvents.Context.TOPIC_CONTEXT, private final IBindingManagerListener bindingManagerListener = new IBindingManagerListener() { + @Override public void bindingManagerChanged(BindingManagerEvent bindingManagerEvent) { if (bindingManagerEvent.isActiveBindingsChanged()) { updateActiveWorkbenchWindowMenuManager(true); @@ -3232,6 +3328,7 @@ UIEvents.Context.TOPIC_CONTEXT, * * @see org.eclipse.ui.IWorkbench#getIntroManager() */ + @Override public IIntroManager getIntroManager() { return getWorkbenchIntroManager(); } @@ -3290,6 +3387,7 @@ UIEvents.Context.TOPIC_CONTEXT, * org.eclipse.core.runtime.IRegistryChangeListener#registryChanged( * org.eclipse.core.runtime.IRegistryChangeEvent) */ + @Override public void registryChanged(IRegistryChangeEvent event) { final IExtensionDelta[] deltas = event.getExtensionDeltas(PlatformUI.PLUGIN_ID, IWorkbenchRegistryConstants.PL_STARTUP); @@ -3323,6 +3421,7 @@ UIEvents.Context.TOPIC_CONTEXT, * * @see org.eclipse.ui.IWorkbench#getThemeManager() */ + @Override public IThemeManager getThemeManager() { return WorkbenchThemeManager.getInstance(); } @@ -3424,6 +3523,7 @@ UIEvents.Context.TOPIC_CONTEXT, * * @see org.eclipse.ui.IWorkbench#getExtensionTracker() */ + @Override public IExtensionTracker getExtensionTracker() { return (IExtensionTracker) e4Context.get(IExtensionTracker.class.getName()); } @@ -3443,6 +3543,7 @@ UIEvents.Context.TOPIC_CONTEXT, * * @see org.eclipse.ui.IWorkbench#getHelpSystem() */ + @Override public IWorkbenchHelpSystem getHelpSystem() { return WorkbenchHelpSystem.getInstance(); } @@ -3452,6 +3553,7 @@ UIEvents.Context.TOPIC_CONTEXT, * * @see org.eclipse.ui.IWorkbench#getHelpSystem() */ + @Override public IWorkbenchBrowserSupport getBrowserSupport() { return WorkbenchBrowserSupport.getInstance(); } @@ -3461,6 +3563,7 @@ UIEvents.Context.TOPIC_CONTEXT, * * @see org.eclipse.ui.IWorkbench#getViewRegistry() */ + @Override public IViewRegistry getViewRegistry() { return WorkbenchPlugin.getDefault().getViewRegistry(); } @@ -3470,6 +3573,7 @@ UIEvents.Context.TOPIC_CONTEXT, * * @see org.eclipse.ui.IWorkbench#getNewWizardRegistry() */ + @Override public IWizardRegistry getNewWizardRegistry() { return WorkbenchPlugin.getDefault().getNewWizardRegistry(); } @@ -3479,6 +3583,7 @@ UIEvents.Context.TOPIC_CONTEXT, * * @see org.eclipse.ui.IWorkbench#getImportWizardRegistry() */ + @Override public IWizardRegistry getImportWizardRegistry() { return WorkbenchPlugin.getDefault().getImportWizardRegistry(); } @@ -3488,10 +3593,12 @@ UIEvents.Context.TOPIC_CONTEXT, * * @see org.eclipse.ui.IWorkbench#getExportWizardRegistry() */ + @Override public IWizardRegistry getExportWizardRegistry() { return WorkbenchPlugin.getDefault().getExportWizardRegistry(); } + @Override public final Object getAdapter(final Class key) { return serviceLocator.getService(key); } @@ -3502,6 +3609,7 @@ UIEvents.Context.TOPIC_CONTEXT, * * @see org.eclipse.ui.services.IServiceLocator#getService(java.lang.Object) */ + @Override public final Object getService(final Class key) { return serviceLocator.getService(key); } @@ -3511,6 +3619,7 @@ UIEvents.Context.TOPIC_CONTEXT, * * @see org.eclipse.ui.services.IServiceLocator#hasService(java.lang.Object) */ + @Override public final boolean hasService(final Class key) { return serviceLocator.hasService(key); } @@ -3585,6 +3694,7 @@ UIEvents.Context.TOPIC_CONTEXT, * , org.eclipse.jface.operation.IRunnableContext, * org.eclipse.ui.ISaveableFilter, boolean) */ + @Override public boolean saveAll(final IShellProvider shellProvider, final IRunnableContext runnableContext, final ISaveableFilter filter, boolean confirm) { SaveablesList saveablesList = (SaveablesList) getService(ISaveablesLifecycleListener.class); @@ -3645,8 +3755,10 @@ UIEvents.Context.TOPIC_CONTEXT, * * @see org.eclipse.ui.IWorkbench#getModalDialogShellProvider() */ + @Override public IShellProvider getModalDialogShellProvider() { return new IShellProvider() { + @Override public Shell getShell() { return ProgressManagerUtil.getDefaultParent(); } @@ -3657,6 +3769,7 @@ UIEvents.Context.TOPIC_CONTEXT, return e4Context; } + @Override public MApplication getApplication() { return application; } @@ -3732,6 +3845,7 @@ UIEvents.Context.TOPIC_CONTEXT, return result; } + @Override public final String getId() { return id; } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchConfigurer.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchConfigurer.java index 434c8acfc12..4961764861c 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchConfigurer.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchConfigurer.java @@ -82,14 +82,16 @@ public final class WorkbenchConfigurer implements IWorkbenchConfigurer { /* (non-javadoc) * @see org.eclipse.ui.application.IWorkbenchConfigurer#getWorkbench */ - public IWorkbench getWorkbench() { + @Override + public IWorkbench getWorkbench() { return PlatformUI.getWorkbench(); } /* (non-javadoc) * @see org.eclipse.ui.application.IWorkbenchConfigurer#getWorkbenchWindowManager */ - public WindowManager getWorkbenchWindowManager() { + @Override + public WindowManager getWorkbenchWindowManager() { // return the global workbench window manager return null; } @@ -97,7 +99,8 @@ public final class WorkbenchConfigurer implements IWorkbenchConfigurer { /* (non-javadoc) * @see org.eclipse.ui.application.IWorkbenchConfigurer#declareImage */ - public void declareImage(String symbolicName, ImageDescriptor descriptor, + @Override + public void declareImage(String symbolicName, ImageDescriptor descriptor, boolean shared) { if (symbolicName == null || descriptor == null) { throw new IllegalArgumentException(); @@ -108,7 +111,8 @@ public final class WorkbenchConfigurer implements IWorkbenchConfigurer { /* (non-javadoc) * @see org.eclipse.ui.application.IWorkbenchConfigurer#getWindowConfigurer */ - public IWorkbenchWindowConfigurer getWindowConfigurer( + @Override + public IWorkbenchWindowConfigurer getWindowConfigurer( IWorkbenchWindow window) { if (window == null) { throw new IllegalArgumentException(); @@ -119,21 +123,24 @@ public final class WorkbenchConfigurer implements IWorkbenchConfigurer { /* (non-Javadoc) * @see org.eclipse.ui.application.IWorkbenchConfigurer#getSaveAndRestore() */ - public boolean getSaveAndRestore() { + @Override + public boolean getSaveAndRestore() { return saveAndRestore; } /* (non-Javadoc) * @see org.eclipse.ui.application.IWorkbenchConfigurer#setSaveAndRestore(boolean) */ - public void setSaveAndRestore(boolean enabled) { + @Override + public void setSaveAndRestore(boolean enabled) { saveAndRestore = enabled; } /* (non-Javadoc) * @see org.eclipse.ui.application.IWorkbenchConfigurer#getData */ - public Object getData(String key) { + @Override + public Object getData(String key) { if (key == null) { throw new IllegalArgumentException(); } @@ -143,7 +150,8 @@ public final class WorkbenchConfigurer implements IWorkbenchConfigurer { /* (non-Javadoc) * @see org.eclipse.ui.application.IWorkbenchConfigurer#setData(String, Object) */ - public void setData(String key, Object data) { + @Override + public void setData(String key, Object data) { if (key == null) { throw new IllegalArgumentException(); } @@ -157,7 +165,8 @@ public final class WorkbenchConfigurer implements IWorkbenchConfigurer { /* (non-Javadoc) * @see org.eclipse.ui.application.IWorkbenchConfigurer#emergencyClose() */ - public void emergencyClose() { + @Override + public void emergencyClose() { if (!isEmergencyClosing) { isEmergencyClosing = true; if (Workbench.getInstance() != null @@ -172,27 +181,31 @@ public final class WorkbenchConfigurer implements IWorkbenchConfigurer { /* (non-Javadoc) * @see org.eclipse.ui.application.IWorkbenchConfigurer#emergencyClosing() */ - public boolean emergencyClosing() { + @Override + public boolean emergencyClosing() { return isEmergencyClosing; } /* (non-Javadoc) * @see org.eclipse.ui.application.IWorkbenchConfigurer#restoreState() */ - public IStatus restoreState() { + @Override + public IStatus restoreState() { return Status.OK_STATUS; } /* (non-Javadoc) * @see org.eclipse.ui.application.IWorkbenchConfigurer#openFirstTimeWindow() */ - public void openFirstTimeWindow() { + @Override + public void openFirstTimeWindow() { ((Workbench) getWorkbench()).openFirstTimeWindow(); } /* (non-Javadoc) * @see org.eclipse.ui.application.IWorkbenchConfigurer#restoreWorkbenchWindow(org.eclipse.ui.IMemento) */ + @Override public IWorkbenchWindowConfigurer restoreWorkbenchWindow(IMemento memento) throws WorkbenchException { return getWindowConfigurer(null); } @@ -200,6 +213,7 @@ public final class WorkbenchConfigurer implements IWorkbenchConfigurer { /* (non-Javadoc) * @see org.eclipse.ui.application.IWorkbenchConfigurer#getExitOnLastWindowClose() */ + @Override public boolean getExitOnLastWindowClose() { return exitOnLastWindowClose; } @@ -207,6 +221,7 @@ public final class WorkbenchConfigurer implements IWorkbenchConfigurer { /* (non-Javadoc) * @see org.eclipse.ui.application.IWorkbenchConfigurer#setExitOnLastWindowClose(boolean) */ + @Override public void setExitOnLastWindowClose(boolean enabled) { exitOnLastWindowClose = enabled; } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchEditorsHandler.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchEditorsHandler.java index 1ad55d9aa8c..393698f8384 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchEditorsHandler.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchEditorsHandler.java @@ -32,6 +32,7 @@ public class WorkbenchEditorsHandler extends AbstractHandler { * * @see org.eclipse.core.commands.IHandler#execute(org.eclipse.core.commands.ExecutionEvent) */ + @Override public Object execute(ExecutionEvent event) throws ExecutionException { IWorkbenchWindow workbenchWindow = HandlerUtil .getActiveWorkbenchWindow(event); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchErrorHandlerProxy.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchErrorHandlerProxy.java index c3deb4eaa27..3cea3d68371 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchErrorHandlerProxy.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchErrorHandlerProxy.java @@ -32,6 +32,7 @@ public class WorkbenchErrorHandlerProxy extends AbstractStatusHandler { * @see org.eclipse.ui.statushandlers.AbstractStatusHandler#handle(org.eclipse.ui.statushandlers.StatusAdapter, * int) */ + @Override public void handle(final StatusAdapter statusAdapter, int style) { Workbench.getInstance().getAdvisor().getWorkbenchErrorHandler().handle( statusAdapter, style); @@ -40,6 +41,7 @@ public class WorkbenchErrorHandlerProxy extends AbstractStatusHandler { /* (non-Javadoc) * @see org.eclipse.ui.statushandlers.AbstractStatusHandler#supportsNotification(int) */ + @Override public boolean supportsNotification(int type) { return Workbench.getInstance().getAdvisor().getWorkbenchErrorHandler() .supportsNotification(type); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchHandlerServiceHandler.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchHandlerServiceHandler.java index 298eeb18347..c121de5c286 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchHandlerServiceHandler.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchHandlerServiceHandler.java @@ -39,6 +39,7 @@ public class WorkbenchHandlerServiceHandler extends HandlerServiceHandler implem * org.eclipse.ui.commands.IElementUpdater#updateElement(org.eclipse.ui. * menus.UIElement, java.util.Map) */ + @Override public void updateElement(UIElement element, Map parameters) { final IEclipseContext executionContext = getExecutionContext(null); if (executionContext == null) { diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchImages.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchImages.java index 4d0a74853ce..ec1a2e678cf 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchImages.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchImages.java @@ -453,7 +453,8 @@ public/*final*/class WorkbenchImages { * * @deprecated As of 3.0, since the workbench itself no longer uses the hover image variants */ - private final static void declareHoverImages() { + @Deprecated + private final static void declareHoverImages() { declareImage(ISharedImages.IMG_TOOL_UNDO_HOVER, PATH_ETOOL + "undo_edit.png", true); //$NON-NLS-1$ declareImage(ISharedImages.IMG_TOOL_REDO_HOVER, PATH_ETOOL diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchIntroManager.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchIntroManager.java index a036c772952..e5f8eb83e8f 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchIntroManager.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchIntroManager.java @@ -55,13 +55,15 @@ public class WorkbenchIntroManager implements IIntroManager { /* (non-Javadoc) * @see org.eclipse.core.runtime.dynamicHelpers.IExtensionChangeHandler#addExtension(org.eclipse.core.runtime.dynamicHelpers.IExtensionTracker, org.eclipse.core.runtime.IExtension) */ - public void addExtension(IExtensionTracker tracker,IExtension extension) { + @Override + public void addExtension(IExtensionTracker tracker,IExtension extension) { //Do nothing } /* (non-Javadoc) * @see org.eclipse.core.runtime.dynamicHelpers.IExtensionChangeHandler#removeExtension(org.eclipse.core.runtime.IExtension, java.lang.Object[]) */ + @Override public void removeExtension(IExtension source, Object[] objects) { for (int i = 0; i < objects.length; i++) { if (objects[i] instanceof IIntroPart) { @@ -81,7 +83,8 @@ public class WorkbenchIntroManager implements IIntroManager { /* (non-Javadoc) * @see org.eclipse.ui.IWorkbench#closeIntro(org.eclipse.ui.intro.IIntroPart) */ - public boolean closeIntro(IIntroPart part) { + @Override + public boolean closeIntro(IIntroPart part) { if (introPart == null || !introPart.equals(part)) { return false; } @@ -110,7 +113,8 @@ public class WorkbenchIntroManager implements IIntroManager { /* (non-Javadoc) * @see org.eclipse.ui.IWorkbench#showIntro(org.eclipse.ui.IWorkbenchWindow) */ - public IIntroPart showIntro(IWorkbenchWindow preferredWindow, + @Override + public IIntroPart showIntro(IWorkbenchWindow preferredWindow, boolean standby) { if (preferredWindow == null) { preferredWindow = this.workbench.getActiveWorkbenchWindow(); @@ -186,7 +190,8 @@ public class WorkbenchIntroManager implements IIntroManager { /* (non-Javadoc) * @see org.eclipse.ui.IWorkbench#setIntroStandby(org.eclipse.ui.intro.IIntroPart, boolean) */ - public void setIntroStandby(IIntroPart part, boolean standby) { + @Override + public void setIntroStandby(IIntroPart part, boolean standby) { if (introPart == null || !introPart.equals(part)) { return; } @@ -231,7 +236,8 @@ public class WorkbenchIntroManager implements IIntroManager { * * @see org.eclipse.ui.IWorkbench#isIntroStandby(org.eclipse.ui.intro.IIntroPart) */ - public boolean isIntroStandby(IIntroPart part) { + @Override + public boolean isIntroStandby(IIntroPart part) { if (introPart == null || !introPart.equals(part)) { return false; } @@ -247,7 +253,8 @@ public class WorkbenchIntroManager implements IIntroManager { /* (non-Javadoc) * @see org.eclipse.ui.IWorkbench#findIntro() */ - public IIntroPart getIntro() { + @Override + public IIntroPart getIntro() { return introPart; } @@ -296,11 +303,13 @@ public class WorkbenchIntroManager implements IIntroManager { /* (non-Javadoc) * @see org.eclipse.ui.IWorkbench#hasIntro() */ - public boolean hasIntro() { + @Override + public boolean hasIntro() { return workbench.getIntroDescriptor() != null; } - public boolean isNewContentAvailable() { + @Override + public boolean isNewContentAvailable() { IntroDescriptor introDescriptor = workbench.getIntroDescriptor(); if (introDescriptor == null) { return false; diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchLayout.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchLayout.java index 04023ba677f..a87a69e282d 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchLayout.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchLayout.java @@ -94,6 +94,7 @@ public class WorkbenchLayout extends Layout { * @see org.eclipse.swt.widgets.Layout#computeSize(org.eclipse.swt.widgets.Composite, * int, int, boolean) */ + @Override protected Point computeSize(Composite composite, int wHint, int hHint, boolean flushCache) { // 'topMax' is the maximum height of both the left and @@ -107,6 +108,7 @@ public class WorkbenchLayout extends Layout { * @see org.eclipse.swt.widgets.Layout#layout(org.eclipse.swt.widgets.Composite, * boolean) */ + @Override protected void layout(Composite composite, boolean flushCache) { } @@ -201,6 +203,7 @@ public class WorkbenchLayout extends Layout { * @see org.eclipse.swt.widgets.Composite#computeSize(int, int, * boolean) */ + @Override public Point computeSize(int wHint, int hHint, boolean changed) { // If we're doing a 'real' workbench layout then delegate to the // appropriate trim area @@ -225,6 +228,7 @@ public class WorkbenchLayout extends Layout { * @see org.eclipse.swt.widgets.Composite#computeSize(int, int, * boolean) */ + @Override public Point computeSize(int wHint, int hHint, boolean changed) { // If we're doing a 'real' workbench layout then delegate to the // appropriate trim area @@ -243,9 +247,11 @@ public class WorkbenchLayout extends Layout { // If the right banner control changes size it's because // the 'swoop' moved. bannerRight.addControlListener(new ControlListener() { + @Override public void controlMoved(ControlEvent e) { } + @Override public void controlResized(ControlEvent e) { Composite leftComp = (Composite) e.widget; leftComp.getShell().layout(true); @@ -265,6 +271,7 @@ public class WorkbenchLayout extends Layout { * Note that this is arbitrary since the we're a top level shell (so * computeSize won't be called. */ + @Override protected Point computeSize(Composite composite, int wHint, int hHint, boolean flushCache) { Point size = new Point(wHint, hHint); @@ -285,6 +292,7 @@ public class WorkbenchLayout extends Layout { * * TODO: Supply a full description of the layout mechanicsS */ + @Override protected void layout(Composite composite, boolean flushCache) { layoutComposite = composite; clientRect = composite.getClientArea(); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchLayoutSettingsTransfer.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchLayoutSettingsTransfer.java index a02c1ec8e16..ac1a0fbc6d7 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchLayoutSettingsTransfer.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchLayoutSettingsTransfer.java @@ -43,6 +43,7 @@ public class WorkbenchLayoutSettingsTransfer extends WorkbenchSettingsTransfer { * * @see org.eclipse.ui.preferences.SettingsTransfer#transferSettings(org.eclipse.core.runtime.IPath) */ + @Override public IStatus transferSettings(IPath newWorkspaceRoot) { try { IPath currentLocation = getNewWorkbenchStateLocation(Platform.getLocation()); @@ -116,6 +117,7 @@ public class WorkbenchLayoutSettingsTransfer extends WorkbenchSettingsTransfer { * * @see org.eclipse.ui.preferences.SettingsTransfer#getName() */ + @Override public String getName() { return WorkbenchMessages.WorkbenchLayoutSettings_Name; } @@ -126,6 +128,7 @@ public class WorkbenchLayoutSettingsTransfer extends WorkbenchSettingsTransfer { * @param newWorkspaceRoot * @return IPath or <code>null</code> if it can't be determined. */ + @Override protected IPath getNewWorkbenchStateLocation(IPath newWorkspaceRoot) { return newWorkspaceRoot.append(new Path(".metadata/.plugins/org.eclipse.e4.workbench")); //$NON-NLS-1$ } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchPage.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchPage.java index 1a931a6aa91..bff6deecef9 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchPage.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchPage.java @@ -184,6 +184,7 @@ public class WorkbenchPage extends CompatibleWorkbenchPage implements class E4PartListener implements org.eclipse.e4.ui.workbench.modeling.IPartListener { + @Override public void partActivated(MPart part) { // update the workbench window's current selection with the active // part's selection @@ -195,11 +196,13 @@ public class WorkbenchPage extends CompatibleWorkbenchPage implements firePartActivated(part); } + @Override public void partBroughtToTop(MPart part) { updateBroughtToTop(part); firePartBroughtToTop(part); } + @Override public void partDeactivated(MPart part) { firePartDeactivated(part); @@ -217,10 +220,12 @@ public class WorkbenchPage extends CompatibleWorkbenchPage implements } } + @Override public void partHidden(MPart part) { firePartHidden(part); } + @Override public void partVisible(MPart part) { firePartVisible(part); } @@ -490,11 +495,13 @@ public class WorkbenchPage extends CompatibleWorkbenchPage implements * A listener that forwards page change events to our part listeners. */ private IPageChangedListener pageChangedListener = new IPageChangedListener() { + @Override public void pageChanged(final PageChangedEvent event) { Object[] listeners = partListener2List.getListeners(); for (final Object listener : listeners) { if (listener instanceof IPageChangedListener) { SafeRunner.run(new SafeRunnable() { + @Override public void run() throws Exception { ((IPageChangedListener) listener).pageChanged(event); } @@ -542,7 +549,8 @@ public class WorkbenchPage extends CompatibleWorkbenchPage implements /* * Remove the working set from the page if the working set is deleted. */ - public void propertyChange(PropertyChangeEvent event) { + @Override + public void propertyChange(PropertyChangeEvent event) { String property = event.getProperty(); if (IWorkingSetManager.CHANGE_WORKING_SET_REMOVE.equals(property)) { if(event.getOldValue().equals(workingSet)) { @@ -835,6 +843,7 @@ public class WorkbenchPage extends CompatibleWorkbenchPage implements * can install DND support into its control. */ private EventHandler widgetHandler = new EventHandler() { + @Override public void handleEvent(Event event) { Object element = event.getProperty(UIEvents.EventTags.ELEMENT); Object newValue = event.getProperty(UIEvents.EventTags.NEW_VALUE); @@ -900,7 +909,8 @@ public class WorkbenchPage extends CompatibleWorkbenchPage implements * @param part * the part to activate */ - public void activate(IWorkbenchPart part) { + @Override + public void activate(IWorkbenchPart part) { if (part == null || !certifyPart(part) || legacyWindow.isClosing()) { return; } @@ -914,14 +924,16 @@ public class WorkbenchPage extends CompatibleWorkbenchPage implements /** * Adds an IPartListener to the part service. */ - public void addPartListener(IPartListener l) { + @Override + public void addPartListener(IPartListener l) { partListenerList.add(l); } /** * Adds an IPartListener to the part service. */ - public void addPartListener(IPartListener2 l) { + @Override + public void addPartListener(IPartListener2 l) { partListener2List.add(l); } @@ -935,14 +947,17 @@ public class WorkbenchPage extends CompatibleWorkbenchPage implements * working set manager to receive notification when the view * working set is removed. */ - public void addPropertyChangeListener(IPropertyChangeListener listener) { + @Deprecated + @Override + public void addPropertyChangeListener(IPropertyChangeListener listener) { propertyChangeListeners.add(listener); } /* * (non-Javadoc) Method declared on ISelectionListener. */ - public void addSelectionListener(ISelectionListener listener) { + @Override + public void addSelectionListener(ISelectionListener listener) { selectionListeners.add(listener); getWorkbenchWindow().getSelectionService().addSelectionListener(listener); } @@ -950,7 +965,8 @@ public class WorkbenchPage extends CompatibleWorkbenchPage implements /* * (non-Javadoc) Method declared on ISelectionListener. */ - public void addSelectionListener(String partId, ISelectionListener listener) { + @Override + public void addSelectionListener(String partId, ISelectionListener listener) { List<ISelectionListener> listeners = targetedSelectionListeners.get(partId); if (listeners == null) { listeners = new ArrayList<ISelectionListener>(); @@ -963,7 +979,8 @@ public class WorkbenchPage extends CompatibleWorkbenchPage implements /* * (non-Javadoc) Method declared on ISelectionListener. */ - public void addPostSelectionListener(ISelectionListener listener) { + @Override + public void addPostSelectionListener(ISelectionListener listener) { postSelectionListeners.add(listener); getWorkbenchWindow().getSelectionService().addPostSelectionListener(listener); } @@ -971,7 +988,8 @@ public class WorkbenchPage extends CompatibleWorkbenchPage implements /* * (non-Javadoc) Method declared on ISelectionListener. */ - public void addPostSelectionListener(String partId, + @Override + public void addPostSelectionListener(String partId, ISelectionListener listener) { List<ISelectionListener> listeners = targetedPostSelectionListeners.get(partId); if (listeners == null) { @@ -990,7 +1008,8 @@ public class WorkbenchPage extends CompatibleWorkbenchPage implements * @param part * the part to bring to move forward */ - public void bringToTop(IWorkbenchPart part) { + @Override + public void bringToTop(IWorkbenchPart part) { // Sanity check. MPart mpart = findPart(part); if (mpart != null) { @@ -1258,10 +1277,12 @@ public class WorkbenchPage extends CompatibleWorkbenchPage implements /** * Closes this page. */ - public boolean close() { + @Override + public boolean close() { final boolean[] ret = new boolean[1]; BusyIndicator.showWhile(null, new Runnable() { - public void run() { + @Override + public void run() { ret[0] = close(true, true); } }); @@ -1291,13 +1312,15 @@ public class WorkbenchPage extends CompatibleWorkbenchPage implements /** * See IWorkbenchPage */ - public boolean closeAllEditors(boolean save) { + @Override + public boolean closeAllEditors(boolean save) { return closeEditors(getEditorReferences(), save); } /** * See IWorkbenchPage */ + @Override public boolean closeEditors(IEditorReference[] refArray, boolean save) { if (refArray.length == 0) { return true; @@ -1540,7 +1563,8 @@ public class WorkbenchPage extends CompatibleWorkbenchPage implements /** * See IWorkbenchPage#closeEditor */ - public boolean closeEditor(IEditorPart editor, boolean save) { + @Override + public boolean closeEditor(IEditorPart editor, boolean save) { IWorkbenchPartReference ref = getReference(editor); if (ref instanceof IEditorReference) { return closeEditors(new IEditorReference[] {(IEditorReference) ref}, save); @@ -1635,6 +1659,7 @@ public class WorkbenchPage extends CompatibleWorkbenchPage implements * @see org.eclipse.ui.IWorkbenchPage#closePerspective(org.eclipse.ui. * IPerspectiveDescriptor, boolean, boolean) */ + @Override public void closePerspective(IPerspectiveDescriptor desc, boolean saveParts, boolean closePage) { closePerspective(desc, desc.getId(), saveParts, closePage); } @@ -1664,6 +1689,7 @@ public class WorkbenchPage extends CompatibleWorkbenchPage implements * * @see org.eclipse.ui.IWorkbenchPage#closeAllPerspectives(boolean, boolean) */ + @Override public void closeAllPerspectives(boolean saveEditors, boolean closePage) { boolean okToProceed = closeAllEditors(true); if (okToProceed) { @@ -1866,7 +1892,8 @@ public class WorkbenchPage extends CompatibleWorkbenchPage implements /** * @return NavigationHistory */ - public INavigationHistory getNavigationHistory() { + @Override + public INavigationHistory getNavigationHistory() { return navigationHistory; } @@ -1893,7 +1920,8 @@ public class WorkbenchPage extends CompatibleWorkbenchPage implements /** * See IWorkbenchPage@findView. */ - public IViewPart findView(String id) { + @Override + public IViewPart findView(String id) { IViewReference ref = findViewReference(id); if (ref == null) { return null; @@ -1906,7 +1934,8 @@ public class WorkbenchPage extends CompatibleWorkbenchPage implements * * @see org.eclipse.ui.IWorkbenchPage */ - public IViewReference findViewReference(String viewId) { + @Override + public IViewReference findViewReference(String viewId) { for (IViewReference reference : getViewReferences()) { ViewReference ref = (ViewReference) reference; if (viewId.equals(ref.getModel().getElementId())) { @@ -1921,7 +1950,8 @@ public class WorkbenchPage extends CompatibleWorkbenchPage implements * * @see org.eclipse.ui.IWorkbenchPage */ - public IViewReference findViewReference(String viewId, String secondaryId) { + @Override + public IViewReference findViewReference(String viewId, String secondaryId) { String compoundId = viewId; if (secondaryId != null && secondaryId.length() > 0) compoundId += ":" + secondaryId; //$NON-NLS-1$ @@ -1996,7 +2026,8 @@ public class WorkbenchPage extends CompatibleWorkbenchPage implements /** * @see IWorkbenchPage */ - public IEditorPart getActiveEditor() { + @Override + public IEditorPart getActiveEditor() { IWorkbenchPart activePart = getActivePart(); if (activePart instanceof IEditorPart) { // if the currently active part is an editor, return it @@ -2152,7 +2183,8 @@ public class WorkbenchPage extends CompatibleWorkbenchPage implements return isValid(ancestor, parent); } - public IWorkbenchPart getActivePart() { + @Override + public IWorkbenchPart getActivePart() { MPart part = partService.getActivePart(); return getWorkbenchPart(part); } @@ -2162,6 +2194,7 @@ public class WorkbenchPage extends CompatibleWorkbenchPage implements * * @see org.eclipse.ui.IPartService#getActivePartReference() */ + @Override public IWorkbenchPartReference getActivePartReference() { IWorkbenchPart part = getActivePart(); return part == null ? null : getReference(part); @@ -2176,6 +2209,7 @@ public class WorkbenchPage extends CompatibleWorkbenchPage implements * * @see org.eclipse.ui.IWorkbenchPage#getDirtyEditors() */ + @Override public IEditorPart[] getDirtyEditors() { List<IEditorPart> dirtyEditors = new ArrayList<IEditorPart>(); for (IEditorReference editorRef : editorReferences) { @@ -2193,6 +2227,7 @@ public class WorkbenchPage extends CompatibleWorkbenchPage implements * @see * org.eclipse.ui.IWorkbenchPage#findEditor(org.eclipse.ui.IEditorInput) */ + @Override public IEditorPart findEditor(IEditorInput input) { IEditorReference[] references = findEditors(input, null, MATCH_INPUT); return references.length == 0 ? null : references[0].getEditor(true); @@ -2205,6 +2240,7 @@ public class WorkbenchPage extends CompatibleWorkbenchPage implements * org.eclipse.ui.IWorkbenchPage#findEditors(org.eclipse.ui.IEditorInput, * java.lang.String, int) */ + @Override public IEditorReference[] findEditors(IEditorInput input, String editorId, int matchFlags) { List<EditorReference> filteredReferences = getSortedEditorReferences(); @@ -2277,6 +2313,7 @@ public class WorkbenchPage extends CompatibleWorkbenchPage implements * * @see org.eclipse.ui.IWorkbenchPage#getEditors() */ + @Override public IEditorPart[] getEditors() { final IEditorReference[] editorReferences = getEditorReferences(); int length = editorReferences.length; @@ -2292,6 +2329,7 @@ public class WorkbenchPage extends CompatibleWorkbenchPage implements * * @see org.eclipse.ui.IWorkbenchPage#getEditorReferences() */ + @Override public IEditorReference[] getEditorReferences() { List<EditorReference> references = getOrderedEditorReferences(); return references.toArray(new IEditorReference[references.size()]); @@ -2359,7 +2397,8 @@ public class WorkbenchPage extends CompatibleWorkbenchPage implements /** * @see IWorkbenchPage */ - public IAdaptable getInput() { + @Override + public IAdaptable getInput() { return input; } @@ -2367,7 +2406,8 @@ public class WorkbenchPage extends CompatibleWorkbenchPage implements * Returns the page label. This is a combination of the page input and * active perspective. */ - public String getLabel() { + @Override + public String getLabel() { String label = WorkbenchMessages.WorkbenchPage_UnknownLabel; IWorkbenchAdapter adapter = (IWorkbenchAdapter) Util.getAdapter(input, IWorkbenchAdapter.class); @@ -2389,7 +2429,8 @@ public class WorkbenchPage extends CompatibleWorkbenchPage implements /** * Returns the perspective. */ - public IPerspectiveDescriptor getPerspective() { + @Override + public IPerspectiveDescriptor getPerspective() { MPerspectiveStack ps = getPerspectiveStack(); MPerspective curPersp = ps.getSelectedElement(); if (curPersp == null) @@ -2411,14 +2452,16 @@ public class WorkbenchPage extends CompatibleWorkbenchPage implements /* * (non-Javadoc) Method declared on ISelectionService */ - public ISelection getSelection() { + @Override + public ISelection getSelection() { return getWorkbenchWindow().getSelectionService().getSelection(); } /* * (non-Javadoc) Method declared on ISelectionService */ - public ISelection getSelection(String partId) { + @Override + public ISelection getSelection(String partId) { return getWorkbenchWindow().getSelectionService().getSelection(partId); } @@ -2459,7 +2502,8 @@ public class WorkbenchPage extends CompatibleWorkbenchPage implements /** * See IWorkbenchPage. */ - public IViewReference[] getViewReferences() { + @Override + public IViewReference[] getViewReferences() { MPerspective perspective = getCurrentPerspective(); if (perspective != null) { List<MPlaceholder> placeholders = modelService.findElements(window, null, @@ -2482,7 +2526,8 @@ public class WorkbenchPage extends CompatibleWorkbenchPage implements /** * See IWorkbenchPage. */ - public IViewPart[] getViews() { + @Override + public IViewPart[] getViews() { IViewReference[] viewReferences = getViewReferences(); int length = viewReferences.length; IViewPart[] views = new IViewPart[length]; @@ -2497,7 +2542,8 @@ public class WorkbenchPage extends CompatibleWorkbenchPage implements /** * See IWorkbenchPage. */ - public IWorkbenchWindow getWorkbenchWindow() { + @Override + public IWorkbenchWindow getWorkbenchWindow() { return legacyWindow; } @@ -2508,14 +2554,17 @@ public class WorkbenchPage extends CompatibleWorkbenchPage implements * @since 2.0 * @deprecated individual views should store a working set if needed */ - public IWorkingSet getWorkingSet() { + @Deprecated + @Override + public IWorkingSet getWorkingSet() { return workingSet; } /** * @see IWorkbenchPage */ - public void hideActionSet(String actionSetID) { + @Override + public void hideActionSet(String actionSetID) { MPerspective mpersp = getCurrentPerspective(); if (mpersp == null) return; @@ -2540,6 +2589,7 @@ public class WorkbenchPage extends CompatibleWorkbenchPage implements * * @see org.eclipse.ui.IWorkbenchPage#hideView(org.eclipse.ui.IViewReference) */ + @Override public void hideView(IViewReference view) { if (view != null) { for (IViewReference reference : getViewReferences()) { @@ -2551,6 +2601,7 @@ public class WorkbenchPage extends CompatibleWorkbenchPage implements } } + @Override public void hideView(IViewPart view) { if (view != null) { MPart part = findPart(view); @@ -2815,6 +2866,7 @@ public class WorkbenchPage extends CompatibleWorkbenchPage implements } private EventHandler selectionHandler = new EventHandler() { + @Override public void handleEvent(Event event) { Object changedElement = event.getProperty(UIEvents.EventTags.ELEMENT); @@ -2898,7 +2950,8 @@ public class WorkbenchPage extends CompatibleWorkbenchPage implements /** * See IWorkbenchPage. */ - public boolean isPartVisible(IWorkbenchPart part) { + @Override + public boolean isPartVisible(IWorkbenchPart part) { MPart mpart = findPart(part); return mpart == null ? false : partService.isPartVisible(mpart); } @@ -2912,7 +2965,8 @@ public class WorkbenchPage extends CompatibleWorkbenchPage implements /** * See IWorkbenchPage. */ - public boolean isEditorAreaVisible() { + @Override + public boolean isEditorAreaVisible() { MUIElement find = findSharedArea(); return find == null ? false : find.isVisible() && find.isToBeRendered(); } @@ -2922,7 +2976,8 @@ public class WorkbenchPage extends CompatibleWorkbenchPage implements * * @see org.eclipse.ui.IWorkbenchPage#isPageZoomed() */ - public boolean isPageZoomed() { + @Override + public boolean isPageZoomed() { List<String> maxTag = new ArrayList<String>(); maxTag.add(IPresentationEngine.MAXIMIZED); List<Object> maxElements = modelService.findElements(window, null, null, maxTag); @@ -2958,7 +3013,8 @@ public class WorkbenchPage extends CompatibleWorkbenchPage implements /** * See IWorkbenchPage. */ - public void reuseEditor(IReusableEditor editor, IEditorInput input) { + @Override + public void reuseEditor(IReusableEditor editor, IEditorInput input) { // Rather than calling editor.setInput on the editor directly, we do it through the part reference. // This case lets us detect badly behaved editors that are not firing a PROP_INPUT event in response @@ -2973,7 +3029,8 @@ public class WorkbenchPage extends CompatibleWorkbenchPage implements /** * See IWorkbenchPage. */ - public IEditorPart openEditor(IEditorInput input, String editorID) + @Override + public IEditorPart openEditor(IEditorInput input, String editorID) throws PartInitException { return openEditor(input, editorID, true, MATCH_INPUT); } @@ -2981,7 +3038,8 @@ public class WorkbenchPage extends CompatibleWorkbenchPage implements /** * See IWorkbenchPage. */ - public IEditorPart openEditor(IEditorInput input, String editorID, + @Override + public IEditorPart openEditor(IEditorInput input, String editorID, boolean activate) throws PartInitException { return openEditor(input, editorID, activate, MATCH_INPUT); } @@ -2989,7 +3047,8 @@ public class WorkbenchPage extends CompatibleWorkbenchPage implements /** * See IWorkbenchPage. */ - public IEditorPart openEditor(final IEditorInput input, + @Override + public IEditorPart openEditor(final IEditorInput input, final String editorID, final boolean activate, final int matchFlags) throws PartInitException { return openEditor(input, editorID, activate, matchFlags, null, true); @@ -3030,7 +3089,8 @@ public class WorkbenchPage extends CompatibleWorkbenchPage implements final PartInitException ex[] = new PartInitException[1]; BusyIndicator.showWhile(legacyWindow.getWorkbench().getDisplay(), new Runnable() { - public void run() { + @Override + public void run() { try { result[0] = busyOpenEditor(input, editorID, activate, matchFlags, editorState, notify); @@ -3158,7 +3218,8 @@ public class WorkbenchPage extends CompatibleWorkbenchPage implements /** * See IWorkbenchPage. */ - public boolean isEditorPinned(IEditorPart editor) { + @Override + public boolean isEditorPinned(IEditorPart editor) { WorkbenchPartReference ref = (WorkbenchPartReference)getReference(editor); return ref != null && ref.isPinned(); } @@ -3168,14 +3229,16 @@ public class WorkbenchPage extends CompatibleWorkbenchPage implements /** * Removes an IPartListener from the part service. */ - public void removePartListener(IPartListener l) { + @Override + public void removePartListener(IPartListener l) { partListenerList.remove(l); } /** * Removes an IPartListener from the part service. */ - public void removePartListener(IPartListener2 l) { + @Override + public void removePartListener(IPartListener2 l) { partListener2List.remove(l); } @@ -3189,14 +3252,17 @@ public class WorkbenchPage extends CompatibleWorkbenchPage implements * working set manager to receive notification when the view * working set is removed. */ - public void removePropertyChangeListener(IPropertyChangeListener listener) { + @Deprecated + @Override + public void removePropertyChangeListener(IPropertyChangeListener listener) { propertyChangeListeners.remove(listener); } /* * (non-Javadoc) Method declared on ISelectionListener. */ - public void removeSelectionListener(ISelectionListener listener) { + @Override + public void removeSelectionListener(ISelectionListener listener) { selectionListeners.remove(listener); getWorkbenchWindow().getSelectionService().removeSelectionListener(listener); } @@ -3204,7 +3270,8 @@ public class WorkbenchPage extends CompatibleWorkbenchPage implements /* * (non-Javadoc) Method declared on ISelectionListener. */ - public void removeSelectionListener(String partId, + @Override + public void removeSelectionListener(String partId, ISelectionListener listener) { List<ISelectionListener> listeners = targetedSelectionListeners.get(partId); if (listeners != null) { @@ -3216,7 +3283,8 @@ public class WorkbenchPage extends CompatibleWorkbenchPage implements /* * (non-Javadoc) Method declared on ISelectionListener. */ - public void removePostSelectionListener(ISelectionListener listener) { + @Override + public void removePostSelectionListener(ISelectionListener listener) { postSelectionListeners.remove(listener); getWorkbenchWindow().getSelectionService().removePostSelectionListener(listener); } @@ -3224,7 +3292,8 @@ public class WorkbenchPage extends CompatibleWorkbenchPage implements /* * (non-Javadoc) Method declared on ISelectionListener. */ - public void removePostSelectionListener(String partId, + @Override + public void removePostSelectionListener(String partId, ISelectionListener listener) { List<ISelectionListener> listeners = targetedPostSelectionListeners.get(partId); if (listeners != null) { @@ -3239,7 +3308,8 @@ public class WorkbenchPage extends CompatibleWorkbenchPage implements * Resets the layout for the perspective. The active part in the old layout * is activated in the new layout for consistent user context. */ - public void resetPerspective() { + @Override + public void resetPerspective() { MPerspectiveStack perspStack = getPerspectiveStack(); MPerspective persp = perspStack.getSelectedElement(); if (persp == null) @@ -3414,7 +3484,8 @@ public class WorkbenchPage extends CompatibleWorkbenchPage implements /** * See IWorkbenchPage */ - public boolean saveAllEditors(boolean confirm) { + @Override + public boolean saveAllEditors(boolean confirm) { return saveAllEditors(confirm, false, false); } @@ -3574,6 +3645,7 @@ public class WorkbenchPage extends CompatibleWorkbenchPage implements MessageDialog d = new MessageDialog(shellProvider.getShell(), WorkbenchMessages.Save_Resource, null, message, MessageDialog.QUESTION, buttons, 0) { + @Override protected int getShellStyle() { return super.getShellStyle() | SWT.SHEET; } @@ -3600,6 +3672,7 @@ public class WorkbenchPage extends CompatibleWorkbenchPage implements ListSelectionDialog dlg = new ListSelectionDialog(shellProvider.getShell(), modelsToSave, new ArrayContentProvider(), new WorkbenchPartLabelProvider(), WorkbenchMessages.EditorManager_saveResourcesMessage) { + @Override protected int getShellStyle() { return super.getShellStyle() | SWT.SHEET; } @@ -3630,6 +3703,7 @@ public class WorkbenchPage extends CompatibleWorkbenchPage implements // Create save block. final List finalModels = modelsToSave; IRunnableWithProgress progressOp = new IRunnableWithProgress() { + @Override public void run(IProgressMonitor monitor) { IProgressMonitor monitorWrap = new EventLoopProgressMonitor(monitor); monitorWrap.beginTask(WorkbenchMessages.Saving_Modifications, finalModels.size()); @@ -3800,7 +3874,8 @@ public class WorkbenchPage extends CompatibleWorkbenchPage implements * @return <code>true</code> if the command succeeded, or <code>false</code> * if the user cancels the command */ - public boolean saveEditor(IEditorPart editor, boolean confirm) { + @Override + public boolean saveEditor(IEditorPart editor, boolean confirm) { return saveSaveable(editor, editor, confirm, false); } @@ -3809,6 +3884,7 @@ public class WorkbenchPage extends CompatibleWorkbenchPage implements * * @see org.eclipse.ui.IWorkbenchPage#savePerspective() */ + @Override public void savePerspective() { throw new UnsupportedOperationException(); } @@ -3819,6 +3895,7 @@ public class WorkbenchPage extends CompatibleWorkbenchPage implements * @see org.eclipse.ui.IWorkbenchPage#savePerspectiveAs(org.eclipse.ui. * IPerspectiveDescriptor) */ + @Override public void savePerspectiveAs(IPerspectiveDescriptor perspective) { MPerspective visiblePerspective = getPerspectiveStack().getSelectedElement(); // get the original perspective @@ -3846,6 +3923,7 @@ public class WorkbenchPage extends CompatibleWorkbenchPage implements * * @see org.eclipse.ui.IWorkbenchPage#setEditorAreaVisible(boolean) */ + @Override public void setEditorAreaVisible(boolean showEditorArea) { MUIElement find = findSharedArea(); if (find != null) { @@ -3885,6 +3963,7 @@ public class WorkbenchPage extends CompatibleWorkbenchPage implements * @see org.eclipse.ui.IWorkbenchPage#setPerspective(org.eclipse.ui. * IPerspectiveDescriptor) */ + @Override public void setPerspective(IPerspectiveDescriptor perspective) { if (perspective == null) { return; @@ -4026,7 +4105,8 @@ public class WorkbenchPage extends CompatibleWorkbenchPage implements * @since 2.0 * @deprecated individual views should store a working set if needed */ - public void setWorkingSet(IWorkingSet newWorkingSet) { + @Deprecated + public void setWorkingSet(IWorkingSet newWorkingSet) { IWorkingSet oldWorkingSet = workingSet; workingSet = newWorkingSet; @@ -4046,7 +4126,8 @@ public class WorkbenchPage extends CompatibleWorkbenchPage implements /** * @see IWorkbenchPage */ - public void showActionSet(String actionSetID) { + @Override + public void showActionSet(String actionSetID) { Perspective persp = getActivePerspective(); if (persp != null) { ActionSetRegistry reg = WorkbenchPlugin.getDefault() @@ -4065,7 +4146,8 @@ public class WorkbenchPage extends CompatibleWorkbenchPage implements /** * See IWorkbenchPage. */ - public IViewPart showView(String viewID) throws PartInitException { + @Override + public IViewPart showView(String viewID) throws PartInitException { return showView(viewID, null, VIEW_ACTIVATE); } @@ -4075,6 +4157,7 @@ public class WorkbenchPage extends CompatibleWorkbenchPage implements * @see org.eclipse.ui.IWorkbenchPage#showView(java.lang.String, * java.lang.String, int) */ + @Override public IViewPart showView(final String viewID, final String secondaryID, final int mode) throws PartInitException { @@ -4092,6 +4175,7 @@ public class WorkbenchPage extends CompatibleWorkbenchPage implements final String compoundId = secondaryID != null ? viewID + ':' + secondaryID : viewID; final Object[] result = new Object[1]; BusyIndicator.showWhile(null, new Runnable() { + @Override public void run() { try { result[0] = busyShowView(compoundId, mode); @@ -4157,6 +4241,7 @@ public class WorkbenchPage extends CompatibleWorkbenchPage implements * @see org.eclipse.ui.IWorkbenchPage#setPartState(org.eclipse.ui. * IWorkbenchPartReference, int) */ + @Override public void setPartState(IWorkbenchPartReference ref, int iState) { MUIElement element = getActiveElement(ref); String state = null; @@ -4175,7 +4260,8 @@ public class WorkbenchPage extends CompatibleWorkbenchPage implements * @see org.eclipse.ui.IWorkbenchPage#getPartState(org.eclipse.ui. * IWorkbenchPartReference) */ - public int getPartState(IWorkbenchPartReference ref) { + @Override + public int getPartState(IWorkbenchPartReference ref) { int state = STATE_RESTORED; MUIElement element = getActiveElement(ref); @@ -4218,7 +4304,8 @@ public class WorkbenchPage extends CompatibleWorkbenchPage implements /* (non-Javadoc) * @see org.eclipse.ui.IWorkbenchPage#zoomOut() */ - public void zoomOut() { + @Override + public void zoomOut() { // TODO compat: what does the zoom do? } @@ -4228,6 +4315,7 @@ public class WorkbenchPage extends CompatibleWorkbenchPage implements * @see org.eclipse.ui.IWorkbenchPage#toggleZoom(org.eclipse.ui. * IWorkbenchPartReference) */ + @Override public void toggleZoom(IWorkbenchPartReference ref) { MUIElement element = getActiveElement(ref); if (element != null) { @@ -4245,6 +4333,7 @@ public class WorkbenchPage extends CompatibleWorkbenchPage implements * * @see org.eclipse.ui.IWorkbenchPage#getOpenPerspectives() */ + @Override public IPerspectiveDescriptor[] getOpenPerspectives() { MPerspectiveStack perspectiveStack = modelService.findElements(window, null, MPerspectiveStack.class, null).get(0); @@ -4270,6 +4359,7 @@ public class WorkbenchPage extends CompatibleWorkbenchPage implements * * @see org.eclipse.ui.IWorkbenchPage#getSortedPerspectives() */ + @Override public IPerspectiveDescriptor[] getSortedPerspectives() { return sortedPerspectives.toArray(new IPerspectiveDescriptor[sortedPerspectives.size()]); } @@ -4284,6 +4374,7 @@ public class WorkbenchPage extends CompatibleWorkbenchPage implements * @return the part's reference or <code>null</code> if the given part does not belong * to this workbench page */ + @Override public IWorkbenchPartReference getReference(IWorkbenchPart part) { if (part != null) { IWorkbenchPartSite site = part.getSite(); @@ -4308,6 +4399,7 @@ public class WorkbenchPage extends CompatibleWorkbenchPage implements * * @see org.eclipse.ui.IWorkbenchPage#getViewStack(org.eclipse.ui.IViewPart) */ + @Override public IViewPart[] getViewStack(IViewPart part) { MPart mpart = partService.findPart(part.getSite().getId()); if (mpart != null) { @@ -4336,6 +4428,7 @@ public class WorkbenchPage extends CompatibleWorkbenchPage implements // sort the list by activation order (most recently activated // first) Collections.sort(stack, new Comparator<CompatibilityView>() { + @Override public int compare(CompatibilityView o1, CompatibilityView o2) { int pos1 = (-1) * activationList.indexOf(o1.getModel()); int pos2 = (-1) * activationList.indexOf(o2.getModel()); @@ -4360,6 +4453,7 @@ public class WorkbenchPage extends CompatibleWorkbenchPage implements /* (non-Javadoc) * @see org.eclipse.ui.IWorkbenchPage#getExtensionTracker() */ + @Override public IExtensionTracker getExtensionTracker() { if (tracker == null) { tracker = new UIExtensionTracker(getWorkbenchWindow().getWorkbench().getDisplay()); @@ -4389,6 +4483,7 @@ public class WorkbenchPage extends CompatibleWorkbenchPage implements * * @see org.eclipse.ui.IWorkbenchPage#getNewWizardShortcuts() */ + @Override public String[] getNewWizardShortcuts() { return getArrayForTag(ModeledPageLayout.NEW_WIZARD_TAG); } @@ -4398,6 +4493,7 @@ public class WorkbenchPage extends CompatibleWorkbenchPage implements * * @see org.eclipse.ui.IWorkbenchPage#getPerspectiveShortcuts() */ + @Override public String[] getPerspectiveShortcuts() { return getArrayForTag(ModeledPageLayout.PERSP_SHORTCUT_TAG); } @@ -4407,6 +4503,7 @@ public class WorkbenchPage extends CompatibleWorkbenchPage implements * * @see org.eclipse.ui.IWorkbenchPage#getShowViewShortcuts() */ + @Override public String[] getShowViewShortcuts() { return getArrayForTag(ModeledPageLayout.SHOW_VIEW_TAG); } @@ -4423,10 +4520,12 @@ public class WorkbenchPage extends CompatibleWorkbenchPage implements return isPartVisible(part); } + @Override public IWorkingSet[] getWorkingSets() { return workingSets; } + @Override public void setWorkingSets(IWorkingSet[] newWorkingSets) { if (newWorkingSets != null) { WorkbenchPlugin @@ -4467,6 +4566,7 @@ public class WorkbenchPage extends CompatibleWorkbenchPage implements } } + @Override public IWorkingSet getAggregateWorkingSet() { if (aggregateWorkingSet == null) { IWorkingSetManager workingSetManager = PlatformUI.getWorkbench() @@ -4511,6 +4611,7 @@ public class WorkbenchPage extends CompatibleWorkbenchPage implements * @see * org.eclipse.ui.IWorkbenchPage#showEditor(org.eclipse.ui.IEditorReference) */ + @Override public void showEditor(IEditorReference ref) { // FIXME compat showEditor E4Util.unsupported("showEditor"); //$NON-NLS-1$ @@ -4523,6 +4624,7 @@ public class WorkbenchPage extends CompatibleWorkbenchPage implements * @see * org.eclipse.ui.IWorkbenchPage#hideEditor(org.eclipse.ui.IEditorReference) */ + @Override public void hideEditor(IEditorReference ref) { // FIXME compat hideEditor E4Util.unsupported("hideEditor"); //$NON-NLS-1$ @@ -4549,6 +4651,7 @@ public class WorkbenchPage extends CompatibleWorkbenchPage implements * org.eclipse.ui.IWorkbenchPage#getEditorState(org.eclipse.ui.IEditorReference * []) */ + @Override public IMemento[] getEditorState(IEditorReference[] editorRefs, boolean includeInputState) { IMemento[] m = new IMemento[editorRefs.length]; for (int i = 0; i < editorRefs.length; i++) { @@ -4567,6 +4670,7 @@ public class WorkbenchPage extends CompatibleWorkbenchPage implements * org.eclipse.ui.IWorkbenchPage#openEditors(org.eclipse.ui.IEditorInput[], * java.lang.String[], int) */ + @Override public IEditorReference[] openEditors(IEditorInput[] inputs, String[] editorIDs, int matchFlags) throws MultiPartInitException { return openEditors(inputs, editorIDs, null, matchFlags, 0); } @@ -4578,6 +4682,7 @@ public class WorkbenchPage extends CompatibleWorkbenchPage implements * org.eclipse.ui.IWorkbenchPage#openEditors(org.eclipse.ui.IEditorInput[], * java.lang.String[], org.eclipse.ui.IMemento[], int) */ + @Override public IEditorReference[] openEditors(IEditorInput[] inputs, String[] editorIDs, IMemento[] mementos, int matchFlags, int activationIndex) throws MultiPartInitException { @@ -4812,6 +4917,7 @@ public class WorkbenchPage extends CompatibleWorkbenchPage implements for (final Object listener : partListenerList.getListeners()) { SafeRunner.run(new SafeRunnable() { + @Override public void run() throws Exception { ((IPartListener) listener).partActivated(workbenchPart); } @@ -4820,6 +4926,7 @@ public class WorkbenchPage extends CompatibleWorkbenchPage implements for (final Object listener : partListener2List.getListeners()) { SafeRunner.run(new SafeRunnable() { + @Override public void run() throws Exception { ((IPartListener2) listener).partActivated(partReference); } @@ -4836,6 +4943,7 @@ public class WorkbenchPage extends CompatibleWorkbenchPage implements for (final Object listener : partListenerList.getListeners()) { SafeRunner.run(new SafeRunnable() { + @Override public void run() throws Exception { ((IPartListener) listener).partDeactivated(workbenchPart); } @@ -4844,6 +4952,7 @@ public class WorkbenchPage extends CompatibleWorkbenchPage implements for (final Object listener : partListener2List.getListeners()) { SafeRunner.run(new SafeRunnable() { + @Override public void run() throws Exception { ((IPartListener2) listener).partDeactivated(partReference); } @@ -4862,6 +4971,7 @@ public class WorkbenchPage extends CompatibleWorkbenchPage implements for (final Object listener : partListenerList.getListeners()) { SafeRunner.run(new SafeRunnable() { + @Override public void run() throws Exception { ((IPartListener) listener).partOpened(part); } @@ -4870,6 +4980,7 @@ public class WorkbenchPage extends CompatibleWorkbenchPage implements for (final Object listener : partListener2List.getListeners()) { SafeRunner.run(new SafeRunnable() { + @Override public void run() throws Exception { ((IPartListener2) listener).partOpened(partReference); } @@ -4902,6 +5013,7 @@ public class WorkbenchPage extends CompatibleWorkbenchPage implements for (final Object listener : partListenerList.getListeners()) { SafeRunner.run(new SafeRunnable() { + @Override public void run() throws Exception { ((IPartListener) listener).partClosed(part); } @@ -4910,6 +5022,7 @@ public class WorkbenchPage extends CompatibleWorkbenchPage implements for (final Object listener : partListener2List.getListeners()) { SafeRunner.run(new SafeRunnable() { + @Override public void run() throws Exception { ((IPartListener2) listener).partClosed(partReference); } @@ -4963,6 +5076,7 @@ public class WorkbenchPage extends CompatibleWorkbenchPage implements for (final Object listener : partListenerList.getListeners()) { SafeRunner.run(new SafeRunnable() { + @Override public void run() throws Exception { ((IPartListener) listener).partBroughtToTop(workbenchPart); } @@ -4971,6 +5085,7 @@ public class WorkbenchPage extends CompatibleWorkbenchPage implements for (final Object listener : partListener2List.getListeners()) { SafeRunner.run(new SafeRunnable() { + @Override public void run() throws Exception { ((IPartListener2) listener).partBroughtToTop(partReference); } @@ -4991,6 +5106,7 @@ public class WorkbenchPage extends CompatibleWorkbenchPage implements private static final int FIRE_PART_BROUGHTTOTOP = 0x2; private EventHandler firingHandler = new EventHandler() { + @Override public void handleEvent(Event event) { Object element = event.getProperty(UIEvents.EventTags.ELEMENT); Object value = event.getProperty(UIEvents.EventTags.NEW_VALUE); @@ -5010,6 +5126,7 @@ public class WorkbenchPage extends CompatibleWorkbenchPage implements }; private EventHandler childrenHandler = new EventHandler() { + @Override public void handleEvent(Event event) { Object changedObj = event.getProperty(UIEvents.EventTags.ELEMENT); @@ -5053,6 +5170,7 @@ public class WorkbenchPage extends CompatibleWorkbenchPage implements for (final Object listener : partListener2List.getListeners()) { SafeRunner.run(new SafeRunnable() { + @Override public void run() throws Exception { ((IPartListener2) listener).partVisible(partReference); } @@ -5077,6 +5195,7 @@ public class WorkbenchPage extends CompatibleWorkbenchPage implements for (final Object listener : partListener2List.getListeners()) { SafeRunner.run(new SafeRunnable() { + @Override public void run() throws Exception { ((IPartListener2) listener).partHidden(partReference); } @@ -5088,6 +5207,7 @@ public class WorkbenchPage extends CompatibleWorkbenchPage implements public void firePartInputChanged(final IWorkbenchPartReference partReference) { for (final Object listener : partListener2List.getListeners()) { SafeRunner.run(new SafeRunnable() { + @Override public void run() throws Exception { ((IPartListener2) listener).partInputChanged(partReference); } @@ -5100,6 +5220,7 @@ public class WorkbenchPage extends CompatibleWorkbenchPage implements * * @see org.eclipse.ui.IWorkbenchPage#getEditorReuseThreshold() */ + @Override public int getEditorReuseThreshold() { IPreferenceStore store = WorkbenchPlugin.getDefault().getPreferenceStore(); return store.getInt(IPreferenceConstants.REUSE_EDITORS); @@ -5110,6 +5231,7 @@ public class WorkbenchPage extends CompatibleWorkbenchPage implements * * @see org.eclipse.ui.IWorkbenchPage#setEditorReuseThreshold(int) */ + @Override public void setEditorReuseThreshold(int openEditors) { // this is an empty implementation in 3.x, see IPageLayout's // setEditorReuseThreshold @@ -5153,6 +5275,7 @@ public class WorkbenchPage extends CompatibleWorkbenchPage implements final IPathEditorInput pathInput = getPathEditorInput(input); if (pathInput != null && pathInput.getPath() != null) { BusyIndicator.showWhile(legacyWindow.getWorkbench().getDisplay(), new Runnable() { + @Override public void run() { try { if (desc.getLauncher() != null) { @@ -5233,6 +5356,7 @@ public class WorkbenchPage extends CompatibleWorkbenchPage implements * unrendered. */ private EventHandler referenceRemovalEventHandler = new EventHandler() { + @Override public void handleEvent(Event event) { if (Boolean.TRUE.equals(event.getProperty(UIEvents.EventTags.NEW_VALUE))) { return; diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchPartReference.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchPartReference.java index cc97e723155..374cddda1a7 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchPartReference.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchPartReference.java @@ -143,12 +143,14 @@ public abstract class WorkbenchPartReference implements IWorkbenchPartReference, /* (non-Javadoc) * @see org.eclipse.ui.IPropertyListener#propertyChanged(java.lang.Object, int) */ - public void propertyChanged(Object source, int propId) { + @Override + public void propertyChanged(Object source, int propId) { partPropertyChanged(source, propId); } }; private IPropertyChangeListener partPropertyChangeListener = new IPropertyChangeListener() { + @Override public void propertyChange(PropertyChangeEvent event) { partPropertyChanged(event); } @@ -176,6 +178,7 @@ public abstract class WorkbenchPartReference implements IWorkbenchPartReference, private EventHandler createContextEventHandler() { if (contextEventHandler == null) { contextEventHandler = new EventHandler() { + @Override public void handleEvent(Event event) { Object element = event.getProperty(UIEvents.EventTags.ELEMENT); MPart part = getModel(); @@ -263,7 +266,8 @@ public abstract class WorkbenchPartReference implements IWorkbenchPartReference, /** * @see IWorkbenchPart */ - public void addPropertyListener(IPropertyListener listener) { + @Override + public void addPropertyListener(IPropertyListener listener) { // The properties of a disposed reference will never change, so don't // add listeners if (isDisposed()) { @@ -276,7 +280,8 @@ public abstract class WorkbenchPartReference implements IWorkbenchPartReference, /** * @see IWorkbenchPart */ - public void removePropertyListener(IPropertyListener listener) { + @Override + public void removePropertyListener(IPropertyListener listener) { // Currently I'm not calling checkReference here for fear of breaking things late in 3.1, but it may // make sense to do so later. For now we just turn it into a NOP if the reference is disposed. if (isDisposed()) { @@ -291,6 +296,7 @@ public abstract class WorkbenchPartReference implements IWorkbenchPartReference, * * @see org.eclipse.ui.IWorkbenchPartReference#getTitle() */ + @Override public String getTitle() { String title = legacyPart == null ? part.getLocalizedLabel() : legacyPart.getTitle(); return Util.safeString(title); @@ -301,6 +307,7 @@ public abstract class WorkbenchPartReference implements IWorkbenchPartReference, * * @see org.eclipse.ui.IWorkbenchPartReference#getTitleToolTip() */ + @Override public String getTitleToolTip() { String toolTip = (String) part.getTransientData().get( IPresentationEngine.OVERRIDE_TITLE_TOOL_TIP_KEY); @@ -314,6 +321,7 @@ public abstract class WorkbenchPartReference implements IWorkbenchPartReference, * * @see org.eclipse.ui.IWorkbenchPartReference#getId() */ + @Override public String getId() { String id = part.getElementId(); @@ -340,6 +348,7 @@ public abstract class WorkbenchPartReference implements IWorkbenchPartReference, return Util.safeString(legacyPart.getTitle()); } + @Override public final Image getTitleImage() { if (isDisposed()) { return PlatformUI.getWorkbench().getSharedImages().getImage(ISharedImages.IMG_DEF_VIEW); @@ -394,7 +403,8 @@ public abstract class WorkbenchPartReference implements IWorkbenchPartReference, } } - public final IWorkbenchPart getPart(boolean restore) { + @Override + public final IWorkbenchPart getPart(boolean restore) { if (isDisposed()) { return null; } @@ -484,7 +494,8 @@ public abstract class WorkbenchPartReference implements IWorkbenchPartReference, /* (non-Javadoc) * @see org.eclipse.ui.IWorkbenchPartReference#getPartProperty(java.lang.String) */ - public String getPartProperty(String key) { + @Override + public String getPartProperty(String key) { if (legacyPart != null) { if (legacyPart instanceof IWorkbenchPart3) { return ((IWorkbenchPart3) legacyPart).getPartProperty(key); @@ -498,7 +509,8 @@ public abstract class WorkbenchPartReference implements IWorkbenchPartReference, /* (non-Javadoc) * @see org.eclipse.ui.IWorkbenchPartReference#addPartPropertyListener(org.eclipse.jface.util.IPropertyChangeListener) */ - public void addPartPropertyListener(IPropertyChangeListener listener) { + @Override + public void addPartPropertyListener(IPropertyChangeListener listener) { if (isDisposed()) { return; } @@ -508,7 +520,8 @@ public abstract class WorkbenchPartReference implements IWorkbenchPartReference, /* (non-Javadoc) * @see org.eclipse.ui.IWorkbenchPartReference#removePartPropertyListener(org.eclipse.jface.util.IPropertyChangeListener) */ - public void removePartPropertyListener(IPropertyChangeListener listener) { + @Override + public void removePartPropertyListener(IPropertyChangeListener listener) { if (isDisposed()) { return; } @@ -533,7 +546,8 @@ public abstract class WorkbenchPartReference implements IWorkbenchPartReference, /* (non-Javadoc) * @see org.eclipse.ui.ISizeProvider#computePreferredSize(boolean, int, int, int) */ - public int computePreferredSize(boolean width, int availableParallel, + @Override + public int computePreferredSize(boolean width, int availableParallel, int availablePerpendicular, int preferredResult) { ISizeProvider sizeProvider = (ISizeProvider) Util.getAdapter(legacyPart, @@ -548,7 +562,8 @@ public abstract class WorkbenchPartReference implements IWorkbenchPartReference, /* (non-Javadoc) * @see org.eclipse.ui.ISizeProvider#getSizeFlags(boolean) */ - public int getSizeFlags(boolean width) { + @Override + public int getSizeFlags(boolean width) { ISizeProvider sizeProvider = (ISizeProvider) Util.getAdapter(legacyPart, ISizeProvider.class); if (sizeProvider != null) { @@ -557,6 +572,7 @@ public abstract class WorkbenchPartReference implements IWorkbenchPartReference, return 0; } + @Override public IWorkbenchPage getPage() { return page; } @@ -570,6 +586,7 @@ public abstract class WorkbenchPartReference implements IWorkbenchPartReference, * * @see org.eclipse.ui.IWorkbenchPartReference#getPartName() */ + @Override public String getPartName() { return part.getLocalizedLabel(); } @@ -579,6 +596,7 @@ public abstract class WorkbenchPartReference implements IWorkbenchPartReference, * * @see org.eclipse.ui.IWorkbenchPartReference#getContentDescription() */ + @Override public String getContentDescription() { IWorkbenchPart workbenchPart = getPart(false); if (workbenchPart instanceof IWorkbenchPart2) { @@ -592,6 +610,7 @@ public abstract class WorkbenchPartReference implements IWorkbenchPartReference, * * @see org.eclipse.ui.IWorkbenchPartReference#isDirty() */ + @Override public boolean isDirty() { IWorkbenchPart part = getPart(false); if (part instanceof ISaveablePart) { diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchPlugin.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchPlugin.java index 7bb6f48ee18..60b4863d0af 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchPlugin.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchPlugin.java @@ -276,7 +276,8 @@ public class WorkbenchPlugin extends AbstractUIPlugin { final Object[] ret = new Object[1]; final CoreException[] exc = new CoreException[1]; BusyIndicator.showWhile(null, new Runnable() { - public void run() { + @Override + public void run() { try { ret[0] = element .createExecutableExtension(classAttribute); @@ -432,7 +433,8 @@ public class WorkbenchPlugin extends AbstractUIPlugin { * convenience access to the graphics resources and fast field access for * some of the commonly used graphical images. */ - protected ImageRegistry createImageRegistry() { + @Override + protected ImageRegistry createImageRegistry() { return WorkbenchImages.getImageRegistry(); } @@ -685,7 +687,9 @@ public class WorkbenchPlugin extends AbstractUIPlugin { * Answer the workbench. * @deprecated Use <code>PlatformUI.getWorkbench()</code> instead. */ - public IWorkbench getWorkbench() { + @Deprecated + @Override + public IWorkbench getWorkbench() { return PlatformUI.getWorkbench(); } @@ -694,7 +698,8 @@ public class WorkbenchPlugin extends AbstractUIPlugin { * This method must be called whenever the preference store is initially loaded * because the default values are not stored in the preference store. */ - protected void initializeDefaultPreferences(IPreferenceStore store) { + @Override + protected void initializeDefaultPreferences(IPreferenceStore store) { // Do nothing. This should not be called. // Prefs are initialized in WorkbenchPreferenceInitializer. } @@ -843,7 +848,8 @@ public class WorkbenchPlugin extends AbstractUIPlugin { * (non-Javadoc) * @see org.osgi.framework.BundleActivator#start(org.osgi.framework.BundleContext) */ - public void start(BundleContext context) throws Exception { + @Override + public void start(BundleContext context) throws Exception { context.addBundleListener(getBundleListener()); super.start(context); bundleContext = context; @@ -1140,7 +1146,8 @@ public class WorkbenchPlugin extends AbstractUIPlugin { /* (non-Javadoc) * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext) */ - public void stop(BundleContext context) throws Exception { + @Override + public void stop(BundleContext context) throws Exception { if (bundleListener!=null) { context.removeBundleListener(bundleListener); bundleListener = null; @@ -1250,6 +1257,7 @@ public class WorkbenchPlugin extends AbstractUIPlugin { private BundleListener getBundleListener() { if (bundleListener == null) { bundleListener = new SynchronousBundleListener() { + @Override public void bundleChanged(BundleEvent event) { WorkbenchPlugin.this.bundleChanged(event); } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchPreferenceInitializer.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchPreferenceInitializer.java index 2c9f33fbafe..fc2513db1fb 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchPreferenceInitializer.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchPreferenceInitializer.java @@ -41,6 +41,7 @@ public class WorkbenchPreferenceInitializer extends + @Override public void initializeDefaultPreferences() { IScopeContext context = new DefaultScope(); IEclipsePreferences node = context.getNode(WorkbenchPlugin diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchSupportFactory.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchSupportFactory.java index 8cf7e4d0e72..82ff0ea7fee 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchSupportFactory.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchSupportFactory.java @@ -31,6 +31,7 @@ import org.eclipse.ui.services.IServiceLocator; */ public class WorkbenchSupportFactory extends AbstractServiceFactory { + @Override public Object create(Class serviceInterface, IServiceLocator parentLocator, IServiceLocator locator) { diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchWindow.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchWindow.java index beb67332943..a41de92c571 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchWindow.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchWindow.java @@ -298,6 +298,7 @@ public class WorkbenchWindow implements IWorkbenchWindow { private IPerspectiveDescriptor perspective; private EventHandler windowWidgetHandler = new EventHandler() { + @Override public void handleEvent(Event event) { if (event.getProperty(UIEvents.EventTags.ELEMENT) == model && event.getProperty(UIEvents.EventTags.NEW_VALUE) == null) { @@ -488,6 +489,7 @@ public class WorkbenchWindow implements IWorkbenchWindow { .getService(IServiceLocatorCreator.class); this.serviceLocator = (ServiceLocator) slc.createServiceLocator(workbench, null, new IDisposable() { + @Override public void dispose() { final Shell shell = getShell(); if (shell != null && !shell.isDisposed()) { @@ -507,6 +509,7 @@ public class WorkbenchWindow implements IWorkbenchWindow { }); windowContext.set(IWindowCloseHandler.class.getName(), new IWindowCloseHandler() { + @Override public boolean close(MWindow window) { return getWindowAdvisor().preWindowShellClose() && WorkbenchWindow.this.close(); } @@ -514,6 +517,7 @@ public class WorkbenchWindow implements IWorkbenchWindow { final ISaveHandler defaultSaveHandler = windowContext.get(ISaveHandler.class); final PartServiceSaveHandler localSaveHandler = new PartServiceSaveHandler() { + @Override public Save promptToSave(MPart dirtyPart) { Object object = dirtyPart.getObject(); if (object instanceof CompatibilityPart) { @@ -528,6 +532,7 @@ public class WorkbenchWindow implements IWorkbenchWindow { return defaultSaveHandler.promptToSave(dirtyPart); } + @Override public Save[] promptToSave(Collection<MPart> dirtyParts) { LabelProvider labelProvider = new LabelProvider() { @Override @@ -560,6 +565,7 @@ public class WorkbenchWindow implements IWorkbenchWindow { return retSaves; } + @Override public boolean save(MPart dirtyPart, boolean confirm) { Object object = dirtyPart.getObject(); if (object instanceof CompatibilityPart) { @@ -572,6 +578,7 @@ public class WorkbenchWindow implements IWorkbenchWindow { return super.save(dirtyPart, confirm); } + @Override public boolean saveParts(Collection<MPart> dirtyParts, boolean confirm) { ArrayList<ISaveablePart> saveables = new ArrayList<ISaveablePart>(); for (MPart part : dirtyParts) { @@ -667,6 +674,7 @@ public class WorkbenchWindow implements IWorkbenchWindow { shell.setMenuBar(menu); menuUpdater = new Runnable() { + @Override public void run() { try { if (model.getMainMenu() == null || model.getWidget() == null @@ -1417,6 +1425,7 @@ public class WorkbenchWindow implements IWorkbenchWindow { /* * Adds an listener to the part service. */ + @Override public void addPageListener(IPageListener l) { pageListeners.addPageListener(l); } @@ -1424,6 +1433,7 @@ public class WorkbenchWindow implements IWorkbenchWindow { /** * @see org.eclipse.ui.IPageService */ + @Override public void addPerspectiveListener(org.eclipse.ui.IPerspectiveListener l) { perspectiveListeners.addPerspectiveListener(l); } @@ -1488,6 +1498,7 @@ public class WorkbenchWindow implements IWorkbenchWindow { return windowClosed; } + @Override public Shell getShell() { return (Shell) model.getWidget(); } @@ -1495,6 +1506,7 @@ public class WorkbenchWindow implements IWorkbenchWindow { public boolean close(final boolean remove) { final boolean[] ret = new boolean[1]; BusyIndicator.showWhile(null, new Runnable() { + @Override public void run() { ret[0] = busyClose(remove); } @@ -1505,6 +1517,7 @@ public class WorkbenchWindow implements IWorkbenchWindow { /** * @see IWorkbenchWindow */ + @Override public boolean close() { return close(true); } @@ -1539,6 +1552,7 @@ public class WorkbenchWindow implements IWorkbenchWindow { */ void fireWindowRestored() throws WorkbenchException { StartupThreading.runWithWorkbenchExceptions(new StartupRunnable() { + @Override public void runWithException() throws Throwable { getWindowAdvisor().postWindowRestore(); } @@ -1687,10 +1701,12 @@ public class WorkbenchWindow implements IWorkbenchWindow { return actionBars; } + @Override public IWorkbenchPage getActivePage() { return page; } + @Override public IWorkbenchPage[] getPages() { return page == null ? new IWorkbenchPage[0] : new IWorkbenchPage[] { page }; } @@ -1698,6 +1714,7 @@ public class WorkbenchWindow implements IWorkbenchWindow { /** * @see IWorkbenchWindow */ + @Override public IPartService getPartService() { return partService; } @@ -1714,6 +1731,7 @@ public class WorkbenchWindow implements IWorkbenchWindow { /** * @see IWorkbenchWindow */ + @Override public ISelectionService getSelectionService() { return selectionService; } @@ -1732,6 +1750,7 @@ public class WorkbenchWindow implements IWorkbenchWindow { /** * @see IWorkbenchWindow */ + @Override public IWorkbench getWorkbench() { return PlatformUI.getWorkbench(); } @@ -1861,6 +1880,7 @@ public class WorkbenchWindow implements IWorkbenchWindow { /** * @see IWorkbenchWindow */ + @Override public boolean isApplicationMenu(String menuID) { // delegate this question to the action bar advisor return getActionBarAdvisor().isApplicationMenu(menuID); @@ -1890,10 +1910,12 @@ public class WorkbenchWindow implements IWorkbenchWindow { * @see org.eclipse.ui.IWorkbenchWindow#openPage(java.lang.String, * org.eclipse.core.runtime.IAdaptable) */ + @Override public IWorkbenchPage openPage(final String perspectiveId, final IAdaptable input) throws WorkbenchException { final Object[] result = new Object[1]; BusyIndicator.showWhile(null, new Runnable() { + @Override public void run() { try { result[0] = busyOpenPage(perspectiveId, input); @@ -1953,6 +1975,7 @@ public class WorkbenchWindow implements IWorkbenchWindow { * org.eclipse.ui.IWorkbenchWindow#openPage(org.eclipse.core.runtime.IAdaptable * ) */ + @Override public IWorkbenchPage openPage(IAdaptable input) throws WorkbenchException { return openPage(workbench.getPerspectiveRegistry().getDefaultPerspective(), input); } @@ -1960,6 +1983,7 @@ public class WorkbenchWindow implements IWorkbenchWindow { /* * Removes an listener from the part service. */ + @Override public void removePageListener(IPageListener l) { pageListeners.removePageListener(l); } @@ -1967,6 +1991,7 @@ public class WorkbenchWindow implements IWorkbenchWindow { /** * @see org.eclipse.ui.IPageService */ + @Override public void removePerspectiveListener(org.eclipse.ui.IPerspectiveListener l) { perspectiveListeners.removePerspectiveListener(l); } @@ -1981,6 +2006,7 @@ public class WorkbenchWindow implements IWorkbenchWindow { /* * (non-Javadoc) Method declared on IRunnableContext. */ + @Override public void run(final boolean fork, boolean cancelable, final IRunnableWithProgress runnable) throws InvocationTargetException, InterruptedException { final StatusLineManager manager = getStatusLineManager(); @@ -2043,6 +2069,7 @@ public class WorkbenchWindow implements IWorkbenchWindow { final InterruptedException[] ie = new InterruptedException[1]; BusyIndicator.showWhile(getShell().getDisplay(), new Runnable() { + @Override public void run() { try { ModalContext.run(runnable, fork, manager.getProgressMonitor(), @@ -2097,6 +2124,7 @@ public class WorkbenchWindow implements IWorkbenchWindow { } } + @Override public void setActivePage(final IWorkbenchPage in) { if (getActivePage() != in) { if (in == null) { @@ -2167,6 +2195,7 @@ public class WorkbenchWindow implements IWorkbenchWindow { */ private void trackShellActivation() { getShell().addShellListener(new ShellAdapter() { + @Override public void shellActivated(ShellEvent event) { shellActivated = true; serviceLocator.activate(); @@ -2176,6 +2205,7 @@ public class WorkbenchWindow implements IWorkbenchWindow { liftRestrictions(); } + @Override public void shellDeactivated(ShellEvent event) { shellActivated = false; imposeRestrictions(); @@ -2654,6 +2684,7 @@ public class WorkbenchWindow implements IWorkbenchWindow { * * @see org.eclipse.ui.IWorkbenchWindow#getExtensionTracker() */ + @Override public IExtensionTracker getExtensionTracker() { return (IExtensionTracker) model.getContext().get(IExtensionTracker.class.getName()); } @@ -2679,37 +2710,47 @@ public class WorkbenchWindow implements IWorkbenchWindow { // to prevent an NPE when using Intro's 'Go to Workbench' handling // See Bug 365625 for details... trimManager = new ITrimManager() { + @Override public void addTrim(int areaId, IWindowTrim trim) { } + @Override public void addTrim(int areaId, IWindowTrim trim, IWindowTrim beforeMe) { } + @Override public void removeTrim(IWindowTrim toRemove) { } + @Override public IWindowTrim getTrim(String id) { return null; } + @Override public int[] getAreaIds() { return null; } + @Override public List getAreaTrim(int areaId) { return null; } + @Override public void updateAreaTrim(int id, List trim, boolean removeExtra) { } + @Override public List getAllTrim() { return null; } + @Override public void setTrimVisible(IWindowTrim trim, boolean visible) { } + @Override public void forceLayout() { } }; @@ -2757,10 +2798,12 @@ public class WorkbenchWindow implements IWorkbenchWindow { serviceLocator.registerService(IMenuService.class, msvs); } + @Override public final Object getService(final Class key) { return serviceLocator.getService(key); } + @Override public final boolean hasService(final Class key) { return serviceLocator.hasService(key); } @@ -2857,22 +2900,27 @@ public class WorkbenchWindow implements IWorkbenchWindow { private IContributionManagerOverrides toolbarOverride = new IContributionManagerOverrides() { + @Override public Integer getAccelerator(IContributionItem item) { return null; } + @Override public String getAcceleratorText(IContributionItem item) { return null; } + @Override public Boolean getEnabled(IContributionItem item) { return null; } + @Override public String getText(IContributionItem item) { return null; } + @Override public Boolean getVisible(IContributionItem item) { if (page == null) return null; @@ -2906,22 +2954,27 @@ public class WorkbenchWindow implements IWorkbenchWindow { private IContributionManagerOverrides menuOverride = new IContributionManagerOverrides() { + @Override public Integer getAccelerator(IContributionItem item) { return null; } + @Override public String getAcceleratorText(IContributionItem item) { return null; } + @Override public Boolean getEnabled(IContributionItem item) { return null; } + @Override public String getText(IContributionItem item) { return null; } + @Override public Boolean getVisible(IContributionItem item) { if (page == null) return null; diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchWindowConfigurer.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchWindowConfigurer.java index 5949488e902..cadd4f7a54a 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchWindowConfigurer.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchWindowConfigurer.java @@ -161,7 +161,8 @@ public final class WorkbenchWindowConfigurer implements /* (non-Javadoc) * @see org.eclipse.ui.application.IActionBarConfigurer#getWindowConfigurer() */ - public IWorkbenchWindowConfigurer getWindowConfigurer() { + @Override + public IWorkbenchWindowConfigurer getWindowConfigurer() { return window.getWindowConfigurer(); } @@ -188,7 +189,8 @@ public final class WorkbenchWindowConfigurer implements /* (non-Javadoc) * @see org.eclipse.ui.application.IActionBarConfigurer */ - public IStatusLineManager getStatusLineManager() { + @Override + public IStatusLineManager getStatusLineManager() { if (proxy != null) { return proxy.getStatusLineManager(); } @@ -198,7 +200,8 @@ public final class WorkbenchWindowConfigurer implements /* (non-Javadoc) * @see org.eclipse.ui.application.IActionBarConfigurer */ - public IMenuManager getMenuManager() { + @Override + public IMenuManager getMenuManager() { if (proxy != null) { return proxy.getMenuManager(); } @@ -208,7 +211,8 @@ public final class WorkbenchWindowConfigurer implements /* (non-Javadoc) * @see org.eclipse.ui.internal.AbstractActionBarConfigurer */ - public ICoolBarManager getCoolBarManager() { + @Override + public ICoolBarManager getCoolBarManager() { if (proxy != null) { return proxy.getCoolBarManager(); } @@ -218,7 +222,8 @@ public final class WorkbenchWindowConfigurer implements /* (non-Javadoc) * @see org.eclipse.ui.application.IActionBarConfigurer */ - public void registerGlobalAction(IAction action) { + @Override + public void registerGlobalAction(IAction action) { if (proxy != null) { proxy.registerGlobalAction(action); } @@ -228,6 +233,7 @@ public final class WorkbenchWindowConfigurer implements /* (non-Javadoc) * @see org.eclipse.ui.application.IActionBarConfigurer#createToolBarManager() */ + @Override public IToolBarManager createToolBarManager() { if (proxy != null) { return proxy.createToolBarManager(); @@ -238,6 +244,7 @@ public final class WorkbenchWindowConfigurer implements /* (non-Javadoc) * @see org.eclipse.ui.application.IActionBarConfigurer#createToolBarContributionItem(org.eclipse.jface.action.IToolBarManager, java.lang.String) */ + @Override public IToolBarContributionItem createToolBarContributionItem(IToolBarManager toolBarManager, String id) { if (proxy != null) { return proxy.createToolBarContributionItem(toolBarManager, id); @@ -271,14 +278,16 @@ public final class WorkbenchWindowConfigurer implements /* (non-javadoc) * @see org.eclipse.ui.application.IWorkbenchWindowConfigurer#getWindow */ - public IWorkbenchWindow getWindow() { + @Override + public IWorkbenchWindow getWindow() { return window; } /* (non-Javadoc) * @see org.eclipse.ui.application.IWorkbenchWindowConfigurer#getWorkbenchConfigurer() */ - public IWorkbenchConfigurer getWorkbenchConfigurer() { + @Override + public IWorkbenchConfigurer getWorkbenchConfigurer() { return Workbench.getInstance().getWorkbenchConfigurer(); } @@ -294,7 +303,8 @@ public final class WorkbenchWindowConfigurer implements /* (non-javadoc) * @see org.eclipse.ui.application.IWorkbenchWindowConfigurer#getTitle */ - public String getTitle() { + @Override + public String getTitle() { Shell shell = window.getShell(); if (shell != null) { // update the cached title @@ -306,7 +316,8 @@ public final class WorkbenchWindowConfigurer implements /* (non-javadoc) * @see org.eclipse.ui.application.IWorkbenchWindowConfigurer#setTitle */ - public void setTitle(String title) { + @Override + public void setTitle(String title) { if (title == null) { throw new IllegalArgumentException(); } @@ -320,14 +331,16 @@ public final class WorkbenchWindowConfigurer implements /* (non-javadoc) * @see org.eclipse.ui.application.IWorkbenchWindowConfigurer#getShowMenuBar */ - public boolean getShowMenuBar() { + @Override + public boolean getShowMenuBar() { return showMenuBar; } /* (non-javadoc) * @see org.eclipse.ui.application.IWorkbenchWindowConfigurer#setShowMenuBar */ - public void setShowMenuBar(boolean show) { + @Override + public void setShowMenuBar(boolean show) { showMenuBar = show; WorkbenchWindow win = (WorkbenchWindow) getWindow(); Shell shell = win.getShell(); @@ -346,14 +359,16 @@ public final class WorkbenchWindowConfigurer implements /* (non-javadoc) * @see org.eclipse.ui.application.IWorkbenchWindowConfigurer#getShowToolBar */ - public boolean getShowCoolBar() { + @Override + public boolean getShowCoolBar() { return showToolBar; } /* (non-javadoc) * @see org.eclipse.ui.application.IWorkbenchWindowConfigurer */ - public void setShowCoolBar(boolean show) { + @Override + public void setShowCoolBar(boolean show) { showToolBar = show; // @issue need to be able to reconfigure after window's controls created } @@ -361,14 +376,16 @@ public final class WorkbenchWindowConfigurer implements /* (non-javadoc) * @see org.eclipse.ui.application.IWorkbenchWindowConfigurer */ - public boolean getShowFastViewBars() { + @Override + public boolean getShowFastViewBars() { return showFastViewBars; } /* (non-javadoc) * @see org.eclipse.ui.application.IWorkbenchWindowConfigurer */ - public void setShowFastViewBars(boolean show) { + @Override + public void setShowFastViewBars(boolean show) { showFastViewBars = show; window.setFastViewBarVisible(show); // @issue need to be able to reconfigure after window's controls created @@ -377,14 +394,16 @@ public final class WorkbenchWindowConfigurer implements /* (non-javadoc) * @see org.eclipse.ui.application.IWorkbenchWindowConfigurer */ - public boolean getShowPerspectiveBar() { + @Override + public boolean getShowPerspectiveBar() { return showPerspectiveBar; } /* (non-javadoc) * @see org.eclipse.ui.application.IWorkbenchWindowConfigurer */ - public void setShowPerspectiveBar(boolean show) { + @Override + public void setShowPerspectiveBar(boolean show) { showPerspectiveBar = show; // @issue need to be able to reconfigure after window's controls created } @@ -392,14 +411,16 @@ public final class WorkbenchWindowConfigurer implements /* (non-javadoc) * @see org.eclipse.ui.application.IWorkbenchWindowConfigurer#getShowStatusLine */ - public boolean getShowStatusLine() { + @Override + public boolean getShowStatusLine() { return showStatusLine; } /* (non-javadoc) * @see org.eclipse.ui.application.IWorkbenchWindowConfigurer#setShowStatusLine */ - public void setShowStatusLine(boolean show) { + @Override + public void setShowStatusLine(boolean show) { showStatusLine = show; window.setStatusLineVisible(show); // @issue need to be able to reconfigure after window's controls created @@ -408,14 +429,16 @@ public final class WorkbenchWindowConfigurer implements /* (non-Javadoc) * @see org.eclipse.ui.application.IWorkbenchWindowConfigurer */ - public boolean getShowProgressIndicator() { + @Override + public boolean getShowProgressIndicator() { return showProgressIndicator; } /* (non-Javadoc) * @see org.eclipse.ui.application.IWorkbenchWindowConfigurer */ - public void setShowProgressIndicator(boolean show) { + @Override + public void setShowProgressIndicator(boolean show) { showProgressIndicator = show; // @issue need to be able to reconfigure after window's controls created } @@ -423,7 +446,8 @@ public final class WorkbenchWindowConfigurer implements /* (non-javadoc) * @see org.eclipse.ui.application.IWorkbenchWindowConfigurer#getData */ - public Object getData(String key) { + @Override + public Object getData(String key) { if (key == null) { throw new IllegalArgumentException(); } @@ -433,7 +457,8 @@ public final class WorkbenchWindowConfigurer implements /* (non-javadoc) * @see org.eclipse.ui.application.IWorkbenchWindowConfigurer#setData */ - public void setData(String key, Object data) { + @Override + public void setData(String key, Object data) { if (key == null) { throw new IllegalArgumentException(); } @@ -447,7 +472,8 @@ public final class WorkbenchWindowConfigurer implements /* (non-Javadoc) * @see org.eclipse.ui.application.IWorkbenchWindowConfigurer#addEditorAreaTransfer */ - public void addEditorAreaTransfer(Transfer tranfer) { + @Override + public void addEditorAreaTransfer(Transfer tranfer) { if (tranfer != null && !transferTypes.contains(tranfer)) { transferTypes.add(tranfer); } @@ -456,7 +482,8 @@ public final class WorkbenchWindowConfigurer implements /* (non-Javadoc) * @see org.eclipse.ui.application.IWorkbenchWindowConfigurer */ - public void configureEditorAreaDropListener( + @Override + public void configureEditorAreaDropListener( DropTargetListener dropTargetListener) { this.dropTargetListener = dropTargetListener; } @@ -480,7 +507,8 @@ public final class WorkbenchWindowConfigurer implements /* (non-javadoc) * @see org.eclipse.ui.application.IWorkbenchWindowConfigurer */ - public IActionBarConfigurer getActionBarConfigurer() { + @Override + public IActionBarConfigurer getActionBarConfigurer() { if (actionBarConfigurer == null) { // lazily initialize actionBarConfigurer = new WindowActionBarConfigurer(); @@ -504,35 +532,40 @@ public final class WorkbenchWindowConfigurer implements /* (non-Javadoc) * @see org.eclipse.ui.application.IWorkbenchWindowConfigurer */ - public int getShellStyle() { + @Override + public int getShellStyle() { return shellStyle; } /* (non-Javadoc) * @see org.eclipse.ui.application.IWorkbenchWindowConfigurer */ - public void setShellStyle(int shellStyle) { + @Override + public void setShellStyle(int shellStyle) { this.shellStyle = shellStyle; } /* (non-Javadoc) * @see org.eclipse.ui.application.IWorkbenchWindowConfigurer */ - public Point getInitialSize() { + @Override + public Point getInitialSize() { return initialSize; } /* (non-Javadoc) * @see org.eclipse.ui.application.IWorkbenchWindowConfigurer */ - public void setInitialSize(Point size) { + @Override + public void setInitialSize(Point size) { initialSize = size; } /* (non-Javadoc) * @see org.eclipse.ui.application.IWorkbenchWindowConfigurer */ - public AbstractPresentationFactory getPresentationFactory() { + @Override + public AbstractPresentationFactory getPresentationFactory() { if (presentationFactory == null) { presentationFactory = createDefaultPresentationFactory(); } @@ -553,6 +586,7 @@ public final class WorkbenchWindowConfigurer implements final AbstractPresentationFactory [] factory = new AbstractPresentationFactory[1]; StartupThreading.runWithoutExceptions(new StartupRunnable() { + @Override public void runWithException() throws Throwable { factory[0] = WorkbenchPlugin.getDefault() .getPresentationFactory(factoryId); @@ -573,7 +607,8 @@ public final class WorkbenchWindowConfigurer implements /* (non-Javadoc) * @see org.eclipse.ui.application.IWorkbenchWindowConfigurer */ - public void setPresentationFactory(AbstractPresentationFactory factory) { + @Override + public void setPresentationFactory(AbstractPresentationFactory factory) { if (factory == null) { throw new IllegalArgumentException(); } @@ -592,14 +627,16 @@ public final class WorkbenchWindowConfigurer implements /* (non-Javadoc) * @see org.eclipse.ui.application.IWorkbenchWindowConfigurer */ - public Menu createMenuBar() { + @Override + public Menu createMenuBar() { return null; } /* (non-Javadoc) * @see org.eclipse.ui.application.IWorkbenchWindowConfigurer */ - public Control createCoolBarControl(Composite parent) { + @Override + public Control createCoolBarControl(Composite parent) { return null; } @@ -607,20 +644,23 @@ public final class WorkbenchWindowConfigurer implements /* (non-Javadoc) * @see org.eclipse.ui.application.IWorkbenchWindowConfigurer */ - public Control createStatusLineControl(Composite parent) { + @Override + public Control createStatusLineControl(Composite parent) { return null; } /* (non-Javadoc) * @see org.eclipse.ui.application.IWorkbenchWindowConfigurer */ - public Control createPageComposite(Composite parent) { + @Override + public Control createPageComposite(Composite parent) { return null; } /* (non-Javadoc) * @see org.eclipse.ui.application.IWorkbenchWindowConfigurer#saveState(org.eclipse.ui.IMemento) */ + @Override public IStatus saveState(IMemento memento) { return null; } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchWindowPropertyTester.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchWindowPropertyTester.java index 990dfbda283..4edb33c86d8 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchWindowPropertyTester.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchWindowPropertyTester.java @@ -30,6 +30,7 @@ public class WorkbenchWindowPropertyTester extends PropertyTester { * @see org.eclipse.core.expressions.IPropertyTester#test(java.lang.Object, * java.lang.String, java.lang.Object[], java.lang.Object) */ + @Override public boolean test(Object receiver, String property, Object[] args, Object expectedValue) { diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbookEditorsHandler.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbookEditorsHandler.java index 91abc84a9f2..f5c40d28371 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbookEditorsHandler.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbookEditorsHandler.java @@ -39,6 +39,7 @@ public class WorkbookEditorsHandler extends AbstractHandler { * * @see org.eclipse.core.commands.IHandler#execute(org.eclipse.core.commands.ExecutionEvent) */ + @Override public Object execute(ExecutionEvent event) throws ExecutionException { MUIElement uiElement = null; diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkingSet.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkingSet.java index ecce2c0cbb5..fe14665cc74 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkingSet.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkingSet.java @@ -88,6 +88,7 @@ public class WorkingSet extends AbstractWorkingSet { * @return true=the object equals the receiver, the name is the same. false * otherwise */ + @Override public boolean equals(Object object) { if (this == object) { return true; @@ -105,6 +106,7 @@ public class WorkingSet extends AbstractWorkingSet { /** * {@inheritDoc} */ + @Override public boolean isEditable() { WorkingSetDescriptor descriptor = getDescriptor(null); return descriptor != null && descriptor.isEditable(); @@ -115,6 +117,7 @@ public class WorkingSet extends AbstractWorkingSet { * * @see org.eclipse.ui.IWorkingSet */ + @Override public String getId() { return editPageId; } @@ -124,6 +127,7 @@ public class WorkingSet extends AbstractWorkingSet { * * @see org.eclipse.ui.IWorkingSet#getImageDescriptor() */ + @Override public ImageDescriptor getImageDescriptor() { WorkingSetDescriptor descriptor = getDescriptor(DEFAULT_ID); if (descriptor == null) { @@ -137,6 +141,7 @@ public class WorkingSet extends AbstractWorkingSet { * * @return the hash code. */ + @Override public int hashCode() { int hashCode = getName().hashCode(); @@ -149,6 +154,7 @@ public class WorkingSet extends AbstractWorkingSet { /** * Recreates the working set elements from the persistence memento. */ + @Override void restoreWorkingSet() { IMemento[] itemMementos = workingSetMemento .getChildren(IWorkbenchConstants.TAG_ITEM); @@ -174,6 +180,7 @@ public class WorkingSet extends AbstractWorkingSet { .run(new SafeRunnable( "Unable to restore working set item - exception while invoking factory: " + factoryID) { //$NON-NLS-1$ + @Override public void run() throws Exception { IAdaptable item = factory .createElement(itemMemento); @@ -198,6 +205,7 @@ public class WorkingSet extends AbstractWorkingSet { * * @see org.eclipse.ui.IPersistableElement#saveState(IMemento) */ + @Override public void saveState(IMemento memento) { if (workingSetMemento != null) { // just re-save the previous memento if the working set has @@ -223,6 +231,7 @@ public class WorkingSet extends AbstractWorkingSet { .run(new SafeRunnable( "Problems occurred while saving persistable item state") { //$NON-NLS-1$ + @Override public void run() throws Exception { persistable.saveState(itemMemento); } @@ -237,6 +246,7 @@ public class WorkingSet extends AbstractWorkingSet { * * @see org.eclipse.ui.IWorkingSet */ + @Override public void setElements(IAdaptable[] newElements) { internalSetElements(newElements); fireWorkingSetChanged( @@ -248,19 +258,23 @@ public class WorkingSet extends AbstractWorkingSet { * * @see org.eclipse.ui.IWorkingSet */ + @Override public void setId(String pageId) { editPageId = pageId; } + @Override public boolean isVisible() { return true; } + @Override public boolean isSelfUpdating() { WorkingSetDescriptor descriptor = getDescriptor(null); return descriptor != null && descriptor.getUpdaterClassName() != null; } + @Override public boolean isAggregateWorkingSet() { return false; } @@ -292,6 +306,7 @@ public class WorkingSet extends AbstractWorkingSet { * * @see org.eclipse.ui.IWorkingSet#adaptElements(org.eclipse.core.runtime.IAdaptable[]) */ + @Override public IAdaptable[] adaptElements(IAdaptable[] objects) { IWorkingSetManager manager = getManager(); if (manager instanceof WorkingSetManager) { diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkingSetComparator.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkingSetComparator.java index 5f5686aa10c..487082b71fb 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkingSetComparator.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkingSetComparator.java @@ -22,6 +22,7 @@ import com.ibm.icu.text.Collator; public class WorkingSetComparator implements Comparator { private static ThreadLocal INSTANCES = new ThreadLocal() { + @Override protected synchronized Object initialValue() { return new WorkingSetComparator(); } @@ -38,7 +39,8 @@ public class WorkingSetComparator implements Comparator { * * @see Comparator#compare(Object, Object) */ - public int compare(Object o1, Object o2) { + @Override + public int compare(Object o1, Object o2) { String name1 = null; String name2 = null; diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkingSetFactory.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkingSetFactory.java index a311c39862e..2cdf153b010 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkingSetFactory.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkingSetFactory.java @@ -23,7 +23,8 @@ public class WorkingSetFactory implements IElementFactory { /* (non-Javadoc) * @see org.eclipse.ui.IElementFactory */ - public IAdaptable createElement(IMemento memento) { + @Override + public IAdaptable createElement(IMemento memento) { String workingSetName = memento.getString(IWorkbenchConstants.TAG_NAME); String label = memento.getString(IWorkbenchConstants.TAG_LABEL); if (label == null) { diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkingSetManager.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkingSetManager.java index f544550d2c2..3322f6ae36b 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkingSetManager.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkingSetManager.java @@ -52,6 +52,7 @@ public class WorkingSetManager extends AbstractWorkingSetManager implements * * @see org.eclipse.ui.IWorkingSetManager */ + @Override public void addRecentWorkingSet(IWorkingSet workingSet) { internalAddRecentWorkingSet(workingSet); saveState(); @@ -62,6 +63,7 @@ public class WorkingSetManager extends AbstractWorkingSetManager implements * * @see org.eclipse.ui.IWorkingSetManager */ + @Override public void addWorkingSet(IWorkingSet workingSet) { super.addWorkingSet(workingSet); saveState(); @@ -87,6 +89,7 @@ public class WorkingSetManager extends AbstractWorkingSetManager implements * * @see org.eclipse.ui.IWorkingSetManager */ + @Override public void removeWorkingSet(IWorkingSet workingSet) { if (internalRemoveWorkingSet(workingSet)) { saveState(); @@ -153,6 +156,7 @@ public class WorkingSetManager extends AbstractWorkingSetManager implements * the changed property. one of CHANGE_WORKING_SET_CONTENT_CHANGE * and CHANGE_WORKING_SET_NAME_CHANGE */ + @Override public void workingSetChanged(IWorkingSet changedWorkingSet, String propertyChangeId, Object oldValue) { saveState(); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkingSetMenuContributionItem.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkingSetMenuContributionItem.java index ddb2255aa98..89cb6f65316 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkingSetMenuContributionItem.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkingSetMenuContributionItem.java @@ -71,12 +71,14 @@ public class WorkingSetMenuContributionItem extends ContributionItem { * * @see org.eclipse.jface.action.ContributionItem#fill(Menu,int) */ - public void fill(Menu menu, int index) { + @Override + public void fill(Menu menu, int index) { MenuItem mi = new MenuItem(menu, SWT.RADIO, index); mi.setText("&" + id + " " + workingSet.getLabel()); //$NON-NLS-1$ //$NON-NLS-2$ mi.setSelection(workingSet.equals(actionGroup.getWorkingSet())); mi.addSelectionListener(new SelectionAdapter() { - public void widgetSelected(SelectionEvent e) { + @Override + public void widgetSelected(SelectionEvent e) { IWorkingSetManager manager = PlatformUI.getWorkbench() .getWorkingSetManager(); actionGroup.setWorkingSet(workingSet); @@ -94,7 +96,8 @@ public class WorkingSetMenuContributionItem extends ContributionItem { /** * Overridden to always return true and force dynamic menu building. */ - public boolean isDynamic() { + @Override + public boolean isDynamic() { return true; } @@ -102,6 +105,7 @@ public class WorkingSetMenuContributionItem extends ContributionItem { * @see org.eclipse.jface.action.ContributionItem#dispose() * @since 3.3 */ + @Override public void dispose() { if (image != null && !image.isDisposed()) image.dispose(); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/about/AboutAction.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/about/AboutAction.java index cd36add7bf8..9f87b1d8fe4 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/about/AboutAction.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/about/AboutAction.java @@ -68,7 +68,8 @@ public class AboutAction extends Action implements /* * (non-Javadoc) Method declared on IAction. */ - public void run() { + @Override + public void run() { // make sure action is not disposed if (workbenchWindow != null) { new AboutDialog(workbenchWindow.getShell()).open(); @@ -78,7 +79,8 @@ public class AboutAction extends Action implements /* * (non-Javadoc) Method declared on ActionFactory.IWorkbenchAction. */ - public void dispose() { + @Override + public void dispose() { workbenchWindow = null; } } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/about/AboutData.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/about/AboutData.java index 52bbc1352f5..47e24cafddc 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/about/AboutData.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/about/AboutData.java @@ -101,6 +101,7 @@ public abstract class AboutData { Arrays.sort(infos, new Comparator<AboutData>() { Collator collator = Collator.getInstance(Locale.getDefault()); + @Override public int compare(AboutData info1, AboutData info2) { String provider1 = info1.getProviderName(); @@ -135,6 +136,7 @@ public abstract class AboutData { Arrays.sort(infos, new Comparator<AboutData>() { Collator collator = Collator.getInstance(Locale.getDefault()); + @Override public int compare(AboutData info1, AboutData info2) { return collator.compare(info1.getName(), info2.getName()); } @@ -162,6 +164,7 @@ public abstract class AboutData { Arrays.sort(infos, new Comparator<AboutData>() { Collator collator = Collator.getInstance(Locale.getDefault()); + @Override public int compare(AboutData info1, AboutData info2) { String version1 = info1.getVersion(); @@ -197,6 +200,7 @@ public abstract class AboutData { Arrays.sort(infos, new Comparator<AboutData>() { Collator collator = Collator.getInstance(Locale.getDefault()); + @Override public int compare(AboutData info1, AboutData info2) { String id1 = info1.getId(); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/about/AboutFeaturesButtonManager.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/about/AboutFeaturesButtonManager.java index b9f22d3138d..ffd55b1d39c 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/about/AboutFeaturesButtonManager.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/about/AboutFeaturesButtonManager.java @@ -36,7 +36,8 @@ public class AboutFeaturesButtonManager { this.crc = crc; } - public boolean equals(Object o) { + @Override + public boolean equals(Object o) { if (!(o instanceof Key)) { return false; } @@ -47,7 +48,8 @@ public class AboutFeaturesButtonManager { return crc.equals(other.crc); } - public int hashCode() { + @Override + public int hashCode() { return providerName.hashCode(); } } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/about/AboutFeaturesPage.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/about/AboutFeaturesPage.java index cc2c57373c0..854f13b9f8a 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/about/AboutFeaturesPage.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/about/AboutFeaturesPage.java @@ -108,6 +108,7 @@ public class AboutFeaturesPage extends ProductInfoPage { this.bundleGroupInfos = bundleGroupInfos; } + @Override String getId() { return ID; } @@ -169,6 +170,7 @@ public class AboutFeaturesPage extends ProductInfoPage { d.open(); } + @Override public void createPageButtons(Composite parent) { moreButton = createButton(parent, MORE_ID, WorkbenchMessages.AboutFeaturesDialog_moreInfo); @@ -182,9 +184,11 @@ public class AboutFeaturesPage extends ProductInfoPage { } } + @Override public void createControl(Composite parent) { initializeDialogUnits(parent); parent.getShell().addDisposeListener(new DisposeListener() { + @Override public void widgetDisposed(DisposeEvent arg0) { disposeImages(); } @@ -269,6 +273,7 @@ public class AboutFeaturesPage extends ProductInfoPage { table.setLinesVisible(true); table.setFont(parent.getFont()); table.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { // If there is no item, nothing we can do. // See https://bugs.eclipse.org/bugs/show_bug.cgi?id=266177 @@ -292,6 +297,7 @@ public class AboutFeaturesPage extends ProductInfoPage { tableColumn.setText(columnTitles[i]); final int columnIndex = i; tableColumn.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { sort(columnIndex); } @@ -523,6 +529,7 @@ public class AboutFeaturesPage extends ProductInfoPage { /* * (non-Javadoc) Method declared on Dialog. */ + @Override protected void buttonPressed(int buttonId) { switch (buttonId) { case MORE_ID: diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/about/AboutHandler.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/about/AboutHandler.java index d5774c5ddde..02b4d534b4b 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/about/AboutHandler.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/about/AboutHandler.java @@ -28,6 +28,7 @@ public class AboutHandler extends AbstractHandler { * * @see org.eclipse.core.commands.IHandler#execute(org.eclipse.core.commands.ExecutionEvent) */ + @Override public Object execute(ExecutionEvent event) throws ExecutionException { new AboutDialog(HandlerUtil.getActiveShellChecked(event)).open(); return null; diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/about/AboutPluginsPage.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/about/AboutPluginsPage.java index 8481fb34276..48310417c6d 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/about/AboutPluginsPage.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/about/AboutPluginsPage.java @@ -102,6 +102,7 @@ public class AboutPluginsPage extends ProductInfoPage { setPriority(Job.SHORT); } + @Override protected IStatus run(IProgressMonitor monitor) { while (true) { // If the UI has not been created, nothing to do. @@ -154,6 +155,7 @@ public class AboutPluginsPage extends ProductInfoPage { * org.eclipse.ui.progress.UIJob#runInUIThread(org.eclipse.core. * runtime.IProgressMonitor) */ + @Override public IStatus runInUIThread(IProgressMonitor monitor) { while (true) { Control page = getControl(); @@ -183,6 +185,7 @@ public class AboutPluginsPage extends ProductInfoPage { * org.eclipse.jface.viewers.ITableLabelProvider#getColumnImage(java * .lang.Object, int) */ + @Override public Image getColumnImage(Object element, int columnIndex) { if (columnIndex == 0) { if (element instanceof AboutBundleData) { @@ -212,6 +215,7 @@ public class AboutPluginsPage extends ProductInfoPage { * org.eclipse.jface.viewers.ITableLabelProvider#getColumnText(java. * lang.Object, int) */ + @Override public String getColumnText(Object element, int columnIndex) { if (element instanceof AboutBundleData) { AboutBundleData data = (AboutBundleData) element; @@ -279,6 +283,7 @@ public class AboutPluginsPage extends ProductInfoPage { this.helpContextId = id; } + @Override public void setMessage(String message) { this.message = message; } @@ -308,6 +313,7 @@ public class AboutPluginsPage extends ProductInfoPage { } } + @Override public void createPageButtons(Composite parent) { moreInfo = createButton(parent, MORE_ID, @@ -322,6 +328,7 @@ public class AboutPluginsPage extends ProductInfoPage { WorkbenchMessages.AboutPluginsDialog_columns); } + @Override public void createControl(Composite parent) { initializeDialogUnits(parent); @@ -381,6 +388,7 @@ public class AboutPluginsPage extends ProductInfoPage { vendorInfo.getTable().setFont(parent.getFont()); vendorInfo.addSelectionChangedListener(new ISelectionChangedListener() { + @Override public void selectionChanged(SelectionChangedEvent event) { checkEnablement(); } @@ -406,6 +414,7 @@ public class AboutPluginsPage extends ProductInfoPage { column.setText(columnTitles[i]); final int columnIndex = i; column.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { updateTableSorting(columnIndex); } @@ -417,6 +426,7 @@ public class AboutPluginsPage extends ProductInfoPage { final BundlePatternFilter searchFilter = new BundlePatternFilter(); filterText.addModifyListener(new ModifyListener() { + @Override public void modifyText(ModifyEvent e) { searchFilter.setPattern(filterText.getText()); vendorInfo.refresh(); @@ -505,6 +515,7 @@ public class AboutPluginsPage extends ProductInfoPage { * * @see org.eclipse.ui.internal.about.ProductInfoPage#getId() */ + @Override String getId() { return ID; } @@ -528,6 +539,7 @@ public class AboutPluginsPage extends ProductInfoPage { } } + @Override protected void buttonPressed(int buttonId) { switch (buttonId) { case MORE_ID: @@ -616,6 +628,7 @@ class TableComparator extends ViewerComparator { * org.eclipse.jface.viewers.ViewerComparator#compare(org.eclipse.jface. * viewers.Viewer, java.lang.Object, java.lang.Object) */ + @Override public int compare(Viewer viewer, Object e1, Object e2) { if (sortColumn == 0 && e1 instanceof AboutBundleData && e2 instanceof AboutBundleData) { diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/about/AboutSystemPage.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/about/AboutSystemPage.java index 6c299b2c2ad..636d7cf12ab 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/about/AboutSystemPage.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/about/AboutSystemPage.java @@ -47,6 +47,7 @@ public final class AboutSystemPage extends ProductInfoPage { private Text text; + @Override public void createControl(Composite parent) { PlatformUI.getWorkbench().getHelpSystem().setHelp(parent, IWorkbenchHelpContextIds.SYSTEM_SUMMARY_DIALOG); @@ -69,6 +70,7 @@ public final class AboutSystemPage extends ProductInfoPage { setControl(outer); } + @Override public void createPageButtons(Composite parent) { Button button = createButton(parent, BROWSE_ERROR_LOG_BUTTON, WorkbenchMessages.AboutSystemDialog_browseErrorLogName); @@ -84,6 +86,7 @@ public final class AboutSystemPage extends ProductInfoPage { * * @see org.eclipse.ui.internal.about.ProductInfoPage#getId() */ + @Override String getId() { return ID; } @@ -113,6 +116,7 @@ public final class AboutSystemPage extends ProductInfoPage { * * @see org.eclipse.jface.dialogs.Dialog#buttonPressed(int) */ + @Override protected void buttonPressed(int buttonId) { switch (buttonId) { case BROWSE_ERROR_LOG_BUTTON: @@ -150,6 +154,7 @@ public final class AboutSystemPage extends ProductInfoPage { text.setText(WorkbenchMessages.AboutSystemPage_RetrievingSystemInfo); WorkbenchJob job = new WorkbenchJob( WorkbenchMessages.AboutSystemPage_FetchJobTitle) { + @Override public IStatus runInUIThread(IProgressMonitor monitor) { String info = ConfigurationInfo.getSystemSummary(); if (!text.isDisposed()) diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/about/AboutTextManager.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/about/AboutTextManager.java index 1e6393e3be2..a5476549be9 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/about/AboutTextManager.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/about/AboutTextManager.java @@ -118,7 +118,8 @@ public class AboutTextManager { handCursor = new Cursor(styledText.getDisplay(), SWT.CURSOR_HAND); busyCursor = new Cursor(styledText.getDisplay(), SWT.CURSOR_WAIT); styledText.addDisposeListener(new DisposeListener() { - public void widgetDisposed(DisposeEvent e) { + @Override + public void widgetDisposed(DisposeEvent e) { handCursor.dispose(); handCursor = null; busyCursor.dispose(); @@ -133,14 +134,16 @@ public class AboutTextManager { */ protected void addListeners() { styledText.addMouseListener(new MouseAdapter() { - public void mouseDown(MouseEvent e) { + @Override + public void mouseDown(MouseEvent e) { if (e.button != 1) { return; } mouseDown = true; } - public void mouseUp(MouseEvent e) { + @Override + public void mouseUp(MouseEvent e) { mouseDown = false; int offset = styledText.getCaretOffset(); if (dragEvent) { @@ -161,7 +164,8 @@ public class AboutTextManager { }); styledText.addMouseMoveListener(new MouseMoveListener() { - public void mouseMove(MouseEvent e) { + @Override + public void mouseMove(MouseEvent e) { // Do not change cursor on drag events if (mouseDown) { if (!dragEvent) { @@ -189,7 +193,8 @@ public class AboutTextManager { }); styledText.addTraverseListener(new TraverseListener() { - public void keyTraversed(TraverseEvent e) { + @Override + public void keyTraversed(TraverseEvent e) { switch (e.detail) { case SWT.TRAVERSE_ESCAPE: e.doit = true; @@ -245,7 +250,8 @@ public class AboutTextManager { //Listen for Tab and Space to allow keyboard navigation styledText.addKeyListener(new KeyAdapter() { - public void keyPressed(KeyEvent event) { + @Override + public void keyPressed(KeyEvent event) { StyledText text = (StyledText) event.widget; if (event.character == ' ' || event.character == SWT.CR) { if (item != null) { diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/about/BundleSigningInfo.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/about/BundleSigningInfo.java index 26fd827c6a2..6eb2fb95701 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/about/BundleSigningInfo.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/about/BundleSigningInfo.java @@ -160,6 +160,7 @@ public class BundleSigningInfo { WorkbenchMessages.BundleSigningTray_Determine_Signer_For, myData.getId())) { + @Override protected IStatus run(IProgressMonitor monitor) { try { if (myData != data) @@ -206,6 +207,7 @@ public class BundleSigningInfo { PlatformUI.getWorkbench().getDisplay().asyncExec( new Runnable() { + @Override public void run() { // check to see if the tray is still visible // and if @@ -235,6 +237,7 @@ public class BundleSigningInfo { Job cleanup = new Job( WorkbenchMessages.BundleSigningTray_Unget_Signing_Service) { + @Override protected IStatus run(IProgressMonitor monitor) { try { getJobManager().join(signerJob, monitor); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/about/ConfigurationLogDefaultSection.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/about/ConfigurationLogDefaultSection.java index d17c969be5e..962d6cf04a3 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/about/ConfigurationLogDefaultSection.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/about/ConfigurationLogDefaultSection.java @@ -50,7 +50,8 @@ public class ConfigurationLogDefaultSection implements ISystemSummarySection { /* (non-Javadoc) * @see org.eclipse.ui.about.ISystemSummarySection#write(java.io.PrintWriter) */ - public void write(PrintWriter writer) { + @Override + public void write(PrintWriter writer) { appendProperties(writer); appendFeatures(writer); appendRegistry(writer); @@ -65,7 +66,8 @@ public class ConfigurationLogDefaultSection implements ISystemSummarySection { writer.println(WorkbenchMessages.SystemSummary_systemProperties); Properties properties = System.getProperties(); SortedSet set = new TreeSet(new Comparator() { - public int compare(Object o1, Object o2) { + @Override + public int compare(Object o1, Object o2) { String s1 = (String) o1; String s2 = (String) o2; return s1.compareTo(s2); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/about/InstallationDialog.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/about/InstallationDialog.java index 90159bede40..4bbcc1b2f1e 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/about/InstallationDialog.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/about/InstallationDialog.java @@ -163,6 +163,7 @@ public class InstallationDialog extends TrayDialog implements * org.eclipse.jface.window.Window#configureShell(org.eclipse.swt.widgets * .Shell) */ + @Override protected void configureShell(Shell newShell) { super.configureShell(newShell); String productName = ""; //$NON-NLS-1$ @@ -178,6 +179,7 @@ public class InstallationDialog extends TrayDialog implements * * @see org.eclipse.jface.dialogs.Dialog#isResizable() */ + @Override protected boolean isResizable() { return true; } @@ -189,6 +191,7 @@ public class InstallationDialog extends TrayDialog implements * org.eclipse.jface.dialogs.Dialog#createDialogArea(org.eclipse.swt.widgets * .Composite) */ + @Override protected Control createDialogArea(Composite parent) { Composite composite = (Composite) super.createDialogArea(parent); @@ -202,6 +205,7 @@ public class InstallationDialog extends TrayDialog implements folder.setLayoutData(folderData); folder.addSelectionListener(createFolderSelectionListener()); folder.addDisposeListener(new DisposeListener() { + @Override public void widgetDisposed(DisposeEvent e) { releaseContributions(); } @@ -227,6 +231,7 @@ public class InstallationDialog extends TrayDialog implements } } + @Override protected Control createContents(Composite parent) { Control control = super.createContents(parent); boolean selected = false; @@ -253,6 +258,7 @@ public class InstallationDialog extends TrayDialog implements private SelectionAdapter createFolderSelectionListener() { return new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { tabSelected((TabItem) e.item); } @@ -285,6 +291,7 @@ public class InstallationDialog extends TrayDialog implements item.setData(page); item.addDisposeListener(new DisposeListener() { + @Override public void widgetDisposed(DisposeEvent e) { page.dispose(); } @@ -330,6 +337,7 @@ public class InstallationDialog extends TrayDialog implements * org.eclipse.jface.dialogs.Dialog#createButtonsForButtonBar(org.eclipse * .swt.widgets.Composite) */ + @Override protected void createButtonsForButtonBar(Composite parent) { // The button manager will handle the correct sizing of the buttons. // We do not want columns equal width because we are going to add some @@ -348,6 +356,7 @@ public class InstallationDialog extends TrayDialog implements return point.getConfigurationElements(); } + @Override protected IDialogSettings getDialogBoundsSettings() { IDialogSettings settings = WorkbenchPlugin.getDefault() .getDialogSettings(); @@ -362,18 +371,21 @@ public class InstallationDialog extends TrayDialog implements buttonManager.clear(); } + @Override public void closeModalContainers() { close(); if (modalParent != null) modalParent.close(); } + @Override protected void buttonPressed(int buttonId) { if (IDialogConstants.CLOSE_ID == buttonId) { okPressed(); } } + @Override public void registerPageButton(InstallationPage page, Button button) { buttonManager.addPageButton(pageToId(page), button); } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/about/InstallationHandler.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/about/InstallationHandler.java index b85c3d21402..0f68d7f8261 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/about/InstallationHandler.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/about/InstallationHandler.java @@ -18,6 +18,7 @@ import org.eclipse.ui.handlers.HandlerUtil; public class InstallationHandler extends AbstractHandler{ + @Override public Object execute(ExecutionEvent event) { IWorkbenchWindow workbenchWindow = HandlerUtil.getActiveWorkbenchWindow(event); if (workbenchWindow == null) diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/about/ProductInfoDialog.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/about/ProductInfoDialog.java index d9fe5276cee..2731b3cc8bd 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/about/ProductInfoDialog.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/about/ProductInfoDialog.java @@ -54,6 +54,7 @@ public abstract class ProductInfoDialog extends InstallationDialog { this.helpContextId = helpContextId; } + @Override protected void createFolderItems(TabFolder folder) { TabItem item = new TabItem(folder, SWT.NONE); item.setText(title); @@ -66,6 +67,7 @@ public abstract class ProductInfoDialog extends InstallationDialog { page.setPageContainer(this); item.addDisposeListener(new DisposeListener() { + @Override public void widgetDisposed(DisposeEvent e) { page.dispose(); } @@ -73,6 +75,7 @@ public abstract class ProductInfoDialog extends InstallationDialog { control.layout(true, true); } + @Override protected void createButtonsForButtonBar(Composite parent) { super.createButtonsForButtonBar(parent); createButtons(page); @@ -85,6 +88,7 @@ public abstract class ProductInfoDialog extends InstallationDialog { * org.eclipse.jface.window.Window#configureShell(org.eclipse.swt.widgets * .Shell) */ + @Override protected void configureShell(Shell newShell) { super.configureShell(newShell); newShell.setText(title); @@ -93,6 +97,7 @@ public abstract class ProductInfoDialog extends InstallationDialog { helpContextId); } + @Override protected String pageToId(InstallationPage page) { Assert.isLegal(page == this.page); return this.page.getId(); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/actions/AbstractWorkingSetPulldownDelegate.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/actions/AbstractWorkingSetPulldownDelegate.java index c3a20f129f8..3ab8ebee560 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/actions/AbstractWorkingSetPulldownDelegate.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/actions/AbstractWorkingSetPulldownDelegate.java @@ -55,6 +55,7 @@ public abstract class AbstractWorkingSetPulldownDelegate implements super(); } + @Override public void dispose() { if (menubarMenu != null) { menubarMenu.dispose(); @@ -66,6 +67,7 @@ public abstract class AbstractWorkingSetPulldownDelegate implements } } + @Override public Menu getMenu(Control parent) { if (toolbarMenu != null) { toolbarMenu.dispose(); @@ -75,6 +77,7 @@ public abstract class AbstractWorkingSetPulldownDelegate implements return toolbarMenu; } + @Override public Menu getMenu(Menu parent) { if (menubarMenu != null) { menubarMenu.dispose(); @@ -89,6 +92,7 @@ public abstract class AbstractWorkingSetPulldownDelegate implements */ private void initMenu(Menu menu) { menu.addMenuListener(new MenuAdapter() { + @Override public void menuShown(MenuEvent e) { Menu m = (Menu) e.widget; MenuItem[] items = m.getItems(); @@ -144,6 +148,7 @@ public abstract class AbstractWorkingSetPulldownDelegate implements return typedSets; } + @Override public void init(IWorkbenchWindow window) { this.window = window; } @@ -152,6 +157,7 @@ public abstract class AbstractWorkingSetPulldownDelegate implements return window; } + @Override public void selectionChanged(IAction action, ISelection selection) { this.selection = selection; } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/actions/ClearWorkingSetAction.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/actions/ClearWorkingSetAction.java index e60bb757935..5855e9e685e 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/actions/ClearWorkingSetAction.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/actions/ClearWorkingSetAction.java @@ -46,7 +46,8 @@ public class ClearWorkingSetAction extends Action { * * @see Action#run */ - public void run() { + @Override + public void run() { actionGroup.setWorkingSet(null); } } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/actions/CommandAction.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/actions/CommandAction.java index f0cb1b62c08..681092f6cfe 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/actions/CommandAction.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/actions/CommandAction.java @@ -89,6 +89,7 @@ public class CommandAction extends Action { protected ICommandListener getCommandListener() { if (commandListener == null) { commandListener = new ICommandListener() { + @Override public void commandChanged(CommandEvent commandEvent) { if (commandEvent.isHandledChanged() || commandEvent.isEnabledChanged()) { @@ -144,6 +145,7 @@ public class CommandAction extends Action { * * @see org.eclipse.jface.action.Action#runWithEvent(org.eclipse.swt.widgets.Event) */ + @Override public void runWithEvent(Event event) { if (handlerService == null) { String commandId = (parameterizedCommand == null ? "unknownCommand" //$NON-NLS-1$ @@ -166,6 +168,7 @@ public class CommandAction extends Action { * * @see org.eclipse.jface.action.Action#run() */ + @Override public void run() { // hopefully this is never called runWithEvent(null); @@ -211,6 +214,7 @@ public class CommandAction extends Action { return parameterizedCommand; } + @Override public String getActionDefinitionId() { return super.getActionDefinitionId(); } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/actions/DynamicHelpAction.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/actions/DynamicHelpAction.java index 9eefcf457a5..fb5663ae5bf 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/actions/DynamicHelpAction.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/actions/DynamicHelpAction.java @@ -82,6 +82,7 @@ public class DynamicHelpAction extends Action implements IWorkbenchAction { /* * (non-Javadoc) Method declared on IAction. */ + @Override public void run() { if (workbenchWindow == null) { // action has been disposed @@ -89,6 +90,7 @@ public class DynamicHelpAction extends Action implements IWorkbenchAction { } // This may take a while, so use the busy indicator BusyIndicator.showWhile(null, new Runnable() { + @Override public void run() { workbenchWindow.getWorkbench().getHelpSystem() .displayDynamicHelp(); @@ -99,6 +101,7 @@ public class DynamicHelpAction extends Action implements IWorkbenchAction { /* * (non-Javadoc) Method declared on ActionFactory.IWorkbenchAction. */ + @Override public void dispose() { workbenchWindow = null; } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/actions/EditWorkingSetAction.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/actions/EditWorkingSetAction.java index 88b5b2dc956..e12cd800899 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/actions/EditWorkingSetAction.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/actions/EditWorkingSetAction.java @@ -58,7 +58,8 @@ public class EditWorkingSetAction extends Action { * * @see Action#run */ - public void run() { + @Override + public void run() { IWorkingSetManager manager = PlatformUI.getWorkbench() .getWorkingSetManager(); IWorkingSet workingSet = actionGroup.getWorkingSet(); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/actions/HelpContentsAction.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/actions/HelpContentsAction.java index cbef11277a8..29588de8082 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/actions/HelpContentsAction.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/actions/HelpContentsAction.java @@ -73,14 +73,16 @@ public class HelpContentsAction extends Action implements IWorkbenchAction { /* (non-Javadoc) * Method declared on IAction. */ - public void run() { + @Override + public void run() { if (workbenchWindow == null) { // action has been disposed return; } //This may take a while, so use the busy indicator BusyIndicator.showWhile(null, new Runnable() { - public void run() { + @Override + public void run() { workbenchWindow.getWorkbench().getHelpSystem().displayHelp(); } }); @@ -89,7 +91,8 @@ public class HelpContentsAction extends Action implements IWorkbenchAction { /* (non-Javadoc) * Method declared on ActionFactory.IWorkbenchAction. */ - public void dispose() { + @Override + public void dispose() { workbenchWindow = null; } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/actions/HelpSearchAction.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/actions/HelpSearchAction.java index b1a7006cdf5..a4bda4c52ac 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/actions/HelpSearchAction.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/actions/HelpSearchAction.java @@ -73,14 +73,16 @@ public class HelpSearchAction extends Action implements IWorkbenchAction { /* (non-Javadoc) * Method declared on IAction. */ - public void run() { + @Override + public void run() { if (workbenchWindow == null) { // action has been disposed return; } //This may take a while, so use the busy indicator BusyIndicator.showWhile(null, new Runnable() { - public void run() { + @Override + public void run() { workbenchWindow.getWorkbench().getHelpSystem().displaySearch(); } }); @@ -89,7 +91,8 @@ public class HelpSearchAction extends Action implements IWorkbenchAction { /* (non-Javadoc) * Method declared on ActionFactory.IWorkbenchAction. */ - public void dispose() { + @Override + public void dispose() { workbenchWindow = null; } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/actions/HelpSearchContributionItem.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/actions/HelpSearchContributionItem.java index 7a37a455455..6adbd078cf3 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/actions/HelpSearchContributionItem.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/actions/HelpSearchContributionItem.java @@ -63,6 +63,7 @@ public class HelpSearchContributionItem extends ControlContribution { /* (non-Javadoc) * @see org.eclipse.jface.action.ControlContribution#createControl(org.eclipse.swt.widgets.Composite) */ + @Override protected Control createControl(Composite parent) { combo = new Combo(parent, SWT.NONE); combo.setToolTipText(WorkbenchMessages.WorkbenchWindow_searchCombo_toolTip); @@ -73,6 +74,7 @@ public class HelpSearchContributionItem extends ControlContribution { } combo.setText(WorkbenchMessages.WorkbenchWindow_searchCombo_text); combo.addKeyListener(new KeyAdapter() { + @Override public void keyReleased(KeyEvent e) { if (e.character == SWT.CR) { doSearch(combo.getText(), true); @@ -80,6 +82,7 @@ public class HelpSearchContributionItem extends ControlContribution { } }); combo.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { int index = combo.getSelectionIndex(); if (index != -1) { @@ -93,6 +96,7 @@ public class HelpSearchContributionItem extends ControlContribution { /* (non-Javadoc) * @see org.eclipse.jface.action.ControlContribution#computeWidth(org.eclipse.swt.widgets.Control) */ + @Override protected int computeWidth(Control control) { return control.computeSize(SWT.DEFAULT, SWT.DEFAULT, true).x; } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/actions/ModifyWorkingSetDelegate.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/actions/ModifyWorkingSetDelegate.java index 950e3100c63..1114191f9cf 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/actions/ModifyWorkingSetDelegate.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/actions/ModifyWorkingSetDelegate.java @@ -64,6 +64,7 @@ public class ModifyWorkingSetDelegate extends super(WorkbenchMessages.NewWorkingSet); } + @Override public void run() { IWorkingSetManager manager = WorkbenchPlugin.getDefault() .getWorkingSetManager(); @@ -105,6 +106,7 @@ public class ModifyWorkingSetDelegate extends setImageDescriptor(set.getImageDescriptor()); } + @Override public void run() { Collection oldElements = Arrays.asList(set.getElements()); @@ -123,6 +125,7 @@ public class ModifyWorkingSetDelegate extends } private QuickMenuCreator contextMenuCreator = new QuickMenuCreator() { + @Override protected void fillMenu(IMenuManager menu) { ModifyWorkingSetDelegate.this.fillMenu(menu); } @@ -132,6 +135,7 @@ public class ModifyWorkingSetDelegate extends private IPropertyChangeListener listener = new IPropertyChangeListener() { + @Override public void propertyChange(PropertyChangeEvent event) { refreshEnablement(); } @@ -157,6 +161,7 @@ public class ModifyWorkingSetDelegate extends * * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction) */ + @Override public void run(IAction action) { contextMenuCreator.createMenu(); } @@ -164,6 +169,7 @@ public class ModifyWorkingSetDelegate extends /* (non-Javadoc) * @see org.eclipse.ui.IActionDelegate2#runWithEvent(org.eclipse.jface.action.IAction, org.eclipse.swt.widgets.Event) */ + @Override public void runWithEvent(IAction action, Event event) { if (event.type == SWT.KeyDown || event.type == SWT.KeyUp) run(action); @@ -174,6 +180,7 @@ public class ModifyWorkingSetDelegate extends * * @see org.eclipse.ui.internal.actions.AbstractWorkingSetPulldownDelegate#init(org.eclipse.ui.IWorkbenchWindow) */ + @Override public void init(IWorkbenchWindow window) { super.init(window); getWindow().getWorkbench().getWorkingSetManager() @@ -185,6 +192,7 @@ public class ModifyWorkingSetDelegate extends * * @see org.eclipse.ui.internal.actions.AbstractWorkingSetPulldownDelegate#dispose() */ + @Override public void dispose() { getWindow().getWorkbench().getWorkingSetManager() .removePropertyChangeListener(listener); @@ -192,6 +200,7 @@ public class ModifyWorkingSetDelegate extends contextMenuCreator.dispose(); } + @Override public void fillMenu(Menu menu) { List menuItems = getItems(); for (int i = 0; i < menuItems.size(); i++) { @@ -322,6 +331,7 @@ public class ModifyWorkingSetDelegate extends * @see org.eclipse.ui.internal.actions.AbstractWorkingSetPulldownDelegate#selectionChanged(org.eclipse.jface.action.IAction, * org.eclipse.jface.viewers.ISelection) */ + @Override public void selectionChanged(IAction actionProxy, ISelection selection) { super.selectionChanged(actionProxy, selection); if (selection instanceof IStructuredSelection) { @@ -349,6 +359,7 @@ public class ModifyWorkingSetDelegate extends * @see org.eclipse.core.runtime.IExecutableExtension#setInitializationData(org.eclipse.core.runtime.IConfigurationElement, * java.lang.String, java.lang.Object) */ + @Override public void setInitializationData(IConfigurationElement config, String propertyName, Object data) { if (data instanceof String) { @@ -359,6 +370,7 @@ public class ModifyWorkingSetDelegate extends /* (non-Javadoc) * @see org.eclipse.ui.IActionDelegate2#init(org.eclipse.jface.action.IAction) */ + @Override public void init(IAction action) { this.actionProxy = action; } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/actions/NewWizardShortcutAction.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/actions/NewWizardShortcutAction.java index 6fe45b67876..d8f8d7f38e5 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/actions/NewWizardShortcutAction.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/actions/NewWizardShortcutAction.java @@ -79,7 +79,8 @@ public class NewWizardShortcutAction extends Action implements /* (non-Javadoc) * @see org.eclipse.jface.action.IAction#run() */ - public void run() { + @Override + public void run() { // create instance of target wizard INewWizard wizard; @@ -139,7 +140,8 @@ public class NewWizardShortcutAction extends Action implements /* (non-Javadoc) * @see org.eclipse.ui.IPluginContribution#getLocalId() */ - public String getLocalId() { + @Override + public String getLocalId() { IPluginContribution contribution = getPluginContribution(); if (contribution != null) { return contribution.getLocalId(); @@ -150,7 +152,8 @@ public class NewWizardShortcutAction extends Action implements /* (non-Javadoc) * @see org.eclipse.ui.IPluginContribution#getPluginId() */ - public String getPluginId() { + @Override + public String getPluginId() { IPluginContribution contribution = getPluginContribution(); if (contribution != null) { return contribution.getPluginId(); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/actions/SelectWorkingSetAction.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/actions/SelectWorkingSetAction.java index fd484fc5604..17e9551aa00 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/actions/SelectWorkingSetAction.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/actions/SelectWorkingSetAction.java @@ -57,7 +57,8 @@ public class SelectWorkingSetAction extends Action { * * @see Action#run() */ - public void run() { + @Override + public void run() { IWorkingSetManager manager = PlatformUI.getWorkbench() .getWorkingSetManager(); IWorkingSetSelectionDialog dialog = manager diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/actions/SelectWorkingSetsAction.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/actions/SelectWorkingSetsAction.java index e943a73533a..d483c176734 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/actions/SelectWorkingSetsAction.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/actions/SelectWorkingSetsAction.java @@ -41,6 +41,7 @@ public class SelectWorkingSetsAction extends AbstractWorkingSetPulldownDelegate super(WorkbenchMessages.Edit); } + @Override public void run() { SelectWorkingSetsAction.this.run(this); } @@ -56,6 +57,7 @@ public class SelectWorkingSetsAction extends AbstractWorkingSetPulldownDelegate setChecked(isWorkingSetEnabled(set)); } + @Override public void runWithEvent(Event event) { Set newList = new HashSet(Arrays.asList(getWindow().getActivePage() @@ -81,6 +83,7 @@ public class SelectWorkingSetsAction extends AbstractWorkingSetPulldownDelegate } } + @Override protected void fillMenu(Menu menu) { IWorkingSet[][] typedSets = splitSets(); @@ -120,6 +123,7 @@ public class SelectWorkingSetsAction extends AbstractWorkingSetPulldownDelegate return false; } + @Override public void run(IAction action) { ConfigureWindowWorkingSetsDialog dialog = new ConfigureWindowWorkingSetsDialog( getWindow()); @@ -141,6 +145,7 @@ class ConfigureWindowWorkingSetsDialog extends SimpleWorkingSetSelectionDialog { setMessage(WorkbenchMessages.WorkingSetSelectionDialog_message_multiSelect); } + @Override protected void okPressed() { super.okPressed(); window.getActivePage().setWorkingSets(getSelection()); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/activities/AbstractActivityManager.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/activities/AbstractActivityManager.java index f7ef9b4599e..2cb449410b7 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/activities/AbstractActivityManager.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/activities/AbstractActivityManager.java @@ -22,7 +22,8 @@ public abstract class AbstractActivityManager implements IActivityManager { protected AbstractActivityManager() { } - public void addActivityManagerListener( + @Override + public void addActivityManagerListener( IActivityManagerListener activityManagerListener) { if (activityManagerListener == null) { throw new NullPointerException(); @@ -50,7 +51,8 @@ public abstract class AbstractActivityManager implements IActivityManager { } } - public void removeActivityManagerListener( + @Override + public void removeActivityManagerListener( IActivityManagerListener activityManagerListener) { if (activityManagerListener == null) { throw new NullPointerException(); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/activities/AbstractActivityRegistry.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/activities/AbstractActivityRegistry.java index b62d0ebbd80..64b8185be09 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/activities/AbstractActivityRegistry.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/activities/AbstractActivityRegistry.java @@ -35,7 +35,8 @@ public abstract class AbstractActivityRegistry implements IActivityRegistry { protected AbstractActivityRegistry() { } - public void addActivityRegistryListener( + @Override + public void addActivityRegistryListener( IActivityRegistryListener activityRegistryListener) { if (activityRegistryListener == null) { throw new NullPointerException(); @@ -63,27 +64,33 @@ public abstract class AbstractActivityRegistry implements IActivityRegistry { } } - public List getActivityRequirementBindingDefinitions() { + @Override + public List getActivityRequirementBindingDefinitions() { return activityRequirementBindingDefinitions; } - public List getActivityDefinitions() { + @Override + public List getActivityDefinitions() { return activityDefinitions; } - public List getActivityPatternBindingDefinitions() { + @Override + public List getActivityPatternBindingDefinitions() { return activityPatternBindingDefinitions; } - public List getCategoryActivityBindingDefinitions() { + @Override + public List getCategoryActivityBindingDefinitions() { return categoryActivityBindingDefinitions; } - public List getCategoryDefinitions() { + @Override + public List getCategoryDefinitions() { return categoryDefinitions; } - public void removeActivityRegistryListener( + @Override + public void removeActivityRegistryListener( IActivityRegistryListener activityRegistryListener) { if (activityRegistryListener == null) { throw new NullPointerException(); @@ -94,7 +101,8 @@ public abstract class AbstractActivityRegistry implements IActivityRegistry { } } - public List getDefaultEnabledActivities() { + @Override + public List getDefaultEnabledActivities() { return defaultEnabledActivities; } } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/activities/Activity.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/activities/Activity.java index dc3d7fa0bb9..d2fec500190 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/activities/Activity.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/activities/Activity.java @@ -69,7 +69,8 @@ final class Activity implements IActivity { this.id = id; } - public void addActivityListener(IActivityListener activityListener) { + @Override + public void addActivityListener(IActivityListener activityListener) { if (activityListener == null) { throw new NullPointerException(); } @@ -85,7 +86,8 @@ final class Activity implements IActivity { strongReferences.add(this); } - public int compareTo(Object object) { + @Override + public int compareTo(Object object) { Activity castedObject = (Activity) object; int compareTo = Util.compare( @@ -117,7 +119,8 @@ final class Activity implements IActivity { return compareTo; } - public boolean equals(Object object) { + @Override + public boolean equals(Object object) { if (!(object instanceof Activity)) { return false; } @@ -162,19 +165,23 @@ final class Activity implements IActivity { } } - public Set getActivityRequirementBindings() { + @Override + public Set getActivityRequirementBindings() { return activityRequirementBindings; } - public Set getActivityPatternBindings() { + @Override + public Set getActivityPatternBindings() { return activityPatternBindings; } - public String getId() { + @Override + public String getId() { return id; } - public String getName() throws NotDefinedException { + @Override + public String getName() throws NotDefinedException { if (!defined) { throw new NotDefinedException(); } @@ -182,11 +189,13 @@ final class Activity implements IActivity { return name; } - public Expression getExpression() { + @Override + public Expression getExpression() { return expression; } - public int hashCode() { + @Override + public int hashCode() { if (hashCode == HASH_INITIAL) { hashCode = hashCode * HASH_FACTOR + Util.hashCode(activityRequirementBindings); @@ -204,11 +213,13 @@ final class Activity implements IActivity { return hashCode; } - public boolean isDefined() { + @Override + public boolean isDefined() { return defined; } - public boolean isEnabled() { + @Override + public boolean isEnabled() { return enabled; } @@ -228,7 +239,8 @@ final class Activity implements IActivity { return false; } - public void removeActivityListener(IActivityListener activityListener) { + @Override + public void removeActivityListener(IActivityListener activityListener) { if (activityListener == null) { throw new NullPointerException(); } @@ -325,7 +337,8 @@ final class Activity implements IActivity { return false; } - public String toString() { + @Override + public String toString() { if (string == null) { final StringBuffer stringBuffer = new StringBuffer(); stringBuffer.append('['); @@ -350,7 +363,8 @@ final class Activity implements IActivity { /* (non-Javadoc) * @see org.eclipse.ui.activities.IActivity#getDescription() */ - public String getDescription() throws NotDefinedException { + @Override + public String getDescription() throws NotDefinedException { if (!defined) { throw new NotDefinedException(); } @@ -361,7 +375,8 @@ final class Activity implements IActivity { /* (non-Javadoc) * @see org.eclipse.ui.activities.IActivity#isDefaultEnabled() */ - public boolean isDefaultEnabled() { + @Override + public boolean isDefaultEnabled() { return defaultEnabled; } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/activities/ActivityDefinition.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/activities/ActivityDefinition.java index 923fd90ce78..6b5ccaee7ad 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/activities/ActivityDefinition.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/activities/ActivityDefinition.java @@ -101,7 +101,8 @@ public final class ActivityDefinition implements Comparable { this.description = description; } - public int compareTo(Object object) { + @Override + public int compareTo(Object object) { ActivityDefinition castedObject = (ActivityDefinition) object; int compareTo = Util.compare(id, castedObject.id); @@ -116,7 +117,8 @@ public final class ActivityDefinition implements Comparable { return compareTo; } - public boolean equals(Object object) { + @Override + public boolean equals(Object object) { if (!(object instanceof ActivityDefinition)) { return false; } @@ -145,7 +147,8 @@ public final class ActivityDefinition implements Comparable { return sourceId; } - public int hashCode() { + @Override + public int hashCode() { if (hashCode == HASH_INITIAL) { hashCode = hashCode * HASH_FACTOR + Util.hashCode(id); hashCode = hashCode * HASH_FACTOR + Util.hashCode(name); @@ -158,7 +161,8 @@ public final class ActivityDefinition implements Comparable { return hashCode; } - public String toString() { + @Override + public String toString() { if (string == null) { final StringBuffer stringBuffer = new StringBuffer(); stringBuffer.append('['); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/activities/ActivityPatternBinding.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/activities/ActivityPatternBinding.java index 2b1138c31c2..f800750ccf5 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/activities/ActivityPatternBinding.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/activities/ActivityPatternBinding.java @@ -78,7 +78,8 @@ public final class ActivityPatternBinding implements IActivityPatternBinding { this.patternString = null; } - public int compareTo(Object object) { + @Override + public int compareTo(Object object) { ActivityPatternBinding castedObject = (ActivityPatternBinding) object; int compareTo = Util.compare(activityId, castedObject.activityId); @@ -94,7 +95,8 @@ public final class ActivityPatternBinding implements IActivityPatternBinding { return compareTo; } - public boolean equals(Object object) { + @Override + public boolean equals(Object object) { if (!(object instanceof ActivityPatternBinding)) { return false; } @@ -111,7 +113,8 @@ public final class ActivityPatternBinding implements IActivityPatternBinding { return Util.equals(getPattern(), castedObject.getPattern()); } - public String getActivityId() { + @Override + public String getActivityId() { return activityId; } @@ -120,7 +123,8 @@ public final class ActivityPatternBinding implements IActivityPatternBinding { * * @see org.eclipse.ui.activities.IActivityPatternBinding#getPattern() */ - public Pattern getPattern() { + @Override + public Pattern getPattern() { if (pattern == null) { pattern = Pattern.compile(PatternUtil.quotePattern(patternString)); } @@ -131,7 +135,8 @@ public final class ActivityPatternBinding implements IActivityPatternBinding { * (non-Javadoc) * @see org.eclipse.ui.activities.IActivityPatternBinding#getString() */ - public String getString() { + @Override + public String getString() { if (isEqualityPattern) { return patternString; } @@ -141,12 +146,14 @@ public final class ActivityPatternBinding implements IActivityPatternBinding { /* (non-Javadoc) * @see org.eclipse.ui.activities.IActivityPatternBinding#isEqualityPattern() */ + @Override public boolean isEqualityPattern() { return isEqualityPattern; } - public int hashCode() { + @Override + public int hashCode() { if (hashCode == HASH_INITIAL) { hashCode = hashCode * HASH_FACTOR + Util.hashCode(activityId); hashCode = hashCode * HASH_FACTOR + Util.hashCode(pattern); @@ -158,7 +165,8 @@ public final class ActivityPatternBinding implements IActivityPatternBinding { return hashCode; } - public String toString() { + @Override + public String toString() { if (string == null) { final StringBuffer stringBuffer = new StringBuffer(); stringBuffer.append('['); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/activities/ActivityPatternBindingDefinition.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/activities/ActivityPatternBindingDefinition.java index ff84c8e197c..f7b2660fc5c 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/activities/ActivityPatternBindingDefinition.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/activities/ActivityPatternBindingDefinition.java @@ -105,7 +105,8 @@ public final class ActivityPatternBindingDefinition { return compareTo; } - public boolean equals(Object object) { + @Override + public boolean equals(Object object) { if (!(object instanceof ActivityPatternBindingDefinition)) { return false; } @@ -142,7 +143,8 @@ public final class ActivityPatternBindingDefinition { return isEqualityPattern; } - public int hashCode() { + @Override + public int hashCode() { if (hashCode == HASH_INITIAL) { hashCode = hashCode * HASH_FACTOR + Util.hashCode(activityId); hashCode = hashCode * HASH_FACTOR + Util.hashCode(pattern); @@ -155,7 +157,8 @@ public final class ActivityPatternBindingDefinition { return hashCode; } - public String toString() { + @Override + public String toString() { if (string == null) { final StringBuffer stringBuffer = new StringBuffer(); stringBuffer.append('['); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/activities/ActivityPropertyTester.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/activities/ActivityPropertyTester.java index b579984c40c..53f0d09d944 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/activities/ActivityPropertyTester.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/activities/ActivityPropertyTester.java @@ -34,6 +34,7 @@ public class ActivityPropertyTester extends PropertyTester { * @see org.eclipse.core.expressions.PropertyTester#test(java.lang.Object, * java.lang.String, java.lang.Object[], java.lang.Object) */ + @Override public boolean test(Object receiver, String property, Object[] args, Object expectedValue) { if (args.length == 1 && receiver instanceof IWorkbench && args[0] instanceof String) { diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/activities/ActivityRequirementBinding.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/activities/ActivityRequirementBinding.java index 358253883f1..b98d828f06e 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/activities/ActivityRequirementBinding.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/activities/ActivityRequirementBinding.java @@ -39,7 +39,8 @@ public final class ActivityRequirementBinding implements this.activityId = activityId; } - public int compareTo(Object object) { + @Override + public int compareTo(Object object) { ActivityRequirementBinding castedObject = (ActivityRequirementBinding) object; int compareTo = Util.compare(requiredActivityId, castedObject.requiredActivityId); @@ -51,7 +52,8 @@ public final class ActivityRequirementBinding implements return compareTo; } - public boolean equals(Object object) { + @Override + public boolean equals(Object object) { if (!(object instanceof ActivityRequirementBinding)) { return false; } @@ -64,15 +66,18 @@ public final class ActivityRequirementBinding implements return Util.equals(activityId, castedObject.activityId); } - public String getRequiredActivityId() { + @Override + public String getRequiredActivityId() { return requiredActivityId; } - public String getActivityId() { + @Override + public String getActivityId() { return activityId; } - public int hashCode() { + @Override + public int hashCode() { if (hashCode == HASH_INITIAL) { hashCode = hashCode * HASH_FACTOR + Util.hashCode(requiredActivityId); @@ -85,7 +90,8 @@ public final class ActivityRequirementBinding implements return hashCode; } - public String toString() { + @Override + public String toString() { if (string == null) { final StringBuffer stringBuffer = new StringBuffer(); stringBuffer.append('['); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/activities/ActivityRequirementBindingDefinition.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/activities/ActivityRequirementBindingDefinition.java index 4d02c591d1f..3ab12f6a3db 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/activities/ActivityRequirementBindingDefinition.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/activities/ActivityRequirementBindingDefinition.java @@ -93,7 +93,8 @@ public final class ActivityRequirementBindingDefinition { return compareTo; } - public boolean equals(Object object) { + @Override + public boolean equals(Object object) { if (!(object instanceof ActivityRequirementBindingDefinition)) { return false; } @@ -123,7 +124,8 @@ public final class ActivityRequirementBindingDefinition { return sourceId; } - public int hashCode() { + @Override + public int hashCode() { if (hashCode == HASH_INITIAL) { hashCode = hashCode * HASH_FACTOR + Util.hashCode(requiredActivityId); @@ -137,7 +139,8 @@ public final class ActivityRequirementBindingDefinition { return hashCode; } - public String toString() { + @Override + public String toString() { if (string == null) { final StringBuffer stringBuffer = new StringBuffer(); stringBuffer.append('['); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/activities/Category.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/activities/Category.java index 2477d47ab84..ddd7888f897 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/activities/Category.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/activities/Category.java @@ -56,7 +56,8 @@ final class Category implements ICategory { this.id = id; } - public void addCategoryListener(ICategoryListener categoryListener) { + @Override + public void addCategoryListener(ICategoryListener categoryListener) { if (categoryListener == null) { throw new NullPointerException(); } @@ -72,7 +73,8 @@ final class Category implements ICategory { strongReferences.add(this); } - public int compareTo(Object object) { + @Override + public int compareTo(Object object) { Category castedObject = (Category) object; int compareTo = Util.compare( categoryActivityBindingsAsArray, @@ -93,7 +95,8 @@ final class Category implements ICategory { return compareTo; } - public boolean equals(Object object) { + @Override + public boolean equals(Object object) { if (!(object instanceof Category)) { return false; } @@ -128,15 +131,18 @@ final class Category implements ICategory { } } - public Set getCategoryActivityBindings() { + @Override + public Set getCategoryActivityBindings() { return categoryActivityBindings; } - public String getId() { + @Override + public String getId() { return id; } - public String getName() throws NotDefinedException { + @Override + public String getName() throws NotDefinedException { if (!defined) { throw new NotDefinedException(); } @@ -144,7 +150,8 @@ final class Category implements ICategory { return name; } - public int hashCode() { + @Override + public int hashCode() { if (hashCode == HASH_INITIAL) { hashCode = hashCode * HASH_FACTOR + Util.hashCode(categoryActivityBindings); @@ -159,11 +166,13 @@ final class Category implements ICategory { return hashCode; } - public boolean isDefined() { + @Override + public boolean isDefined() { return defined; } - public void removeCategoryListener(ICategoryListener categoryListener) { + @Override + public void removeCategoryListener(ICategoryListener categoryListener) { if (categoryListener == null) { throw new NullPointerException(); } @@ -217,7 +226,8 @@ final class Category implements ICategory { return false; } - public String toString() { + @Override + public String toString() { if (string == null) { final StringBuffer stringBuffer = new StringBuffer(); stringBuffer.append('['); @@ -238,7 +248,8 @@ final class Category implements ICategory { /* (non-Javadoc) * @see org.eclipse.ui.activities.ICategory#getDescription() */ - public String getDescription() throws NotDefinedException { + @Override + public String getDescription() throws NotDefinedException { if (!defined) { throw new NotDefinedException(); } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/activities/CategoryActivityBinding.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/activities/CategoryActivityBinding.java index 3ec6e8fd59e..6f650317df9 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/activities/CategoryActivityBinding.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/activities/CategoryActivityBinding.java @@ -37,7 +37,8 @@ public final class CategoryActivityBinding implements ICategoryActivityBinding { this.categoryId = categoryId; } - public int compareTo(Object object) { + @Override + public int compareTo(Object object) { CategoryActivityBinding castedObject = (CategoryActivityBinding) object; int compareTo = Util.compare(activityId, castedObject.activityId); @@ -48,7 +49,8 @@ public final class CategoryActivityBinding implements ICategoryActivityBinding { return compareTo; } - public boolean equals(Object object) { + @Override + public boolean equals(Object object) { if (!(object instanceof CategoryActivityBinding)) { return false; } @@ -61,15 +63,18 @@ public final class CategoryActivityBinding implements ICategoryActivityBinding { return Util.equals(categoryId, castedObject.categoryId); } - public String getActivityId() { + @Override + public String getActivityId() { return activityId; } - public String getCategoryId() { + @Override + public String getCategoryId() { return categoryId; } - public int hashCode() { + @Override + public int hashCode() { if (hashCode == HASH_INITIAL){ hashCode = hashCode * HASH_FACTOR + Util.hashCode(activityId); hashCode = hashCode * HASH_FACTOR + Util.hashCode(categoryId); @@ -81,7 +86,8 @@ public final class CategoryActivityBinding implements ICategoryActivityBinding { return hashCode; } - public String toString() { + @Override + public String toString() { if (string == null) { final StringBuffer stringBuffer = new StringBuffer(); stringBuffer.append('['); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/activities/CategoryActivityBindingDefinition.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/activities/CategoryActivityBindingDefinition.java index ae43135ad44..72d27d2f88a 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/activities/CategoryActivityBindingDefinition.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/activities/CategoryActivityBindingDefinition.java @@ -92,7 +92,8 @@ public final class CategoryActivityBindingDefinition { return compareTo; } - public boolean equals(Object object) { + @Override + public boolean equals(Object object) { if (!(object instanceof CategoryActivityBindingDefinition)) { return false; } @@ -121,7 +122,8 @@ public final class CategoryActivityBindingDefinition { return sourceId; } - public int hashCode() { + @Override + public int hashCode() { if (hashCode == HASH_INITIAL) { hashCode = hashCode * HASH_FACTOR + Util.hashCode(activityId); hashCode = hashCode * HASH_FACTOR + Util.hashCode(categoryId); @@ -134,7 +136,8 @@ public final class CategoryActivityBindingDefinition { return hashCode; } - public String toString() { + @Override + public String toString() { if (string == null) { final StringBuffer stringBuffer = new StringBuffer(); stringBuffer.append('['); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/activities/CategoryDefinition.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/activities/CategoryDefinition.java index 2687bc55eab..7807a9bf9f4 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/activities/CategoryDefinition.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/activities/CategoryDefinition.java @@ -98,7 +98,8 @@ public final class CategoryDefinition implements Comparable { this.description = description; } - public int compareTo(Object object) { + @Override + public int compareTo(Object object) { CategoryDefinition castedObject = (CategoryDefinition) object; int compareTo = Util.compare(id, castedObject.id); @@ -113,7 +114,8 @@ public final class CategoryDefinition implements Comparable { return compareTo; } - public boolean equals(Object object) { + @Override + public boolean equals(Object object) { if (!(object instanceof CategoryDefinition)) { return false; } @@ -142,7 +144,8 @@ public final class CategoryDefinition implements Comparable { return sourceId; } - public int hashCode() { + @Override + public int hashCode() { if (hashCode == HASH_INITIAL) { hashCode = hashCode * HASH_FACTOR + Util.hashCode(id); hashCode = hashCode * HASH_FACTOR + Util.hashCode(name); @@ -155,7 +158,8 @@ public final class CategoryDefinition implements Comparable { return hashCode; } - public String toString() { + @Override + public String toString() { if (string == null) { final StringBuffer stringBuffer = new StringBuffer(); stringBuffer.append('['); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/activities/ExtensionActivityRegistry.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/activities/ExtensionActivityRegistry.java index 6d335ebd309..574c8c8ad4a 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/activities/ExtensionActivityRegistry.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/activities/ExtensionActivityRegistry.java @@ -58,7 +58,8 @@ final class ExtensionActivityRegistry extends AbstractActivityRegistry { this.extensionRegistry .addRegistryChangeListener(new IRegistryChangeListener() { - public void registryChanged( + @Override + public void registryChanged( IRegistryChangeEvent registryChangeEvent) { IExtensionDelta[] extensionDeltas = registryChangeEvent .getExtensionDeltas(Persistence.PACKAGE_PREFIX, diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/activities/Identifier.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/activities/Identifier.java index 4948d8edb06..d7910bcfe53 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/activities/Identifier.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/activities/Identifier.java @@ -50,7 +50,8 @@ final class Identifier implements IIdentifier { this.id = id; } - public void addIdentifierListener(IIdentifierListener identifierListener) { + @Override + public void addIdentifierListener(IIdentifierListener identifierListener) { if (identifierListener == null) { throw new NullPointerException(); } @@ -63,7 +64,8 @@ final class Identifier implements IIdentifier { strongReferences.add(this); } - public int compareTo(Object object) { + @Override + public int compareTo(Object object) { Identifier castedObject = (Identifier) object; int compareTo = Util.compare(activityIdsAsArray, castedObject.activityIdsAsArray); @@ -79,7 +81,8 @@ final class Identifier implements IIdentifier { return compareTo; } - public boolean equals(Object object) { + @Override + public boolean equals(Object object) { if (!(object instanceof Identifier)) { return false; } @@ -110,15 +113,18 @@ final class Identifier implements IIdentifier { } } + @Override public Set<String> getActivityIds() { return activityIds; } - public String getId() { + @Override + public String getId() { return id; } - public int hashCode() { + @Override + public int hashCode() { if (hashCode == HASH_INITIAL) { hashCode = hashCode * HASH_FACTOR + Util.hashCode(activityIds); hashCode = hashCode * HASH_FACTOR + Util.hashCode(enabled); @@ -131,11 +137,13 @@ final class Identifier implements IIdentifier { return hashCode; } - public boolean isEnabled() { + @Override + public boolean isEnabled() { return enabled; } - public void removeIdentifierListener(IIdentifierListener identifierListener) { + @Override + public void removeIdentifierListener(IIdentifierListener identifierListener) { if (identifierListener == null) { throw new NullPointerException(); } @@ -173,7 +181,8 @@ final class Identifier implements IIdentifier { return false; } - public String toString() { + @Override + public String toString() { if (string == null) { final StringBuffer stringBuffer = new StringBuffer(); stringBuffer.append('['); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/activities/MutableActivityManager.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/activities/MutableActivityManager.java index be1d202c8fe..bddfab9fb4e 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/activities/MutableActivityManager.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/activities/MutableActivityManager.java @@ -97,7 +97,8 @@ public final class MutableActivityManager extends AbstractActivityManager private Job deferredIdentifierJob = null; private final IActivityRegistryListener activityRegistryListener = new IActivityRegistryListener() { - public void activityRegistryChanged( + @Override + public void activityRegistryChanged( ActivityRegistryEvent activityRegistryEvent) { readRegistry(false); } @@ -132,6 +133,7 @@ public final class MutableActivityManager extends AbstractActivityManager readRegistry(true); } + @Override synchronized public IActivity getActivity(String activityId) { if (activityId == null) { throw new NullPointerException(); @@ -148,6 +150,7 @@ public final class MutableActivityManager extends AbstractActivityManager return activity; } + @Override synchronized public ICategory getCategory(String categoryId) { if (categoryId == null) { throw new NullPointerException(); @@ -164,18 +167,22 @@ public final class MutableActivityManager extends AbstractActivityManager return category; } + @Override synchronized public Set getDefinedActivityIds() { return Collections.unmodifiableSet(definedActivityIds); } + @Override synchronized public Set getDefinedCategoryIds() { return Collections.unmodifiableSet(definedCategoryIds); } + @Override synchronized public Set getEnabledActivityIds() { return Collections.unmodifiableSet(enabledActivityIds); } + @Override synchronized public IIdentifier getIdentifier(String identifierId) { if (identifierId == null) { throw new NullPointerException(); @@ -522,6 +529,7 @@ public final class MutableActivityManager extends AbstractActivityManager } } + @Override synchronized public void setEnabledActivityIds(Set enabledActivityIds) { enabledActivityIds = new HashSet(enabledActivityIds); Set requiredActivityIds = new HashSet(enabledActivityIds); @@ -669,6 +677,7 @@ public final class MutableActivityManager extends AbstractActivityManager } private IPropertyChangeListener enabledWhenListener = new IPropertyChangeListener() { + @Override public void propertyChange(PropertyChangeEvent event) { if (addingEvaluationListener) { return; @@ -905,6 +914,7 @@ public final class MutableActivityManager extends AbstractActivityManager /* (non-Javadoc) * @see java.lang.Object#clone() */ + @Override synchronized public Object clone() { MutableActivityManager clone = new MutableActivityManager(advisor, activityRegistry); clone.setEnabledActivityIds(getEnabledActivityIds()); @@ -924,7 +934,8 @@ public final class MutableActivityManager extends AbstractActivityManager /* (non-Javadoc) * @see org.eclipse.core.internal.jobs.InternalJob#run(org.eclipse.core.runtime.IProgressMonitor) */ - protected IStatus run(IProgressMonitor monitor) { + @Override + protected IStatus run(IProgressMonitor monitor) { while (!deferredIdentifiers.isEmpty()) { Identifier identifier = (Identifier) deferredIdentifiers.remove(0); Set activityIds = new HashSet(); @@ -947,6 +958,7 @@ public final class MutableActivityManager extends AbstractActivityManager identifierEvent); UIJob notifyJob = new UIJob("Identifier Update Job") { //$NON-NLS-1$ + @Override public IStatus runInUIThread( IProgressMonitor monitor) { notifyIdentifiers(identifierEventsByIdentifierId); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/activities/ProxyActivityManager.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/activities/ProxyActivityManager.java index d947e84542c..c4ad33f6f92 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/activities/ProxyActivityManager.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/activities/ProxyActivityManager.java @@ -32,7 +32,8 @@ public final class ProxyActivityManager extends AbstractActivityManager { this.activityManager .addActivityManagerListener(new IActivityManagerListener() { - public void activityManagerChanged( + @Override + public void activityManagerChanged( ActivityManagerEvent activityManagerEvent) { ActivityManagerEvent proxyActivityManagerEvent = new ActivityManagerEvent( ProxyActivityManager.this, activityManagerEvent @@ -52,27 +53,33 @@ public final class ProxyActivityManager extends AbstractActivityManager { }); } - public IActivity getActivity(String activityId) { + @Override + public IActivity getActivity(String activityId) { return activityManager.getActivity(activityId); } - public ICategory getCategory(String categoryId) { + @Override + public ICategory getCategory(String categoryId) { return activityManager.getCategory(categoryId); } - public Set getDefinedActivityIds() { + @Override + public Set getDefinedActivityIds() { return activityManager.getDefinedActivityIds(); } - public Set getDefinedCategoryIds() { + @Override + public Set getDefinedCategoryIds() { return activityManager.getDefinedCategoryIds(); } - public Set getEnabledActivityIds() { + @Override + public Set getEnabledActivityIds() { return activityManager.getEnabledActivityIds(); } - public IIdentifier getIdentifier(String identifierId) { + @Override + public IIdentifier getIdentifier(String identifierId) { return activityManager.getIdentifier(identifierId); } } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/activities/ws/AbstractTriggerPoint.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/activities/ws/AbstractTriggerPoint.java index be57811f753..a43959c2b26 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/activities/ws/AbstractTriggerPoint.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/activities/ws/AbstractTriggerPoint.java @@ -21,6 +21,7 @@ public abstract class AbstractTriggerPoint implements ITriggerPoint { /* (non-Javadoc) * @see java.lang.Object#equals(java.lang.Object) */ + @Override public boolean equals(Object obj) { if (obj instanceof ITriggerPoint) { return getId().equals(((ITriggerPoint)obj).getId()); @@ -32,6 +33,7 @@ public abstract class AbstractTriggerPoint implements ITriggerPoint { /* (non-Javadoc) * @see java.lang.Object#hashCode() */ + @Override public int hashCode() { return getId().hashCode(); } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/activities/ws/ActivityCategoryContentProvider.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/activities/ws/ActivityCategoryContentProvider.java index 0b95c116dfb..472575ec2b4 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/activities/ws/ActivityCategoryContentProvider.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/activities/ws/ActivityCategoryContentProvider.java @@ -45,7 +45,8 @@ public class ActivityCategoryContentProvider implements ITreeContentProvider { /* (non-Javadoc) * @see org.eclipse.jface.viewers.IContentProvider#dispose() */ - public void dispose() { + @Override + public void dispose() { manager = null; } @@ -212,7 +213,8 @@ public class ActivityCategoryContentProvider implements ITreeContentProvider { /* (non-Javadoc) * @see org.eclipse.jface.viewers.ITreeContentProvider#getChildren(java.lang.Object) */ - public Object[] getChildren(Object parentElement) { + @Override + public Object[] getChildren(Object parentElement) { if (parentElement instanceof IActivityManager) { Set categoryIds = manager.getDefinedCategoryIds(); ArrayList categories = new ArrayList(categoryIds.size()); @@ -233,14 +235,16 @@ public class ActivityCategoryContentProvider implements ITreeContentProvider { /* (non-Javadoc) * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object) */ - public Object[] getElements(Object inputElement) { + @Override + public Object[] getElements(Object inputElement) { return getChildren(inputElement); } /* (non-Javadoc) * @see org.eclipse.jface.viewers.ITreeContentProvider#getParent(java.lang.Object) */ - public Object getParent(Object element) { + @Override + public Object getParent(Object element) { if (element instanceof CategorizedActivity) { return ((CategorizedActivity) element).getCategory(); } @@ -250,7 +254,8 @@ public class ActivityCategoryContentProvider implements ITreeContentProvider { /* (non-Javadoc) * @see org.eclipse.jface.viewers.ITreeContentProvider#hasChildren(java.lang.Object) */ - public boolean hasChildren(Object element) { + @Override + public boolean hasChildren(Object element) { if (element instanceof IActivityManager || element instanceof ICategory) { return true; } @@ -260,7 +265,8 @@ public class ActivityCategoryContentProvider implements ITreeContentProvider { /* (non-Javadoc) * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object) */ - public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { + @Override + public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { manager = (IActivityManager) newInput; } } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/activities/ws/ActivityCategoryLabelProvider.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/activities/ws/ActivityCategoryLabelProvider.java index 3e713400f3e..ce064c0f353 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/activities/ws/ActivityCategoryLabelProvider.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/activities/ws/ActivityCategoryLabelProvider.java @@ -45,7 +45,8 @@ public class ActivityCategoryLabelProvider extends LabelProvider { /* (non-Javadoc) * @see org.eclipse.jface.viewers.ILabelProvider#getImage(java.lang.Object) */ - public Image getImage(Object element) { + @Override + public Image getImage(Object element) { try { ImageDescriptor descriptor = getDescriptor(element); if (descriptor != null) { @@ -85,7 +86,8 @@ public class ActivityCategoryLabelProvider extends LabelProvider { /* (non-Javadoc) * @see org.eclipse.jface.viewers.ILabelProvider#getText(java.lang.Object) */ - public String getText(Object element) { + @Override + public String getText(Object element) { if (element instanceof IActivity) { IActivity activity = (IActivity) element; try { @@ -107,7 +109,8 @@ public class ActivityCategoryLabelProvider extends LabelProvider { /* (non-Javadoc) * @see org.eclipse.jface.viewers.IBaseLabelProvider#dispose() */ - public void dispose() { + @Override + public void dispose() { manager.dispose(); descriptorMap.clear(); } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/activities/ws/ActivityContentProvider.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/activities/ws/ActivityContentProvider.java index 1bd715ccdb6..4c9e50ae747 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/activities/ws/ActivityContentProvider.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/activities/ws/ActivityContentProvider.java @@ -32,7 +32,8 @@ public class ActivityContentProvider implements IStructuredContentProvider { * * @see org.eclipse.jface.viewers.IContentProvider#dispose() */ - public void dispose() { + @Override + public void dispose() { } /* @@ -40,7 +41,8 @@ public class ActivityContentProvider implements IStructuredContentProvider { * * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object) */ - public Object[] getElements(Object inputElement) { + @Override + public Object[] getElements(Object inputElement) { Object[] activities = new Object[0]; if (inputElement instanceof IActivityManager) { activities = ((IActivityManager) inputElement) @@ -57,6 +59,7 @@ public class ActivityContentProvider implements IStructuredContentProvider { * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer, * java.lang.Object, java.lang.Object) */ - public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { + @Override + public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { } } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/activities/ws/ActivityEnabler.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/activities/ws/ActivityEnabler.java index 5544c07894e..c85ee257869 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/activities/ws/ActivityEnabler.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/activities/ws/ActivityEnabler.java @@ -72,6 +72,7 @@ public class ActivityEnabler { * * @see org.eclipse.jface.viewers.ISelectionChangedListener#selectionChanged(org.eclipse.jface.viewers.SelectionChangedEvent) */ + @Override public void selectionChanged(SelectionChangedEvent event) { Object element = ((IStructuredSelection) event.getSelection()) .getFirstElement(); @@ -99,6 +100,7 @@ public class ActivityEnabler { * * @see org.eclipse.jface.viewers.ICheckStateListener#checkStateChanged(org.eclipse.jface.viewers.CheckStateChangedEvent) */ + @Override public void checkStateChanged(CheckStateChangedEvent event) { Set checked = new HashSet(Arrays.asList(dualViewer .getCheckedElements())); @@ -312,6 +314,7 @@ public class ActivityEnabler { * * @see org.eclipse.swt.events.SelectionAdapter#widgetSelected(org.eclipse.swt.events.SelectionEvent) */ + @Override public void widgetSelected(SelectionEvent e) { toggleTreeEnablement(true); } @@ -326,6 +329,7 @@ public class ActivityEnabler { * * @see org.eclipse.swt.events.SelectionAdapter#widgetSelected(org.eclipse.swt.events.SelectionEvent) */ + @Override public void widgetSelected(SelectionEvent e) { toggleTreeEnablement(false); } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/activities/ws/ActivityLabelProvider.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/activities/ws/ActivityLabelProvider.java index 8d103d1b706..f732ffc7691 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/activities/ws/ActivityLabelProvider.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/activities/ws/ActivityLabelProvider.java @@ -54,7 +54,8 @@ public class ActivityLabelProvider extends LabelProvider { * * @see org.eclipse.jface.viewers.ILabelProvider#getImage(java.lang.Object) */ - public Image getImage(Object element) { + @Override + public Image getImage(Object element) { return null; } @@ -63,7 +64,8 @@ public class ActivityLabelProvider extends LabelProvider { * * @see org.eclipse.jface.viewers.ILabelProvider#getText(java.lang.Object) */ - public String getText(Object element) { + @Override + public String getText(Object element) { if (element instanceof String) { return getActivityText(activityManager .getActivity((String) element)); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/activities/ws/ActivityViewerFilter.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/activities/ws/ActivityViewerFilter.java index 2481cc443a9..d84650905a8 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/activities/ws/ActivityViewerFilter.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/activities/ws/ActivityViewerFilter.java @@ -26,7 +26,8 @@ public class ActivityViewerFilter extends ViewerFilter { /* (non-Javadoc) * @see org.eclipse.jface.viewers.ViewerFilter#select(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object) */ - public boolean select(Viewer viewer, Object parentElement, Object element) { + @Override + public boolean select(Viewer viewer, Object parentElement, Object element) { if (WorkbenchActivityHelper.filterItem(element)) { setHasEncounteredFilteredItem(true); return false; diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/activities/ws/CategorizedActivity.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/activities/ws/CategorizedActivity.java index a18f71164b5..43f401ac186 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/activities/ws/CategorizedActivity.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/activities/ws/CategorizedActivity.java @@ -53,21 +53,24 @@ public class CategorizedActivity implements IActivity { /* (non-Javadoc) * @see org.eclipse.ui.activities.IActivity#addActivityListener(org.eclipse.ui.activities.IActivityListener) */ - public void addActivityListener(IActivityListener activityListener) { + @Override + public void addActivityListener(IActivityListener activityListener) { activity.addActivityListener(activityListener); } /* (non-Javadoc) * @see java.lang.Comparable#compareTo(java.lang.Object) */ - public int compareTo(Object o) { + @Override + public int compareTo(Object o) { return activity.compareTo(o); } /* (non-Javadoc) * @see java.lang.Object#equals(java.lang.Object) */ - public boolean equals(Object o) { + @Override + public boolean equals(Object o) { if (o instanceof CategorizedActivity) { if (((CategorizedActivity) o).getCategory().equals(getCategory())) { return ((CategorizedActivity) o).getActivity().equals( @@ -87,14 +90,16 @@ public class CategorizedActivity implements IActivity { /* (non-Javadoc) * @see org.eclipse.ui.activities.IActivity#getActivityRequirementBindings() */ - public Set getActivityRequirementBindings() { + @Override + public Set getActivityRequirementBindings() { return activity.getActivityRequirementBindings(); } /* (non-Javadoc) * @see org.eclipse.ui.activities.IActivity#getActivityPatternBindings() */ - public Set getActivityPatternBindings() { + @Override + public Set getActivityPatternBindings() { return activity.getActivityPatternBindings(); } @@ -108,67 +113,77 @@ public class CategorizedActivity implements IActivity { /* (non-Javadoc) * @see org.eclipse.ui.activities.IActivity#getId() */ - public String getId() { + @Override + public String getId() { return activity.getId(); } /* (non-Javadoc) * @see org.eclipse.ui.activities.IActivity#getName() */ - public String getName() throws NotDefinedException { + @Override + public String getName() throws NotDefinedException { return activity.getName(); } /* (non-Javadoc) * @see java.lang.Object#hashCode() */ - public int hashCode() { + @Override + public int hashCode() { return activity.hashCode(); } /* (non-Javadoc) * @see org.eclipse.ui.activities.IActivity#isDefined() */ - public boolean isDefined() { + @Override + public boolean isDefined() { return activity.isDefined(); } /* (non-Javadoc) * @see org.eclipse.ui.activities.IActivity#isEnabled() */ - public boolean isEnabled() { + @Override + public boolean isEnabled() { return activity.isEnabled(); } /* (non-Javadoc) * @see org.eclipse.ui.activities.IActivity#removeActivityListener(org.eclipse.ui.activities.IActivityListener) */ - public void removeActivityListener(IActivityListener activityListener) { + @Override + public void removeActivityListener(IActivityListener activityListener) { activity.removeActivityListener(activityListener); } /* (non-Javadoc) * @see java.lang.Object#toString() */ - public String toString() { + @Override + public String toString() { return category.getId() + " -> " + activity.getId(); //$NON-NLS-1$ } /* (non-Javadoc) * @see org.eclipse.ui.activities.IActivity#getDescription() */ - public String getDescription() throws NotDefinedException { + @Override + public String getDescription() throws NotDefinedException { return activity.getDescription(); } /* (non-Javadoc) * @see org.eclipse.ui.activities.IActivity#isDefaultEnabled() */ - public boolean isDefaultEnabled() throws NotDefinedException { + @Override + public boolean isDefaultEnabled() throws NotDefinedException { return activity.isDefaultEnabled(); } - public Expression getExpression() { + @Override + public Expression getExpression() { return activity.getExpression(); } } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/activities/ws/EnablementDialog.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/activities/ws/EnablementDialog.java index 4f34be7e9bb..6e08c46f11c 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/activities/ws/EnablementDialog.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/activities/ws/EnablementDialog.java @@ -94,7 +94,8 @@ public class EnablementDialog extends Dialog { /* (non-Javadoc) * @see org.eclipse.jface.dialogs.Dialog#createDialogArea(org.eclipse.swt.widgets.Composite) */ - protected Control createDialogArea(Composite parent) { + @Override + protected Control createDialogArea(Composite parent) { Composite composite = (Composite) super.createDialogArea(parent); Font dialogFont = parent.getFont(); composite.setFont(dialogFont); @@ -143,7 +144,8 @@ public class EnablementDialog extends Dialog { /* (non-Javadoc) * @see org.eclipse.jface.viewers.ICheckStateListener#checkStateChanged(org.eclipse.jface.viewers.CheckStateChangedEvent) */ - public void checkStateChanged(CheckStateChangedEvent event) { + @Override + public void checkStateChanged(CheckStateChangedEvent event) { if (event.getChecked()) { activitiesToEnable.add(event.getElement()); } else { @@ -158,7 +160,8 @@ public class EnablementDialog extends Dialog { /* (non-Javadoc) * @see org.eclipse.jface.viewers.ISelectionChangedListener#selectionChanged(org.eclipse.jface.viewers.SelectionChangedEvent) */ - public void selectionChanged(SelectionChangedEvent event) { + @Override + public void selectionChanged(SelectionChangedEvent event) { selectedActivity = (String) ((IStructuredSelection) event .getSelection()).getFirstElement(); setDetails(); @@ -272,7 +275,8 @@ public class EnablementDialog extends Dialog { /* (non-Javadoc) * @see org.eclipse.jface.window.Window#configureShell(org.eclipse.swt.widgets.Shell) */ - protected void configureShell(Shell newShell) { + @Override + protected void configureShell(Shell newShell) { super.configureShell(newShell); newShell.setText(RESOURCE_BUNDLE.getString("title")); //$NON-NLS-1$ } @@ -295,7 +299,8 @@ public class EnablementDialog extends Dialog { /* (non-Javadoc) * @see org.eclipse.jface.dialogs.Dialog#okPressed() */ - protected void okPressed() { + @Override + protected void okPressed() { dontAsk = dontAskButton.getSelection(); super.okPressed(); } @@ -303,7 +308,8 @@ public class EnablementDialog extends Dialog { /* (non-Javadoc) * @see org.eclipse.jface.dialogs.Dialog#createButtonsForButtonBar(org.eclipse.swt.widgets.Composite) */ - protected void createButtonsForButtonBar(Composite parent) { + @Override + protected void createButtonsForButtonBar(Composite parent) { super.createButtonsForButtonBar(parent); detailsButton = createButton(parent, IDialogConstants.DETAILS_ID, "", false); //$NON-NLS-1$ @@ -313,7 +319,8 @@ public class EnablementDialog extends Dialog { /* (non-Javadoc) * @see org.eclipse.jface.dialogs.Dialog#buttonPressed(int) */ - protected void buttonPressed(int buttonId) { + @Override + protected void buttonPressed(int buttonId) { if (buttonId == IDialogConstants.DETAILS_ID) { detailsPressed(); return; diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/activities/ws/ImageBindingRegistry.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/activities/ws/ImageBindingRegistry.java index 67a5a09a2ee..26e84a644ef 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/activities/ws/ImageBindingRegistry.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/activities/ws/ImageBindingRegistry.java @@ -46,6 +46,7 @@ public class ImageBindingRegistry implements IExtensionChangeHandler { /* (non-Javadoc) * @see org.eclipse.core.runtime.dynamicHelpers.IExtensionChangeHandler#addExtension(org.eclipse.core.runtime.dynamicHelpers.IExtensionTracker, org.eclipse.core.runtime.IExtension) */ + @Override public void addExtension(IExtensionTracker tracker, IExtension extension) { IConfigurationElement [] elements = extension.getConfigurationElements(); for (int i = 0; i < elements.length; i++) { @@ -82,6 +83,7 @@ public class ImageBindingRegistry implements IExtensionChangeHandler { /* (non-Javadoc) * @see org.eclipse.core.runtime.dynamicHelpers.IExtensionChangeHandler#removeExtension(org.eclipse.core.runtime.IExtension, java.lang.Object[]) */ + @Override public void removeExtension(IExtension extension, Object[] objects) { for (int i = 0; i < objects.length; i++) { if (objects[i] instanceof String) { diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/activities/ws/RegistryTriggerPoint.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/activities/ws/RegistryTriggerPoint.java index 2c18b211fac..00638f6f8db 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/activities/ws/RegistryTriggerPoint.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/activities/ws/RegistryTriggerPoint.java @@ -44,7 +44,8 @@ public class RegistryTriggerPoint extends AbstractTriggerPoint { * * @see org.eclipse.ui.activities.ITriggerPoint#getId() */ - public String getId() { + @Override + public String getId() { return id; } @@ -53,7 +54,8 @@ public class RegistryTriggerPoint extends AbstractTriggerPoint { * * @see org.eclipse.ui.activities.ITriggerPoint#getStringHint(java.lang.String) */ - public String getStringHint(String key) { + @Override + public String getStringHint(String key) { return (String) getHints().get(key); } @@ -62,7 +64,8 @@ public class RegistryTriggerPoint extends AbstractTriggerPoint { * * @see org.eclipse.ui.activities.ITriggerPoint#getBooleanHint(java.lang.String) */ - public boolean getBooleanHint(String key) { + @Override + public boolean getBooleanHint(String key) { return Boolean.valueOf(getStringHint(key)).booleanValue(); } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/activities/ws/TriggerPointManager.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/activities/ws/TriggerPointManager.java index 84cbafa7df3..ad59c5e613f 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/activities/ws/TriggerPointManager.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/activities/ws/TriggerPointManager.java @@ -48,7 +48,8 @@ public class TriggerPointManager implements ITriggerPointManager, IExtensionChan * * @see org.eclipse.ui.activities.ITriggerPoint#getId() */ - public String getId() { + @Override + public String getId() { return ITriggerPointManager.UNKNOWN_TRIGGER_POINT_ID; } @@ -57,7 +58,8 @@ public class TriggerPointManager implements ITriggerPointManager, IExtensionChan * * @see org.eclipse.ui.activities.ITriggerPoint#getStringHint(java.lang.String) */ - public String getStringHint(String key) { + @Override + public String getStringHint(String key) { if (ITriggerPoint.HINT_INTERACTIVE.equals(key)) { // TODO: change to false when we have mapped our // trigger points @@ -71,7 +73,8 @@ public class TriggerPointManager implements ITriggerPointManager, IExtensionChan * * @see org.eclipse.ui.activities.ITriggerPoint#getBooleanHint(java.lang.String) */ - public boolean getBooleanHint(String key) { + @Override + public boolean getBooleanHint(String key) { if (ITriggerPoint.HINT_INTERACTIVE.equals(key)) { // TODO: change to false when we have mapped our // trigger points @@ -96,7 +99,8 @@ public class TriggerPointManager implements ITriggerPointManager, IExtensionChan * * @see org.eclipse.ui.activities.ITriggerPointManager#getTriggerPoint(java.lang.String) */ - public ITriggerPoint getTriggerPoint(String id) { + @Override + public ITriggerPoint getTriggerPoint(String id) { return (ITriggerPoint) triggerMap.get(id); } @@ -105,7 +109,8 @@ public class TriggerPointManager implements ITriggerPointManager, IExtensionChan * * @see org.eclipse.ui.activities.ITriggerPointManager#getDefinedTriggerPointIds() */ - public Set getDefinedTriggerPointIds() { + @Override + public Set getDefinedTriggerPointIds() { return triggerMap.entrySet(); } @@ -115,7 +120,8 @@ public class TriggerPointManager implements ITriggerPointManager, IExtensionChan * @see org.eclipse.core.runtime.dynamicHelpers.IExtensionRemovalHandler#removeInstance(org.eclipse.core.runtime.IExtension, * java.lang.Object[]) */ - public void removeExtension(IExtension extension, Object[] objects) { + @Override + public void removeExtension(IExtension extension, Object[] objects) { for (int i = 0; i < objects.length; i++) { Object object = objects[i]; if (object instanceof RegistryTriggerPoint) { @@ -130,7 +136,8 @@ public class TriggerPointManager implements ITriggerPointManager, IExtensionChan * @see org.eclipse.core.runtime.dynamicHelpers.IExtensionAdditionHandler#addInstance(org.eclipse.core.runtime.dynamicHelpers.IExtensionTracker, * org.eclipse.core.runtime.IExtension) */ - public void addExtension(IExtensionTracker tracker, IExtension extension) { + @Override + public void addExtension(IExtensionTracker tracker, IExtension extension) { IConfigurationElement[] elements = extension.getConfigurationElements(); for (int i = 0; i < elements.length; i++) { IConfigurationElement element = elements[i]; diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/activities/ws/WorkbenchActivitySupport.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/activities/ws/WorkbenchActivitySupport.java index 6e6c86df42f..663dac92e73 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/activities/ws/WorkbenchActivitySupport.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/activities/ws/WorkbenchActivitySupport.java @@ -91,7 +91,8 @@ public class WorkbenchActivitySupport implements IWorkbenchActivitySupport, IExt /* (non-Javadoc) * @see org.eclipse.ui.activities.IActivityManagerListener#activityManagerChanged(org.eclipse.ui.activities.ActivityManagerEvent) */ - public void activityManagerChanged( + @Override + public void activityManagerChanged( ActivityManagerEvent activityManagerEvent) { Set activityIds = mutableActivityManager .getEnabledActivityIds(); @@ -131,7 +132,8 @@ public class WorkbenchActivitySupport implements IWorkbenchActivitySupport, IExt /* (non-Javadoc) * @see org.eclipse.jface.operation.IRunnableWithProgress#run(org.eclipse.core.runtime.IProgressMonitor) */ - public void run(IProgressMonitor monitor) { + @Override + public void run(IProgressMonitor monitor) { openTime = System .currentTimeMillis() @@ -263,7 +265,8 @@ public class WorkbenchActivitySupport implements IWorkbenchActivitySupport, IExt /* (non-Javadoc) * @see java.lang.Runnable#run() */ - public void run() { + @Override + public void run() { BusyIndicator .showWhile( workbench @@ -273,7 +276,8 @@ public class WorkbenchActivitySupport implements IWorkbenchActivitySupport, IExt /* (non-Javadoc) * @see java.lang.Runnable#run() */ - public void run() { + @Override + public void run() { try { dialog .run( @@ -309,20 +313,23 @@ public class WorkbenchActivitySupport implements IWorkbenchActivitySupport, IExt /* (non-Javadoc) * @see org.eclipse.ui.activities.IWorkbenchActivitySupport#getActivityManager() */ - public IActivityManager getActivityManager() { + @Override + public IActivityManager getActivityManager() { return proxyActivityManager; } /* (non-Javadoc) * @see org.eclipse.ui.activities.IWorkbenchActivitySupport#setEnabledActivityIds(java.util.Set) */ - public void setEnabledActivityIds(Set enabledActivityIds) { + @Override + public void setEnabledActivityIds(Set enabledActivityIds) { mutableActivityManager.setEnabledActivityIds(enabledActivityIds); } /* (non-Javadoc) * @see org.eclipse.ui.activities.IWorkbenchActivitySupport#getImageDescriptor(org.eclipse.ui.activities.IActivity) */ + @Override public ImageDescriptor getImageDescriptor(IActivity activity) { if (activity.isDefined()) { ImageDescriptor descriptor = getActivityImageBindingRegistry() @@ -338,6 +345,7 @@ public class WorkbenchActivitySupport implements IWorkbenchActivitySupport, IExt /* (non-Javadoc) * @see org.eclipse.ui.activities.IWorkbenchActivitySupport#getImageDescriptor(org.eclipse.ui.activities.ICategory) */ + @Override public ImageDescriptor getImageDescriptor(ICategory category) { if (category.isDefined()) { ImageDescriptor descriptor = getCategoryImageBindingRegistry() @@ -445,6 +453,7 @@ public class WorkbenchActivitySupport implements IWorkbenchActivitySupport, IExt /* (non-Javadoc) * @see org.eclipse.ui.activities.IWorkbenchActivitySupport#getTriggerPointManager() */ + @Override public ITriggerPointManager getTriggerPointManager() { return triggerPointManager; } @@ -452,6 +461,7 @@ public class WorkbenchActivitySupport implements IWorkbenchActivitySupport, IExt /* (non-Javadoc) * @see org.eclipse.core.runtime.dynamicHelpers.IExtensionChangeHandler#addExtension(org.eclipse.core.runtime.dynamicHelpers.IExtensionTracker, org.eclipse.core.runtime.IExtension) */ + @Override public void addExtension(IExtensionTracker tracker, IExtension extension) { // reset the advisor if it's the "default" advisor. // this will give getAdvisor the chance to find a proper trigger/binding if @@ -475,6 +485,7 @@ public class WorkbenchActivitySupport implements IWorkbenchActivitySupport, IExt /* (non-Javadoc) * @see org.eclipse.core.runtime.dynamicHelpers.IExtensionChangeHandler#removeExtension(org.eclipse.core.runtime.IExtension, java.lang.Object[]) */ + @Override public void removeExtension(IExtension extension, Object[] objects) { for (int i = 0; i < objects.length; i++) { if (objects[i] == advisor) { @@ -487,7 +498,8 @@ public class WorkbenchActivitySupport implements IWorkbenchActivitySupport, IExt /* (non-Javadoc) * @see org.eclipse.ui.activities.IWorkbenchActivitySupport#createWorkingCopy() */ - public IMutableActivityManager createWorkingCopy() { + @Override + public IMutableActivityManager createWorkingCopy() { MutableActivityManager clone = (MutableActivityManager) mutableActivityManager.clone(); clone.unhookRegistryListeners(); return clone; diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/application/CompatibilityActionBarAdvisor.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/application/CompatibilityActionBarAdvisor.java index 97c69182b95..01a3c3908c0 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/application/CompatibilityActionBarAdvisor.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/application/CompatibilityActionBarAdvisor.java @@ -36,12 +36,14 @@ public class CompatibilityActionBarAdvisor extends ActionBarAdvisor { this.wbAdvisor = wbAdvisor; } - public void fillActionBars(int flags) { + @Override + public void fillActionBars(int flags) { IActionBarConfigurer abc = getActionBarConfigurer(); wbAdvisor.fillActionBars(abc.getWindowConfigurer().getWindow(), abc, flags); } - public boolean isApplicationMenu(String menuId) { + @Override + public boolean isApplicationMenu(String menuId) { IActionBarConfigurer abc = getActionBarConfigurer(); return wbAdvisor.isApplicationMenu(abc.getWindowConfigurer(), menuId); } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/application/CompatibilityWorkbenchWindowAdvisor.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/application/CompatibilityWorkbenchWindowAdvisor.java index 3e9aa9cb178..f9550a501f9 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/application/CompatibilityWorkbenchWindowAdvisor.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/application/CompatibilityWorkbenchWindowAdvisor.java @@ -41,35 +41,43 @@ public class CompatibilityWorkbenchWindowAdvisor extends WorkbenchWindowAdvisor this.wbAdvisor = wbAdvisor; } - public void preWindowOpen() { + @Override + public void preWindowOpen() { wbAdvisor.preWindowOpen(getWindowConfigurer()); } - public ActionBarAdvisor createActionBarAdvisor(IActionBarConfigurer configurer) { + @Override + public ActionBarAdvisor createActionBarAdvisor(IActionBarConfigurer configurer) { return new CompatibilityActionBarAdvisor(wbAdvisor, configurer); } - public void postWindowRestore() throws WorkbenchException { + @Override + public void postWindowRestore() throws WorkbenchException { wbAdvisor.postWindowRestore(getWindowConfigurer()); } - public void openIntro() { + @Override + public void openIntro() { wbAdvisor.openIntro(getWindowConfigurer()); } - public void postWindowCreate() { + @Override + public void postWindowCreate() { wbAdvisor.postWindowCreate(getWindowConfigurer()); } - public void postWindowOpen() { + @Override + public void postWindowOpen() { wbAdvisor.postWindowOpen(getWindowConfigurer()); } - public boolean preWindowShellClose() { + @Override + public boolean preWindowShellClose() { return wbAdvisor.preWindowShellClose(getWindowConfigurer()); } - public void postWindowClose() { + @Override + public void postWindowClose() { wbAdvisor.postWindowClose(getWindowConfigurer()); } @@ -81,7 +89,8 @@ public class CompatibilityWorkbenchWindowAdvisor extends WorkbenchWindowAdvisor return wbAdvisor.getDefaultPageInput(); } - public void createWindowContents(Shell shell) { + @Override + public void createWindowContents(Shell shell) { wbAdvisor.createWindowContents(getWindowConfigurer(), shell); } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/browser/DefaultWebBrowser.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/browser/DefaultWebBrowser.java index c734cbb7c70..53bde7354a6 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/browser/DefaultWebBrowser.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/browser/DefaultWebBrowser.java @@ -52,6 +52,7 @@ public class DefaultWebBrowser extends AbstractWebBrowser { * * @see org.eclipse.ui.browser.IWebBrowser#openURL(java.net.URL) */ + @Override public void openURL(URL url) throws PartInitException { // format the href for an html file (file:///<filename.html> // required for Mac only. @@ -79,6 +80,7 @@ public class DefaultWebBrowser extends AbstractWebBrowser { } } else { Thread launcher = new Thread("About Link Launcher") {//$NON-NLS-1$ + @Override public void run() { try { /* @@ -120,6 +122,7 @@ public class DefaultWebBrowser extends AbstractWebBrowser { * * @see org.eclipse.ui.browser.IWebBrowser#close() */ + @Override public boolean close() { support.unregisterBrowser(this); return super.close(); @@ -182,6 +185,7 @@ public class DefaultWebBrowser extends AbstractWebBrowser { */ private void openWebBrowserError(Display display) { display.asyncExec(new Runnable() { + @Override public void run() { MessageDialog .openError( diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/browser/DefaultWorkbenchBrowserSupport.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/browser/DefaultWorkbenchBrowserSupport.java index 626183f9d6f..6698fa4d808 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/browser/DefaultWorkbenchBrowserSupport.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/browser/DefaultWorkbenchBrowserSupport.java @@ -60,6 +60,7 @@ public class DefaultWorkbenchBrowserSupport extends * @see org.eclipse.ui.browser.IWorkbenchBrowserSupport#createBrowser(int, * java.lang.String, java.lang.String, java.lang.String) */ + @Override public IWebBrowser createBrowser(int style, String browserId, String name, String tooltip) throws PartInitException { IWebBrowser browser = findBrowser(browserId == null? getDefaultId():browserId); @@ -76,6 +77,7 @@ public class DefaultWorkbenchBrowserSupport extends * * @see org.eclipse.ui.browser.IWorkbenchBrowserSupport#createBrowser(java.lang.String) */ + @Override public IWebBrowser createBrowser(String browserId) throws PartInitException { return createBrowser(AS_EXTERNAL, browserId, null, null); } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/browser/WorkbenchBrowserSupport.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/browser/WorkbenchBrowserSupport.java index 6bf6bdbc40f..3efd3ac5f82 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/browser/WorkbenchBrowserSupport.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/browser/WorkbenchBrowserSupport.java @@ -50,14 +50,16 @@ public class WorkbenchBrowserSupport extends AbstractWorkbenchBrowserSupport { /* (non-Javadoc) * @see org.eclipse.core.runtime.dynamicHelpers.IExtensionChangeHandler#addExtension(org.eclipse.core.runtime.dynamicHelpers.IExtensionTracker, org.eclipse.core.runtime.IExtension) */ - public void addExtension(IExtensionTracker tracker,IExtension extension) { + @Override + public void addExtension(IExtensionTracker tracker,IExtension extension) { //Do nothing } /* (non-Javadoc) * @see org.eclipse.core.runtime.dynamicHelpers.IExtensionChangeHandler#removeExtension(org.eclipse.core.runtime.IExtension, java.lang.Object[]) */ - public void removeExtension(IExtension source, Object[] objects) { + @Override + public void removeExtension(IExtension source, Object[] objects) { for (int i = 0; i < objects.length; i++) { if (objects[i] == activeSupport) { dispose(); @@ -91,6 +93,7 @@ public class WorkbenchBrowserSupport extends AbstractWorkbenchBrowserSupport { /* (non-Javadoc) * @see org.eclipse.ui.browser.IWorkbenchBrowserSupport#createBrowser(int, java.lang.String, java.lang.String, java.lang.String) */ + @Override public IWebBrowser createBrowser(int style, String browserId, String name, String tooltip) throws PartInitException { return getActiveSupport() @@ -100,6 +103,7 @@ public class WorkbenchBrowserSupport extends AbstractWorkbenchBrowserSupport { /* (non-Javadoc) * @see org.eclipse.ui.browser.IWorkbenchBrowserSupport#createBrowser(java.lang.String) */ + @Override public IWebBrowser createBrowser(String browserId) throws PartInitException { return getActiveSupport().createBrowser(browserId); } @@ -107,6 +111,7 @@ public class WorkbenchBrowserSupport extends AbstractWorkbenchBrowserSupport { /* (non-Javadoc) * @see org.eclipse.ui.browser.IWorkbenchBrowserSupport#isInternalWebBrowserAvailable() */ + @Override public boolean isInternalWebBrowserAvailable() { return getActiveSupport().isInternalWebBrowserAvailable(); } @@ -138,6 +143,7 @@ public class WorkbenchBrowserSupport extends AbstractWorkbenchBrowserSupport { * * @see java.lang.Runnable#run() */ + @Override public void run() { IConfigurationElement[] elements = Platform .getExtensionRegistry().getConfigurationElementsFor( diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/commands/CommandImagePersistence.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/commands/CommandImagePersistence.java index 07c25f40164..394fe2ee3bf 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/commands/CommandImagePersistence.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/commands/CommandImagePersistence.java @@ -167,6 +167,7 @@ public final class CommandImagePersistence extends RegistryPersistence { this.commandService = commandService; } + @Override protected final boolean isChangeImportant(final IRegistryChangeEvent event) { final IExtensionDelta[] imageDeltas = event.getExtensionDeltas( PlatformUI.PLUGIN_ID, @@ -181,6 +182,7 @@ public final class CommandImagePersistence extends RegistryPersistence { /** * Reads all of the command images from the registry. */ + @Override protected final void read() { super.read(); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/commands/CommandImageService.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/commands/CommandImageService.java index 32321c5c80a..b7d37f6edf9 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/commands/CommandImageService.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/commands/CommandImageService.java @@ -103,6 +103,7 @@ public final class CommandImageService implements ICommandImageService { commandImageManager.bind(commandId, type, style, url); } + @Override public final void dispose() { commandImagePersistence.dispose(); } @@ -121,20 +122,24 @@ public final class CommandImageService implements ICommandImageService { return commandImageManager.generateUnusedStyle(commandId); } + @Override public final ImageDescriptor getImageDescriptor(final String commandId) { return commandImageManager.getImageDescriptor(commandId); } + @Override public final ImageDescriptor getImageDescriptor(final String commandId, final int type) { return commandImageManager.getImageDescriptor(commandId, type); } + @Override public final ImageDescriptor getImageDescriptor(final String commandId, final int type, final String style) { return commandImageManager.getImageDescriptor(commandId, type, style); } + @Override public final ImageDescriptor getImageDescriptor(final String commandId, final String style) { return commandImageManager.getImageDescriptor(commandId, style); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/commands/CommandLegacyWrapper.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/commands/CommandLegacyWrapper.java index 801da0b6478..21080120d8d 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/commands/CommandLegacyWrapper.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/commands/CommandLegacyWrapper.java @@ -86,6 +86,7 @@ final class CommandLegacyWrapper implements ICommand { * @see org.eclipse.ui.commands.ICommand#addCommandListener(org.eclipse.ui.commands.ICommandListener) */ + @Override public final void addCommandListener(final ICommandListener commandListener) { command.addCommandListener(new LegacyCommandListenerWrapper( commandListener, bindingManager)); @@ -96,6 +97,7 @@ final class CommandLegacyWrapper implements ICommand { * * @see org.eclipse.ui.commands.ICommand#execute(java.util.Map) */ + @Override public final Object execute(Map parameterValuesByName) throws ExecutionException, NotHandledException { try { @@ -117,6 +119,7 @@ final class CommandLegacyWrapper implements ICommand { * * @see org.eclipse.ui.commands.ICommand#getAttributeValuesByName() */ + @Override public final Map getAttributeValuesByName() { final Map attributeValues = new HashMap(); // avoid using Boolean.valueOf to allow compilation against JCL @@ -133,6 +136,7 @@ final class CommandLegacyWrapper implements ICommand { * * @see org.eclipse.ui.commands.ICommand#getCategoryId() */ + @Override public final String getCategoryId() throws NotDefinedException { try { return command.getCategory().getId(); @@ -146,6 +150,7 @@ final class CommandLegacyWrapper implements ICommand { * * @see org.eclipse.ui.commands.ICommand#getDescription() */ + @Override public final String getDescription() throws NotDefinedException { try { return command.getDescription(); @@ -159,6 +164,7 @@ final class CommandLegacyWrapper implements ICommand { * * @see org.eclipse.ui.commands.ICommand#getId() */ + @Override public final String getId() { return command.getId(); } @@ -168,6 +174,7 @@ final class CommandLegacyWrapper implements ICommand { * * @see org.eclipse.ui.commands.ICommand#getKeySequenceBindings() */ + @Override public final List getKeySequenceBindings() { final List legacyBindings = new ArrayList(); if (parameterizedCommand == null) { @@ -197,6 +204,7 @@ final class CommandLegacyWrapper implements ICommand { * * @see org.eclipse.ui.commands.ICommand#getName() */ + @Override public final String getName() throws NotDefinedException { try { return command.getName(); @@ -210,6 +218,7 @@ final class CommandLegacyWrapper implements ICommand { * * @see org.eclipse.ui.commands.ICommand#isDefined() */ + @Override public final boolean isDefined() { return command.isDefined(); } @@ -219,6 +228,7 @@ final class CommandLegacyWrapper implements ICommand { * * @see org.eclipse.ui.commands.ICommand#isHandled() */ + @Override public final boolean isHandled() { return command.isHandled(); } @@ -228,6 +238,7 @@ final class CommandLegacyWrapper implements ICommand { * * @see org.eclipse.ui.commands.ICommand#removeCommandListener(org.eclipse.ui.commands.ICommandListener) */ + @Override public final void removeCommandListener( final ICommandListener commandListener) { command.removeCommandListener(new LegacyCommandListenerWrapper( @@ -239,6 +250,7 @@ final class CommandLegacyWrapper implements ICommand { * * @see java.lang.Comparable#compareTo(java.lang.Object) */ + @Override public final int compareTo(final Object o) { return command.compareTo(o); } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/commands/CommandManagerLegacyWrapper.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/commands/CommandManagerLegacyWrapper.java index c078996afff..9e60ecad553 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/commands/CommandManagerLegacyWrapper.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/commands/CommandManagerLegacyWrapper.java @@ -138,6 +138,7 @@ public final class CommandManagerLegacyWrapper implements ICommandManager, this.contextManager = contextManager; } + @Override public final void addCommandManagerListener( final ICommandManagerListener commandManagerListener) { if (commandManagerListener == null) { @@ -161,6 +162,7 @@ public final class CommandManagerLegacyWrapper implements ICommandManager, * * @see org.eclipse.jface.bindings.IBindingManagerListener#bindingManagerChanged(org.eclipse.jface.bindings.BindingManagerEvent) */ + @Override public final void bindingManagerChanged(final BindingManagerEvent event) { final boolean schemeDefinitionsChanged = event.getScheme() != null; final Set previousSchemes; @@ -195,6 +197,7 @@ public final class CommandManagerLegacyWrapper implements ICommandManager, * * @see org.eclipse.commands.ICommandManagerListener#commandManagerChanged(org.eclipse.commands.CommandManagerEvent) */ + @Override public final void commandManagerChanged( final org.eclipse.core.commands.CommandManagerEvent event) { // Figure out the set of previous category identifiers. @@ -234,6 +237,7 @@ public final class CommandManagerLegacyWrapper implements ICommandManager, previousCategoryIds, previousCommandIds, null)); } + @Override public final void contextManagerChanged(final ContextManagerEvent event) { fireCommandManagerChanged(new CommandManagerEvent(this, event .isActiveContextsChanged(), false, false, false, false, false, @@ -253,10 +257,12 @@ public final class CommandManagerLegacyWrapper implements ICommandManager, } } + @Override public Set getActiveContextIds() { return contextManager.getActiveContextIds(); } + @Override public String getActiveKeyConfigurationId() { final Scheme scheme = bindingManager.getActiveScheme(); if (scheme != null) { @@ -270,20 +276,24 @@ public final class CommandManagerLegacyWrapper implements ICommandManager, return Util.ZERO_LENGTH_STRING; } + @Override public String getActiveLocale() { return bindingManager.getLocale(); } + @Override public String getActivePlatform() { return bindingManager.getPlatform(); } + @Override public ICategory getCategory(String categoryId) { // TODO Provide access to the categories. // return new CategoryWrapper(commandManager.getCategory(categoryId)); return null; } + @Override public ICommand getCommand(String commandId) { final Command command = commandManager.getCommand(commandId); if (!command.isDefined()) { @@ -297,14 +307,17 @@ public final class CommandManagerLegacyWrapper implements ICommandManager, * * @see org.eclipse.ui.commands.ICommandManager#getDefinedCategoryIds() */ + @Override public Set getDefinedCategoryIds() { return commandManager.getDefinedCategoryIds(); } + @Override public Set getDefinedCommandIds() { return commandManager.getDefinedCommandIds(); } + @Override public Set getDefinedKeyConfigurationIds() { final Set definedIds = new HashSet(); final Scheme[] schemes = bindingManager.getDefinedSchemes(); @@ -314,11 +327,13 @@ public final class CommandManagerLegacyWrapper implements ICommandManager, return definedIds; } + @Override public IKeyConfiguration getKeyConfiguration(String keyConfigurationId) { final Scheme scheme = bindingManager.getScheme(keyConfigurationId); return new SchemeLegacyWrapper(scheme, bindingManager); } + @Override public Map getPartialMatches(KeySequence keySequence) { try { final org.eclipse.jface.bindings.keys.KeySequence sequence = org.eclipse.jface.bindings.keys.KeySequence @@ -345,6 +360,7 @@ public final class CommandManagerLegacyWrapper implements ICommandManager, } } + @Override public String getPerfectMatch(KeySequence keySequence) { try { final org.eclipse.jface.bindings.keys.KeySequence sequence = org.eclipse.jface.bindings.keys.KeySequence @@ -361,6 +377,7 @@ public final class CommandManagerLegacyWrapper implements ICommandManager, } } + @Override public boolean isPartialMatch(KeySequence keySequence) { try { final org.eclipse.jface.bindings.keys.KeySequence sequence = org.eclipse.jface.bindings.keys.KeySequence @@ -371,6 +388,7 @@ public final class CommandManagerLegacyWrapper implements ICommandManager, } } + @Override public boolean isPerfectMatch(KeySequence keySequence) { try { final org.eclipse.jface.bindings.keys.KeySequence sequence = org.eclipse.jface.bindings.keys.KeySequence @@ -381,6 +399,7 @@ public final class CommandManagerLegacyWrapper implements ICommandManager, } } + @Override public void removeCommandManagerListener( ICommandManagerListener commandManagerListener) { if (commandManagerListener == null) { diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/commands/CommandPersistence.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/commands/CommandPersistence.java index fa4d7596f6b..11e489ca672 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/commands/CommandPersistence.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/commands/CommandPersistence.java @@ -423,6 +423,7 @@ public final class CommandPersistence extends RegistryPersistence { this.commandManager = commandService; } + @Override protected final boolean isChangeImportant(final IRegistryChangeEvent event) { return false; } @@ -449,6 +450,7 @@ public final class CommandPersistence extends RegistryPersistence { * The command service which should be populated with the values * from the registry; must not be <code>null</code>. */ + @Override protected final void read() { super.read(); reRead(); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/commands/CommandService.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/commands/CommandService.java index 39a8b47c300..be56d2586ac 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/commands/CommandService.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/commands/CommandService.java @@ -106,21 +106,25 @@ public final class CommandService implements ICommandService, IUpdateService { this.context = context; } + @Override public final void addExecutionListener(final IExecutionListener listener) { commandManager.addExecutionListener(listener); } + @Override public final void defineUncategorizedCategory(final String name, final String description) { commandManager.defineUncategorizedCategory(name, description); } + @Override public final ParameterizedCommand deserialize( final String serializedParameterizedCommand) throws NotDefinedException, SerializationException { return commandManager.deserialize(serializedParameterizedCommand); } + @Override public final void dispose() { commandPersistence.dispose(); @@ -148,61 +152,75 @@ public final class CommandService implements ICommandService, IUpdateService { commandCallbacks = null; } + @Override public final Category getCategory(final String categoryId) { return commandManager.getCategory(categoryId); } + @Override public final Command getCommand(final String commandId) { return commandManager.getCommand(commandId); } + @Override public final Category[] getDefinedCategories() { return commandManager.getDefinedCategories(); } + @Override public final Collection getDefinedCategoryIds() { return commandManager.getDefinedCategoryIds(); } + @Override public final Collection getDefinedCommandIds() { return commandManager.getDefinedCommandIds(); } + @Override public final Command[] getDefinedCommands() { return commandManager.getDefinedCommands(); } + @Override public Collection getDefinedParameterTypeIds() { return commandManager.getDefinedParameterTypeIds(); } + @Override public ParameterType[] getDefinedParameterTypes() { return commandManager.getDefinedParameterTypes(); } + @Override public final String getHelpContextId(final Command command) throws NotDefinedException { return commandManager.getHelpContextId(command); } + @Override public final String getHelpContextId(final String commandId) throws NotDefinedException { final Command command = getCommand(commandId); return commandManager.getHelpContextId(command); } + @Override public ParameterType getParameterType(final String parameterTypeId) { return commandManager.getParameterType(parameterTypeId); } + @Override public final void readRegistry() { commandPersistence.reRead(); } + @Override public final void removeExecutionListener(final IExecutionListener listener) { commandManager.removeExecutionListener(listener); } + @Override public final void setHelpContextId(final IHandler handler, final String helpContextId) { commandManager.setHelpContextId(handler, helpContextId); @@ -220,6 +238,7 @@ public final class CommandService implements ICommandService, IUpdateService { * @see org.eclipse.ui.commands.ICommandService#refreshElements(java.lang.String, * java.util.Map) */ + @Override public final void refreshElements(String commandId, Map filter) { Command cmd = getCommand(commandId); @@ -242,11 +261,13 @@ public final class CommandService implements ICommandService, IUpdateService { final Map parms = Collections.unmodifiableMap(callbackRef .getParameters()); ISafeRunnable run = new ISafeRunnable() { + @Override public void handleException(Throwable exception) { WorkbenchPlugin.log("Failed to update callback: " //$NON-NLS-1$ + callbackRef.getCommandId(), exception); } + @Override public void run() throws Exception { updater.updateElement(callbackRef.getElement(), parms); } @@ -276,6 +297,7 @@ public final class CommandService implements ICommandService, IUpdateService { * @see org.eclipse.ui.commands.ICommandService#registerElementForCommand(org.eclipse.core.commands.ParameterizedCommand, * org.eclipse.ui.menus.UIElement) */ + @Override public final IElementReference registerElementForCommand( ParameterizedCommand command, UIElement element) throws NotDefinedException { @@ -300,6 +322,7 @@ public final class CommandService implements ICommandService, IUpdateService { * * @see org.eclipse.ui.commands.ICommandService#registerElement(org.eclipse.ui.commands.IElementReference) */ + @Override public void registerElement(IElementReference elementReference) { List parameterizedCommands = (List) commandCallbacks .get(elementReference.getCommandId()); @@ -327,6 +350,7 @@ public final class CommandService implements ICommandService, IUpdateService { * * @see org.eclipse.ui.commands.ICommandService#unregisterElement(org.eclipse.ui.commands.IElementReference) */ + @Override public void unregisterElement(IElementReference elementReference) { if (commandCallbacks == null) return; @@ -354,6 +378,7 @@ public final class CommandService implements ICommandService, IUpdateService { * registerElementForUpdate(org.eclipse.core.commands.ParameterizedCommand, * org.eclipse.e4.ui.model.application.ui.MUILabel) */ + @Override public Runnable registerElementForUpdate(ParameterizedCommand parameterizedCommand, final MItem item) { UIElement element = new UIElement(context.get(IWorkbench.class)) { @@ -394,6 +419,7 @@ public final class CommandService implements ICommandService, IUpdateService { final IElementReference reference = registerElementForCommand(parameterizedCommand, element); return new Runnable() { + @Override public void run() { unregisterElement(reference); } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/commands/CommandServiceFactory.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/commands/CommandServiceFactory.java index 2734ecbe922..ca50313a12d 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/commands/CommandServiceFactory.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/commands/CommandServiceFactory.java @@ -35,6 +35,7 @@ public class CommandServiceFactory extends AbstractServiceFactory { * org.eclipse.ui.services.IServiceLocator, * org.eclipse.ui.services.IServiceLocator) */ + @Override public Object create(Class serviceInterface, IServiceLocator parentLocator, IServiceLocator locator) { if (!ICommandService.class.equals(serviceInterface)) { diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/commands/CommandStateProxy.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/commands/CommandStateProxy.java index 30fa3f9bf13..dd131ead66e 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/commands/CommandStateProxy.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/commands/CommandStateProxy.java @@ -110,6 +110,7 @@ public final class CommandStateProxy extends PersistentState { this.preferenceStore = preferenceStore; } + @Override public final void addListener(final IStateListener listener) { if (state == null) { addListenerObject(listener); @@ -118,6 +119,7 @@ public final class CommandStateProxy extends PersistentState { } } + @Override public final void dispose() { if (state != null) { state.dispose(); @@ -131,6 +133,7 @@ public final class CommandStateProxy extends PersistentState { } } + @Override public final Object getValue() { if (loadState()) { return state.getValue(); @@ -139,6 +142,7 @@ public final class CommandStateProxy extends PersistentState { return null; } + @Override public final void load(final IPreferenceStore store, final String preferenceKey) { if (loadState() && state instanceof PersistentState) { @@ -216,6 +220,7 @@ public final class CommandStateProxy extends PersistentState { return true; } + @Override public final void removeListener(final IStateListener listener) { if (state == null) { removeListenerObject(listener); @@ -224,6 +229,7 @@ public final class CommandStateProxy extends PersistentState { } } + @Override public final void save(final IPreferenceStore store, final String preferenceKey) { if (loadState() && state instanceof PersistentState) { @@ -231,6 +237,7 @@ public final class CommandStateProxy extends PersistentState { } } + @Override public final void setId(final String id) { super.setId(id); if (state != null) { @@ -238,18 +245,21 @@ public final class CommandStateProxy extends PersistentState { } } + @Override public final void setShouldPersist(final boolean persisted) { if (loadState(persisted) && state instanceof PersistentState) { ((PersistentState) state).setShouldPersist(persisted); } } + @Override public final void setValue(final Object value) { if (loadState()) { state.setValue(value); } } + @Override public final boolean shouldPersist() { if (loadState() && state instanceof PersistentState) { return ((PersistentState) state).shouldPersist(); @@ -258,6 +268,7 @@ public final class CommandStateProxy extends PersistentState { return false; } + @Override public final String toString() { if (state == null) { return configurationElement.getAttribute(stateAttributeName); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/commands/ElementReference.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/commands/ElementReference.java index a620cfc16da..c67c4aa48f2 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/commands/ElementReference.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/commands/ElementReference.java @@ -54,6 +54,7 @@ public class ElementReference implements IElementReference { * * @see org.eclipse.ui.commands.IElementReference#getElement() */ + @Override public UIElement getElement() { return element; } @@ -61,6 +62,7 @@ public class ElementReference implements IElementReference { /* (non-Javadoc) * @see org.eclipse.ui.commands.IElementReference#getCommandId() */ + @Override public String getCommandId() { return commandId; } @@ -68,6 +70,7 @@ public class ElementReference implements IElementReference { /* (non-Javadoc) * @see org.eclipse.ui.commands.IElementReference#getParameters() */ + @Override public Map getParameters() { return parameters; } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/commands/LegacyCommandListenerWrapper.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/commands/LegacyCommandListenerWrapper.java index 1a7cfd4d566..6bf1ff04ea7 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/commands/LegacyCommandListenerWrapper.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/commands/LegacyCommandListenerWrapper.java @@ -62,6 +62,7 @@ final class LegacyCommandListenerWrapper implements ICommandListener { * * @see org.eclipse.commands.ICommandListener#commandChanged(org.eclipse.commands.CommandEvent) */ + @Override public final void commandChanged(final CommandEvent commandEvent) { final ICommand command = new CommandLegacyWrapper(commandEvent.getCommand(), bindingManager); @@ -76,6 +77,7 @@ final class LegacyCommandListenerWrapper implements ICommandListener { } + @Override public final boolean equals(final Object object) { if (object instanceof LegacyCommandListenerWrapper) { final LegacyCommandListenerWrapper wrapper = (LegacyCommandListenerWrapper) object; @@ -90,6 +92,7 @@ final class LegacyCommandListenerWrapper implements ICommandListener { return false; } + @Override public final int hashCode() { return listener.hashCode(); } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/commands/ParameterValueConverterProxy.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/commands/ParameterValueConverterProxy.java index a9ff3a77081..35eec4f2a27 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/commands/ParameterValueConverterProxy.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/commands/ParameterValueConverterProxy.java @@ -57,11 +57,13 @@ public final class ParameterValueConverterProxy extends this.converterConfigurationElement = converterConfigurationElement; } + @Override public final Object convertToObject(final String parameterValue) throws ParameterValueConversionException { return getConverter().convertToObject(parameterValue); } + @Override public final String convertToString(final Object parameterValue) throws ParameterValueConversionException { return getConverter().convertToString(parameterValue); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/commands/SlaveCommandService.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/commands/SlaveCommandService.java index 86db5c76831..a7d76644f55 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/commands/SlaveCommandService.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/commands/SlaveCommandService.java @@ -105,6 +105,7 @@ public class SlaveCommandService implements ICommandService, IUpdateService { * * @see org.eclipse.ui.commands.ICommandService#addExecutionListener(org.eclipse.core.commands.IExecutionListener) */ + @Override public void addExecutionListener(IExecutionListener listener) { if (!fExecutionListeners.contains(listener)) { fExecutionListeners.add(listener); @@ -118,6 +119,7 @@ public class SlaveCommandService implements ICommandService, IUpdateService { * @see org.eclipse.ui.commands.ICommandService#defineUncategorizedCategory(java.lang.String, * java.lang.String) */ + @Override public void defineUncategorizedCategory(String name, String description) { fParentService.defineUncategorizedCategory(name, description); } @@ -127,6 +129,7 @@ public class SlaveCommandService implements ICommandService, IUpdateService { * * @see org.eclipse.ui.commands.ICommandService#deserialize(java.lang.String) */ + @Override public ParameterizedCommand deserialize( String serializedParameterizedCommand) throws NotDefinedException, SerializationException { @@ -138,6 +141,7 @@ public class SlaveCommandService implements ICommandService, IUpdateService { * * @see org.eclipse.ui.services.IDisposable#dispose() */ + @Override public void dispose() { if (!fExecutionListeners.isEmpty()) { Object[] array = fExecutionListeners.toArray(); @@ -159,6 +163,7 @@ public class SlaveCommandService implements ICommandService, IUpdateService { * * @see org.eclipse.ui.commands.ICommandService#getCategory(java.lang.String) */ + @Override public Category getCategory(String categoryId) { return fParentService.getCategory(categoryId); } @@ -168,6 +173,7 @@ public class SlaveCommandService implements ICommandService, IUpdateService { * * @see org.eclipse.ui.commands.ICommandService#getCommand(java.lang.String) */ + @Override public Command getCommand(String commandId) { return fParentService.getCommand(commandId); } @@ -177,6 +183,7 @@ public class SlaveCommandService implements ICommandService, IUpdateService { * * @see org.eclipse.ui.commands.ICommandService#getDefinedCategories() */ + @Override public Category[] getDefinedCategories() { return fParentService.getDefinedCategories(); } @@ -186,6 +193,7 @@ public class SlaveCommandService implements ICommandService, IUpdateService { * * @see org.eclipse.ui.commands.ICommandService#getDefinedCategoryIds() */ + @Override public Collection getDefinedCategoryIds() { return fParentService.getDefinedCategoryIds(); } @@ -195,6 +203,7 @@ public class SlaveCommandService implements ICommandService, IUpdateService { * * @see org.eclipse.ui.commands.ICommandService#getDefinedCommandIds() */ + @Override public Collection getDefinedCommandIds() { return fParentService.getDefinedCommandIds(); } @@ -204,6 +213,7 @@ public class SlaveCommandService implements ICommandService, IUpdateService { * * @see org.eclipse.ui.commands.ICommandService#getDefinedCommands() */ + @Override public Command[] getDefinedCommands() { return fParentService.getDefinedCommands(); } @@ -213,6 +223,7 @@ public class SlaveCommandService implements ICommandService, IUpdateService { * * @see org.eclipse.ui.commands.ICommandService#getDefinedParameterTypeIds() */ + @Override public Collection getDefinedParameterTypeIds() { return fParentService.getDefinedParameterTypeIds(); } @@ -222,15 +233,18 @@ public class SlaveCommandService implements ICommandService, IUpdateService { * * @see org.eclipse.ui.commands.ICommandService#getDefinedParameterTypes() */ + @Override public ParameterType[] getDefinedParameterTypes() { return fParentService.getDefinedParameterTypes(); } + @Override public final String getHelpContextId(final Command command) throws NotDefinedException { return fParentService.getHelpContextId(command); } + @Override public final String getHelpContextId(final String commandId) throws NotDefinedException { return fParentService.getHelpContextId(commandId); @@ -241,6 +255,7 @@ public class SlaveCommandService implements ICommandService, IUpdateService { * * @see org.eclipse.ui.commands.ICommandService#getParameterType(java.lang.String) */ + @Override public ParameterType getParameterType(String parameterTypeId) { return fParentService.getParameterType(parameterTypeId); } @@ -250,6 +265,7 @@ public class SlaveCommandService implements ICommandService, IUpdateService { * * @see org.eclipse.ui.commands.ICommandService#readRegistry() */ + @Override public void readRegistry() { fParentService.readRegistry(); } @@ -259,11 +275,13 @@ public class SlaveCommandService implements ICommandService, IUpdateService { * * @see org.eclipse.ui.commands.ICommandService#removeExecutionListener(org.eclipse.core.commands.IExecutionListener) */ + @Override public void removeExecutionListener(IExecutionListener listener) { fExecutionListeners.remove(listener); fParentService.removeExecutionListener(listener); } + @Override public final void setHelpContextId(final IHandler handler, final String helpContextId) { fParentService.setHelpContextId(handler, helpContextId); @@ -275,6 +293,7 @@ public class SlaveCommandService implements ICommandService, IUpdateService { * @see org.eclipse.ui.commands.ICommandService#refreshElements(java.lang.String, * java.util.Map) */ + @Override public void refreshElements(String commandId, Map filter) { fParentService.refreshElements(commandId, filter); } @@ -285,6 +304,7 @@ public class SlaveCommandService implements ICommandService, IUpdateService { * @see org.eclipse.ui.commands.ICommandService#registerElementForCommand(org.eclipse.core.commands.ParameterizedCommand, * org.eclipse.ui.menus.UIElement) */ + @Override public IElementReference registerElementForCommand( ParameterizedCommand command, UIElement element) throws NotDefinedException { @@ -309,6 +329,7 @@ public class SlaveCommandService implements ICommandService, IUpdateService { * * @see org.eclipse.ui.commands.ICommandService#registerElement(org.eclipse.ui.commands.IElementReference) */ + @Override public void registerElement(IElementReference elementReference) { fCallbackCache.add(elementReference); elementReference.getParameters().put(fScopingName, fScopingValue); @@ -320,6 +341,7 @@ public class SlaveCommandService implements ICommandService, IUpdateService { * * @see org.eclipse.ui.commands.ICommandService#unregisterElement(org.eclipse.ui.commands.IElementReference) */ + @Override public void unregisterElement(IElementReference elementReference) { fCallbackCache.remove(elementReference); fParentService.unregisterElement(elementReference); @@ -332,6 +354,7 @@ public class SlaveCommandService implements ICommandService, IUpdateService { * registerElementForUpdate(org.eclipse.core.commands.ParameterizedCommand, * org.eclipse.e4.ui.model.application.ui.menu.MItem) */ + @Override public Runnable registerElementForUpdate(ParameterizedCommand parameterizedCommand, final MItem item) { UIElement element = new UIElement(fScopingValue) { @@ -372,6 +395,7 @@ public class SlaveCommandService implements ICommandService, IUpdateService { final IElementReference reference = registerElementForCommand(parameterizedCommand, element); return new Runnable() { + @Override public void run() { unregisterElement(reference); } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/commands/WorkbenchCommandSupport.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/commands/WorkbenchCommandSupport.java index e8c448a66b7..61862d3f42b 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/commands/WorkbenchCommandSupport.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/commands/WorkbenchCommandSupport.java @@ -86,6 +86,7 @@ public class WorkbenchCommandSupport implements IWorkbenchCommandSupport { .getKeyFormatterForPlatform()); } + @Override public final void addHandlerSubmission( final HandlerSubmission handlerSubmission) { final IHandlerActivation activation = handlerService.activateHandler( @@ -100,6 +101,7 @@ public class WorkbenchCommandSupport implements IWorkbenchCommandSupport { activationsBySubmission.put(handlerSubmission, activation); } + @Override public final void addHandlerSubmissions(final Collection handlerSubmissions) { final Iterator submissionItr = handlerSubmissions.iterator(); while (submissionItr.hasNext()) { @@ -107,10 +109,12 @@ public class WorkbenchCommandSupport implements IWorkbenchCommandSupport { } } + @Override public ICommandManager getCommandManager() { return commandManagerWrapper; } + @Override public final void removeHandlerSubmission( final HandlerSubmission handlerSubmission) { if (activationsBySubmission == null) { @@ -124,6 +128,7 @@ public class WorkbenchCommandSupport implements IWorkbenchCommandSupport { } } + @Override public final void removeHandlerSubmissions( final Collection handlerSubmissions) { final Iterator submissionItr = handlerSubmissions.iterator(); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/contexts/ActiveContextSourceProvider.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/contexts/ActiveContextSourceProvider.java index cfc392ea8ba..7394b135713 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/contexts/ActiveContextSourceProvider.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/contexts/ActiveContextSourceProvider.java @@ -45,6 +45,7 @@ public final class ActiveContextSourceProvider extends AbstractSourceProvider */ private IContextService contextService; + @Override public final void contextManagerChanged(final ContextManagerEvent event) { if (event.isActiveContextsChanged()) { final Map currentState = getCurrentState(); @@ -58,10 +59,12 @@ public final class ActiveContextSourceProvider extends AbstractSourceProvider } } + @Override public final void dispose() { contextService.removeContextManagerListener(this); } + @Override public final Map getCurrentState() { final Map currentState = new TreeMap(); final Collection activeContextIds = contextService @@ -70,6 +73,7 @@ public final class ActiveContextSourceProvider extends AbstractSourceProvider return currentState; } + @Override public final String[] getProvidedSourceNames() { return PROVIDED_SOURCE_NAMES; } @@ -79,6 +83,7 @@ public final class ActiveContextSourceProvider extends AbstractSourceProvider * * @see org.eclipse.ui.AbstractSourceProvider#initialize(org.eclipse.ui.services.IServiceLocator) */ + @Override public void initialize(IServiceLocator locator) { contextService = (IContextService) locator .getService(IContextService.class); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/contexts/ContextActivation.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/contexts/ContextActivation.java index f1991778aa3..6b92d456be7 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/contexts/ContextActivation.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/contexts/ContextActivation.java @@ -82,22 +82,27 @@ final class ContextActivation extends EvaluationResultCache implements this.contextService = contextService; } + @Override public final void clearActive() { clearResult(); } + @Override public final String getContextId() { return contextId; } + @Override public final IContextService getContextService() { return contextService; } + @Override public final boolean isActive(final IEvaluationContext context) { return evaluate(context); } + @Override public final String toString() { final StringBuffer buffer = new StringBuffer(); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/contexts/ContextAuthority.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/contexts/ContextAuthority.java index c1758c930f7..cc7ee6fd01c 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/contexts/ContextAuthority.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/contexts/ContextAuthority.java @@ -263,6 +263,7 @@ public final class ContextAuthority extends ExpressionAuthority { * * @see org.eclipse.swt.events.DisposeListener#widgetDisposed(org.eclipse.swt.events.DisposeEvent) */ + @Override public void widgetDisposed(DisposeEvent e) { registeredWindows.remove(null); if (!newShell.isDisposed()) { @@ -568,6 +569,7 @@ public final class ContextAuthority extends ExpressionAuthority { * * @see org.eclipse.swt.events.DisposeListener#widgetDisposed(org.eclipse.swt.events.DisposeEvent) */ + @Override public void widgetDisposed(DisposeEvent e) { registeredWindows.remove(shell); if (!shell.isDisposed()) { @@ -603,6 +605,7 @@ public final class ContextAuthority extends ExpressionAuthority { * @param sourcePriority * A bit mask of all the source priorities that have changed. */ + @Override protected final void sourceChanged(final int sourcePriority) { // If tracing, then track how long it takes to process the activations. long startTime = 0L; @@ -773,6 +776,7 @@ public final class ContextAuthority extends ExpressionAuthority { * The new value of the variable. If this value is * <code>null</code>, then the variable is removed. */ + @Override protected final void updateEvaluationContext(final String name, final Object value) { /* diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/contexts/ContextLegacyWrapper.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/contexts/ContextLegacyWrapper.java index 40d2a7470da..b40638efbc1 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/contexts/ContextLegacyWrapper.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/contexts/ContextLegacyWrapper.java @@ -68,6 +68,7 @@ public class ContextLegacyWrapper implements IContext { * * @see org.eclipse.ui.contexts.IContext#addContextListener(org.eclipse.ui.contexts.IContextListener) */ + @Override public void addContextListener(IContextListener contextListener) { final LegacyContextListenerWrapper wrapper = new LegacyContextListenerWrapper( contextListener, contextManager, this); @@ -85,6 +86,7 @@ public class ContextLegacyWrapper implements IContext { * * @see java.lang.Comparable#compareTo(T) */ + @Override public int compareTo(Object o) { return Util .compare(wrappedContext, ((ContextLegacyWrapper) o).wrappedContext); @@ -95,6 +97,7 @@ public class ContextLegacyWrapper implements IContext { * * @see org.eclipse.ui.contexts.IContext#getId() */ + @Override public String getId() { return wrappedContext.getId(); } @@ -104,6 +107,7 @@ public class ContextLegacyWrapper implements IContext { * * @see org.eclipse.ui.contexts.IContext#getName() */ + @Override public String getName() throws NotDefinedException { try { return wrappedContext.getName(); @@ -117,6 +121,7 @@ public class ContextLegacyWrapper implements IContext { * * @see org.eclipse.ui.contexts.IContext#getParentId() */ + @Override public String getParentId() throws NotDefinedException { try { return wrappedContext.getParentId(); @@ -130,6 +135,7 @@ public class ContextLegacyWrapper implements IContext { * * @see org.eclipse.ui.contexts.IContext#isDefined() */ + @Override public boolean isDefined() { return wrappedContext.isDefined(); } @@ -139,6 +145,7 @@ public class ContextLegacyWrapper implements IContext { * * @see org.eclipse.ui.contexts.IContext#isEnabled() */ + @Override public boolean isEnabled() { return contextManager.getActiveContextIds().contains( wrappedContext.getId()); @@ -149,6 +156,7 @@ public class ContextLegacyWrapper implements IContext { * * @see org.eclipse.ui.contexts.IContext#removeContextListener(org.eclipse.ui.contexts.IContextListener) */ + @Override public void removeContextListener(IContextListener contextListener) { final LegacyContextListenerWrapper wrapper = new LegacyContextListenerWrapper( contextListener, contextManager, this); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/contexts/ContextManagerLegacyWrapper.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/contexts/ContextManagerLegacyWrapper.java index 564a833e619..410a1035ae2 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/contexts/ContextManagerLegacyWrapper.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/contexts/ContextManagerLegacyWrapper.java @@ -50,6 +50,7 @@ public final class ContextManagerLegacyWrapper implements /** * @see java.util.Comparator#compare(java.lang.Object, java.lang.Object) */ + @Override public final int compare(final Object object1, final Object object2) { final String contextId1 = (String) object1; final String contextId2 = (String) object2; @@ -148,6 +149,7 @@ public final class ContextManagerLegacyWrapper implements this.contextManager.addContextManagerListener(this); } + @Override public void addContextManagerListener( IContextManagerListener contextManagerListener) { if (contextManagerListener == null) { @@ -168,6 +170,7 @@ public final class ContextManagerLegacyWrapper implements * * @see org.eclipse.core.commands.contexts.IContextManagerListener#contextManagerChanged(org.eclipse.core.commands.contexts.ContextManagerEvent) */ + @Override public void contextManagerChanged( org.eclipse.core.commands.contexts.ContextManagerEvent contextManagerEvent) { final String contextId = contextManagerEvent.getContextId(); @@ -210,20 +213,24 @@ public final class ContextManagerLegacyWrapper implements } } + @Override public IContext getContext(String contextId) { return new ContextLegacyWrapper(contextManager.getContext(contextId), contextManager); } + @Override public SortedSet getDefinedContextIds() { return new DepthSortedContextIdSet(contextManager .getDefinedContextIds()); } + @Override public SortedSet getEnabledContextIds() { return new DepthSortedContextIdSet(contextManager.getActiveContextIds()); } + @Override public void removeContextManagerListener( IContextManagerListener contextManagerListener) { if (contextManagerListener == null) { diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/contexts/ContextPersistence.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/contexts/ContextPersistence.java index 9c56cb3058a..8ed2176d43d 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/contexts/ContextPersistence.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/contexts/ContextPersistence.java @@ -121,6 +121,7 @@ public final class ContextPersistence extends RegistryPersistence { this.contextManager = contextManager; } + @Override protected final boolean isChangeImportant(final IRegistryChangeEvent event) { final IExtensionDelta[] acceleratorScopeDeltas = event .getExtensionDeltas(PlatformUI.PLUGIN_ID, @@ -149,6 +150,7 @@ public final class ContextPersistence extends RegistryPersistence { * The context manager which should be populated with the values * from the registry; must not be <code>null</code>. */ + @Override protected final void read() { super.read(); reRead(); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/contexts/ContextService.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/contexts/ContextService.java index ae9c1a02dc1..02ee657bfe4 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/contexts/ContextService.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/contexts/ContextService.java @@ -86,6 +86,7 @@ public final class ContextService implements IContextService { /* (non-Javadoc) * @see org.eclipse.ui.contexts.IContextService#deferUpdates(boolean) */ + @Override public void deferUpdates(boolean defer) { contextManager.deferUpdates(defer); contextService.deferUpdates(defer); @@ -96,6 +97,7 @@ public final class ContextService implements IContextService { * * @see org.eclipse.ui.contexts.IContextService#activateContext(java.lang.String) */ + @Override public final IContextActivation activateContext(final String contextId) { return activateContext(contextId, null); } @@ -128,12 +130,14 @@ public final class ContextService implements IContextService { } if (result != EvaluationResult.FALSE) { runExternalCode(new Runnable() { + @Override public void run() { contextService.activateContext(contextId); } }); } else if (cached != null) { runExternalCode(new Runnable() { + @Override public void run() { contextService.deactivateContext(contextId); } @@ -155,6 +159,7 @@ public final class ContextService implements IContextService { * @see org.eclipse.ui.contexts.IContextService#activateContext(java.lang.String, * org.eclipse.core.expressions.Expression) */ + @Override public final IContextActivation activateContext(final String contextId, final Expression expression) { @@ -177,6 +182,7 @@ public final class ContextService implements IContextService { * @see org.eclipse.ui.contexts.IContextService#activateContext(java.lang.String, * org.eclipse.core.expressions.Expression, boolean) */ + @Override public IContextActivation activateContext(String contextId, Expression expression, boolean global) { return activateContext(contextId, expression); @@ -188,6 +194,7 @@ public final class ContextService implements IContextService { * @see org.eclipse.ui.contexts.IContextService#activateContext(java.lang.String, * org.eclipse.core.expressions.Expression, int) */ + @Override public final IContextActivation activateContext(final String contextId, final Expression expression, final int sourcePriority) { return activateContext(contextId, expression); @@ -198,6 +205,7 @@ public final class ContextService implements IContextService { * * @see org.eclipse.ui.contexts.IContextService#addContextManagerListener(org.eclipse.core.commands.contexts.IContextManagerListener) */ + @Override public final void addContextManagerListener( final IContextManagerListener listener) { contextManager.addContextManagerListener(listener); @@ -208,6 +216,7 @@ public final class ContextService implements IContextService { * * @see org.eclipse.ui.internal.services.IServiceWithSources#addSourceProvider(org.eclipse.ui.ISourceProvider) */ + @Override public final void addSourceProvider(final ISourceProvider provider) { contextAuthority.addSourceProvider(provider); } @@ -217,6 +226,7 @@ public final class ContextService implements IContextService { * * @see org.eclipse.ui.contexts.IContextService#deactivateContext(org.eclipse.ui.contexts.IContextActivation) */ + @Override public final void deactivateContext(final IContextActivation activation) { if (activation != null && activation.getContextService() == this) { final UpdateExpression rat = activationToRat.remove(activation); @@ -237,6 +247,7 @@ public final class ContextService implements IContextService { * * @see org.eclipse.ui.contexts.IContextService#deactivateContexts(java.util.Collection) */ + @Override public final void deactivateContexts(final Collection activations) { final Iterator activationItr = activations.iterator(); while (activationItr.hasNext()) { @@ -251,6 +262,7 @@ public final class ContextService implements IContextService { * * @see org.eclipse.ui.services.IDisposable#dispose() */ + @Override public final void dispose() { contextPersistence.dispose(); contextAuthority.dispose(); @@ -261,6 +273,7 @@ public final class ContextService implements IContextService { * * @see org.eclipse.ui.contexts.IContextService#getActiveContextIds() */ + @Override public final Collection getActiveContextIds() { return contextService.getActiveContextIds(); } @@ -270,6 +283,7 @@ public final class ContextService implements IContextService { * * @see org.eclipse.ui.contexts.IContextService#getContext(java.lang.String) */ + @Override public final Context getContext(final String contextId) { return contextService.getContext(contextId); } @@ -279,6 +293,7 @@ public final class ContextService implements IContextService { * * @see org.eclipse.ui.contexts.IContextService#getDefinedContextIds() */ + @Override public final Collection getDefinedContextIds() { return contextManager.getDefinedContextIds(); } @@ -288,6 +303,7 @@ public final class ContextService implements IContextService { * * @see org.eclipse.ui.contexts.IContextService#getDefinedContexts() */ + @Override public final Context[] getDefinedContexts() { return contextManager.getDefinedContexts(); } @@ -297,6 +313,7 @@ public final class ContextService implements IContextService { * * @see org.eclipse.ui.contexts.IContextService#getShellType(org.eclipse.swt.widgets.Shell) */ + @Override public final int getShellType(final Shell shell) { return contextAuthority.getShellType(shell); } @@ -306,6 +323,7 @@ public final class ContextService implements IContextService { * * @see org.eclipse.ui.contexts.IContextService#readRegistry() */ + @Override public final void readRegistry() { // contextPersistence.read(); } @@ -316,6 +334,7 @@ public final class ContextService implements IContextService { * @see org.eclipse.ui.contexts.IContextService#registerShell(org.eclipse.swt.widgets.Shell, * int) */ + @Override public final boolean registerShell(final Shell shell, final int type) { return contextAuthority.registerShell(shell, type); } @@ -325,6 +344,7 @@ public final class ContextService implements IContextService { * * @see org.eclipse.ui.contexts.IContextService#removeContextManagerListener(org.eclipse.core.commands.contexts.IContextManagerListener) */ + @Override public final void removeContextManagerListener( final IContextManagerListener listener) { contextManager.removeContextManagerListener(listener); @@ -335,6 +355,7 @@ public final class ContextService implements IContextService { * * @see org.eclipse.ui.internal.services.IServiceWithSources#removeSourceProvider(org.eclipse.ui.ISourceProvider) */ + @Override public final void removeSourceProvider(final ISourceProvider provider) { contextAuthority.removeSourceProvider(provider); } @@ -344,6 +365,7 @@ public final class ContextService implements IContextService { * * @see org.eclipse.ui.contexts.IContextService#unregisterShell(org.eclipse.swt.widgets.Shell) */ + @Override public final boolean unregisterShell(final Shell shell) { return contextAuthority.unregisterShell(shell); } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/contexts/ContextServiceFactory.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/contexts/ContextServiceFactory.java index 11e657aa0ef..6d19be1fa4e 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/contexts/ContextServiceFactory.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/contexts/ContextServiceFactory.java @@ -36,6 +36,7 @@ public class ContextServiceFactory extends AbstractServiceFactory { * org.eclipse.ui.services.IServiceLocator, * org.eclipse.ui.services.IServiceLocator) */ + @Override public Object create(Class serviceInterface, IServiceLocator parentLocator, IServiceLocator locator) { if (!IContextService.class.equals(serviceInterface)) { diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/contexts/LegacyContextListenerWrapper.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/contexts/LegacyContextListenerWrapper.java index d69379ac9a3..53f9a8905a4 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/contexts/LegacyContextListenerWrapper.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/contexts/LegacyContextListenerWrapper.java @@ -87,6 +87,7 @@ public class LegacyContextListenerWrapper implements IContextListener, * * @see org.eclipse.core.commands.contexts.IContextListener#contextChanged(org.eclipse.core.commands.contexts.ContextEvent) */ + @Override public final void contextChanged(final ContextEvent contextEvent) { wrappedListener .contextChanged(new org.eclipse.ui.contexts.ContextEvent( @@ -97,6 +98,7 @@ public class LegacyContextListenerWrapper implements IContextListener, .isParentIdChanged())); } + @Override public final void contextManagerChanged(final ContextManagerEvent event) { final String contextId = context.getId(); final boolean enabledChanged; @@ -125,6 +127,7 @@ public class LegacyContextListenerWrapper implements IContextListener, context, false, enabledChanged, false, false)); } + @Override public final boolean equals(final Object object) { if (object instanceof LegacyContextListenerWrapper) { final LegacyContextListenerWrapper other = (LegacyContextListenerWrapper) object; @@ -139,6 +142,7 @@ public class LegacyContextListenerWrapper implements IContextListener, return false; } + @Override public final int hashCode() { return wrappedListener.hashCode(); } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/contexts/NestableContextService.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/contexts/NestableContextService.java index b5571468ba9..dfc3405cd10 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/contexts/NestableContextService.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/contexts/NestableContextService.java @@ -59,6 +59,7 @@ public class NestableContextService extends SlaveContextService implements * * @see org.eclipse.ui.internal.contexts.SlaveContextService#doActivateContext(org.eclipse.ui.contexts.IContextActivation) */ + @Override protected IContextActivation doActivateContext(IContextActivation activation) { if (fActive) { return super.doActivateContext(activation); @@ -72,6 +73,7 @@ public class NestableContextService extends SlaveContextService implements * * @see org.eclipse.ui.internal.services.INestable#activate() */ + @Override public void activate() { if (fActive) { return; @@ -90,6 +92,7 @@ public class NestableContextService extends SlaveContextService implements * * @see org.eclipse.ui.internal.services.INestable#deactivate() */ + @Override public void deactivate() { if (!fActive) { return; diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/contexts/SlaveContextService.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/contexts/SlaveContextService.java index db496d492eb..e61e2c4f6e5 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/contexts/SlaveContextService.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/contexts/SlaveContextService.java @@ -111,6 +111,7 @@ public class SlaveContextService implements IContextService { fRegisteredShells = new ArrayList(); } + @Override public void deferUpdates(boolean defer) { fParentService.deferUpdates(defer); } @@ -120,6 +121,7 @@ public class SlaveContextService implements IContextService { * * @see org.eclipse.ui.contexts.IContextService#activateContext(java.lang.String) */ + @Override public IContextActivation activateContext(String contextId) { ContextActivation activation = new ContextActivation(contextId, @@ -133,6 +135,7 @@ public class SlaveContextService implements IContextService { * @see org.eclipse.ui.contexts.IContextService#activateContext(java.lang.String, * org.eclipse.core.expressions.Expression) */ + @Override public IContextActivation activateContext(String contextId, Expression expression) { return activateContext(contextId, expression, false); @@ -144,6 +147,7 @@ public class SlaveContextService implements IContextService { * @see org.eclipse.ui.contexts.IContextService#activateContext(java.lang.String, * org.eclipse.core.expressions.Expression, boolean) */ + @Override public IContextActivation activateContext(String contextId, Expression expression, boolean global) { if (global) { @@ -174,6 +178,7 @@ public class SlaveContextService implements IContextService { * @see org.eclipse.ui.contexts.IContextService#activateContext(java.lang.String, * org.eclipse.core.expressions.Expression, int) */ + @Override public IContextActivation activateContext(String contextId, Expression expression, int sourcePriorities) { return activateContext(contextId, expression); @@ -184,6 +189,7 @@ public class SlaveContextService implements IContextService { * * @see org.eclipse.ui.contexts.IContextService#addContextManagerListener(org.eclipse.core.commands.contexts.IContextManagerListener) */ + @Override public void addContextManagerListener(IContextManagerListener listener) { if (!fContextManagerListeners.contains(listener)) { fContextManagerListeners.add(listener); @@ -196,6 +202,7 @@ public class SlaveContextService implements IContextService { * * @see org.eclipse.ui.services.IServiceWithSources#addSourceProvider(org.eclipse.ui.ISourceProvider) */ + @Override public void addSourceProvider(ISourceProvider provider) { if (!fSourceProviders.contains(provider)) { fSourceProviders.add(provider); @@ -208,6 +215,7 @@ public class SlaveContextService implements IContextService { * * @see org.eclipse.ui.contexts.IContextService#deactivateContext(org.eclipse.ui.contexts.IContextActivation) */ + @Override public void deactivateContext(IContextActivation activation) { IContextActivation parentActivation = null; if (fLocalActivations.containsKey(activation)) { @@ -227,6 +235,7 @@ public class SlaveContextService implements IContextService { * * @see org.eclipse.ui.contexts.IContextService#deactivateContexts(java.util.Collection) */ + @Override public void deactivateContexts(Collection activations) { Object[] array = activations.toArray(); for (int i = 0; i < array.length; i++) { @@ -240,6 +249,7 @@ public class SlaveContextService implements IContextService { * * @see org.eclipse.ui.services.IDisposable#dispose() */ + @Override public void dispose() { fParentService.deactivateContexts(fParentActivations); fParentActivations.clear(); @@ -292,6 +302,7 @@ public class SlaveContextService implements IContextService { * * @see org.eclipse.ui.contexts.IContextService#getActiveContextIds() */ + @Override public Collection getActiveContextIds() { return fParentService.getActiveContextIds(); } @@ -301,6 +312,7 @@ public class SlaveContextService implements IContextService { * * @see org.eclipse.ui.contexts.IContextService#getContext(java.lang.String) */ + @Override public Context getContext(String contextId) { return fParentService.getContext(contextId); } @@ -310,6 +322,7 @@ public class SlaveContextService implements IContextService { * * @see org.eclipse.ui.contexts.IContextService#getDefinedContextIds() */ + @Override public Collection getDefinedContextIds() { return fParentService.getDefinedContextIds(); } @@ -319,6 +332,7 @@ public class SlaveContextService implements IContextService { * * @see org.eclipse.ui.contexts.IContextService#getDefinedContexts() */ + @Override public Context[] getDefinedContexts() { return fParentService.getDefinedContexts(); } @@ -328,6 +342,7 @@ public class SlaveContextService implements IContextService { * * @see org.eclipse.ui.contexts.IContextService#getShellType(org.eclipse.swt.widgets.Shell) */ + @Override public int getShellType(Shell shell) { return fParentService.getShellType(shell); } @@ -337,6 +352,7 @@ public class SlaveContextService implements IContextService { * * @see org.eclipse.ui.contexts.IContextService#readRegistry() */ + @Override public void readRegistry() { fParentService.readRegistry(); } @@ -347,6 +363,7 @@ public class SlaveContextService implements IContextService { * @see org.eclipse.ui.contexts.IContextService#registerShell(org.eclipse.swt.widgets.Shell, * int) */ + @Override public boolean registerShell(Shell shell, int type) { if (!fRegisteredShells.contains(shell)) { fRegisteredShells.add(shell); @@ -359,6 +376,7 @@ public class SlaveContextService implements IContextService { * * @see org.eclipse.ui.contexts.IContextService#removeContextManagerListener(org.eclipse.core.commands.contexts.IContextManagerListener) */ + @Override public void removeContextManagerListener(IContextManagerListener listener) { fContextManagerListeners.remove(listener); fParentService.removeContextManagerListener(listener); @@ -369,6 +387,7 @@ public class SlaveContextService implements IContextService { * * @see org.eclipse.ui.services.IServiceWithSources#removeSourceProvider(org.eclipse.ui.ISourceProvider) */ + @Override public void removeSourceProvider(ISourceProvider provider) { fSourceProviders.remove(provider); fParentService.removeSourceProvider(provider); @@ -379,6 +398,7 @@ public class SlaveContextService implements IContextService { * * @see org.eclipse.ui.contexts.IContextService#unregisterShell(org.eclipse.swt.widgets.Shell) */ + @Override public boolean unregisterShell(Shell shell) { fRegisteredShells.remove(shell); return fParentService.unregisterShell(shell); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/contexts/WorkbenchContextSupport.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/contexts/WorkbenchContextSupport.java index 1aa7d1c32b8..7a6424b6d8b 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/contexts/WorkbenchContextSupport.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/contexts/WorkbenchContextSupport.java @@ -84,6 +84,7 @@ public class WorkbenchContextSupport implements IWorkbenchContextSupport { .getContextManagerWrapper(contextManager); } + @Override public final void addEnabledSubmission( final EnabledSubmission enabledSubmission) { final IContextActivation activation = contextService.activateContext( @@ -97,6 +98,7 @@ public class WorkbenchContextSupport implements IWorkbenchContextSupport { activationsBySubmission.put(enabledSubmission, activation); } + @Override public final void addEnabledSubmissions(final Collection enabledSubmissions) { final Iterator submissionItr = enabledSubmissions.iterator(); while (submissionItr.hasNext()) { @@ -104,26 +106,32 @@ public class WorkbenchContextSupport implements IWorkbenchContextSupport { } } + @Override public final IContextManager getContextManager() { return contextManagerWrapper; } + @Override public final int getShellType(Shell shell) { return contextService.getShellType(shell); } + @Override public final boolean isKeyFilterEnabled() { return bindingService.isKeyFilterEnabled(); } + @Override public final void openKeyAssistDialog() { bindingService.openKeyAssistDialog(); } + @Override public final boolean registerShell(final Shell shell, final int type) { return contextService.registerShell(shell, type); } + @Override public final void removeEnabledSubmission( final EnabledSubmission enabledSubmission) { if (activationsBySubmission == null) { @@ -137,6 +145,7 @@ public class WorkbenchContextSupport implements IWorkbenchContextSupport { } } + @Override public final void removeEnabledSubmissions( final Collection enabledSubmissions) { final Iterator submissionItr = enabledSubmissions.iterator(); @@ -145,10 +154,12 @@ public class WorkbenchContextSupport implements IWorkbenchContextSupport { } } + @Override public final void setKeyFilterEnabled(final boolean enabled) { bindingService.setKeyFilterEnabled(enabled); } + @Override public final boolean unregisterShell(final Shell shell) { return contextService.unregisterShell(shell); } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/decorators/DeclarativeDecorator.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/decorators/DeclarativeDecorator.java index 4c91a01d290..dc36661e83e 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/decorators/DeclarativeDecorator.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/decorators/DeclarativeDecorator.java @@ -39,13 +39,15 @@ public class DeclarativeDecorator implements ILightweightLabelDecorator { /** * @see org.eclipse.jface.viewers.IBaseLabelProvider#addListener(org.eclipse.jface.viewers.ILabelProviderListener) */ - public void addListener(ILabelProviderListener listener) { + @Override + public void addListener(ILabelProviderListener listener) { } /** * @see org.eclipse.jface.viewers.IBaseLabelProvider#dispose() */ - public void dispose() { + @Override + public void dispose() { //Nothing to do here } @@ -53,21 +55,24 @@ public class DeclarativeDecorator implements ILightweightLabelDecorator { * @see org.eclipse.jface.viewers.IBaseLabelProvider#isLabelProperty(java.lang.Object, * java.lang.String) */ - public boolean isLabelProperty(Object element, String property) { + @Override + public boolean isLabelProperty(Object element, String property) { return false; } /** * @see org.eclipse.jface.viewers.IBaseLabelProvider#removeListener(org.eclipse.jface.viewers.ILabelProviderListener) */ - public void removeListener(ILabelProviderListener listener) { + @Override + public void removeListener(ILabelProviderListener listener) { } /** * @see org.eclipse.jface.viewers.ILightweightLabelDecorator#decorate(java.lang.Object, * org.eclipse.jface.viewers.IDecoration) */ - public void decorate(Object element, IDecoration decoration) { + @Override + public void decorate(Object element, IDecoration decoration) { if (descriptor == null) { URL url = BundleUtility.find(configElement.getDeclaringExtension() .getNamespace(), iconLocation); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/decorators/DecorationBuilder.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/decorators/DecorationBuilder.java index eb37f238b90..ae7e56f5c68 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/decorators/DecorationBuilder.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/decorators/DecorationBuilder.java @@ -78,6 +78,7 @@ public class DecorationBuilder implements IDecoration { /** * @see org.eclipse.jface.viewers.IDecoration#addOverlay(org.eclipse.jface.resource.ImageDescriptor) */ + @Override public void addOverlay(ImageDescriptor overlay) { int quadrant = currentDefinition.getQuadrant(); if (descriptors[quadrant] == null) { @@ -89,6 +90,7 @@ public class DecorationBuilder implements IDecoration { /** * @see org.eclipse.jface.viewers.IDecoration#addOverlay(org.eclipse.jface.resource.ImageDescriptor) */ + @Override public void addOverlay(ImageDescriptor overlay, int quadrant) { if (quadrant >= 0 && quadrant < DECORATOR_ARRAY_SIZE) { if (descriptors[quadrant] == null) { @@ -104,6 +106,7 @@ public class DecorationBuilder implements IDecoration { /** * @see org.eclipse.jface.viewers.IDecoration#addPrefix(java.lang.String) */ + @Override public void addPrefix(String prefixString) { prefixes.add(prefixString); valueSet = true; @@ -112,6 +115,7 @@ public class DecorationBuilder implements IDecoration { /** * @see org.eclipse.jface.viewers.IDecoration#addSuffix(java.lang.String) */ + @Override public void addSuffix(String suffixString) { suffixes.add(suffixString); valueSet = true; @@ -191,6 +195,7 @@ public class DecorationBuilder implements IDecoration { * @see org.eclipse.jface.viewers.IDecoration#setBackgroundColor(org.eclipse.swt.graphics.Color) */ + @Override public void setBackgroundColor(Color bgColor) { this.backgroundColor = bgColor; valueSet = true; @@ -201,6 +206,7 @@ public class DecorationBuilder implements IDecoration { * * @see org.eclipse.jface.viewers.IDecoration#setFont(org.eclipse.swt.graphics.Font) */ + @Override public void setFont(Font newFont) { this.font = newFont; valueSet = true; @@ -211,6 +217,7 @@ public class DecorationBuilder implements IDecoration { * * @see org.eclipse.jface.viewers.IDecoration#setForegroundColor(org.eclipse.swt.graphics.Color) */ + @Override public void setForegroundColor(Color fgColor) { this.foregroundColor = fgColor; valueSet = true; @@ -221,6 +228,7 @@ public class DecorationBuilder implements IDecoration { * * @see org.eclipse.jface.viewers.IDecoration#getDecorationContext() */ + @Override public IDecorationContext getDecorationContext() { return context; } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/decorators/DecorationScheduler.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/decorators/DecorationScheduler.java index 0c284135ebd..e16de60b809 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/decorators/DecorationScheduler.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/decorators/DecorationScheduler.java @@ -288,6 +288,7 @@ public class DecorationScheduler { * * @see org.eclipse.core.runtime.jobs.Job#run(org.eclipse.core.runtime.IProgressMonitor) */ + @Override public IStatus run(IProgressMonitor monitor) { synchronized (DecorationScheduler.this) { @@ -404,6 +405,7 @@ public class DecorationScheduler { * * @see org.eclipse.core.runtime.jobs.Job#belongsTo(java.lang.Object) */ + @Override public boolean belongsTo(Object family) { return DecoratorManager.FAMILY_DECORATE == family; } @@ -413,6 +415,7 @@ public class DecorationScheduler { * * @see org.eclipse.core.runtime.jobs.Job#shouldRun() */ + @Override public boolean shouldRun() { return PlatformUI.isWorkbenchRunning(); } @@ -458,6 +461,7 @@ public class DecorationScheduler { * * @see org.eclipse.core.runtime.jobs.Job#run(org.eclipse.core.runtime.IProgressMonitor) */ + @Override protected IStatus run(IProgressMonitor monitor) { resultCache.clear(); return Status.OK_STATUS; @@ -468,6 +472,7 @@ public class DecorationScheduler { * * @see org.eclipse.core.runtime.jobs.Job#shouldRun() */ + @Override public boolean shouldRun() { return PlatformUI.isWorkbenchRunning(); } @@ -493,6 +498,7 @@ public class DecorationScheduler { ILabelProviderListener[] listeners; + @Override public IStatus runInUIThread(IProgressMonitor monitor) { synchronized (DecorationScheduler.this) { @@ -588,6 +594,7 @@ public class DecorationScheduler { * * @see org.eclipse.core.runtime.jobs.Job#belongsTo(java.lang.Object) */ + @Override public boolean belongsTo(Object family) { return DecoratorManager.FAMILY_DECORATE == family; } @@ -597,6 +604,7 @@ public class DecorationScheduler { * * @see org.eclipse.core.runtime.jobs.Job#shouldRun() */ + @Override public boolean shouldRun() { return PlatformUI.isWorkbenchRunning(); } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/decorators/DecoratorDefinition.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/decorators/DecoratorDefinition.java index ab270c0fb02..360bd5bf872 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/decorators/DecoratorDefinition.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/decorators/DecoratorDefinition.java @@ -287,10 +287,12 @@ public abstract class DecoratorDefinition implements IPluginContribution { } + @Override public String getPluginId() { return getConfigurationElement().getContributor().getName(); } + @Override public String getLocalId() { return getId(); } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/decorators/DecoratorManager.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/decorators/DecoratorManager.java index ae99836603c..150dd840512 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/decorators/DecoratorManager.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/decorators/DecoratorManager.java @@ -144,6 +144,7 @@ public class DecoratorManager implements ILabelProviderListener, * @see org.eclipse.jface.viewers.LabelDecorator#decorateImage(org.eclipse.swt.graphics.Image, * java.lang.Object, org.eclipse.jface.viewers.IDecorationContext) */ + @Override public Image decorateImage(Image image, Object element, IDecorationContext context) { return decoratorManager.decorateImage(image, element, context, @@ -156,6 +157,7 @@ public class DecoratorManager implements ILabelProviderListener, * @see org.eclipse.jface.viewers.LabelDecorator#decorateText(java.lang.String, * java.lang.Object, org.eclipse.jface.viewers.IDecorationContext) */ + @Override public String decorateText(String text, Object element, IDecorationContext context) { return decoratorManager.decorateText(text, element, context); @@ -167,6 +169,7 @@ public class DecoratorManager implements ILabelProviderListener, * @see org.eclipse.jface.viewers.LabelDecorator#prepareDecoration(java.lang.Object, * java.lang.String, org.eclipse.jface.viewers.IDecorationContext) */ + @Override public boolean prepareDecoration(Object element, String originalText, IDecorationContext context) { return decoratorManager.prepareDecoration(element, originalText, @@ -179,6 +182,7 @@ public class DecoratorManager implements ILabelProviderListener, * @see org.eclipse.jface.viewers.IDelayedLabelDecorator#prepareDecoration(java.lang.Object, * java.lang.String) */ + @Override public boolean prepareDecoration(Object element, String originalText) { return prepareDecoration(element, originalText, DecorationContext.DEFAULT_CONTEXT); @@ -189,6 +193,7 @@ public class DecoratorManager implements ILabelProviderListener, * * @see org.eclipse.jface.viewers.IFontDecorator#decorateFont(java.lang.Object) */ + @Override public Font decorateFont(Object element) { return decoratorManager.decorateFont(element); } @@ -198,6 +203,7 @@ public class DecoratorManager implements ILabelProviderListener, * * @see org.eclipse.jface.viewers.IColorDecorator#decorateBackground(java.lang.Object) */ + @Override public Color decorateBackground(Object element) { return decoratorManager.decorateBackground(element); } @@ -207,6 +213,7 @@ public class DecoratorManager implements ILabelProviderListener, * * @see org.eclipse.jface.viewers.IColorDecorator#decorateForeground(java.lang.Object) */ + @Override public Color decorateForeground(Object element) { return decoratorManager.decorateForeground(element); } @@ -217,6 +224,7 @@ public class DecoratorManager implements ILabelProviderListener, * @see org.eclipse.jface.viewers.ILabelDecorator#decorateImage(org.eclipse.swt.graphics.Image, * java.lang.Object) */ + @Override public Image decorateImage(Image image, Object element) { return decorateImage(image, element, DecorationContext.DEFAULT_CONTEXT); @@ -228,6 +236,7 @@ public class DecoratorManager implements ILabelProviderListener, * @see org.eclipse.jface.viewers.ILabelDecorator#decorateText(java.lang.String, * java.lang.Object) */ + @Override public String decorateText(String text, Object element) { return decorateText(text, element, DecorationContext.DEFAULT_CONTEXT); @@ -238,6 +247,7 @@ public class DecoratorManager implements ILabelProviderListener, * * @see org.eclipse.jface.viewers.IBaseLabelProvider#addListener(org.eclipse.jface.viewers.ILabelProviderListener) */ + @Override public void addListener(ILabelProviderListener listener) { decoratorManager.addListener(listener); } @@ -247,6 +257,7 @@ public class DecoratorManager implements ILabelProviderListener, * * @see org.eclipse.jface.viewers.IBaseLabelProvider#dispose() */ + @Override public void dispose() { if (resourceManager != null) { resourceManager.dispose(); @@ -260,6 +271,7 @@ public class DecoratorManager implements ILabelProviderListener, * @see org.eclipse.jface.viewers.IBaseLabelProvider#isLabelProperty(java.lang.Object, * java.lang.String) */ + @Override public boolean isLabelProperty(Object element, String property) { return decoratorManager.isLabelProperty(element, property); } @@ -269,6 +281,7 @@ public class DecoratorManager implements ILabelProviderListener, * * @see org.eclipse.jface.viewers.IBaseLabelProvider#removeListener(org.eclipse.jface.viewers.ILabelProviderListener) */ + @Override public void removeListener(ILabelProviderListener listener) { decoratorManager.removeListener(listener); } @@ -391,6 +404,7 @@ public class DecoratorManager implements ILabelProviderListener, /** * Add the listener to the list of listeners. */ + @Override public void addListener(ILabelProviderListener listener) { listeners.add(listener); } @@ -398,6 +412,7 @@ public class DecoratorManager implements ILabelProviderListener, /** * Remove the listener from the list. */ + @Override public void removeListener(ILabelProviderListener listener) { listeners.remove(listener); scheduler.listenerRemoved(listener); @@ -426,6 +441,7 @@ public class DecoratorManager implements ILabelProviderListener, void fireListener(final LabelProviderChangedEvent event, final ILabelProviderListener listener) { SafeRunner.run(new SafeRunnable() { + @Override public void run() { listener.labelProviderChanged(event); } @@ -444,6 +460,7 @@ public class DecoratorManager implements ILabelProviderListener, for (int i = 0; i < array.length; i++) { final ILabelProviderListener l = (ILabelProviderListener) array[i]; SafeRunner.run(new SafeRunnable() { + @Override public void run() { l.labelProviderChanged(event); } @@ -479,6 +496,7 @@ public class DecoratorManager implements ILabelProviderListener, * * @see org.eclipse.ui.progress.UIJob#runInUIThread(org.eclipse.core.runtime.IProgressMonitor) */ + @Override public IStatus runInUIThread(IProgressMonitor monitor) { fireListeners(event); return Status.OK_STATUS; @@ -489,6 +507,7 @@ public class DecoratorManager implements ILabelProviderListener, * * @see org.eclipse.core.runtime.jobs.Job#belongsTo(java.lang.Object) */ + @Override public boolean belongsTo(Object family) { return FAMILY_DECORATE == family; } @@ -545,6 +564,7 @@ public class DecoratorManager implements ILabelProviderListener, /* (non-Javadoc) * @see org.eclipse.jface.viewers.ILabelDecorator#decorateText(java.lang.String, java.lang.Object) */ + @Override public String decorateText(String text, Object element) { return decorateText(text, element, DecorationContext.DEFAULT_CONTEXT); } @@ -620,6 +640,7 @@ public class DecoratorManager implements ILabelProviderListener, * @see org.eclipse.jface.viewers.ILabelDecorator#decorateImage(org.eclipse.swt.graphics.Image, * java.lang.Object) */ + @Override public Image decorateImage(Image image, Object element) { return decorateImage(image, element, DecorationContext.DEFAULT_CONTEXT, getResourceManager()); @@ -664,6 +685,7 @@ public class DecoratorManager implements ILabelProviderListener, * Return whether or not the decorator registered for element has a label * property called property name. */ + @Override public boolean isLabelProperty(Object element, String property) { return isLabelProperty(element, property, true); } @@ -754,6 +776,7 @@ public class DecoratorManager implements ILabelProviderListener, /* * @see IBaseLabelProvider#dispose() */ + @Override public void dispose() { // do nothing } @@ -798,6 +821,7 @@ public class DecoratorManager implements ILabelProviderListener, /* * @see ILabelProviderListener#labelProviderChanged(LabelProviderChangedEvent) */ + @Override public void labelProviderChanged(LabelProviderChangedEvent event) { Object[] elements = event.getElements(); scheduler.clearResults(); @@ -925,6 +949,7 @@ public class DecoratorManager implements ILabelProviderListener, * * @see org.eclipse.ui.IDecoratorManager#getEnabled(java.lang.String) */ + @Override public boolean getEnabled(String decoratorId) { DecoratorDefinition definition = getDecoratorDefinition(decoratorId); if (definition == null) { @@ -936,6 +961,7 @@ public class DecoratorManager implements ILabelProviderListener, /** * @see IDecoratorManager#getLabelDecorator() */ + @Override public ILabelDecorator getLabelDecorator() { return new ManagedWorkbenchLabelDecorator(this); } @@ -957,6 +983,7 @@ public class DecoratorManager implements ILabelProviderListener, /** * @see IDecoratorManager#setEnabled(String, boolean) */ + @Override public void setEnabled(String decoratorId, boolean enabled) { DecoratorDefinition definition = getDecoratorDefinition(decoratorId); if (definition != null) { @@ -969,6 +996,7 @@ public class DecoratorManager implements ILabelProviderListener, /* * @see IDecoratorManager#getBaseLabelProvider(String) */ + @Override public IBaseLabelProvider getBaseLabelProvider(String decoratorId) { IBaseLabelProvider fullProvider = getLabelDecorator(decoratorId); if (fullProvider == null) { @@ -980,6 +1008,7 @@ public class DecoratorManager implements ILabelProviderListener, /* * @see IDecoratorManager#getLabelDecorator(String) */ + @Override public ILabelDecorator getLabelDecorator(String decoratorId) { FullDecoratorDefinition definition = getFullDecoratorDefinition(decoratorId); @@ -1001,6 +1030,7 @@ public class DecoratorManager implements ILabelProviderListener, /* * @see IDecoratorManager#getLightweightLabelDecorator(String) */ + @Override public ILightweightLabelDecorator getLightweightLabelDecorator( String decoratorId) { LightweightDecoratorDefinition definition = getLightweightManager() @@ -1101,6 +1131,7 @@ public class DecoratorManager implements ILabelProviderListener, /** * @see org.eclipse.ui.IDecoratorManager#update(java.lang.String) */ + @Override public void update(String decoratorId) { IBaseLabelProvider provider = getBaseLabelProvider(decoratorId); @@ -1147,6 +1178,7 @@ public class DecoratorManager implements ILabelProviderListener, * @see org.eclipse.jface.viewers.IDelayedLabelDecorator#prepareDecoration(java.lang.Object, * java.lang.String) */ + @Override public boolean prepareDecoration(Object element, String originalText) { return prepareDecoration(element, originalText, DecorationContext.DEFAULT_CONTEXT); @@ -1204,6 +1236,7 @@ public class DecoratorManager implements ILabelProviderListener, * @see org.eclipse.core.runtime.dynamicHelpers.IExtensionChangeHandler#addExtension(org.eclipse.core.runtime.dynamicHelpers.IExtensionTracker, * org.eclipse.core.runtime.IExtension) */ + @Override public void addExtension(IExtensionTracker tracker, IExtension addedExtension) { IConfigurationElement addedElements[] = addedExtension @@ -1223,6 +1256,7 @@ public class DecoratorManager implements ILabelProviderListener, * @see org.eclipse.core.runtime.dynamicHelpers.IExtensionChangeHandler#removeExtension(org.eclipse.core.runtime.IExtension, * java.lang.Object[]) */ + @Override public void removeExtension(IExtension source, Object[] objects) { boolean shouldClear = false; diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/decorators/DecoratorRegistryReader.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/decorators/DecoratorRegistryReader.java index 53cb870bae6..d3e89aaa8fa 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/decorators/DecoratorRegistryReader.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/decorators/DecoratorRegistryReader.java @@ -41,7 +41,8 @@ public class DecoratorRegistryReader extends RegistryReader { /* * @see RegistryReader#readElement(IConfigurationElement) */ - public boolean readElement(IConfigurationElement element) { + @Override + public boolean readElement(IConfigurationElement element) { DecoratorDefinition desc = getDecoratorDefinition(element); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/decorators/FullDecoratorDefinition.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/decorators/FullDecoratorDefinition.java index fe401779923..73ac9d1fc71 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/decorators/FullDecoratorDefinition.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/decorators/FullDecoratorDefinition.java @@ -58,7 +58,8 @@ class FullDecoratorDefinition extends DecoratorDefinition { Platform .run(new SafeRunnable( NLS.bind(WorkbenchMessages.DecoratorManager_ErrorActivatingDecorator, getName() )) { - public void run() { + @Override + public void run() { try { decorator = (ILabelDecorator) WorkbenchPlugin .createExtension( @@ -90,7 +91,8 @@ class FullDecoratorDefinition extends DecoratorDefinition { /* (non-Javadoc) * @see org.eclipse.ui.internal.decorators.DecoratorDefinition#refreshDecorator() */ - protected void refreshDecorator() { + @Override + protected void refreshDecorator() { //Only do something if disabled so as to prevent //gratutitous activation if (!this.enabled && decorator != null) { @@ -151,7 +153,8 @@ class FullDecoratorDefinition extends DecoratorDefinition { /* (non-Javadoc) * @see org.eclipse.ui.internal.decorators.DecoratorDefinition#internalGetLabelProvider() */ - protected IBaseLabelProvider internalGetLabelProvider() + @Override + protected IBaseLabelProvider internalGetLabelProvider() throws CoreException { return internalGetDecorator(); } @@ -159,7 +162,8 @@ class FullDecoratorDefinition extends DecoratorDefinition { /* (non-Javadoc) * @see org.eclipse.ui.internal.decorators.DecoratorDefinition#isFull() */ - public boolean isFull() { + @Override + public boolean isFull() { return true; } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/decorators/FullDecoratorRunnable.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/decorators/FullDecoratorRunnable.java index 3ee086ca5e2..7515e87b2df 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/decorators/FullDecoratorRunnable.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/decorators/FullDecoratorRunnable.java @@ -40,7 +40,8 @@ abstract class FullDecoratorRunnable implements ISafeRunnable { /* * @see ISafeRunnable.handleException(Throwable). */ - public void handleException(Throwable exception) { + @Override + public void handleException(Throwable exception) { IStatus status = StatusUtil.newStatus(IStatus.ERROR, exception .getMessage(), exception); String message = NLS.bind(WorkbenchMessages.DecoratorWillBeDisabled, diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/decorators/FullImageDecoratorRunnable.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/decorators/FullImageDecoratorRunnable.java index 099e37b39db..717809881d6 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/decorators/FullImageDecoratorRunnable.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/decorators/FullImageDecoratorRunnable.java @@ -24,7 +24,8 @@ class FullImageDecoratorRunnable extends FullDecoratorRunnable { /* (non-Javadoc) * @see org.eclipse.core.runtime.ISafeRunnable#run() */ - public void run() throws Exception { + @Override + public void run() throws Exception { result = decorator.decorateImage(start, element); } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/decorators/FullTextDecoratorRunnable.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/decorators/FullTextDecoratorRunnable.java index 8ea321c3d13..41b0444977e 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/decorators/FullTextDecoratorRunnable.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/decorators/FullTextDecoratorRunnable.java @@ -22,7 +22,8 @@ public class FullTextDecoratorRunnable extends FullDecoratorRunnable { /* (non-Javadoc) * @see org.eclipse.core.runtime.ISafeRunnable#run() */ - public void run() throws Exception { + @Override + public void run() throws Exception { result = decorator.decorateText(start, element); } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/decorators/LightweightActionDescriptor.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/decorators/LightweightActionDescriptor.java index 686e22552c7..2b6169dce5a 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/decorators/LightweightActionDescriptor.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/decorators/LightweightActionDescriptor.java @@ -65,7 +65,8 @@ public class LightweightActionDescriptor implements IAdaptable, * associated with this object. Returns <code>null</code> if * no such object can be found. */ - public Object getAdapter(Class adapter) { + @Override + public Object getAdapter(Class adapter) { if (adapter == IWorkbenchAdapter.class) { return this; } @@ -102,7 +103,8 @@ public class LightweightActionDescriptor implements IAdaptable, /* (non-Javadoc) * @see org.eclipse.ui.model.IWorkbenchAdapter#getImageDescriptor(java.lang.Object) */ - public ImageDescriptor getImageDescriptor(Object o) { + @Override + public ImageDescriptor getImageDescriptor(Object o) { if (o == this) { return getImageDescriptor(); } @@ -121,7 +123,8 @@ public class LightweightActionDescriptor implements IAdaptable, /* (non-Javadoc) * @see org.eclipse.ui.model.IWorkbenchAdapter#getLabel(java.lang.Object) */ - public String getLabel(Object o) { + @Override + public String getLabel(Object o) { if (o == this) { String text = getLabel(); int end = text.lastIndexOf('@'); @@ -136,14 +139,16 @@ public class LightweightActionDescriptor implements IAdaptable, /* (non-Javadoc) * @see org.eclipse.ui.model.IWorkbenchAdapter#getChildren(java.lang.Object) */ - public Object[] getChildren(Object o) { + @Override + public Object[] getChildren(Object o) { return NO_CHILDREN; } /* (non-Javadoc) * @see org.eclipse.ui.model.IWorkbenchAdapter#getParent(java.lang.Object) */ - public Object getParent(Object o) { + @Override + public Object getParent(Object o) { return null; } } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/decorators/LightweightDecoratorDefinition.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/decorators/LightweightDecoratorDefinition.java index 9f67923302e..60ba5063403 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/decorators/LightweightDecoratorDefinition.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/decorators/LightweightDecoratorDefinition.java @@ -118,6 +118,7 @@ class LightweightDecoratorDefinition extends DecoratorDefinition implements } else { Platform.run(new ISafeRunnable() { + @Override public void run() { try { decorator = (ILightweightLabelDecorator) WorkbenchPlugin @@ -133,6 +134,7 @@ class LightweightDecoratorDefinition extends DecoratorDefinition implements /* * (non-Javadoc) Method declared on ISafeRunnable. */ + @Override public void handleException(Throwable e) { // Do nothing as Core will handle the logging } @@ -177,6 +179,7 @@ class LightweightDecoratorDefinition extends DecoratorDefinition implements * * @see org.eclipse.ui.internal.decorators.DecoratorDefinition#internalGetLabelProvider() */ + @Override protected IBaseLabelProvider internalGetLabelProvider() throws CoreException { return internalGetDecorator(); @@ -187,6 +190,7 @@ class LightweightDecoratorDefinition extends DecoratorDefinition implements * * @see org.eclipse.ui.internal.decorators.DecoratorDefinition#isFull() */ + @Override public boolean isFull() { return false; } @@ -289,6 +293,7 @@ class LightweightDecoratorDefinition extends DecoratorDefinition implements * * @see org.eclipse.ui.internal.decorators.DecoratorDefinition#refreshDecorator() */ + @Override protected void refreshDecorator() { // Only do something if disabled so as to prevent // gratutitous activation @@ -304,6 +309,7 @@ class LightweightDecoratorDefinition extends DecoratorDefinition implements * * @see org.eclipse.ui.internal.IObjectContributor#isApplicableTo(java.lang.Object) */ + @Override public boolean isApplicableTo(Object object) { return isEnabledFor(object); } @@ -313,6 +319,7 @@ class LightweightDecoratorDefinition extends DecoratorDefinition implements * * @see org.eclipse.ui.internal.IObjectContributor#canAdapt() */ + @Override public boolean canAdapt() { return isAdaptable(); } @@ -335,6 +342,7 @@ class LightweightDecoratorDefinition extends DecoratorDefinition implements * * @see org.eclipse.ui.internal.decorators.DecoratorDefinition#initializeEnablement() */ + @Override protected void initializeEnablement() { super.initializeEnablement(); ActionExpression expression = getEnablement(); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/decorators/LightweightDecoratorManager.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/decorators/LightweightDecoratorManager.java index 44a259cd472..a9938ec48a3 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/decorators/LightweightDecoratorManager.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/decorators/LightweightDecoratorManager.java @@ -57,6 +57,7 @@ public class LightweightDecoratorManager extends ObjectContributorManager { /* * @see ISafeRunnable.handleException(Throwable). */ + @Override public void handleException(Throwable exception) { IStatus status = StatusUtil.newStatus(IStatus.ERROR, exception .getMessage(), exception); @@ -77,6 +78,7 @@ public class LightweightDecoratorManager extends ObjectContributorManager { /* * @see ISafeRunnable.run */ + @Override public void run() throws Exception { decorator.decorate(element, decoration); clearReferences(); @@ -386,6 +388,7 @@ public class LightweightDecoratorManager extends ObjectContributorManager { * @see org.eclipse.core.runtime.dynamichelpers.IExtensionChangeHandler#addExtension(org.eclipse.core.runtime.dynamichelpers.IExtensionTracker, * org.eclipse.core.runtime.IExtension) */ + @Override public void addExtension(IExtensionTracker tracker, IExtension extension) { // Do nothing as this is handled by the DecoratorManager // This is not called as canHandleExtensionTracking returns diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/AboutDialog.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/AboutDialog.java index 6e8f664d316..d7e4e3a0c8a 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/AboutDialog.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/AboutDialog.java @@ -116,10 +116,12 @@ public class AboutDialog extends TrayDialog { /* * (non-Javadoc) Method declared on Dialog. */ - protected void buttonPressed(int buttonId) { + @Override + protected void buttonPressed(int buttonId) { switch (buttonId) { case DETAILS_ID: BusyIndicator.showWhile(getShell().getDisplay(), new Runnable() { + @Override public void run() { IWorkbenchWindow workbenchWindow = PlatformUI.getWorkbench().getActiveWorkbenchWindow(); InstallationDialog dialog = new InstallationDialog(getShell(), workbenchWindow); @@ -134,7 +136,8 @@ public class AboutDialog extends TrayDialog { } } - public boolean close() { + @Override + public boolean close() { // dispose all images for (int i = 0; i < images.size(); ++i) { Image image = (Image) images.get(i); @@ -147,7 +150,8 @@ public class AboutDialog extends TrayDialog { /* * (non-Javadoc) Method declared on Window. */ - protected void configureShell(Shell newShell) { + @Override + protected void configureShell(Shell newShell) { super.configureShell(newShell); newShell.setText(NLS.bind(WorkbenchMessages.AboutDialog_shellTitle,productName )); PlatformUI.getWorkbench().getHelpSystem().setHelp(newShell, @@ -162,7 +166,8 @@ public class AboutDialog extends TrayDialog { * @param parent * the button bar composite */ - protected void createButtonsForButtonBar(Composite parent) { + @Override + protected void createButtonsForButtonBar(Composite parent) { parent.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); createButton(parent, DETAILS_ID, WorkbenchMessages.AboutDialog_DetailsButton, false); @@ -187,7 +192,8 @@ public class AboutDialog extends TrayDialog { * @param parent the parent composite to contain the dialog area * @return the dialog area control */ - protected Control createDialogArea(Composite parent) { + @Override + protected Control createDialogArea(Composite parent) { // brand the about box if there is product info Image aboutImage = null; AboutItem item = null; @@ -337,7 +343,8 @@ public class AboutDialog extends TrayDialog { final boolean[] inresize = new boolean[1]; // flag to stop unneccesary // recursion textComposite.addControlListener(new ControlAdapter() { - public void controlResized(ControlEvent e) { + @Override + public void controlResized(ControlEvent e) { if (inresize[0]) return; inresize[0] = true; @@ -409,6 +416,7 @@ public class AboutDialog extends TrayDialog { text.setMenu(textManager.createContextMenu(text)); text.addDisposeListener(new DisposeListener() { + @Override public void widgetDisposed(DisposeEvent e) { textManager.dispose(); } @@ -450,12 +458,14 @@ public class AboutDialog extends TrayDialog { /* (non-Javadoc) * @see org.eclipse.swt.accessibility.AccessibleAdapter#getName(org.eclipse.swt.accessibility.AccessibleEvent) */ + @Override public void getName(AccessibleEvent e) { e.result = info.getProviderName(); } }); button.addSelectionListener(new SelectionAdapter() { - public void widgetSelected(SelectionEvent event) { + @Override + public void widgetSelected(SelectionEvent event) { AboutBundleGroupData[] groupInfos = buttonManager .getRelatedInfos(info); AboutBundleGroupData selection = (AboutBundleGroupData) event.widget @@ -475,6 +485,7 @@ public class AboutDialog extends TrayDialog { * * @see org.eclipse.jface.dialogs.Dialog#isResizable() */ + @Override protected boolean isResizable() { return true; } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/AbstractWorkingSetDialog.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/AbstractWorkingSetDialog.java index feaec78a7ec..04a1944aed3 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/AbstractWorkingSetDialog.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/AbstractWorkingSetDialog.java @@ -121,6 +121,7 @@ public abstract class AbstractWorkingSetDialog extends SelectionDialog WorkbenchMessages.WorkingSetSelectionDialog_newButton_label, false); newButton.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { createWorkingSet(); } @@ -134,6 +135,7 @@ public abstract class AbstractWorkingSetDialog extends SelectionDialog false); detailsButton.setEnabled(false); detailsButton.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { editSelectedWorkingSet(); } @@ -146,6 +148,7 @@ public abstract class AbstractWorkingSetDialog extends SelectionDialog false); removeButton.setEnabled(false); removeButton.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { removeSelectedWorkingSets(); } @@ -175,6 +178,7 @@ public abstract class AbstractWorkingSetDialog extends SelectionDialog WorkbenchMessages.SelectionDialog_selectLabel, false); selectAllButton.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { selectAllSets(); } @@ -186,6 +190,7 @@ public abstract class AbstractWorkingSetDialog extends SelectionDialog WorkbenchMessages.SelectionDialog_deselectLabel, false); deselectAllButton.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { deselectAllSets(); } @@ -293,6 +298,7 @@ public abstract class AbstractWorkingSetDialog extends SelectionDialog /* (non-Javadoc) * @see org.eclipse.ui.dialogs.IWorkingSetSelectionDialog#getSelection() */ + @Override public IWorkingSet[] getSelection() { return result; } @@ -300,6 +306,7 @@ public abstract class AbstractWorkingSetDialog extends SelectionDialog /* (non-Javadoc) * @see org.eclipse.ui.dialogs.IWorkingSetSelectionDialog#setSelection(org.eclipse.ui.IWorkingSet[]) */ + @Override public void setSelection(IWorkingSet[] selection) { result = selection; } @@ -309,6 +316,7 @@ public abstract class AbstractWorkingSetDialog extends SelectionDialog * * @see org.eclipse.jface.dialogs.Dialog#open() */ + @Override public int open() { addedWorkingSets = new ArrayList(); removedWorkingSets = new ArrayList(); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/ActionSetComparator.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/ActionSetComparator.java index d630a0d0923..c51916afb7e 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/ActionSetComparator.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/ActionSetComparator.java @@ -30,7 +30,8 @@ public class ActionSetComparator extends ViewerComparator { * the first element is less than, equal to, or greater than * the second element. */ - public int compare(Viewer viewer, Object e1, Object e2) { + @Override + public int compare(Viewer viewer, Object e1, Object e2) { if (e1 instanceof IActionSetDescriptor) { String str1 = DialogUtil.removeAccel(((IActionSetDescriptor) e1) .getLabel()); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/AdaptableForwarder.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/AdaptableForwarder.java index 30a2cac3b22..f2c72d37807 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/AdaptableForwarder.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/AdaptableForwarder.java @@ -35,6 +35,7 @@ public class AdaptableForwarder implements IAdaptable { /* (non-Javadoc) * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class) */ + @Override public Object getAdapter(Class adapter) { return Util.getAdapter(element, adapter); } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/CapabilityFilter.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/CapabilityFilter.java index 0b6401cf562..6f8d994c85b 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/CapabilityFilter.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/CapabilityFilter.java @@ -31,6 +31,7 @@ public class CapabilityFilter extends ViewerFilter { /* (non-Javadoc) * @see org.eclipse.jface.viewers.ViewerFilter#select(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object) */ + @Override public boolean select(Viewer viewer, Object parentElement, Object element) { return ! WorkbenchActivityHelper.filterItem(element); } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/ContentTypesPreferencePage.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/ContentTypesPreferencePage.java index 4c1caabc34d..811632b2fc5 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/ContentTypesPreferencePage.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/ContentTypesPreferencePage.java @@ -103,6 +103,7 @@ public class ContentTypesPreferencePage extends PreferencePage implements * * @see java.lang.Object#toString() */ + @Override public String toString() { String toString; if (name != null) { @@ -121,6 +122,7 @@ public class ContentTypesPreferencePage extends PreferencePage implements } private class FileSpecComparator extends ViewerComparator { + @Override public int category(Object element) { // only Spec objects in here - unchecked cast return ((Spec) element).sortValue; @@ -133,6 +135,7 @@ public class ContentTypesPreferencePage extends PreferencePage implements * * @see org.eclipse.jface.viewers.LabelProvider#getText(java.lang.Object) */ + @Override public String getText(Object element) { String label = super.getText(element); return TextProcessor.process(label, "*."); //$NON-NLS-1$ @@ -146,6 +149,7 @@ public class ContentTypesPreferencePage extends PreferencePage implements * * @see org.eclipse.jface.viewers.IContentProvider#dispose() */ + @Override public void dispose() { } @@ -155,6 +159,7 @@ public class ContentTypesPreferencePage extends PreferencePage implements * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer, * java.lang.Object, java.lang.Object) */ + @Override public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { } @@ -163,6 +168,7 @@ public class ContentTypesPreferencePage extends PreferencePage implements * * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object) */ + @Override public Object[] getElements(Object inputElement) { IContentType contentType = (IContentType) inputElement; String[] userextfileSpecs = contentType @@ -228,6 +234,7 @@ public class ContentTypesPreferencePage extends PreferencePage implements * * @see org.eclipse.jface.viewers.LabelProvider#getText(java.lang.Object) */ + @Override public String getText(Object element) { IContentType contentType = (IContentType) element; return contentType.getName(); @@ -243,6 +250,7 @@ public class ContentTypesPreferencePage extends PreferencePage implements * * @see org.eclipse.jface.viewers.ITreeContentProvider#getChildren(java.lang.Object) */ + @Override public Object[] getChildren(Object parentElement) { List elements = new ArrayList(); IContentType baseType = (IContentType) parentElement; @@ -261,6 +269,7 @@ public class ContentTypesPreferencePage extends PreferencePage implements * * @see org.eclipse.jface.viewers.ITreeContentProvider#getParent(java.lang.Object) */ + @Override public Object getParent(Object element) { IContentType contentType = (IContentType) element; return contentType.getBaseType(); @@ -271,6 +280,7 @@ public class ContentTypesPreferencePage extends PreferencePage implements * * @see org.eclipse.jface.viewers.ITreeContentProvider#hasChildren(java.lang.Object) */ + @Override public boolean hasChildren(Object element) { return getChildren(element).length > 0; } @@ -280,6 +290,7 @@ public class ContentTypesPreferencePage extends PreferencePage implements * * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object) */ + @Override public Object[] getElements(Object inputElement) { return getChildren(null); } @@ -289,6 +300,7 @@ public class ContentTypesPreferencePage extends PreferencePage implements * * @see org.eclipse.jface.viewers.IContentProvider#dispose() */ + @Override public void dispose() { } @@ -299,6 +311,7 @@ public class ContentTypesPreferencePage extends PreferencePage implements * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer, * java.lang.Object, java.lang.Object) */ + @Override public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { manager = (IContentTypeManager) newInput; } @@ -309,6 +322,7 @@ public class ContentTypesPreferencePage extends PreferencePage implements * * @see org.eclipse.jface.preference.PreferencePage#createContents(org.eclipse.swt.widgets.Composite) */ + @Override protected Control createContents(Composite parent) { Composite composite = new Composite(parent, SWT.NONE); GridLayout layout = new GridLayout(2, false); @@ -366,6 +380,7 @@ public class ContentTypesPreferencePage extends PreferencePage implements * * @see org.eclipse.swt.events.SelectionAdapter#widgetSelected(org.eclipse.swt.events.SelectionEvent) */ + @Override public void widgetSelected(SelectionEvent e) { try { String text = charsetField.getText().trim(); @@ -387,6 +402,7 @@ public class ContentTypesPreferencePage extends PreferencePage implements * * @see org.eclipse.swt.events.KeyAdapter#keyReleased(org.eclipse.swt.events.KeyEvent) */ + @Override public void keyReleased(KeyEvent e) { IContentType contentType = getSelectedContentType(); String charset = contentType.getDefaultCharset(); @@ -399,6 +415,7 @@ public class ContentTypesPreferencePage extends PreferencePage implements }); charsetField.addModifyListener(new ModifyListener() { + @Override public void modifyText(ModifyEvent e) { String errorMessage = null; String text = charsetField.getText(); @@ -438,6 +455,7 @@ public class ContentTypesPreferencePage extends PreferencePage implements fileAssociationViewer .addSelectionChangedListener(new ISelectionChangedListener() { + @Override public void selectionChanged(SelectionChangedEvent event) { IStructuredSelection selection = (IStructuredSelection) event .getSelection(); @@ -479,6 +497,7 @@ public class ContentTypesPreferencePage extends PreferencePage implements * * @see org.eclipse.swt.events.SelectionAdapter#widgetSelected(org.eclipse.swt.events.SelectionEvent) */ + @Override public void widgetSelected(SelectionEvent e) { Shell shell = composite.getShell(); IContentType selectedContentType = getSelectedContentType(); @@ -522,6 +541,7 @@ public class ContentTypesPreferencePage extends PreferencePage implements editButton.setEnabled(false); setButtonLayoutData(editButton); editButton.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { Shell shell = composite.getShell(); IContentType selectedContentType = getSelectedContentType(); @@ -585,6 +605,7 @@ public class ContentTypesPreferencePage extends PreferencePage implements * * @see org.eclipse.swt.events.SelectionAdapter#widgetSelected(org.eclipse.swt.events.SelectionEvent) */ + @Override public void widgetSelected(SelectionEvent event) { IContentType contentType = getSelectedContentType(); Spec[] specs = getSelectedSpecs(); @@ -661,6 +682,7 @@ public class ContentTypesPreferencePage extends PreferencePage implements * * @see org.eclipse.jface.viewers.ISelectionChangedListener#selectionChanged(org.eclipse.jface.viewers.SelectionChangedEvent) */ + @Override public void selectionChanged(SelectionChangedEvent event) { IContentType contentType = (IContentType) ((IStructuredSelection) event .getSelection()).getFirstElement(); @@ -690,6 +712,7 @@ public class ContentTypesPreferencePage extends PreferencePage implements * * @see org.eclipse.ui.IWorkbenchPreferencePage#init(org.eclipse.ui.IWorkbench) */ + @Override public void init(IWorkbench workbench) { this.workbench = workbench; noDefaultAndApplyButton(); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/CustomizePerspectiveDialog.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/CustomizePerspectiveDialog.java index 8834d5f19b4..6d27b51ae25 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/CustomizePerspectiveDialog.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/CustomizePerspectiveDialog.java @@ -285,6 +285,7 @@ public class CustomizePerspectiveDialog extends TrayDialog { this.filter = menuStructureFilterByActionSet; } + @Override public void selectionChanged(SelectionChangedEvent event) { Object element = ((IStructuredSelection) event.getSelection()) .getFirstElement(); @@ -307,6 +308,7 @@ public class CustomizePerspectiveDialog extends TrayDialog { this.rootItem = rootItem; } + @Override public boolean select(Viewer viewer, Object parentElement, Object element) { return (includeInSetStructure(rootItem, (ActionSet) element)); @@ -555,6 +557,7 @@ public class CustomizePerspectiveDialog extends TrayDialog { contributionItems.add(item); } + @Override public String toString() { return descriptor.getLabel(); } @@ -592,25 +595,30 @@ public class CustomizePerspectiveDialog extends TrayDialog { */ private class ShortcutLabelProvider extends TreeManager.TreeItemLabelProvider implements ITableLabelProvider { + @Override public Image getColumnImage(Object element, int columnIndex) { if (columnIndex == 0) return this.getImage(element); return null; } + @Override public String getColumnText(Object element, int columnIndex) { if (columnIndex == 1) return ((ShortcutItem) element).getDescription(); return this.getText(element); } + @Override public void addListener(ILabelProviderListener listener) { } + @Override public boolean isLabelProperty(Object element, String property) { return false; } + @Override public void removeListener(ILabelProviderListener listener) { } } @@ -625,6 +633,7 @@ public class CustomizePerspectiveDialog extends TrayDialog { * @since 3.5 */ private static class CategoryCheckProvider implements ICheckStateProvider { + @Override public boolean isChecked(Object element) { Category category = (Category) element; @@ -650,6 +659,7 @@ public class CustomizePerspectiveDialog extends TrayDialog { return false; } + @Override public boolean isGrayed(Object element) { boolean hasChecked = false; boolean hasUnchecked = false; @@ -702,11 +712,13 @@ public class CustomizePerspectiveDialog extends TrayDialog { * Adds logic to only show a tooltip if a meaningful item is under the * cursor. */ + @Override protected boolean shouldCreateToolTip(Event event) { return super.shouldCreateToolTip(event) && getModelElement(event) != null; } + @Override protected Composite createToolTipContentArea(Event event, Composite parent) { Object modelElement = getModelElement(event); @@ -843,6 +855,7 @@ public class CustomizePerspectiveDialog extends TrayDialog { this.table = table; } + @Override protected Object getModelElement(Event event) { TableItem tableItem = table.getItem(new Point(event.x, event.y)); if (tableItem == null) @@ -881,6 +894,7 @@ public class CustomizePerspectiveDialog extends TrayDialog { this.setHideOnMouseDown(false); } + @Override public Point getLocation(Point tipSize, Event event) { // try to position the tooltip at the bottom of the cell ViewerCell cell = v.getCell(new Point(event.x, event.y)); @@ -892,11 +906,13 @@ public class CustomizePerspectiveDialog extends TrayDialog { return super.getLocation(tipSize, event); } + @Override protected Object getToolTipArea(Event event) { // Ensure that the tooltip is hidden when the cell is left return v.getCell(new Point(event.x, event.y)); } + @Override protected void addContent(Composite destination, Object modelElement) { final DisplayItem item = (DisplayItem) modelElement; @@ -979,10 +995,12 @@ public class CustomizePerspectiveDialog extends TrayDialog { if(text != null) { Link link = createEntryWithLink(destination, image, text); link.addSelectionListener(new SelectionListener() { + @Override public void widgetDefaultSelected(SelectionEvent e) { widgetSelected(e); } + @Override public void widgetSelected(SelectionEvent e) { ActionSet actionSet = (ActionSet) idToActionSet .get(e.text); @@ -1070,10 +1088,12 @@ public class CustomizePerspectiveDialog extends TrayDialog { text); bindingLink.addSelectionListener(new SelectionListener() { + @Override public void widgetDefaultSelected(SelectionEvent e) { widgetDefaultSelected(e); } + @Override public void widgetSelected(SelectionEvent e) { PreferenceDialog dialog = PreferencesUtil .createPreferenceDialogOn(getShell(), @@ -1108,6 +1128,7 @@ public class CustomizePerspectiveDialog extends TrayDialog { } } + @Override protected Object getModelElement(Event event) { org.eclipse.swt.widgets.TreeItem treeItem = tree.getItem(new Point( event.x, event.y)); @@ -1129,6 +1150,7 @@ public class CustomizePerspectiveDialog extends TrayDialog { this.actionSet = actionSet; } + @Override public boolean select(Viewer viewer, Object parentElement, Object element) { if (!(element instanceof DisplayItem)) @@ -1156,11 +1178,13 @@ public class CustomizePerspectiveDialog extends TrayDialog { this.filter = filter; } + @Override public boolean isChecked(Object element) { TreeItem treeItem = (TreeItem) element; return getLeafStates(treeItem, contentProvider, filter) != TreeManager.CHECKSTATE_UNCHECKED; } + @Override public boolean isGrayed(Object element) { TreeItem treeItem = (TreeItem) element; return getLeafStates(treeItem, contentProvider, filter) == TreeManager.CHECKSTATE_GRAY; @@ -1187,6 +1211,7 @@ public class CustomizePerspectiveDialog extends TrayDialog { this.filter = filter; } + @Override public void checkStateChanged(CheckStateChangedEvent event) { setAllLeafs((DisplayItem) event.getElement(), event .getChecked(), contentProvider, filter); @@ -1211,6 +1236,7 @@ public class CustomizePerspectiveDialog extends TrayDialog { this.viewer = viewer; } + @Override public void checkChanged(TreeItem changedItem) { TreeItem item = changedItem; boolean update = false; @@ -1252,6 +1278,7 @@ public class CustomizePerspectiveDialog extends TrayDialog { this.originalListener = originalListener; } + @Override public void checkStateChanged(CheckStateChangedEvent event) { DisplayItem item = (DisplayItem) event.getElement(); ViewerFilter[] filters = viewer.getFilters(); @@ -1332,10 +1359,12 @@ public class CustomizePerspectiveDialog extends TrayDialog { this.filter = filter; } + @Override public Color getBackground(Object element) { return null; } + @Override public Color getForeground(Object element) { if (!isEffectivelyAvailable((DisplayItem) element, filter)) { return display.getSystemColor(SWT.COLOR_GRAY); @@ -1343,6 +1372,7 @@ public class CustomizePerspectiveDialog extends TrayDialog { return null; } + @Override public Image getImage(Object element) { Image actual = super.getImage(element); @@ -1395,39 +1425,49 @@ public class CustomizePerspectiveDialog extends TrayDialog { this.configurer = configurer; } + @Override public IWorkbenchWindowConfigurer getWindowConfigurer() { return configurer; } + @Override public IMenuManager getMenuManager() { return menuManager; } + @Override public IStatusLineManager getStatusLineManager() { return statusLineManager; } + @Override public ICoolBarManager getCoolBarManager() { return coolBarManager; } + @Override public IToolBarManager getToolBarManager() { return null; } + @Override public void setGlobalActionHandler(String actionID, IAction handler) { } + @Override public void updateActionBars() { } + @Override public void clearGlobalActionHandlers() { } + @Override public IAction getGlobalActionHandler(String actionId) { return null; } + @Override public void registerGlobalAction(IAction action) { } @@ -1440,15 +1480,18 @@ public class CustomizePerspectiveDialog extends TrayDialog { statusLineManager.dispose(); } + @Override public final IServiceLocator getServiceLocator() { return configurer.getWindow(); } + @Override public IToolBarContributionItem createToolBarContributionItem( IToolBarManager toolBarManager, String id) { return new ToolBarContributionItem2(toolBarManager, id); } + @Override public IToolBarManager createToolBarManager() { return new ToolBarManager(); } @@ -1485,6 +1528,7 @@ public class CustomizePerspectiveDialog extends TrayDialog { loadMenuAndToolbarStructure(); } + @Override protected void configureShell(Shell shell) { super.configureShell(shell); String title = perspective.getDesc().getLabel(); @@ -1495,6 +1539,7 @@ public class CustomizePerspectiveDialog extends TrayDialog { IWorkbenchHelpContextIds.ACTION_SET_SELECTION_DIALOG); } + @Override protected Control createDialogArea(Composite parent) { // Create a font for titles in the tooltips FontData[] defaultFont = JFaceResources.getDefaultFont().getFontData(); @@ -1596,6 +1641,7 @@ public class CustomizePerspectiveDialog extends TrayDialog { menuCategoriesViewer.setComparator(new WorkbenchViewerComparator()); menuCategoriesViewer.setCheckStateProvider(new CategoryCheckProvider()); menuCategoriesViewer.addCheckStateListener(new ICheckStateListener() { + @Override public void checkStateChanged(CheckStateChangedEvent event) { Category category = (Category) event.getElement(); category.setItemsState(event.getChecked()); @@ -1604,6 +1650,7 @@ public class CustomizePerspectiveDialog extends TrayDialog { }); treeManager.addListener(new CheckListener() { + @Override public void checkChanged(TreeItem changedItem) { if (changedItem instanceof Category) { menuCategoriesViewer.update(changedItem, null); @@ -1645,6 +1692,7 @@ public class CustomizePerspectiveDialog extends TrayDialog { menuItemsViewer .setContentProvider(new TreeManager.TreeItemContentProvider() { + @Override public Object[] getChildren(Object parentElement) { if (parentElement instanceof Category) return ((Category) parentElement) @@ -1658,6 +1706,7 @@ public class CustomizePerspectiveDialog extends TrayDialog { // menusViewer menusViewer .addSelectionChangedListener(new ISelectionChangedListener() { + @Override public void selectionChanged(SelectionChangedEvent event) { Category category = (Category) ((IStructuredSelection) event .getSelection()).getFirstElement(); @@ -1673,6 +1722,7 @@ public class CustomizePerspectiveDialog extends TrayDialog { // update menuItemsViewer on a change to menuCategoriesViewer menuCategoriesViewer .addSelectionChangedListener(new ISelectionChangedListener() { + @Override public void selectionChanged(SelectionChangedEvent event) { Category category = (Category) ((IStructuredSelection) event .getSelection()).getFirstElement(); @@ -1749,10 +1799,12 @@ public class CustomizePerspectiveDialog extends TrayDialog { actionSetsViewer.setContentProvider(new ArrayContentProvider()); actionSetsViewer.setComparator(new WorkbenchViewerComparator()); actionSetsViewer.setCheckStateProvider(new ICheckStateProvider() { + @Override public boolean isChecked(Object element) { return ((ActionSet) element).isActive(); } + @Override public boolean isGrayed(Object element) { return false; } @@ -1766,6 +1818,7 @@ public class CustomizePerspectiveDialog extends TrayDialog { // Filter to show only branches necessary for the selected action set. final ViewerFilter setFilter = new ViewerFilter() { + @Override public boolean select(Viewer viewer, Object parentElement, Object element) { if (selectedActionSet[0] == null) @@ -1777,6 +1830,7 @@ public class CustomizePerspectiveDialog extends TrayDialog { // Updates the check state of action sets actionSetsViewer.addCheckStateListener(new ICheckStateListener() { + @Override public void checkStateChanged(CheckStateChangedEvent event) { final ActionSet actionSet = (ActionSet) event.getElement(); if (event.getChecked()) { @@ -1859,6 +1913,7 @@ public class CustomizePerspectiveDialog extends TrayDialog { // selection changes actionSetsViewer .addSelectionChangedListener(new ISelectionChangedListener() { + @Override public void selectionChanged(SelectionChangedEvent event) { selectedActionSet[0] = (ActionSet) ((IStructuredSelection) event .getSelection()).getFirstElement(); @@ -1963,6 +2018,7 @@ public class CustomizePerspectiveDialog extends TrayDialog { // Override any attempts to set an item to visible // which exists in an unavailable action set treeManager.addListener(new CheckListener() { + @Override public void checkChanged(TreeItem changedItem) { if (!(changedItem instanceof DisplayItem)) return; @@ -1980,9 +2036,11 @@ public class CustomizePerspectiveDialog extends TrayDialog { .setText(WorkbenchMessages.HideItems_turnOnActionSets); showCommandGroupFilterButton .addSelectionListener(new SelectionListener() { + @Override public void widgetDefaultSelected(SelectionEvent e) { } + @Override public void widgetSelected(SelectionEvent e) { if (showCommandGroupFilterButton.getSelection()) { Object o = ((StructuredSelection) menuStructureViewer1 @@ -2112,6 +2170,7 @@ public class CustomizePerspectiveDialog extends TrayDialog { // Override any attempts to set an item to visible // which exists in an unavailable action set treeManager.addListener(new CheckListener() { + @Override public void checkChanged(TreeItem changedItem) { if (!(changedItem instanceof DisplayItem)) return; @@ -2129,9 +2188,11 @@ public class CustomizePerspectiveDialog extends TrayDialog { .setText(WorkbenchMessages.HideItems_turnOnActionSets); showCommandGroupFilterButton .addSelectionListener(new SelectionListener() { + @Override public void widgetDefaultSelected(SelectionEvent e) { } + @Override public void widgetSelected(SelectionEvent e) { if (showCommandGroupFilterButton.getSelection()) { Object o = ((StructuredSelection) toolbarStructureViewer1 @@ -3369,6 +3430,7 @@ public class CustomizePerspectiveDialog extends TrayDialog { return hasChanges; } + @Override protected void okPressed() { // Shortcuts if (showShortcutTab()) { @@ -3425,6 +3487,7 @@ public class CustomizePerspectiveDialog extends TrayDialog { * * @see org.eclipse.jface.dialogs.TrayDialog#close() */ + @Override public boolean close() { tooltipHeading.dispose(); @@ -3470,6 +3533,7 @@ public class CustomizePerspectiveDialog extends TrayDialog { * * @see org.eclipse.jface.dialogs.Dialog#isResizable() */ + @Override protected boolean isResizable() { return true; } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/DataTransferWizardCollectionComparator.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/DataTransferWizardCollectionComparator.java index 69f3ac5f753..4431ff1681a 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/DataTransferWizardCollectionComparator.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/DataTransferWizardCollectionComparator.java @@ -43,7 +43,8 @@ class DataTransferWizardCollectionComparator extends ViewerComparator { super(); } - public int category(Object element) { + @Override + public int category(Object element) { if (element instanceof WizardCollectionElement){ String id = ((WizardCollectionElement)element).getId(); if (WizardsRegistryReader.GENERAL_WIZARD_CATEGORY.equals(id)) { @@ -61,7 +62,8 @@ class DataTransferWizardCollectionComparator extends ViewerComparator { * Return true if this sorter is affected by a property * change of propertyName on the specified element. */ - public boolean isSorterProperty(Object object, String propertyId) { + @Override + public boolean isSorterProperty(Object object, String propertyId) { return propertyId.equals(IBasicPropertyConstants.P_TEXT); } } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/DecoratorsPreferencePage.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/DecoratorsPreferencePage.java index f92c4a8d407..0cd40847be0 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/DecoratorsPreferencePage.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/DecoratorsPreferencePage.java @@ -58,7 +58,8 @@ public class DecoratorsPreferencePage extends PreferencePage implements /** * @see PreferencePage#createContents(Composite) */ - protected Control createContents(Composite parent) { + @Override + protected Control createContents(Composite parent) { Font font = parent.getFont(); @@ -111,7 +112,8 @@ public class DecoratorsPreferencePage extends PreferencePage implements new GridData(GridData.FILL_BOTH)); checkboxViewer.getTable().setFont(decoratorsComposite.getFont()); checkboxViewer.setLabelProvider(new LabelProvider() { - public String getText(Object element) { + @Override + public String getText(Object element) { return ((DecoratorDefinition) element).getName(); } }); @@ -121,22 +123,26 @@ public class DecoratorsPreferencePage extends PreferencePage implements private final Comparator comparer = new Comparator() { private Collator collator = Collator.getInstance(); - public int compare(Object arg0, Object arg1) { + @Override + public int compare(Object arg0, Object arg1) { String s1 = ((DecoratorDefinition) arg0).getName(); String s2 = ((DecoratorDefinition) arg1).getName(); return collator.compare(s1, s2); } }; - public void dispose() { + @Override + public void dispose() { //Nothing to do on dispose } - public void inputChanged(Viewer viewer, Object oldInput, + @Override + public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { } - public Object[] getElements(Object inputElement) { + @Override + public Object[] getElements(Object inputElement) { //Make an entry for each decorator definition Object[] elements = (Object[]) inputElement; Object[] results = new Object[elements.length]; @@ -149,7 +155,8 @@ public class DecoratorsPreferencePage extends PreferencePage implements checkboxViewer .addSelectionChangedListener(new ISelectionChangedListener() { - public void selectionChanged(SelectionChangedEvent event) { + @Override + public void selectionChanged(SelectionChangedEvent event) { if (event.getSelection() instanceof IStructuredSelection) { IStructuredSelection sel = (IStructuredSelection) event .getSelection(); @@ -165,7 +172,8 @@ public class DecoratorsPreferencePage extends PreferencePage implements }); checkboxViewer.addCheckStateListener(new ICheckStateListener() { - public void checkStateChanged(CheckStateChangedEvent event) { + @Override + public void checkStateChanged(CheckStateChangedEvent event) { checkboxViewer.setSelection(new StructuredSelection(event .getElement())); } @@ -236,7 +244,8 @@ public class DecoratorsPreferencePage extends PreferencePage implements /** * @see PreferencePage#performDefaults() */ - protected void performDefaults() { + @Override + protected void performDefaults() { super.performDefaults(); DecoratorManager manager = WorkbenchPlugin.getDefault() .getDecoratorManager(); @@ -251,7 +260,8 @@ public class DecoratorsPreferencePage extends PreferencePage implements /** * @see IPreferencePage#performOk() */ - public boolean performOk() { + @Override + public boolean performOk() { if (super.performOk()) { DecoratorManager manager = getDecoratorManager(); //Clear the caches first to avoid unneccessary updates @@ -275,7 +285,8 @@ public class DecoratorsPreferencePage extends PreferencePage implements /** * @see IWorkbenchPreferencePage#init(IWorkbench) */ - public void init(IWorkbench workbench) { + @Override + public void init(IWorkbench workbench) { } /** diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/EditorsPreferencePage.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/EditorsPreferencePage.java index 939d3c2881b..2c6969a844e 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/EditorsPreferencePage.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/EditorsPreferencePage.java @@ -70,7 +70,8 @@ public class EditorsPreferencePage extends PreferencePage implements private IntegerFieldEditor recentFilesEditor; private IPropertyChangeListener validityChangeListener = new IPropertyChangeListener() { - public void propertyChange(PropertyChangeEvent event) { + @Override + public void propertyChange(PropertyChangeEvent event) { if (event.getProperty().equals(FieldEditor.IS_VALID)) { updateValidState(); } @@ -81,6 +82,7 @@ public class EditorsPreferencePage extends PreferencePage implements private Button allowInplaceEditor; + @Override protected Control createContents(Composite parent) { Composite composite = createComposite(parent); @@ -156,11 +158,13 @@ public class EditorsPreferencePage extends PreferencePage implements return composite; } - public void init(IWorkbench workbench) { + @Override + public void init(IWorkbench workbench) { // do nothing } - protected void performDefaults() { + @Override + protected void performDefaults() { IPreferenceStore store = getPreferenceStore(); showMultipleEditorTabs .setSelection(getAPIPreferenceStore() @@ -191,7 +195,8 @@ public class EditorsPreferencePage extends PreferencePage implements recentFilesEditor.loadDefault(); } - public boolean performOk() { + @Override + public boolean performOk() { IPreferenceStore store = getPreferenceStore(); getAPIPreferenceStore().setValue(IWorkbenchPreferenceConstants.SHOW_MULTIPLE_EDITOR_TABS, showMultipleEditorTabs.getSelection()); @@ -221,7 +226,8 @@ public class EditorsPreferencePage extends PreferencePage implements * * @return the preference store for this plugin */ - protected IPreferenceStore doGetPreferenceStore() { + @Override + protected IPreferenceStore doGetPreferenceStore() { return WorkbenchPlugin.getDefault().getPreferenceStore(); } @@ -264,7 +270,8 @@ public class EditorsPreferencePage extends PreferencePage implements reuseEditors.setSelection(store .getBoolean(IPreferenceConstants.REUSE_EDITORS_BOOLEAN)); reuseEditors.addSelectionListener(new SelectionAdapter() { - public void widgetSelected(SelectionEvent e) { + @Override + public void widgetSelected(SelectionEvent e) { reuseEditorsThreshold .getLabelControl(editorReuseThresholdGroup).setEnabled( reuseEditors.getSelection()); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/EmptyPreferencePage.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/EmptyPreferencePage.java index ff4b5a1f1f9..978d7cd8343 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/EmptyPreferencePage.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/EmptyPreferencePage.java @@ -25,7 +25,8 @@ import org.eclipse.ui.internal.WorkbenchPlugin; */ public class EmptyPreferencePage extends PreferencePage implements IWorkbenchPreferencePage { - protected Control createContents(Composite parent) { + @Override + protected Control createContents(Composite parent) { return new Composite(parent, SWT.NULL); } @@ -33,13 +34,15 @@ public class EmptyPreferencePage extends PreferencePage implements * Hook method to get a page specific preference store. Reimplement this * method if a page don't want to use its parent's preference store. */ - protected IPreferenceStore doGetPreferenceStore() { + @Override + protected IPreferenceStore doGetPreferenceStore() { return WorkbenchPlugin.getDefault().getPreferenceStore(); } /** * @see IWorkbenchPreferencePage */ - public void init(IWorkbench workbench) { + @Override + public void init(IWorkbench workbench) { } } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/EmptyPropertyPage.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/EmptyPropertyPage.java index 416f766dbd5..beca1ff3905 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/EmptyPropertyPage.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/EmptyPropertyPage.java @@ -24,7 +24,8 @@ public class EmptyPropertyPage extends PropertyPage { * Creates empty composite for this page content. */ - protected Control createContents(Composite parent) { + @Override + protected Control createContents(Composite parent) { return new Composite(parent, SWT.NULL); } } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/ErrorPreferencePage.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/ErrorPreferencePage.java index ef3acd3f6be..3e36d6d9ddf 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/ErrorPreferencePage.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/ErrorPreferencePage.java @@ -30,7 +30,8 @@ public class ErrorPreferencePage extends EmptyPreferencePage { * * @see org.eclipse.jface.preference.PreferencePage#createContents(org.eclipse.swt.widgets.Composite) */ - protected Control createContents(Composite parent) { + @Override + protected Control createContents(Composite parent) { Text text = new Text(parent, SWT.MULTI | SWT.READ_ONLY | SWT.WRAP); text.setForeground(JFaceColors.getErrorText(text.getDisplay())); text.setBackground(text.getDisplay().getSystemColor( diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/EventLoopProgressMonitor.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/EventLoopProgressMonitor.java index d615c2751c7..1fafc840622 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/EventLoopProgressMonitor.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/EventLoopProgressMonitor.java @@ -60,7 +60,8 @@ public class EventLoopProgressMonitor extends ProgressMonitorWrapper implements /** * @see IProgressMonitor#beginTask */ - public void beginTask(String name, int totalWork) { + @Override + public void beginTask(String name, int totalWork) { super.beginTask(name, totalWork); taskName = name; runEventLoop(); @@ -69,14 +70,16 @@ public class EventLoopProgressMonitor extends ProgressMonitorWrapper implements /* (non-Javadoc) * @see org.eclipse.core.runtime.IProgressMonitorWithBlocking#clearBlocked() */ - public void clearBlocked() { + @Override + public void clearBlocked() { Dialog.getBlockedHandler().clearBlocked(); } /** * @see IProgressMonitor#done */ - public void done() { + @Override + public void done() { super.done(); taskName = null; runEventLoop(); @@ -85,7 +88,8 @@ public class EventLoopProgressMonitor extends ProgressMonitorWrapper implements /** * @see IProgressMonitor#internalWorked */ - public void internalWorked(double work) { + @Override + public void internalWorked(double work) { super.internalWorked(work); runEventLoop(); } @@ -93,7 +97,8 @@ public class EventLoopProgressMonitor extends ProgressMonitorWrapper implements /** * @see IProgressMonitor#isCanceled */ - public boolean isCanceled() { + @Override + public boolean isCanceled() { runEventLoop(); return super.isCanceled(); } @@ -140,14 +145,16 @@ public class EventLoopProgressMonitor extends ProgressMonitorWrapper implements /* (non-Javadoc) * @see org.eclipse.core.runtime.IProgressMonitorWithBlocking#setBlocked(org.eclipse.core.runtime.IStatus) */ - public void setBlocked(IStatus reason) { + @Override + public void setBlocked(IStatus reason) { Dialog.getBlockedHandler().showBlocked(this, reason, taskName); } /** * @see IProgressMonitor#setCanceled */ - public void setCanceled(boolean b) { + @Override + public void setCanceled(boolean b) { super.setCanceled(b); taskName = null; runEventLoop(); @@ -156,7 +163,8 @@ public class EventLoopProgressMonitor extends ProgressMonitorWrapper implements /** * @see IProgressMonitor#setTaskName */ - public void setTaskName(String name) { + @Override + public void setTaskName(String name) { super.setTaskName(name); taskName = name; runEventLoop(); @@ -165,7 +173,8 @@ public class EventLoopProgressMonitor extends ProgressMonitorWrapper implements /** * @see IProgressMonitor#subTask */ - public void subTask(String name) { + @Override + public void subTask(String name) { //Be prepared in case the first task was null if (taskName == null) { taskName = name; @@ -177,7 +186,8 @@ public class EventLoopProgressMonitor extends ProgressMonitorWrapper implements /** * @see IProgressMonitor#worked */ - public void worked(int work) { + @Override + public void worked(int work) { super.worked(work); runEventLoop(); } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/ExportPage.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/ExportPage.java index 0708c84a410..fbd65abb6ef 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/ExportPage.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/ExportPage.java @@ -50,11 +50,13 @@ public class ExportPage extends ImportExportPage { super(aWorkbench, currentSelection); } + @Override protected void initialize() { workbench.getHelpSystem().setHelp(getControl(), IWorkbenchHelpContextIds.EXPORT_WIZARD_SELECTION_WIZARD_PAGE); } + @Override protected Composite createTreeViewer(Composite parent) { IWizardCategory root = WorkbenchPlugin.getDefault() .getExportWizardRegistry().getRootCategory(); @@ -62,12 +64,14 @@ public class ExportPage extends ImportExportPage { root, WorkbenchMessages.ExportWizard_selectDestination); Composite exportComp = exportTree.createControl(parent); exportTree.getViewer().addSelectionChangedListener(new ISelectionChangedListener(){ + @Override public void selectionChanged(SelectionChangedEvent event) { listSelectionChanged(event.getSelection()); } }); exportTree.getViewer().addDoubleClickListener(new IDoubleClickListener(){ - public void doubleClick(DoubleClickEvent event) { + @Override + public void doubleClick(DoubleClickEvent event) { treeDoubleClicked(event); } }); @@ -75,12 +79,14 @@ public class ExportPage extends ImportExportPage { return exportComp; } + @Override public void saveWidgetValues(){ storeExpandedCategories(STORE_EXPANDED_EXPORT_CATEGORIES, exportTree.getViewer()); storeSelectedCategoryAndWizard(STORE_SELECTED_EXPORT_WIZARD_ID, exportTree.getViewer()); super.saveWidgetValues(); } + @Override protected void restoreWidgetValues(){ IWizardCategory exportRoot = WorkbenchPlugin.getDefault().getExportWizardRegistry().getRootCategory(); expandPreviouslyExpandedCategories(STORE_EXPANDED_EXPORT_CATEGORIES, exportRoot, exportTree.getViewer()); @@ -88,11 +94,13 @@ public class ExportPage extends ImportExportPage { super.restoreWidgetValues(); } + @Override protected ITriggerPoint getTriggerPoint(){ return getWorkbench().getActivitySupport() .getTriggerPointManager().getTriggerPoint(WorkbenchTriggerPoints.EXPORT_WIZARDS); } + @Override protected void updateMessage(){ setMessage(WorkbenchMessages.ImportExportPage_chooseExportDestination); super.updateMessage(); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/ExportWizard.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/ExportWizard.java index c0f8140c582..92f8294cb2f 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/ExportWizard.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/ExportWizard.java @@ -44,15 +44,18 @@ public class ExportWizard extends Wizard { super(w, ss, e, s, WorkbenchTriggerPoints.EXPORT_WIZARDS); } - public void createControl(Composite parent) { + @Override + public void createControl(Composite parent) { super.createControl(parent); workbench.getHelpSystem().setHelp(getControl(), IWorkbenchHelpContextIds.EXPORT_WIZARD_SELECTION_WIZARD_PAGE); } - protected IWizardNode createWizardNode(WorkbenchWizardElement element) { + @Override + protected IWizardNode createWizardNode(WorkbenchWizardElement element) { return new WorkbenchWizardNode(this, element) { - public IWorkbenchWizard createWizard() throws CoreException { + @Override + public IWorkbenchWizard createWizard() throws CoreException { return wizardElement.createWizard(); } }; @@ -62,7 +65,8 @@ public class ExportWizard extends Wizard { /** * Creates the wizard's pages lazily. */ - public void addPages() { + @Override + public void addPages() { addPage(new SelectionPage(this.theWorkbench, this.selection, getAvailableExportWizards(), WorkbenchMessages.ExportWizard_selectDestination)); } @@ -105,7 +109,8 @@ public class ExportWizard extends Wizard { * Subclasses must implement this <code>IWizard</code> method * to perform any special finish processing for their wizard. */ - public boolean performFinish() { + @Override + public boolean performFinish() { ((SelectionPage) getPages()[0]).saveWidgetValues(); return true; } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/FileEditorsPreferencePage.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/FileEditorsPreferencePage.java index 2c65c966484..38834e94340 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/FileEditorsPreferencePage.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/FileEditorsPreferencePage.java @@ -153,7 +153,8 @@ public class FileEditorsPreferencePage extends PreferencePage implements /** * Creates the page's UI content. */ - protected Control createContents(Composite parent) { + @Override + protected Control createContents(Composite parent) { imagesToDispose = new ArrayList(); editorsToImages = new HashMap(50); @@ -287,7 +288,8 @@ public class FileEditorsPreferencePage extends PreferencePage implements * (i.e fonts, cursors, etc). Subclasses should reimplement this method to * release their own allocated SWT resources. */ - public void dispose() { + @Override + public void dispose() { super.dispose(); if (imagesToDispose != null) { for (Iterator e = imagesToDispose.iterator(); e.hasNext();) { @@ -307,7 +309,8 @@ public class FileEditorsPreferencePage extends PreferencePage implements * Hook method to get a page specific preference store. Reimplement this * method if a page don't want to use its parent's preference store. */ - protected IPreferenceStore doGetPreferenceStore() { + @Override + protected IPreferenceStore doGetPreferenceStore() { return WorkbenchPlugin.getDefault().getPreferenceStore(); } @@ -434,7 +437,8 @@ public class FileEditorsPreferencePage extends PreferencePage implements return null; } - public void handleEvent(Event event) { + @Override + public void handleEvent(Event event) { if (event.widget == addResourceTypeButton) { promptForResourceType(); } else if (event.widget == removeResourceTypeButton) { @@ -456,7 +460,8 @@ public class FileEditorsPreferencePage extends PreferencePage implements /** * @see IWorkbenchPreferencePage */ - public void init(IWorkbench aWorkbench) { + @Override + public void init(IWorkbench aWorkbench) { this.workbench = aWorkbench; noDefaultAndApplyButton(); } @@ -491,7 +496,8 @@ public class FileEditorsPreferencePage extends PreferencePage implements * For example reimplement this method if you want to save the * page's data into the preference bundle. */ - public boolean performOk() { + @Override + public boolean performOk() { TableItem[] items = resourceTypeTable.getItems(); FileEditorMapping[] resourceTypes = new FileEditorMapping[items.length]; for (int i = 0; i < items.length; i++) { diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/FileExtensionDialog.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/FileExtensionDialog.java index 6660a8b0fed..d474be4eae1 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/FileExtensionDialog.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/FileExtensionDialog.java @@ -95,7 +95,8 @@ public class FileExtensionDialog extends TitleAreaDialog { /* (non-Javadoc) * @see org.eclipse.jface.window.Window#configureShell(org.eclipse.swt.widgets.Shell) */ - protected void configureShell(Shell shell) { + @Override + protected void configureShell(Shell shell) { super.configureShell(shell); shell.setText(title); PlatformUI.getWorkbench().getHelpSystem().setHelp(shell, helpContextId); @@ -105,7 +106,8 @@ public class FileExtensionDialog extends TitleAreaDialog { /* (non-Javadoc) * @see org.eclipse.jface.dialogs.TitleAreaDialog#createDialogArea(org.eclipse.swt.widgets.Composite) */ - protected Control createDialogArea(Composite parent) { + @Override + protected Control createDialogArea(Composite parent) { Composite parentComposite = (Composite) super.createDialogArea(parent); Composite contents = new Composite(parentComposite, SWT.NONE); @@ -122,6 +124,7 @@ public class FileExtensionDialog extends TitleAreaDialog { filenameField.setText(initialValue); } filenameField.addModifyListener(new ModifyListener() { + @Override public void modifyText(ModifyEvent event) { if (event.widget == filenameField) { filename = filenameField.getText().trim(); @@ -144,7 +147,8 @@ public class FileExtensionDialog extends TitleAreaDialog { /* (non-Javadoc) * @see org.eclipse.jface.dialogs.Dialog#createButtonsForButtonBar(org.eclipse.swt.widgets.Composite) */ - protected void createButtonsForButtonBar(Composite parent) { + @Override + protected void createButtonsForButtonBar(Composite parent) { okButton = createButton(parent, IDialogConstants.OK_ID, IDialogConstants.OK_LABEL, true); okButton.setEnabled(false); @@ -247,7 +251,8 @@ public class FileExtensionDialog extends TitleAreaDialog { /* (non-Javadoc) * @see org.eclipse.jface.dialogs.Dialog#getDialogBoundsSettings() */ - protected IDialogSettings getDialogBoundsSettings() { + @Override + protected IDialogSettings getDialogBoundsSettings() { IDialogSettings settings = WorkbenchPlugin.getDefault().getDialogSettings(); IDialogSettings section = settings.getSection(DIALOG_SETTINGS_SECTION); if (section == null) section = settings.addNewSection(DIALOG_SETTINGS_SECTION); @@ -258,7 +263,8 @@ public class FileExtensionDialog extends TitleAreaDialog { * (non-Javadoc) * @see org.eclipse.jface.dialogs.Dialog#isResizable() */ - protected boolean isResizable() { + @Override + protected boolean isResizable() { return true; } } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/FilteredPreferenceDialog.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/FilteredPreferenceDialog.java index eda9a6df34d..c7dee3ea772 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/FilteredPreferenceDialog.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/FilteredPreferenceDialog.java @@ -149,6 +149,7 @@ public abstract class FilteredPreferenceDialog extends PreferenceDialog * * @see org.eclipse.ui.dialogs.FilteredTree#updateToolbar(boolean) */ + @Override protected void updateToolbar(boolean visible) { super.updateToolbar(viewerFilter != null || visible); } @@ -158,6 +159,7 @@ public abstract class FilteredPreferenceDialog extends PreferenceDialog * * @see org.eclipse.ui.dialogs.FilteredTree#clearText() */ + @Override protected void clearText() { setFilterText(""); //$NON-NLS-1$ // remove the filter if text is cleared @@ -213,6 +215,7 @@ public abstract class FilteredPreferenceDialog extends PreferenceDialog * * @see org.eclipse.jface.preference.PreferenceDialog#findNodeMatching(java.lang.String) */ + @Override protected IPreferenceNode findNodeMatching(String nodeId) { IPreferenceNode node = super.findNodeMatching(nodeId); if (WorkbenchActivityHelper.filterItem(node)) { @@ -226,6 +229,7 @@ public abstract class FilteredPreferenceDialog extends PreferenceDialog * * @see org.eclipse.jface.preference.PreferenceDialog#createTreeViewer(org.eclipse.swt.widgets.Composite) */ + @Override protected TreeViewer createTreeViewer(Composite parent) { int styleBits = SWT.SINGLE; TreeViewer tree; @@ -251,6 +255,7 @@ public abstract class FilteredPreferenceDialog extends PreferenceDialog * * @see org.eclipse.jface.viewers.ISelectionChangedListener#selectionChanged(org.eclipse.jface.viewers.SelectionChangedEvent) */ + @Override public void selectionChanged(SelectionChangedEvent event) { handleTreeSelectionChanged(event); } @@ -319,6 +324,7 @@ public abstract class FilteredPreferenceDialog extends PreferenceDialog * * @see org.eclipse.jface.preference.PreferenceDialog#createTreeAreaContents(org.eclipse.swt.widgets.Composite) */ + @Override protected Control createTreeAreaContents(Composite parent) { Composite leftArea = new Composite(parent, SWT.NONE); leftArea.setBackground(parent.getDisplay().getSystemColor( @@ -373,6 +379,7 @@ public abstract class FilteredPreferenceDialog extends PreferenceDialog * * @see org.eclipse.jface.preference.PreferenceDialog#createPage(org.eclipse.jface.preference.IPreferenceNode) */ + @Override protected void createPage(IPreferenceNode node) { super.createPage(node); @@ -392,6 +399,7 @@ public abstract class FilteredPreferenceDialog extends PreferenceDialog * * @see org.eclipse.jface.preference.PreferenceDialog#getCurrentPage() */ + @Override public IPreferencePage getCurrentPage() { return super.getCurrentPage(); } @@ -402,6 +410,7 @@ public abstract class FilteredPreferenceDialog extends PreferenceDialog * @see org.eclipse.ui.preferences.IWorkbenchPreferenceContainer#openPage(java.lang.String, * java.lang.Object) */ + @Override public boolean openPage(String pageId, Object data) { setPageData(data); setCurrentPageId(pageId); @@ -433,6 +442,7 @@ public abstract class FilteredPreferenceDialog extends PreferenceDialog * * @see org.eclipse.ui.preferences.IWorkbenchPreferenceContainer#getWorkingCopyManager() */ + @Override public IWorkingCopyManager getWorkingCopyManager() { if (workingCopyManager == null) { workingCopyManager = new WorkingCopyManager(); @@ -445,6 +455,7 @@ public abstract class FilteredPreferenceDialog extends PreferenceDialog * * @see org.eclipse.jface.dialogs.Dialog#okPressed() */ + @Override protected void okPressed() { super.okPressed(); @@ -480,6 +491,7 @@ public abstract class FilteredPreferenceDialog extends PreferenceDialog * * @see org.eclipse.ui.preferences.IWorkbenchPreferenceContainer#registerUpdateJob(org.eclipse.core.runtime.jobs.Job) */ + @Override public void registerUpdateJob(Job job) { updateJobs.add(job); } @@ -504,6 +516,7 @@ public abstract class FilteredPreferenceDialog extends PreferenceDialog * * @see org.eclipse.jface.action.Action#getImageDescriptor() */ + @Override public ImageDescriptor getImageDescriptor() { return WorkbenchImages .getImageDescriptor(IWorkbenchGraphicConstants.IMG_LCL_VIEW_MENU); @@ -514,6 +527,7 @@ public abstract class FilteredPreferenceDialog extends PreferenceDialog * * @see org.eclipse.jface.action.Action#run() */ + @Override public void run() { MenuManager manager = new MenuManager(); manager.add(new Action() { @@ -522,15 +536,18 @@ public abstract class FilteredPreferenceDialog extends PreferenceDialog * * @see org.eclipse.jface.action.Action#run() */ + @Override public void run() { sash.addFocusListener(new FocusAdapter() { + @Override public void focusGained(FocusEvent e) { sash.setBackground(sash.getDisplay() .getSystemColor( SWT.COLOR_LIST_SELECTION)); } + @Override public void focusLost(FocusEvent e) { sash.setBackground(sash.getDisplay() .getSystemColor(SWT.COLOR_LIST_BACKGROUND)); @@ -544,6 +561,7 @@ public abstract class FilteredPreferenceDialog extends PreferenceDialog * * @see org.eclipse.jface.action.Action#getText() */ + @Override public String getText() { return WorkbenchMessages.FilteredPreferenceDialog_Resize; } @@ -554,6 +572,7 @@ public abstract class FilteredPreferenceDialog extends PreferenceDialog * * @see org.eclipse.jface.action.Action#run() */ + @Override public void run() { activeKeyScrolling(); } @@ -563,6 +582,7 @@ public abstract class FilteredPreferenceDialog extends PreferenceDialog * * @see org.eclipse.jface.action.Action#getText() */ + @Override public String getText() { return WorkbenchMessages.FilteredPreferenceDialog_Key_Scrolling; } @@ -601,6 +621,7 @@ public abstract class FilteredPreferenceDialog extends PreferenceDialog } final ScrolledComposite sc = (ScrolledComposite) pageParent; keyScrollingFilter = new Listener() { + @Override public void handleEvent(Event event) { if (!keyScrollingEnabled || sc.isDisposed()) { return; @@ -647,6 +668,7 @@ public abstract class FilteredPreferenceDialog extends PreferenceDialog display.addFilter(SWT.KeyDown, keyScrollingFilter); display.addFilter(SWT.Traverse, keyScrollingFilter); sc.addDisposeListener(new DisposeListener() { + @Override public void widgetDisposed(DisposeEvent e) { removeKeyScrolling(); } @@ -672,6 +694,7 @@ public abstract class FilteredPreferenceDialog extends PreferenceDialog * * @see org.eclipse.jface.preference.PreferenceDialog#showPage(org.eclipse.jface.preference.IPreferenceNode) */ + @Override protected boolean showPage(IPreferenceNode node) { final boolean success = super.showPage(node); if (success) { @@ -686,6 +709,7 @@ public abstract class FilteredPreferenceDialog extends PreferenceDialog * * @see org.eclipse.jface.window.Window#close() */ + @Override public boolean close() { if (showViewHandler != null) { IHandlerService service = (IHandlerService) PlatformUI @@ -704,6 +728,7 @@ public abstract class FilteredPreferenceDialog extends PreferenceDialog * * @see org.eclipse.jface.preference.PreferenceDialog#createTitleArea(org.eclipse.swt.widgets.Composite) */ + @Override protected Composite createTitleArea(Composite parent) { GridLayout parentLayout = (GridLayout) parent.getLayout(); @@ -726,6 +751,7 @@ public abstract class FilteredPreferenceDialog extends PreferenceDialog return titleComposite; } + @Override protected void selectSavedItem() { getTreeViewer().setInput(getPreferenceManager()); super.selectSavedItem(); @@ -744,6 +770,7 @@ public abstract class FilteredPreferenceDialog extends PreferenceDialog * * @see org.eclipse.jface.preference.PreferenceDialog#updateTreeFont(org.eclipse.swt.graphics.Font) */ + @Override protected void updateTreeFont(Font dialogFont) { if (hasAtMostOnePage()) { Composite composite= getTreeViewer().getTree(); @@ -774,6 +801,7 @@ public abstract class FilteredPreferenceDialog extends PreferenceDialog /* (non-Javadoc) * @see org.eclipse.jface.preference.PreferenceDialog#createSash(org.eclipse.swt.widgets.Composite, org.eclipse.swt.widgets.Control) */ + @Override protected Sash createSash(Composite composite, Control rightControl) { sash = super.createSash(composite, rightControl); return sash; diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/GlobalizationPreferencePage.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/GlobalizationPreferencePage.java index 4e460840c93..286e042f272 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/GlobalizationPreferencePage.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/GlobalizationPreferencePage.java @@ -63,6 +63,7 @@ public class GlobalizationPreferencePage extends PreferencePage implements IWork * * @see org.eclipse.jface.preference.PreferencePage */ + @Override protected Control createContents(Composite parent) { PlatformUI.getWorkbench().getHelpSystem() .setHelp(parent, IWorkbenchHelpContextIds.GLOBALIZATION_PREFERENCE_PAGE); @@ -112,6 +113,7 @@ public class GlobalizationPreferencePage extends PreferencePage implements IWork layoutDirectionCombo.setItems(new String[] { DEFAULT_DIR, LTR_DIR, RTL_DIR }); layoutDirectionCombo.select(getLayoutDirectionIndex(layoutDirection)); layoutDirectionCombo.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { layoutDirection = getLayoutDirectionInteger(layoutDirectionCombo .getSelectionIndex()); @@ -125,6 +127,7 @@ public class GlobalizationPreferencePage extends PreferencePage implements IWork bidiSupportClickButton.setText(WorkbenchMessages.GlobalizationPreference_bidiSupport); bidiSupportClickButton.setSelection(bidiSupport); bidiSupportClickButton.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { selectClickMode(bidiSupportClickButton.getSelection()); } @@ -137,6 +140,7 @@ public class GlobalizationPreferencePage extends PreferencePage implements IWork textDirectionCombo.setEnabled(bidiSupport); textDirectionCombo.select(getTextDirectionIndex(textDirection)); textDirectionCombo.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { textDirection = getTextDirectionString(textDirectionCombo.getSelectionIndex()); } @@ -230,6 +234,7 @@ public class GlobalizationPreferencePage extends PreferencePage implements IWork vfiller.setLayoutData(gridData); } + @Override protected IPreferenceStore doGetPreferenceStore() { return WorkbenchPlugin.getDefault().getPreferenceStore(); } @@ -237,6 +242,7 @@ public class GlobalizationPreferencePage extends PreferencePage implements IWork /** * @see IWorkbenchPreferencePage */ + @Override public void init(IWorkbench aWorkbench) { IPreferenceStore store = getPreferenceStore(); layoutDirection = store.getInt(IPreferenceConstants.LAYOUT_DIRECTION); @@ -247,6 +253,7 @@ public class GlobalizationPreferencePage extends PreferencePage implements IWork /** * The default button has been pressed. */ + @Override protected void performDefaults() { IPreferenceStore store = getPreferenceStore(); nlExtensionsField @@ -265,6 +272,7 @@ public class GlobalizationPreferencePage extends PreferencePage implements IWork /** * The user has pressed Ok. Store/apply this page's values appropriately. */ + @Override public boolean performOk() { IPreferenceStore store = getPreferenceStore(); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/ImportExportPage.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/ImportExportPage.java index 57b6ad71e47..0f0725379d2 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/ImportExportPage.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/ImportExportPage.java @@ -190,6 +190,7 @@ public abstract class ImportExportPage extends WorkbenchWizardSelectionPage{ * (non-Javadoc) * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite) */ + @Override public void createControl(Composite parent) { Font font = parent.getFont(); @@ -297,7 +298,8 @@ public abstract class ImportExportPage extends WorkbenchWizardSelectionPage{ */ private IWizardNode createWizardNode(IWizardDescriptor element) { return new WorkbenchWizardNode(this, element) { - public IWorkbenchWizard createWizard() throws CoreException { + @Override + public IWorkbenchWizard createWizard() throws CoreException { return wizardElement.createWizard(); } }; @@ -425,7 +427,8 @@ public abstract class ImportExportPage extends WorkbenchWizardSelectionPage{ * (non-Javadoc) * @see org.eclipse.jface.wizard.IWizardPage#getNextPage() */ - public IWizardPage getNextPage() { + @Override + public IWizardPage getNextPage() { ITriggerPoint triggerPoint = getTriggerPoint(); if (triggerPoint == null || WorkbenchActivityHelper.allowUseOf(triggerPoint, getSelectedNode())) { diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/ImportExportWizard.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/ImportExportWizard.java index bd7ac910a89..16e42de1d2c 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/ImportExportWizard.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/ImportExportWizard.java @@ -56,7 +56,8 @@ public class ImportExportWizard extends Wizard { * Subclasses must implement this <code>IWizard</code> method * to perform any special finish processing for their wizard. */ - public boolean performFinish() { + @Override + public boolean performFinish() { importExportPage.saveWidgetValues(); return true; } @@ -64,7 +65,8 @@ public class ImportExportWizard extends Wizard { /** * Creates the wizard's pages lazily. */ - public void addPages() { + @Override + public void addPages() { if (page.equals(IMPORT)) { importExportPage = new ImportPage(this.workbench, this.selection); } else if (page.equals(EXPORT)) { diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/ImportPage.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/ImportPage.java index 3194b3098c3..68c6e99b830 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/ImportPage.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/ImportPage.java @@ -50,12 +50,14 @@ public class ImportPage extends ImportExportPage { super(aWorkbench, currentSelection); } + @Override protected void initialize() { workbench.getHelpSystem().setHelp( getControl(), IWorkbenchHelpContextIds.IMPORT_WIZARD_SELECTION_WIZARD_PAGE); } + @Override protected Composite createTreeViewer(Composite parent) { IWizardCategory root = WorkbenchPlugin.getDefault() .getImportWizardRegistry().getRootCategory(); @@ -63,12 +65,14 @@ public class ImportPage extends ImportExportPage { root, WorkbenchMessages.ImportWizard_selectSource); Composite importComp = importTree.createControl(parent); importTree.getViewer().addSelectionChangedListener(new ISelectionChangedListener(){ + @Override public void selectionChanged(SelectionChangedEvent event) { listSelectionChanged(event.getSelection()); } }); importTree.getViewer().addDoubleClickListener(new IDoubleClickListener(){ - public void doubleClick(DoubleClickEvent event) { + @Override + public void doubleClick(DoubleClickEvent event) { treeDoubleClicked(event); } }); @@ -76,12 +80,14 @@ public class ImportPage extends ImportExportPage { return importComp; } + @Override public void saveWidgetValues(){ storeExpandedCategories(STORE_EXPANDED_IMPORT_CATEGORIES, importTree.getViewer()); storeSelectedCategoryAndWizard(STORE_SELECTED_IMPORT_WIZARD_ID, importTree.getViewer()); super.saveWidgetValues(); } + @Override protected void restoreWidgetValues(){ IWizardCategory importRoot = WorkbenchPlugin.getDefault().getImportWizardRegistry().getRootCategory(); expandPreviouslyExpandedCategories(STORE_EXPANDED_IMPORT_CATEGORIES, importRoot,importTree.getViewer()); @@ -89,11 +95,13 @@ public class ImportPage extends ImportExportPage { super.restoreWidgetValues(); } + @Override protected ITriggerPoint getTriggerPoint(){ return getWorkbench().getActivitySupport() .getTriggerPointManager().getTriggerPoint(WorkbenchTriggerPoints.IMPORT_WIZARDS); } + @Override protected void updateMessage(){ setMessage(WorkbenchMessages.ImportExportPage_chooseImportSource); super.updateMessage(); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/ImportWizard.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/ImportWizard.java index ee61b62f185..770448ccb11 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/ImportWizard.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/ImportWizard.java @@ -42,7 +42,8 @@ public class ImportWizard extends Wizard { super(w, ss, e, s, WorkbenchTriggerPoints.IMPORT_WIZARDS); } - public void createControl(Composite parent) { + @Override + public void createControl(Composite parent) { super.createControl(parent); getWorkbench() .getHelpSystem() @@ -51,9 +52,11 @@ public class ImportWizard extends Wizard { IWorkbenchHelpContextIds.IMPORT_WIZARD_SELECTION_WIZARD_PAGE); } - public IWizardNode createWizardNode(WorkbenchWizardElement element) { + @Override + public IWizardNode createWizardNode(WorkbenchWizardElement element) { return new WorkbenchWizardNode(this, element) { - public IWorkbenchWizard createWizard() throws CoreException { + @Override + public IWorkbenchWizard createWizard() throws CoreException { return wizardElement.createWizard(); } }; @@ -69,7 +72,8 @@ public class ImportWizard extends Wizard { /** * Creates the wizard's pages lazily. */ - public void addPages() { + @Override + public void addPages() { addPage(new SelectionPage(this.workbench, this.selection, getAvailableImportWizards(), WorkbenchMessages.ImportWizard_selectSource)); } @@ -111,7 +115,8 @@ public class ImportWizard extends Wizard { /* (non-Javadoc) * @see org.eclipse.jface.wizard.IWizard#performFinish() */ - public boolean performFinish() { + @Override + public boolean performFinish() { ((SelectionPage) getPages()[0]).saveWidgetValues(); return true; } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/NewWizard.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/NewWizard.java index 412a69846d8..faad8fc4032 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/NewWizard.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/NewWizard.java @@ -43,7 +43,8 @@ public class NewWizard extends Wizard { /** * Create the wizard pages */ - public void addPages() { + @Override + public void addPages() { IWizardCategory root = WorkbenchPlugin.getDefault().getNewWizardRegistry().getRootCategory(); IWizardDescriptor [] primary = WorkbenchPlugin.getDefault().getNewWizardRegistry().getPrimaryWizards(); @@ -123,7 +124,8 @@ public class NewWizard extends Wizard { * * @return boolean */ - public boolean performFinish() { + @Override + public boolean performFinish() { //save our selection state mainPage.saveWidgetValues(); // if we're finishing from the main page then perform finish on the selected wizard. @@ -160,7 +162,8 @@ public class NewWizard extends Wizard { /* (non-Javadoc) * @see org.eclipse.jface.wizard.IWizard#canFinish() */ - public boolean canFinish() { + @Override + public boolean canFinish() { // we can finish if the first page is current and the the page can finish early. if (getContainer().getCurrentPage() == mainPage) { if (mainPage.canFinishEarly()) { diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/NewWizardCollectionComparator.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/NewWizardCollectionComparator.java index 774f3c5a0b8..d80f01b849f 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/NewWizardCollectionComparator.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/NewWizardCollectionComparator.java @@ -44,7 +44,8 @@ class NewWizardCollectionComparator extends ViewerComparator { * (non-Javadoc) * @see org.eclipse.jface.viewers.ViewerSorter#category(java.lang.Object) */ - public int category(Object element) { + @Override + public int category(Object element) { if (element instanceof WorkbenchWizardElement) { return -1; } @@ -68,7 +69,8 @@ class NewWizardCollectionComparator extends ViewerComparator { * Return true if this sorter is affected by a property * change of propertyName on the specified element. */ - public boolean isSorterProperty(Object object, String propertyId) { + @Override + public boolean isSorterProperty(Object object, String propertyId) { return propertyId.equals(IBasicPropertyConstants.P_TEXT); } } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/NewWizardNewPage.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/NewWizardNewPage.java index 4b477e3e5ad..a3ff2d45ba9 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/NewWizardNewPage.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/NewWizardNewPage.java @@ -352,7 +352,8 @@ class NewWizardNewPage implements ISelectionChangedListener { * * @see org.eclipse.jface.viewers.IDoubleClickListener#doubleClick(org.eclipse.jface.viewers.DoubleClickEvent) */ - public void doubleClick(DoubleClickEvent event) { + @Override + public void doubleClick(DoubleClickEvent event) { IStructuredSelection s = (IStructuredSelection) event .getSelection(); selectionChanged(new SelectionChangedEvent(event.getViewer(), s)); @@ -398,7 +399,8 @@ class NewWizardNewPage implements ISelectionChangedListener { // and the current 'no show all' private Object[] delta = new Object[0]; - public void widgetSelected(SelectionEvent e) { + @Override + public void widgetSelected(SelectionEvent e) { boolean showAll = showAllCheck.getSelection(); if (showAll) { @@ -478,7 +480,8 @@ class NewWizardNewPage implements ISelectionChangedListener { /* (non-Javadoc) * @see org.eclipse.swt.events.DisposeListener#widgetDisposed(org.eclipse.swt.events.DisposeEvent) */ - public void widgetDisposed(DisposeEvent e) { + @Override + public void widgetDisposed(DisposeEvent e) { for (Iterator i = imageTable.values().iterator(); i.hasNext();) { ((Image) i.next()).dispose(); } @@ -552,7 +555,8 @@ class NewWizardNewPage implements ISelectionChangedListener { * * @param selectionEvent ISelection */ - public void selectionChanged(SelectionChangedEvent selectionEvent) { + @Override + public void selectionChanged(SelectionChangedEvent selectionEvent) { page.setErrorMessage(null); page.setMessage(null); @@ -603,7 +607,8 @@ class NewWizardNewPage implements ISelectionChangedListener { //work around for 62039 final StructuredSelection selection = new StructuredSelection(selected); filteredTree.getViewer().getControl().getDisplay().asyncExec(new Runnable() { - public void run() { + @Override + public void run() { filteredTree.getViewer().setSelection(selection, true); } }); @@ -735,7 +740,8 @@ class NewWizardNewPage implements ISelectionChangedListener { .get(selectedObject); } else { selectedNode = new WorkbenchWizardNode(page, selectedObject) { - public IWorkbenchWizard createWizard() throws CoreException { + @Override + public IWorkbenchWizard createWizard() throws CoreException { return wizardElement.createWizard(); } }; diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/NewWizardSelectionPage.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/NewWizardSelectionPage.java index 85068fc97c8..5ab4f6b8b6a 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/NewWizardSelectionPage.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/NewWizardSelectionPage.java @@ -79,7 +79,8 @@ class NewWizardSelectionPage extends WorkbenchWizardSelectionPage { /** (non-Javadoc) * Method declared on IDialogPage. */ - public void createControl(Composite parent) { + @Override + public void createControl(Composite parent) { IDialogSettings settings = getDialogSettings(); newResourcePage = new NewWizardNewPage(this, wizardCategories, primaryWizards, projectsOnly); @@ -102,7 +103,8 @@ class NewWizardSelectionPage extends WorkbenchWizardSelectionPage { /* (non-Javadoc) * @see org.eclipse.jface.wizard.IWizardPage#canFlipToNextPage() */ - public boolean canFlipToNextPage() { + @Override + public boolean canFlipToNextPage() { // if the current page advertises that it does have pages then ask it via the super call if (hasPages) { return super.canFlipToNextPage(); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/PerspContentProvider.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/PerspContentProvider.java index 3f91eb6fcf2..448bb04170c 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/PerspContentProvider.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/PerspContentProvider.java @@ -28,7 +28,8 @@ public class PerspContentProvider implements IStructuredContentProvider { * * @see org.eclipse.jface.viewers.IContentProvider#dispose() */ - public void dispose() { + @Override + public void dispose() { //no-op } @@ -37,7 +38,8 @@ public class PerspContentProvider implements IStructuredContentProvider { * * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object) */ - public Object[] getElements(Object element) { + @Override + public Object[] getElements(Object element) { if (element instanceof IPerspectiveRegistry) { return ((IPerspectiveRegistry) element).getPerspectives(); } @@ -50,7 +52,8 @@ public class PerspContentProvider implements IStructuredContentProvider { * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer, * java.lang.Object, java.lang.Object) */ - public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { + @Override + public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { //no-op } } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/PerspectivesPreferencePage.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/PerspectivesPreferencePage.java index 0773e630e68..62a5f4e0e1c 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/PerspectivesPreferencePage.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/PerspectivesPreferencePage.java @@ -128,6 +128,7 @@ public class PerspectivesPreferencePage extends PreferencePage implements private Comparator<IPerspectiveDescriptor> comparator = new Comparator<IPerspectiveDescriptor>() { private Collator collator = Collator.getInstance(); + @Override public int compare(IPerspectiveDescriptor ob1, IPerspectiveDescriptor ob2) { IPerspectiveDescriptor d1 = ob1; IPerspectiveDescriptor d2 = ob2; @@ -138,6 +139,7 @@ public class PerspectivesPreferencePage extends PreferencePage implements /** * Creates the page's UI content. */ + @Override protected Control createContents(Composite parent) { // @issue if the product subclasses this page, then it should provide // the help content @@ -199,6 +201,7 @@ public class PerspectivesPreferencePage extends PreferencePage implements .setSelection(IPreferenceConstants.OPM_ACTIVE_PAGE == openPerspMode); openSameWindowButton.setFont(font); openSameWindowButton.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { openPerspMode = IPreferenceConstants.OPM_ACTIVE_PAGE; } @@ -210,6 +213,7 @@ public class PerspectivesPreferencePage extends PreferencePage implements .setSelection(IPreferenceConstants.OPM_NEW_WINDOW == openPerspMode); openNewWindowButton.setFont(font); openNewWindowButton.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { openPerspMode = IPreferenceConstants.OPM_NEW_WINDOW; } @@ -246,6 +250,7 @@ public class PerspectivesPreferencePage extends PreferencePage implements openEmbedButton .setSelection(openViewMode == IPreferenceConstants.OVM_EMBED); openEmbedButton.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { openViewMode = IPreferenceConstants.OVM_EMBED; } @@ -262,6 +267,7 @@ public class PerspectivesPreferencePage extends PreferencePage implements openFastButton .setSelection(openViewMode == IPreferenceConstants.OVM_FAST); openFastButton.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { openViewMode = IPreferenceConstants.OVM_FAST; } @@ -322,6 +328,7 @@ public class PerspectivesPreferencePage extends PreferencePage implements perspectivesTable = new Table(perspectivesComponent, SWT.H_SCROLL | SWT.V_SCROLL | SWT.BORDER); perspectivesTable.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { updateButtons(); } @@ -387,6 +394,7 @@ public class PerspectivesPreferencePage extends PreferencePage implements data.horizontalAlignment = GridData.FILL; button.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent event) { verticalButtonPressed(event.widget); } @@ -441,6 +449,7 @@ public class PerspectivesPreferencePage extends PreferencePage implements /** * @see IWorkbenchPreferencePage */ + @Override public void init(IWorkbench aWorkbench) { this.workbench = aWorkbench; this.perspectiveRegistry = (PerspectiveRegistry) workbench @@ -459,6 +468,7 @@ public class PerspectivesPreferencePage extends PreferencePage implements /** * The default button has been pressed. */ + @Override protected void performDefaults() { //Project perspective preferences IPreferenceStore store = WorkbenchPlugin.getDefault() @@ -559,6 +569,7 @@ public class PerspectivesPreferencePage extends PreferencePage implements /** * Apply the user's changes if any */ + @Override public boolean performOk() { // Set the default perspective if (!Util.equals(defaultPerspectiveId, perspectiveRegistry.getDefaultPerspective())) { diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/PreferenceBoldLabelProvider.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/PreferenceBoldLabelProvider.java index 908d1a2315a..7942885ed69 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/PreferenceBoldLabelProvider.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/PreferenceBoldLabelProvider.java @@ -31,6 +31,7 @@ public class PreferenceBoldLabelProvider extends PreferenceLabelProvider impleme this.filterForBoldElements= filterTree.getPatternFilter(); } + @Override public Font getFont(Object element) { return FilteredTree.getBoldFont(element, filterTree, filterForBoldElements); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/PreferenceHistoryEntry.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/PreferenceHistoryEntry.java index 7c2c793c9f1..35ea307d1b7 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/PreferenceHistoryEntry.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/PreferenceHistoryEntry.java @@ -64,6 +64,7 @@ final class PreferenceHistoryEntry { /* * @see java.lang.Object#toString() */ + @Override public String toString() { if (argument == null) { return id; @@ -73,6 +74,7 @@ final class PreferenceHistoryEntry { /* * @see java.lang.Object#equals(java.lang.Object) */ + @Override public boolean equals(Object obj) { if (obj instanceof PreferenceHistoryEntry) { PreferenceHistoryEntry other= (PreferenceHistoryEntry) obj; @@ -85,6 +87,7 @@ final class PreferenceHistoryEntry { /* * @see java.lang.Object#hashCode() */ + @Override public int hashCode() { int argHash= argument == null ? 0 : argument.hashCode() & 0x0000ffff; return id.hashCode() << 16 | argHash; diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/PreferenceNodeFilter.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/PreferenceNodeFilter.java index a43ffb63f2a..9a525adb2dc 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/PreferenceNodeFilter.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/PreferenceNodeFilter.java @@ -41,6 +41,7 @@ public class PreferenceNodeFilter extends ViewerFilter { /* (non-Javadoc) * @see org.eclipse.jface.viewers.ViewerFilter#select(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object) */ + @Override public boolean select(Viewer viewer, Object parentElement, Object element) { return checkNodeAndChildren((IPreferenceNode) element); } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/PreferencePageHistory.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/PreferencePageHistory.java index e7cbebf0e71..19d1a415cc0 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/PreferencePageHistory.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/PreferencePageHistory.java @@ -169,10 +169,12 @@ class PreferencePageHistory { super("", IAction.AS_DROP_DOWN_MENU); //$NON-NLS-1$ } + @Override public IMenuCreator getMenuCreator() { return this; } + @Override public void dispose() { if (lastMenu != null) { lastMenu.dispose(); @@ -180,6 +182,7 @@ class PreferencePageHistory { } } + @Override public Menu getMenu(Control parent) { if (lastMenu != null) { lastMenu.dispose(); @@ -190,6 +193,7 @@ class PreferencePageHistory { } + @Override public Menu getMenu(Menu parent) { return null; } @@ -215,16 +219,19 @@ class PreferencePageHistory { this.index = index; } + @Override public void run() { jumpToHistory(index); } } HistoryNavigationAction backward = new HistoryNavigationAction() { + @Override public void run() { jumpToHistory(historyIndex - 1); } + @Override public boolean isEnabled() { boolean enabled = historyIndex > 0; if (enabled) { @@ -233,6 +240,7 @@ class PreferencePageHistory { return enabled; } + @Override protected void createEntries(Menu menu) { int limit = Math.max(0, historyIndex - MAX_ENTRIES); for (int i = historyIndex - 1; i >= limit; i--) { @@ -255,10 +263,12 @@ class PreferencePageHistory { historyToolbar.add(backward); HistoryNavigationAction forward = new HistoryNavigationAction() { + @Override public void run() { jumpToHistory(historyIndex + 1); } + @Override public boolean isEnabled() { boolean enabled = historyIndex < history.size() - 1; if (enabled) { @@ -267,6 +277,7 @@ class PreferencePageHistory { return enabled; } + @Override protected void createEntries(Menu menu) { int limit = Math.min(history.size(), historyIndex + MAX_ENTRIES + 1); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/PreferencePatternFilter.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/PreferencePatternFilter.java index 83c12e57f91..32b1a6965a5 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/PreferencePatternFilter.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/PreferencePatternFilter.java @@ -82,6 +82,7 @@ public class PreferencePatternFilter extends PatternFilter { * * @see org.eclipse.ui.internal.dialogs.PatternFilter#isElementSelectable(java.lang.Object) */ + @Override public boolean isElementSelectable(Object element) { return element instanceof WorkbenchPreferenceExtensionNode; } @@ -89,6 +90,7 @@ public class PreferencePatternFilter extends PatternFilter { /* (non-Javadoc) * @see org.eclipse.ui.dialogs.PatternFilter#isElementVisible(org.eclipse.jface.viewers.Viewer, java.lang.Object) */ + @Override public boolean isElementVisible(Viewer viewer, Object element) { if (WorkbenchActivityHelper.restrictUseOf( element)) @@ -115,6 +117,7 @@ public class PreferencePatternFilter extends PatternFilter { * @see org.eclipse.ui.dialogs.PatternFilter#isLeafMatch(org.eclipse.jface.viewers.Viewer, java.lang.Object) * */ + @Override protected boolean isLeafMatch(Viewer viewer, Object element) { IPreferenceNode node = (IPreferenceNode) element; String text = node.getLabelText(); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/PropertyDialog.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/PropertyDialog.java index a8f8822b6c5..8a37e8dc7b9 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/PropertyDialog.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/PropertyDialog.java @@ -158,6 +158,7 @@ public class PropertyDialog extends FilteredPreferenceDialog { /** * Get the name of the selected item preference */ + @Override protected String getSelectedNodePreference() { return lastPropertyId; } @@ -165,6 +166,7 @@ public class PropertyDialog extends FilteredPreferenceDialog { /** * Get the name of the selected item preference */ + @Override protected void setSelectedNodePreference(String pageId) { lastPropertyId = pageId; } @@ -176,6 +178,7 @@ public class PropertyDialog extends FilteredPreferenceDialog { * * @return a string, the contributionType */ + @Override protected String getContributionType() { return IContributionService.TYPE_PROPERTY; } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/PropertyPageContributorManager.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/PropertyPageContributorManager.java index 1259064987f..03e543c4af3 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/PropertyPageContributorManager.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/PropertyPageContributorManager.java @@ -195,7 +195,8 @@ public class PropertyPageContributorManager extends ObjectContributorManager { /* (non-Javadoc) * @see org.eclipse.core.runtime.dynamicHelpers.IExtensionChangeHandler#addExtension(org.eclipse.core.runtime.dynamicHelpers.IExtensionTracker, org.eclipse.core.runtime.IExtension) */ - public void addExtension(IExtensionTracker tracker, IExtension extension) { + @Override + public void addExtension(IExtensionTracker tracker, IExtension extension) { IConfigurationElement[] addedElements = extension.getConfigurationElements(); for (int i = 0; i < addedElements.length; i++) { PropertyPagesRegistryReader reader = new PropertyPagesRegistryReader(this); @@ -256,6 +257,7 @@ public class PropertyPageContributorManager extends ObjectContributorManager { /* (non-Javadoc) * @see org.eclipse.ui.internal.ObjectContributorManager#getExtensionPointFilter() */ + @Override protected String getExtensionPointFilter() { return IWorkbenchRegistryConstants.PL_PROPERTY_PAGES; } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/PropertyPageNode.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/PropertyPageNode.java index 409d8373c8d..d745b619eea 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/PropertyPageNode.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/PropertyPageNode.java @@ -51,7 +51,8 @@ public class PropertyPageNode extends WorkbenchPreferenceExtensionNode { * it will be created by loading the class. If loading fails, * empty filler page will be created instead. */ - public void createPage() { + @Override + public void createPage() { try { page = contributor.createPage(element); } catch (CoreException e) { @@ -67,7 +68,8 @@ public class PropertyPageNode extends WorkbenchPreferenceExtensionNode { /** (non-Javadoc) * Method declared on IPreferenceNode. */ - public void disposeResources() { + @Override + public void disposeResources() { if (page != null) { page.dispose(); @@ -82,7 +84,8 @@ public class PropertyPageNode extends WorkbenchPreferenceExtensionNode { /** * Returns page icon, if defined. */ - public Image getLabelImage() { + @Override + public Image getLabelImage() { if (icon == null) { ImageDescriptor desc = contributor.getPageIcon(); if (desc != null) { @@ -95,7 +98,8 @@ public class PropertyPageNode extends WorkbenchPreferenceExtensionNode { /** * Returns page label as defined in the registry. */ - public String getLabelText() { + @Override + public String getLabelText() { return contributor.getPageName(); } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/RegistryPageContributor.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/RegistryPageContributor.java index 9b08d1d2dd0..c27984b67c7 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/RegistryPageContributor.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/RegistryPageContributor.java @@ -108,6 +108,7 @@ public class RegistryPageContributor implements IPropertyPageContributor, * @see org.eclipse.ui.internal.dialogs.IPropertyPageContributor#contributePropertyPage(org.eclipse.ui.internal.dialogs.PropertyPageManager, * java.lang.Object) */ + @Override public PreferenceNode contributePropertyPage(PropertyPageManager mng, Object element) { PropertyPageNode node = new PropertyPageNode(this, element); @@ -241,6 +242,7 @@ public class RegistryPageContributor implements IPropertyPageContributor, * For multipleSelection pages, considers all elements in the selection for * enablement. */ + @Override public boolean isApplicableTo(Object object) { Object[] objs = getObjects(object); @@ -375,6 +377,7 @@ public class RegistryPageContributor implements IPropertyPageContributor, /* * @see IObjectContributor#canAdapt() */ + @Override public boolean canAdapt() { return adaptable; } @@ -461,6 +464,7 @@ public class RegistryPageContributor implements IPropertyPageContributor, * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class) * @since 3.1 */ + @Override public Object getAdapter(Class adapter) { if (adapter.equals(IConfigurationElement.class)) { return getConfigurationElement(); @@ -484,11 +488,13 @@ public class RegistryPageContributor implements IPropertyPageContributor, return pageElement; } + @Override public String getLocalId() { return pageId; } - public String getPluginId() { + @Override + public String getPluginId() { return pageElement.getContributor().getName(); } } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/SavePerspectiveDialog.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/SavePerspectiveDialog.java index d36eeb8ba2b..13afc34c509 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/SavePerspectiveDialog.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/SavePerspectiveDialog.java @@ -82,7 +82,8 @@ public class SavePerspectiveDialog extends org.eclipse.jface.dialogs.Dialog /* (non-Javadoc) * Method declared in Window. */ - protected void configureShell(Shell shell) { + @Override + protected void configureShell(Shell shell) { super.configureShell(shell); shell .setText(WorkbenchMessages.SavePerspective_shellTitle); @@ -95,7 +96,8 @@ public class SavePerspectiveDialog extends org.eclipse.jface.dialogs.Dialog * * @param parent the button bar composite */ - protected void createButtonsForButtonBar(Composite parent) { + @Override + protected void createButtonsForButtonBar(Composite parent) { okButton = createButton(parent, IDialogConstants.OK_ID, IDialogConstants.OK_LABEL, true); createButton(parent, IDialogConstants.CANCEL_ID, @@ -111,7 +113,8 @@ public class SavePerspectiveDialog extends org.eclipse.jface.dialogs.Dialog * @param parent the parent composite to contain the dialog area * @return the dialog area control */ - protected Control createDialogArea(Composite parent) { + @Override + protected Control createDialogArea(Composite parent) { Font font = parent.getFont(); // Run super. Composite composite = (Composite) super.createDialogArea(parent); @@ -210,7 +213,8 @@ public class SavePerspectiveDialog extends org.eclipse.jface.dialogs.Dialog /** * The user has typed some text. */ - public void modifyText(org.eclipse.swt.events.ModifyEvent e) { + @Override + public void modifyText(org.eclipse.swt.events.ModifyEvent e) { // Get text. perspName = text.getText(); @@ -237,7 +241,8 @@ public class SavePerspectiveDialog extends org.eclipse.jface.dialogs.Dialog * and closes the dialog. Subclasses may override. * </p> */ - protected void okPressed() { + @Override + protected void okPressed() { perspName = text.getText(); persp = perspReg.findPerspectiveWithLabel(perspName); if (persp != null) { @@ -248,6 +253,7 @@ public class SavePerspectiveDialog extends org.eclipse.jface.dialogs.Dialog MessageDialog d = new MessageDialog(this.getShell(), WorkbenchMessages.SavePerspective_overwriteTitle, null, message, MessageDialog.QUESTION, buttons, 0) { + @Override protected int getShellStyle() { return super.getShellStyle() | SWT.SHEET; } @@ -274,7 +280,8 @@ public class SavePerspectiveDialog extends org.eclipse.jface.dialogs.Dialog * * @param event event object describing the change */ - public void selectionChanged(SelectionChangedEvent event) { + @Override + public void selectionChanged(SelectionChangedEvent event) { // If a selection is caused by modifyText ignore it. if (ignoreSelection) { return; diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/SelectPerspectiveDialog.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/SelectPerspectiveDialog.java index cb47089fc64..d5320c47b0f 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/SelectPerspectiveDialog.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/SelectPerspectiveDialog.java @@ -82,7 +82,8 @@ public class SelectPerspectiveDialog extends Dialog implements * * @see org.eclipse.jface.dialogs.Dialog#cancelPressed() */ - protected void cancelPressed() { + @Override + protected void cancelPressed() { perspDesc = null; super.cancelPressed(); } @@ -92,7 +93,8 @@ public class SelectPerspectiveDialog extends Dialog implements * * @see org.eclipse.jface.window.Window#configureShell(org.eclipse.swt.widgets.Shell) */ - protected void configureShell(Shell shell) { + @Override + protected void configureShell(Shell shell) { super.configureShell(shell); shell.setText(WorkbenchMessages.SelectPerspective_shellTitle); PlatformUI.getWorkbench().getHelpSystem().setHelp(shell, @@ -109,7 +111,8 @@ public class SelectPerspectiveDialog extends Dialog implements * * @param parent the button bar composite */ - protected void createButtonsForButtonBar(Composite parent) { + @Override + protected void createButtonsForButtonBar(Composite parent) { okButton = createButton(parent, IDialogConstants.OK_ID, IDialogConstants.OK_LABEL, true); createButton(parent, IDialogConstants.CANCEL_ID, @@ -124,7 +127,8 @@ public class SelectPerspectiveDialog extends Dialog implements * @param parent the parent composite to contain the dialog area * @return the dialog area control */ - protected Control createDialogArea(Composite parent) { + @Override + protected Control createDialogArea(Composite parent) { // Run super. Composite composite = (Composite) super.createDialogArea(parent); composite.setFont(parent.getFont()); @@ -159,7 +163,8 @@ public class SelectPerspectiveDialog extends Dialog implements /* (non-Javadoc) * @see org.eclipse.swt.events.SelectionAdapter#widgetSelected(org.eclipse.swt.events.SelectionEvent) */ - public void widgetSelected(SelectionEvent e) { + @Override + public void widgetSelected(SelectionEvent e) { if (showAllButton.getSelection()) { list.resetFilters(); } else { @@ -187,7 +192,8 @@ public class SelectPerspectiveDialog extends Dialog implements list.setInput(perspReg); list.addSelectionChangedListener(this); list.addDoubleClickListener(new IDoubleClickListener() { - public void doubleClick(DoubleClickEvent event) { + @Override + public void doubleClick(DoubleClickEvent event) { handleDoubleClickEvent(); } }); @@ -226,7 +232,8 @@ public class SelectPerspectiveDialog extends Dialog implements * * @param event event object describing the change */ - public void selectionChanged(SelectionChangedEvent event) { + @Override + public void selectionChanged(SelectionChangedEvent event) { updateSelection(event); updateButtons(); } @@ -255,7 +262,8 @@ public class SelectPerspectiveDialog extends Dialog implements /* (non-Javadoc) * @see org.eclipse.jface.dialogs.Dialog#okPressed() */ - protected void okPressed() { + @Override + protected void okPressed() { ITriggerPoint triggerPoint = PlatformUI.getWorkbench() .getActivitySupport().getTriggerPointManager().getTriggerPoint( WorkbenchTriggerPoints.OPEN_PERSPECITVE_DIALOG); @@ -268,7 +276,8 @@ public class SelectPerspectiveDialog extends Dialog implements * (non-Javadoc) * @see org.eclipse.jface.dialogs.Dialog#isResizable() */ - protected boolean isResizable() { + @Override + protected boolean isResizable() { return true; } } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/SimpleWorkingSetSelectionDialog.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/SimpleWorkingSetSelectionDialog.java index c32820bc2bf..15da88cbafd 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/SimpleWorkingSetSelectionDialog.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/SimpleWorkingSetSelectionDialog.java @@ -45,6 +45,7 @@ public class SimpleWorkingSetSelectionDialog extends AbstractWorkingSetDialog { private class Filter extends ViewerFilter { + @Override public boolean select(Viewer viewer, Object parentElement, Object element) { return isCompatible((IWorkingSet) element); @@ -107,6 +108,7 @@ public class SimpleWorkingSetSelectionDialog extends AbstractWorkingSetDialog { setMessage(WorkbenchMessages.WorkingSetSelectionDialog_message_multiSelect); } + @Override protected Control createDialogArea(Composite parent) { initializeDialogUnits(parent); @@ -131,6 +133,7 @@ public class SimpleWorkingSetSelectionDialog extends AbstractWorkingSetDialog { viewer.setFilters(new ViewerFilter[] { new Filter() }); viewer.addSelectionChangedListener(new ISelectionChangedListener() { + @Override public void selectionChanged(SelectionChangedEvent event) { handleSelectionChanged(); } @@ -155,6 +158,7 @@ public class SimpleWorkingSetSelectionDialog extends AbstractWorkingSetDialog { return composite; } + @Override protected void okPressed() { Object[] checked = viewer.getCheckedElements(); IWorkingSet[] workingSets = new IWorkingSet[checked.length]; @@ -163,6 +167,7 @@ public class SimpleWorkingSetSelectionDialog extends AbstractWorkingSetDialog { super.okPressed(); } + @Override protected List getSelectedWorkingSets() { ISelection selection = viewer.getSelection(); if (selection instanceof IStructuredSelection) { @@ -171,6 +176,7 @@ public class SimpleWorkingSetSelectionDialog extends AbstractWorkingSetDialog { return null; } + @Override protected void availableWorkingSetsChanged() { viewer.setInput(PlatformUI.getWorkbench().getWorkingSetManager() .getWorkingSets()); @@ -184,12 +190,14 @@ public class SimpleWorkingSetSelectionDialog extends AbstractWorkingSetDialog { updateButtonAvailability(); } + @Override protected void selectAllSets() { viewer.setCheckedElements(PlatformUI.getWorkbench() .getWorkingSetManager().getWorkingSets()); updateButtonAvailability(); } + @Override protected void deselectAllSets() { viewer.setCheckedElements(new Object[0]); updateButtonAvailability(); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/StartupPreferencePage.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/StartupPreferencePage.java index 730914e7282..be47f91d3f9 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/StartupPreferencePage.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/StartupPreferencePage.java @@ -49,7 +49,8 @@ public class StartupPreferencePage extends PreferencePage implements /** * @see PreferencePage#createContents(Composite) */ - protected Control createContents(Composite parent) { + @Override + protected Control createContents(Composite parent) { PlatformUI.getWorkbench().getHelpSystem().setHelp(parent, IWorkbenchHelpContextIds.STARTUP_PREFERENCE_PAGE); @@ -87,6 +88,7 @@ public class StartupPreferencePage extends PreferencePage implements pluginsList.setLayoutData(data); TableViewer viewer = new TableViewer(pluginsList); viewer.setLabelProvider(new LabelProvider() { + @Override public String getText(Object element) { return (String) Platform.getBundle(((ContributionInfo) element).getBundleId()) .getHeaders().get( @@ -110,14 +112,16 @@ public class StartupPreferencePage extends PreferencePage implements /** * @see IWorkbenchPreferencePage */ - public void init(IWorkbench workbench) { + @Override + public void init(IWorkbench workbench) { this.workbench = (Workbench) workbench; } /** * @see PreferencePage */ - protected void performDefaults() { + @Override + protected void performDefaults() { TableItem items[] = pluginsList.getItems(); for (int i = 0; i < items.length; i++) { items[i].setChecked(true); @@ -127,7 +131,8 @@ public class StartupPreferencePage extends PreferencePage implements /** * @see PreferencePage */ - public boolean performOk() { + @Override + public boolean performOk() { StringBuffer preference = new StringBuffer(); TableItem items[] = pluginsList.getItems(); for (int i = 0; i < items.length; i++) { diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/TreeManager.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/TreeManager.java index a1682592d70..dd56ff2e4c5 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/TreeManager.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/TreeManager.java @@ -84,6 +84,7 @@ public class TreeManager { manager.addListener(this); } + @Override public void checkChanged(TreeItem changedItem) { treeViewer.update(changedItem, null); } @@ -100,12 +101,14 @@ public class TreeManager { manager.addListener(this); } + @Override public void checkChanged(TreeItem changedItem) { tableViewer.update(changedItem, null); } } public static class ViewerCheckStateListener implements ICheckStateListener { + @Override public void checkStateChanged(CheckStateChangedEvent event) { Object checked = event.getElement(); if(checked instanceof TreeItem) { @@ -120,10 +123,12 @@ public class TreeManager { * {@link TreeManager.TreeItem}s. */ public static class CheckStateProvider implements ICheckStateProvider { + @Override public boolean isChecked(Object element) { return ((TreeItem)element).checkState != CHECKSTATE_UNCHECKED; } + @Override public boolean isGrayed(Object element) { return ((TreeItem)element).checkState == CHECKSTATE_GRAY; } @@ -133,10 +138,12 @@ public class TreeManager { * A {@link IBaseLabelProvider} for {@link TreeManager.TreeItem}s. */ public static class TreeItemLabelProvider extends LabelProvider { + @Override public String getText(Object element) { return ((TreeItem)element).getLabel(); } + @Override public Image getImage(Object element) { return ((TreeItem)element).getImage(); } @@ -147,24 +154,30 @@ public class TreeManager { * tree structure represented by {@link TreeManager.TreeItem}s. */ public static class TreeItemContentProvider implements ITreeContentProvider { + @Override public Object[] getChildren(Object parentElement) { return ((TreeItem)parentElement).getChildren().toArray(); } + @Override public Object getParent(Object element) { return ((TreeItem)element).getParent(); } + @Override public boolean hasChildren(Object element) { return getChildren(element).length > 0; } + @Override public Object[] getElements(Object inputElement) { return getChildren(inputElement); } + @Override public void dispose() {} + @Override public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {} } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/ViewComparator.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/ViewComparator.java index b34a4cde602..d41b104609d 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/ViewComparator.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/ViewComparator.java @@ -44,7 +44,8 @@ public class ViewComparator extends ViewerComparator { * the first element is less than, equal to, or greater than * the second element. */ - public int compare(Viewer viewer, Object e1, Object e2) { + @Override + public int compare(Viewer viewer, Object e1, Object e2) { if (e1 instanceof IViewDescriptor) { String str1 = DialogUtil.removeAccel(((IViewDescriptor) e1) .getLabel()); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/ViewLabelProvider.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/ViewLabelProvider.java index 706a4ef562d..afe231099be 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/ViewLabelProvider.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/ViewLabelProvider.java @@ -44,6 +44,7 @@ public class ViewLabelProvider extends ColumnLabelProvider { this.dimmedForeground = dimmedForeground; } + @Override protected void initialize(ColumnViewer viewer, ViewerColumn column) { super.initialize(viewer, column); } @@ -60,7 +61,8 @@ public class ViewLabelProvider extends ColumnLabelProvider { return image; } - public void dispose() { + @Override + public void dispose() { if (images != null) { for (Image i : images.values()) { i.dispose(); @@ -70,7 +72,8 @@ public class ViewLabelProvider extends ColumnLabelProvider { super.dispose(); } - public Image getImage(Object element) { + @Override + public Image getImage(Object element) { if (element instanceof IViewDescriptor) { ImageDescriptor desc = ((IViewDescriptor) element) .getImageDescriptor(); @@ -85,7 +88,8 @@ public class ViewLabelProvider extends ColumnLabelProvider { return null; } - public String getText(Object element) { + @Override + public String getText(Object element) { String label = WorkbenchMessages.ViewLabel_unknown; if (element instanceof IViewCategory) { label = ((IViewCategory) element).getLabel(); @@ -95,10 +99,12 @@ public class ViewLabelProvider extends ColumnLabelProvider { return DialogUtil.removeAccel(label); } + @Override public Color getBackground(Object element) { return null; } + @Override public Color getForeground(Object element) { if (element instanceof IViewDescriptor) { IWorkbenchPage activePage = window.getActivePage(); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/ViewPatternFilter.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/ViewPatternFilter.java index ee08c93bef2..9a79828818c 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/ViewPatternFilter.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/ViewPatternFilter.java @@ -36,6 +36,7 @@ public class ViewPatternFilter extends PatternFilter { * (non-Javadoc) * @see org.eclipse.ui.internal.dialogs.PatternFilter#isElementSelectable(java.lang.Object) */ + @Override public boolean isElementSelectable(Object element) { return element instanceof IViewDescriptor; } @@ -43,6 +44,7 @@ public class ViewPatternFilter 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 IViewCategory) { return false; diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/ViewsPreferencePage.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/ViewsPreferencePage.java index ef391b20c35..37c4f4c16ce 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/ViewsPreferencePage.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/ViewsPreferencePage.java @@ -110,6 +110,7 @@ public class ViewsPreferencePage extends PreferencePage implements themeIdCombo.setSelection(new StructuredSelection(currentTheme)); } themeIdCombo.addSelectionChangedListener(new ISelectionChangedListener() { + @Override public void selectionChanged(SelectionChangedEvent event) { ITheme selection = getSelectedTheme(); engine.setTheme(selection, false); @@ -176,6 +177,7 @@ public class ViewsPreferencePage extends PreferencePage implements return (ITheme) ((IStructuredSelection) themeIdCombo.getSelection()).getFirstElement(); } + @Override public void init(IWorkbench workbench) { MApplication application = (MApplication) workbench.getService(MApplication.class); IEclipseContext context = application.getContext(); @@ -273,6 +275,7 @@ public class ViewsPreferencePage extends PreferencePage implements colorsAndFontsThemeCombo.setInput(getColorsAndFontsThemes()); colorsAndFontsThemeCombo.getControl().setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); colorsAndFontsThemeCombo.addSelectionChangedListener(new ISelectionChangedListener() { + @Override public void selectionChanged(SelectionChangedEvent event) { ColorsAndFontsTheme colorsAndFontsTheme = getSelectedColorsAndFontsTheme(); refreshColorsAndFontsThemeDescriptionText(colorsAndFontsTheme); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/WizardActivityFilter.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/WizardActivityFilter.java index fcd27774ead..fea5bd652d8 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/WizardActivityFilter.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/WizardActivityFilter.java @@ -32,7 +32,8 @@ public class WizardActivityFilter extends ViewerFilter { /* (non-Javadoc) * @see org.eclipse.jface.viewers.ViewerFilter#select(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object) */ - public boolean select(Viewer viewer, Object parentElement, Object element) { + @Override + public boolean select(Viewer viewer, Object parentElement, Object element) { if (parentElement.getClass().equals(AdaptableList.class) && !filterPrimaryWizards) { return true; //top-level ("primary") wizards should always be returned } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/WizardCollectionElement.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/WizardCollectionElement.java index 780514e64d5..1900487b7a5 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/WizardCollectionElement.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/WizardCollectionElement.java @@ -94,7 +94,8 @@ public class WizardCollectionElement extends AdaptableList implements IPluginCon /** * Adds a wizard collection to this collection. */ - public AdaptableList add(IAdaptable a) { + @Override + public AdaptableList add(IAdaptable a) { if (a instanceof WorkbenchWizardElement) { wizards.add(a); } else { @@ -107,7 +108,8 @@ public class WizardCollectionElement extends AdaptableList implements IPluginCon /** * Remove a wizard from this collection. */ - public void remove(IAdaptable a) { + @Override + public void remove(IAdaptable a) { if (a instanceof WorkbenchWizardElement) { wizards.remove(a); } else { @@ -201,7 +203,8 @@ public class WizardCollectionElement extends AdaptableList implements IPluginCon * with this object. Returns <code>null</code> if no such object can be * found. */ - public Object getAdapter(Class adapter) { + @Override + public Object getAdapter(Class adapter) { if (adapter == IWorkbenchAdapter.class) { return this; } @@ -211,14 +214,16 @@ public class WizardCollectionElement extends AdaptableList implements IPluginCon /** * Returns the unique ID of this element. */ - public String getId() { + @Override + public String getId() { return id; } /** * Returns the label for this collection. */ - public String getLabel(Object o) { + @Override + public String getLabel(Object o) { return configElement != null ? configElement .getAttribute(IWorkbenchRegistryConstants.ATT_NAME) : name; } @@ -226,14 +231,16 @@ public class WizardCollectionElement extends AdaptableList implements IPluginCon /** * Returns the logical parent of the given object in its tree. */ - public Object getParent(Object o) { + @Override + public Object getParent(Object o) { return parent; } /* (non-Javadoc) * @see org.eclipse.ui.wizards.IWizardCategory#getPath() */ - public IPath getPath() { + @Override + public IPath getPath() { if (parent == null) { return new Path(""); //$NON-NLS-1$ } @@ -245,7 +252,8 @@ public class WizardCollectionElement extends AdaptableList implements IPluginCon /* (non-Javadoc) * @see org.eclipse.ui.wizards.IWizardCategory#getWizards() */ - public IWizardDescriptor [] getWizards() { + @Override + public IWizardDescriptor [] getWizards() { return getWizardsExpression((IWizardDescriptor[]) wizards .getTypedChildren(IWizardDescriptor.class)); } @@ -313,7 +321,8 @@ public class WizardCollectionElement extends AdaptableList implements IPluginCon /** * For debugging purposes. */ - public String toString() { + @Override + public String toString() { StringBuffer buf = new StringBuffer("WizardCollection, "); //$NON-NLS-1$ buf.append(children.size()); buf.append(" children, "); //$NON-NLS-1$ @@ -327,7 +336,8 @@ public class WizardCollectionElement extends AdaptableList implements IPluginCon * * @see org.eclipse.ui.model.IWorkbenchAdapter#getImageDescriptor(java.lang.Object) */ - public ImageDescriptor getImageDescriptor(Object object) { + @Override + public ImageDescriptor getImageDescriptor(Object object) { return WorkbenchImages.getImageDescriptor(ISharedImages.IMG_OBJ_FOLDER); } @@ -336,7 +346,8 @@ public class WizardCollectionElement extends AdaptableList implements IPluginCon * * @see org.eclipse.ui.activities.support.IPluginContribution#getLocalId() */ - public String getLocalId() { + @Override + public String getLocalId() { return getId(); } @@ -345,7 +356,8 @@ public class WizardCollectionElement extends AdaptableList implements IPluginCon * * @see org.eclipse.ui.activities.support.IPluginContribution#getPluginId() */ - public String getPluginId() { + @Override + public String getPluginId() { return configElement != null ? configElement.getNamespace() : pluginId; } @@ -353,14 +365,16 @@ public class WizardCollectionElement extends AdaptableList implements IPluginCon /* (non-Javadoc) * @see org.eclipse.ui.wizards.IWizardCategory#getParent() */ - public IWizardCategory getParent() { + @Override + public IWizardCategory getParent() { return parent; } /* (non-Javadoc) * @see org.eclipse.ui.wizards.IWizardCategory#getCategories() */ - public IWizardCategory[] getCategories() { + @Override + public IWizardCategory[] getCategories() { return (IWizardCategory []) getTypedChildren(IWizardCategory.class); } @@ -387,7 +401,8 @@ public class WizardCollectionElement extends AdaptableList implements IPluginCon /* (non-Javadoc) * @see org.eclipse.ui.wizards.IWizardCategory#getLabel() */ - public String getLabel() { + @Override + public String getLabel() { return getLabel(this); } @@ -414,6 +429,7 @@ public class WizardCollectionElement extends AdaptableList implements IPluginCon /* (non-Javadoc) * @see org.eclipse.ui.wizards.IWizardCategory#findWizard(java.lang.String) */ + @Override public IWizardDescriptor findWizard(String id) { return findWizard(id, true); } @@ -421,6 +437,7 @@ public class WizardCollectionElement extends AdaptableList implements IPluginCon /* (non-Javadoc) * @see org.eclipse.ui.wizards.IWizardCategory#findCategory(org.eclipse.core.runtime.IPath) */ + @Override public IWizardCategory findCategory(IPath path) { return findChildCollection(path); } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/WizardContentProvider.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/WizardContentProvider.java index d75579c67dc..53057025871 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/WizardContentProvider.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/WizardContentProvider.java @@ -30,7 +30,8 @@ public class WizardContentProvider implements ITreeContentProvider { * * @see org.eclipse.jface.viewers.IContentProvider#dispose() */ - public void dispose() { + @Override + public void dispose() { input = null; } @@ -39,7 +40,8 @@ public class WizardContentProvider implements ITreeContentProvider { * * @see org.eclipse.jface.viewers.ITreeContentProvider#getChildren(java.lang.Object) */ - public Object[] getChildren(Object parentElement) { + @Override + public Object[] getChildren(Object parentElement) { if (parentElement instanceof WizardCollectionElement) { ArrayList list = new ArrayList(); WizardCollectionElement element = (WizardCollectionElement) parentElement; @@ -85,7 +87,8 @@ public class WizardContentProvider implements ITreeContentProvider { * * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object) */ - public Object[] getElements(Object inputElement) { + @Override + public Object[] getElements(Object inputElement) { return getChildren(inputElement); } @@ -94,7 +97,8 @@ public class WizardContentProvider implements ITreeContentProvider { * * @see org.eclipse.jface.viewers.ITreeContentProvider#getParent(java.lang.Object) */ - public Object getParent(Object element) { + @Override + public Object getParent(Object element) { if (element instanceof WizardCollectionElement) { Object[] children = input.getChildren(); for (int i = 0; i < children.length; i++) { @@ -129,7 +133,8 @@ public class WizardContentProvider implements ITreeContentProvider { * * @see org.eclipse.jface.viewers.ITreeContentProvider#hasChildren(java.lang.Object) */ - public boolean hasChildren(Object element) { + @Override + public boolean hasChildren(Object element) { if (element instanceof WizardCollectionElement) { if (getChildren(element).length > 0) { return true; @@ -144,7 +149,8 @@ public class WizardContentProvider implements ITreeContentProvider { * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer, * java.lang.Object, java.lang.Object) */ - public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { + @Override + public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { input = (AdaptableList) newInput; } } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/WizardPatternFilter.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/WizardPatternFilter.java index da63938c9d6..da9fa780c08 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/WizardPatternFilter.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/WizardPatternFilter.java @@ -34,6 +34,7 @@ public class WizardPatternFilter extends PatternFilter { * (non-Javadoc) * @see org.eclipse.ui.internal.dialogs.PatternFilter#isElementSelectable(java.lang.Object) */ + @Override public boolean isElementSelectable(Object element) { return element instanceof WorkbenchWizardElement; } @@ -42,6 +43,7 @@ public class WizardPatternFilter extends PatternFilter { * (non-Javadoc) * @see org.eclipse.ui.internal.dialogs.PatternFilter#isElementMatch(org.eclipse.jface.viewers.Viewer, java.lang.Object) */ + @Override protected boolean isLeafMatch(Viewer viewer, Object element) { if (element instanceof WizardCollectionElement) { return false; diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/WizardTagFilter.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/WizardTagFilter.java index d3b789cfafa..266560ad793 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/WizardTagFilter.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/WizardTagFilter.java @@ -37,6 +37,7 @@ public class WizardTagFilter extends ViewerFilter { /* (non-Javadoc) * @see org.eclipse.jface.viewers.ViewerFilter#select(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object) */ + @Override public boolean select(Viewer viewer, Object parentElement, Object element) { if (element instanceof IWizardDescriptor) { IWizardDescriptor desc = (IWizardDescriptor)element; diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/WorkbenchDialogBlockedHandler.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/WorkbenchDialogBlockedHandler.java index a35dd1d064a..567228ffd9d 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/WorkbenchDialogBlockedHandler.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/WorkbenchDialogBlockedHandler.java @@ -37,7 +37,8 @@ public class WorkbenchDialogBlockedHandler implements IDialogBlockedHandler { * * @see org.eclipse.jface.dialogs.IDialogBlockedHandler#clearBlocked() */ - public void clearBlocked() { + @Override + public void clearBlocked() { if (nestingDepth == 0) { return; } @@ -59,7 +60,8 @@ public class WorkbenchDialogBlockedHandler implements IDialogBlockedHandler { * org.eclipse.core.runtime.IProgressMonitor, * org.eclipse.core.runtime.IStatus, java.lang.String) */ - public void showBlocked(Shell parentShell, + @Override + public void showBlocked(Shell parentShell, IProgressMonitor blockingMonitor, IStatus blockingStatus, String blockedName) { @@ -82,7 +84,8 @@ public class WorkbenchDialogBlockedHandler implements IDialogBlockedHandler { * @see org.eclipse.jface.dialogs.IDialogBlockedHandler#showBlocked(org.eclipse.core.runtime.IProgressMonitor, * org.eclipse.core.runtime.IStatus, java.lang.String) */ - public void showBlocked(IProgressMonitor blocking, IStatus blockingStatus, + @Override + public void showBlocked(IProgressMonitor blocking, IStatus blockingStatus, String blockedName) { showBlocked(null, blocking, blockingStatus, blockedName); } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/WorkbenchEditorsDialog.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/WorkbenchEditorsDialog.java index 3fe8aad2045..1eaa9123932 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/WorkbenchEditorsDialog.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/WorkbenchEditorsDialog.java @@ -112,7 +112,8 @@ public class WorkbenchEditorsDialog extends SelectionDialog { private static final String COLUMNS = "columns"; //$NON-NLS-1$ private SelectionListener headerListener = new SelectionAdapter() { - public void widgetSelected(SelectionEvent e) { + @Override + public void widgetSelected(SelectionEvent e) { TableColumn column = (TableColumn) e.widget; int index = editorsTable.indexOf(column); if (index == sortColumn) { @@ -164,7 +165,8 @@ public class WorkbenchEditorsDialog extends SelectionDialog { /* (non-Javadoc) * Method declared on Window. */ - protected void configureShell(Shell newShell) { + @Override + protected void configureShell(Shell newShell) { super.configureShell(newShell); PlatformUI.getWorkbench().getHelpSystem().setHelp(newShell, IWorkbenchHelpContextIds.WORKBENCH_EDITORS_DIALOG); @@ -174,7 +176,8 @@ public class WorkbenchEditorsDialog extends SelectionDialog { * (non-Javadoc) * @see org.eclipse.jface.dialogs.Dialog#createButtonsForButtonBar(org.eclipse.swt.widgets.Composite) */ - protected void createButtonsForButtonBar(Composite parent) { + @Override + protected void createButtonsForButtonBar(Composite parent) { // Typically we would use the parent's createButtonsForButtonBar. // However, we only want a Cancel button and not an OK button. The // OK button will be used later (in createDialogArea) to activate @@ -192,7 +195,8 @@ public class WorkbenchEditorsDialog extends SelectionDialog { * Initialize the dialog bounds with the bounds saved * from the settings. */ - protected void initializeBounds() { + @Override + protected void initializeBounds() { if (bounds != null) { getShell().setBounds(bounds); } else { @@ -204,7 +208,8 @@ public class WorkbenchEditorsDialog extends SelectionDialog { * Creates the contents of this dialog, initializes the * listener and the update thread. */ - protected Control createDialogArea(Composite parent) { + @Override + protected Control createDialogArea(Composite parent) { initializeDialogUnits(parent); @@ -242,12 +247,14 @@ public class WorkbenchEditorsDialog extends SelectionDialog { editorsTable.setLayoutData(tableData); editorsTable.setLayout(new Layout() { - protected Point computeSize(Composite composite, int wHint, + @Override + protected Point computeSize(Composite composite, int wHint, int hHint, boolean flushCache) { return new Point(width, height); } - protected void layout(Composite composite, boolean flushCache) { + @Override + protected void layout(Composite composite, boolean flushCache) { TableColumn c[] = editorsTable.getColumns(); if (columnsWidth == null) { int w = editorsTable.getClientArea().width; @@ -283,7 +290,8 @@ public class WorkbenchEditorsDialog extends SelectionDialog { selectClean = new Button(selectionButtons, SWT.PUSH); selectClean.setText(WorkbenchMessages.WorkbenchEditorsDialog_selectClean); selectClean.addSelectionListener(new SelectionAdapter() { - public void widgetSelected(SelectionEvent e) { + @Override + public void widgetSelected(SelectionEvent e) { editorsTable.setSelection(selectClean(editorsTable.getItems())); updateButtons(); } @@ -295,7 +303,8 @@ public class WorkbenchEditorsDialog extends SelectionDialog { invertSelection = new Button(selectionButtons, SWT.PUSH); invertSelection.setText(WorkbenchMessages.WorkbenchEditorsDialog_invertSelection); invertSelection.addSelectionListener(new SelectionAdapter() { - public void widgetSelected(SelectionEvent e) { + @Override + public void widgetSelected(SelectionEvent e) { editorsTable.setSelection(invertedSelection(editorsTable .getItems(), editorsTable.getSelection())); updateButtons(); @@ -308,7 +317,8 @@ public class WorkbenchEditorsDialog extends SelectionDialog { allSelection = new Button(selectionButtons, SWT.PUSH); allSelection.setText(WorkbenchMessages.WorkbenchEditorsDialog_allSelection); allSelection.addSelectionListener(new SelectionAdapter() { - public void widgetSelected(SelectionEvent e) { + @Override + public void widgetSelected(SelectionEvent e) { editorsTable.setSelection(editorsTable.getItems()); updateButtons(); } @@ -332,7 +342,8 @@ public class WorkbenchEditorsDialog extends SelectionDialog { closeSelected = new Button(actionButtons, SWT.PUSH); closeSelected.setText(WorkbenchMessages.WorkbenchEditorsDialog_closeSelected); closeSelected.addSelectionListener(new SelectionAdapter() { - public void widgetSelected(SelectionEvent e) { + @Override + public void widgetSelected(SelectionEvent e) { closeItems(editorsTable.getSelection()); } }); @@ -343,7 +354,8 @@ public class WorkbenchEditorsDialog extends SelectionDialog { saveSelected = new Button(actionButtons, SWT.PUSH); saveSelected.setText(WorkbenchMessages.WorkbenchEditorsDialog_saveSelected); saveSelected.addSelectionListener(new SelectionAdapter() { - public void widgetSelected(SelectionEvent e) { + @Override + public void widgetSelected(SelectionEvent e) { saveItems(editorsTable.getSelection()); } }); @@ -357,7 +369,8 @@ public class WorkbenchEditorsDialog extends SelectionDialog { showAllPerspButton.setFont(font); setButtonLayoutData(showAllPerspButton); showAllPerspButton.addSelectionListener(new SelectionAdapter() { - public void widgetSelected(SelectionEvent e) { + @Override + public void widgetSelected(SelectionEvent e) { showAllPersp = showAllPerspButton.getSelection(); updateItems(); } @@ -367,16 +380,19 @@ public class WorkbenchEditorsDialog extends SelectionDialog { updateButtons(); editorsTable.addSelectionListener(new SelectionAdapter() { - public void widgetSelected(SelectionEvent e) { + @Override + public void widgetSelected(SelectionEvent e) { updateButtons(); } - public void widgetDefaultSelected(SelectionEvent e) { + @Override + public void widgetDefaultSelected(SelectionEvent e) { okPressed(); } }); editorsTable.addDisposeListener(new DisposeListener() { - public void widgetDisposed(DisposeEvent e) { + @Override + public void widgetDisposed(DisposeEvent e) { for (Iterator images = imageCache.values().iterator(); images .hasNext();) { Image i = (Image) images.next(); @@ -613,7 +629,8 @@ public class WorkbenchEditorsDialog extends SelectionDialog { /** * The user has selected a resource and the dialog is closing. */ - protected void okPressed() { + @Override + protected void okPressed() { TableItem items[] = editorsTable.getSelection(); if (items.length != 1) { super.okPressed(); @@ -628,6 +645,7 @@ public class WorkbenchEditorsDialog extends SelectionDialog { selection.activate(); } + @Override public boolean close() { saveDialogSettings(); return super.close(); @@ -798,7 +816,8 @@ public class WorkbenchEditorsDialog extends SelectionDialog { } } - public int compareTo(Object another) { + @Override + public int compareTo(Object another) { Adapter adapter = (Adapter) another; int result = collator.compare(getText()[sortColumn], adapter .getText()[sortColumn]); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/WorkbenchPreferenceDialog.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/WorkbenchPreferenceDialog.java index 3feff7a7214..a83debf4d8d 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/WorkbenchPreferenceDialog.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/WorkbenchPreferenceDialog.java @@ -142,6 +142,7 @@ public class WorkbenchPreferenceDialog extends FilteredPreferenceDialog { /* (non-Javadoc) * @see org.eclipse.jface.window.Window#close() */ + @Override public boolean close() { instance = null; return super.close(); @@ -156,6 +157,7 @@ public class WorkbenchPreferenceDialog extends FilteredPreferenceDialog { * * @see org.eclipse.jface.preference.PreferenceDialog#findNodeMatching(java.lang.String) */ + @Override protected IPreferenceNode findNodeMatching(String nodeId) { IPreferenceNode node = super.findNodeMatching(nodeId); if (WorkbenchActivityHelper.filterItem(node)) { @@ -167,6 +169,7 @@ public class WorkbenchPreferenceDialog extends FilteredPreferenceDialog { /* (non-Javadoc) * @see org.eclipse.jface.dialogs.Dialog#okPressed() */ + @Override protected void okPressed() { super.okPressed(); } @@ -176,6 +179,7 @@ public class WorkbenchPreferenceDialog extends FilteredPreferenceDialog { * * @since 3.2 */ + @Override protected IDialogSettings getDialogBoundsSettings() { IDialogSettings settings = WorkbenchPlugin.getDefault().getDialogSettings(); IDialogSettings section = settings.getSection(DIALOG_SETTINGS_SECTION); @@ -192,6 +196,7 @@ public class WorkbenchPreferenceDialog extends FilteredPreferenceDialog { * page dictates the most appropriate size for the dialog. * @since 3.2 */ + @Override protected int getDialogBoundsStrategy() { return DIALOG_PERSISTLOCATION; } @@ -201,6 +206,7 @@ public class WorkbenchPreferenceDialog extends FilteredPreferenceDialog { * Overrides to set focus to the specific page if it a specific page was requested. * @since 3.5 */ + @Override public int open() { IPreferencePage selectedPage = getCurrentPage(); if ((initialPageId != null) && (selectedPage != null)) { diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/WorkbenchPreferenceManager.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/WorkbenchPreferenceManager.java index 8a86f138216..d79dc390a84 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/WorkbenchPreferenceManager.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/WorkbenchPreferenceManager.java @@ -59,6 +59,7 @@ public class WorkbenchPreferenceManager extends PreferenceManager implements * * @see org.eclipse.core.runtime.IRegistryChangeListener#registryChanged(org.eclipse.core.runtime.IRegistryChangeEvent) */ + @Override public void registryChanged(IRegistryChangeEvent event) { if (event.getExtensionDeltas(PlatformUI.PLUGIN_ID, IWorkbenchRegistryConstants.PL_KEYWORDS).length > 0) { @@ -114,6 +115,7 @@ public class WorkbenchPreferenceManager extends PreferenceManager implements /* (non-Javadoc) * @see org.eclipse.core.runtime.dynamicHelpers.IExtensionChangeHandler#addExtension(org.eclipse.core.runtime.dynamicHelpers.IExtensionTracker, org.eclipse.core.runtime.IExtension) */ + @Override public void addExtension(IExtensionTracker tracker, IExtension extension) { IConfigurationElement[] elements = extension.getConfigurationElements(); for (int i = 0; i < elements.length; i++) { @@ -162,6 +164,7 @@ public class WorkbenchPreferenceManager extends PreferenceManager implements /* (non-Javadoc) * @see org.eclipse.core.runtime.dynamicHelpers.IExtensionChangeHandler#removeExtension(org.eclipse.core.runtime.IExtension, java.lang.Object[]) */ + @Override public void removeExtension(IExtension extension, Object[] objects) { for (int i = 0; i < objects.length; i++) { if (objects[i] instanceof IPreferenceNode) { diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/WorkbenchPreferenceNode.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/WorkbenchPreferenceNode.java index 74895bb478f..af5bed442a4 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/WorkbenchPreferenceNode.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/WorkbenchPreferenceNode.java @@ -41,6 +41,7 @@ public class WorkbenchPreferenceNode extends WorkbenchPreferenceExtensionNode { /** * Creates the preference page this node stands for. */ + @Override public void createPage() { IWorkbenchPreferencePage page; try { diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/WorkbenchPreferencePage.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/WorkbenchPreferencePage.java index 4b61799ae36..e93376f83d0 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/WorkbenchPreferencePage.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/WorkbenchPreferencePage.java @@ -83,7 +83,8 @@ public class WorkbenchPreferencePage extends PreferencePage implements * * @see org.eclipse.jface.preference.PreferencePage */ - protected Control createContents(Composite parent) { + @Override + protected Control createContents(Composite parent) { // @issue if the product subclasses this page, then it should provide // the help content @@ -203,6 +204,7 @@ public class WorkbenchPreferencePage extends PreferencePage implements saveInterval.setPropertyChangeListener(new IPropertyChangeListener() { + @Override public void propertyChange(PropertyChangeEvent event) { if (event.getProperty().equals(FieldEditor.IS_VALID)) { setValid(saveInterval.isValid()); @@ -228,7 +230,8 @@ public class WorkbenchPreferencePage extends PreferencePage implements doubleClickButton = createRadioButton(buttonComposite, label); doubleClickButton.addSelectionListener(new SelectionAdapter() { - public void widgetSelected(SelectionEvent e) { + @Override + public void widgetSelected(SelectionEvent e) { selectClickMode(singleClickButton.getSelection()); } }); @@ -238,7 +241,8 @@ public class WorkbenchPreferencePage extends PreferencePage implements singleClickButton = createRadioButton(buttonComposite, label); singleClickButton.addSelectionListener(new SelectionAdapter() { - public void widgetSelected(SelectionEvent e) { + @Override + public void widgetSelected(SelectionEvent e) { selectClickMode(singleClickButton.getSelection()); } }); @@ -251,7 +255,8 @@ public class WorkbenchPreferencePage extends PreferencePage implements selectOnHoverButton.setSelection(selectOnHover); selectOnHoverButton.addSelectionListener(new SelectionAdapter() { - public void widgetSelected(SelectionEvent e) { + @Override + public void widgetSelected(SelectionEvent e) { selectOnHover = selectOnHoverButton.getSelection(); } }); @@ -266,7 +271,8 @@ public class WorkbenchPreferencePage extends PreferencePage implements openAfterDelayButton.setSelection(openAfterDelay); openAfterDelayButton.addSelectionListener(new SelectionAdapter() { - public void widgetSelected(SelectionEvent e) { + @Override + public void widgetSelected(SelectionEvent e) { openAfterDelay = openAfterDelayButton.getSelection(); } }); @@ -357,14 +363,16 @@ public class WorkbenchPreferencePage extends PreferencePage implements * * @return the preference store for this plugin */ - protected IPreferenceStore doGetPreferenceStore() { + @Override + protected IPreferenceStore doGetPreferenceStore() { return WorkbenchPlugin.getDefault().getPreferenceStore(); } /** * @see IWorkbenchPreferencePage */ - public void init(IWorkbench aWorkbench) { + @Override + public void init(IWorkbench aWorkbench) { IPreferenceStore store = getPreferenceStore(); openOnSingleClick = store .getBoolean(IPreferenceConstants.OPEN_ON_SINGLE_CLICK); @@ -376,7 +384,8 @@ public class WorkbenchPreferencePage extends PreferencePage implements /** * The default button has been pressed. */ - protected void performDefaults() { + @Override + protected void performDefaults() { IPreferenceStore store = getPreferenceStore(); saveInterval.loadDefault(); stickyCycleButton.setSelection(store @@ -406,7 +415,8 @@ public class WorkbenchPreferencePage extends PreferencePage implements /** * The user has pressed Ok. Store/apply this page's values appropriately. */ - public boolean performOk() { + @Override + public boolean performOk() { IPreferenceStore store = getPreferenceStore(); // store the keep cycle part dialogs sticky preference diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/WorkbenchWizardElement.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/WorkbenchWizardElement.java index 00e1cece729..036776b0962 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/WorkbenchWizardElement.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/WorkbenchWizardElement.java @@ -97,7 +97,8 @@ public class WorkbenchWizardElement extends WorkbenchAdapter implements * @param selection * IStructuredSelection */ - public IStructuredSelection adaptedSelection(IStructuredSelection selection) { + @Override + public IStructuredSelection adaptedSelection(IStructuredSelection selection) { if (canHandleSelection(selection)) { return selection; } @@ -128,7 +129,8 @@ public class WorkbenchWizardElement extends WorkbenchAdapter implements * with this object. Returns <code>null</code> if no such object can be * found. */ - public Object getAdapter(Class adapter) { + @Override + public Object getAdapter(Class adapter) { if (adapter == IWorkbenchAdapter.class || adapter == IWorkbenchAdapter2.class || adapter == IWorkbenchAdapter3.class) { @@ -155,14 +157,16 @@ public class WorkbenchWizardElement extends WorkbenchAdapter implements * * @return java.lang.String */ - public String getDescription() { + @Override + public String getDescription() { return RegistryReader.getDescription(configurationElement); } /** * Answer the icon of this element. */ - public ImageDescriptor getImageDescriptor() { + @Override + public ImageDescriptor getImageDescriptor() { if (imageDescriptor == null) { String iconName = configurationElement .getAttribute(IWorkbenchRegistryConstants.ATT_ICON); @@ -178,14 +182,16 @@ public class WorkbenchWizardElement extends WorkbenchAdapter implements /** * Returns the name of this wizard element. */ - public ImageDescriptor getImageDescriptor(Object element) { + @Override + public ImageDescriptor getImageDescriptor(Object element) { return getImageDescriptor(); } /** * Returns the name of this wizard element. */ - public String getLabel(Object element) { + @Override + public String getLabel(Object element) { return configurationElement.getAttribute(IWorkbenchRegistryConstants.ATT_NAME); } @@ -226,14 +232,16 @@ public class WorkbenchWizardElement extends WorkbenchAdapter implements * * @see org.eclipse.ui.IPluginContribution#getLocalId() */ - public String getLocalId() { + @Override + public String getLocalId() { return getId(); } /* (non-Javadoc) * @see org.eclipse.ui.IPluginContribution#getPluginId() */ - public String getPluginId() { + @Override + public String getPluginId() { return (configurationElement != null) ? configurationElement .getNamespaceIdentifier() : null; } @@ -241,7 +249,8 @@ public class WorkbenchWizardElement extends WorkbenchAdapter implements /* (non-Javadoc) * @see org.eclipse.ui.wizards.INewWizardDescriptor#getDescriptionImage() */ - public ImageDescriptor getDescriptionImage() { + @Override + public ImageDescriptor getDescriptionImage() { if (descriptionImage == null) { String descImage = configurationElement.getAttribute(IWorkbenchRegistryConstants.ATT_DESCRIPTION_IMAGE); if (descImage == null) { @@ -256,13 +265,15 @@ public class WorkbenchWizardElement extends WorkbenchAdapter implements /* (non-Javadoc) * @see org.eclipse.ui.wizards.INewWizardDescriptor#getHelpHref() */ - public String getHelpHref() { + @Override + public String getHelpHref() { return configurationElement.getAttribute(IWorkbenchRegistryConstants.ATT_HELP_HREF); } /* (non-Javadoc) * @see org.eclipse.ui.wizards.INewWizardDescriptor#createWizard() */ + @Override public IWorkbenchWizard createWizard() throws CoreException { return (IWorkbenchWizard) createExecutableExtension(); } @@ -270,6 +281,7 @@ public class WorkbenchWizardElement extends WorkbenchAdapter implements /* (non-Javadoc) * @see org.eclipse.ui.IWorkbenchPartDescriptor#getId() */ + @Override public String getId() { return id; } @@ -277,6 +289,7 @@ public class WorkbenchWizardElement extends WorkbenchAdapter implements /* (non-Javadoc) * @see org.eclipse.ui.IWorkbenchPartDescriptor#getLabel() */ + @Override public String getLabel() { return getLabel(this); } @@ -284,6 +297,7 @@ public class WorkbenchWizardElement extends WorkbenchAdapter implements /* (non-Javadoc) * @see org.eclipse.ui.wizards.INewWizardDescriptor#getCategory() */ + @Override public IWizardCategory getCategory() { return (IWizardCategory) getParent(this); } @@ -301,6 +315,7 @@ public class WorkbenchWizardElement extends WorkbenchAdapter implements /* (non-Javadoc) * @see org.eclipse.ui.wizards.IWizardDescriptor#getTags() */ + @Override public String [] getTags() { String flag = configurationElement.getAttribute(IWorkbenchRegistryConstants.ATT_PROJECT); @@ -314,6 +329,7 @@ public class WorkbenchWizardElement extends WorkbenchAdapter implements /* (non-Javadoc) * @see org.eclipse.ui.model.IWorkbenchAdapter#getParent(java.lang.Object) */ + @Override public Object getParent(Object object) { return parentCategory; } @@ -331,6 +347,7 @@ public class WorkbenchWizardElement extends WorkbenchAdapter implements /* (non-Javadoc) * @see org.eclipse.ui.wizards.IWizardDescriptor#canFinishEarly() */ + @Override public boolean canFinishEarly() { return Boolean.valueOf(configurationElement.getAttribute(IWorkbenchRegistryConstants.ATT_CAN_FINISH_EARLY)).booleanValue(); } @@ -338,6 +355,7 @@ public class WorkbenchWizardElement extends WorkbenchAdapter implements /* (non-Javadoc) * @see org.eclipse.ui.wizards.IWizardDescriptor#hasPages() */ + @Override public boolean hasPages() { String hasPagesString = configurationElement.getAttribute(IWorkbenchRegistryConstants.ATT_HAS_PAGES); // default value is true diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/WorkbenchWizardListSelectionPage.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/WorkbenchWizardListSelectionPage.java index 0260250b422..7da513fac7e 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/WorkbenchWizardListSelectionPage.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/WorkbenchWizardListSelectionPage.java @@ -79,7 +79,8 @@ public abstract class WorkbenchWizardListSelectionPage extends * * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite) */ - public void createControl(Composite parent) { + @Override + public void createControl(Composite parent) { Font font = parent.getFont(); @@ -137,7 +138,8 @@ public abstract class WorkbenchWizardListSelectionPage extends /** * An item in a viewer has been double-clicked. */ - public void doubleClick(DoubleClickEvent event) { + @Override + public void doubleClick(DoubleClickEvent event) { selectionChanged(new SelectionChangedEvent(event.getViewer(), event .getViewer().getSelection())); getContainer().showPage(getNextPage()); @@ -206,7 +208,8 @@ public abstract class WorkbenchWizardListSelectionPage extends * * @param event the selection changed event */ - public void selectionChanged(SelectionChangedEvent event) { + @Override + public void selectionChanged(SelectionChangedEvent event) { setErrorMessage(null); IStructuredSelection selection = (IStructuredSelection) event .getSelection(); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/WorkbenchWizardNode.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/WorkbenchWizardNode.java index a0fdfff39f8..19242d25782 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/WorkbenchWizardNode.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/WorkbenchWizardNode.java @@ -76,7 +76,8 @@ public abstract class WorkbenchWizardNode implements IWizardNode, /* (non-Javadoc) * @see org.eclipse.jface.wizard.IWizardNode#dispose() */ - public void dispose() { + @Override + public void dispose() { // Do nothing since the wizard wasn't created via reflection. } @@ -90,14 +91,16 @@ public abstract class WorkbenchWizardNode implements IWizardNode, /* (non-Javadoc) * @see org.eclipse.jface.wizard.IWizardNode#getExtent() */ - public Point getExtent() { + @Override + public Point getExtent() { return new Point(-1, -1); } /* (non-Javadoc) * @see org.eclipse.ui.IPluginContribution#getLocalId() */ - public String getLocalId() { + @Override + public String getLocalId() { IPluginContribution contribution = (IPluginContribution) Util.getAdapter(wizardElement, IPluginContribution.class); if (contribution != null) { @@ -109,7 +112,8 @@ public abstract class WorkbenchWizardNode implements IWizardNode, /* (non-Javadoc) * @see org.eclipse.ui.IPluginContribution#getPluginId() */ - public String getPluginId() { + @Override + public String getPluginId() { IPluginContribution contribution = (IPluginContribution) Util.getAdapter(wizardElement, IPluginContribution.class); if (contribution != null) { @@ -121,7 +125,8 @@ public abstract class WorkbenchWizardNode implements IWizardNode, /* (non-Javadoc) * @see org.eclipse.jface.wizard.IWizardNode#getWizard() */ - public IWizard getWizard() { + @Override + public IWizard getWizard() { if (wizard != null) { return wizard; // we've already created it } @@ -131,12 +136,14 @@ public abstract class WorkbenchWizardNode implements IWizardNode, // Start busy indicator. BusyIndicator.showWhile(parentWizardPage.getShell().getDisplay(), new Runnable() { - public void run() { + @Override + public void run() { SafeRunner.run(new SafeRunnable() { /** * Add the exception details to status is one happens. */ - public void handleException(Throwable e) { + @Override + public void handleException(Throwable e) { IPluginContribution contribution = (IPluginContribution) Util.getAdapter(wizardElement, IPluginContribution.class); statuses[0] = new Status( IStatus.ERROR, @@ -146,7 +153,8 @@ public abstract class WorkbenchWizardNode implements IWizardNode, e); } - public void run() { + @Override + public void run() { try { workbenchWizard[0] = createWizard(); // create instance of target wizard @@ -207,7 +215,8 @@ public abstract class WorkbenchWizardNode implements IWizardNode, /* (non-Javadoc) * @see org.eclipse.jface.wizard.IWizardNode#isContentCreated() */ - public boolean isContentCreated() { + @Override + public boolean isContentCreated() { return wizard != null; } } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/WorkbenchWizardSelectionPage.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/WorkbenchWizardSelectionPage.java index ff44fa614d0..0db953f8222 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/WorkbenchWizardSelectionPage.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/WorkbenchWizardSelectionPage.java @@ -93,7 +93,8 @@ public abstract class WorkbenchWizardSelectionPage extends WizardSelectionPage { /* (non-Javadoc) * @see org.eclipse.jface.wizard.IWizardPage#getNextPage() */ - public IWizardPage getNextPage() { + @Override + public IWizardPage getNextPage() { ITriggerPoint triggerPoint = getWorkbench().getActivitySupport() .getTriggerPointManager().getTriggerPoint(triggerPointId); if (triggerPoint == null || WorkbenchActivityHelper.allowUseOf(triggerPoint, getSelectedNode())) { diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/WorkingSetEditWizard.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/WorkingSetEditWizard.java index 74730f7fc94..dd57e50e94d 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/WorkingSetEditWizard.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/WorkingSetEditWizard.java @@ -47,7 +47,8 @@ public class WorkingSetEditWizard extends Wizard implements * * @see org.eclipse.jface.wizard.Wizard#addPages */ - public void addPages() { + @Override + public void addPages() { super.addPages(); addPage(workingSetEditPage); } @@ -57,7 +58,8 @@ public class WorkingSetEditWizard extends Wizard implements * * @see org.eclipse.jface.wizard.Wizard#canFinish() */ - public boolean canFinish() { + @Override + public boolean canFinish() { return workingSetEditPage.isPageComplete(); } @@ -66,7 +68,8 @@ public class WorkingSetEditWizard extends Wizard implements * * @return the working set that is being edited. */ - public IWorkingSet getSelection() { + @Override + public IWorkingSet getSelection() { return workingSet; } @@ -76,7 +79,8 @@ public class WorkingSetEditWizard extends Wizard implements * * @see org.eclipse.jface.wizard.Wizard#performFinish */ - public boolean performFinish() { + @Override + public boolean performFinish() { workingSetEditPage.finish(); return true; } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/WorkingSetFilter.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/WorkingSetFilter.java index a55da611bff..2454fecadb8 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/WorkingSetFilter.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/WorkingSetFilter.java @@ -24,7 +24,8 @@ public class WorkingSetFilter extends ViewerFilter { this.workingSetIds = workingSetIds; } - public boolean select(Viewer viewer, Object parentElement, Object element) { + @Override + public boolean select(Viewer viewer, Object parentElement, Object element) { if (element instanceof IWorkingSet) { IWorkingSet workingSet = (IWorkingSet) element; String id = workingSet.getId(); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/WorkingSetLabelProvider.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/WorkingSetLabelProvider.java index c3600b5ed5b..d6e4a7c1995 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/WorkingSetLabelProvider.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/WorkingSetLabelProvider.java @@ -30,13 +30,15 @@ public class WorkingSetLabelProvider extends LabelProvider { images = new LocalResourceManager(JFaceResources.getResources()); } - public void dispose() { + @Override + public void dispose() { images.dispose(); super.dispose(); } - public Image getImage(Object object) { + @Override + public Image getImage(Object object) { Assert.isTrue(object instanceof IWorkingSet); IWorkingSet workingSet = (IWorkingSet) object; ImageDescriptor imageDescriptor = workingSet.getImageDescriptor(); @@ -49,7 +51,8 @@ public class WorkingSetLabelProvider extends LabelProvider { return icon; } - public String getText(Object object) { + @Override + public String getText(Object object) { Assert.isTrue(object instanceof IWorkingSet); IWorkingSet workingSet = (IWorkingSet) object; return workingSet.getLabel(); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/WorkingSetNewWizard.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/WorkingSetNewWizard.java index f9f3de57b30..abc2919435e 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/WorkingSetNewWizard.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/WorkingSetNewWizard.java @@ -59,7 +59,8 @@ public class WorkingSetNewWizard extends Wizard implements IWorkingSetNewWizard * * @see org.eclipse.jface.wizard.Wizard#addPages() */ - public void addPages() { + @Override + public void addPages() { super.addPages(); IWizardPage page; @@ -81,7 +82,8 @@ public class WorkingSetNewWizard extends Wizard implements IWorkingSetNewWizard * * @see org.eclipse.jface.wizard.Wizard#canFinish() */ - public boolean canFinish() { + @Override + public boolean canFinish() { return (workingSetEditPage != null && workingSetEditPage .isPageComplete()); } @@ -94,7 +96,8 @@ public class WorkingSetNewWizard extends Wizard implements IWorkingSetNewWizard * * @see org.eclipse.jface.wizard.Wizard#getNextPage(IWizardPage) */ - public IWizardPage getNextPage(IWizardPage page) { + @Override + public IWizardPage getNextPage(IWizardPage page) { if (workingSetTypePage != null && page == workingSetTypePage) { String pageId = workingSetTypePage.getSelection(); if (pageId != null) { @@ -118,7 +121,8 @@ public class WorkingSetNewWizard extends Wizard implements IWorkingSetNewWizard * @return the new working set or null if the wizard has been * cancelled. */ - public IWorkingSet getSelection() { + @Override + public IWorkingSet getSelection() { return workingSet; } @@ -129,7 +133,8 @@ public class WorkingSetNewWizard extends Wizard implements IWorkingSetNewWizard * * @see org.eclipse.jface.wizard.Wizard#performFinish() */ - public boolean performFinish() { + @Override + public boolean performFinish() { workingSetEditPage.finish(); workingSet = workingSetEditPage.getSelection(); workingSet.setId(editPageId); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/WorkingSetSelectionDialog.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/WorkingSetSelectionDialog.java index b0141673997..1e024e21d23 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/WorkingSetSelectionDialog.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/WorkingSetSelectionDialog.java @@ -129,7 +129,8 @@ public class WorkingSetSelectionDialog extends AbstractWorkingSetDialog { * * @see org.eclipse.jface.dialogs.Dialog#cancelPressed() */ - protected void cancelPressed() { + @Override + protected void cancelPressed() { restoreAddedWorkingSets(); restoreChangedWorkingSets(); restoreRemovedWorkingSets(); @@ -142,7 +143,8 @@ public class WorkingSetSelectionDialog extends AbstractWorkingSetDialog { * * @see org.eclipse.jface.window.Window#configureShell(Shell) */ - protected void configureShell(Shell shell) { + @Override + protected void configureShell(Shell shell) { super.configureShell(shell); PlatformUI.getWorkbench().getHelpSystem().setHelp(shell, IWorkbenchHelpContextIds.WORKING_SET_SELECTION_DIALOG); @@ -154,7 +156,8 @@ public class WorkingSetSelectionDialog extends AbstractWorkingSetDialog { * * @see org.eclipse.jface.dialogs.Dialog#createDialogArea(Composite) */ - protected Control createDialogArea(Composite parent) { + @Override + protected Control createDialogArea(Composite parent) { initializeDialogUnits(parent); Composite composite = (Composite) super.createDialogArea(parent); @@ -162,6 +165,7 @@ public class WorkingSetSelectionDialog extends AbstractWorkingSetDialog { createMessageArea(composite); SelectionListener listener = new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { updateButtonAvailability(); } @@ -221,12 +225,14 @@ public class WorkingSetSelectionDialog extends AbstractWorkingSetDialog { listViewer.addFilter(new WorkingSetFilter(getSupportedWorkingSetIds())); listViewer.addSelectionChangedListener(new ISelectionChangedListener() { - public void selectionChanged(SelectionChangedEvent event) { + @Override + public void selectionChanged(SelectionChangedEvent event) { handleSelectionChanged(); } }); listViewer.addDoubleClickListener(new IDoubleClickListener() { - public void doubleClick(DoubleClickEvent event) { + @Override + public void doubleClick(DoubleClickEvent event) { Object obj = ((IStructuredSelection) listViewer.getSelection()) .getFirstElement(); listViewer.setCheckedElements(new Object[] {obj}); @@ -237,6 +243,7 @@ public class WorkingSetSelectionDialog extends AbstractWorkingSetDialog { } }); listViewer.addCheckStateListener(new ICheckStateListener() { + @Override public void checkStateChanged(CheckStateChangedEvent event) { // implicitly select the third radio button buttonWindowSet.setSelection(false); @@ -297,7 +304,8 @@ public class WorkingSetSelectionDialog extends AbstractWorkingSetDialog { * * @see org.eclipse.jface.dialogs.Dialog#createContents(Composite) */ - protected Control createContents(Composite parent) { + @Override + protected Control createContents(Composite parent) { Control control = super.createContents(parent); List selections = getInitialElementSelections(); if (!selections.isEmpty()) { @@ -312,7 +320,8 @@ public class WorkingSetSelectionDialog extends AbstractWorkingSetDialog { * * @return the selected working sets */ - protected List getSelectedWorkingSets() { + @Override + protected List getSelectedWorkingSets() { ISelection selection = listViewer.getSelection(); if (selection instanceof IStructuredSelection) { return ((IStructuredSelection) selection).toList(); @@ -333,7 +342,8 @@ public class WorkingSetSelectionDialog extends AbstractWorkingSetDialog { * * @see org.eclipse.jface.dialogs.Dialog#okPressed() */ - protected void okPressed() { + @Override + protected void okPressed() { if (buttonWindowSet.getSelection()) { IWorkingSet [] windowSet = new IWorkingSet[] {workbenchWindow.getActivePage().getAggregateWorkingSet()}; setSelection(windowSet); @@ -444,16 +454,19 @@ public class WorkingSetSelectionDialog extends AbstractWorkingSetDialog { * * @see org.eclipse.ui.dialogs.IWorkingSetSelectionDialog#setSelection(IWorkingSet[]) */ - public void setSelection(IWorkingSet[] workingSets) { + @Override + public void setSelection(IWorkingSet[] workingSets) { super.setSelection(workingSets); setInitialSelections(workingSets == null ? new Object[0] : workingSets); } + @Override protected void availableWorkingSetsChanged() { listViewer.setInput(PlatformUI.getWorkbench().getWorkingSetManager().getWorkingSets()); super.availableWorkingSetsChanged(); } + @Override protected void selectAllSets() { listViewer.setCheckedElements(PlatformUI.getWorkbench().getWorkingSetManager().getWorkingSets()); // implicitly select the third radio button @@ -463,6 +476,7 @@ public class WorkingSetSelectionDialog extends AbstractWorkingSetDialog { updateButtonAvailability(); } + @Override protected void deselectAllSets() { listViewer.setCheckedElements(new Object[0]); // implicitly select the third radio button diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/WorkingSetTypePage.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/WorkingSetTypePage.java index 9f870f5f663..201aa5b124e 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/WorkingSetTypePage.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/WorkingSetTypePage.java @@ -78,7 +78,8 @@ public class WorkingSetTypePage extends WizardPage { * * @see org.eclipse.jface.wizard.IWizardPage#canFlipToNextPage() */ - public boolean canFlipToNextPage() { + @Override + public boolean canFlipToNextPage() { return isPageComplete(); } @@ -87,7 +88,8 @@ public class WorkingSetTypePage extends WizardPage { * * @see org.eclipse.jface.dialogs.IDialogPage#createControl(Composite) */ - public void createControl(Composite parent) { + @Override + public void createControl(Composite parent) { Font font = parent.getFont(); Composite composite = new Composite(parent, SWT.NULL); composite.setLayout(new GridLayout()); @@ -110,12 +112,14 @@ public class WorkingSetTypePage extends WizardPage { typesListViewer.getTable().setFont(font); typesListViewer .addSelectionChangedListener(new ISelectionChangedListener() { - public void selectionChanged(SelectionChangedEvent event) { + @Override + public void selectionChanged(SelectionChangedEvent event) { handleSelectionChanged(); } }); typesListViewer.addDoubleClickListener(new IDoubleClickListener() { - public void doubleClick(DoubleClickEvent event) { + @Override + public void doubleClick(DoubleClickEvent event) { handleDoubleClick(); } }); @@ -128,6 +132,7 @@ public class WorkingSetTypePage extends WizardPage { * * @see org.eclipse.jface.viewers.LabelProvider#getText(java.lang.Object) */ + @Override public String getText(Object element) { return ((WorkingSetDescriptor)element).getName(); } @@ -135,6 +140,7 @@ public class WorkingSetTypePage extends WizardPage { /* (non-Javadoc) * @see org.eclipse.jface.viewers.BaseLabelProvider#dispose() */ + @Override public void dispose() { images.dispose(); super.dispose(); @@ -145,6 +151,7 @@ public class WorkingSetTypePage extends WizardPage { * * @see org.eclipse.jface.viewers.LabelProvider#getImage(java.lang.Object) */ + @Override public Image getImage(Object element) { ImageDescriptor imageDescriptor = ((WorkingSetDescriptor) element) .getIcon(); @@ -161,7 +168,8 @@ public class WorkingSetTypePage extends WizardPage { * * @see org.eclipse.jface.dialogs.IDialogPage#dispose() */ - public void dispose() { + @Override + public void dispose() { super.dispose(); } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dnd/AbstractDropTarget.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dnd/AbstractDropTarget.java index c7c8d81f0bb..b563874b643 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dnd/AbstractDropTarget.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dnd/AbstractDropTarget.java @@ -19,17 +19,20 @@ public abstract class AbstractDropTarget implements IDropTarget { /* (non-Javadoc) * @see org.eclipse.ui.internal.dnd.IDropTarget#drop() */ - public abstract void drop(); + @Override + public abstract void drop(); /* (non-Javadoc) * @see org.eclipse.ui.internal.dnd.IDropTarget#getCursor() */ - public abstract Cursor getCursor(); + @Override + public abstract Cursor getCursor(); /* (non-Javadoc) * @see org.eclipse.ui.internal.dnd.IDropTarget#getSnapRectangle() */ - public Rectangle getSnapRectangle() { + @Override + public Rectangle getSnapRectangle() { return null; } } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dnd/DragBorder.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dnd/DragBorder.java index 4822a1e3e5e..70d30765b68 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dnd/DragBorder.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dnd/DragBorder.java @@ -69,6 +69,7 @@ public class DragBorder { if (provideFrame) { border.addPaintListener(new PaintListener() { + @Override public void paintControl(PaintEvent e) { if (isHighlight) { e.gc.setForeground(hilightColor); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dnd/DragUtil.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dnd/DragUtil.java index 3f54110e921..d08183900e9 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dnd/DragUtil.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dnd/DragUtil.java @@ -214,9 +214,11 @@ public class DragUtil { tracker.setStippled(true); tracker.addListener(SWT.Move, new Listener() { - public void handleEvent(final Event event) { + @Override + public void handleEvent(final Event event) { display.syncExec(new Runnable() { - public void run() { + @Override + public void run() { // Get the curslor location as a point Point location = new Point(event.x, event.y); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/e4/compatibility/ActionBars.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/e4/compatibility/ActionBars.java index f5c823b4e20..cfb712e90cd 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/e4/compatibility/ActionBars.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/e4/compatibility/ActionBars.java @@ -50,6 +50,7 @@ public class ActionBars extends SubActionBars { * * @see org.eclipse.ui.IActionBars#getMenuManager() */ + @Override public IMenuManager getMenuManager() { if (menuManager == null) { menuManager = new MenuManager(); @@ -63,6 +64,7 @@ public class ActionBars extends SubActionBars { * * @see org.eclipse.ui.IActionBars#getToolBarManager() */ + @Override public IToolBarManager getToolBarManager() { if (toolbarManager == null) { toolbarManager = new ToolBarManager(SWT.FLAT | SWT.RIGHT | SWT.WRAP); @@ -75,6 +77,7 @@ public class ActionBars extends SubActionBars { * * @see org.eclipse.ui.IActionBars#updateActionBars() */ + @Override public void updateActionBars() { // FIXME compat: updateActionBars : should do something useful getStatusLineManager().update(false); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/e4/compatibility/CompatibilityEditor.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/e4/compatibility/CompatibilityEditor.java index 1d3afac2945..3d9b7fe22a9 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/e4/compatibility/CompatibilityEditor.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/e4/compatibility/CompatibilityEditor.java @@ -94,6 +94,7 @@ public class CompatibilityEditor extends CompatibilityPart { ((AbstractMultiEditor) part).setChildren(editors); } + @Override protected boolean createPartControl(final IWorkbenchPart legacyPart, Composite parent) { super.createPartControl(legacyPart, parent); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/e4/compatibility/CompatibilityPart.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/e4/compatibility/CompatibilityPart.java index ff0d8d80fad..15afc7bec15 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/e4/compatibility/CompatibilityPart.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/e4/compatibility/CompatibilityPart.java @@ -81,6 +81,7 @@ public abstract class CompatibilityPart implements ISelectionChangedListener { * This handler will be notified when the part's widget has been un/set. */ private EventHandler widgetSetHandler = new EventHandler() { + @Override public void handleEvent(Event event) { // check that we're looking at our own part and that the widget is // being unset @@ -103,6 +104,7 @@ public abstract class CompatibilityPart implements ISelectionChangedListener { * un/set. */ private EventHandler objectSetHandler = new EventHandler() { + @Override public void handleEvent(Event event) { // check that we're looking at our own part and that the object is // being set @@ -117,6 +119,7 @@ public abstract class CompatibilityPart implements ISelectionChangedListener { private ISelectionChangedListener postListener = new ISelectionChangedListener() { + @Override public void selectionChanged(SelectionChangedEvent e) { ESelectionService selectionService = (ESelectionService) part.getContext().get( ESelectionService.class.getName()); @@ -333,6 +336,7 @@ public abstract class CompatibilityPart implements ISelectionChangedListener { } wrapped.addPropertyListener(new IPropertyListener() { + @Override public void propertyChanged(Object source, int propId) { switch (propId) { case IWorkbenchPartConstants.PROP_TITLE: @@ -407,6 +411,7 @@ public abstract class CompatibilityPart implements ISelectionChangedListener { return part; } + @Override public void selectionChanged(SelectionChangedEvent e) { ESelectionService selectionService = (ESelectionService) part.getContext().get( ESelectionService.class.getName()); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/e4/compatibility/CompatibilityView.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/e4/compatibility/CompatibilityView.java index 38eaf57fc13..dff49523a47 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/e4/compatibility/CompatibilityView.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/e4/compatibility/CompatibilityView.java @@ -202,6 +202,7 @@ public class CompatibilityView extends CompatibilityPart { actionBars.updateActionBars(); final Runnable dispose = new Runnable() { + @Override public void run() { actionBuilder.dispose(); } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/e4/compatibility/ModeledFolderLayout.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/e4/compatibility/ModeledFolderLayout.java index b436e2f6866..8bd308f0f73 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/e4/compatibility/ModeledFolderLayout.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/e4/compatibility/ModeledFolderLayout.java @@ -25,6 +25,7 @@ public class ModeledFolderLayout extends ModeledPlaceholderFolderLayout super(layout, application, stackModel); } + @Override public void addView(String viewId) { MStackElement viewModel = ModeledPageLayout.createViewModel(application, viewId, true, layout.page, diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/e4/compatibility/ModeledPageLayout.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/e4/compatibility/ModeledPageLayout.java index a61095ee06f..b5c34c7343c 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/e4/compatibility/ModeledPageLayout.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/e4/compatibility/ModeledPageLayout.java @@ -109,6 +109,7 @@ public class ModeledPageLayout implements IPageLayout { * org.eclipse.ui.activities.IIdentifierListener#identifierChanged(org * .eclipse.ui.activities.IdentifierEvent) */ + @Override public void identifierChanged(IdentifierEvent identifierEvent) { IIdentifier identifier = identifierEvent.getIdentifier(); @@ -189,39 +190,48 @@ public class ModeledPageLayout implements IPageLayout { return perspModel; } + @Override public void addActionSet(String actionSetId) { perspModel.getTags().add(ACTION_SET_TAG + actionSetId); } + @Override public void addFastView(String viewId) { E4Util.unsupported("addFastView: " + viewId); //$NON-NLS-1$ } + @Override public void addFastView(String viewId, float ratio) { E4Util.unsupported("addFastView: " + viewId); //$NON-NLS-1$ } + @Override public void addNewWizardShortcut(String id) { perspModel.getTags().add(NEW_WIZARD_TAG + id); } + @Override public void addPerspectiveShortcut(String id) { perspModel.getTags().add(PERSP_SHORTCUT_TAG + id); } + @Override public void addPlaceholder(String viewId, int relationship, float ratio, String refId) { insertView(viewId, relationship, ratio, refId, false, true); } + @Override public void addShowInPart(String id) { perspModel.getTags().add(SHOW_IN_PART_TAG + id); } + @Override public void addShowViewShortcut(String id) { perspModel.getTags().add(SHOW_VIEW_TAG + id); } + @Override public void addStandaloneView(String viewId, boolean showTitle, int relationship, float ratio, String refId) { MUIElement newElement = insertView(viewId, relationship, ratio, refId, true, showTitle); @@ -234,6 +244,7 @@ public class ModeledPageLayout implements IPageLayout { } } + @Override public void addStandaloneViewPlaceholder(String viewId, int relationship, float ratio, String refId, boolean showTitle) { MUIElement newElement = insertView(viewId, relationship, ratio, refId, false, showTitle); @@ -246,6 +257,7 @@ public class ModeledPageLayout implements IPageLayout { } } + @Override public void addView(String viewId, int relationship, float ratio, String refId) { insertView(viewId, relationship, ratio, refId, true, true); } @@ -276,6 +288,7 @@ public class ModeledPageLayout implements IPageLayout { identifier.addIdentifierListener(new ViewActivator(element)); } + @Override public IFolderLayout createFolder(String folderId, int relationship, float ratio, String refId) { MPartStack stack = insertStack(folderId, relationship, ratio, refId, @@ -283,6 +296,7 @@ public class ModeledPageLayout implements IPageLayout { return new ModeledFolderLayout(this, application, stack); } + @Override public IPlaceholderFolderLayout createPlaceholderFolder(String folderId, int relationship, float ratio, String refId) { MPartStack Stack = insertStack(folderId, relationship, ratio, refId, @@ -290,6 +304,7 @@ public class ModeledPageLayout implements IPageLayout { return new ModeledPlaceholderFolderLayout(this, application, Stack); } + @Override public IPerspectiveDescriptor getDescriptor() { return descriptor; } @@ -298,14 +313,17 @@ public class ModeledPageLayout implements IPageLayout { return IPageLayout.ID_EDITOR_AREA; } + @Override public String getEditorArea() { return internalGetEditorArea(); } + @Override public int getEditorReuseThreshold() { return -1; } + @Override public IPlaceholderFolderLayout getFolderForView(String id) { MPart view = findPart(perspModel, id); if (view == null) @@ -318,6 +336,7 @@ public class ModeledPageLayout implements IPageLayout { return new ModeledPlaceholderFolderLayout(this, application, (MPartStack) stack); } + @Override public IViewLayout getViewLayout(String id) { MPart view = findPart(perspModel, id); if (view != null) @@ -330,22 +349,27 @@ public class ModeledPageLayout implements IPageLayout { return null; } + @Override public boolean isEditorAreaVisible() { return true; } + @Override public boolean isFixed() { return false; } + @Override public void setEditorAreaVisible(boolean showEditorArea) { eaRef.setToBeRendered(showEditorArea); } + @Override public void setEditorReuseThreshold(int openEditors) { // ignored, no-op, same as 3.x implementation } + @Override public void setFixed(boolean isFixed) { // perspModel.setFixed(isFixed); } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/e4/compatibility/ModeledPlaceholderFolderLayout.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/e4/compatibility/ModeledPlaceholderFolderLayout.java index b0fb91ae569..866c7d11359 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/e4/compatibility/ModeledPlaceholderFolderLayout.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/e4/compatibility/ModeledPlaceholderFolderLayout.java @@ -33,6 +33,7 @@ public class ModeledPlaceholderFolderLayout implements IPlaceholderFolderLayout layout = l; } + @Override public void addPlaceholder(String viewId) { boolean containsWildcards = viewId.indexOf('?') != -1; if (containsWildcards) { @@ -47,11 +48,13 @@ public class ModeledPlaceholderFolderLayout implements IPlaceholderFolderLayout } } + @Override public String getProperty(String id) { Object propVal = null; return propVal == null ? "" : propVal.toString(); //$NON-NLS-1$ } + @Override public void setProperty(String id, String value) { // folderModel.setProperty(id, value); } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/e4/compatibility/ModeledViewLayout.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/e4/compatibility/ModeledViewLayout.java index f36aaad523f..c1f7de73fe2 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/e4/compatibility/ModeledViewLayout.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/e4/compatibility/ModeledViewLayout.java @@ -29,23 +29,28 @@ public class ModeledViewLayout implements IViewLayout { viewME = placeholder; } + @Override public boolean getShowTitle() { return !viewME.getTags().contains(IPresentationEngine.NO_TITLE); } + @Override public boolean isCloseable() { return !viewME.getTags().contains(IPresentationEngine.NO_CLOSE); } + @Override public boolean isMoveable() { return !viewME.getTags().contains(IPresentationEngine.NO_MOVE); } + @Override public boolean isStandalone() { MUIElement parentElement = viewME.getParent(); return !(parentElement instanceof MPartStack); } + @Override public void setCloseable(boolean closeable) { if (closeable) viewME.getTags().remove(IPresentationEngine.NO_CLOSE); @@ -53,6 +58,7 @@ public class ModeledViewLayout implements IViewLayout { viewME.getTags().add(IPresentationEngine.NO_CLOSE); } + @Override public void setMoveable(boolean moveable) { if (moveable) viewME.getTags().remove(IPresentationEngine.NO_MOVE); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/e4/compatibility/SelectionService.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/e4/compatibility/SelectionService.java index 8372f0cb920..089177af212 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/e4/compatibility/SelectionService.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/e4/compatibility/SelectionService.java @@ -60,6 +60,7 @@ public class SelectionService implements ISelectionChangedListener, ISelectionSe private Map<String, Set<ISelectionListener>> targetedPostSelectionListeners = new HashMap<String, Set<ISelectionListener>>(); private org.eclipse.e4.ui.workbench.modeling.ISelectionListener listener = new org.eclipse.e4.ui.workbench.modeling.ISelectionListener() { + @Override public void selectionChanged(MPart part, Object selection) { selection = createCompatibilitySelection(selection); context.set(ISources.ACTIVE_CURRENT_SELECTION_NAME, selection); @@ -78,6 +79,7 @@ public class SelectionService implements ISelectionChangedListener, ISelectionSe }; private org.eclipse.e4.ui.workbench.modeling.ISelectionListener postListener = new org.eclipse.e4.ui.workbench.modeling.ISelectionListener() { + @Override public void selectionChanged(MPart part, Object selection) { selection = createCompatibilitySelection(selection); @@ -199,6 +201,7 @@ public class SelectionService implements ISelectionChangedListener, ISelectionSe * org.eclipse.ui.ISelectionService#addSelectionListener(org.eclipse.ui. * ISelectionListener) */ + @Override public void addSelectionListener(ISelectionListener listener) { listeners.add(listener); } @@ -210,6 +213,7 @@ public class SelectionService implements ISelectionChangedListener, ISelectionSe * org.eclipse.ui.ISelectionService#addSelectionListener(java.lang.String, * org.eclipse.ui.ISelectionListener) */ + @Override public void addSelectionListener(String partId, ISelectionListener listener) { Set<ISelectionListener> listeners = targetedListeners.get(partId); if (listeners == null) { @@ -226,6 +230,7 @@ public class SelectionService implements ISelectionChangedListener, ISelectionSe * org.eclipse.ui.ISelectionService#addPostSelectionListener(org.eclipse * .ui.ISelectionListener) */ + @Override public void addPostSelectionListener(ISelectionListener listener) { postSelectionListeners.add(listener); } @@ -237,6 +242,7 @@ public class SelectionService implements ISelectionChangedListener, ISelectionSe * org.eclipse.ui.ISelectionService#addPostSelectionListener(java.lang.String * , org.eclipse.ui.ISelectionListener) */ + @Override public void addPostSelectionListener(String partId, ISelectionListener listener) { Set<ISelectionListener> listeners = targetedPostSelectionListeners.get(partId); if (listeners == null) { @@ -251,6 +257,7 @@ public class SelectionService implements ISelectionChangedListener, ISelectionSe * * @see org.eclipse.ui.ISelectionService#getSelection() */ + @Override public ISelection getSelection() { if (activePart != null) { // get the selection from the active part @@ -270,6 +277,7 @@ public class SelectionService implements ISelectionChangedListener, ISelectionSe * * @see org.eclipse.ui.ISelectionService#getSelection(java.lang.String) */ + @Override public ISelection getSelection(String partId) { Object selection = selectionService.getSelection(partId); if (selection == null || selection instanceof ISelection) { @@ -285,6 +293,7 @@ public class SelectionService implements ISelectionChangedListener, ISelectionSe * org.eclipse.ui.ISelectionService#removeSelectionListener(org.eclipse. * ui.ISelectionListener) */ + @Override public void removeSelectionListener(ISelectionListener listener) { listeners.remove(listener); } @@ -296,6 +305,7 @@ public class SelectionService implements ISelectionChangedListener, ISelectionSe * org.eclipse.ui.ISelectionService#removeSelectionListener(java.lang.String * , org.eclipse.ui.ISelectionListener) */ + @Override public void removeSelectionListener(String partId, ISelectionListener listener) { Set<ISelectionListener> listeners = targetedListeners.get(partId); if (listeners != null) { @@ -310,6 +320,7 @@ public class SelectionService implements ISelectionChangedListener, ISelectionSe * org.eclipse.ui.ISelectionService#removePostSelectionListener(org.eclipse * .ui.ISelectionListener) */ + @Override public void removePostSelectionListener(ISelectionListener listener) { postSelectionListeners.remove(listener); } @@ -321,6 +332,7 @@ public class SelectionService implements ISelectionChangedListener, ISelectionSe * org.eclipse.ui.ISelectionService#removePostSelectionListener(java.lang * .String, org.eclipse.ui.ISelectionListener) */ + @Override public void removePostSelectionListener(String partId, ISelectionListener listener) { Set<ISelectionListener> listeners = targetedPostSelectionListeners.get(partId); if (listeners != null) { @@ -335,6 +347,7 @@ public class SelectionService implements ISelectionChangedListener, ISelectionSe * org.eclipse.jface.viewers.ISelectionChangedListener#selectionChanged( * org.eclipse.jface.viewers.SelectionChangedEvent) */ + @Override public void selectionChanged(SelectionChangedEvent e) { MPart part = page.findPart(activePart); ESelectionService selectionService = (ESelectionService) part.getContext().get( diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/expressions/ActivePartExpression.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/expressions/ActivePartExpression.java index ef9d18a3cd0..ecdb0202ac0 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/expressions/ActivePartExpression.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/expressions/ActivePartExpression.java @@ -57,14 +57,17 @@ public final class ActivePartExpression extends Expression { this.activePart = activePart; } + @Override public final void collectExpressionInfo(final ExpressionInfo info) { info.addVariableNameAccess(ISources.ACTIVE_PART_NAME); } + @Override protected final int computeHashCode() { return HASH_INITIAL * HASH_FACTOR + hashCode(activePart); } + @Override public final boolean equals(final Object object) { if (object instanceof ActivePartExpression) { final ActivePartExpression that = (ActivePartExpression) object; @@ -74,6 +77,7 @@ public final class ActivePartExpression extends Expression { return false; } + @Override public final EvaluationResult evaluate(final IEvaluationContext context) { final Object variable = context.getVariable(ISources.ACTIVE_PART_NAME); if (equals(activePart, variable)) { @@ -82,6 +86,7 @@ public final class ActivePartExpression extends Expression { return EvaluationResult.FALSE; } + @Override public final String toString() { final StringBuffer buffer = new StringBuffer(); buffer.append("ActivePartExpression("); //$NON-NLS-1$ diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/expressions/AlwaysEnabledExpression.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/expressions/AlwaysEnabledExpression.java index 29b23e1df27..24e5b5c4d9a 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/expressions/AlwaysEnabledExpression.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/expressions/AlwaysEnabledExpression.java @@ -38,6 +38,7 @@ public final class AlwaysEnabledExpression extends Expression { * * @see org.eclipse.core.expressions.Expression#evaluate(org.eclipse.core.expressions.IEvaluationContext) */ + @Override public EvaluationResult evaluate(IEvaluationContext context) { return EvaluationResult.TRUE; } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/expressions/AndExpression.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/expressions/AndExpression.java index 76c78669576..d928037bb76 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/expressions/AndExpression.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/expressions/AndExpression.java @@ -28,10 +28,12 @@ public final class AndExpression extends CompositeExpression { private static final int HASH_INITIAL = AndExpression.class.getName() .hashCode(); + @Override protected final int computeHashCode() { return HASH_INITIAL * HASH_FACTOR + hashCode(fExpressions); } + @Override public final boolean equals(final Object object) { if (object instanceof AndExpression) { final AndExpression that = (AndExpression) object; @@ -41,11 +43,13 @@ public final class AndExpression extends CompositeExpression { return false; } + @Override public final EvaluationResult evaluate(final IEvaluationContext context) throws CoreException { return evaluateAnd(context); } + @Override public final String toString() { final StringBuffer buffer = new StringBuffer(); buffer.append("AndExpression("); //$NON-NLS-1$ diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/expressions/CompositeExpression.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/expressions/CompositeExpression.java index fcdacc5fd70..b05f9320e70 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/expressions/CompositeExpression.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/expressions/CompositeExpression.java @@ -78,6 +78,7 @@ public abstract class CompositeExpression extends Expression { return result; } + @Override public void collectExpressionInfo(ExpressionInfo info) { if (fExpressions == null) { return; diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/expressions/LegacyActionExpressionWrapper.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/expressions/LegacyActionExpressionWrapper.java index f1e3faee802..2a8bcb6fdf4 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/expressions/LegacyActionExpressionWrapper.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/expressions/LegacyActionExpressionWrapper.java @@ -68,17 +68,20 @@ public final class LegacyActionExpressionWrapper extends this.expression = expression; } + @Override public final void collectExpressionInfo(final ExpressionInfo info) { super.collectExpressionInfo(info); info.markDefaultVariableAccessed(); } + @Override protected final int computeHashCode() { int hashCode = HASH_INITIAL * HASH_FACTOR + hashCode(getWindow()); hashCode = hashCode * HASH_FACTOR + hashCode(expression); return hashCode; } + @Override public final boolean equals(final Object object) { if (object instanceof LegacyActionExpressionWrapper) { final LegacyActionExpressionWrapper that = (LegacyActionExpressionWrapper) object; @@ -89,6 +92,7 @@ public final class LegacyActionExpressionWrapper extends return false; } + @Override public final EvaluationResult evaluate(final IEvaluationContext context) throws CoreException { final EvaluationResult result = super.evaluate(context); @@ -110,6 +114,7 @@ public final class LegacyActionExpressionWrapper extends return EvaluationResult.FALSE; } + @Override public final String toString() { final StringBuffer buffer = new StringBuffer(); buffer.append("LegacyActionExpressionWrapper("); //$NON-NLS-1$ diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/expressions/LegacyActionSetExpression.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/expressions/LegacyActionSetExpression.java index 3afc7186dee..3213152713b 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/expressions/LegacyActionSetExpression.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/expressions/LegacyActionSetExpression.java @@ -67,6 +67,7 @@ public final class LegacyActionSetExpression extends WorkbenchWindowExpression { this.actionSetId = actionSetId; } + @Override public final void collectExpressionInfo(final ExpressionInfo info) { super.collectExpressionInfo(info); info.addVariableNameAccess(ISources.ACTIVE_CONTEXT_NAME); @@ -78,6 +79,7 @@ public final class LegacyActionSetExpression extends WorkbenchWindowExpression { return hashCode; } + @Override public final boolean equals(final Object object) { if (object instanceof LegacyActionSetExpression) { final LegacyActionSetExpression that = (LegacyActionSetExpression) object; @@ -88,6 +90,7 @@ public final class LegacyActionSetExpression extends WorkbenchWindowExpression { return false; } + @Override public final EvaluationResult evaluate(final IEvaluationContext context) throws CoreException { final EvaluationResult result = super.evaluate(context); @@ -102,6 +105,7 @@ public final class LegacyActionSetExpression extends WorkbenchWindowExpression { return EvaluationResult.FALSE; } + @Override public final String toString() { final StringBuffer buffer = new StringBuffer(); buffer.append("ActionSetExpression("); //$NON-NLS-1$ diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/expressions/LegacyEditorActionBarExpression.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/expressions/LegacyEditorActionBarExpression.java index c1a7c59df67..01f7756cc71 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/expressions/LegacyEditorActionBarExpression.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/expressions/LegacyEditorActionBarExpression.java @@ -59,17 +59,20 @@ public class LegacyEditorActionBarExpression extends Expression { activeEditorId = editorId; } + @Override public final void collectExpressionInfo(final ExpressionInfo info) { info.addVariableNameAccess(ISources.ACTIVE_PART_ID_NAME); info .addVariableNameAccess(SourcePriorityNameMapping.LEGACY_LEGACY_NAME); } + @Override protected final int computeHashCode() { int hashCode = HASH_INITIAL * HASH_FACTOR + hashCode(activeEditorId); return hashCode; } + @Override public final boolean equals(final Object object) { if (object instanceof LegacyEditorActionBarExpression) { final LegacyEditorActionBarExpression that = (LegacyEditorActionBarExpression) object; @@ -84,6 +87,7 @@ public class LegacyEditorActionBarExpression extends Expression { * * @see org.eclipse.core.expressions.Expression#evaluate(org.eclipse.core.expressions.IEvaluationContext) */ + @Override public final EvaluationResult evaluate(final IEvaluationContext context) { final Object variable = context .getVariable(ISources.ACTIVE_PART_ID_NAME); @@ -93,6 +97,7 @@ public class LegacyEditorActionBarExpression extends Expression { return EvaluationResult.FALSE; } + @Override public final String toString() { final StringBuffer buffer = new StringBuffer(); buffer.append("LegacyEditorActionBarExpression("); //$NON-NLS-1$ diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/expressions/LegacyEditorContributionExpression.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/expressions/LegacyEditorContributionExpression.java index f41733b0955..89ad617a046 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/expressions/LegacyEditorContributionExpression.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/expressions/LegacyEditorContributionExpression.java @@ -67,17 +67,20 @@ public final class LegacyEditorContributionExpression extends this.activeEditorId = activeEditorId; } + @Override public final void collectExpressionInfo(final ExpressionInfo info) { super.collectExpressionInfo(info); info.addVariableNameAccess(ISources.ACTIVE_PART_ID_NAME); } + @Override protected final int computeHashCode() { int hashCode = HASH_INITIAL * HASH_FACTOR + hashCode(getWindow()); hashCode = hashCode * HASH_FACTOR + hashCode(activeEditorId); return hashCode; } + @Override public final boolean equals(final Object object) { if (object instanceof LegacyEditorContributionExpression) { final LegacyEditorContributionExpression that = (LegacyEditorContributionExpression) object; @@ -88,6 +91,7 @@ public final class LegacyEditorContributionExpression extends return false; } + @Override public final EvaluationResult evaluate(final IEvaluationContext context) throws CoreException { final EvaluationResult result = super.evaluate(context); @@ -103,6 +107,7 @@ public final class LegacyEditorContributionExpression extends return EvaluationResult.FALSE; } + @Override public final String toString() { final StringBuffer buffer = new StringBuffer(); buffer.append("LegacyEditorContributionExpression("); //$NON-NLS-1$ diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/expressions/LegacySelectionEnablerWrapper.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/expressions/LegacySelectionEnablerWrapper.java index f7da038deae..07807a25610 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/expressions/LegacySelectionEnablerWrapper.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/expressions/LegacySelectionEnablerWrapper.java @@ -67,17 +67,20 @@ public final class LegacySelectionEnablerWrapper extends this.enabler = enabler; } + @Override public final void collectExpressionInfo(final ExpressionInfo info) { super.collectExpressionInfo(info); info.markDefaultVariableAccessed(); } + @Override protected final int computeHashCode() { int hashCode = HASH_INITIAL * HASH_FACTOR + hashCode(getWindow()); hashCode = hashCode * HASH_FACTOR + hashCode(enabler); return hashCode; } + @Override public final boolean equals(final Object object) { if (object instanceof LegacySelectionEnablerWrapper) { final LegacySelectionEnablerWrapper that = (LegacySelectionEnablerWrapper) object; @@ -88,6 +91,7 @@ public final class LegacySelectionEnablerWrapper extends return false; } + @Override public final EvaluationResult evaluate(final IEvaluationContext context) throws CoreException { final EvaluationResult result = super.evaluate(context); @@ -107,6 +111,7 @@ public final class LegacySelectionEnablerWrapper extends return EvaluationResult.FALSE; } + @Override public final String toString() { final StringBuffer buffer = new StringBuffer(); buffer.append("LegacySelectionEnablerWrapper("); //$NON-NLS-1$ diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/expressions/LegacyViewContributionExpression.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/expressions/LegacyViewContributionExpression.java index 929c2ed819b..47aa030cb26 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/expressions/LegacyViewContributionExpression.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/expressions/LegacyViewContributionExpression.java @@ -67,17 +67,20 @@ public final class LegacyViewContributionExpression extends this.activePartId = activePartId; } + @Override public final void collectExpressionInfo(final ExpressionInfo info) { super.collectExpressionInfo(info); info.addVariableNameAccess(ISources.ACTIVE_PART_ID_NAME); } + @Override protected final int computeHashCode() { int hashCode = HASH_INITIAL * HASH_FACTOR + hashCode(getWindow()); hashCode = hashCode * HASH_FACTOR + hashCode(activePartId); return hashCode; } + @Override public final boolean equals(final Object object) { if (object instanceof LegacyViewContributionExpression) { final LegacyViewContributionExpression that = (LegacyViewContributionExpression) object; @@ -88,6 +91,7 @@ public final class LegacyViewContributionExpression extends return false; } + @Override public final EvaluationResult evaluate(final IEvaluationContext context) throws CoreException { final EvaluationResult result = super.evaluate(context); @@ -103,6 +107,7 @@ public final class LegacyViewContributionExpression extends return EvaluationResult.FALSE; } + @Override public final String toString() { final StringBuffer buffer = new StringBuffer(); buffer.append("LegacyViewContributionExpression("); //$NON-NLS-1$ diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/expressions/LegacyViewerContributionExpression.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/expressions/LegacyViewerContributionExpression.java index 3bfe7131576..d844d2e1279 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/expressions/LegacyViewerContributionExpression.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/expressions/LegacyViewerContributionExpression.java @@ -82,6 +82,7 @@ public final class LegacyViewerContributionExpression extends this.expression = childExpression; } + @Override public final void collectExpressionInfo(final ExpressionInfo info) { super.collectExpressionInfo(info); info.addVariableNameAccess(ISources.ACTIVE_MENU_NAME); @@ -90,6 +91,7 @@ public final class LegacyViewerContributionExpression extends } } + @Override protected final int computeHashCode() { int hashCode = HASH_INITIAL * HASH_FACTOR + hashCode(getWindow()); hashCode = hashCode * HASH_FACTOR + hashCode(expression); @@ -97,6 +99,7 @@ public final class LegacyViewerContributionExpression extends return hashCode; } + @Override public final boolean equals(final Object object) { if (object instanceof LegacyViewerContributionExpression) { final LegacyViewerContributionExpression that = (LegacyViewerContributionExpression) object; @@ -108,6 +111,7 @@ public final class LegacyViewerContributionExpression extends return false; } + @Override public final EvaluationResult evaluate(final IEvaluationContext context) throws CoreException { final EvaluationResult result = super.evaluate(context); @@ -139,6 +143,7 @@ public final class LegacyViewerContributionExpression extends return EvaluationResult.FALSE; } + @Override public final String toString() { final StringBuffer buffer = new StringBuffer(); buffer.append("ViewerContributionExpression("); //$NON-NLS-1$ diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/expressions/WorkbenchWindowExpression.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/expressions/WorkbenchWindowExpression.java index a55bb3aa146..9df715b43fe 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/expressions/WorkbenchWindowExpression.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/expressions/WorkbenchWindowExpression.java @@ -54,16 +54,19 @@ public class WorkbenchWindowExpression extends Expression { this.window = window; } + @Override public void collectExpressionInfo(final ExpressionInfo info) { if (window != null) { info.addVariableNameAccess(ISources.ACTIVE_WORKBENCH_WINDOW_NAME); } } + @Override protected int computeHashCode() { return HASH_INITIAL * HASH_FACTOR + hashCode(window); } + @Override public boolean equals(final Object object) { if (object instanceof WorkbenchWindowExpression) { final WorkbenchWindowExpression that = (WorkbenchWindowExpression) object; @@ -73,6 +76,7 @@ public class WorkbenchWindowExpression extends Expression { return false; } + @Override public EvaluationResult evaluate(final IEvaluationContext context) throws CoreException { if (window != null) { @@ -96,6 +100,7 @@ public class WorkbenchWindowExpression extends Expression { return window; } + @Override public String toString() { final StringBuffer buffer = new StringBuffer(); buffer.append("WorkbenchWindowExpression("); //$NON-NLS-1$ diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/AbstractSaveHandler.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/AbstractSaveHandler.java index 6fad0c3fad1..14e18ec18b1 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/AbstractSaveHandler.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/AbstractSaveHandler.java @@ -38,9 +38,11 @@ public abstract class AbstractSaveHandler extends AbstractEvaluationHandler { dirtyStateTracker = new DirtyStateTracker(); } + @Override protected Expression getEnabledWhenExpression() { if (enabledWhen == null) { enabledWhen = new Expression() { + @Override public EvaluationResult evaluate(IEvaluationContext context) { return AbstractSaveHandler.this.evaluate(context); } @@ -50,6 +52,7 @@ public abstract class AbstractSaveHandler extends AbstractEvaluationHandler { * * @see org.eclipse.core.expressions.Expression#collectExpressionInfo(org.eclipse.core.expressions.ExpressionInfo) */ + @Override public void collectExpressionInfo(ExpressionInfo info) { info.addVariableNameAccess(ISources.ACTIVE_PART_NAME); } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/ActionCommandMappingService.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/ActionCommandMappingService.java index bb96d7977ce..9fbe066c195 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/ActionCommandMappingService.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/ActionCommandMappingService.java @@ -38,6 +38,7 @@ public final class ActionCommandMappingService implements */ private final Map mapping = new HashMap(); + @Override public final String getCommandId(final String actionId) { if (actionId == null) { throw new NullPointerException( @@ -47,6 +48,7 @@ public final class ActionCommandMappingService implements return (String) mapping.get(actionId); } + @Override public final void map(final String actionId, final String commandId) { if (actionId == null) { throw new NullPointerException("The action id cannot be null"); //$NON-NLS-1$ @@ -59,6 +61,7 @@ public final class ActionCommandMappingService implements mapping.put(actionId, commandId); } + @Override public final String getGeneratedCommandId(String targetId, String actionId) { return IWorkbenchRegistryConstants.AUTOGENERATED_PREFIX + targetId + '/' + actionId; diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/ActionDelegateHandlerProxy.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/ActionDelegateHandlerProxy.java index 3390d6871fa..1db110c63ef 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/ActionDelegateHandlerProxy.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/ActionDelegateHandlerProxy.java @@ -223,6 +223,7 @@ public final class ActionDelegateHandlerProxy implements ISelectionListener, this.viewId = viewId; } + @Override public final void addHandlerListener(final IHandlerListener handlerListener) { if (listenerList == null) { listenerList = new ListenerList(ListenerList.IDENTITY); @@ -231,12 +232,14 @@ public final class ActionDelegateHandlerProxy implements ISelectionListener, listenerList.add(handlerListener); } + @Override public void addState(String id, State state) { // TODO Auto-generated method stub } + @Override public final void dispose() { disposeDelegate(); } @@ -261,6 +264,7 @@ public final class ActionDelegateHandlerProxy implements ISelectionListener, currentSelection = null; } + @Override public final Object execute(final ExecutionEvent event) { final IAction action = getAction(); if (loadDelegate() && (action != null)) { @@ -396,6 +400,7 @@ public final class ActionDelegateHandlerProxy implements ISelectionListener, action = new CommandLegacyActionWrapper(actionId, command, style, window); action.addPropertyChangeListener(new IPropertyChangeListener() { + @Override public final void propertyChange(final PropertyChangeEvent event) { // TODO Update the state somehow. } @@ -414,11 +419,13 @@ public final class ActionDelegateHandlerProxy implements ISelectionListener, return delegate; } + @Override public State getState(String stateId) { // TODO Auto-generated method stub return null; } + @Override public String[] getStateIds() { // TODO Auto-generated method stub return null; @@ -455,10 +462,12 @@ public final class ActionDelegateHandlerProxy implements ISelectionListener, // Initialize the delegate. final ISafeRunnable runnable = new ISafeRunnable() { + @Override public final void handleException(final Throwable exception) { // Do nothing. } + @Override public final void run() { // Handle IActionDelegate2 if (delegate instanceof IActionDelegate2) { @@ -489,6 +498,7 @@ public final class ActionDelegateHandlerProxy implements ISelectionListener, /* (non-Javadoc) * @see org.eclipse.core.commands.IHandler2#setEnabled(java.lang.Object) */ + @Override public void setEnabled(Object evaluationContext) { if (!(evaluationContext instanceof IEvaluationContext)) { return; @@ -522,10 +532,12 @@ public final class ActionDelegateHandlerProxy implements ISelectionListener, updateDelegate(action, context); } + @Override public final boolean isEnabled() { return (action == null) || action.isEnabledDisregardingCommand(); } + @Override public final boolean isHandled() { return true; } @@ -643,6 +655,7 @@ public final class ActionDelegateHandlerProxy implements ISelectionListener, } } + @Override public void removeHandlerListener(IHandlerListener handlerListener) { if (listenerList != null) { listenerList.remove(handlerListener); @@ -653,6 +666,7 @@ public final class ActionDelegateHandlerProxy implements ISelectionListener, } } + @Override public void removeState(String stateId) { // TODO Auto-generated method stub @@ -678,17 +692,20 @@ public final class ActionDelegateHandlerProxy implements ISelectionListener, refreshEnablement(); } + @Override public final void selectionChanged(final IWorkbenchPart part, final ISelection selection) { selectionChanged(selection); } + @Override public final void selectionChanged(final SelectionChangedEvent event) { final ISelection selection = event.getSelection(); selectionChanged(selection); } + @Override public final String toString() { final StringBuffer buffer = new StringBuffer(); buffer.append("ActionDelegateHandlerProxy("); //$NON-NLS-1$ @@ -710,18 +727,21 @@ public final class ActionDelegateHandlerProxy implements ISelectionListener, /* (non-Javadoc) * @see org.eclipse.ui.IPartListener2#partActivated(org.eclipse.ui.IWorkbenchPartReference) */ + @Override public void partActivated(IWorkbenchPartReference partRef) { } /* (non-Javadoc) * @see org.eclipse.ui.IPartListener2#partBroughtToTop(org.eclipse.ui.IWorkbenchPartReference) */ + @Override public void partBroughtToTop(IWorkbenchPartReference partRef) { } /* (non-Javadoc) * @see org.eclipse.ui.IPartListener2#partClosed(org.eclipse.ui.IWorkbenchPartReference) */ + @Override public void partClosed(IWorkbenchPartReference partRef) { if (currentPart != null && partRef.getPart(false) == currentPart) { updateActivePart(null); @@ -731,30 +751,35 @@ public final class ActionDelegateHandlerProxy implements ISelectionListener, /* (non-Javadoc) * @see org.eclipse.ui.IPartListener2#partDeactivated(org.eclipse.ui.IWorkbenchPartReference) */ + @Override public void partDeactivated(IWorkbenchPartReference partRef) { } /* (non-Javadoc) * @see org.eclipse.ui.IPartListener2#partHidden(org.eclipse.ui.IWorkbenchPartReference) */ + @Override public void partHidden(IWorkbenchPartReference partRef) { } /* (non-Javadoc) * @see org.eclipse.ui.IPartListener2#partInputChanged(org.eclipse.ui.IWorkbenchPartReference) */ + @Override public void partInputChanged(IWorkbenchPartReference partRef) { } /* (non-Javadoc) * @see org.eclipse.ui.IPartListener2#partOpened(org.eclipse.ui.IWorkbenchPartReference) */ + @Override public void partOpened(IWorkbenchPartReference partRef) { } /* (non-Javadoc) * @see org.eclipse.ui.IPartListener2#partVisible(org.eclipse.ui.IWorkbenchPartReference) */ + @Override public void partVisible(IWorkbenchPartReference partRef) { } } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/ActiveContextInfoHandler.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/ActiveContextInfoHandler.java index 0fa44286357..a788a3d4716 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/ActiveContextInfoHandler.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/ActiveContextInfoHandler.java @@ -23,6 +23,7 @@ public class ActiveContextInfoHandler extends AbstractHandler { /* (non-Javadoc) * @see org.eclipse.core.commands.IHandler#execute(org.eclipse.core.commands.ExecutionEvent) */ + @Override public Object execute(ExecutionEvent event) throws ExecutionException { final IWorkbenchPart part = HandlerUtil.getActivePartChecked(event); EContextService service = (EContextService) part.getSite() diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/CloseAllPerspectivesHandler.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/CloseAllPerspectivesHandler.java index a0272a51b2b..c8e639bcd50 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/CloseAllPerspectivesHandler.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/CloseAllPerspectivesHandler.java @@ -24,6 +24,7 @@ import org.eclipse.ui.handlers.HandlerUtil; */ public class CloseAllPerspectivesHandler extends AbstractHandler { + @Override public Object execute(ExecutionEvent event) throws ExecutionException { IWorkbenchWindow window = HandlerUtil.getActiveWorkbenchWindow(event); if (window != null) { diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/ClosePartHandler.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/ClosePartHandler.java index f875072bca0..395a6dd3efd 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/ClosePartHandler.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/ClosePartHandler.java @@ -33,6 +33,7 @@ public class ClosePartHandler extends AbstractHandler { * * @see org.eclipse.core.commands.IHandler#execute(org.eclipse.core.commands.ExecutionEvent) */ + @Override public Object execute(ExecutionEvent event) throws ExecutionException { IWorkbenchPart part = HandlerUtil.getActivePartChecked(event); IWorkbenchWindow window = HandlerUtil.getActiveWorkbenchWindowChecked(event); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/ClosePerspectiveHandler.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/ClosePerspectiveHandler.java index 473201bbfe4..2bc022f4845 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/ClosePerspectiveHandler.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/ClosePerspectiveHandler.java @@ -25,6 +25,7 @@ import org.eclipse.ui.internal.e4.compatibility.E4Util; public class ClosePerspectiveHandler extends AbstractHandler { + @Override public Object execute(ExecutionEvent event) throws ExecutionException { IWorkbenchWindow activeWorkbenchWindow = HandlerUtil .getActiveWorkbenchWindow(event); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/CommandLegacyActionWrapper.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/CommandLegacyActionWrapper.java index 49710965d9a..81f1ff766d4 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/CommandLegacyActionWrapper.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/CommandLegacyActionWrapper.java @@ -70,6 +70,7 @@ public final class CommandLegacyActionWrapper extends AbstractAction { * the property change event mechanism. */ private final class CommandListener implements ICommandListener { + @Override public final void commandChanged(final CommandEvent commandEvent) { final Command baseCommand = commandEvent.getCommand(); @@ -184,6 +185,7 @@ public final class CommandLegacyActionWrapper extends AbstractAction { command.getCommand().addCommandListener(commandListener); } + @Override public final int getAccelerator() { final String commandId = getActionDefinitionId(); final IBindingService bindingService = (IBindingService) serviceLocator @@ -202,10 +204,12 @@ public final class CommandLegacyActionWrapper extends AbstractAction { return 0; } + @Override public final String getActionDefinitionId() { return command.getId(); } + @Override public final String getDescription() { try { return command.getCommand().getDescription(); @@ -214,6 +218,7 @@ public final class CommandLegacyActionWrapper extends AbstractAction { } } + @Override public final ImageDescriptor getDisabledImageDescriptor() { final String commandId = getActionDefinitionId(); final ICommandImageService commandImageService = (ICommandImageService) serviceLocator @@ -222,11 +227,13 @@ public final class CommandLegacyActionWrapper extends AbstractAction { CommandImageManager.TYPE_DISABLED, style); } + @Override public final HelpListener getHelpListener() { // TODO Help. Addressing help on commands. return null; } + @Override public final ImageDescriptor getHoverImageDescriptor() { final String commandId = getActionDefinitionId(); final ICommandImageService commandImageService = (ICommandImageService) serviceLocator @@ -235,10 +242,12 @@ public final class CommandLegacyActionWrapper extends AbstractAction { CommandImageManager.TYPE_HOVER, style); } + @Override public final String getId() { return id; } + @Override public final ImageDescriptor getImageDescriptor() { final String commandId = getActionDefinitionId(); final ICommandImageService commandImageService = (ICommandImageService) serviceLocator @@ -246,11 +255,13 @@ public final class CommandLegacyActionWrapper extends AbstractAction { return commandImageService.getImageDescriptor(commandId, style); } + @Override public final IMenuCreator getMenuCreator() { // TODO Pulldown. What kind of callback is needed here? return null; } + @Override public final int getStyle() { // TODO Pulldown. This does not currently support the pulldown style. final State state = command.getCommand().getState(IMenuStateIds.STYLE); @@ -263,6 +274,7 @@ public final class CommandLegacyActionWrapper extends AbstractAction { return IAction.AS_PUSH_BUTTON; } + @Override public final String getText() { try { return command.getName(); @@ -271,10 +283,12 @@ public final class CommandLegacyActionWrapper extends AbstractAction { } } + @Override public final String getToolTipText() { return getDescription(); } + @Override public final boolean isChecked() { final State state = command.getCommand().getState(IMenuStateIds.STYLE); if (state instanceof ToggleState) { @@ -285,6 +299,7 @@ public final class CommandLegacyActionWrapper extends AbstractAction { return false; } + @Override public final boolean isEnabled() { return isEnabledDisregardingCommand(); } @@ -305,15 +320,18 @@ public final class CommandLegacyActionWrapper extends AbstractAction { return enabled; } + @Override public final boolean isHandled() { final Command baseCommand = command.getCommand(); return baseCommand.isHandled(); } + @Override public final void run() { runWithEvent(null); } + @Override public final void runWithEvent(final Event event) { final Command baseCommand = command.getCommand(); final ExecutionEvent executionEvent = new ExecutionEvent(command @@ -332,10 +350,12 @@ public final class CommandLegacyActionWrapper extends AbstractAction { } } + @Override public final void setAccelerator(final int keycode) { // TODO Binding. This is hopefully not essential. } + @Override public final void setActionDefinitionId(final String id) { // Get the old values. final boolean oldChecked = isChecked(); @@ -416,6 +436,7 @@ public final class CommandLegacyActionWrapper extends AbstractAction { } } + @Override public final void setChecked(final boolean checked) { final State state = command.getCommand().getState(IMenuStateIds.STYLE); if (state instanceof ToggleState) { @@ -430,6 +451,7 @@ public final class CommandLegacyActionWrapper extends AbstractAction { } } + @Override public final void setDescription(final String text) { final State state = command.getCommand().getState( INamedHandleStateIds.DESCRIPTION); @@ -441,6 +463,7 @@ public final class CommandLegacyActionWrapper extends AbstractAction { } } + @Override public final void setDisabledImageDescriptor(final ImageDescriptor newImage) { final String commandId = getActionDefinitionId(); final int type = CommandImageManager.TYPE_DISABLED; @@ -452,6 +475,7 @@ public final class CommandLegacyActionWrapper extends AbstractAction { } } + @Override public final void setEnabled(final boolean enabled) { if (enabled != this.enabled) { final Boolean oldValue = this.enabled ? Boolean.TRUE @@ -462,11 +486,13 @@ public final class CommandLegacyActionWrapper extends AbstractAction { } } + @Override public final void setHelpListener(final HelpListener listener) { // TODO Help Haven't even started to look at help yet. } + @Override public final void setHoverImageDescriptor(final ImageDescriptor newImage) { final String commandId = getActionDefinitionId(); final int type = CommandImageManager.TYPE_HOVER; @@ -478,10 +504,12 @@ public final class CommandLegacyActionWrapper extends AbstractAction { } } + @Override public final void setId(final String id) { this.id = id; } + @Override public final void setImageDescriptor(final ImageDescriptor newImage) { final String commandId = getActionDefinitionId(); final int type = CommandImageManager.TYPE_DEFAULT; @@ -493,10 +521,12 @@ public final class CommandLegacyActionWrapper extends AbstractAction { } } + @Override public final void setMenuCreator(final IMenuCreator creator) { // TODO Pulldown. This is complicated } + @Override public final void setText(final String text) { final State state = command.getCommand().getState( INamedHandleStateIds.NAME); @@ -508,6 +538,7 @@ public final class CommandLegacyActionWrapper extends AbstractAction { } } + @Override public final void setToolTipText(final String text) { setDescription(text); } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/ContextMenuHandler.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/ContextMenuHandler.java index 00d9e6fd197..6316405982c 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/ContextMenuHandler.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/ContextMenuHandler.java @@ -28,6 +28,7 @@ public class ContextMenuHandler extends AbstractHandler { * @throws ExecutionException * {@inheritDoc} */ + @Override public Object execute(ExecutionEvent exEvent) throws ExecutionException { Shell shell = HandlerUtil.getActiveShell(exEvent); Display display = shell == null ? Display.getCurrent() : shell.getDisplay(); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/CyclePageHandler.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/CyclePageHandler.java index 55014ec3423..2eab7900faa 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/CyclePageHandler.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/CyclePageHandler.java @@ -58,6 +58,7 @@ public class CyclePageHandler extends CycleBaseHandler { this.pageSwitcher = pageSwitcher; } + @Override protected void addItems(Table table, WorkbenchPage page) { Object[] pages = pageSwitcher.getPages(); for (int i = 0; i < pages.length; i++) { @@ -81,10 +82,12 @@ public class CyclePageHandler extends CycleBaseHandler { } } + @Override protected int getCurrentItemIndex() { return pageSwitcher.getCurrentPageIndex(); } + @Override protected ParameterizedCommand getBackwardCommand() { final ICommandService commandService = (ICommandService) window .getWorkbench().getService(ICommandService.class); @@ -94,6 +97,7 @@ public class CyclePageHandler extends CycleBaseHandler { return commandF; } + @Override protected ParameterizedCommand getForwardCommand() { final ICommandService commandService = (ICommandService) window .getWorkbench().getService(ICommandService.class); @@ -102,6 +106,7 @@ public class CyclePageHandler extends CycleBaseHandler { return commandF; } + @Override protected String getTableHeader(IWorkbenchPart activePart) { if (activePart instanceof WorkbenchPart) { return ((WorkbenchPart) activePart).getPartName(); @@ -110,6 +115,7 @@ public class CyclePageHandler extends CycleBaseHandler { return activePart.getTitle(); } + @Override public Object execute(ExecutionEvent event) throws ExecutionException { if (event.getCommand().getId().equals(IWorkbenchCommandConstants.NAVIGATE_NEXT_PAGE)) { gotoDirection = true; @@ -124,6 +130,7 @@ public class CyclePageHandler extends CycleBaseHandler { return null; } + @Override protected void setDialogLocation(final Shell dialog, IWorkbenchPart activePart) { if (dialog == null) @@ -154,11 +161,13 @@ public class CyclePageHandler extends CycleBaseHandler { dialog.setLocation(dlgAnchor); } + @Override public void dispose() { super.dispose(); this.pageSwitcher = null; } + @Override protected void activate(IWorkbenchPage page, Object selectedItem) { if (selectedItem == null) { return; diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/DirtyStateTracker.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/DirtyStateTracker.java index 603e49f7cef..3f8e977e6c1 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/DirtyStateTracker.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/DirtyStateTracker.java @@ -60,6 +60,7 @@ public class DirtyStateTracker implements IPartListener, IWindowListener, * @see * org.eclipse.ui.IPartListener#partActivated(org.eclipse.ui.IWorkbenchPart) */ + @Override public void partActivated(IWorkbenchPart part) { if (part instanceof ISaveablePart) { part.addPropertyListener(this); @@ -73,6 +74,7 @@ public class DirtyStateTracker implements IPartListener, IWindowListener, * org.eclipse.ui.IPartListener#partBroughtToTop(org.eclipse.ui.IWorkbenchPart * ) */ + @Override public void partBroughtToTop(IWorkbenchPart part) { } @@ -82,6 +84,7 @@ public class DirtyStateTracker implements IPartListener, IWindowListener, * @see * org.eclipse.ui.IPartListener#partClosed(org.eclipse.ui.IWorkbenchPart) */ + @Override public void partClosed(IWorkbenchPart part) { if (part instanceof ISaveablePart) { part.removePropertyListener(this); @@ -96,6 +99,7 @@ public class DirtyStateTracker implements IPartListener, IWindowListener, * org.eclipse.ui.IPartListener#partDeactivated(org.eclipse.ui.IWorkbenchPart * ) */ + @Override public void partDeactivated(IWorkbenchPart part) { } @@ -105,6 +109,7 @@ public class DirtyStateTracker implements IPartListener, IWindowListener, * @see * org.eclipse.ui.IPartListener#partOpened(org.eclipse.ui.IWorkbenchPart) */ + @Override public void partOpened(IWorkbenchPart part) { if (part instanceof ISaveablePart) { part.addPropertyListener(this); @@ -117,6 +122,7 @@ public class DirtyStateTracker implements IPartListener, IWindowListener, * @see org.eclipse.ui.IWindowListener#windowActivated(org.eclipse.ui. * IWorkbenchWindow) */ + @Override public void windowActivated(IWorkbenchWindow window) { register(window); } @@ -127,6 +133,7 @@ public class DirtyStateTracker implements IPartListener, IWindowListener, * @see org.eclipse.ui.IWindowListener#windowDeactivated(org.eclipse.ui. * IWorkbenchWindow) */ + @Override public void windowDeactivated(IWorkbenchWindow window) { } @@ -137,6 +144,7 @@ public class DirtyStateTracker implements IPartListener, IWindowListener, * org.eclipse.ui.IWindowListener#windowClosed(org.eclipse.ui.IWorkbenchWindow * ) */ + @Override public void windowClosed(IWorkbenchWindow window) { window.getPartService().removePartListener(this); } @@ -148,6 +156,7 @@ public class DirtyStateTracker implements IPartListener, IWindowListener, * org.eclipse.ui.IWindowListener#windowOpened(org.eclipse.ui.IWorkbenchWindow * ) */ + @Override public void windowOpened(IWorkbenchWindow window) { register(window); } @@ -158,6 +167,7 @@ public class DirtyStateTracker implements IPartListener, IWindowListener, * @see org.eclipse.ui.IPropertyListener#propertyChanged(java.lang.Object, * int) */ + @Override public void propertyChanged(Object source, int propID) { if (source instanceof ISaveablePart && propID == ISaveablePart.PROP_DIRTY) { update(); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/DisplayHelpHandler.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/DisplayHelpHandler.java index 2744785f44b..49b4479edb3 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/DisplayHelpHandler.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/DisplayHelpHandler.java @@ -28,6 +28,7 @@ public final class DisplayHelpHandler extends AbstractHandler { */ private static final String PARAM_ID_HREF = "href"; //$NON-NLS-1$ + @Override public final Object execute(final ExecutionEvent event) { final IWorkbenchHelpSystem helpSystem = PlatformUI.getWorkbench() .getHelpSystem(); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/DynamicHelpHandler.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/DynamicHelpHandler.java index 6f8bf535473..a84ef0e3e3f 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/DynamicHelpHandler.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/DynamicHelpHandler.java @@ -22,9 +22,11 @@ import org.eclipse.ui.PlatformUI; */ public class DynamicHelpHandler extends AbstractHandler { + @Override public Object execute(ExecutionEvent event) { BusyIndicator.showWhile(null, new Runnable() { + @Override public void run() { PlatformUI.getWorkbench().getHelpSystem().displayDynamicHelp(); } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/E4HandlerProxy.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/E4HandlerProxy.java index 4859a7ab407..2562bfbfa24 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/E4HandlerProxy.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/E4HandlerProxy.java @@ -97,6 +97,7 @@ public class E4HandlerProxy implements IHandler2, IHandlerListener, IElementUpda return handler; } + @Override public void handlerChanged(HandlerEvent handlerEvent) { IHandler handler = command.getHandler(); if (handler instanceof HandlerServiceHandler) { @@ -115,6 +116,7 @@ public class E4HandlerProxy implements IHandler2, IHandlerListener, IElementUpda * org.eclipse.ui.commands.IElementUpdater#updateElement(org.eclipse.ui. * menus.UIElement, java.util.Map) */ + @Override public void updateElement(UIElement element, Map parameters) { if (handler instanceof IElementUpdater) { ((IElementUpdater) handler).updateElement(element, parameters); @@ -138,6 +140,7 @@ public class E4HandlerProxy implements IHandler2, IHandlerListener, IElementUpda * org.eclipse.core.commands.IHandler#addHandlerListener(org.eclipse.core * .commands.IHandlerListener) */ + @Override public void addHandlerListener(IHandlerListener handlerListener) { handler.addHandlerListener(handlerListener); } @@ -147,6 +150,7 @@ public class E4HandlerProxy implements IHandler2, IHandlerListener, IElementUpda * * @see org.eclipse.core.commands.IHandler#dispose() */ + @Override public void dispose() { handler.dispose(); } @@ -158,6 +162,7 @@ public class E4HandlerProxy implements IHandler2, IHandlerListener, IElementUpda * org.eclipse.core.commands.IHandler#execute(org.eclipse.core.commands. * ExecutionEvent) */ + @Override public Object execute(ExecutionEvent event) throws ExecutionException { if (logExecute) { logExecute = false; @@ -173,6 +178,7 @@ public class E4HandlerProxy implements IHandler2, IHandlerListener, IElementUpda * * @see org.eclipse.core.commands.IHandler#isEnabled() */ + @Override public boolean isEnabled() { return handler.isEnabled(); } @@ -182,6 +188,7 @@ public class E4HandlerProxy implements IHandler2, IHandlerListener, IElementUpda * * @see org.eclipse.core.commands.IHandler#isHandled() */ + @Override public boolean isHandled() { return handler.isHandled(); } @@ -193,6 +200,7 @@ public class E4HandlerProxy implements IHandler2, IHandlerListener, IElementUpda * org.eclipse.core.commands.IHandler#removeHandlerListener(org.eclipse. * core.commands.IHandlerListener) */ + @Override public void removeHandlerListener(IHandlerListener handlerListener) { handler.removeHandlerListener(handlerListener); } @@ -202,6 +210,7 @@ public class E4HandlerProxy implements IHandler2, IHandlerListener, IElementUpda * * @see org.eclipse.core.commands.IHandler2#setEnabled(java.lang.Object) */ + @Override public void setEnabled(Object evaluationContext) { if (logSetEnabled) { logSetEnabled = false; diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/EditActionSetsHandler.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/EditActionSetsHandler.java index aa8dcca871f..be07abc349d 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/EditActionSetsHandler.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/EditActionSetsHandler.java @@ -30,6 +30,7 @@ public class EditActionSetsHandler extends AbstractHandler { * * @see org.eclipse.core.commands.IHandler#execute(org.eclipse.core.commands.ExecutionEvent) */ + @Override public Object execute(ExecutionEvent event) throws ExecutionException { IWorkbenchWindow activeWorkbenchWindow = HandlerUtil .getActiveWorkbenchWindow(event); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/ExecutableExtensionHandler.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/ExecutableExtensionHandler.java index abb693001e8..292ae676761 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/ExecutableExtensionHandler.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/ExecutableExtensionHandler.java @@ -53,7 +53,8 @@ public abstract class ExecutableExtensionHandler extends AbstractHandler * @see org.eclipse.core.runtime.IExecutableExtension#setInitializationData(org.eclipse.core.runtime.IConfigurationElement, * java.lang.String, java.lang.Object) */ - public void setInitializationData(final IConfigurationElement config, + @Override + public void setInitializationData(final IConfigurationElement config, final String propertyName, final Object data) throws CoreException { // Do nothing, by default } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/HandlerActivation.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/HandlerActivation.java index 476a435a1dc..1027624c730 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/HandlerActivation.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/HandlerActivation.java @@ -69,6 +69,7 @@ final class HandlerActivation implements IHandlerActivation { * @see * org.eclipse.ui.internal.services.IEvaluationResultCache#clearResult() */ + @Override public void clearResult() { } @@ -78,6 +79,7 @@ final class HandlerActivation implements IHandlerActivation { * @see * org.eclipse.ui.internal.services.IEvaluationResultCache#getExpression() */ + @Override public Expression getExpression() { return activeWhen; } @@ -89,6 +91,7 @@ final class HandlerActivation implements IHandlerActivation { * org.eclipse.ui.internal.services.IEvaluationResultCache#getSourcePriority * () */ + @Override public int getSourcePriority() { return sourcePriority; } @@ -100,6 +103,7 @@ final class HandlerActivation implements IHandlerActivation { * org.eclipse.ui.internal.services.IEvaluationResultCache#evaluate(org. * eclipse.core.expressions.IEvaluationContext) */ + @Override public boolean evaluate(IEvaluationContext context) { if (activeWhen == null) { active = true; @@ -128,6 +132,7 @@ final class HandlerActivation implements IHandlerActivation { * org.eclipse.ui.internal.services.IEvaluationResultCache#setResult(boolean * ) */ + @Override public void setResult(boolean result) { active = result; } @@ -137,6 +142,7 @@ final class HandlerActivation implements IHandlerActivation { * * @see java.lang.Comparable#compareTo(java.lang.Object) */ + @Override public int compareTo(Object o) { HandlerActivation activation = (HandlerActivation) o; int difference; @@ -180,6 +186,7 @@ final class HandlerActivation implements IHandlerActivation { * * @see org.eclipse.ui.handlers.IHandlerActivation#clearActive() */ + @Override public void clearActive() { // TODO Auto-generated method stub @@ -190,6 +197,7 @@ final class HandlerActivation implements IHandlerActivation { * * @see org.eclipse.ui.handlers.IHandlerActivation#getCommandId() */ + @Override public String getCommandId() { return commandId; } @@ -199,6 +207,7 @@ final class HandlerActivation implements IHandlerActivation { * * @see org.eclipse.ui.handlers.IHandlerActivation#getDepth() */ + @Override public int getDepth() { return 0; } @@ -208,6 +217,7 @@ final class HandlerActivation implements IHandlerActivation { * * @see org.eclipse.ui.handlers.IHandlerActivation#getHandler() */ + @Override public IHandler getHandler() { return handler; } @@ -217,6 +227,7 @@ final class HandlerActivation implements IHandlerActivation { * * @see org.eclipse.ui.handlers.IHandlerActivation#getHandlerService() */ + @Override public IHandlerService getHandlerService() { return (IHandlerService) context.get(IHandlerService.class.getName()); } @@ -228,6 +239,7 @@ final class HandlerActivation implements IHandlerActivation { * org.eclipse.ui.handlers.IHandlerActivation#isActive(org.eclipse.core. * expressions.IEvaluationContext) */ + @Override public boolean isActive(IEvaluationContext context) { return active; } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/HandlerPersistence.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/HandlerPersistence.java index f5a1afbaae2..37e8d809958 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/HandlerPersistence.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/HandlerPersistence.java @@ -120,11 +120,13 @@ public final class HandlerPersistence extends RegistryPersistence { handlerActivations.clear(); } + @Override public final void dispose() { super.dispose(); clearActivations(handlerService); } + @Override protected final boolean isChangeImportant(final IRegistryChangeEvent event) { return false; } @@ -162,6 +164,7 @@ public final class HandlerPersistence extends RegistryPersistence { * The handler service which should be populated with the values * from the registry; must not be <code>null</code>. */ + @Override protected final void read() { super.read(); reRead(); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/HandlerProxy.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/HandlerProxy.java index 0f590cbf5aa..e4985d1a9fe 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/HandlerProxy.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/HandlerProxy.java @@ -214,6 +214,7 @@ public final class HandlerProxy extends AbstractHandlerWithState implements enabledWhenExpression, getEnablementListener(), PROP_ENABLED); } + @Override public void setEnabled(Object evaluationContext) { if (!(evaluationContext instanceof IEvaluationContext)) { return; @@ -245,6 +246,7 @@ public final class HandlerProxy extends AbstractHandlerWithState implements private IPropertyChangeListener getEnablementListener() { if (enablementListener == null) { enablementListener = new IPropertyChangeListener() { + @Override public void propertyChange(PropertyChangeEvent event) { if (event.getProperty() == PROP_ENABLED) { setProxyEnabled(event.getNewValue() == null ? false @@ -262,6 +264,7 @@ public final class HandlerProxy extends AbstractHandlerWithState implements /** * Passes the dipose on to the proxied handler, if it has been loaded. */ + @Override public final void dispose() { if (handler != null) { if (handlerListener != null) { @@ -278,6 +281,7 @@ public final class HandlerProxy extends AbstractHandlerWithState implements } } + @Override public final Object execute(final ExecutionEvent event) throws ExecutionException { if (loadHandler()) { @@ -296,6 +300,7 @@ public final class HandlerProxy extends AbstractHandlerWithState implements return null; } + @Override public final boolean isEnabled() { if (enabledWhenExpression != null) { // proxyEnabled reflects the enabledWhen clause @@ -319,6 +324,7 @@ public final class HandlerProxy extends AbstractHandlerWithState implements return true; } + @Override public final boolean isHandled() { if (configurationElement != null && handler == null) { return true; @@ -378,6 +384,7 @@ public final class HandlerProxy extends AbstractHandlerWithState implements private IHandlerListener getHandlerListener() { if (handlerListener == null) { handlerListener = new IHandlerListener() { + @Override public void handlerChanged(HandlerEvent handlerEvent) { fireHandlerChanged(new HandlerEvent(HandlerProxy.this, handlerEvent.isEnabledChanged(), handlerEvent @@ -388,6 +395,7 @@ public final class HandlerProxy extends AbstractHandlerWithState implements return handlerListener; } + @Override public final String toString() { if (handler == null) { if (configurationElement != null) { @@ -443,6 +451,7 @@ public final class HandlerProxy extends AbstractHandlerWithState implements * @see org.eclipse.ui.commands.IElementUpdater#updateElement(org.eclipse.ui.menus.UIElement, * java.util.Map) */ + @Override public void updateElement(UIElement element, Map parameters) { if (checkedState != null) { Boolean value = (Boolean) checkedState.getValue(); @@ -470,6 +479,7 @@ public final class HandlerProxy extends AbstractHandlerWithState implements /* (non-Javadoc) * @see org.eclipse.core.commands.IStateListener#handleStateChange(org.eclipse.core.commands.State, java.lang.Object) */ + @Override public void handleStateChange(State state, Object oldValue) { if (state.getId().equals(RegistryToggleState.STATE_ID)) { checkedState = state; diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/HelpContentsHandler.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/HelpContentsHandler.java index 71b6d22ce47..dc8c23d3768 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/HelpContentsHandler.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/HelpContentsHandler.java @@ -22,9 +22,11 @@ import org.eclipse.ui.PlatformUI; */ public class HelpContentsHandler extends AbstractHandler { + @Override public Object execute(ExecutionEvent event) { BusyIndicator.showWhile(null, new Runnable() { + @Override public void run() { PlatformUI.getWorkbench().getHelpSystem().displayHelp(); } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/HelpSearchHandler.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/HelpSearchHandler.java index bb560d7e50a..22d986807d8 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/HelpSearchHandler.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/HelpSearchHandler.java @@ -22,9 +22,11 @@ import org.eclipse.ui.PlatformUI; */ public class HelpSearchHandler extends AbstractHandler { + @Override public Object execute(ExecutionEvent event) { BusyIndicator.showWhile(null, new Runnable() { + @Override public void run() { PlatformUI.getWorkbench().getHelpSystem().displaySearch(); } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/IntroHandler.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/IntroHandler.java index 2f3a5a81e81..4cf469d9d44 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/IntroHandler.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/IntroHandler.java @@ -44,6 +44,7 @@ public class IntroHandler extends AbstractHandler { * org.eclipse.core.commands.IHandler#execute(org.eclipse.core.commands. * ExecutionEvent) */ + @Override public Object execute(ExecutionEvent event) { if (introDescriptor == null) { @@ -62,6 +63,7 @@ public class IntroHandler extends AbstractHandler { * * @see org.eclipse.core.commands.AbstractHandler#isEnabled() */ + @Override public boolean isEnabled() { boolean enabled = false; diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/LegacyHandlerListenerWrapper.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/LegacyHandlerListenerWrapper.java index c717dba01c2..e1d1c83399d 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/LegacyHandlerListenerWrapper.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/LegacyHandlerListenerWrapper.java @@ -60,6 +60,7 @@ public final class LegacyHandlerListenerWrapper implements IHandlerListener { * * @see org.eclipse.ui.commands.IHandlerListener#handlerChanged(org.eclipse.ui.commands.HandlerEvent) */ + @Override public void handlerChanged(HandlerEvent event) { final boolean enabledChanged = ((Boolean) event .getPreviousAttributeValuesByName().get( diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/LegacyHandlerProxy.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/LegacyHandlerProxy.java index 2048784943a..3e23c911d53 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/LegacyHandlerProxy.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/LegacyHandlerProxy.java @@ -73,6 +73,7 @@ public final class LegacyHandlerProxy extends AbstractHandler { /** * Passes the dipose on to the proxied handler, if it has been loaded. */ + @Override public void dispose() { if (handler != null) { handler.dispose(); @@ -82,6 +83,7 @@ public final class LegacyHandlerProxy extends AbstractHandler { /** * @see IHandler#execute(Map) */ + @Override public Object execute(Map parameters) throws ExecutionException { if (loadHandler()) { return handler.execute(parameters); @@ -93,6 +95,7 @@ public final class LegacyHandlerProxy extends AbstractHandler { /** * @see IHandler#getAttributeValuesByName() */ + @Override public Map getAttributeValuesByName() { if (loadHandler()) { return handler.getAttributeValuesByName(); @@ -133,6 +136,7 @@ public final class LegacyHandlerProxy extends AbstractHandler { return true; } + @Override public final String toString() { final StringBuffer buffer = new StringBuffer(); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/LegacyHandlerWrapper.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/LegacyHandlerWrapper.java index ea3227f1bc4..79c811f1d32 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/LegacyHandlerWrapper.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/LegacyHandlerWrapper.java @@ -59,6 +59,7 @@ public final class LegacyHandlerWrapper implements IHandler { * * @see org.eclipse.core.commands.IHandler#addHandlerListener(org.eclipse.core.commands.IHandlerListener) */ + @Override public final void addHandlerListener(final IHandlerListener handlerListener) { handler.addHandlerListener(new LegacyHandlerListenerWrapper(this, handlerListener)); @@ -69,10 +70,12 @@ public final class LegacyHandlerWrapper implements IHandler { * * @see org.eclipse.core.commands.IHandler#dispose() */ + @Override public final void dispose() { handler.dispose(); } + @Override public final boolean equals(final Object object) { if (object instanceof org.eclipse.ui.commands.IHandler) { return this.handler == object; @@ -90,6 +93,7 @@ public final class LegacyHandlerWrapper implements IHandler { * * @see org.eclipse.core.commands.IHandler#execute(org.eclipse.core.commands.ExecutionEvent) */ + @Override public final Object execute(final ExecutionEvent event) throws ExecutionException { // Debugging output @@ -112,10 +116,12 @@ public final class LegacyHandlerWrapper implements IHandler { } } + @Override public final int hashCode() { return this.handler.hashCode(); } + @Override public final boolean isEnabled() { final Object enabled = handler.getAttributeValuesByName().get( ILegacyAttributeNames.ENABLED); @@ -126,6 +132,7 @@ public final class LegacyHandlerWrapper implements IHandler { return true; } + @Override public final boolean isHandled() { final Object handled = handler.getAttributeValuesByName().get( ILegacyAttributeNames.HANDLED); @@ -136,12 +143,14 @@ public final class LegacyHandlerWrapper implements IHandler { return true; } + @Override public final void removeHandlerListener( final IHandlerListener handlerListener) { handler.removeHandlerListener(new LegacyHandlerListenerWrapper(this, handlerListener)); } + @Override public final String toString() { final StringBuffer buffer = new StringBuffer(); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/LockToolBarHandler.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/LockToolBarHandler.java index ef094b3ea56..c82a6372301 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/LockToolBarHandler.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/LockToolBarHandler.java @@ -33,6 +33,7 @@ public class LockToolBarHandler extends AbstractHandler { * org.eclipse.core.commands.IHandler#execute(org.eclipse.core.commands. * ExecutionEvent) */ + @Override public Object execute(ExecutionEvent event) throws ExecutionException { WorkbenchWindow workbenchWindow = (WorkbenchWindow) HandlerUtil diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/MaximizePartHandler.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/MaximizePartHandler.java index 7c3b942784e..bcc354bb827 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/MaximizePartHandler.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/MaximizePartHandler.java @@ -30,6 +30,7 @@ public class MaximizePartHandler extends AbstractHandler { * * @see org.eclipse.core.commands.IHandler#execute(org.eclipse.core.commands.ExecutionEvent) */ + @Override public Object execute(ExecutionEvent event) throws ExecutionException { IWorkbenchWindow activeWorkbenchWindow = HandlerUtil .getActiveWorkbenchWindow(event); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/MinimizePartHandler.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/MinimizePartHandler.java index 8631926badc..4fc2942a833 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/MinimizePartHandler.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/MinimizePartHandler.java @@ -31,6 +31,7 @@ public class MinimizePartHandler extends AbstractHandler { * * @see org.eclipse.core.commands.IHandler#execute(org.eclipse.core.commands.ExecutionEvent) */ + @Override public Object execute(ExecutionEvent event) throws ExecutionException { IWorkbenchWindow activeWorkbenchWindow = HandlerUtil .getActiveWorkbenchWindow(event); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/NewEditorHandler.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/NewEditorHandler.java index 2e71257e851..3ab5877ccf2 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/NewEditorHandler.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/NewEditorHandler.java @@ -39,6 +39,7 @@ public class NewEditorHandler extends AbstractHandler { * * @see org.eclipse.core.commands.IHandler#execute(org.eclipse.core.commands.ExecutionEvent) */ + @Override public Object execute(ExecutionEvent event) throws ExecutionException { IWorkbenchWindow activeWorkbenchWindow = HandlerUtil .getActiveWorkbenchWindow(event); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/OpenInNewWindowHandler.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/OpenInNewWindowHandler.java index 960f37e1d75..d6a08c87977 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/OpenInNewWindowHandler.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/OpenInNewWindowHandler.java @@ -35,6 +35,7 @@ public class OpenInNewWindowHandler extends AbstractHandler { * * @see org.eclipse.core.commands.IHandler#execute(org.eclipse.core.commands.ExecutionEvent) */ + @Override public Object execute(ExecutionEvent event) throws ExecutionException { IWorkbenchWindow activeWorkbenchWindow = HandlerUtil .getActiveWorkbenchWindow(event); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/PinEditorHandler.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/PinEditorHandler.java index 11247aae4af..6875d7a77a0 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/PinEditorHandler.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/PinEditorHandler.java @@ -39,6 +39,7 @@ public class PinEditorHandler extends AbstractHandler implements * org.eclipse.core.commands.IHandler#execute(org.eclipse.core.commands. * ExecutionEvent) */ + @Override public Object execute(ExecutionEvent event) { IWorkbenchWindow window = HandlerUtil.getActiveWorkbenchWindow(event); if (window == null) { @@ -68,6 +69,7 @@ public class PinEditorHandler extends AbstractHandler implements * org.eclipse.ui.commands.IElementUpdater#updateElement(org.eclipse.ui. * menus.UIElement, java.util.Map) */ + @Override public void updateElement(UIElement element, Map parameters) { IWorkbenchWindow window = (IWorkbenchWindow) element .getServiceLocator().getService(IWorkbenchWindow.class); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/PropertyDialogHandler.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/PropertyDialogHandler.java index 23623667868..5d7a38d2ca4 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/PropertyDialogHandler.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/PropertyDialogHandler.java @@ -34,6 +34,7 @@ public class PropertyDialogHandler extends AbstractHandler { * * @see org.eclipse.core.commands.IHandler#execute(org.eclipse.core.commands.ExecutionEvent) */ + @Override public Object execute(ExecutionEvent event) throws ExecutionException { PreferenceDialog dialog; Object element = null; diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/QuickMenuHandler.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/QuickMenuHandler.java index 0a3e3980f40..fb7874a14c2 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/QuickMenuHandler.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/QuickMenuHandler.java @@ -37,6 +37,7 @@ import org.eclipse.ui.progress.UIJob; public class QuickMenuHandler extends AbstractHandler implements IMenuListener2 { private QuickMenuCreator creator = new QuickMenuCreator() { + @Override protected void fillMenu(IMenuManager menu) { if (!(menu instanceof ContributionManager)) { return; @@ -57,6 +58,7 @@ public class QuickMenuHandler extends AbstractHandler implements IMenuListener2 * * @see org.eclipse.core.commands.IHandler#execute(org.eclipse.core.commands.ExecutionEvent) */ + @Override public Object execute(ExecutionEvent event) throws ExecutionException { locationURI = event.getParameter("org.eclipse.ui.window.quickMenu.uri"); //$NON-NLS-1$ if (locationURI == null) { @@ -71,6 +73,7 @@ public class QuickMenuHandler extends AbstractHandler implements IMenuListener2 * * @see org.eclipse.core.commands.AbstractHandler#dispose() */ + @Override public void dispose() { if (creator != null) { creator.dispose(); @@ -83,9 +86,11 @@ public class QuickMenuHandler extends AbstractHandler implements IMenuListener2 * * @see org.eclipse.jface.action.IMenuListener2#menuAboutToHide(org.eclipse.jface.action.IMenuManager) */ + @Override public void menuAboutToHide(final IMenuManager managerM) { new UIJob("quickMenuCleanup") { //$NON-NLS-1$ + @Override public IStatus runInUIThread(IProgressMonitor monitor) { IMenuService service = (IMenuService) PlatformUI.getWorkbench() .getService(IMenuService.class); @@ -101,6 +106,7 @@ public class QuickMenuHandler extends AbstractHandler implements IMenuListener2 * * @see org.eclipse.jface.action.IMenuListener#menuAboutToShow(org.eclipse.jface.action.IMenuManager) */ + @Override public void menuAboutToShow(IMenuManager manager) { // no-op } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/QuitHandler.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/QuitHandler.java index 92d54d808c9..a6f2d9756c8 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/QuitHandler.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/QuitHandler.java @@ -30,6 +30,7 @@ public class QuitHandler extends AbstractHandler { * * @see org.eclipse.core.commands.IHandler#execute(org.eclipse.core.commands.ExecutionEvent) */ + @Override public Object execute(ExecutionEvent event) throws ExecutionException { IEvaluationContext context = (IEvaluationContext) event.getApplicationContext(); IWorkbench workbench = (IWorkbench) context.getVariable(IWorkbench.class.getName()); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/ResetPerspectiveHandler.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/ResetPerspectiveHandler.java index 5992f1db0b8..96b2d2643c5 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/ResetPerspectiveHandler.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/ResetPerspectiveHandler.java @@ -40,6 +40,7 @@ public class ResetPerspectiveHandler extends AbstractHandler { * org.eclipse.core.commands.IHandler#execute(org.eclipse.core.commands.
* ExecutionEvent)
*/
+ @Override
public Object execute(ExecutionEvent event) {
IWorkbenchWindow activeWorkbenchWindow = HandlerUtil.getActiveWorkbenchWindow(event);
diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/RestartWorkbenchHandler.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/RestartWorkbenchHandler.java index 3cc5db89555..336bc8dca51 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/RestartWorkbenchHandler.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/RestartWorkbenchHandler.java @@ -26,6 +26,7 @@ public class RestartWorkbenchHandler extends AbstractHandler { * * @see org.eclipse.core.commands.IHandler#execute(org.eclipse.core.commands.ExecutionEvent) */ + @Override public Object execute(ExecutionEvent event){ PlatformUI.getWorkbench().restart(); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/ReuseEditorTester.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/ReuseEditorTester.java index 99b8ba5e9a1..6fead95abad 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/ReuseEditorTester.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/ReuseEditorTester.java @@ -28,6 +28,7 @@ public class ReuseEditorTester extends PropertyTester { * @see org.eclipse.core.expressions.IPropertyTester#test(java.lang.Object, * java.lang.String, java.lang.Object[], java.lang.Object) */ + @Override public boolean test(Object receiver, String property, Object[] args, Object expectedValue) { IPreferenceStore store = WorkbenchPlugin.getDefault() diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/SaveAllHandler.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/SaveAllHandler.java index e12d3cfe028..249878fa20c 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/SaveAllHandler.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/SaveAllHandler.java @@ -39,6 +39,7 @@ public class SaveAllHandler extends AbstractSaveHandler { registerEnablement(); } + @Override public Object execute(ExecutionEvent event) throws ExecutionException { IWorkbenchWindow window = HandlerUtil .getActiveWorkbenchWindowChecked(event); @@ -50,6 +51,7 @@ public class SaveAllHandler extends AbstractSaveHandler { return null; } + @Override protected EvaluationResult evaluate(IEvaluationContext context) { IWorkbenchWindow window = InternalHandlerUtil.getActiveWorkbenchWindow(context); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/SaveAsHandler.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/SaveAsHandler.java index a0f4f313155..583880ccf0f 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/SaveAsHandler.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/SaveAsHandler.java @@ -33,6 +33,7 @@ public class SaveAsHandler extends AbstractSaveHandler { registerEnablement(); } + @Override public Object execute(ExecutionEvent event) { ISaveablePart saveablePart = getSaveablePart(event); @@ -43,6 +44,7 @@ public class SaveAsHandler extends AbstractSaveHandler { return null; } + @Override protected EvaluationResult evaluate(IEvaluationContext context) { IWorkbenchWindow window = InternalHandlerUtil.getActiveWorkbenchWindow(context); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/SaveHandler.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/SaveHandler.java index a57fad52d86..655a340511c 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/SaveHandler.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/SaveHandler.java @@ -38,6 +38,7 @@ public class SaveHandler extends AbstractSaveHandler { registerEnablement(); } + @Override public Object execute(ExecutionEvent event) { ISaveablePart saveablePart = getSaveablePart(event); @@ -63,6 +64,7 @@ public class SaveHandler extends AbstractSaveHandler { } + @Override protected EvaluationResult evaluate(IEvaluationContext context) { IWorkbenchWindow window = InternalHandlerUtil.getActiveWorkbenchWindow(context); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/SavePerspectiveHandler.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/SavePerspectiveHandler.java index 4241f49aa9e..37418159495 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/SavePerspectiveHandler.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/SavePerspectiveHandler.java @@ -47,6 +47,7 @@ public class SavePerspectiveHandler extends AbstractHandler { * org.eclipse.core.commands.IHandler#execute(org.eclipse.core.commands.
* ExecutionEvent)
*/
+ @Override
public Object execute(ExecutionEvent event) {
IWorkbenchWindow activeWorkbenchWindow = HandlerUtil.getActiveWorkbenchWindow(event);
diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/SelectAllHandler.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/SelectAllHandler.java index bd8db846198..6a7b241fdc5 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/SelectAllHandler.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/SelectAllHandler.java @@ -39,6 +39,7 @@ public class SelectAllHandler extends WidgetMethodHandler { */ private static final Class[] METHOD_PARAMETERS = { Point.class }; + @Override public final Object execute(final ExecutionEvent event) throws ExecutionException { final Method methodToExecute = getMethodToExecute(); @@ -74,12 +75,14 @@ public class SelectAllHandler extends WidgetMethodHandler { final Object focusComponent = getFocusComponent(); if (focusComponent != null) { Runnable methodRunnable = new Runnable() { + @Override public void run() { try { methodToExecute.invoke(focusComponent); // and back to the UI thread :-) focusControl.getDisplay().asyncExec( new Runnable() { + @Override public void run() { if (!focusControl .isDisposed()) { @@ -103,6 +106,7 @@ public class SelectAllHandler extends WidgetMethodHandler { */ focusControl.getDisplay().asyncExec( new Runnable() { + @Override public void run() { ExceptionHandler .getInstance() @@ -178,6 +182,7 @@ public class SelectAllHandler extends WidgetMethodHandler { * * @return The method on the focus control; <code>null</code> if none. */ + @Override protected Method getMethodToExecute() { Method method = super.getMethodToExecute(); @@ -201,6 +206,7 @@ public class SelectAllHandler extends WidgetMethodHandler { * @see org.eclipse.core.runtime.IExecutableExtension#setInitializationData(org.eclipse.core.runtime.IConfigurationElement, * java.lang.String, java.lang.Object) */ + @Override public void setInitializationData(IConfigurationElement config, String propertyName, Object data) { // The name is always "selectAll". diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/ShowKeyAssistHandler.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/ShowKeyAssistHandler.java index e03b90078d1..603d1c508b7 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/ShowKeyAssistHandler.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/ShowKeyAssistHandler.java @@ -31,6 +31,7 @@ public class ShowKeyAssistHandler extends WorkbenchWindowHandlerDelegate { * Ignored * @return <code>null</code> */ + @Override public Object execute(final ExecutionEvent event) { final IWorkbench workbench = PlatformUI.getWorkbench(); final IBindingService bindingService = (IBindingService) workbench.getService(IBindingService.class); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/ShowPreferencePageHandler.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/ShowPreferencePageHandler.java index 954fec3a6f2..34ab82e95e0 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/ShowPreferencePageHandler.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/ShowPreferencePageHandler.java @@ -40,6 +40,7 @@ public final class ShowPreferencePageHandler extends AbstractHandler { super(); } + @Override public final Object execute(final ExecutionEvent event) { final String preferencePageId = event .getParameter(IWorkbenchCommandConstants.WINDOW_PREFERENCES_PARM_PAGEID); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/SpyHandler.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/SpyHandler.java index efec8e76f78..e691f5af7a7 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/SpyHandler.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/SpyHandler.java @@ -41,6 +41,7 @@ import org.osgi.framework.FrameworkUtil; */ public class SpyHandler extends AbstractHandler { + @Override public Object execute(ExecutionEvent event) { Shell shell = HandlerUtil.getActiveShell(event); if (shell != null) { @@ -111,6 +112,7 @@ public class SpyHandler extends AbstractHandler { final ContributionInfo contributionInfo) { ToolTip toolTip = new ToolTip(control, ToolTip.NO_RECREATE, true) { + @Override protected Composite createToolTipContentArea(Event event, Composite parent) { // Create the content area Composite composite = new Composite(parent, SWT.NONE); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/ToggleCoolbarHandler.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/ToggleCoolbarHandler.java index 9a3324ab08a..ecb78fe169c 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/ToggleCoolbarHandler.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/ToggleCoolbarHandler.java @@ -39,6 +39,7 @@ public class ToggleCoolbarHandler extends AbstractHandler implements * org.eclipse.core.commands.IHandler#execute(org.eclipse.core.commands. * ExecutionEvent) */ + @Override public Object execute(ExecutionEvent event) throws ExecutionException { final IWorkbenchWindow activeWorkbenchWindow = HandlerUtil .getActiveWorkbenchWindowChecked(event); @@ -57,6 +58,7 @@ public class ToggleCoolbarHandler extends AbstractHandler implements * org.eclipse.ui.commands.IElementUpdater#updateElement(org.eclipse.ui. * menus.UIElement, java.util.Map) */ + @Override public void updateElement(UIElement element, Map parameters) { IWorkbenchLocationService wls = (IWorkbenchLocationService) element .getServiceLocator() diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/TraversePageHandler.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/TraversePageHandler.java index ae57a33c448..1fe00acc454 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/TraversePageHandler.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/TraversePageHandler.java @@ -33,6 +33,7 @@ public class TraversePageHandler extends WidgetMethodHandler { */ private static final Class[] METHOD_PARAMETERS = { int.class }; + @Override public final Object execute(final ExecutionEvent event) { Control focusControl = Display.getCurrent().getFocusControl(); if (focusControl != null) { @@ -55,6 +56,7 @@ public class TraversePageHandler extends WidgetMethodHandler { * * @return The method on the focus control; <code>null</code> if none. */ + @Override protected Method getMethodToExecute() { final Control focusControl = Display.getCurrent().getFocusControl(); if (focusControl != null) { diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/WidgetMethodHandler.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/WidgetMethodHandler.java index 07aa0c991fb..13d3df6399a 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/WidgetMethodHandler.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/WidgetMethodHandler.java @@ -46,6 +46,7 @@ public class WidgetMethodHandler extends AbstractHandler implements display = Display.getCurrent(); if (display != null) { focusListener = new Listener() { + @Override public void handleEvent(Event event) { updateEnablement(); } @@ -69,6 +70,7 @@ public class WidgetMethodHandler extends AbstractHandler implements private Listener focusListener; private Display display; + @Override public Object execute(final ExecutionEvent event) throws ExecutionException { final Method methodToExecute = getMethodToExecute(); if (methodToExecute != null) { @@ -94,6 +96,7 @@ public class WidgetMethodHandler extends AbstractHandler implements final Object focusComponent = getFocusComponent(); if (focusComponent != null) { Runnable methodRunnable = new Runnable() { + @Override public void run() { try { methodToExecute.invoke(focusComponent); @@ -110,6 +113,7 @@ public class WidgetMethodHandler extends AbstractHandler implements */ focusControl.getDisplay().asyncExec( new Runnable() { + @Override public void run() { ExceptionHandler .getInstance() @@ -233,6 +237,7 @@ public class WidgetMethodHandler extends AbstractHandler implements } + @Override public final boolean isHandled() { return getMethodToExecute() != null; } @@ -306,6 +311,7 @@ public class WidgetMethodHandler extends AbstractHandler implements * .eclipse.core.runtime.IConfigurationElement, java.lang.String, * java.lang.Object) */ + @Override public void setInitializationData(IConfigurationElement config, String propertyName, Object data) { // The data is really just a string (i.e., the method name). @@ -315,6 +321,7 @@ public class WidgetMethodHandler extends AbstractHandler implements /* (non-Javadoc) * @see org.eclipse.core.commands.AbstractHandler#dispose() */ + @Override public void dispose() { if (display!=null && !display.isDisposed()) { display.removeFilter(SWT.FocusIn, focusListener); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/WizardHandler.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/WizardHandler.java index 97f4358ae8b..870c803f0ce 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/WizardHandler.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/WizardHandler.java @@ -61,14 +61,17 @@ public abstract class WizardHandler extends AbstractHandler implements IElementU private static final int SIZING_WIZARD_WIDTH = 470; private static final int SIZING_WIZARD_HEIGHT = 550; + @Override protected String getWizardIdParameterId() { return IWorkbenchCommandConstants.FILE_EXPORT_PARM_WIZARDID; } + @Override protected IWizardRegistry getWizardRegistry() { return PlatformUI.getWorkbench().getExportWizardRegistry(); } + @Override protected void executeHandler(ExecutionEvent event) { IWorkbenchWindow activeWorkbenchWindow = HandlerUtil .getActiveWorkbenchWindow(event); @@ -112,14 +115,17 @@ public abstract class WizardHandler extends AbstractHandler implements IElementU private static final int SIZING_WIZARD_WIDTH = 470; private static final int SIZING_WIZARD_HEIGHT = 550; + @Override protected String getWizardIdParameterId() { return IWorkbenchCommandConstants.FILE_IMPORT_PARM_WIZARDID; } + @Override protected IWizardRegistry getWizardRegistry() { return PlatformUI.getWorkbench().getImportWizardRegistry(); } + @Override protected void executeHandler(ExecutionEvent event) { IWorkbenchWindow activeWorkbenchWindow = HandlerUtil.getActiveWorkbenchWindow(event); if (activeWorkbenchWindow == null) { @@ -175,10 +181,12 @@ public abstract class WizardHandler extends AbstractHandler implements IElementU */ private String categoryId = null; + @Override protected String getWizardIdParameterId() { return IWorkbenchCommandConstants.FILE_NEW_PARM_WIZARDID; } + @Override protected IWizardRegistry getWizardRegistry() { return PlatformUI.getWorkbench().getNewWizardRegistry(); } @@ -201,7 +209,8 @@ public abstract class WizardHandler extends AbstractHandler implements IElementU categoryId = id; } - protected IStructuredSelection getSelectionToUse(ExecutionEvent event) { + @Override + protected IStructuredSelection getSelectionToUse(ExecutionEvent event) { ISelection selection = HandlerUtil.getCurrentSelection(event); IStructuredSelection selectionToPass = StructuredSelection.EMPTY; if (selection instanceof IStructuredSelection) { @@ -226,6 +235,7 @@ public abstract class WizardHandler extends AbstractHandler implements IElementU return selectionToPass; } + @Override protected void executeHandler(ExecutionEvent event) { IWorkbenchWindow activeWorkbenchWindow = HandlerUtil.getActiveWorkbenchWindow(event); if (activeWorkbenchWindow == null) { @@ -268,6 +278,7 @@ public abstract class WizardHandler extends AbstractHandler implements IElementU */ protected abstract void executeHandler(ExecutionEvent event); + @Override public Object execute(ExecutionEvent event) throws ExecutionException { String wizardId = event.getParameter(getWizardIdParameterId()); @@ -323,6 +334,7 @@ public abstract class WizardHandler extends AbstractHandler implements IElementU return StructuredSelection.EMPTY; } + @Override public void updateElement(UIElement element, Map parameters) { String wizardId = (String) parameters.get(getWizardIdParameterId()); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/WorkbenchWindowHandlerDelegate.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/WorkbenchWindowHandlerDelegate.java index 61ebb94ceef..e5f98911e50 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/WorkbenchWindowHandlerDelegate.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/WorkbenchWindowHandlerDelegate.java @@ -32,6 +32,7 @@ public abstract class WorkbenchWindowHandlerDelegate extends * the window that provides the context for this delegate * @see org.eclipse.ui.IWorkbenchWindowActionDelegate#init(IWorkbenchWindow) */ + @Override public void init(final IWorkbenchWindow window) { // Do nothing by default. } @@ -46,6 +47,7 @@ public abstract class WorkbenchWindowHandlerDelegate extends * action * @see org.eclipse.ui.IActionDelegate#run(IAction) */ + @Override public void run(final IAction action) { try { execute(new ExecutionEvent()); @@ -66,6 +68,7 @@ public abstract class WorkbenchWindowHandlerDelegate extends * * @see org.eclipse.ui.IActionDelegate#selectionChanged(IAction, ISelection) */ + @Override public void selectionChanged(IAction action, ISelection selection) { // Do nothing be default. } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/help/WorkbenchHelpSystem.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/help/WorkbenchHelpSystem.java index 1870d6be7f0..db0ce579de1 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/help/WorkbenchHelpSystem.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/help/WorkbenchHelpSystem.java @@ -80,6 +80,7 @@ public final class WorkbenchHelpSystem implements IWorkbenchHelpSystem { * The help listener. */ private static class WorkbenchHelpListener implements HelpListener { + @Override public void helpRequested(HelpEvent event) { if (getInstance().getHelpUI() == null) { @@ -182,14 +183,16 @@ public final class WorkbenchHelpSystem implements IWorkbenchHelpSystem { /* (non-Javadoc) * @see org.eclipse.core.runtime.dynamicHelpers.IExtensionChangeHandler#addExtension(org.eclipse.core.runtime.dynamicHelpers.IExtensionTracker, org.eclipse.core.runtime.IExtension) */ - public void addExtension(IExtensionTracker tracker,IExtension extension) { + @Override + public void addExtension(IExtensionTracker tracker,IExtension extension) { //Do nothing } /* (non-Javadoc) * @see org.eclipse.core.runtime.dynamicHelpers.IExtensionChangeHandler#removeExtension(org.eclipse.core.runtime.IExtension, java.lang.Object[]) */ - public void removeExtension(IExtension source, Object[] objects) { + @Override + public void removeExtension(IExtension source, Object[] objects) { for (int i = 0; i < objects.length; i++) { if (objects[i] == pluggableHelpUI) { isInitialized = false; @@ -211,6 +214,8 @@ public final class WorkbenchHelpSystem implements IWorkbenchHelpSystem { private class CompatibilityIHelpImplementation implements IHelp { /** @deprecated */ + @Deprecated + @Override public void displayHelp() { // real method - forward to help UI if available AbstractHelpUI helpUI = getHelpUI(); @@ -220,6 +225,8 @@ public final class WorkbenchHelpSystem implements IWorkbenchHelpSystem { } /** @deprecated */ + @Deprecated + @Override public void displayContext(IContext context, int x, int y) { // real method - forward to help UI if available AbstractHelpUI helpUI = getHelpUI(); @@ -229,6 +236,8 @@ public final class WorkbenchHelpSystem implements IWorkbenchHelpSystem { } /** @deprecated */ + @Deprecated + @Override public void displayContext(String contextId, int x, int y) { // convenience method - funnel through the real method IContext context = HelpSystem.getContext(contextId); @@ -238,6 +247,8 @@ public final class WorkbenchHelpSystem implements IWorkbenchHelpSystem { } /** @deprecated */ + @Deprecated + @Override public void displayHelpResource(String href) { // real method - forward to help UI if available AbstractHelpUI helpUI = getHelpUI(); @@ -247,48 +258,64 @@ public final class WorkbenchHelpSystem implements IWorkbenchHelpSystem { } /** @deprecated */ + @Deprecated + @Override public void displayHelpResource(IHelpResource helpResource) { // convenience method - funnel through the real method displayHelpResource(helpResource.getHref()); } /** @deprecated */ + @Deprecated + @Override public void displayHelp(String toc) { // deprecated method - funnel through the real method displayHelpResource(toc); } /** @deprecated */ + @Deprecated + @Override public void displayHelp(String toc, String selectedTopic) { // deprecated method - funnel through the real method displayHelpResource(selectedTopic); } /** @deprecated */ + @Deprecated + @Override public void displayHelp(String contextId, int x, int y) { // deprecated method - funnel through the real method displayContext(contextId, x, y); } /** @deprecated */ + @Deprecated + @Override public void displayHelp(IContext context, int x, int y) { // deprecated method - funnel through the real method displayContext(context, x, y); } /** @deprecated */ + @Deprecated + @Override public IContext getContext(String contextId) { // non-UI method - forward to HelpSystem return HelpSystem.getContext(contextId); } /** @deprecated */ + @Deprecated + @Override public IToc[] getTocs() { // non-UI method - forward to HelpSystem return HelpSystem.getTocs(); } /** @deprecated */ + @Deprecated + @Override public boolean isContextHelpDisplayed() { // real method - forward to pluggedhelp UI return isContextHelpDisplayed(); @@ -309,6 +336,7 @@ public final class WorkbenchHelpSystem implements IWorkbenchHelpSystem { this.title = title; } + @Override public String getTitle() { if (context instanceof IContext2) { String ctitle = ((IContext2)context).getTitle(); @@ -319,6 +347,7 @@ public final class WorkbenchHelpSystem implements IWorkbenchHelpSystem { return title; } + @Override public String getStyledText() { if (context instanceof IContext2) { return ((IContext2)context).getStyledText(); @@ -326,6 +355,7 @@ public final class WorkbenchHelpSystem implements IWorkbenchHelpSystem { return context.getText(); } + @Override public String getCategory(IHelpResource topic) { if (context instanceof IContext2) { return ((IContext2)context).getCategory(topic); @@ -333,10 +363,12 @@ public final class WorkbenchHelpSystem implements IWorkbenchHelpSystem { return null; } + @Override public IHelpResource[] getRelatedTopics() { return context.getRelatedTopics(); } + @Override public String getText() { return context.getText(); } @@ -439,6 +471,7 @@ public final class WorkbenchHelpSystem implements IWorkbenchHelpSystem { * * @see java.lang.Runnable#run() */ + @Override public void run() { // get the help UI extension from the registry IExtensionPoint point = Platform.getExtensionRegistry() @@ -560,6 +593,7 @@ public final class WorkbenchHelpSystem implements IWorkbenchHelpSystem { * {@link org.eclipse.help.HelpSystem HelpSystem}instead of the * IHelp methods on the object returned by this method. */ + @Deprecated public IHelp getHelpSupport() { AbstractHelpUI helpUI = getHelpUI(); if (helpUI != null && helpCompatibilityWrapper == null) { @@ -586,12 +620,14 @@ public final class WorkbenchHelpSystem implements IWorkbenchHelpSystem { * contexts (type <code>IContext</code>) * @deprecated use setHelp with a single context id parameter */ + @Deprecated public void setHelp(IAction action, final Object[] contexts) { for (int i = 0; i < contexts.length; i++) { Assert.isTrue(contexts[i] instanceof String || contexts[i] instanceof IContext); } action.setHelpListener(new HelpListener() { + @Override public void helpRequested(HelpEvent event) { if (contexts != null && contexts.length > 0 && getHelpUI() != null) { @@ -628,8 +664,10 @@ public final class WorkbenchHelpSystem implements IWorkbenchHelpSystem { * @deprecated context computers are no longer supported, clients should * implement their own help listener */ + @Deprecated public void setHelp(IAction action, final IContextComputer computer) { action.setHelpListener(new HelpListener() { + @Override public void helpRequested(HelpEvent event) { Object[] helpContexts = computer.computeContexts(event); if (helpContexts != null && helpContexts.length > 0 @@ -668,6 +706,7 @@ public final class WorkbenchHelpSystem implements IWorkbenchHelpSystem { * contexts (type <code>IContext</code>) * @deprecated use setHelp with single context id parameter */ + @Deprecated public void setHelp(Control control, Object[] contexts) { for (int i = 0; i < contexts.length; i++) { Assert.isTrue(contexts[i] instanceof String @@ -696,6 +735,7 @@ public final class WorkbenchHelpSystem implements IWorkbenchHelpSystem { * @deprecated context computers are no longer supported, clients should * implement their own help listener */ + @Deprecated public void setHelp(Control control, IContextComputer computer) { control.setData(HELP_KEY, computer); // ensure that the listener is only registered once @@ -719,6 +759,7 @@ public final class WorkbenchHelpSystem implements IWorkbenchHelpSystem { * contexts (type <code>IContext</code>) * @deprecated use setHelp with single context id parameter */ + @Deprecated public void setHelp(Menu menu, Object[] contexts) { for (int i = 0; i < contexts.length; i++) { Assert.isTrue(contexts[i] instanceof String @@ -746,6 +787,7 @@ public final class WorkbenchHelpSystem implements IWorkbenchHelpSystem { * @deprecated context computers are no longer supported, clients should * implement their own help listener */ + @Deprecated public void setHelp(Menu menu, IContextComputer computer) { menu.setData(HELP_KEY, computer); // ensure that the listener is only registered once @@ -769,6 +811,7 @@ public final class WorkbenchHelpSystem implements IWorkbenchHelpSystem { * contexts (type <code>IContext</code>) * @deprecated use setHelp with single context id parameter */ + @Deprecated public void setHelp(MenuItem item, Object[] contexts) { for (int i = 0; i < contexts.length; i++) { Assert.isTrue(contexts[i] instanceof String @@ -796,6 +839,7 @@ public final class WorkbenchHelpSystem implements IWorkbenchHelpSystem { * @deprecated context computers are no longer supported, clients should * implement their own help listener */ + @Deprecated public void setHelp(MenuItem item, IContextComputer computer) { item.setData(HELP_KEY, computer); // ensure that the listener is only registered once @@ -818,6 +862,7 @@ public final class WorkbenchHelpSystem implements IWorkbenchHelpSystem { // final String contextId = command.getHelpId(); final String contextId = ""; //$NON-NLS-1$ return new HelpListener() { + @Override public void helpRequested(HelpEvent event) { if (getHelpUI() != null) { IContext context = HelpSystem.getContext(contextId); @@ -836,6 +881,7 @@ public final class WorkbenchHelpSystem implements IWorkbenchHelpSystem { * * @see org.eclipse.ui.help.IWorkbenchHelpSystem#displayHelp() */ + @Override public void displayHelp() { AbstractHelpUI helpUI = getHelpUI(); if (helpUI != null) { @@ -848,6 +894,7 @@ public final class WorkbenchHelpSystem implements IWorkbenchHelpSystem { * * @see org.eclipse.ui.help.IWorkbenchHelpSystem#displaySearch() */ + @Override public void displaySearch() { AbstractHelpUI helpUI = getHelpUI(); if (helpUI != null) { @@ -860,6 +907,7 @@ public final class WorkbenchHelpSystem implements IWorkbenchHelpSystem { * * @see org.eclipse.ui.help.IWorkbenchHelpSystem#displaySearch() */ + @Override public void displayDynamicHelp() { AbstractHelpUI helpUI = getHelpUI(); if (helpUI != null) { @@ -872,6 +920,7 @@ public final class WorkbenchHelpSystem implements IWorkbenchHelpSystem { * * @see org.eclipse.ui.help.IWorkbenchHelpSystem#search(java.lang.String) */ + @Override public void search(String expression) { AbstractHelpUI helpUI = getHelpUI(); if (helpUI != null) { @@ -882,6 +931,7 @@ public final class WorkbenchHelpSystem implements IWorkbenchHelpSystem { /* (non-Javadoc) * @see org.eclipse.ui.help.IWorkbenchHelpSystem#resolve(java.lang.String, boolean) */ + @Override public URL resolve(String href, boolean documentOnly) { AbstractHelpUI helpUI = getHelpUI(); if (helpUI != null) { @@ -896,6 +946,7 @@ public final class WorkbenchHelpSystem implements IWorkbenchHelpSystem { * @see org.eclipse.ui.help.IWorkbenchHelpSystem#displayContext(org.eclipse.help.IContext, * int, int) */ + @Override public void displayContext(IContext context, int x, int y) { if (context == null) { throw new IllegalArgumentException(); @@ -911,6 +962,7 @@ public final class WorkbenchHelpSystem implements IWorkbenchHelpSystem { * * @see org.eclipse.ui.help.IWorkbenchHelpSystem#displayHelpResource(java.lang.String) */ + @Override public void displayHelpResource(String href) { if (href == null) { throw new IllegalArgumentException(); @@ -926,6 +978,7 @@ public final class WorkbenchHelpSystem implements IWorkbenchHelpSystem { * * @see org.eclipse.ui.help.IWorkbenchHelpSystem#displayHelp(java.lang.String) */ + @Override public void displayHelp(String contextId) { IContext context = HelpSystem.getContext(contextId); if (context != null) { @@ -939,6 +992,7 @@ public final class WorkbenchHelpSystem implements IWorkbenchHelpSystem { * * @see org.eclipse.ui.help.IWorkbenchHelpSystem#displayHelp(org.eclipse.help.IContext) */ + @Override public void displayHelp(IContext context) { Point point = computePopUpLocation(Display.getCurrent()); AbstractHelpUI helpUI = getHelpUI(); @@ -952,6 +1006,7 @@ public final class WorkbenchHelpSystem implements IWorkbenchHelpSystem { * * @see org.eclipse.ui.help.IWorkbenchHelpSystem#isContextHelpDisplayed() */ + @Override public boolean isContextHelpDisplayed() { if (!isInitialized) { return false; @@ -966,10 +1021,12 @@ public final class WorkbenchHelpSystem implements IWorkbenchHelpSystem { * @see org.eclipse.ui.help.IWorkbenchHelpSystem#setHelp(org.eclipse.jface.action.IAction, * java.lang.String) */ + @Override public void setHelp(final IAction action, final String contextId) { if (WorkbenchPlugin.DEBUG) setHelpTrace(contextId); action.setHelpListener(new HelpListener() { + @Override public void helpRequested(HelpEvent event) { if (getHelpUI() != null) { IContext context = HelpSystem.getContext(contextId); @@ -990,6 +1047,7 @@ public final class WorkbenchHelpSystem implements IWorkbenchHelpSystem { * @see org.eclipse.ui.help.IWorkbenchHelpSystem#setHelp(org.eclipse.swt.widgets.Control, * java.lang.String) */ + @Override public void setHelp(Control control, String contextId) { if (WorkbenchPlugin.DEBUG) setHelpTrace(contextId); @@ -1005,6 +1063,7 @@ public final class WorkbenchHelpSystem implements IWorkbenchHelpSystem { * @see org.eclipse.ui.help.IWorkbenchHelpSystem#setHelp(org.eclipse.swt.widgets.Menu, * java.lang.String) */ + @Override public void setHelp(Menu menu, String contextId) { if (WorkbenchPlugin.DEBUG) setHelpTrace(contextId); @@ -1020,6 +1079,7 @@ public final class WorkbenchHelpSystem implements IWorkbenchHelpSystem { * @see org.eclipse.ui.help.IWorkbenchHelpSystem#setHelp(org.eclipse.swt.widgets.MenuItem, * java.lang.String) */ + @Override public void setHelp(MenuItem item, String contextId) { if (WorkbenchPlugin.DEBUG) @@ -1069,6 +1129,7 @@ public final class WorkbenchHelpSystem implements IWorkbenchHelpSystem { /* (non-Javadoc) * @see org.eclipse.ui.help.IWorkbenchHelpSystem#hasHelpUI() */ + @Override public boolean hasHelpUI() { return getHelpUI() != null; } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/intro/IntroDescriptor.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/intro/IntroDescriptor.java index 9f6316bf6c9..4d0a0645f51 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/intro/IntroDescriptor.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/intro/IntroDescriptor.java @@ -51,7 +51,8 @@ public class IntroDescriptor implements IIntroDescriptor, IPluginContribution { /* (non-Javadoc) * @see org.eclipse.ui.intro.IIntroDescriptor#createIntro() */ - public IIntroPart createIntro() throws CoreException { + @Override + public IIntroPart createIntro() throws CoreException { return (IIntroPart) element.createExecutableExtension(IWorkbenchRegistryConstants.ATT_CLASS); } @@ -65,14 +66,16 @@ public class IntroDescriptor implements IIntroDescriptor, IPluginContribution { /* (non-Javadoc) * @see org.eclipse.ui.IIntroDescriptor#getId() */ - public String getId() { + @Override + public String getId() { return element.getAttribute(IWorkbenchRegistryConstants.ATT_ID); } /* (non-Javadoc) * @see org.eclipse.ui.IIntroDescriptor#getImageDescriptor() */ - public ImageDescriptor getImageDescriptor() { + @Override + public ImageDescriptor getImageDescriptor() { if (imageDescriptor != null) { return imageDescriptor; } @@ -89,14 +92,16 @@ public class IntroDescriptor implements IIntroDescriptor, IPluginContribution { /* (non-Javadoc) * @see org.eclipse.ui.IPluginContribution#getLocalId() */ - public String getLocalId() { + @Override + public String getLocalId() { return element.getAttribute(IWorkbenchRegistryConstants.ATT_ID); } /* (non-Javadoc) * @see org.eclipse.ui.IPluginContribution#getPluginId() */ - public String getPluginId() { + @Override + public String getPluginId() { return element.getNamespace(); } @@ -113,6 +118,7 @@ public class IntroDescriptor implements IIntroDescriptor, IPluginContribution { /* (non-Javadoc) * @see org.eclipse.ui.internal.intro.IIntroDescriptor#getLabelOverride() */ + @Override public String getLabelOverride() { return element.getAttribute(IWorkbenchRegistryConstants.ATT_LABEL); } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/intro/IntroRegistry.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/intro/IntroRegistry.java index 0e1f5eb03bf..aa9ca7c20a5 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/intro/IntroRegistry.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/intro/IntroRegistry.java @@ -43,6 +43,7 @@ public class IntroRegistry implements IIntroRegistry { * * @see org.eclipse.ui.internal.intro.IIntroRegistry#getIntroCount() */ + @Override public int getIntroCount() { return getIntros().length; } @@ -52,6 +53,7 @@ public class IntroRegistry implements IIntroRegistry { * * @see org.eclipse.ui.internal.intro.IIntroRegistry#getIntros() */ + @Override public IIntroDescriptor[] getIntros() { IExtensionPoint point = Platform.getExtensionRegistry() .getExtensionPoint(PlatformUI.PLUGIN_ID, @@ -92,6 +94,7 @@ public class IntroRegistry implements IIntroRegistry { * * @see org.eclipse.ui.internal.intro.IIntroRegistry#getIntroForProduct(java.lang.String) */ + @Override public IIntroDescriptor getIntroForProduct(String targetProductId) { IExtensionPoint point = Platform.getExtensionRegistry() .getExtensionPoint(PlatformUI.PLUGIN_ID, @@ -161,6 +164,7 @@ public class IntroRegistry implements IIntroRegistry { * * @see org.eclipse.ui.internal.intro.IIntroRegistry#getIntro(java.lang.String) */ + @Override public IIntroDescriptor getIntro(String id) { IIntroDescriptor[] intros = getIntros(); for (int i = 0; i < intros.length; i++) { diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/keys/AbstractKeyFormatter.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/keys/AbstractKeyFormatter.java index fecad8966df..0f39617abef 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/keys/AbstractKeyFormatter.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/keys/AbstractKeyFormatter.java @@ -61,7 +61,8 @@ public abstract class AbstractKeyFormatter implements IKeyFormatter { * * @see org.eclipse.ui.keys.KeyFormatter#format(org.eclipse.ui.keys.KeySequence) */ - public String format(Key key) { + @Override + public String format(Key key) { String name = key.toString(); return Util.translateString(RESOURCE_BUNDLE, name, name, false, false); } @@ -71,7 +72,8 @@ public abstract class AbstractKeyFormatter implements IKeyFormatter { * * @see org.eclipse.ui.keys.KeyFormatter#format(org.eclipse.ui.keys.KeySequence) */ - public String format(KeySequence keySequence) { + @Override + public String format(KeySequence keySequence) { StringBuffer stringBuffer = new StringBuffer(); Iterator keyStrokeItr = keySequence.getKeyStrokes().iterator(); @@ -91,7 +93,8 @@ public abstract class AbstractKeyFormatter implements IKeyFormatter { * * @see org.eclipse.ui.keys.KeyFormatter#formatKeyStroke(org.eclipse.ui.keys.KeyStroke) */ - public String format(KeyStroke keyStroke) { + @Override + public String format(KeyStroke keyStroke) { String keyDelimiter = getKeyDelimiter(); // Format the modifier keys, in sorted order. diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/keys/AbstractModifierKeyComparator.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/keys/AbstractModifierKeyComparator.java index 6db7565485d..4ba9e031033 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/keys/AbstractModifierKeyComparator.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/keys/AbstractModifierKeyComparator.java @@ -16,7 +16,8 @@ import org.eclipse.ui.keys.ModifierKey; abstract class AbstractModifierKeyComparator implements Comparator { - public int compare(Object left, Object right) { + @Override + public int compare(Object left, Object right) { ModifierKey modifierKeyLeft = (ModifierKey) left; ModifierKey modifierKeyRight = (ModifierKey) right; int modifierKeyLeftRank = rank(modifierKeyLeft); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/keys/AlphabeticModifierKeyComparator.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/keys/AlphabeticModifierKeyComparator.java index c2b254e401e..0ab5bc6db3f 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/keys/AlphabeticModifierKeyComparator.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/keys/AlphabeticModifierKeyComparator.java @@ -27,7 +27,8 @@ public class AlphabeticModifierKeyComparator implements Comparator { * * @see java.lang.Comparable#compareTo(java.lang.Object) */ - public int compare(Object left, Object right) { + @Override + public int compare(Object left, Object right) { ModifierKey modifierKeyLeft = (ModifierKey) left; ModifierKey modifierKeyRight = (ModifierKey) right; return modifierKeyLeft.toString() diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/keys/BindingPersistence.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/keys/BindingPersistence.java index 4e6a5f95615..f0d2fda91f1 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/keys/BindingPersistence.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/keys/BindingPersistence.java @@ -1221,6 +1221,7 @@ public class BindingPersistence extends PreferencePersistence { super.read(); } + @Override protected final boolean isChangeImportant(final IRegistryChangeEvent event) { return false; } @@ -1264,6 +1265,7 @@ public class BindingPersistence extends PreferencePersistence { return true; } + @Override protected final boolean isChangeImportant(final PropertyChangeEvent event) { return EXTENSION_COMMANDS.equals(event.getProperty()); } @@ -1272,6 +1274,7 @@ public class BindingPersistence extends PreferencePersistence { * Reads all of the binding information from the registry and from the * preference store. */ + @Override public final void read() { super.read(); reRead(); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/keys/BindingService.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/keys/BindingService.java index 8c601e58e00..b64f0a3f4fa 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/keys/BindingService.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/keys/BindingService.java @@ -123,6 +123,7 @@ public final class BindingService implements IBindingService { * * @see org.eclipse.ui.services.IDisposable#dispose() */ + @Override public void dispose() { if (bp != null) { bp.dispose(); @@ -141,6 +142,7 @@ public final class BindingService implements IBindingService { * org.eclipse.ui.keys.IBindingService#addBindingManagerListener(org.eclipse * .jface.bindings.IBindingManagerListener) */ + @Override public void addBindingManagerListener(IBindingManagerListener listener) { manager.addBindingManagerListener(listener); } @@ -152,6 +154,7 @@ public final class BindingService implements IBindingService { * org.eclipse.ui.keys.IBindingService#removeBindingManagerListener(org. * eclipse.jface.bindings.IBindingManagerListener) */ + @Override public void removeBindingManagerListener(IBindingManagerListener listener) { manager.removeBindingManagerListener(listener); } @@ -163,6 +166,7 @@ public final class BindingService implements IBindingService { * org.eclipse.ui.keys.IBindingService#getActiveBindingsFor(org.eclipse. * core.commands.ParameterizedCommand) */ + @Override public TriggerSequence[] getActiveBindingsFor(ParameterizedCommand parameterizedCommand) { Collection<TriggerSequence> seq = bindingService.getSequencesFor(parameterizedCommand); return seq.toArray(new TriggerSequence[seq.size()]); @@ -175,6 +179,7 @@ public final class BindingService implements IBindingService { * org.eclipse.ui.keys.IBindingService#getActiveBindingsFor(java.lang.String * ) */ + @Override public TriggerSequence[] getActiveBindingsFor(String commandId) { return getActiveBindingsFor(commandService.createCommand(commandId, null)); } @@ -184,6 +189,7 @@ public final class BindingService implements IBindingService { * * @see org.eclipse.ui.keys.IBindingService#getActiveScheme() */ + @Override public Scheme getActiveScheme() { return manager.getActiveScheme(); } @@ -195,6 +201,7 @@ public final class BindingService implements IBindingService { * org.eclipse.ui.keys.IBindingService#getBestActiveBindingFor(org.eclipse * .core.commands.ParameterizedCommand) */ + @Override public TriggerSequence getBestActiveBindingFor(ParameterizedCommand command) { TriggerSequence seq = bindingService.getBestSequenceFor(command); return seq; @@ -207,6 +214,7 @@ public final class BindingService implements IBindingService { * org.eclipse.ui.keys.IBindingService#getBestActiveBindingFor(java.lang * .String) */ + @Override public TriggerSequence getBestActiveBindingFor(String commandId) { ParameterizedCommand cmd = commandService.createCommand(commandId, null); return bindingService.getBestSequenceFor(cmd); @@ -219,6 +227,7 @@ public final class BindingService implements IBindingService { * org.eclipse.ui.keys.IBindingService#getBestActiveBindingFormattedFor( * java.lang.String) */ + @Override public String getBestActiveBindingFormattedFor(String commandId) { TriggerSequence sequence = bindingService.getBestSequenceFor(commandService.createCommand( commandId, null)); @@ -230,6 +239,7 @@ public final class BindingService implements IBindingService { * * @see org.eclipse.ui.keys.IBindingService#getBindings() */ + @Override public Binding[] getBindings() { return manager.getBindings(); } @@ -239,6 +249,7 @@ public final class BindingService implements IBindingService { * * @see org.eclipse.ui.keys.IBindingService#getBuffer() */ + @Override public TriggerSequence getBuffer() { if (dispatcher == null) { return KeySequence.getInstance(); @@ -251,6 +262,7 @@ public final class BindingService implements IBindingService { * * @see org.eclipse.ui.keys.IBindingService#getDefaultSchemeId() */ + @Override public String getDefaultSchemeId() { return BindingPersistence.getDefaultSchemeId(); } @@ -260,6 +272,7 @@ public final class BindingService implements IBindingService { * * @see org.eclipse.ui.keys.IBindingService#getDefinedSchemes() */ + @Override public Scheme[] getDefinedSchemes() { return manager.getDefinedSchemes(); } @@ -269,6 +282,7 @@ public final class BindingService implements IBindingService { * * @see org.eclipse.ui.keys.IBindingService#getLocale() */ + @Override public String getLocale() { return manager.getLocale(); } @@ -280,6 +294,7 @@ public final class BindingService implements IBindingService { * org.eclipse.ui.keys.IBindingService#getPartialMatches(org.eclipse.jface * .bindings.TriggerSequence) */ + @Override public Map getPartialMatches(TriggerSequence trigger) { final Collection<Binding> partialMatches = bindingService.getPartialMatches(trigger); final Map<TriggerSequence, Binding> result = new HashMap<TriggerSequence, Binding>( @@ -299,6 +314,7 @@ public final class BindingService implements IBindingService { * org.eclipse.ui.keys.IBindingService#getPerfectMatch(org.eclipse.jface * .bindings.TriggerSequence) */ + @Override public Binding getPerfectMatch(TriggerSequence trigger) { return bindingService.getPerfectMatch(trigger); } @@ -308,6 +324,7 @@ public final class BindingService implements IBindingService { * * @see org.eclipse.ui.keys.IBindingService#getPlatform() */ + @Override public String getPlatform() { return Util.getWS(); } @@ -317,6 +334,7 @@ public final class BindingService implements IBindingService { * * @see org.eclipse.ui.keys.IBindingService#getScheme(java.lang.String) */ + @Override public Scheme getScheme(String schemeId) { return manager.getScheme(schemeId); } @@ -326,6 +344,7 @@ public final class BindingService implements IBindingService { * * @see org.eclipse.ui.keys.IBindingService#isKeyFilterEnabled() */ + @Override public boolean isKeyFilterEnabled() { return dispatcher == null ? false : dispatcher.getKeyDownFilter().isEnabled(); } @@ -337,6 +356,7 @@ public final class BindingService implements IBindingService { * org.eclipse.ui.keys.IBindingService#isPartialMatch(org.eclipse.jface. * bindings.TriggerSequence) */ + @Override public boolean isPartialMatch(TriggerSequence trigger) { return bindingService.isPartialMatch(trigger); } @@ -348,6 +368,7 @@ public final class BindingService implements IBindingService { * org.eclipse.ui.keys.IBindingService#isPerfectMatch(org.eclipse.jface. * bindings.TriggerSequence) */ + @Override public boolean isPerfectMatch(TriggerSequence trigger) { return bindingService.isPerfectMatch(trigger); } @@ -357,6 +378,7 @@ public final class BindingService implements IBindingService { * * @see org.eclipse.ui.keys.IBindingService#openKeyAssistDialog() */ + @Override public void openKeyAssistDialog() { if (keyAssistDialog == null) { Display.getCurrent(); @@ -375,6 +397,7 @@ public final class BindingService implements IBindingService { * org.eclipse.ui.keys.IBindingService#readRegistryAndPreferences(org.eclipse * .ui.commands.ICommandService) */ + @Override public void readRegistryAndPreferences(ICommandService commandService) { bp.read(); } @@ -397,6 +420,7 @@ public final class BindingService implements IBindingService { * org.eclipse.ui.keys.IBindingService#savePreferences(org.eclipse.jface * .bindings.Scheme, org.eclipse.jface.bindings.Binding[]) */ + @Override public void savePreferences(Scheme activeScheme, Binding[] bindings) throws IOException { saveLegacyPreferences(activeScheme, bindings); persistToModel(activeScheme); @@ -581,6 +605,7 @@ public final class BindingService implements IBindingService { * * @see org.eclipse.ui.keys.IBindingService#setKeyFilterEnabled(boolean) */ + @Override public void setKeyFilterEnabled(boolean enabled) { if (dispatcher != null) { dispatcher.getKeyDownFilter().setEnabled(enabled); @@ -594,6 +619,7 @@ public final class BindingService implements IBindingService { * org.eclipse.ui.keys.IBindingService#getConflictsFor(org.eclipse.jface * .bindings.TriggerSequence) */ + @Override public Collection<Binding> getConflictsFor(TriggerSequence sequence) { return bindingService.getConflictsFor(sequence); } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/keys/CancelOnModifyListener.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/keys/CancelOnModifyListener.java index d00a83e7672..070eaf445f0 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/keys/CancelOnModifyListener.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/keys/CancelOnModifyListener.java @@ -46,7 +46,8 @@ final class CancelOnModifyListener implements Listener { * * @see org.eclipse.swt.widgets.Listener#handleEvent(org.eclipse.swt.widgets.Event) */ - public void handleEvent(Event event) { + @Override + public void handleEvent(Event event) { Widget widget = event.widget; widget.removeListener(SWT.Modify, this); widget.removeListener(SWT.KeyDown, chainedListener); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/keys/CategoryPatternFilter.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/keys/CategoryPatternFilter.java index 677c641e26d..88d3d34eae2 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/keys/CategoryPatternFilter.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/keys/CategoryPatternFilter.java @@ -47,6 +47,7 @@ class CategoryPatternFilter extends PatternFilter { * @see org.eclipse.ui.dialogs.PatternFilter#isLeafMatch(org.eclipse.jface.viewers.Viewer, * java.lang.Object) */ + @Override protected boolean isLeafMatch(Viewer viewer, Object element) { if (filterCategories) { final ParameterizedCommand cmd = getCommand(element); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/keys/CompactKeyFormatter.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/keys/CompactKeyFormatter.java index ff6c55c1410..2dfbe3714d5 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/keys/CompactKeyFormatter.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/keys/CompactKeyFormatter.java @@ -37,7 +37,8 @@ public class CompactKeyFormatter extends NativeKeyFormatter { * * @see org.eclipse.ui.keys.KeyFormatter#format(org.eclipse.ui.keys.KeySequence) */ - public String format(KeySequence keySequence) { + @Override + public String format(KeySequence keySequence) { StringBuffer stringBuffer = new StringBuffer(); List keyStrokes = keySequence.getKeyStrokes(); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/keys/EmacsKeyFormatter.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/keys/EmacsKeyFormatter.java index 684e64623ab..7ba6e40d684 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/keys/EmacsKeyFormatter.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/keys/EmacsKeyFormatter.java @@ -49,7 +49,8 @@ public class EmacsKeyFormatter extends AbstractKeyFormatter { * The key to format; must not be <code>null</code>. * @return The key formatted as a string; should not be <code>null</code>. */ - public String format(Key key) { + @Override + public String format(Key key) { if (key instanceof ModifierKey) { String formattedName = Util.translateString(RESOURCE_BUNDLE, key .toString(), null, false, false); @@ -66,7 +67,8 @@ public class EmacsKeyFormatter extends AbstractKeyFormatter { * * @see org.eclipse.ui.keys.AbstractKeyFormatter#getKeyDelimiter() */ - protected String getKeyDelimiter() { + @Override + protected String getKeyDelimiter() { return Util.translateString(RESOURCE_BUNDLE, KEY_DELIMITER_KEY, KeyStroke.KEY_DELIMITER, false, false); } @@ -76,7 +78,8 @@ public class EmacsKeyFormatter extends AbstractKeyFormatter { * * @see org.eclipse.ui.keys.AbstractKeyFormatter#getKeyStrokeDelimiter() */ - protected String getKeyStrokeDelimiter() { + @Override + protected String getKeyStrokeDelimiter() { return Util.translateString(RESOURCE_BUNDLE, KEY_STROKE_DELIMITER_KEY, KeySequence.KEY_STROKE_DELIMITER, false, false); } @@ -86,7 +89,8 @@ public class EmacsKeyFormatter extends AbstractKeyFormatter { * * @see org.eclipse.ui.keys.AbstractKeyFormatter#getModifierKeyComparator() */ - protected Comparator getModifierKeyComparator() { + @Override + protected Comparator getModifierKeyComparator() { return EMACS_MODIFIER_KEY_COMPARATOR; } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/keys/FormalKeyFormatter.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/keys/FormalKeyFormatter.java index 1c7dc75cbe8..677d61ed97b 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/keys/FormalKeyFormatter.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/keys/FormalKeyFormatter.java @@ -36,7 +36,8 @@ public class FormalKeyFormatter extends AbstractKeyFormatter { * * @see org.eclipse.ui.keys.KeyFormatter#format(org.eclipse.ui.keys.KeySequence) */ - public String format(Key key) { + @Override + public String format(Key key) { return key.toString(); } @@ -45,7 +46,8 @@ public class FormalKeyFormatter extends AbstractKeyFormatter { * * @see org.eclipse.ui.keys.AbstractKeyFormatter#getKeyDelimiter() */ - protected String getKeyDelimiter() { + @Override + protected String getKeyDelimiter() { return KeyStroke.KEY_DELIMITER; } @@ -54,7 +56,8 @@ public class FormalKeyFormatter extends AbstractKeyFormatter { * * @see org.eclipse.ui.keys.AbstractKeyFormatter#getKeyStrokeDelimiter() */ - protected String getKeyStrokeDelimiter() { + @Override + protected String getKeyStrokeDelimiter() { return KeySequence.KEY_STROKE_DELIMITER; } @@ -63,7 +66,8 @@ public class FormalKeyFormatter extends AbstractKeyFormatter { * * @see org.eclipse.ui.keys.AbstractKeyFormatter#getModifierKeyComparator() */ - protected Comparator getModifierKeyComparator() { + @Override + protected Comparator getModifierKeyComparator() { return FORMAL_MODIFIER_KEY_COMPARATOR; } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/keys/KdeKeyFormatter.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/keys/KdeKeyFormatter.java index f38c4a76f7b..8fbc20269d9 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/keys/KdeKeyFormatter.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/keys/KdeKeyFormatter.java @@ -24,7 +24,8 @@ public final class KdeKeyFormatter extends AbstractKeyFormatter { private final static class KdeModifierKeyComparator extends AbstractModifierKeyComparator { - protected int rank(ModifierKey modifierKey) { + @Override + protected int rank(ModifierKey modifierKey) { if (ModifierKey.ALT.equals(modifierKey)) { return 0; } @@ -46,17 +47,20 @@ public final class KdeKeyFormatter extends AbstractKeyFormatter { private final static ResourceBundle RESOURCE_BUNDLE = ResourceBundle .getBundle(KdeKeyFormatter.class.getName()); - protected String getKeyDelimiter() { + @Override + protected String getKeyDelimiter() { return Util.translateString(RESOURCE_BUNDLE, KEY_DELIMITER_KEY, KeyStroke.KEY_DELIMITER, false, false); } - protected String getKeyStrokeDelimiter() { + @Override + protected String getKeyStrokeDelimiter() { return Util.translateString(RESOURCE_BUNDLE, KEY_STROKE_DELIMITER_KEY, KeySequence.KEY_STROKE_DELIMITER, false, false); } - protected Comparator getModifierKeyComparator() { + @Override + protected Comparator getModifierKeyComparator() { return MODIFIER_KEY_COMPARATOR; } } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/keys/KeySequenceBinding.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/keys/KeySequenceBinding.java index a17e95b1ff6..11e97036308 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/keys/KeySequenceBinding.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/keys/KeySequenceBinding.java @@ -53,7 +53,8 @@ public final class KeySequenceBinding implements IKeySequenceBinding { this.match = match; } - public int compareTo(Object object) { + @Override + public int compareTo(Object object) { KeySequenceBinding castedObject = (KeySequenceBinding) object; int compareTo = Util.compare(match, castedObject.match); @@ -64,7 +65,8 @@ public final class KeySequenceBinding implements IKeySequenceBinding { return compareTo; } - public boolean equals(Object object) { + @Override + public boolean equals(Object object) { if (!(object instanceof KeySequenceBinding)) { return false; } @@ -77,7 +79,8 @@ public final class KeySequenceBinding implements IKeySequenceBinding { return Util.equals(match, castedObject.match); } - public KeySequence getKeySequence() { + @Override + public KeySequence getKeySequence() { return keySequence; } @@ -85,7 +88,8 @@ public final class KeySequenceBinding implements IKeySequenceBinding { return match; } - public int hashCode() { + @Override + public int hashCode() { if (!hashCodeComputed) { hashCode = HASH_INITIAL; hashCode = hashCode * HASH_FACTOR + Util.hashCode(keySequence); @@ -96,7 +100,8 @@ public final class KeySequenceBinding implements IKeySequenceBinding { return hashCode; } - public String toString() { + @Override + public String toString() { if (string == null) { final StringBuffer stringBuffer = new StringBuffer(); stringBuffer.append('['); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/keys/KeysPreferenceFiltersDialog.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/keys/KeysPreferenceFiltersDialog.java index a10f590ab7c..eb3c39de2bb 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/keys/KeysPreferenceFiltersDialog.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/keys/KeysPreferenceFiltersDialog.java @@ -74,6 +74,7 @@ public class KeysPreferenceFiltersDialog extends ViewSettingsDialog { * * @see org.eclipse.ui.preferences.ViewSettingsDialog#performDefaults() */ + @Override protected void performDefaults() { actionSetFilterCheckBox.setSelection(true); internalFilterCheckBox.setSelection(true); @@ -86,6 +87,7 @@ public class KeysPreferenceFiltersDialog extends ViewSettingsDialog { * * @see org.eclipse.jface.dialogs.Dialog#createDialogArea(org.eclipse.swt.widgets.Composite) */ + @Override protected Control createDialogArea(Composite parent) { Composite topComposite = (Composite) super.createDialogArea(parent); GridLayout layout = new GridLayout(1, false); @@ -114,6 +116,7 @@ public class KeysPreferenceFiltersDialog extends ViewSettingsDialog { * * @see org.eclipse.jface.dialogs.Dialog#okPressed() */ + @Override protected void okPressed() { filterActionSet = actionSetFilterCheckBox.getSelection(); filterInternal = internalFilterCheckBox.getSelection(); @@ -126,6 +129,7 @@ public class KeysPreferenceFiltersDialog extends ViewSettingsDialog { * * @see org.eclipse.jface.window.Window#configureShell(org.eclipse.swt.widgets.Shell) */ + @Override protected void configureShell(Shell newShell) { super.configureShell(newShell); newShell diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/keys/KeysPreferencePage.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/keys/KeysPreferencePage.java index e63be2c3b33..3241c82fca9 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/keys/KeysPreferencePage.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/keys/KeysPreferencePage.java @@ -143,6 +143,7 @@ public final class KeysPreferencePage extends PreferencePage implements * * @see org.eclipse.swt.events.SelectionListener#widgetSelected(org.eclipse.swt.events.SelectionEvent) */ + @Override public void widgetSelected(SelectionEvent e) { // Change the column titles. final int oldSortIndex = sortOrder[0]; @@ -519,11 +520,13 @@ public final class KeysPreferencePage extends PreferencePage implements /* (non-Javadoc) * @see org.eclipse.jface.preference.PreferencePage#applyData(java.lang.Object) */ + @Override public void applyData(Object data) { if(data instanceof Binding) { editBinding((Binding) data); } } + @Override protected final Control createContents(final Composite parent) { PlatformUI.getWorkbench().getHelpSystem() @@ -586,6 +589,7 @@ public final class KeysPreferencePage extends PreferencePage implements comboScheme.setVisibleItemCount(ITEMS_TO_SHOW); comboScheme.addSelectionListener(new SelectionAdapter() { + @Override public final void widgetSelected(final SelectionEvent e) { selectedComboScheme(); } @@ -620,6 +624,7 @@ public final class KeysPreferencePage extends PreferencePage implements comboCategory.setVisibleItemCount(ITEMS_TO_SHOW); comboCategory.addSelectionListener(new SelectionAdapter() { + @Override public final void widgetSelected(final SelectionEvent e) { update(); } @@ -638,6 +643,7 @@ public final class KeysPreferencePage extends PreferencePage implements comboCommand.setVisibleItemCount(9); comboCommand.addSelectionListener(new SelectionAdapter() { + @Override public final void widgetSelected(final SelectionEvent e) { update(); } @@ -680,6 +686,7 @@ public final class KeysPreferencePage extends PreferencePage implements tableBindingsForCommand.addMouseListener(new MouseAdapter() { + @Override public void mouseDoubleClick(MouseEvent mouseEvent) { update(); } @@ -687,6 +694,7 @@ public final class KeysPreferencePage extends PreferencePage implements tableBindingsForCommand.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent selectionEvent) { selectedTableBindingsForCommand(); } @@ -715,20 +723,24 @@ public final class KeysPreferencePage extends PreferencePage implements gridData.widthHint = 300; textTriggerSequence.setLayoutData(gridData); textTriggerSequence.addModifyListener(new ModifyListener() { + @Override public void modifyText(ModifyEvent e) { update(); } }); textTriggerSequence.addFocusListener(new FocusListener() { + @Override public void focusGained(FocusEvent e) { bindingService.setKeyFilterEnabled(false); } + @Override public void focusLost(FocusEvent e) { bindingService.setKeyFilterEnabled(true); } }); textTriggerSequence.addDisposeListener(new DisposeListener() { + @Override public void widgetDisposed(DisposeEvent e) { if (!bindingService.isKeyFilterEnabled()) { bindingService.setKeyFilterEnabled(true); @@ -772,6 +784,7 @@ public final class KeysPreferencePage extends PreferencePage implements menuItem.setText(trappedKey.format()); menuItem.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { textTriggerSequenceManager.insert(trappedKey); textTriggerSequence.setFocus(); @@ -782,6 +795,7 @@ public final class KeysPreferencePage extends PreferencePage implements } buttonAddKey.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent selectionEvent) { Point buttonLocation = buttonAddKey.getLocation(); buttonLocation = groupKeySequence.toDisplay(buttonLocation.x, @@ -829,6 +843,7 @@ public final class KeysPreferencePage extends PreferencePage implements tableBindingsForTriggerSequence.addMouseListener(new MouseAdapter() { + @Override public void mouseDoubleClick(MouseEvent mouseEvent) { update(); } @@ -837,6 +852,7 @@ public final class KeysPreferencePage extends PreferencePage implements tableBindingsForTriggerSequence .addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent selectionEvent) { selectedTableBindingsForTriggerSequence(); } @@ -858,6 +874,7 @@ public final class KeysPreferencePage extends PreferencePage implements comboContext.setVisibleItemCount(ITEMS_TO_SHOW); comboContext.addSelectionListener(new SelectionAdapter() { + @Override public final void widgetSelected(final SelectionEvent e) { update(); } @@ -884,6 +901,7 @@ public final class KeysPreferencePage extends PreferencePage implements buttonAdd.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent selectionEvent) { selectedButtonAdd(); } @@ -900,6 +918,7 @@ public final class KeysPreferencePage extends PreferencePage implements buttonRemove.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent selectionEvent) { selectedButtonRemove(); } @@ -916,6 +935,7 @@ public final class KeysPreferencePage extends PreferencePage implements buttonRestore.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent selectionEvent) { selectedButtonRestore(); } @@ -981,6 +1001,7 @@ public final class KeysPreferencePage extends PreferencePage implements tableColumnContext.addSelectionListener(new SortOrderSelectionListener( VIEW_CONTEXT_COLUMN_INDEX)); tableBindings.addSelectionListener(new SelectionAdapter() { + @Override public final void widgetDefaultSelected(final SelectionEvent e) { selectedTableKeyBindings(); } @@ -1008,6 +1029,7 @@ public final class KeysPreferencePage extends PreferencePage implements * * @see org.eclipse.swt.events.SelectionListener#widgetDefaultSelected(org.eclipse.swt.events.SelectionEvent) */ + @Override public final void widgetDefaultSelected(final SelectionEvent event) { selectedTableKeyBindings(); } @@ -1017,6 +1039,7 @@ public final class KeysPreferencePage extends PreferencePage implements * * @see org.eclipse.swt.events.SelectionListener#widgetSelected(org.eclipse.swt.events.SelectionEvent) */ + @Override public void widgetSelected(SelectionEvent e) { widgetDefaultSelected(e); } @@ -1038,6 +1061,7 @@ public final class KeysPreferencePage extends PreferencePage implements * * @see org.eclipse.swt.events.SelectionListener#widgetDefaultSelected(org.eclipse.swt.events.SelectionEvent) */ + @Override public final void widgetDefaultSelected(final SelectionEvent event) { selectedButtonExport(); } @@ -1047,6 +1071,7 @@ public final class KeysPreferencePage extends PreferencePage implements * * @see org.eclipse.swt.events.SelectionListener#widgetSelected(org.eclipse.swt.events.SelectionEvent) */ + @Override public void widgetSelected(SelectionEvent e) { widgetDefaultSelected(e); } @@ -1055,6 +1080,7 @@ public final class KeysPreferencePage extends PreferencePage implements return composite; } + @Override protected IPreferenceStore doGetPreferenceStore() { return PrefUtil.getInternalPreferenceStore(); } @@ -1215,6 +1241,7 @@ public final class KeysPreferencePage extends PreferencePage implements : null; } + @Override public final void init(final IWorkbench workbench) { activityManager = workbench.getActivitySupport().getActivityManager(); bindingService = (IBindingService) workbench.getService(IBindingService.class); @@ -1258,6 +1285,7 @@ public final class KeysPreferencePage extends PreferencePage implements StatusUtil.handleStatus(message, exception, StatusManager.SHOW); } + @Override public final boolean performCancel() { // Save the selected tab for future reference. persistSelectedTab(); @@ -1265,6 +1293,7 @@ public final class KeysPreferencePage extends PreferencePage implements return super.performCancel(); } + @Override protected final void performDefaults() { // Ask the user to confirm final String title = Util.translateString(RESOURCE_BUNDLE, @@ -1313,6 +1342,7 @@ public final class KeysPreferencePage extends PreferencePage implements super.performDefaults(); } + @Override public final boolean performOk() { // Save the preferences. try { @@ -1376,6 +1406,7 @@ public final class KeysPreferencePage extends PreferencePage implements } final SafeRunnable runnable = new SafeRunnable() { + @Override public final void run() throws IOException { Writer fileWriter = null; try { @@ -1620,6 +1651,7 @@ public final class KeysPreferencePage extends PreferencePage implements * Builds the internal look-up tables before allowing the page to become * visible. */ + @Override public final void setVisible(final boolean visible) { if (visible == true) { Map contextsByName = new HashMap(); @@ -2006,6 +2038,7 @@ public final class KeysPreferencePage extends PreferencePage implements // this comparator is based on the ParameterizedCommands#compareTo(*) // method, but uses the collator. Comparator comparator = new Comparator() { + @Override public int compare(Object o1, Object o2) { String name1 = null; String name2 = null; @@ -2322,6 +2355,7 @@ public final class KeysPreferencePage extends PreferencePage implements * comparison is based on the current sort order. * @since 3.1 */ + @Override public final int compare(final Object object1, final Object object2) { final Binding binding1 = (Binding) object1; final Binding binding2 = (Binding) object2; @@ -2422,6 +2456,7 @@ public final class KeysPreferencePage extends PreferencePage implements /** * @see Object#equals(java.lang.Object) */ + @Override public final boolean equals(final Object object) { return super.equals(object); } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/keys/LegacySchemeListenerWrapper.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/keys/LegacySchemeListenerWrapper.java index 2b816b5fedf..43663ff114c 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/keys/LegacySchemeListenerWrapper.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/keys/LegacySchemeListenerWrapper.java @@ -56,6 +56,7 @@ final class LegacySchemeListenerWrapper implements ISchemeListener { this.bindingManager = bindingManager; } + @Override public final boolean equals(final Object object) { if (object instanceof LegacySchemeListenerWrapper) { final LegacySchemeListenerWrapper wrapper = (LegacySchemeListenerWrapper) object; @@ -70,6 +71,7 @@ final class LegacySchemeListenerWrapper implements ISchemeListener { return false; } + @Override public final int hashCode() { return listener.hashCode(); } @@ -79,6 +81,7 @@ final class LegacySchemeListenerWrapper implements ISchemeListener { * * @see org.eclipse.jface.bindings.ISchemeListener#schemeChanged(org.eclipse.jface.bindings.SchemeEvent) */ + @Override public final void schemeChanged(final SchemeEvent schemeEvent) { final IKeyConfiguration keyConfiguration = new SchemeLegacyWrapper( schemeEvent.getScheme(), bindingManager); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/keys/MacKeyFormatter.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/keys/MacKeyFormatter.java index 5e1305d4898..eaab24240c0 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/keys/MacKeyFormatter.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/keys/MacKeyFormatter.java @@ -27,7 +27,8 @@ public final class MacKeyFormatter extends AbstractKeyFormatter { private final static class MacModifierKeyComparator extends AbstractModifierKeyComparator { - protected int rank(ModifierKey modifierKey) { + @Override + protected int rank(ModifierKey modifierKey) { if (ModifierKey.SHIFT.equals(modifierKey)) { return 0; } @@ -79,22 +80,26 @@ public final class MacKeyFormatter extends AbstractKeyFormatter { KEY_LOOKUP.put(SpecialKey.PAGE_UP.toString(), "\u21DE"); //$NON-NLS-1$ } - public String format(Key key) { + @Override + public String format(Key key) { String string = (String) KEY_LOOKUP.get(key.toString()); return string != null ? string : super.format(key); } - protected String getKeyDelimiter() { + @Override + protected String getKeyDelimiter() { return Util.translateString(RESOURCE_BUNDLE, KEY_DELIMITER_KEY, Util.ZERO_LENGTH_STRING, false, false); } - protected String getKeyStrokeDelimiter() { + @Override + protected String getKeyStrokeDelimiter() { return Util.translateString(RESOURCE_BUNDLE, KEY_STROKE_DELIMITER_KEY, KeySequence.KEY_STROKE_DELIMITER, false, false); } - protected Comparator getModifierKeyComparator() { + @Override + protected Comparator getModifierKeyComparator() { return MODIFIER_KEY_COMPARATOR; } } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/keys/NativeKeyFormatter.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/keys/NativeKeyFormatter.java index 0a8beb5b61f..b799da8ad3b 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/keys/NativeKeyFormatter.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/keys/NativeKeyFormatter.java @@ -93,7 +93,8 @@ public class NativeKeyFormatter extends AbstractKeyFormatter { * The key to format; must not be <code>null</code>. * @return The key formatted as a string; should not be <code>null</code>. */ - public String format(Key key) { + @Override + public String format(Key key) { String name = key.toString(); // TODO consider platform-specific resource bundles @@ -112,7 +113,8 @@ public class NativeKeyFormatter extends AbstractKeyFormatter { * * @see org.eclipse.ui.keys.AbstractKeyFormatter#getKeyDelimiter() */ - protected String getKeyDelimiter() { + @Override + protected String getKeyDelimiter() { // We must do the look up every time, as our locale might change. if (org.eclipse.jface.util.Util.isMac()) { return Util.translateString(RESOURCE_BUNDLE, @@ -129,7 +131,8 @@ public class NativeKeyFormatter extends AbstractKeyFormatter { * * @see org.eclipse.ui.keys.AbstractKeyFormatter#getKeyStrokeDelimiter() */ - protected String getKeyStrokeDelimiter() { + @Override + protected String getKeyStrokeDelimiter() { // We must do the look up every time, as our locale might change. if (org.eclipse.jface.util.Util.isWindows()) { return Util.translateString(RESOURCE_BUNDLE, @@ -147,7 +150,8 @@ public class NativeKeyFormatter extends AbstractKeyFormatter { * * @see org.eclipse.ui.keys.AbstractKeyFormatter#getModifierKeyComparator() */ - protected Comparator getModifierKeyComparator() { + @Override + protected Comparator getModifierKeyComparator() { return MODIFIER_KEY_COMPARATOR; } } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/keys/NativeModifierKeyComparator.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/keys/NativeModifierKeyComparator.java index 10fcf4c31b1..a395de1f8ac 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/keys/NativeModifierKeyComparator.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/keys/NativeModifierKeyComparator.java @@ -35,7 +35,8 @@ class NativeModifierKeyComparator implements Comparator { * * @see java.lang.Comparable#compareTo(java.lang.Object) */ - public int compare(Object left, Object right) { + @Override + public int compare(Object left, Object right) { ModifierKey modifierKeyLeft = (ModifierKey) left; ModifierKey modifierKeyRight = (ModifierKey) right; int modifierKeyLeftRank = rank(modifierKeyLeft); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/keys/NewKeysPreferencePage.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/keys/NewKeysPreferencePage.java index fd2b5091f98..8512e08b010 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/keys/NewKeysPreferencePage.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/keys/NewKeysPreferencePage.java @@ -260,6 +260,7 @@ public class NewKeysPreferencePage extends PreferencePage implements this.ascending = ascending; } + @Override public final int compare(final Viewer viewer, final Object a, final Object b) { int result = 0; @@ -312,6 +313,7 @@ public class NewKeysPreferencePage extends PreferencePage implements this.column = column; } + @Override public void widgetSelected(SelectionEvent e) { if (comparator.getSortColumn() == column) { comparator.setAscending(!comparator.isAscending()); @@ -336,6 +338,7 @@ public class NewKeysPreferencePage extends PreferencePage implements * * @see org.eclipse.jface.viewers.LabelProvider#getText(java.lang.Object) */ + @Override public String getText(Object element) { return ((ModelElement) element).getName(); } @@ -349,6 +352,7 @@ public class NewKeysPreferencePage extends PreferencePage implements private final LocalResourceManager localResourceManager = new LocalResourceManager( JFaceResources.getResources()); + @Override public final void dispose() { super.dispose(); localResourceManager.dispose(); @@ -359,6 +363,7 @@ public class NewKeysPreferencePage extends PreferencePage implements * * @see org.eclipse.jface.viewers.LabelProvider#getText(java.lang.Object) */ + @Override public String getText(Object element) { String rc = getColumnText(element, 0); if (rc == null) { @@ -375,6 +380,7 @@ public class NewKeysPreferencePage extends PreferencePage implements return buf.toString(); } + @Override public String getColumnText(Object element, int index) { BindingElement bindingElement = ((BindingElement) element); switch (index) { @@ -404,6 +410,7 @@ public class NewKeysPreferencePage extends PreferencePage implements return null; } + @Override public Image getColumnImage(Object element, int index) { BindingElement be = (BindingElement) element; switch (index) { @@ -443,6 +450,7 @@ public class NewKeysPreferencePage extends PreferencePage implements } class ModelContentProvider implements ITreeContentProvider { + @Override public Object[] getChildren(Object parentElement) { if (parentElement instanceof BindingModel) { return ((BindingModel) parentElement).getBindings().toArray(); @@ -456,23 +464,28 @@ public class NewKeysPreferencePage extends PreferencePage implements return new Object[0]; } + @Override public Object getParent(Object element) { return ((ModelElement) element).getParent(); } + @Override public boolean hasChildren(Object element) { return (element instanceof BindingModel) || (element instanceof ContextModel) || (element instanceof SchemeModel); } + @Override public Object[] getElements(Object inputElement) { return getChildren(inputElement); } + @Override public void dispose() { } + @Override public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { } @@ -483,6 +496,7 @@ public class NewKeysPreferencePage extends PreferencePage implements * * @see org.eclipse.jface.preference.PreferencePage#createContents(org.eclipse.swt.widgets.Composite) */ + @Override protected Control createContents(Composite parent) { PlatformUI.getWorkbench().getHelpSystem().setHelp(parent, IWorkbenchHelpContextIds.KEYS_PREFERENCE_PAGE); @@ -560,9 +574,11 @@ public class NewKeysPreferencePage extends PreferencePage implements SWT.DEFAULT, SWT.DEFAULT, true).x) + 5; filtersButton.setLayoutData(gridData); filtersButton.addSelectionListener(new SelectionListener() { + @Override public void widgetDefaultSelected(SelectionEvent e) { } + @Override public void widgetSelected(SelectionEvent e) { KeysPreferenceFiltersDialog dialog = new KeysPreferenceFiltersDialog( getShell()); @@ -598,9 +614,11 @@ public class NewKeysPreferencePage extends PreferencePage implements exportButton.setLayoutData(gridData); exportButton.addSelectionListener(new SelectionListener() { + @Override public void widgetDefaultSelected(SelectionEvent e) { } + @Override public void widgetSelected(SelectionEvent e) { keyController.exportCSV(((Button) e.getSource()).getShell()); } @@ -670,15 +688,18 @@ public class NewKeysPreferencePage extends PreferencePage implements fBindingText.setLayoutData(gridData); fBindingText.addFocusListener(new FocusListener() { + @Override public void focusGained(FocusEvent e) { fBindingService.setKeyFilterEnabled(false); } + @Override public void focusLost(FocusEvent e) { fBindingService.setKeyFilterEnabled(true); } }); fBindingText.addDisposeListener(new DisposeListener() { + @Override public void widgetDisposed(DisposeEvent e) { if (!fBindingService.isKeyFilterEnabled()) { fBindingService.setKeyFilterEnabled(true); @@ -690,6 +711,7 @@ public class NewKeysPreferencePage extends PreferencePage implements fKeySequenceText.setKeyStrokeLimit(4); fKeySequenceText .addPropertyChangeListener(new IPropertyChangeListener() { + @Override public final void propertyChange( final PropertyChangeEvent event) { if (!event.getOldValue().equals(event.getNewValue())) { @@ -742,6 +764,7 @@ public class NewKeysPreferencePage extends PreferencePage implements menuItem.setText(trappedKey.format()); menuItem.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { fKeySequenceText.insert(trappedKey); fBindingText.setFocus(); @@ -751,6 +774,7 @@ public class NewKeysPreferencePage extends PreferencePage implements } addKeyButton.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent selectionEvent) { Point buttonLocation = addKeyButton.getLocation(); buttonLocation = dataArea.toDisplay(buttonLocation.x, @@ -779,6 +803,7 @@ public class NewKeysPreferencePage extends PreferencePage implements fWhenCombo.setContentProvider(new ModelContentProvider()); fWhenCombo.setLabelProvider(new ListLabelProvider()); fWhenCombo.addSelectionChangedListener(new ISelectionChangedListener() { + @Override public final void selectionChanged(final SelectionChangedEvent event) { ContextElement context = (ContextElement) ((IStructuredSelection) event .getSelection()).getFirstElement(); @@ -790,6 +815,7 @@ public class NewKeysPreferencePage extends PreferencePage implements IPropertyChangeListener whenListener = new IPropertyChangeListener() { // Sets the combo selection when a new keybinding is selected? + @Override public void propertyChange(PropertyChangeEvent event) { if (event.getSource() == keyController.getContextModel() && CommonModel.PROP_SELECTED_ELEMENT.equals(event @@ -840,6 +866,7 @@ public class NewKeysPreferencePage extends PreferencePage implements table.setLayout(tableLayout); conflictViewer.setContentProvider(new IStructuredContentProvider() { + @Override public Object[] getElements(Object inputElement) { if (inputElement instanceof Collection) { return ((Collection) inputElement).toArray(); @@ -847,14 +874,17 @@ public class NewKeysPreferencePage extends PreferencePage implements return new Object[0]; } + @Override public void dispose() { } + @Override public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { } }); conflictViewer.setLabelProvider(new BindingElementLabelProvider() { + @Override public String getColumnText(Object o, int index) { BindingElement element = (BindingElement) o; if (index == 0) { @@ -868,6 +898,7 @@ public class NewKeysPreferencePage extends PreferencePage implements // When the conflict viewer's selection changes, update the // model's current selection + @Override public void selectionChanged(SelectionChangedEvent event) { ModelElement binding = (ModelElement) ((IStructuredSelection) event .getSelection()).getFirstElement(); @@ -902,6 +933,7 @@ public class NewKeysPreferencePage extends PreferencePage implements }); IPropertyChangeListener conflictsListener = new IPropertyChangeListener() { + @Override public void propertyChange(PropertyChangeEvent event) { if (event.getSource() == keyController.getConflictModel() && CommonModel.PROP_SELECTED_ELEMENT.equals(event @@ -928,6 +960,7 @@ public class NewKeysPreferencePage extends PreferencePage implements IPropertyChangeListener dataUpdateListener = new IPropertyChangeListener() { + @Override public void propertyChange(PropertyChangeEvent event) { BindingElement bindingElement = null; boolean weCare = false; @@ -1045,6 +1078,7 @@ public class NewKeysPreferencePage extends PreferencePage implements // When the viewer changes selection, update the model's current // selection + @Override public void selectionChanged(SelectionChangedEvent event) { ModelElement binding = (ModelElement) ((IStructuredSelection) event .getSelection()).getFirstElement(); @@ -1055,6 +1089,7 @@ public class NewKeysPreferencePage extends PreferencePage implements IPropertyChangeListener treeUpdateListener = new IPropertyChangeListener() { // When the model changes a property, update the viewer + @Override public void propertyChange(PropertyChangeEvent event) { if (event.getSource() == keyController.getBindingModel() && CommonModel.PROP_SELECTED_ELEMENT.equals(event @@ -1114,6 +1149,7 @@ public class NewKeysPreferencePage extends PreferencePage implements SWT.DEFAULT, SWT.DEFAULT, true).x) + 5; addBindingButton.setLayoutData(gridData); addBindingButton.addSelectionListener(new SelectionAdapter() { + @Override public final void widgetSelected(final SelectionEvent event) { keyController.getBindingModel().copy(); } @@ -1128,6 +1164,7 @@ public class NewKeysPreferencePage extends PreferencePage implements .computeSize(SWT.DEFAULT, SWT.DEFAULT, true).x) + 5; removeBindingButton.setLayoutData(gridData); removeBindingButton.addSelectionListener(new SelectionAdapter() { + @Override public final void widgetSelected(final SelectionEvent event) { keyController.getBindingModel().remove(); } @@ -1141,6 +1178,7 @@ public class NewKeysPreferencePage extends PreferencePage implements SWT.DEFAULT, SWT.DEFAULT, true).x) + 5; restore.setLayoutData(gridData); restore.addSelectionListener(new SelectionAdapter() { + @Override public final void widgetSelected(final SelectionEvent event) { try { fFilteredTree.setRedraw(false); @@ -1192,10 +1230,12 @@ public class NewKeysPreferencePage extends PreferencePage implements fSchemeCombo.getCombo().setLayoutData(gridData); fSchemeCombo .addSelectionChangedListener(new ISelectionChangedListener() { + @Override public final void selectionChanged( final SelectionChangedEvent event) { BusyIndicator.showWhile(fFilteredTree.getViewer() .getTree().getDisplay(), new Runnable() { + @Override public void run() { SchemeElement scheme = (SchemeElement) ((IStructuredSelection) event .getSelection()).getFirstElement(); @@ -1207,6 +1247,7 @@ public class NewKeysPreferencePage extends PreferencePage implements }); IPropertyChangeListener listener = new IPropertyChangeListener() { + @Override public void propertyChange(PropertyChangeEvent event) { if (event.getSource() == keyController.getSchemeModel() && CommonModel.PROP_SELECTED_ELEMENT.equals(event @@ -1227,6 +1268,7 @@ public class NewKeysPreferencePage extends PreferencePage implements * * @see org.eclipse.ui.IWorkbenchPreferencePage#init(org.eclipse.ui.IWorkbench) */ + @Override public void init(IWorkbench workbench) { keyController = new KeyController(); keyController.init(workbench); @@ -1241,6 +1283,7 @@ public class NewKeysPreferencePage extends PreferencePage implements .getService(ICommandImageService.class); } + @Override public void applyData(Object data) { if (data instanceof ModelElement) { keyController.getBindingModel().setSelectedElement( @@ -1268,6 +1311,7 @@ public class NewKeysPreferencePage extends PreferencePage implements * * @see org.eclipse.jface.preference.PreferencePage#performOk() */ + @Override public boolean performOk() { keyController.saveBindings(fBindingService); saveState(getDialogSettings()); @@ -1302,6 +1346,7 @@ public class NewKeysPreferencePage extends PreferencePage implements return settings; } + @Override protected final void performDefaults() { // Ask the user to confirm @@ -1319,6 +1364,7 @@ public class NewKeysPreferencePage extends PreferencePage implements fFilteredTree.setRedraw(false); BusyIndicator.showWhile(fFilteredTree.getViewer().getTree() .getDisplay(), new Runnable() { + @Override public void run() { keyController.setDefaultBindings(fBindingService); } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/keys/NoKeysPreferencePage.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/keys/NoKeysPreferencePage.java index b79ff2006c8..74795862f7a 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/keys/NoKeysPreferencePage.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/keys/NoKeysPreferencePage.java @@ -24,6 +24,7 @@ public class NoKeysPreferencePage extends PreferencePage implements IWorkbenchPr /* (non-Javadoc) * @see org.eclipse.ui.IWorkbenchPreferencePage#init(org.eclipse.ui.IWorkbench) */ + @Override public void init(IWorkbench workbench) { // do nothing, we don't have content } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/keys/SchemeLegacyWrapper.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/keys/SchemeLegacyWrapper.java index 8db28f438f5..25c4492178a 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/keys/SchemeLegacyWrapper.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/keys/SchemeLegacyWrapper.java @@ -64,6 +64,7 @@ public final class SchemeLegacyWrapper implements IKeyConfiguration { * * @see org.eclipse.ui.commands.IKeyConfiguration#addKeyConfigurationListener(org.eclipse.ui.commands.IKeyConfigurationListener) */ + @Override public void addKeyConfigurationListener( IKeyConfigurationListener keyConfigurationListener) { scheme.addSchemeListener(new LegacySchemeListenerWrapper( @@ -75,6 +76,7 @@ public final class SchemeLegacyWrapper implements IKeyConfiguration { * * @see java.lang.Comparable#compareTo(java.lang.Object) */ + @Override public int compareTo(Object o) { return scheme.compareTo(o); } @@ -84,6 +86,7 @@ public final class SchemeLegacyWrapper implements IKeyConfiguration { * * @see org.eclipse.ui.commands.IKeyConfiguration#getDescription() */ + @Override public String getDescription() throws NotDefinedException { try { return scheme.getDescription(); @@ -97,6 +100,7 @@ public final class SchemeLegacyWrapper implements IKeyConfiguration { * * @see org.eclipse.ui.commands.IKeyConfiguration#getId() */ + @Override public String getId() { return scheme.getId(); } @@ -106,6 +110,7 @@ public final class SchemeLegacyWrapper implements IKeyConfiguration { * * @see org.eclipse.ui.commands.IKeyConfiguration#getName() */ + @Override public String getName() throws NotDefinedException { try { return scheme.getName(); @@ -119,6 +124,7 @@ public final class SchemeLegacyWrapper implements IKeyConfiguration { * * @see org.eclipse.ui.commands.IKeyConfiguration#getParentId() */ + @Override public String getParentId() throws NotDefinedException { try { return scheme.getParentId(); @@ -132,6 +138,7 @@ public final class SchemeLegacyWrapper implements IKeyConfiguration { * * @see org.eclipse.ui.commands.IKeyConfiguration#isActive() */ + @Override public boolean isActive() { return scheme.getId().equals(bindingManager.getActiveScheme().getId()); } @@ -141,6 +148,7 @@ public final class SchemeLegacyWrapper implements IKeyConfiguration { * * @see org.eclipse.ui.commands.IKeyConfiguration#isDefined() */ + @Override public boolean isDefined() { return scheme.isDefined(); } @@ -150,6 +158,7 @@ public final class SchemeLegacyWrapper implements IKeyConfiguration { * * @see org.eclipse.ui.commands.IKeyConfiguration#removeKeyConfigurationListener(org.eclipse.ui.commands.IKeyConfigurationListener) */ + @Override public void removeKeyConfigurationListener( IKeyConfigurationListener keyConfigurationListener) { scheme.removeSchemeListener(new LegacySchemeListenerWrapper( diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/keys/WorkbenchKeyboard.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/keys/WorkbenchKeyboard.java index b9e06cd0aed..f6060d2603b 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/keys/WorkbenchKeyboard.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/keys/WorkbenchKeyboard.java @@ -31,6 +31,7 @@ public class WorkbenchKeyboard { * @param event * @see org.eclipse.swt.widgets.Listener#handleEvent(org.eclipse.swt.widgets.Event) */ + @Override public void handleEvent(Event event) { delegate.handleEvent(event); } @@ -39,6 +40,7 @@ public class WorkbenchKeyboard { * @return * @see java.lang.Object#toString() */ + @Override public String toString() { return delegate.toString(); } @@ -54,6 +56,7 @@ public class WorkbenchKeyboard { * @return * @see java.lang.Object#equals(java.lang.Object) */ + @Override public boolean equals(Object o) { return delegate.equals(o); } @@ -62,6 +65,7 @@ public class WorkbenchKeyboard { * @return * @see java.lang.Object#hashCode() */ + @Override public int hashCode() { return delegate.hashCode(); } @@ -70,6 +74,7 @@ public class WorkbenchKeyboard { * @return * @see java.lang.Object#toString() */ + @Override public String toString() { return delegate.toString(); } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/keys/model/ConflictModel.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/keys/model/ConflictModel.java index 7a91e3adc28..93c2773b057 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/keys/model/ConflictModel.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/keys/model/ConflictModel.java @@ -230,6 +230,7 @@ public class ConflictModel extends CommonModel { } } controller.addPropertyChangeListener(new IPropertyChangeListener() { + @Override public void propertyChange(PropertyChangeEvent event) { if (event.getSource() == ConflictModel.this && CommonModel.PROP_SELECTED_ELEMENT.equals(event diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/keys/model/KeyController.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/keys/model/KeyController.java index 463236e4d97..ea4bfc9a686 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/keys/model/KeyController.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/keys/model/KeyController.java @@ -190,6 +190,7 @@ public class KeyController { private void addSetContextListener() { addPropertyChangeListener(new IPropertyChangeListener() { + @Override public void propertyChange(PropertyChangeEvent event) { if (event.getSource() == contextModel && CommonModel.PROP_SELECTED_ELEMENT.equals(event @@ -202,6 +203,7 @@ public class KeyController { private void addSetBindingListener() { addPropertyChangeListener(new IPropertyChangeListener() { + @Override public void propertyChange(PropertyChangeEvent event) { if (event.getSource() == bindingModel && CommonModel.PROP_SELECTED_ELEMENT.equals(event @@ -224,6 +226,7 @@ public class KeyController { private void addSetConflictListener() { addPropertyChangeListener(new IPropertyChangeListener() { + @Override public void propertyChange(PropertyChangeEvent event) { if (event.getSource() == conflictModel && CommonModel.PROP_SELECTED_ELEMENT.equals(event @@ -239,6 +242,7 @@ public class KeyController { private void addSetKeySequenceListener() { addPropertyChangeListener(new IPropertyChangeListener() { + @Override public void propertyChange(PropertyChangeEvent event) { if (BindingElement.PROP_TRIGGER.equals(event.getProperty())) { updateTrigger((BindingElement) event.getSource(), @@ -251,6 +255,7 @@ public class KeyController { private void addSetModelObjectListener() { addPropertyChangeListener(new IPropertyChangeListener() { + @Override public void propertyChange(PropertyChangeEvent event) { if (event.getSource() instanceof BindingElement && ModelElement.PROP_MODEL_OBJECT.equals(event @@ -282,6 +287,7 @@ public class KeyController { private void addSetSchemeListener() { addPropertyChangeListener(new IPropertyChangeListener() { + @Override public void propertyChange(PropertyChangeEvent event) { if (event.getSource() == fSchemeModel && CommonModel.PROP_SELECTED_ELEMENT.equals(event @@ -517,6 +523,7 @@ public class KeyController { } final SafeRunnable runnable = new SafeRunnable() { + @Override public final void run() throws IOException { Writer fileWriter = null; try { diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/layout/CacheWrapper.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/layout/CacheWrapper.java index c8e70be3316..b37a55a9cbe 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/layout/CacheWrapper.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/layout/CacheWrapper.java @@ -62,7 +62,8 @@ public class CacheWrapper { private Rectangle lastBounds = new Rectangle(0, 0, 0, 0); private class WrapperLayout extends Layout implements ICachingLayout { - protected Point computeSize(Composite composite, int wHint, int hHint, + @Override + protected Point computeSize(Composite composite, int wHint, int hHint, boolean flushCache) { Control[] children = composite.getChildren(); if (children.length != 1) { @@ -74,7 +75,8 @@ public class CacheWrapper { return cache.computeSize(wHint, hHint); } - protected void layout(Composite composite, boolean flushCache) { + @Override + protected void layout(Composite composite, boolean flushCache) { Control[] children = composite.getChildren(); if (children.length != 1) { return; @@ -92,7 +94,8 @@ public class CacheWrapper { /* (non-Javadoc) * @see org.eclipse.ui.internal.layout.ICachingLayout#flush(org.eclipse.swt.widgets.Control) */ - public void flush(Control dirtyControl) { + @Override + public void flush(Control dirtyControl) { CacheWrapper.this.flushCache(); } } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/layout/CellLayout.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/layout/CellLayout.java index 11c347f1e3c..2dbdb6ea976 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/layout/CellLayout.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/layout/CellLayout.java @@ -340,7 +340,8 @@ public class CellLayout extends Layout { /* (non-Javadoc) * @see org.eclipse.swt.widgets.Layout#computeSize(org.eclipse.swt.widgets.Composite, int, int, boolean) */ - protected Point computeSize(Composite composite, int wHint, int hHint, + @Override + protected Point computeSize(Composite composite, int wHint, int hHint, boolean flushCache) { Control[] children = composite.getChildren(); initGrid(children); @@ -808,7 +809,8 @@ public class CellLayout extends Layout { /* (non-Javadoc) * @see org.eclipse.swt.widgets.Layout#layout(org.eclipse.swt.widgets.Composite, boolean) */ - protected void layout(Composite composite, boolean flushCache) { + @Override + protected void layout(Composite composite, boolean flushCache) { Control[] children = composite.getChildren(); // If there are no children then this is a NO-OP diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/layout/TrimCommonUIHandle.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/layout/TrimCommonUIHandle.java index b4a90f88beb..2265312d164 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/layout/TrimCommonUIHandle.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/layout/TrimCommonUIHandle.java @@ -100,7 +100,8 @@ public class TrimCommonUIHandle extends Composite { * This listener brings up the context menu */ private Listener menuListener = new Listener() { - public void handleEvent(Event event) { + @Override + public void handleEvent(Event event) { Point loc = new Point(event.x, event.y); if (event.type == SWT.MenuDetect) { showDockTrimPopup(loc); @@ -113,9 +114,11 @@ public class TrimCommonUIHandle extends Composite { * Coolbar and CoolItem to match. */ private ControlListener controlListener = new ControlListener() { + @Override public void controlMoved(ControlEvent e) { } + @Override public void controlResized(ControlEvent e) { if (e.widget instanceof TrimCommonUIHandle) { TrimCommonUIHandle ctrl = (TrimCommonUIHandle) e.widget; @@ -315,6 +318,7 @@ public class TrimCommonUIHandle extends Composite { /* (non-Javadoc) * @see org.eclipse.swt.widgets.Composite#computeSize(int, int, boolean) */ + @Override public Point computeSize(int wHint, int hHint, boolean changed) { Point ctrlPrefSize = trim.getControl().computeSize(wHint, hHint); if (orientation == SWT.HORIZONTAL) { @@ -335,7 +339,8 @@ public class TrimCommonUIHandle extends Composite { public ContributionItem getDockingContribution() { if (dockContributionItem == null) { dockContributionItem = new ContributionItem() { - public void fill(Menu menu, int index) { + @Override + public void fill(Menu menu, int index) { // populate from superclass super.fill(menu, index); @@ -345,10 +350,12 @@ public class TrimCommonUIHandle extends Composite { closeItem.setText(WorkbenchMessages.TrimCommon_Close); closeItem.addSelectionListener(new SelectionListener() { + @Override public void widgetSelected(SelectionEvent e) { handleCloseTrim(); } + @Override public void widgetDefaultSelected(SelectionEvent e) { } }); @@ -390,7 +397,8 @@ public class TrimCommonUIHandle extends Composite { // if the radioVal changes it means that the User wants to change the docking location radioVal.addChangeListener(new IChangeListener() { - public void update(boolean changed) { + @Override + public void update(boolean changed) { if (changed) { handleShowOnChange(); } @@ -461,7 +469,8 @@ public class TrimCommonUIHandle extends Composite { /* (non-Javadoc) * @see org.eclipse.swt.widgets.Widget#dispose() */ - public void dispose() { + @Override + public void dispose() { if (radioButtons != null) { radioButtons.dispose(); } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/layout/TrimDragPreferenceDialog.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/layout/TrimDragPreferenceDialog.java index 650b23d27b8..e5f97852ae8 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/layout/TrimDragPreferenceDialog.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/layout/TrimDragPreferenceDialog.java @@ -49,6 +49,7 @@ public class TrimDragPreferenceDialog extends Dialog { /* (non-Javadoc) * @see org.eclipse.jface.dialogs.Dialog#createDialogArea(org.eclipse.swt.widgets.Composite) */ + @Override protected Control createDialogArea(Composite parent) { Composite composite = new Composite(parent, SWT.NONE); composite.setLayout(new GridLayout(2, false)); @@ -97,6 +98,7 @@ public class TrimDragPreferenceDialog extends Dialog { /* (non-Javadoc) * @see org.eclipse.jface.dialogs.Dialog#okPressed() */ + @Override protected void okPressed() { // Update the 'threshold' pref try { diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/layout/TrimLayout.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/layout/TrimLayout.java index 61041ff6d91..2ffb3fc836a 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/layout/TrimLayout.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/layout/TrimLayout.java @@ -153,6 +153,7 @@ public class TrimLayout extends Layout implements ICachingLayout, ITrimManager { * @see #getAreaIds() * @deprecated */ + @Deprecated public void addTrim(IWindowTrim control, int areaId) { addTrim(areaId, control, null); } @@ -170,6 +171,7 @@ public class TrimLayout extends Layout implements ICachingLayout, ITrimManager { * @see #getAreaIds() * @deprecated */ + @Deprecated public void addTrim(IWindowTrim trim, int areaId, IWindowTrim beforeMe) { addTrim(areaId, trim, beforeMe); } @@ -180,6 +182,7 @@ public class TrimLayout extends Layout implements ICachingLayout, ITrimManager { * @see org.eclipse.ui.internal.layout.ITrimManager#addTrim(int, * org.eclipse.ui.internal.IWindowTrim) */ + @Override public void addTrim(int areaId, IWindowTrim trim) { // If we're adding trim to the same side that it's // already on then don't change its order @@ -204,6 +207,7 @@ public class TrimLayout extends Layout implements ICachingLayout, ITrimManager { * org.eclipse.ui.internal.IWindowTrim, * org.eclipse.ui.internal.IWindowTrim) */ + @Override public void addTrim(int areaId, IWindowTrim trim, IWindowTrim beforeMe) { TrimArea area = (TrimArea) fTrimArea.get(new Integer(areaId)); if (area == null) { @@ -231,6 +235,7 @@ public class TrimLayout extends Layout implements ICachingLayout, ITrimManager { // Add a dispose listener so we can clean up if the Client disposes the trim trim.getControl().addDisposeListener(new DisposeListener() { + @Override public void widgetDisposed(DisposeEvent e) { Control control = (Control) e.widget; if (control.getLayoutData() instanceof IWindowTrim) { @@ -261,6 +266,7 @@ public class TrimLayout extends Layout implements ICachingLayout, ITrimManager { /** * Force a layout of the trim */ + @Override public void forceLayout() { removeDisposed(); @@ -281,6 +287,7 @@ public class TrimLayout extends Layout implements ICachingLayout, ITrimManager { * * @see org.eclipse.ui.internal.layout.ITrimManager#removeTrim(org.eclipse.ui.internal.IWindowTrim) */ + @Override public void removeTrim(IWindowTrim toRemove) { TrimDescriptor desc = (TrimDescriptor) fTrimDescriptors.remove(toRemove .getId()); @@ -311,6 +318,7 @@ public class TrimLayout extends Layout implements ICachingLayout, ITrimManager { * * @see org.eclipse.ui.internal.layout.ITrimManager#getTrim(java.lang.String) */ + @Override public IWindowTrim getTrim(String id) { TrimDescriptor desc = (TrimDescriptor) fTrimDescriptors.get(id); if (desc != null) { @@ -357,6 +365,7 @@ public class TrimLayout extends Layout implements ICachingLayout, ITrimManager { * @see org.eclipse.swt.widgets.Layout#computeSize(org.eclipse.swt.widgets.Composite, * int, int, boolean) */ + @Override protected Point computeSize(Composite composite, int wHint, int hHint, boolean flushCache) { return new Point(0, 0); @@ -368,6 +377,7 @@ public class TrimLayout extends Layout implements ICachingLayout, ITrimManager { * @see org.eclipse.swt.widgets.Layout#layout(org.eclipse.swt.widgets.Composite, * boolean) */ + @Override protected void layout(Composite composite, boolean flushCache) { //long startTime = System.currentTimeMillis(); removeDisposed(); @@ -435,6 +445,7 @@ public class TrimLayout extends Layout implements ICachingLayout, ITrimManager { * * @see org.eclipse.ui.internal.layout.ICachingLayout#flush(org.eclipse.swt.widgets.Control) */ + @Override public void flush(Control dirtyControl) { if (dirtyControl == centerArea.getControl()) { centerArea.flush(); @@ -451,6 +462,7 @@ public class TrimLayout extends Layout implements ICachingLayout, ITrimManager { * * @see org.eclipse.ui.internal.layout.ITrimManager#getAreaIds() */ + @Override public int[] getAreaIds() { return (int[]) TRIM_ID_INFO.clone(); } @@ -460,6 +472,7 @@ public class TrimLayout extends Layout implements ICachingLayout, ITrimManager { * * @see org.eclipse.ui.internal.layout.ITrimManager#getAreaTrim(int) */ + @Override public List getAreaTrim(int areaId) { TrimArea area = (TrimArea) fTrimArea.get(new Integer(areaId)); if (area == null) { @@ -474,6 +487,7 @@ public class TrimLayout extends Layout implements ICachingLayout, ITrimManager { * @see org.eclipse.ui.internal.layout.ITrimManager#updateAreaTrim(int, * java.util.List, boolean) */ + @Override public void updateAreaTrim(int id, List trim, boolean removeExtra) { TrimArea area = (TrimArea) fTrimArea.get(new Integer(id)); if (area == null) { @@ -523,6 +537,7 @@ public class TrimLayout extends Layout implements ICachingLayout, ITrimManager { * * @see org.eclipse.ui.internal.layout.ITrimManager#getAllTrim() */ + @Override public List getAllTrim() { List trimList = new ArrayList(fTrimDescriptors.size()); @@ -541,6 +556,7 @@ public class TrimLayout extends Layout implements ICachingLayout, ITrimManager { * @see org.eclipse.ui.internal.layout.ITrimManager#setTrimVisible(org.eclipse.ui.internal.IWindowTrim, * boolean) */ + @Override public void setTrimVisible(IWindowTrim trim, boolean visible) { TrimDescriptor desc = findTrimDescription(trim.getControl()); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/layout/TrimToolBarBase.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/layout/TrimToolBarBase.java index 02904f27a27..95c5b1758a2 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/layout/TrimToolBarBase.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/layout/TrimToolBarBase.java @@ -90,7 +90,8 @@ public abstract class TrimToolBarBase implements IWindowTrim { */ private Listener tbListener = new Listener() { - public void handleEvent(Event event) { + @Override + public void handleEvent(Event event) { Point loc = new Point(event.x, event.y); if (event.type == SWT.MenuDetect) { showToolBarPopup(loc); @@ -102,7 +103,8 @@ public abstract class TrimToolBarBase implements IWindowTrim { * This listener brings up the context menu */ private Listener cbListener = new Listener() { - public void handleEvent(Event event) { + @Override + public void handleEvent(Event event) { Point loc = new Point(event.x, event.y); if (event.type == SWT.MenuDetect) { showDockTrimPopup(loc); @@ -270,7 +272,8 @@ public abstract class TrimToolBarBase implements IWindowTrim { private ContributionItem getDockingContribution() { if (dockContributionItem == null) { dockContributionItem = new ContributionItem() { - public void fill(Menu menu, int index) { + @Override + public void fill(Menu menu, int index) { // populate from superclass super.fill(menu, index); @@ -280,10 +283,12 @@ public abstract class TrimToolBarBase implements IWindowTrim { closeItem.setText(WorkbenchMessages.TrimCommon_Close); closeItem.addSelectionListener(new SelectionListener() { + @Override public void widgetSelected(SelectionEvent e) { handleCloseTrim(); } + @Override public void widgetDefaultSelected(SelectionEvent e) { } }); @@ -325,7 +330,8 @@ public abstract class TrimToolBarBase implements IWindowTrim { // if the radioVal changes it means that the User wants to change the docking location radioVal.addChangeListener(new IChangeListener() { - public void update(boolean changed) { + @Override + public void update(boolean changed) { if (changed) { handleShowOnChange(); } @@ -433,6 +439,7 @@ public abstract class TrimToolBarBase implements IWindowTrim { /* (non-Javadoc) * @see org.eclipse.ui.internal.layout.IWindowTrim#dock(int) */ + @Override public void dock(int dropSide) { createControl(dropSide); } @@ -440,6 +447,7 @@ public abstract class TrimToolBarBase implements IWindowTrim { /* (non-Javadoc) * @see org.eclipse.ui.internal.layout.IWindowTrim#getControl() */ + @Override public Control getControl() { if (frame == null) return null; @@ -450,6 +458,7 @@ public abstract class TrimToolBarBase implements IWindowTrim { /* (non-Javadoc) * @see org.eclipse.ui.internal.layout.IWindowTrim#getDisplayName() */ + @Override public String getDisplayName() { return id; } @@ -457,6 +466,7 @@ public abstract class TrimToolBarBase implements IWindowTrim { /* (non-Javadoc) * @see org.eclipse.ui.internal.layout.IWindowTrim#getHeightHint() */ + @Override public int getHeightHint() { return getControl().computeSize(SWT.DEFAULT, SWT.DEFAULT, true).y; } @@ -464,6 +474,7 @@ public abstract class TrimToolBarBase implements IWindowTrim { /* (non-Javadoc) * @see org.eclipse.ui.internal.layout.IWindowTrim#getId() */ + @Override public String getId() { return id; } @@ -471,6 +482,7 @@ public abstract class TrimToolBarBase implements IWindowTrim { /* (non-Javadoc) * @see org.eclipse.ui.internal.layout.IWindowTrim#getValidSides() */ + @Override public int getValidSides() { return SWT.BOTTOM | SWT.TOP | SWT.LEFT | SWT.RIGHT; } @@ -478,6 +490,7 @@ public abstract class TrimToolBarBase implements IWindowTrim { /* (non-Javadoc) * @see org.eclipse.ui.internal.layout.IWindowTrim#getWidthHint() */ + @Override public int getWidthHint() { return getControl().computeSize(SWT.DEFAULT, SWT.DEFAULT, true).x; } @@ -485,12 +498,14 @@ public abstract class TrimToolBarBase implements IWindowTrim { /* (non-Javadoc) * @see org.eclipse.ui.internal.layout.IWindowTrim#handleClose() */ + @Override public void handleClose() { } /* (non-Javadoc) * @see org.eclipse.ui.internal.layout.IWindowTrim#isCloseable() */ + @Override public boolean isCloseable() { return false; } @@ -498,6 +513,7 @@ public abstract class TrimToolBarBase implements IWindowTrim { /* (non-Javadoc) * @see org.eclipse.ui.internal.layout.IWindowTrim#isResizeable() */ + @Override public boolean isResizeable() { return false; } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/menus/AbstractWorkbenchWidget.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/menus/AbstractWorkbenchWidget.java index 02e7ab17fe7..4a077b50725 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/menus/AbstractWorkbenchWidget.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/menus/AbstractWorkbenchWidget.java @@ -28,6 +28,7 @@ public class AbstractWorkbenchWidget implements IWorkbenchWidget { /* (non-Javadoc) * @see org.eclipse.ui.menus.IWorkbenchWidget#init(org.eclipse.ui.IWorkbenchWindow) */ + @Override public void init(IWorkbenchWindow workbenchWindow) { // TODO Auto-generated method stub @@ -36,6 +37,7 @@ public class AbstractWorkbenchWidget implements IWorkbenchWidget { /* (non-Javadoc) * @see org.eclipse.jface.menus.IWidget#dispose() */ + @Override public void dispose() { // TODO Auto-generated method stub @@ -44,6 +46,7 @@ public class AbstractWorkbenchWidget implements IWorkbenchWidget { /* (non-Javadoc) * @see org.eclipse.jface.menus.IWidget#fill(org.eclipse.swt.widgets.Composite) */ + @Override public void fill(Composite parent) { // TODO Auto-generated method stub @@ -52,6 +55,7 @@ public class AbstractWorkbenchWidget implements IWorkbenchWidget { /* (non-Javadoc) * @see org.eclipse.jface.menus.IWidget#fill(org.eclipse.swt.widgets.Menu, int) */ + @Override public void fill(Menu parent, int index) { // TODO Auto-generated method stub @@ -60,6 +64,7 @@ public class AbstractWorkbenchWidget implements IWorkbenchWidget { /* (non-Javadoc) * @see org.eclipse.jface.menus.IWidget#fill(org.eclipse.swt.widgets.ToolBar, int) */ + @Override public void fill(ToolBar parent, int index) { // TODO Auto-generated method stub @@ -68,6 +73,7 @@ public class AbstractWorkbenchWidget implements IWorkbenchWidget { /* (non-Javadoc) * @see org.eclipse.jface.menus.IWidget#fill(org.eclipse.swt.widgets.CoolBar, int) */ + @Override public void fill(CoolBar parent, int index) { // TODO Auto-generated method stub diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/menus/ContributionFactoryGenerator.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/menus/ContributionFactoryGenerator.java index dbc59fbedaf..a9079459b3f 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/menus/ContributionFactoryGenerator.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/menus/ContributionFactoryGenerator.java @@ -99,6 +99,7 @@ public class ContributionFactoryGenerator extends ContextFunction { // return something disposable return new Runnable() { + @Override public void run() { root.release(); } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/menus/ContributionRoot.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/menus/ContributionRoot.java index 4fcfb86a263..af354073cc9 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/menus/ContributionRoot.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/menus/ContributionRoot.java @@ -51,6 +51,7 @@ final class ContributionRoot implements /* (non-Javadoc) * @see org.eclipse.ui.menus.IContributionRoot#addContributionItem(org.eclipse.jface.action.IContributionItem, org.eclipse.core.expressions.Expression, org.eclipse.core.expressions.Expression) */ + @Override public void addContributionItem(IContributionItem item, Expression visibleWhen) { if (item == null) @@ -108,6 +109,7 @@ final class ContributionRoot implements * org.eclipse.core.expressions.Expression, * org.eclipse.core.expressions.Expression) */ + @Override public void registerVisibilityForChild(IContributionItem item, Expression visibleWhen) { if (item == null) diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/menus/DynamicMenuContributionItem.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/menus/DynamicMenuContributionItem.java index e092628eaa8..34c2d4f21ef 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/menus/DynamicMenuContributionItem.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/menus/DynamicMenuContributionItem.java @@ -67,6 +67,7 @@ public class DynamicMenuContributionItem extends ContributionItem { * * @see org.eclipse.jface.action.ContributionItem#isDynamic() */ + @Override public boolean isDynamic() { if (loadedDynamicContribution != null) { return loadedDynamicContribution.isDynamic(); @@ -79,6 +80,7 @@ public class DynamicMenuContributionItem extends ContributionItem { * * @see org.eclipse.jface.action.ContributionItem#isDirty() */ + @Override public boolean isDirty() { if (loadedDynamicContribution != null) { return loadedDynamicContribution.isDirty(); @@ -93,6 +95,7 @@ public class DynamicMenuContributionItem extends ContributionItem { * org.eclipse.jface.action.ContributionItem#fill(org.eclipse.swt.widgets * .Composite) */ + @Override public void fill(Composite parent) { IContributionItem contributionItem = getContributionItem(); if (contributionItem != null) @@ -106,6 +109,7 @@ public class DynamicMenuContributionItem extends ContributionItem { * org.eclipse.jface.action.ContributionItem#fill(org.eclipse.swt.widgets * .CoolBar, int) */ + @Override public void fill(CoolBar parent, int index) { IContributionItem contributionItem = getContributionItem(); if (contributionItem != null) @@ -119,6 +123,7 @@ public class DynamicMenuContributionItem extends ContributionItem { * org.eclipse.jface.action.ContributionItem#fill(org.eclipse.swt.widgets * .Menu, int) */ + @Override public void fill(Menu menu, int index) { IContributionItem contributionItem = getContributionItem(); if (contributionItem != null) @@ -132,6 +137,7 @@ public class DynamicMenuContributionItem extends ContributionItem { * org.eclipse.jface.action.ContributionItem#fill(org.eclipse.swt.widgets * .ToolBar, int) */ + @Override public void fill(ToolBar parent, int index) { IContributionItem contributionItem = getContributionItem(); if (contributionItem != null) @@ -169,6 +175,7 @@ public class DynamicMenuContributionItem extends ContributionItem { * * @see org.eclipse.jface.action.ContributionItem#dispose() */ + @Override public void dispose() { if (loadedDynamicContribution != null) { loadedDynamicContribution.dispose(); @@ -182,12 +189,14 @@ public class DynamicMenuContributionItem extends ContributionItem { * * @see org.eclipse.jface.action.ContributionItem#update() */ + @Override public void update() { if (loadedDynamicContribution != null) { loadedDynamicContribution.update(); } } + @Override public void update(String id) { if (loadedDynamicContribution != null) { loadedDynamicContribution.update(id); @@ -201,6 +210,7 @@ public class DynamicMenuContributionItem extends ContributionItem { * org.eclipse.jface.action.ContributionItem#setParent(org.eclipse.jface * .action.IContributionManager) */ + @Override public void setParent(IContributionManager parent) { super.setParent(parent); if (loadedDynamicContribution != null) { diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/menus/DynamicToolBarContributionItem.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/menus/DynamicToolBarContributionItem.java index 7a3ed509963..3ace4d07882 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/menus/DynamicToolBarContributionItem.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/menus/DynamicToolBarContributionItem.java @@ -67,6 +67,7 @@ public class DynamicToolBarContributionItem extends WorkbenchWindowControlContri * * @see org.eclipse.jface.action.ContributionItem#isDynamic() */ + @Override public boolean isDynamic() { if (loadedDynamicContribution != null) { return loadedDynamicContribution.isDynamic(); @@ -79,6 +80,7 @@ public class DynamicToolBarContributionItem extends WorkbenchWindowControlContri * * @see org.eclipse.jface.action.ContributionItem#isDirty() */ + @Override public boolean isDirty() { if (loadedDynamicContribution != null) { return loadedDynamicContribution.isDirty(); @@ -93,6 +95,7 @@ public class DynamicToolBarContributionItem extends WorkbenchWindowControlContri * org.eclipse.jface.action.ContributionItem#fill(org.eclipse.swt.widgets * .CoolBar, int) */ + @Override public void fill(CoolBar parent, int index) { IContributionItem contributionItem = getContributionItem(); if (contributionItem != null) @@ -132,6 +135,7 @@ public class DynamicToolBarContributionItem extends WorkbenchWindowControlContri * * @see org.eclipse.jface.action.ContributionItem#dispose() */ + @Override public void dispose() { if (loadedDynamicContribution != null) { loadedDynamicContribution.dispose(); @@ -145,12 +149,14 @@ public class DynamicToolBarContributionItem extends WorkbenchWindowControlContri * * @see org.eclipse.jface.action.ContributionItem#update() */ + @Override public void update() { if (loadedDynamicContribution != null) { loadedDynamicContribution.update(); } } + @Override public void update(String id) { if (loadedDynamicContribution != null) { loadedDynamicContribution.update(id); @@ -164,6 +170,7 @@ public class DynamicToolBarContributionItem extends WorkbenchWindowControlContri * org.eclipse.jface.action.ContributionItem#setParent(org.eclipse.jface * .action.IContributionManager) */ + @Override public void setParent(IContributionManager parent) { super.setParent(parent); if (loadedDynamicContribution != null) { @@ -178,6 +185,7 @@ public class DynamicToolBarContributionItem extends WorkbenchWindowControlContri * org.eclipse.ui.internal.menus.InternalControlContribution#setWorkbenchWindow * (org.eclipse.ui.IWorkbenchWindow) */ + @Override public void setWorkbenchWindow(IWorkbenchWindow wbw) { super.setWorkbenchWindow(wbw); if (loadedDynamicContribution != null) { @@ -191,6 +199,7 @@ public class DynamicToolBarContributionItem extends WorkbenchWindowControlContri * @see * org.eclipse.ui.internal.menus.InternalControlContribution#setCurSide(int) */ + @Override public void setCurSide(int curSide) { super.setCurSide(curSide); if (loadedDynamicContribution != null) { @@ -201,6 +210,7 @@ public class DynamicToolBarContributionItem extends WorkbenchWindowControlContri * (non-Javadoc) * @see org.eclipse.jface.action.ControlContribution#createControl(org.eclipse.swt.widgets.Composite) */ + @Override public Control createControl(Composite parent) { WorkbenchWindowControlContribution contributionItem = getContributionItem(); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/menus/EditorAction.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/menus/EditorAction.java index 6287e999c74..19faf55a597 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/menus/EditorAction.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/menus/EditorAction.java @@ -57,6 +57,7 @@ public class EditorAction extends ActionSet { MAIN_TOOLBAR); } + @Override protected Expression createExpression(IConfigurationElement configElement) { String idContrib = MenuHelper.getId(configElement); return new ActiveEditorContextExpression( diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/menus/ExtensionContribution.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/menus/ExtensionContribution.java index 79f626f8d6f..be921642b3e 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/menus/ExtensionContribution.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/menus/ExtensionContribution.java @@ -25,6 +25,7 @@ import org.eclipse.ui.services.IServiceLocator; public class ExtensionContribution implements IDelegateInitializer { + @Override public void initialize(MApplicationElement model, Object delegate) { if (delegate instanceof IWorkbenchContribution) { IServiceLocator locator = getServiceLocator((EObject) model); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/menus/FocusControlSourceProvider.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/menus/FocusControlSourceProvider.java index b21bda89667..dd63a0b94a6 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/menus/FocusControlSourceProvider.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/menus/FocusControlSourceProvider.java @@ -54,6 +54,7 @@ public class FocusControlSourceProvider extends AbstractSourceProvider * @see org.eclipse.ui.menus.IFocusService#addTrackerFor(org.eclipse.swt.widgets.Control, * java.lang.String) */ + @Override public void addFocusTracker(Control control, String id) { if (control.isDisposed()) { return; @@ -66,6 +67,7 @@ public class FocusControlSourceProvider extends AbstractSourceProvider private DisposeListener getDisposeListener() { if (disposeListener == null) { disposeListener = new DisposeListener() { + @Override public void widgetDisposed(DisposeEvent e) { controlToId.remove(e.widget); if (currentControl == e.widget) { @@ -81,10 +83,12 @@ public class FocusControlSourceProvider extends AbstractSourceProvider private FocusListener getFocusListener() { if (focusListener == null) { focusListener = new FocusListener() { + @Override public void focusGained(FocusEvent e) { focusIn(e.widget); } + @Override public void focusLost(FocusEvent e) { focusIn(null); } @@ -122,6 +126,7 @@ public class FocusControlSourceProvider extends AbstractSourceProvider * * @see org.eclipse.ui.menus.IFocusService#removeTrackerFor(org.eclipse.swt.widgets.Control) */ + @Override public void removeFocusTracker(Control control) { if (controlToId == null) { // bug 396909: avoid NPEs if the service has already been disposed @@ -140,6 +145,7 @@ public class FocusControlSourceProvider extends AbstractSourceProvider * * @see org.eclipse.ui.ISourceProvider#dispose() */ + @Override public void dispose() { Iterator i = controlToId.keySet().iterator(); while (i.hasNext()) { @@ -160,6 +166,7 @@ public class FocusControlSourceProvider extends AbstractSourceProvider * * @see org.eclipse.ui.ISourceProvider#getCurrentState() */ + @Override public Map getCurrentState() { Map m = new HashMap(); if (currentId == null) { @@ -180,6 +187,7 @@ public class FocusControlSourceProvider extends AbstractSourceProvider * * @see org.eclipse.ui.ISourceProvider#getProvidedSourceNames() */ + @Override public String[] getProvidedSourceNames() { return PROVIDED_SOURCE_NAMES; } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/menus/LegacyActionPersistence.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/menus/LegacyActionPersistence.java index 9c7c5676e36..2ccbf166489 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/menus/LegacyActionPersistence.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/menus/LegacyActionPersistence.java @@ -381,6 +381,7 @@ public final class LegacyActionPersistence extends RegistryPersistence { + @Override public final void dispose() { super.dispose(); clear(); @@ -392,6 +393,7 @@ public final class LegacyActionPersistence extends RegistryPersistence { clearMenus(); } + @Override protected final boolean isChangeImportant(final IRegistryChangeEvent event) { return !((event.getExtensionDeltas(PlatformUI.PLUGIN_ID, IWorkbenchRegistryConstants.PL_ACTION_SETS).length == 0) @@ -414,6 +416,7 @@ public final class LegacyActionPersistence extends RegistryPersistence { * cleared. * </p> */ + @Override public final void read() { clear(); LegacyActionPersistence.super.read(); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/menus/MenuAdditionCacheEntry.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/menus/MenuAdditionCacheEntry.java index 47b79471437..13ac2ed4d5f 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/menus/MenuAdditionCacheEntry.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/menus/MenuAdditionCacheEntry.java @@ -282,6 +282,7 @@ public class MenuAdditionCacheEntry { } private class IdListener implements IIdentifierListener { + @Override public void identifierChanged(IdentifierEvent identifierEvent) { application.getContext().set(identifierEvent.getIdentifier().getId(), identifierEvent.getIdentifier().isEnabled()); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/menus/MenuHelper.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/menus/MenuHelper.java index da370abb676..b64323078f8 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/menus/MenuHelper.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/menus/MenuHelper.java @@ -632,6 +632,7 @@ public class MenuHelper { return (IWorkbenchWindowPulldownDelegate) handlerProxy.getDelegate(); } + @Override public Menu getMenu(Menu parent) { IWorkbenchWindowPulldownDelegate2 delegate = (IWorkbenchWindowPulldownDelegate2) getDelegate(); if (delegate == null) { @@ -640,10 +641,12 @@ public class MenuHelper { return delegate.getMenu(parent); } + @Override public Menu getMenu(Control parent) { return getDelegate() == null ? null : getDelegate().getMenu(parent); } + @Override public void dispose() { if (handlerProxy != null) { handlerProxy.dispose(); @@ -730,6 +733,7 @@ public class MenuHelper { ActionDescriptor desc = getDescriptor(context); final IAction action = desc.getAction(); final IPropertyChangeListener propListener = new IPropertyChangeListener() { + @Override public void propertyChange(PropertyChangeEvent event) { if (IAction.CHECKED.equals(event.getProperty())) { boolean checked = false; @@ -742,6 +746,7 @@ public class MenuHelper { }; action.addPropertyChangeListener(propListener); Runnable obj = new Runnable() { + @Override @Execute public void run() { action.removePropertyChangeListener(propListener); @@ -956,6 +961,7 @@ public class MenuHelper { toolItem.setEnabled(action.isEnabled()); final IPropertyChangeListener propertyListener = new IPropertyChangeListener() { + @Override public void propertyChange(PropertyChangeEvent event) { String property = event.getProperty(); if (property.equals(IAction.ENABLED)) { @@ -973,6 +979,7 @@ public class MenuHelper { // DirectContributionItem#handleWidgetDispose() action.addPropertyChangeListener(propertyListener); toolItem.getTransientData().put(DirectContributionItem.DISPOSABLE, new Runnable() { + @Override public void run() { action.removePropertyChangeListener(propertyListener); } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/menus/MenuLocationURI.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/menus/MenuLocationURI.java index 8d8ca57b8b1..a0efd0115e0 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/menus/MenuLocationURI.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/menus/MenuLocationURI.java @@ -75,6 +75,7 @@ public class MenuLocationURI { /* (non-Javadoc) * @see java.lang.Object#toString() */ + @Override public String toString() { return rawString; } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/menus/MenuPersistence.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/menus/MenuPersistence.java index 564ad5de5c7..ce06e9d7cd7 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/menus/MenuPersistence.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/menus/MenuPersistence.java @@ -52,6 +52,7 @@ final public class MenuPersistence extends RegistryPersistence { private ArrayList<MTrimContribution> trimContributions = new ArrayList<MTrimContribution>(); private final Comparator<IConfigurationElement> comparer = new Comparator<IConfigurationElement>() { + @Override public int compare(IConfigurationElement c1, IConfigurationElement c2) { return c1.getContributor().getName().compareToIgnoreCase(c2.getContributor().getName()); } @@ -105,6 +106,7 @@ final public class MenuPersistence extends RegistryPersistence { read(); } + @Override protected final void read() { super.read(); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/menus/PulldownDelegateWidgetProxy.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/menus/PulldownDelegateWidgetProxy.java index e4e6d133e25..dce41afeee3 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/menus/PulldownDelegateWidgetProxy.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/menus/PulldownDelegateWidgetProxy.java @@ -132,6 +132,7 @@ final class PulldownDelegateWidgetProxy implements IWidget { /** * @see ISafeRunnable#handleException(java.lang.Throwable) */ + @Override public void handleException(Throwable exception) { // Do nothing } @@ -139,6 +140,7 @@ final class PulldownDelegateWidgetProxy implements IWidget { /** * @see ISafeRunnable#run() */ + @Override public void run() throws Exception { if (parent == null) { menu = delegate.getMenu(control); @@ -177,6 +179,7 @@ final class PulldownDelegateWidgetProxy implements IWidget { private final String delegateAttributeName; private final DisposeListener disposeListener = new DisposeListener() { + @Override public void widgetDisposed(DisposeEvent e) { if (e.widget == widget) { dispose(); @@ -196,6 +199,7 @@ final class PulldownDelegateWidgetProxy implements IWidget { private final IServiceLocator locator; private final Listener selectionListener = new Listener() { + @Override public final void handleEvent(final Event event) { final Widget item = event.widget; if (item == null) { @@ -292,20 +296,24 @@ final class PulldownDelegateWidgetProxy implements IWidget { /** * Passes the dipose on to the proxied handler, if it has been loaded. */ + @Override public final void dispose() { if (delegate != null) { delegate.dispose(); } } + @Override public final void fill(final Composite parent) { // This does not need to be supported. } + @Override public final void fill(CoolBar parent, final int index) { // This does not need to be supported. } + @Override public final void fill(final Menu parent, final int index) { if ((widget != null) || (parent == null)) { return; @@ -344,6 +352,7 @@ final class PulldownDelegateWidgetProxy implements IWidget { // update(null); } + @Override public final void fill(final ToolBar parent, final int index) { if ((widget != null) && (parent == null)) { return; @@ -416,6 +425,7 @@ final class PulldownDelegateWidgetProxy implements IWidget { return true; } + @Override public final String toString() { if (delegate == null) { return configurationElement.getAttribute(delegateAttributeName); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/menus/SlaveMenuService.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/menus/SlaveMenuService.java index 63843695481..c7efcd5a0d1 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/menus/SlaveMenuService.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/menus/SlaveMenuService.java @@ -29,6 +29,7 @@ public class SlaveMenuService implements IMenuService { * @param provider * @see org.eclipse.ui.services.IServiceWithSources#addSourceProvider(org.eclipse.ui.ISourceProvider) */ + @Override public void addSourceProvider(ISourceProvider provider) { parentService.addSourceProvider(provider); } @@ -37,6 +38,7 @@ public class SlaveMenuService implements IMenuService { * @param provider * @see org.eclipse.ui.services.IServiceWithSources#removeSourceProvider(org.eclipse.ui.ISourceProvider) */ + @Override public void removeSourceProvider(ISourceProvider provider) { parentService.removeSourceProvider(provider); } @@ -45,6 +47,7 @@ public class SlaveMenuService implements IMenuService { * @param factory * @see org.eclipse.ui.menus.IMenuService#addContributionFactory(org.eclipse.ui.menus.AbstractContributionFactory) */ + @Override public void addContributionFactory(AbstractContributionFactory factory) { parentService.addContributionFactory(factory); } @@ -53,6 +56,7 @@ public class SlaveMenuService implements IMenuService { * * @see org.eclipse.ui.services.IDisposable#dispose() */ + @Override public void dispose() { // nothing to do here yet. } @@ -61,6 +65,7 @@ public class SlaveMenuService implements IMenuService { * @param factory * @see org.eclipse.ui.menus.IMenuService#removeContributionFactory(org.eclipse.ui.menus.AbstractContributionFactory) */ + @Override public void removeContributionFactory(AbstractContributionFactory factory) { parentService.removeContributionFactory(factory); } @@ -71,6 +76,7 @@ public class SlaveMenuService implements IMenuService { * @see org.eclipse.ui.menus.IMenuService#populateContributionManager(org.eclipse.jface.action.ContributionManager, * java.lang.String) */ + @Override public void populateContributionManager(ContributionManager mgr, String location) { populateContributionManager(model, mgr, location); } @@ -88,6 +94,7 @@ public class SlaveMenuService implements IMenuService { * @param mgr * @see org.eclipse.ui.menus.IMenuService#releaseContributions(org.eclipse.jface.action.ContributionManager) */ + @Override public void releaseContributions(ContributionManager mgr) { parentService.releaseContributions(mgr); } @@ -96,6 +103,7 @@ public class SlaveMenuService implements IMenuService { * @return * @see org.eclipse.ui.menus.IMenuService#getCurrentState() */ + @Override public IEvaluationContext getCurrentState() { return parentService.getCurrentState(); } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/menus/ViewAction.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/menus/ViewAction.java index ec9263fa9ac..de7ebaf944c 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/menus/ViewAction.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/menus/ViewAction.java @@ -57,6 +57,7 @@ public class ViewAction extends ActionSet { } } + @Override protected Expression createExpression(IConfigurationElement configElement) { return null; } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/menus/WidgetProxy.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/menus/WidgetProxy.java index 835d71b10ce..0d8ed39eea8 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/menus/WidgetProxy.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/menus/WidgetProxy.java @@ -88,30 +88,35 @@ final class WidgetProxy implements IWorkbenchWidget { this.widgetAttributeName = widgetAttributeName; } + @Override public final void dispose() { if (loadWidget()) { widget.dispose(); } } + @Override public final void fill(final Composite parent) { if (loadWidget()) { widget.fill(parent); } } + @Override public final void fill(final CoolBar parent, final int index) { if (loadWidget()) { widget.fill(parent, index); } } + @Override public final void fill(final Menu parent, final int index) { if (loadWidget()) { widget.fill(parent, index); } } + @Override public final void fill(final ToolBar parent, final int index) { if (loadWidget()) { widget.fill(parent, index); @@ -121,6 +126,7 @@ final class WidgetProxy implements IWorkbenchWidget { /* (non-Javadoc) * @see org.eclipse.ui.menus.IWorkbenchWidget#init(org.eclipse.ui.IWorkbenchWindow) */ + @Override public void init(IWorkbenchWindow workbenchWindow) { if (loadWidget()) { widget.init(workbenchWindow); @@ -198,6 +204,7 @@ final class WidgetProxy implements IWorkbenchWidget { return false; } + @Override public final String toString() { if (widget == null) { return configurationElement.getAttribute(widgetAttributeName); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/menus/WorkbenchMenuService.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/menus/WorkbenchMenuService.java index d28491f5f73..7cb6120160b 100755 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/menus/WorkbenchMenuService.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/menus/WorkbenchMenuService.java @@ -97,6 +97,7 @@ public class WorkbenchMenuService implements IMenuService { * org.eclipse.ui.services.IServiceWithSources#addSourceProvider(org.eclipse * .ui.ISourceProvider) */ + @Override public void addSourceProvider(ISourceProvider provider) { // TODO Auto-generated method stub @@ -109,6 +110,7 @@ public class WorkbenchMenuService implements IMenuService { * org.eclipse.ui.services.IServiceWithSources#removeSourceProvider(org. * eclipse.ui.ISourceProvider) */ + @Override public void removeSourceProvider(ISourceProvider provider) { // TODO Auto-generated method stub @@ -119,6 +121,7 @@ public class WorkbenchMenuService implements IMenuService { * * @see org.eclipse.ui.services.IDisposable#dispose() */ + @Override public void dispose() { persistence.dispose(); } @@ -134,6 +137,7 @@ public class WorkbenchMenuService implements IMenuService { * org.eclipse.ui.menus.IMenuService#addContributionFactory(org.eclipse. * ui.menus.AbstractContributionFactory) */ + @Override public void addContributionFactory(final AbstractContributionFactory factory) { MenuLocationURI location = new MenuLocationURI(factory.getLocation()); if (location.getPath() == null || location.getPath().length() == 0) { @@ -216,6 +220,7 @@ public class WorkbenchMenuService implements IMenuService { * org.eclipse.ui.menus.IMenuService#removeContributionFactory(org.eclipse * .ui.menus.AbstractContributionFactory) */ + @Override public void removeContributionFactory(AbstractContributionFactory factory) { Object contribution; if ((contribution = factoriesToContributions.remove(factory)) != null) { @@ -278,6 +283,7 @@ public class WorkbenchMenuService implements IMenuService { * org.eclipse.ui.menus.IMenuService#populateContributionManager(org.eclipse * .jface.action.ContributionManager, java.lang.String) */ + @Override public void populateContributionManager(ContributionManager mgr, String location) { MApplicationElement model = getPartToExtend(); if (model == null) { @@ -463,6 +469,7 @@ public class WorkbenchMenuService implements IMenuService { * org.eclipse.ui.menus.IMenuService#releaseContributions(org.eclipse.jface * .action.ContributionManager) */ + @Override public void releaseContributions(ContributionManager mgr) { if (mgr instanceof MenuManager) { MenuManager menu = (MenuManager) mgr; @@ -550,6 +557,7 @@ public class WorkbenchMenuService implements IMenuService { * * @see org.eclipse.ui.menus.IMenuService#getCurrentState() */ + @Override public IEvaluationContext getCurrentState() { if (legacyContext == null) { legacyContext = new ExpressionContext(e4Context); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/misc/ExternalProgramImageDescriptor.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/misc/ExternalProgramImageDescriptor.java index 534e86cd422..f9a19b7b893 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/misc/ExternalProgramImageDescriptor.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/misc/ExternalProgramImageDescriptor.java @@ -36,7 +36,8 @@ public class ExternalProgramImageDescriptor extends ImageDescriptor { /** * @see Object#equals */ - public boolean equals(Object o) { + @Override + public boolean equals(Object o) { if (!(o instanceof ExternalProgramImageDescriptor)) { return false; } @@ -63,7 +64,8 @@ public class ExternalProgramImageDescriptor extends ImageDescriptor { * Returns an SWT Image that is described by the information * in this descriptor. Each call returns a new Image. */ - public ImageData getImageData() { + @Override + public ImageData getImageData() { ImageData data = null; ImageData defaultImage = WorkbenchImages.getImageDescriptor( ISharedImages.IMG_OBJ_FILE).getImageData(); @@ -87,7 +89,8 @@ public class ExternalProgramImageDescriptor extends ImageDescriptor { /** * @see Object#hashCode */ - public int hashCode() { + @Override + public int hashCode() { String programName = program.getName(); if (programName == null) { return program.hashCode(); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/misc/ProgramImageDescriptor.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/misc/ProgramImageDescriptor.java index f98b29698f7..ec012d48587 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/misc/ProgramImageDescriptor.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/misc/ProgramImageDescriptor.java @@ -36,7 +36,8 @@ public class ProgramImageDescriptor extends ImageDescriptor { /** * @see Object#equals */ - public boolean equals(Object o) { + @Override + public boolean equals(Object o) { if (!(o instanceof ProgramImageDescriptor)) { return false; } @@ -56,7 +57,8 @@ public class ProgramImageDescriptor extends ImageDescriptor { * Returns an SWT Image that is described by the information * in this descriptor. */ - public ImageData getImageData() { + @Override + public ImageData getImageData() { /*This is a user defined offset into the file which always *returns us the defualt - return the default regardless*/ @@ -67,7 +69,8 @@ public class ProgramImageDescriptor extends ImageDescriptor { /** * @see Object#hashCode */ - public int hashCode() { + @Override + public int hashCode() { return filename.hashCode() + offset; } } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/misc/TestPartListener.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/misc/TestPartListener.java index f39a446c813..c21cab7f186 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/misc/TestPartListener.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/misc/TestPartListener.java @@ -31,7 +31,8 @@ public class TestPartListener implements IPartListener { * @param part the part that was activated * @see IPerspective#activate */ - public void partActivated(IWorkbenchPart part) { + @Override + public void partActivated(IWorkbenchPart part) { System.out.println("partActivated(" + part + ")");//$NON-NLS-2$//$NON-NLS-1$ } @@ -48,7 +49,8 @@ public class TestPartListener implements IPartListener { * @param part the part that was surfaced * @see IPerspective#bringToTop */ - public void partBroughtToTop(IWorkbenchPart part) { + @Override + public void partBroughtToTop(IWorkbenchPart part) { System.out.println("partBroughtToTop(" + part + ")");//$NON-NLS-2$//$NON-NLS-1$ } @@ -58,7 +60,8 @@ public class TestPartListener implements IPartListener { * @param part the part that was closed * @see IPerspective#close */ - public void partClosed(IWorkbenchPart part) { + @Override + public void partClosed(IWorkbenchPart part) { System.out.println("partClosed(" + part + ")");//$NON-NLS-2$//$NON-NLS-1$ } @@ -68,7 +71,8 @@ public class TestPartListener implements IPartListener { * @param part the part that was deactivated * @see IPerspective#activate */ - public void partDeactivated(IWorkbenchPart part) { + @Override + public void partDeactivated(IWorkbenchPart part) { System.out.println("partDeactivated(" + part + ")");//$NON-NLS-2$//$NON-NLS-1$ } @@ -77,7 +81,8 @@ public class TestPartListener implements IPartListener { * * @param part the part that was opened */ - public void partOpened(IWorkbenchPart part) { + @Override + public void partOpened(IWorkbenchPart part) { System.out.println("partOpened(" + part + ")");//$NON-NLS-2$//$NON-NLS-1$ } } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/model/ContributionService.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/model/ContributionService.java index f5b94220c96..e33d20545e3 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/model/ContributionService.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/model/ContributionService.java @@ -26,6 +26,7 @@ public class ContributionService implements IContributionService { this.advisor = advisor; } + @Override public ContributionComparator getComparatorFor(String contributionType) { return advisor.getComparatorFor(contributionType); } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/operations/AdvancedValidationUserApprover.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/operations/AdvancedValidationUserApprover.java index 36362f9ddea..4c7fa8fc2ac 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/operations/AdvancedValidationUserApprover.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/operations/AdvancedValidationUserApprover.java @@ -93,6 +93,7 @@ public class AdvancedValidationUserApprover implements IOperationApprover, // The casts to IAdvancedUndoableOperation and // IAdvancedUndoableOperation2 are safe because these types were checked // in the call chain. + @Override public void run(IProgressMonitor pm) { try { switch (doing) { @@ -141,6 +142,7 @@ public class AdvancedValidationUserApprover implements IOperationApprover, * org.eclipse.core.commands.operations.IOperationHistory, * org.eclipse.core.runtime.IAdaptable) */ + @Override public IStatus proceedRedoing(IUndoableOperation operation, IOperationHistory history, IAdaptable uiInfo) { return proceedWithOperation(operation, history, uiInfo, REDOING); @@ -153,6 +155,7 @@ public class AdvancedValidationUserApprover implements IOperationApprover, * org.eclipse.core.commands.operations.IOperationHistory, * org.eclipse.core.runtime.IAdaptable) */ + @Override public IStatus proceedUndoing(IUndoableOperation operation, IOperationHistory history, IAdaptable uiInfo) { @@ -166,6 +169,7 @@ public class AdvancedValidationUserApprover implements IOperationApprover, * org.eclipse.core.commands.operations.IOperationHistory, * org.eclipse.core.runtime.IAdaptable) */ + @Override public IStatus proceedExecuting(IUndoableOperation operation, IOperationHistory history, IAdaptable uiInfo) { return proceedWithOperation(operation, history, uiInfo, EXECUTING); @@ -199,6 +203,7 @@ public class AdvancedValidationUserApprover implements IOperationApprover, // whole thing up in a syncExec. final IStatus[] status = new IStatus[1]; PlatformUI.getWorkbench().getDisplay().syncExec(new Runnable() { + @Override public void run() { // Compute the undoable or redoable status status[0] = computeOperationStatus(operation, history, uiInfo, diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/operations/TimeTriggeredProgressMonitorDialog.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/operations/TimeTriggeredProgressMonitorDialog.java index 6123b0c8227..85ec0df3f0d 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/operations/TimeTriggeredProgressMonitorDialog.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/operations/TimeTriggeredProgressMonitorDialog.java @@ -82,7 +82,8 @@ public class TimeTriggeredProgressMonitorDialog extends ProgressMonitorDialog { * @see org.eclipse.core.runtime.IProgressMonitor#beginTask(java.lang.String, * int) */ - public void beginTask(String name, int totalWork) { + @Override + public void beginTask(String name, int totalWork) { superMonitor.beginTask(name, totalWork); checkTicking(); } @@ -107,7 +108,8 @@ public class TimeTriggeredProgressMonitorDialog extends ProgressMonitorDialog { * * @see org.eclipse.core.runtime.IProgressMonitor#done() */ - public void done() { + @Override + public void done() { superMonitor.done(); checkTicking(); } @@ -117,7 +119,8 @@ public class TimeTriggeredProgressMonitorDialog extends ProgressMonitorDialog { * * @see org.eclipse.core.runtime.IProgressMonitor#internalWorked(double) */ - public void internalWorked(double work) { + @Override + public void internalWorked(double work) { superMonitor.internalWorked(work); checkTicking(); } @@ -127,7 +130,8 @@ public class TimeTriggeredProgressMonitorDialog extends ProgressMonitorDialog { * * @see org.eclipse.core.runtime.IProgressMonitor#isCanceled() */ - public boolean isCanceled() { + @Override + public boolean isCanceled() { return superMonitor.isCanceled(); } @@ -136,7 +140,8 @@ public class TimeTriggeredProgressMonitorDialog extends ProgressMonitorDialog { * * @see org.eclipse.core.runtime.IProgressMonitor#setCanceled(boolean) */ - public void setCanceled(boolean value) { + @Override + public void setCanceled(boolean value) { superMonitor.setCanceled(value); } @@ -146,7 +151,8 @@ public class TimeTriggeredProgressMonitorDialog extends ProgressMonitorDialog { * * @see org.eclipse.core.runtime.IProgressMonitor#setTaskName(java.lang.String) */ - public void setTaskName(String name) { + @Override + public void setTaskName(String name) { superMonitor.setTaskName(name); checkTicking(); @@ -157,7 +163,8 @@ public class TimeTriggeredProgressMonitorDialog extends ProgressMonitorDialog { * * @see org.eclipse.core.runtime.IProgressMonitor#subTask(java.lang.String) */ - public void subTask(String name) { + @Override + public void subTask(String name) { superMonitor.subTask(name); checkTicking(); } @@ -167,7 +174,8 @@ public class TimeTriggeredProgressMonitorDialog extends ProgressMonitorDialog { * * @see org.eclipse.core.runtime.IProgressMonitor#worked(int) */ - public void worked(int work) { + @Override + public void worked(int work) { superMonitor.worked(work); checkTicking(); @@ -180,7 +188,8 @@ public class TimeTriggeredProgressMonitorDialog extends ProgressMonitorDialog { * * @see org.eclipse.jface.dialogs.ProgressMonitorDialog#getProgressMonitor() */ - public IProgressMonitor getProgressMonitor() { + @Override + public IProgressMonitor getProgressMonitor() { if (wrapperedMonitor == null) { createWrapperedMonitor(); } @@ -192,13 +201,15 @@ public class TimeTriggeredProgressMonitorDialog extends ProgressMonitorDialog { * * @see org.eclipse.jface.operations.IRunnableContext#run(boolean, boolean, IRunnableWithProgress) */ - public void run(final boolean fork, final boolean cancelable, + @Override + public void run(final boolean fork, final boolean cancelable, final IRunnableWithProgress runnable) throws InvocationTargetException, InterruptedException { final InvocationTargetException[] invokes = new InvocationTargetException[1]; final InterruptedException[] interrupt = new InterruptedException[1]; Runnable dialogWaitRunnable = new Runnable() { - public void run() { + @Override + public void run() { try { TimeTriggeredProgressMonitorDialog.super.run(fork, cancelable, runnable); } catch (InvocationTargetException e) { diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/operations/WorkbenchOperationSupport.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/operations/WorkbenchOperationSupport.java index 6a86fdef351..4e5820ff82d 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/operations/WorkbenchOperationSupport.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/operations/WorkbenchOperationSupport.java @@ -66,6 +66,7 @@ public class WorkbenchOperationSupport implements IWorkbenchOperationSupport { * @return the workbench operation context. * @since 3.1 */ + @Override public IUndoContext getUndoContext() { if (undoContext == null) { undoContext = new ObjectUndoContext(PlatformUI.getWorkbench(), @@ -80,6 +81,7 @@ public class WorkbenchOperationSupport implements IWorkbenchOperationSupport { * @return the operation history for workbench operations. * @since 3.1 */ + @Override public IOperationHistory getOperationHistory() { IOperationHistory history = OperationHistoryFactory.getOperationHistory(); /* diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/part/NullEditorInput.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/part/NullEditorInput.java index 3f0999f0b05..5f9f8eb18cd 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/part/NullEditorInput.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/part/NullEditorInput.java @@ -45,21 +45,24 @@ public class NullEditorInput implements IEditorInput { /* (non-Javadoc) * @see org.eclipse.ui.IEditorInput#exists() */ - public boolean exists() { + @Override + public boolean exists() { return false; } /* (non-Javadoc) * @see org.eclipse.ui.IEditorInput#getImageDescriptor() */ - public ImageDescriptor getImageDescriptor() { + @Override + public ImageDescriptor getImageDescriptor() { return ImageDescriptor.getMissingImageDescriptor(); } /* (non-Javadoc) * @see org.eclipse.ui.IEditorInput#getName() */ - public String getName() { + @Override + public String getName() { String result = null; if (editorReference != null) { result = editorReference.getName(); @@ -73,14 +76,16 @@ public class NullEditorInput implements IEditorInput { /* (non-Javadoc) * @see org.eclipse.ui.IEditorInput#getPersistable() */ - public IPersistableElement getPersistable() { + @Override + public IPersistableElement getPersistable() { return null; } /* (non-Javadoc) * @see org.eclipse.ui.IEditorInput#getToolTipText() */ - public String getToolTipText() { + @Override + public String getToolTipText() { if (editorReference != null) return editorReference.getTitleToolTip(); return ""; //$NON-NLS-1$ @@ -89,7 +94,8 @@ public class NullEditorInput implements IEditorInput { /* (non-Javadoc) * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class) */ - public Object getAdapter(Class adapter) { + @Override + public Object getAdapter(Class adapter) { return null; } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/part/NullPersistable.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/part/NullPersistable.java index 4b0f875ca41..a11728c8f2f 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/part/NullPersistable.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/part/NullPersistable.java @@ -21,7 +21,8 @@ public class NullPersistable implements IPersistable { /* (non-Javadoc) * @see org.eclipse.ui.internal.part.components.interfaces.IPersistable#saveState(org.eclipse.ui.IMemento) */ - public void saveState(IMemento memento) { + @Override + public void saveState(IMemento memento) { } } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/part/SelectionProviderAdapter.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/part/SelectionProviderAdapter.java index f7f9cbf5d10..896b67bef96 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/part/SelectionProviderAdapter.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/part/SelectionProviderAdapter.java @@ -30,20 +30,24 @@ class SelectionProviderAdapter implements ISelectionProvider { ISelection theSelection = StructuredSelection.EMPTY; - public void addSelectionChangedListener(ISelectionChangedListener listener) { + @Override + public void addSelectionChangedListener(ISelectionChangedListener listener) { listeners.add(listener); } - public ISelection getSelection() { + @Override + public ISelection getSelection() { return theSelection; } - public void removeSelectionChangedListener( + @Override + public void removeSelectionChangedListener( ISelectionChangedListener listener) { listeners.remove(listener); } - public void setSelection(ISelection selection) { + @Override + public void setSelection(ISelection selection) { theSelection = selection; final SelectionChangedEvent e = new SelectionChangedEvent(this, selection); Object[] listenersArray = listeners.toArray(); @@ -51,7 +55,8 @@ class SelectionProviderAdapter implements ISelectionProvider { for (int i = 0; i < listenersArray.length; i++) { final ISelectionChangedListener l = (ISelectionChangedListener) listenersArray[i]; Platform.run(new SafeRunnable() { - public void run() { + @Override + public void run() { l.selectionChanged(e); } }); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/part/StatusPart.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/part/StatusPart.java index fc3bf6571ea..101fa176b36 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/part/StatusPart.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/part/StatusPart.java @@ -102,7 +102,8 @@ public class StatusPart { detailsButton = new Button(buttonParent, SWT.PUSH); detailsButton.addSelectionListener(new SelectionAdapter() { - public void widgetSelected(SelectionEvent e) { + @Override + public void widgetSelected(SelectionEvent e) { showDetails(!showingDetails); } }); @@ -197,6 +198,7 @@ public class StatusPart { } Button button = new Button(parent, SWT.PUSH); button.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { try { PlatformUI.getWorkbench().getActiveWorkbenchWindow() @@ -211,6 +213,7 @@ public class StatusPart { button.setImage(image); button.setToolTipText(WorkbenchMessages.ErrorLogUtil_ShowErrorLogTooltip); button.addDisposeListener(new DisposeListener() { + @Override public void widgetDisposed(DisposeEvent e) { image.dispose(); } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/preferences/AbstractBooleanListener.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/preferences/AbstractBooleanListener.java index 985cb7db495..5786fc91c76 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/preferences/AbstractBooleanListener.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/preferences/AbstractBooleanListener.java @@ -39,7 +39,8 @@ public abstract class AbstractBooleanListener extends AbstractPropertyListener { /* (non-Javadoc) * @see org.eclipse.ui.internal.preferences.AbstractPropertyListener#update() */ - protected void update() { + @Override + protected void update() { handleValue(PropertyUtil.get(map, propertyId, defaultValue)); } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/preferences/AbstractIntegerListener.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/preferences/AbstractIntegerListener.java index 0b2174abbc2..4036573eb75 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/preferences/AbstractIntegerListener.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/preferences/AbstractIntegerListener.java @@ -39,7 +39,8 @@ public abstract class AbstractIntegerListener extends AbstractPropertyListener { /* (non-Javadoc) * @see org.eclipse.ui.internal.preferences.AbstractPropertyListener#update() */ - protected void update() { + @Override + protected void update() { handleValue(PropertyUtil.get(map, propertyId, defaultValue)); } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/preferences/AbstractPropertyListener.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/preferences/AbstractPropertyListener.java index bd08a25b30b..a77f727ad78 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/preferences/AbstractPropertyListener.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/preferences/AbstractPropertyListener.java @@ -18,14 +18,16 @@ public abstract class AbstractPropertyListener implements IPropertyMapListener { /* (non-Javadoc) * @see org.eclipse.ui.internal.preferences.IPropertyMapListener#propertyChanged(java.lang.String[]) */ - public void propertyChanged(String[] propertyIds) { + @Override + public void propertyChanged(String[] propertyIds) { update(); } /* (non-Javadoc) * @see org.eclipse.ui.internal.preferences.IPropertyMapListener#listenerAttached() */ - public void listenerAttached() { + @Override + public void listenerAttached() { update(); } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/preferences/PreferenceStoreAdapter.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/preferences/PreferenceStoreAdapter.java index 9ccb3a8b768..181e2bb7bbf 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/preferences/PreferenceStoreAdapter.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/preferences/PreferenceStoreAdapter.java @@ -24,7 +24,8 @@ public final class PreferenceStoreAdapter extends PropertyMapAdapter { private IPreferenceStore store; private IPropertyChangeListener listener = new IPropertyChangeListener() { - public void propertyChange(PropertyChangeEvent event) { + @Override + public void propertyChange(PropertyChangeEvent event) { firePropertyChange(event.getProperty()); } }; @@ -36,28 +37,32 @@ public final class PreferenceStoreAdapter extends PropertyMapAdapter { /* (non-Javadoc) * @see org.eclipse.ui.internal.preferences.PropertyMapAdapter#attachListener() */ - protected void attachListener() { + @Override + protected void attachListener() { store.addPropertyChangeListener(listener); } /* (non-Javadoc) * @see org.eclipse.ui.internal.preferences.PropertyMapAdapter#detachListener() */ - protected void detachListener() { + @Override + protected void detachListener() { store.removePropertyChangeListener(listener); } /* (non-Javadoc) * @see org.eclipse.ui.internal.preferences.IPropertyMap#keySet() */ - public Set keySet() { + @Override + public Set keySet() { throw new UnsupportedOperationException(); } /* (non-Javadoc) * @see org.eclipse.ui.internal.preferences.IPropertyMap#getValue(java.lang.String, java.lang.Class) */ - public Object getValue(String propertyId, Class propertyType) { + @Override + public Object getValue(String propertyId, Class propertyType) { if (propertyType.isAssignableFrom(String.class)) { return store.getString(propertyId); } @@ -88,14 +93,16 @@ public final class PreferenceStoreAdapter extends PropertyMapAdapter { /* (non-Javadoc) * @see org.eclipse.ui.internal.preferences.IPropertyMap#propertyExists(java.lang.String) */ - public boolean propertyExists(String propertyId) { + @Override + public boolean propertyExists(String propertyId) { return store.contains(propertyId); } /* (non-Javadoc) * @see org.eclipse.ui.internal.preferences.IPropertyMap#setValue(java.lang.String, java.lang.Object) */ - public void setValue(String propertyId, Object newValue) { + @Override + public void setValue(String propertyId, Object newValue) { if (newValue instanceof String) { store.setValue(propertyId, (String)newValue); } else if (newValue instanceof Integer) { diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/preferences/PreferenceTransferElement.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/preferences/PreferenceTransferElement.java index 0bf52afb779..8cab3b445d7 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/preferences/PreferenceTransferElement.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/preferences/PreferenceTransferElement.java @@ -135,6 +135,7 @@ public class PreferenceTransferElement extends WorkbenchAdapter implements * * @see org.eclipse.ui.IPluginContribution#getLocalId() */ + @Override public String getLocalId() { return getID(); } @@ -144,6 +145,7 @@ public class PreferenceTransferElement extends WorkbenchAdapter implements * * @see org.eclipse.ui.IPluginContribution#getPluginId() */ + @Override public String getPluginId() { return (configurationElement != null) ? configurationElement .getContributor().getName() : null; @@ -159,10 +161,12 @@ public class PreferenceTransferElement extends WorkbenchAdapter implements this.mappings = mappings; } + @Override public String[] getScopes() { return scopes; } + @Override public Map getMapping(String scope) { return (Map) mappings.get(scope); } @@ -174,6 +178,7 @@ public class PreferenceTransferElement extends WorkbenchAdapter implements * * @see org.eclipse.ui.model.WorkbenchAdapter#getLabel(java.lang.Object) */ + @Override public String getLabel(Object object) { return getName(); } @@ -185,6 +190,7 @@ public class PreferenceTransferElement extends WorkbenchAdapter implements * org.eclipse.ui.model.WorkbenchAdapter#getImageDescriptor(java.lang.Object * ) */ + @Override public ImageDescriptor getImageDescriptor(Object object) { if (imageDescriptor == null) { String iconName = configurationElement diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/preferences/PreferencesAdapter.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/preferences/PreferencesAdapter.java index b2a834a5aa4..d9dd2253bbc 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/preferences/PreferencesAdapter.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/preferences/PreferencesAdapter.java @@ -22,7 +22,8 @@ public final class PreferencesAdapter extends PropertyMapAdapter { private Preferences store; private Preferences.IPropertyChangeListener listener = new Preferences.IPropertyChangeListener() { - public void propertyChange(Preferences.PropertyChangeEvent event) { + @Override + public void propertyChange(Preferences.PropertyChangeEvent event) { firePropertyChange(event.getProperty()); } }; @@ -34,21 +35,24 @@ public final class PreferencesAdapter extends PropertyMapAdapter { /* (non-Javadoc) * @see org.eclipse.ui.internal.preferences.PropertyMapAdapter#attachListener() */ - protected void attachListener() { + @Override + protected void attachListener() { store.addPropertyChangeListener(listener); } /* (non-Javadoc) * @see org.eclipse.ui.internal.preferences.PropertyMapAdapter#detachListener() */ - protected void detachListener() { + @Override + protected void detachListener() { store.removePropertyChangeListener(listener); } /* (non-Javadoc) * @see org.eclipse.ui.internal.preferences.IPropertyMap#keySet() */ - public Set keySet() { + @Override + public Set keySet() { Set result = new HashSet(); String[] names = store.propertyNames(); @@ -65,7 +69,8 @@ public final class PreferencesAdapter extends PropertyMapAdapter { /* (non-Javadoc) * @see org.eclipse.ui.internal.preferences.IPropertyMap#getValue(java.lang.String, java.lang.Class) */ - public Object getValue(String propertyId, Class propertyType) { + @Override + public Object getValue(String propertyId, Class propertyType) { if (propertyType.isAssignableFrom(String.class)) { return store.getString(propertyId); } @@ -96,14 +101,16 @@ public final class PreferencesAdapter extends PropertyMapAdapter { /* (non-Javadoc) * @see org.eclipse.ui.internal.preferences.IPropertyMap#propertyExists(java.lang.String) */ - public boolean propertyExists(String propertyId) { + @Override + public boolean propertyExists(String propertyId) { return store.contains(propertyId); } /* (non-Javadoc) * @see org.eclipse.ui.internal.preferences.IPropertyMap#setValue(java.lang.String, java.lang.Object) */ - public void setValue(String propertyId, Object newValue) { + @Override + public void setValue(String propertyId, Object newValue) { if (newValue instanceof String) { store.setValue(propertyId, (String)newValue); } else if (newValue instanceof Integer) { diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/preferences/PropertyMapAdapter.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/preferences/PropertyMapAdapter.java index 87f92036412..195c2034f06 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/preferences/PropertyMapAdapter.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/preferences/PropertyMapAdapter.java @@ -24,7 +24,8 @@ public abstract class PropertyMapAdapter implements IDynamicPropertyMap { /* (non-Javadoc) * @see org.eclipse.ui.internal.preferences.IDynamicPropertyMap#addListener(org.eclipse.ui.internal.preferences.IPropertyMapListener) */ - public final void addListener(IPropertyMapListener listener) { + @Override + public final void addListener(IPropertyMapListener listener) { if (listeners == null) { listeners = new PropertyListenerList(); attachListener(); @@ -35,7 +36,8 @@ public abstract class PropertyMapAdapter implements IDynamicPropertyMap { /* (non-Javadoc) * @see org.eclipse.ui.internal.preferences.IDynamicPropertyMap#removeListener(org.eclipse.ui.internal.preferences.IPropertyMapListener) */ - public final void removeListener(IPropertyMapListener listener) { + @Override + public final void removeListener(IPropertyMapListener listener) { if (listeners != null) { listeners.remove(listener); if (listeners.isEmpty()) { @@ -48,7 +50,8 @@ public abstract class PropertyMapAdapter implements IDynamicPropertyMap { /* (non-Javadoc) * @see org.eclipse.ui.internal.preferences.IPropertyMap#isCommonProperty(java.lang.String) */ - public final boolean isCommonProperty(String propertyId) { + @Override + public final boolean isCommonProperty(String propertyId) { return true; } @@ -75,7 +78,8 @@ public abstract class PropertyMapAdapter implements IDynamicPropertyMap { } } - public final void addListener(String[] eventsOfInterest, IPropertyMapListener listener) { + @Override + public final void addListener(String[] eventsOfInterest, IPropertyMapListener listener) { if (listeners == null) { listeners = new PropertyListenerList(); attachListener(); @@ -110,7 +114,8 @@ public abstract class PropertyMapAdapter implements IDynamicPropertyMap { } } - public boolean equals(Object toCompare) { + @Override + public boolean equals(Object toCompare) { return toCompare instanceof IPropertyMap && PropertyUtil.isEqual(this, (IPropertyMap)toCompare); } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/preferences/PropertyMapUnion.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/preferences/PropertyMapUnion.java index 698daec30fa..c1b0f307b5a 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/preferences/PropertyMapUnion.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/preferences/PropertyMapUnion.java @@ -36,14 +36,16 @@ public class PropertyMapUnion implements IPropertyMap { /* (non-Javadoc) * @see org.eclipse.ui.internal.preferences.IPropertyMap#keySet() */ - public Set keySet() { + @Override + public Set keySet() { return values.keySet(); } /* (non-Javadoc) * @see org.eclipse.ui.internal.preferences.IPropertyMap#getValue(java.lang.String, java.lang.Class) */ - public Object getValue(String propertyId, Class propertyType) { + @Override + public Object getValue(String propertyId, Class propertyType) { PropertyInfo info = (PropertyInfo)values.get(propertyId); if (info == null) { @@ -62,7 +64,8 @@ public class PropertyMapUnion implements IPropertyMap { /* (non-Javadoc) * @see org.eclipse.ui.internal.preferences.IPropertyMap#isCommonProperty(java.lang.String) */ - public boolean isCommonProperty(String propertyId) { + @Override + public boolean isCommonProperty(String propertyId) { PropertyInfo info = (PropertyInfo)values.get(propertyId); if (info == null) { @@ -75,14 +78,16 @@ public class PropertyMapUnion implements IPropertyMap { /* (non-Javadoc) * @see org.eclipse.ui.internal.preferences.IPropertyMap#propertyExists(java.lang.String) */ - public boolean propertyExists(String propertyId) { + @Override + public boolean propertyExists(String propertyId) { return values.get(propertyId) != null; } /* (non-Javadoc) * @see org.eclipse.ui.internal.preferences.IPropertyMap#setValue(java.lang.String, java.lang.Object) */ - public void setValue(String propertyId, Object newValue) { + @Override + public void setValue(String propertyId, Object newValue) { PropertyInfo info = new PropertyInfo(newValue, true); values.put(propertyId, info); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/preferences/SettingsTransferRegistryReader.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/preferences/SettingsTransferRegistryReader.java index 9562ef91b47..bab2825f98f 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/preferences/SettingsTransferRegistryReader.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/preferences/SettingsTransferRegistryReader.java @@ -65,6 +65,7 @@ public class SettingsTransferRegistryReader extends RegistryReader { * * @see org.eclipse.ui.internal.registry.RegistryReader#readElement(org.eclipse.core.runtime.IConfigurationElement) */ + @Override protected boolean readElement(IConfigurationElement element) { if (element.getName().equals( IWorkbenchRegistryConstants.TAG_SETTINGS_TRANSFER)) { diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/preferences/ThemeAdapter.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/preferences/ThemeAdapter.java index dc73483f28c..07cdc781b4a 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/preferences/ThemeAdapter.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/preferences/ThemeAdapter.java @@ -28,7 +28,8 @@ public class ThemeAdapter extends PropertyMapAdapter { private ITheme targetTheme; private IPropertyChangeListener listener = new IPropertyChangeListener() { - public void propertyChange(PropertyChangeEvent event) { + @Override + public void propertyChange(PropertyChangeEvent event) { firePropertyChange(event.getProperty()); } }; @@ -40,28 +41,32 @@ public class ThemeAdapter extends PropertyMapAdapter { /* (non-Javadoc) * @see org.eclipse.ui.internal.preferences.PropertyMapAdapter#attachListener() */ - protected void attachListener() { + @Override + protected void attachListener() { targetTheme.addPropertyChangeListener(listener); } /* (non-Javadoc) * @see org.eclipse.ui.internal.preferences.PropertyMapAdapter#detachListener() */ - protected void detachListener() { + @Override + protected void detachListener() { targetTheme.removePropertyChangeListener(listener); } /* (non-Javadoc) * @see org.eclipse.ui.internal.preferences.IPropertyMap#getKeySet() */ - public Set keySet() { + @Override + public Set keySet() { return getKeySet(targetTheme); } /* (non-Javadoc) * @see org.eclipse.ui.internal.preferences.IPropertyMap#getValue(java.lang.String, java.lang.Class) */ - public Object getValue(String propertyId, Class propertyType) { + @Override + public Object getValue(String propertyId, Class propertyType) { return getValue(targetTheme, propertyId, propertyType); } @@ -110,14 +115,16 @@ public class ThemeAdapter extends PropertyMapAdapter { /* (non-Javadoc) * @see org.eclipse.ui.internal.preferences.IPropertyMap#propertyExists(java.lang.String) */ - public boolean propertyExists(String propertyId) { + @Override + public boolean propertyExists(String propertyId) { return keySet().contains(propertyId); } /* (non-Javadoc) * @see org.eclipse.ui.internal.preferences.IPropertyMap#setValue(java.lang.String) */ - public void setValue(String propertyId, Object newValue) { + @Override + public void setValue(String propertyId, Object newValue) { throw new UnsupportedOperationException(); } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/preferences/ThemeManagerAdapter.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/preferences/ThemeManagerAdapter.java index 22c481e0eaa..a2c3e792294 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/preferences/ThemeManagerAdapter.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/preferences/ThemeManagerAdapter.java @@ -24,7 +24,8 @@ public class ThemeManagerAdapter extends PropertyMapAdapter { private IThemeManager manager; private IPropertyChangeListener listener = new IPropertyChangeListener() { - public void propertyChange(PropertyChangeEvent event) { + @Override + public void propertyChange(PropertyChangeEvent event) { firePropertyChange(event.getProperty()); } }; @@ -36,21 +37,24 @@ public class ThemeManagerAdapter extends PropertyMapAdapter { /* (non-Javadoc) * @see org.eclipse.ui.internal.preferences.PropertyMapAdapter#attachListener() */ - protected void attachListener() { + @Override + protected void attachListener() { manager.addPropertyChangeListener(listener); } /* (non-Javadoc) * @see org.eclipse.ui.internal.preferences.PropertyMapAdapter#detachListener() */ - protected void detachListener() { + @Override + protected void detachListener() { manager.removePropertyChangeListener(listener); } /* (non-Javadoc) * @see org.eclipse.ui.internal.preferences.IPropertyMap#keySet() */ - public Set keySet() { + @Override + public Set keySet() { Set result = ThemeAdapter.getKeySet(manager.getCurrentTheme()); return result; @@ -59,21 +63,24 @@ public class ThemeManagerAdapter extends PropertyMapAdapter { /* (non-Javadoc) * @see org.eclipse.ui.internal.preferences.IPropertyMap#getValue(java.lang.String, java.lang.Class) */ - public Object getValue(String propertyId, Class propertyType) { + @Override + public Object getValue(String propertyId, Class propertyType) { return ThemeAdapter.getValue(manager.getCurrentTheme(), propertyId, propertyType); } /* (non-Javadoc) * @see org.eclipse.ui.internal.preferences.IPropertyMap#propertyExists(java.lang.String) */ - public boolean propertyExists(String propertyId) { + @Override + public boolean propertyExists(String propertyId) { return keySet().contains(propertyId); } /* (non-Javadoc) * @see org.eclipse.ui.internal.preferences.IPropertyMap#setValue(java.lang.String, java.lang.Object) */ - public void setValue(String propertyId, Object newValue) { + @Override + public void setValue(String propertyId, Object newValue) { throw new UnsupportedOperationException(); } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/preferences/WorkbenchPreferenceExpressionNode.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/preferences/WorkbenchPreferenceExpressionNode.java index 3c9b5177168..10b5ade22d1 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/preferences/WorkbenchPreferenceExpressionNode.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/preferences/WorkbenchPreferenceExpressionNode.java @@ -41,7 +41,8 @@ public class WorkbenchPreferenceExpressionNode extends PreferenceNode * * @see org.eclipse.jface.preference.PreferenceNode#findSubNode(java.lang.String) */ - public IPreferenceNode findSubNode(String id) { + @Override + public IPreferenceNode findSubNode(String id) { return getNodeExpression(super.findSubNode(id)); } @@ -50,7 +51,8 @@ public class WorkbenchPreferenceExpressionNode extends PreferenceNode * * @see org.eclipse.jface.preference.PreferenceNode#getSubNodes() */ - public IPreferenceNode[] getSubNodes() { + @Override + public IPreferenceNode[] getSubNodes() { IPreferenceNode[] prefNodes = super.getSubNodes(); int size = prefNodes.length; List list = new ArrayList(size); @@ -90,6 +92,7 @@ public class WorkbenchPreferenceExpressionNode extends PreferenceNode /* (non-Javadoc) * @see org.eclipse.ui.IPluginContribution#getLocalId() */ + @Override public String getLocalId() { return getId(); } @@ -97,6 +100,7 @@ public class WorkbenchPreferenceExpressionNode extends PreferenceNode /* (non-Javadoc) * @see org.eclipse.ui.IPluginContribution#getPluginId() */ + @Override public String getPluginId() { return ""; //$NON-NLS-1$ } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/preferences/WorkbenchPreferenceExtensionNode.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/preferences/WorkbenchPreferenceExtensionNode.java index c76235fd949..409a9cd7670 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/preferences/WorkbenchPreferenceExtensionNode.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/preferences/WorkbenchPreferenceExtensionNode.java @@ -130,6 +130,7 @@ public abstract class WorkbenchPreferenceExtensionNode extends WorkbenchPreferen /* (non-Javadoc) * @see org.eclipse.jface.preference.IPreferenceNode#disposeResources() */ + @Override public void disposeResources() { if (image != null) { image.dispose(); @@ -141,6 +142,7 @@ public abstract class WorkbenchPreferenceExtensionNode extends WorkbenchPreferen /* (non-Javadoc) * @see org.eclipse.jface.preference.IPreferenceNode#getLabelImage() */ + @Override public Image getLabelImage() { if (image == null) { ImageDescriptor desc = getImageDescriptor(); @@ -155,6 +157,7 @@ public abstract class WorkbenchPreferenceExtensionNode extends WorkbenchPreferen /* (non-Javadoc) * @see org.eclipse.jface.preference.IPreferenceNode#getLabelText() */ + @Override public String getLabelText() { return getConfigurationElement().getAttribute(IWorkbenchRegistryConstants.ATT_NAME); } @@ -164,7 +167,8 @@ public abstract class WorkbenchPreferenceExtensionNode extends WorkbenchPreferen * * @return the image descriptor */ - public ImageDescriptor getImageDescriptor() { + @Override + public ImageDescriptor getImageDescriptor() { if (imageDescriptor != null) { return imageDescriptor; } @@ -189,6 +193,7 @@ public abstract class WorkbenchPreferenceExtensionNode extends WorkbenchPreferen /* (non-Javadoc) * @see org.eclipse.ui.activities.support.IPluginContribution#getLocalId() */ + @Override public String getLocalId() { return getId(); } @@ -196,6 +201,7 @@ public abstract class WorkbenchPreferenceExtensionNode extends WorkbenchPreferen /* (non-Javadoc) * @see org.eclipse.ui.activities.support.IPluginContribution#getPluginId() */ + @Override public String getPluginId() { return pluginId; } @@ -203,7 +209,8 @@ public abstract class WorkbenchPreferenceExtensionNode extends WorkbenchPreferen /* (non-Javadoc) * @see org.eclipse.ui.model.IComparableContribution#getAdapter(java.lang.Class) */ - public Object getAdapter(Class adapter) + @Override + public Object getAdapter(Class adapter) { if (adapter == IConfigurationElement.class) return getConfigurationElement(); @@ -213,7 +220,8 @@ public abstract class WorkbenchPreferenceExtensionNode extends WorkbenchPreferen /* (non-Javadoc) * @see org.eclipse.ui.model.IComparableContribution#getLabel() */ - public String getLabel() + @Override + public String getLabel() { return getLabelText(); } @@ -221,7 +229,8 @@ public abstract class WorkbenchPreferenceExtensionNode extends WorkbenchPreferen /* (non-Javadoc) * @see org.eclipse.ui.model.IComparableContribution#getPriority() */ - public int getPriority() + @Override + public int getPriority() { return priority; } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/preferences/WorkingCopyPreferences.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/preferences/WorkingCopyPreferences.java index 384c5192274..dfe8981820a 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/preferences/WorkingCopyPreferences.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/preferences/WorkingCopyPreferences.java @@ -69,6 +69,7 @@ public class WorkingCopyPreferences extends EventManager implements /* (non-Javadoc) * @see org.eclipse.core.runtime.preferences.IEclipsePreferences#addNodeChangeListener(org.eclipse.core.runtime.preferences.IEclipsePreferences.INodeChangeListener) */ + @Override public void addNodeChangeListener(INodeChangeListener listener) { // no-op - working copy nodes don't fire node change events } @@ -76,6 +77,7 @@ public class WorkingCopyPreferences extends EventManager implements /* (non-Javadoc) * @see org.eclipse.core.runtime.preferences.IEclipsePreferences#removeNodeChangeListener(org.eclipse.core.runtime.preferences.IEclipsePreferences.INodeChangeListener) */ + @Override public void removeNodeChangeListener(INodeChangeListener listener) { // no-op - working copy nodes don't fire node change events } @@ -83,6 +85,7 @@ public class WorkingCopyPreferences extends EventManager implements /* (non-Javadoc) * @see org.eclipse.core.runtime.preferences.IEclipsePreferences#addPreferenceChangeListener(org.eclipse.core.runtime.preferences.IEclipsePreferences.IPreferenceChangeListener) */ + @Override public void addPreferenceChangeListener(IPreferenceChangeListener listener) { checkRemoved(); addListenerObject(listener); @@ -91,6 +94,7 @@ public class WorkingCopyPreferences extends EventManager implements /* (non-Javadoc) * @see org.eclipse.core.runtime.preferences.IEclipsePreferences#removePreferenceChangeListener(org.eclipse.core.runtime.preferences.IEclipsePreferences.IPreferenceChangeListener) */ + @Override public void removePreferenceChangeListener(IPreferenceChangeListener listener) { checkRemoved(); removeListenerObject(listener); @@ -99,6 +103,7 @@ public class WorkingCopyPreferences extends EventManager implements /* (non-Javadoc) * @see org.osgi.service.prefs.Preferences#removeNode() */ + @Override public void removeNode() throws BackingStoreException { checkRemoved(); @@ -122,6 +127,7 @@ public class WorkingCopyPreferences extends EventManager implements /* (non-Javadoc) * @see org.osgi.service.prefs.Preferences#node(java.lang.String) */ + @Override public Preferences node(String path) { checkRemoved(); return manager.getWorkingCopy((IEclipsePreferences) getOriginal().node(path)); @@ -130,6 +136,7 @@ public class WorkingCopyPreferences extends EventManager implements /* (non-Javadoc) * @see org.eclipse.core.runtime.preferences.IEclipsePreferences#accept(org.eclipse.core.runtime.preferences.IPreferenceNodeVisitor) */ + @Override public void accept(IPreferenceNodeVisitor visitor) throws BackingStoreException { checkRemoved(); if (!visitor.visit(this)) { @@ -144,6 +151,7 @@ public class WorkingCopyPreferences extends EventManager implements /* (non-Javadoc) * @see org.osgi.service.prefs.Preferences#put(java.lang.String, java.lang.String) */ + @Override public void put(String key, String value) { checkRemoved(); if (key == null || value == null) { @@ -175,6 +183,7 @@ public class WorkingCopyPreferences extends EventManager implements /* (non-Javadoc) * @see org.osgi.service.prefs.Preferences#get(java.lang.String, java.lang.String) */ + @Override public String get(String key, String defaultValue) { checkRemoved(); return internalGet(key, defaultValue); @@ -194,6 +203,7 @@ public class WorkingCopyPreferences extends EventManager implements /* (non-Javadoc) * @see org.osgi.service.prefs.Preferences#remove(java.lang.String) */ + @Override public void remove(String key) { checkRemoved(); if (key == null) { @@ -215,6 +225,7 @@ public class WorkingCopyPreferences extends EventManager implements /* (non-Javadoc) * @see org.osgi.service.prefs.Preferences#clear() */ + @Override public void clear() { checkRemoved(); for (Iterator i = temporarySettings.keySet().iterator(); i.hasNext();) { @@ -230,6 +241,7 @@ public class WorkingCopyPreferences extends EventManager implements /* (non-Javadoc) * @see org.osgi.service.prefs.Preferences#putInt(java.lang.String, int) */ + @Override public void putInt(String key, int value) { checkRemoved(); if (key == null) { @@ -251,6 +263,7 @@ public class WorkingCopyPreferences extends EventManager implements /* (non-Javadoc) * @see org.osgi.service.prefs.Preferences#getInt(java.lang.String, int) */ + @Override public int getInt(String key, int defaultValue) { checkRemoved(); String value = internalGet(key, null); @@ -268,6 +281,7 @@ public class WorkingCopyPreferences extends EventManager implements /* (non-Javadoc) * @see org.osgi.service.prefs.Preferences#putLong(java.lang.String, long) */ + @Override public void putLong(String key, long value) { checkRemoved(); if (key == null) { @@ -289,6 +303,7 @@ public class WorkingCopyPreferences extends EventManager implements /* (non-Javadoc) * @see org.osgi.service.prefs.Preferences#getLong(java.lang.String, long) */ + @Override public long getLong(String key, long defaultValue) { checkRemoved(); String value = internalGet(key, null); @@ -306,6 +321,7 @@ public class WorkingCopyPreferences extends EventManager implements /* (non-Javadoc) * @see org.osgi.service.prefs.Preferences#putBoolean(java.lang.String, boolean) */ + @Override public void putBoolean(String key, boolean value) { checkRemoved(); if (key == null) { @@ -327,6 +343,7 @@ public class WorkingCopyPreferences extends EventManager implements /* (non-Javadoc) * @see org.osgi.service.prefs.Preferences#getBoolean(java.lang.String, boolean) */ + @Override public boolean getBoolean(String key, boolean defaultValue) { checkRemoved(); String value = internalGet(key, null); @@ -336,6 +353,7 @@ public class WorkingCopyPreferences extends EventManager implements /* (non-Javadoc) * @see org.osgi.service.prefs.Preferences#putFloat(java.lang.String, float) */ + @Override public void putFloat(String key, float value) { checkRemoved(); if (key == null) { @@ -357,6 +375,7 @@ public class WorkingCopyPreferences extends EventManager implements /* (non-Javadoc) * @see org.osgi.service.prefs.Preferences#getFloat(java.lang.String, float) */ + @Override public float getFloat(String key, float defaultValue) { checkRemoved(); String value = internalGet(key, null); @@ -374,6 +393,7 @@ public class WorkingCopyPreferences extends EventManager implements /* (non-Javadoc) * @see org.osgi.service.prefs.Preferences#putDouble(java.lang.String, double) */ + @Override public void putDouble(String key, double value) { checkRemoved(); if (key == null) { @@ -395,6 +415,7 @@ public class WorkingCopyPreferences extends EventManager implements /* (non-Javadoc) * @see org.osgi.service.prefs.Preferences#getDouble(java.lang.String, double) */ + @Override public double getDouble(String key, double defaultValue) { checkRemoved(); String value = internalGet(key, null); @@ -412,6 +433,7 @@ public class WorkingCopyPreferences extends EventManager implements /* (non-Javadoc) * @see org.osgi.service.prefs.Preferences#putByteArray(java.lang.String, byte[]) */ + @Override public void putByteArray(String key, byte[] value) { checkRemoved(); if (key == null || value == null) { @@ -433,6 +455,7 @@ public class WorkingCopyPreferences extends EventManager implements /* (non-Javadoc) * @see org.osgi.service.prefs.Preferences#getByteArray(java.lang.String, byte[]) */ + @Override public byte[] getByteArray(String key, byte[] defaultValue) { checkRemoved(); String value = internalGet(key, null); @@ -442,6 +465,7 @@ public class WorkingCopyPreferences extends EventManager implements /* (non-Javadoc) * @see org.osgi.service.prefs.Preferences#keys() */ + @Override public String[] keys() throws BackingStoreException { checkRemoved(); HashSet allKeys = new HashSet(Arrays.asList(getOriginal().keys())); @@ -452,6 +476,7 @@ public class WorkingCopyPreferences extends EventManager implements /* (non-Javadoc) * @see org.osgi.service.prefs.Preferences#childrenNames() */ + @Override public String[] childrenNames() throws BackingStoreException { checkRemoved(); return getOriginal().childrenNames(); @@ -460,6 +485,7 @@ public class WorkingCopyPreferences extends EventManager implements /* (non-Javadoc) * @see org.osgi.service.prefs.Preferences#parent() */ + @Override public Preferences parent() { checkRemoved(); return manager.getWorkingCopy((IEclipsePreferences) getOriginal().parent()); @@ -468,6 +494,7 @@ public class WorkingCopyPreferences extends EventManager implements /* (non-Javadoc) * @see org.osgi.service.prefs.Preferences#nodeExists(java.lang.String) */ + @Override public boolean nodeExists(String pathName) throws BackingStoreException { // short circuit for this node if (pathName.length() == 0) { @@ -479,6 +506,7 @@ public class WorkingCopyPreferences extends EventManager implements /* (non-Javadoc) * @see org.osgi.service.prefs.Preferences#name() */ + @Override public String name() { return getOriginal().name(); } @@ -486,6 +514,7 @@ public class WorkingCopyPreferences extends EventManager implements /* (non-Javadoc) * @see org.osgi.service.prefs.Preferences#absolutePath() */ + @Override public String absolutePath() { return getOriginal().absolutePath(); } @@ -493,6 +522,7 @@ public class WorkingCopyPreferences extends EventManager implements /* (non-Javadoc) * @see org.osgi.service.prefs.Preferences#flush() */ + @Override public void flush() throws BackingStoreException { if (removed) { getOriginal().removeNode(); @@ -519,6 +549,7 @@ public class WorkingCopyPreferences extends EventManager implements /* (non-Javadoc) * @see org.osgi.service.prefs.Preferences#sync() */ + @Override public void sync() throws BackingStoreException { checkRemoved(); // forget our settings diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/preferences/WorkingSetPropertyPage.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/preferences/WorkingSetPropertyPage.java index 3571a133074..cb14e8f6caa 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/preferences/WorkingSetPropertyPage.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/preferences/WorkingSetPropertyPage.java @@ -38,6 +38,7 @@ public class WorkingSetPropertyPage extends WizardPropertyPage { /** * {@inheritDoc} */ + @Override public boolean performFinish() { return true; } @@ -45,6 +46,7 @@ public class WorkingSetPropertyPage extends WizardPropertyPage { /** * {@inheritDoc} */ + @Override public void addPages() { addPage(new ReadOnlyPage()); } @@ -60,6 +62,7 @@ public class WorkingSetPropertyPage extends WizardPropertyPage { /** * {@inheritDoc} */ + @Override public void createControl(Composite parent) { Composite composite= new Composite(parent, SWT.NONE); composite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true)); @@ -78,6 +81,7 @@ public class WorkingSetPropertyPage extends WizardPropertyPage { /** * {@inheritDoc} */ + @Override public void setElement(IAdaptable element) { super.setElement(element); @@ -91,6 +95,7 @@ public class WorkingSetPropertyPage extends WizardPropertyPage { /** * {@inheritDoc} */ + @Override protected void applyChanges() { //Wizard does all the work } @@ -98,6 +103,7 @@ public class WorkingSetPropertyPage extends WizardPropertyPage { /** * {@inheritDoc} */ + @Override protected IWizard createWizard() { if (fWorkingSet.isEditable()) { return PlatformUI.getWorkbench().getWorkingSetManager().createWorkingSetEditWizard(fWorkingSet); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/preferences/WorkingSetSettingsTransfer.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/preferences/WorkingSetSettingsTransfer.java index 3956600b73d..ea10b7c01a2 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/preferences/WorkingSetSettingsTransfer.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/preferences/WorkingSetSettingsTransfer.java @@ -38,6 +38,7 @@ public class WorkingSetSettingsTransfer extends WorkbenchSettingsTransfer { * * @see org.eclipse.ui.preferences.SettingsTransfer#getName() */ + @Override public String getName() { return WorkbenchMessages.WorkingSets_Name; } @@ -47,6 +48,7 @@ public class WorkingSetSettingsTransfer extends WorkbenchSettingsTransfer { * * @see org.eclipse.ui.preferences.SettingsTransfer#transferSettings(org.eclipse.core.runtime.IPath) */ + @Override public IStatus transferSettings(IPath newWorkspaceRoot) { IPath dataLocation = getNewWorkbenchStateLocation(newWorkspaceRoot); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/progress/AnimationItem.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/progress/AnimationItem.java index f6efd905afc..b0e3065f1c8 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/progress/AnimationItem.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/progress/AnimationItem.java @@ -44,14 +44,16 @@ public abstract class AnimationItem { /* (non-Javadoc) * @see org.eclipse.ui.internal.progress.AnimationItem.IAnimationContainer#animationDone() */ - public void animationDone() { + @Override + public void animationDone() { //Do nothing by default } /* (non-Javadoc) * @see org.eclipse.ui.internal.progress.AnimationItem.IAnimationContainer#animationStart() */ - public void animationStart() { + @Override + public void animationStart() { //Do nothing by default } }; @@ -81,7 +83,8 @@ public abstract class AnimationItem { * * @see org.eclipse.swt.events.MouseListener#mouseDoubleClick(org.eclipse.swt.events.MouseEvent) */ - public void mouseDoubleClick(MouseEvent arg0) { + @Override + public void mouseDoubleClick(MouseEvent arg0) { ProgressManagerUtil.openProgressView(AnimationItem.this.window); } @@ -90,7 +93,8 @@ public abstract class AnimationItem { * * @see org.eclipse.swt.events.MouseListener#mouseDown(org.eclipse.swt.events.MouseEvent) */ - public void mouseDown(MouseEvent arg0) { + @Override + public void mouseDown(MouseEvent arg0) { //Do nothing } @@ -99,12 +103,14 @@ public abstract class AnimationItem { * * @see org.eclipse.swt.events.MouseListener#mouseUp(org.eclipse.swt.events.MouseEvent) */ - public void mouseUp(MouseEvent arg0) { + @Override + public void mouseUp(MouseEvent arg0) { //Do nothing } }); animationItem.addDisposeListener(new DisposeListener() { - public void widgetDisposed(DisposeEvent e) { + @Override + public void widgetDisposed(DisposeEvent e) { AnimationManager.getInstance().removeItem(AnimationItem.this); } }); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/progress/AnimationManager.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/progress/AnimationManager.java index 76b58f4bf55..3b6bc721334 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/progress/AnimationManager.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/progress/AnimationManager.java @@ -67,7 +67,8 @@ public class AnimationManager { * * @see org.eclipse.ui.progress.UIJob#runInUIThread(org.eclipse.core.runtime.IProgressMonitor) */ - public IStatus runInUIThread(IProgressMonitor monitor) { + @Override + public IStatus runInUIThread(IProgressMonitor monitor) { if (animated) { animationProcessor.animationStarted(); @@ -139,7 +140,8 @@ public class AnimationManager { * * @see org.eclipse.ui.internal.progress.IJobProgressManagerListener#addJob(org.eclipse.ui.internal.progress.JobInfo) */ - public void addJob(JobInfo info) { + @Override + public void addJob(JobInfo info) { incrementJobCount(info); } @@ -148,7 +150,8 @@ public class AnimationManager { * * @see org.eclipse.ui.internal.progress.IJobProgressManagerListener#refreshJobInfo(org.eclipse.ui.internal.progress.JobInfo) */ - public void refreshJobInfo(JobInfo info) { + @Override + public void refreshJobInfo(JobInfo info) { int state = info.getJob().getState(); if (state == Job.RUNNING) { addJob(info); @@ -162,7 +165,8 @@ public class AnimationManager { * * @see org.eclipse.ui.internal.progress.IJobProgressManagerListener#refreshAll() */ - public void refreshAll() { + @Override + public void refreshAll() { ProgressManager manager = ProgressManager.getInstance(); jobs.clear(); setAnimated(false); @@ -177,7 +181,8 @@ public class AnimationManager { * * @see org.eclipse.ui.internal.progress.IJobProgressManagerListener#remove(org.eclipse.ui.internal.progress.JobInfo) */ - public void removeJob(JobInfo info) { + @Override + public void removeJob(JobInfo info) { decrementJobCount(info.getJob()); } @@ -186,7 +191,8 @@ public class AnimationManager { * * @see org.eclipse.ui.internal.progress.IJobProgressManagerListener#showsDebug() */ - public boolean showsDebug() { + @Override + public boolean showsDebug() { return false; } @@ -226,7 +232,8 @@ public class AnimationManager { * * @see org.eclipse.ui.internal.progress.IJobProgressManagerListener#addGroup(org.eclipse.ui.internal.progress.GroupInfo) */ - public void addGroup(GroupInfo info) { + @Override + public void addGroup(GroupInfo info) { //Don't care about groups } @@ -235,7 +242,8 @@ public class AnimationManager { * * @see org.eclipse.ui.internal.progress.IJobProgressManagerListener#removeGroup(org.eclipse.ui.internal.progress.GroupInfo) */ - public void removeGroup(GroupInfo group) { + @Override + public void removeGroup(GroupInfo group) { //Don't care about groups } @@ -244,7 +252,8 @@ public class AnimationManager { * * @see org.eclipse.ui.internal.progress.IJobProgressManagerListener#refreshGroup(org.eclipse.ui.internal.progress.GroupInfo) */ - public void refreshGroup(GroupInfo info) { + @Override + public void refreshGroup(GroupInfo info) { //Don't care about groups } }; diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/progress/BlockedJobsDialog.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/progress/BlockedJobsDialog.java index f13909c0673..cb5c2f4c4ef 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/progress/BlockedJobsDialog.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/progress/BlockedJobsDialog.java @@ -81,6 +81,7 @@ public class BlockedJobsDialog extends IconAndMessageDialog { * * @see org.eclipse.ui.internal.progress.JobTreeElement#getChildren() */ + @Override Object[] getChildren() { return ProgressManagerUtil.EMPTY_OBJECT_ARRAY; } @@ -90,6 +91,7 @@ public class BlockedJobsDialog extends IconAndMessageDialog { * * @see org.eclipse.ui.internal.progress.JobTreeElement#getDisplayString() */ + @Override String getDisplayString() { if (blockedTaskName == null || blockedTaskName.length() == 0) { return ProgressMessages.BlockedJobsDialog_UserInterfaceTreeElement; @@ -102,6 +104,7 @@ public class BlockedJobsDialog extends IconAndMessageDialog { * * @see org.eclipse.ui.internal.progress.JobTreeElement#getDisplayImage() */ + @Override public Image getDisplayImage() { return JFaceResources.getImage(ProgressManager.WAITING_JOB_KEY); } @@ -111,6 +114,7 @@ public class BlockedJobsDialog extends IconAndMessageDialog { * * @see org.eclipse.ui.internal.progress.JobTreeElement#hasChildren() */ + @Override boolean hasChildren() { return false; } @@ -120,6 +124,7 @@ public class BlockedJobsDialog extends IconAndMessageDialog { * * @see org.eclipse.ui.internal.progress.JobTreeElement#isActive() */ + @Override boolean isActive() { return true; } @@ -129,6 +134,7 @@ public class BlockedJobsDialog extends IconAndMessageDialog { * * @see org.eclipse.ui.internal.progress.JobTreeElement#isJobInfo() */ + @Override boolean isJobInfo() { return false; } @@ -138,6 +144,7 @@ public class BlockedJobsDialog extends IconAndMessageDialog { * * @see org.eclipse.ui.internal.progress.JobTreeElement#cancel() */ + @Override public void cancel() { blockingMonitor.setCanceled(true); } @@ -147,6 +154,7 @@ public class BlockedJobsDialog extends IconAndMessageDialog { * * @see org.eclipse.ui.internal.progress.JobTreeElement#isCancellable() */ + @Override public boolean isCancellable() { return true; } @@ -200,6 +208,7 @@ public class BlockedJobsDialog extends IconAndMessageDialog { * * @see org.eclipse.ui.progress.UIJob#runInUIThread(org.eclipse.core.runtime.IProgressMonitor) */ + @Override public IStatus runInUIThread(IProgressMonitor monitor) { if (singleton == null) { return Status.CANCEL_STATUS; @@ -269,6 +278,7 @@ public class BlockedJobsDialog extends IconAndMessageDialog { * * @return parent The parent Composite. */ + @Override protected Control createDialogArea(Composite parent) { setMessage(message); createMessageArea(parent); @@ -293,6 +303,7 @@ public class BlockedJobsDialog extends IconAndMessageDialog { * @see org.eclipse.jface.viewers.ViewerComparator#compare(org.eclipse.jface.viewers.Viewer, * java.lang.Object, java.lang.Object) */ + @Override public int compare(Viewer testViewer, Object e1, Object e2) { return ((Comparable) e1).compareTo(e2); } @@ -322,6 +333,7 @@ public class BlockedJobsDialog extends IconAndMessageDialog { * * @see org.eclipse.ui.internal.progress.ProgressViewerContentProvider#getElements(java.lang.Object) */ + @Override public Object[] getElements(Object inputElement) { Object[] elements = super.getElements(inputElement); Object[] result = new Object[elements.length + 1]; @@ -364,6 +376,7 @@ public class BlockedJobsDialog extends IconAndMessageDialog { * * @see org.eclipse.jface.window.Window#configureShell(org.eclipse.swt.widgets.Shell) */ + @Override protected void configureShell(Shell shell) { super.configureShell(shell); shell.setText(ProgressMessages.BlockedJobsDialog_BlockedTitle); @@ -393,6 +406,7 @@ public class BlockedJobsDialog extends IconAndMessageDialog { * * @see org.eclipse.jface.dialogs.IconAndMessageDialog#getImage() */ + @Override protected Image getImage() { return getInfoImage(); } @@ -427,6 +441,7 @@ public class BlockedJobsDialog extends IconAndMessageDialog { * * @see org.eclipse.jface.dialogs.Dialog#close() */ + @Override public boolean close() { // Clear the singleton first singleton = null; @@ -439,6 +454,7 @@ public class BlockedJobsDialog extends IconAndMessageDialog { * * @see org.eclipse.jface.dialogs.IconAndMessageDialog#createButtonBar(org.eclipse.swt.widgets.Composite) */ + @Override protected Control createButtonBar(Composite parent) { // Do nothing here as we want no buttons return parent; diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/progress/DetailedProgressViewer.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/progress/DetailedProgressViewer.java index 291ac0c802d..96a89b5fd01 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/progress/DetailedProgressViewer.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/progress/DetailedProgressViewer.java @@ -83,6 +83,7 @@ public class DetailedProgressViewer extends AbstractProgressViewer { * * @see org.eclipse.swt.events.FocusAdapter#focusGained(org.eclipse.swt.events.FocusEvent) */ + @Override public void focusGained(FocusEvent e) { if (!settingFocus) { // Prevent new focus events as a result this update @@ -100,6 +101,7 @@ public class DetailedProgressViewer extends AbstractProgressViewer { * * @see org.eclipse.swt.events.ControlListener#controlMoved(org.eclipse.swt.events.ControlEvent) */ + @Override public void controlMoved(ControlEvent e) { updateVisibleItems(); @@ -110,6 +112,7 @@ public class DetailedProgressViewer extends AbstractProgressViewer { * * @see org.eclipse.swt.events.ControlListener#controlResized(org.eclipse.swt.events.ControlEvent) */ + @Override public void controlResized(ControlEvent e) { updateVisibleItems(); } @@ -144,6 +147,7 @@ public class DetailedProgressViewer extends AbstractProgressViewer { * * @see org.eclipse.ui.internal.progress.AbstractProgressViewer#add(java.lang.Object[]) */ + @Override public void add(Object[] elements) { ViewerComparator sorter = getComparator(); @@ -211,6 +215,7 @@ public class DetailedProgressViewer extends AbstractProgressViewer { * * @see org.eclipse.ui.internal.progress.ProgressInfoItem.IndexListener#selectNext() */ + @Override public void selectNext() { DetailedProgressViewer.this.selectNext(item); @@ -221,6 +226,7 @@ public class DetailedProgressViewer extends AbstractProgressViewer { * * @see org.eclipse.ui.internal.progress.ProgressInfoItem.IndexListener#selectPrevious() */ + @Override public void selectPrevious() { DetailedProgressViewer.this.selectPrevious(item); @@ -231,6 +237,7 @@ public class DetailedProgressViewer extends AbstractProgressViewer { * * @see org.eclipse.ui.internal.progress.ProgressInfoItem.IndexListener#select() */ + @Override public void select() { Control[] children = control.getChildren(); @@ -304,6 +311,7 @@ public class DetailedProgressViewer extends AbstractProgressViewer { * * @see org.eclipse.jface.viewers.StructuredViewer#doFindInputItem(java.lang.Object) */ + @Override protected Widget doFindInputItem(Object element) { return null; } @@ -313,6 +321,7 @@ public class DetailedProgressViewer extends AbstractProgressViewer { * * @see org.eclipse.jface.viewers.StructuredViewer#doFindItem(java.lang.Object) */ + @Override protected Widget doFindItem(Object element) { Control[] existingChildren = control.getChildren(); for (int i = 0; i < existingChildren.length; i++) { @@ -333,6 +342,7 @@ public class DetailedProgressViewer extends AbstractProgressViewer { * @see org.eclipse.jface.viewers.StructuredViewer#doUpdateItem(org.eclipse.swt.widgets.Widget, * java.lang.Object, boolean) */ + @Override protected void doUpdateItem(Widget item, Object element, boolean fullMap) { if (usingElementMap()) { unmapElement(item); @@ -346,6 +356,7 @@ public class DetailedProgressViewer extends AbstractProgressViewer { * * @see org.eclipse.jface.viewers.Viewer#getControl() */ + @Override public Control getControl() { return scrolled; } @@ -355,6 +366,7 @@ public class DetailedProgressViewer extends AbstractProgressViewer { * * @see org.eclipse.jface.viewers.StructuredViewer#getSelectionFromWidget() */ + @Override protected List getSelectionFromWidget() { return new ArrayList(0); } @@ -365,6 +377,7 @@ public class DetailedProgressViewer extends AbstractProgressViewer { * @see org.eclipse.jface.viewers.Viewer#inputChanged(java.lang.Object, * java.lang.Object) */ + @Override protected void inputChanged(Object input, Object oldInput) { super.inputChanged(input, oldInput); refreshAll(); @@ -376,6 +389,7 @@ public class DetailedProgressViewer extends AbstractProgressViewer { * * @see org.eclipse.jface.viewers.StructuredViewer#internalRefresh(java.lang.Object) */ + @Override protected void internalRefresh(Object element) { if (element == null) { return; @@ -405,6 +419,7 @@ public class DetailedProgressViewer extends AbstractProgressViewer { * * @see org.eclipse.ui.internal.progress.AbstractProgressViewer#remove(java.lang.Object[]) */ + @Override public void remove(Object[] elements) { for (int i = 0; i < elements.length; i++) { @@ -445,6 +460,7 @@ public class DetailedProgressViewer extends AbstractProgressViewer { * * @see org.eclipse.jface.viewers.StructuredViewer#reveal(java.lang.Object) */ + @Override public void reveal(Object element) { } @@ -455,6 +471,7 @@ public class DetailedProgressViewer extends AbstractProgressViewer { * @see org.eclipse.jface.viewers.StructuredViewer#setSelectionToWidget(java.util.List, * boolean) */ + @Override protected void setSelectionToWidget(List l, boolean reveal) { } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/progress/ErrorInfo.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/progress/ErrorInfo.java index 99eb6f018fe..a1f1851ea6d 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/progress/ErrorInfo.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/progress/ErrorInfo.java @@ -47,6 +47,7 @@ public class ErrorInfo extends JobTreeElement { * * @see org.eclipse.ui.internal.progress.JobTreeElement#hasChildren() */ + @Override boolean hasChildren() { return false; } @@ -56,6 +57,7 @@ public class ErrorInfo extends JobTreeElement { * * @see org.eclipse.ui.internal.progress.JobTreeElement#getChildren() */ + @Override Object[] getChildren() { return ProgressManagerUtil.EMPTY_OBJECT_ARRAY; } @@ -65,6 +67,7 @@ public class ErrorInfo extends JobTreeElement { * * @see org.eclipse.ui.internal.progress.JobTreeElement#getDisplayString() */ + @Override String getDisplayString() { return NLS.bind(ProgressMessages.JobInfo_Error, (new Object[] { job.getName(), @@ -85,6 +88,7 @@ public class ErrorInfo extends JobTreeElement { * * @see org.eclipse.ui.internal.progress.JobTreeElement#isJobInfo() */ + @Override boolean isJobInfo() { return false; } @@ -103,6 +107,7 @@ public class ErrorInfo extends JobTreeElement { * * @see org.eclipse.ui.internal.progress.JobTreeElement#isActive() */ + @Override boolean isActive() { return true; } @@ -130,6 +135,7 @@ public class ErrorInfo extends JobTreeElement { * * @see org.eclipse.ui.internal.progress.JobTreeElement#compareTo(java.lang.Object) */ + @Override public int compareTo(Object arg0) { if (arg0 instanceof ErrorInfo) { // Order ErrorInfo by time received diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/progress/FinishedJobs.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/progress/FinishedJobs.java index 42d615885d3..9c90e689cf3 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/progress/FinishedJobs.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/progress/FinishedJobs.java @@ -68,24 +68,30 @@ public class FinishedJobs extends EventManager { private FinishedJobs() { listener = new IJobProgressManagerListener() { + @Override public void addJob(JobInfo info) { checkForDuplicates(info); } + @Override public void addGroup(GroupInfo info) { checkForDuplicates(info); } + @Override public void refreshJobInfo(JobInfo info) { checkTasks(info); } + @Override public void refreshGroup(GroupInfo info) { } + @Override public void refreshAll() { } + @Override public void removeJob(JobInfo info) { if (keep(info)) { checkForDuplicates(info); @@ -93,9 +99,11 @@ public class FinishedJobs extends EventManager { } } + @Override public void removeGroup(GroupInfo group) { } + @Override public boolean showsDebug() { return false; } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/progress/GroupInfo.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/progress/GroupInfo.java index 734d97889e3..f43bdf51a64 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/progress/GroupInfo.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/progress/GroupInfo.java @@ -42,6 +42,7 @@ class GroupInfo extends JobTreeElement implements IProgressMonitor { * * @see org.eclipse.ui.internal.progress.JobTreeElement#hasChildren() */ + @Override boolean hasChildren() { synchronized (lock) { return !infos.isEmpty(); @@ -54,6 +55,7 @@ class GroupInfo extends JobTreeElement implements IProgressMonitor { * * @see org.eclipse.ui.internal.progress.JobTreeElement#getChildren() */ + @Override Object[] getChildren() { synchronized (lock) { return infos.toArray(); @@ -65,6 +67,7 @@ class GroupInfo extends JobTreeElement implements IProgressMonitor { * * @see org.eclipse.ui.internal.progress.JobTreeElement#getDisplayString() */ + @Override String getDisplayString() { if (total < 0) { return taskName; @@ -91,6 +94,7 @@ class GroupInfo extends JobTreeElement implements IProgressMonitor { * * @see org.eclipse.ui.internal.progress.JobTreeElement#isJobInfo() */ + @Override boolean isJobInfo() { return false; } @@ -102,6 +106,7 @@ class GroupInfo extends JobTreeElement implements IProgressMonitor { * org.eclipse.core.runtime.IProgressMonitor#beginTask(java.lang.String, * int) */ + @Override public void beginTask(String name, int totalWork) { if (name == null) name = ProgressMessages.SubTaskInfo_UndefinedTaskName; @@ -120,6 +125,7 @@ class GroupInfo extends JobTreeElement implements IProgressMonitor { * * @see org.eclipse.core.runtime.IProgressMonitor#done() */ + @Override public void done() { synchronized (lock) { isActive = false; @@ -153,6 +159,7 @@ class GroupInfo extends JobTreeElement implements IProgressMonitor { * * @see org.eclipse.core.runtime.IProgressMonitor#internalWorked(double) */ + @Override public void internalWorked(double work) { synchronized (lock) { currentWork += work; @@ -165,6 +172,7 @@ class GroupInfo extends JobTreeElement implements IProgressMonitor { * * @see org.eclipse.core.runtime.IProgressMonitor#isCanceled() */ + @Override public boolean isCanceled() { // Just a group so no cancel state return false; @@ -175,6 +183,7 @@ class GroupInfo extends JobTreeElement implements IProgressMonitor { * * @see org.eclipse.core.runtime.IProgressMonitor#setCanceled(boolean) */ + @Override public void setCanceled(boolean value) { cancel(); } @@ -185,6 +194,7 @@ class GroupInfo extends JobTreeElement implements IProgressMonitor { * @see * org.eclipse.core.runtime.IProgressMonitor#setTaskName(java.lang.String) */ + @Override public void setTaskName(String name) { synchronized (this) { isActive = true; @@ -201,6 +211,7 @@ class GroupInfo extends JobTreeElement implements IProgressMonitor { * * @see org.eclipse.core.runtime.IProgressMonitor#subTask(java.lang.String) */ + @Override public void subTask(String name) { // Not interesting for this monitor } @@ -210,6 +221,7 @@ class GroupInfo extends JobTreeElement implements IProgressMonitor { * * @see org.eclipse.core.runtime.IProgressMonitor#worked(int) */ + @Override public void worked(int work) { internalWorked(work); } @@ -244,6 +256,7 @@ class GroupInfo extends JobTreeElement implements IProgressMonitor { * * @see org.eclipse.ui.internal.progress.JobTreeElement#isActive() */ + @Override boolean isActive() { return isActive; } @@ -253,6 +266,7 @@ class GroupInfo extends JobTreeElement implements IProgressMonitor { * * @see org.eclipse.ui.internal.progress.JobTreeElement#cancel() */ + @Override public void cancel() { Object[] jobInfos = getChildren(); for (int i = 0; i < jobInfos.length; i++) { @@ -267,6 +281,7 @@ class GroupInfo extends JobTreeElement implements IProgressMonitor { * * @see org.eclipse.ui.internal.progress.JobTreeElement#isCancellable() */ + @Override public boolean isCancellable() { return true; } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/progress/JobInfo.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/progress/JobInfo.java index aefa8758811..ba6ce61cb30 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/progress/JobInfo.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/progress/JobInfo.java @@ -91,7 +91,8 @@ public class JobInfo extends JobTreeElement { * * @see org.eclipse.ui.internal.progress.JobTreeElement#cancel() */ - public void cancel() { + @Override + public void cancel() { this.canceled = true; this.job.cancel(); //Call the refresh so that this is updated immediately @@ -167,7 +168,8 @@ public class JobInfo extends JobTreeElement { * * @see java.lang.Comparable#compareTo(java.lang.Object) */ - public int compareTo(Object arg0) { + @Override + public int compareTo(Object arg0) { if (!(arg0 instanceof JobInfo)) { return super.compareTo(arg0); @@ -218,7 +220,8 @@ public class JobInfo extends JobTreeElement { * * @see org.eclipse.ui.internal.progress.JobTreeElement#getChildren() */ - Object[] getChildren() { + @Override + Object[] getChildren() { return children.toArray(); } @@ -227,7 +230,8 @@ public class JobInfo extends JobTreeElement { * * @see org.eclipse.ui.internal.progress.JobTreeElement#getCondensedDisplayString() */ - String getCondensedDisplayString() { + @Override + String getCondensedDisplayString() { TaskInfo info = getTaskInfo(); if (info != null) { return info.getDisplayStringWithoutTask(true); @@ -240,7 +244,8 @@ public class JobInfo extends JobTreeElement { * * @see org.eclipse.ui.internal.progress.JobTreeElement#getDisplayImage() */ - public Image getDisplayImage() { + @Override + public Image getDisplayImage() { int done = getPercentDone(); if (done > 0) { return super.getDisplayImage(); @@ -262,14 +267,16 @@ public class JobInfo extends JobTreeElement { /* (non-Javadoc) * @see org.eclipse.ui.internal.progress.JobTreeElement#getDisplayString() */ - String getDisplayString() { + @Override + String getDisplayString() { return getDisplayString(true); } /* (non-Javadoc) * @see org.eclipse.ui.internal.progress.JobTreeElement#getDisplayString(boolean) */ - String getDisplayString(boolean showProgress) { + @Override + String getDisplayString(boolean showProgress) { String name = getDisplayStringWithStatus(showProgress); if (job.isSystem()) { return NLS.bind(ProgressMessages.JobInfo_System, (new Object[] { name })); @@ -334,6 +341,7 @@ public class JobInfo extends JobTreeElement { * * @see org.eclipse.ui.internal.progress.JobTreeElement#getParent() */ + @Override public Object getParent() { return parent; } @@ -370,7 +378,8 @@ public class JobInfo extends JobTreeElement { * * @see org.eclipse.ui.internal.progress.JobTreeElement#hasChildren() */ - boolean hasChildren() { + @Override + boolean hasChildren() { return children.size() > 0; } @@ -388,7 +397,8 @@ public class JobInfo extends JobTreeElement { * * @see org.eclipse.ui.internal.progress.JobTreeElement#isActive() */ - boolean isActive() { + @Override + boolean isActive() { return getJob().getState() != Job.NONE; } @@ -416,7 +426,8 @@ public class JobInfo extends JobTreeElement { * * @see org.eclipse.ui.internal.progress.JobTreeElement#isCancellable() */ - public boolean isCancellable() { + @Override + public boolean isCancellable() { return super.isCancellable(); } @@ -425,7 +436,8 @@ public class JobInfo extends JobTreeElement { * * @see org.eclipse.ui.internal.progress.JobTreeElement#isJobInfo() */ - boolean isJobInfo() { + @Override + boolean isJobInfo() { return true; } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/progress/JobTreeElement.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/progress/JobTreeElement.java index 3f2ceb5ae1d..cd11daf2346 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/progress/JobTreeElement.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/progress/JobTreeElement.java @@ -89,6 +89,7 @@ public abstract class JobTreeElement implements Comparable { * * @see java.lang.Comparable#compareTo(java.lang.Object) */ + @Override public int compareTo(Object arg0) { if (arg0 instanceof JobTreeElement) return getDisplayString().compareTo( diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/progress/JobsViewPreferenceDialog.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/progress/JobsViewPreferenceDialog.java index 8db6f8c7cd2..4c08618084d 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/progress/JobsViewPreferenceDialog.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/progress/JobsViewPreferenceDialog.java @@ -42,6 +42,7 @@ public class JobsViewPreferenceDialog extends ViewSettingsDialog { /* (non-Javadoc) * @see org.eclipse.jface.window.Window#configureShell(org.eclipse.swt.widgets.Shell) */ + @Override protected void configureShell(Shell newShell) { super.configureShell(newShell); newShell.setText(ProgressMessages.JobsViewPreferenceDialog_Title); @@ -50,6 +51,7 @@ public class JobsViewPreferenceDialog extends ViewSettingsDialog { /* (non-Javadoc) * @see org.eclipse.jface.dialogs.Dialog#createDialogArea(org.eclipse.swt.widgets.Composite) */ + @Override protected Control createDialogArea(Composite parent) { Composite top = (Composite) super.createDialogArea(parent); @@ -70,6 +72,7 @@ public class JobsViewPreferenceDialog extends ViewSettingsDialog { /* (non-Javadoc) * @see org.eclipse.jface.dialogs.Dialog#okPressed() */ + @Override protected void okPressed() { verboseEditor.store(); super.okPressed(); @@ -78,6 +81,7 @@ public class JobsViewPreferenceDialog extends ViewSettingsDialog { /* (non-Javadoc) * @see org.eclipse.ui.internal.preferences.ViewSettingsDialog#performDefaults() */ + @Override protected void performDefaults() { verboseEditor.loadDefault(); } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/progress/ProgressAnimationItem.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/progress/ProgressAnimationItem.java index 318ee2a4dc6..64f3da22313 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/progress/ProgressAnimationItem.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/progress/ProgressAnimationItem.java @@ -91,6 +91,7 @@ public class ProgressAnimationItem extends AnimationItem implements progressRegion = region; mouseListener = new MouseAdapter() { + @Override public void mouseDoubleClick(MouseEvent e) { doAction(); } @@ -256,7 +257,8 @@ public class ProgressAnimationItem extends AnimationItem implements toolbar.getParent().layout(); // must layout toolbar.getAccessible().addAccessibleListener(new AccessibleAdapter() { - public void getName(AccessibleEvent e) { + @Override + public void getName(AccessibleEvent e) { e.result = tt; } }); @@ -267,6 +269,7 @@ public class ProgressAnimationItem extends AnimationItem implements * * @see org.eclipse.ui.internal.progress.AnimationItem#createAnimationItem(org.eclipse.swt.widgets.Composite) */ + @Override protected Control createAnimationItem(Composite parent) { if (okImage == null) { @@ -281,6 +284,7 @@ public class ProgressAnimationItem extends AnimationItem implements top = new Composite(parent, SWT.NULL); top.addDisposeListener(new DisposeListener() { + @Override public void widgetDisposed(DisposeEvent e) { FinishedJobs.getInstance().removeListener( ProgressAnimationItem.this); @@ -325,6 +329,7 @@ public class ProgressAnimationItem extends AnimationItem implements toolButton = new ToolItem(toolbar, SWT.NONE); toolButton.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { doAction(); } @@ -351,6 +356,7 @@ public class ProgressAnimationItem extends AnimationItem implements * * @see org.eclipse.ui.internal.progress.AnimationItem#getControl() */ + @Override public Control getControl() { return top; } @@ -360,6 +366,7 @@ public class ProgressAnimationItem extends AnimationItem implements * * @see org.eclipse.ui.internal.progress.AnimationItem#animationDone() */ + @Override void animationDone() { super.animationDone(); animationRunning = false; @@ -382,6 +389,7 @@ public class ProgressAnimationItem extends AnimationItem implements * * @see org.eclipse.ui.internal.progress.AnimationItem#animationStart() */ + @Override void animationStart() { super.animationStart(); animationRunning = true; @@ -392,18 +400,22 @@ public class ProgressAnimationItem extends AnimationItem implements refresh(); } + @Override public void removed(JobTreeElement info) { final Display display = Display.getDefault(); display.asyncExec(new Runnable() { + @Override public void run() { refresh(); } }); } + @Override public void finished(final JobTreeElement jte) { final Display display = Display.getDefault(); display.asyncExec(new Runnable() { + @Override public void run() { refresh(); } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/progress/ProgressAnimationProcessor.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/progress/ProgressAnimationProcessor.java index 2fe128af18d..7eafe47ce00 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/progress/ProgressAnimationProcessor.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/progress/ProgressAnimationProcessor.java @@ -71,7 +71,8 @@ class ProgressAnimationProcessor implements IAnimationProcessor { * * @see org.eclipse.ui.internal.progress.IAnimationProcessor#addItem(org.eclipse.ui.internal.progress.AnimationItem) */ - public void addItem(AnimationItem item) { + @Override + public void addItem(AnimationItem item) { Assert.isTrue(item instanceof ProgressAnimationItem); items.add(item); } @@ -81,7 +82,8 @@ class ProgressAnimationProcessor implements IAnimationProcessor { * * @see org.eclipse.ui.internal.progress.IAnimationProcessor#removeItem(org.eclipse.ui.internal.progress.AnimationItem) */ - public void removeItem(AnimationItem item) { + @Override + public void removeItem(AnimationItem item) { Assert.isTrue(item instanceof ProgressAnimationItem); items.remove(item); } @@ -91,7 +93,8 @@ class ProgressAnimationProcessor implements IAnimationProcessor { * * @see org.eclipse.ui.internal.progress.IAnimationProcessor#hasItems() */ - public boolean hasItems() { + @Override + public boolean hasItems() { return items.size() > 0; } @@ -110,7 +113,8 @@ class ProgressAnimationProcessor implements IAnimationProcessor { * * @see org.eclipse.ui.internal.progress.IAnimationProcessor#animationStarted(org.eclipse.core.runtime.IProgressMonitor) */ - public void animationStarted() { + @Override + public void animationStarted() { AnimationItem[] animationItems = getAnimationItems(); for (int i = 0; i < animationItems.length; i++) { animationItems[i].animationStart(); @@ -123,7 +127,8 @@ class ProgressAnimationProcessor implements IAnimationProcessor { * * @see org.eclipse.ui.internal.progress.IAnimationProcessor#getPreferredWidth() */ - public int getPreferredWidth() { + @Override + public int getPreferredWidth() { return 30; } @@ -142,7 +147,8 @@ class ProgressAnimationProcessor implements IAnimationProcessor { /* (non-Javadoc) * @see org.eclipse.ui.internal.progress.IAnimationProcessor#animationFinished() */ - public void animationFinished() { + @Override + public void animationFinished() { AnimationItem[] animationItems = getAnimationItems(); for (int i = 0; i < animationItems.length; i++) { animationItems[i].animationDone(); @@ -153,7 +159,8 @@ class ProgressAnimationProcessor implements IAnimationProcessor { /* (non-Javadoc) * @see org.eclipse.ui.internal.progress.IAnimationProcessor#isProcessorJob(org.eclipse.core.runtime.jobs.Job) */ - public boolean isProcessorJob(Job job) { + @Override + public boolean isProcessorJob(Job job) { // We have no jobs return false; } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/progress/ProgressCanvasViewer.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/progress/ProgressCanvasViewer.java index 7415cc95474..6e14b38f11f 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/progress/ProgressCanvasViewer.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/progress/ProgressCanvasViewer.java @@ -87,9 +87,11 @@ public class ProgressCanvasViewer extends AbstractProgressViewer { * tab traversal order. Defeating it here is more self-contained then * setting the tab list on the shell or other parent composite. */ - protected void hookControl(Control control) { + @Override + protected void hookControl(Control control) { control.addDisposeListener(new DisposeListener() { - public void widgetDisposed(DisposeEvent event) { + @Override + public void widgetDisposed(DisposeEvent event) { handleDispose(event); } }); @@ -100,7 +102,8 @@ public class ProgressCanvasViewer extends AbstractProgressViewer { * * @see org.eclipse.jface.viewers.StructuredViewer#doFindInputItem(java.lang.Object) */ - protected Widget doFindInputItem(Object element) { + @Override + protected Widget doFindInputItem(Object element) { return null; // No widgets associated with items } @@ -109,7 +112,8 @@ public class ProgressCanvasViewer extends AbstractProgressViewer { * * @see org.eclipse.jface.viewers.StructuredViewer#doFindItem(java.lang.Object) */ - protected Widget doFindItem(Object element) { + @Override + protected Widget doFindItem(Object element) { return null; // No widgets associated with items } @@ -119,7 +123,8 @@ public class ProgressCanvasViewer extends AbstractProgressViewer { * @see org.eclipse.jface.viewers.StructuredViewer#doUpdateItem(org.eclipse.swt.widgets.Widget, * java.lang.Object, boolean) */ - protected void doUpdateItem(Widget item, Object element, boolean fullMap) { + @Override + protected void doUpdateItem(Widget item, Object element, boolean fullMap) { canvas.redraw(); } @@ -128,7 +133,8 @@ public class ProgressCanvasViewer extends AbstractProgressViewer { * * @see org.eclipse.jface.viewers.StructuredViewer#getSelectionFromWidget() */ - protected List getSelectionFromWidget() { + @Override + protected List getSelectionFromWidget() { //No selection on a Canvas return EMPTY_LIST; } @@ -138,7 +144,8 @@ public class ProgressCanvasViewer extends AbstractProgressViewer { * * @see org.eclipse.jface.viewers.StructuredViewer#internalRefresh(java.lang.Object) */ - protected void internalRefresh(Object element) { + @Override + protected void internalRefresh(Object element) { displayedItems = getSortedChildren(getRoot()); canvas.redraw(); } @@ -148,7 +155,8 @@ public class ProgressCanvasViewer extends AbstractProgressViewer { * * @see org.eclipse.jface.viewers.StructuredViewer#reveal(java.lang.Object) */ - public void reveal(Object element) { + @Override + public void reveal(Object element) { //Nothing to do here as we do not scroll } @@ -158,7 +166,8 @@ public class ProgressCanvasViewer extends AbstractProgressViewer { * @see org.eclipse.jface.viewers.StructuredViewer#setSelectionToWidget(java.util.List, * boolean) */ - protected void setSelectionToWidget(List l, boolean reveal) { + @Override + protected void setSelectionToWidget(List l, boolean reveal) { //Do nothing as there is no selection } @@ -167,7 +176,8 @@ public class ProgressCanvasViewer extends AbstractProgressViewer { * * @see org.eclipse.jface.viewers.Viewer#getControl() */ - public Control getControl() { + @Override + public Control getControl() { return canvas; } @@ -178,7 +188,8 @@ public class ProgressCanvasViewer extends AbstractProgressViewer { * * @see org.eclipse.swt.events.PaintListener#paintControl(org.eclipse.swt.events.PaintEvent) */ - public void paintControl(PaintEvent event) { + @Override + public void paintControl(PaintEvent event) { GC gc = event.gc; Transform transform = null; @@ -227,7 +238,8 @@ public class ProgressCanvasViewer extends AbstractProgressViewer { /* (non-Javadoc) * @see org.eclipse.jface.viewers.ContentViewer#setLabelProvider(org.eclipse.jface.viewers.IBaseLabelProvider) */ - public void setLabelProvider(IBaseLabelProvider labelProvider) { + @Override + public void setLabelProvider(IBaseLabelProvider labelProvider) { Assert.isTrue(labelProvider instanceof ILabelProvider); super.setLabelProvider(labelProvider); } @@ -262,6 +274,7 @@ public class ProgressCanvasViewer extends AbstractProgressViewer { /* (non-Javadoc) * @see org.eclipse.ui.internal.progress.AbstractProgressViewer#add(java.lang.Object[]) */ + @Override public void add(Object[] elements) { refresh(true); @@ -270,6 +283,7 @@ public class ProgressCanvasViewer extends AbstractProgressViewer { /* (non-Javadoc) * @see org.eclipse.ui.internal.progress.AbstractProgressViewer#remove(java.lang.Object[]) */ + @Override public void remove(Object[] elements) { refresh(true); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/progress/ProgressContentProvider.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/progress/ProgressContentProvider.java index 965c0c3fb2c..6290e544675 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/progress/ProgressContentProvider.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/progress/ProgressContentProvider.java @@ -49,7 +49,8 @@ public abstract class ProgressContentProvider implements * * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object) */ - public Object[] getElements(Object inputElement) { + @Override + public Object[] getElements(Object inputElement) { return ProgressManager.getInstance().getRootElements(debug()); } @@ -59,7 +60,8 @@ public abstract class ProgressContentProvider implements * * @see org.eclipse.jface.viewers.IContentProvider#dispose() */ - public void dispose() { + @Override + public void dispose() { ProgressViewUpdater.getSingleton().removeCollector(this); } @@ -69,7 +71,8 @@ public abstract class ProgressContentProvider implements * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer, * java.lang.Object, java.lang.Object) */ - public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { + @Override + public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { //No change when input changes } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/progress/ProgressInfoItem.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/progress/ProgressInfoItem.java index d0b2484309a..1faf115e07a 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/progress/ProgressInfoItem.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/progress/ProgressInfoItem.java @@ -241,6 +241,7 @@ public class ProgressInfoItem extends Composite { actionButton .setToolTipText(ProgressMessages.NewProgressView_CancelJobToolTip); actionButton.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { actionButton.setEnabled(false); cancelOrRemove(); @@ -252,6 +253,7 @@ public class ProgressInfoItem extends Composite { * * @see org.eclipse.swt.widgets.Listener#handleEvent(org.eclipse.swt.widgets.Event) */ + @Override public void handleEvent(Event event) { if (indexListener == null) { return; @@ -283,6 +285,7 @@ public class ProgressInfoItem extends Composite { * * @see org.eclipse.swt.events.MouseListener#mouseDown(org.eclipse.swt.events.MouseEvent) */ + @Override public void mouseDown(MouseEvent e) { if (indexListener != null) { indexListener.select(); @@ -780,6 +783,7 @@ public class ProgressInfoItem extends Composite { * * @see org.eclipse.swt.events.SelectionListener#widgetSelected(org.eclipse.swt.events.SelectionEvent) */ + @Override public void widgetSelected(SelectionEvent e) { executeTrigger(); } @@ -791,6 +795,7 @@ public class ProgressInfoItem extends Composite { * * @see org.eclipse.swt.widgets.Listener#handleEvent(org.eclipse.swt.widgets.Event) */ + @Override public void handleEvent(Event event) { Object text = link.getData(TEXT_KEY); @@ -1051,6 +1056,7 @@ public class ProgressInfoItem extends Composite { /* (non-Javadoc) * @see org.eclipse.swt.widgets.Widget#dispose() */ + @Override public void dispose() { super.dispose(); if(resourceManager != null) diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/progress/ProgressLabelProvider.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/progress/ProgressLabelProvider.java index 27b40346618..d6a26c73859 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/progress/ProgressLabelProvider.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/progress/ProgressLabelProvider.java @@ -24,14 +24,16 @@ public class ProgressLabelProvider extends LabelProvider { /* (non-Javadoc) * @see org.eclipse.jface.viewers.ILabelProvider#getImage(java.lang.Object) */ - public Image getImage(Object element) { + @Override + public Image getImage(Object element) { return ((JobTreeElement) element).getDisplayImage(); } /* (non-Javadoc) * @see org.eclipse.jface.viewers.ILabelProvider#getText(java.lang.Object) */ - public String getText(Object element) { + @Override + public String getText(Object element) { return ((JobTreeElement) element).getDisplayString(); } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/progress/ProgressManager.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/progress/ProgressManager.java index 702f67da4fd..1bccfdb6f04 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/progress/ProgressManager.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/progress/ProgressManager.java @@ -83,6 +83,7 @@ public class ProgressManager extends ProgressProvider implements * @deprecated * @see IProgressConstants#PROPERTY_IN_DIALOG */ + @Deprecated public static final QualifiedName PROPERTY_IN_DIALOG = IProgressConstants.PROPERTY_IN_DIALOG; private static final String ERROR_JOB = "errorstate.png"; //$NON-NLS-1$ @@ -205,6 +206,7 @@ public class ProgressManager extends ProgressProvider implements * @see org.eclipse.core.runtime.IProgressMonitor#beginTask(java.lang.String, * int) */ + @Override public void beginTask(String taskName, int totalWork) { JobInfo info = getJobInfo(job); info.beginTask(taskName, totalWork); @@ -220,6 +222,7 @@ public class ProgressManager extends ProgressProvider implements * * @see org.eclipse.core.runtime.IProgressMonitor#done() */ + @Override public void done() { JobInfo info = getJobInfo(job); info.clearTaskInfo(); @@ -235,6 +238,7 @@ public class ProgressManager extends ProgressProvider implements * * @see org.eclipse.core.runtime.IProgressMonitor#internalWorked(double) */ + @Override public void internalWorked(double work) { JobInfo info = getJobInfo(job); if (info.hasTaskInfo()) { @@ -251,6 +255,7 @@ public class ProgressManager extends ProgressProvider implements * * @see org.eclipse.core.runtime.IProgressMonitor#isCanceled() */ + @Override public boolean isCanceled() { // Use the internal get so we don't create a Job Info for // a job that is not running (see bug 149857) @@ -265,6 +270,7 @@ public class ProgressManager extends ProgressProvider implements * * @see org.eclipse.core.runtime.IProgressMonitor#setCanceled(boolean) */ + @Override public void setCanceled(boolean value) { JobInfo info = getJobInfo(job); // Don't bother cancelling twice @@ -282,6 +288,7 @@ public class ProgressManager extends ProgressProvider implements * * @see org.eclipse.core.runtime.IProgressMonitor#setTaskName(java.lang.String) */ + @Override public void setTaskName(String taskName) { JobInfo info = getJobInfo(job); if (info.hasTaskInfo()) { @@ -303,6 +310,7 @@ public class ProgressManager extends ProgressProvider implements * * @see org.eclipse.core.runtime.IProgressMonitor#subTask(java.lang.String) */ + @Override public void subTask(String name) { if (name == null) { return; @@ -321,6 +329,7 @@ public class ProgressManager extends ProgressProvider implements * * @see org.eclipse.core.runtime.IProgressMonitor#worked(int) */ + @Override public void worked(int work) { internalWorked(work); } @@ -330,6 +339,7 @@ public class ProgressManager extends ProgressProvider implements * * @see org.eclipse.core.runtime.IProgressMonitorWithBlocking#clearBlocked() */ + @Override public void clearBlocked() { JobInfo info = getJobInfo(job); info.setBlockedStatus(null); @@ -344,6 +354,7 @@ public class ProgressManager extends ProgressProvider implements * * @see org.eclipse.core.runtime.IProgressMonitorWithBlocking#setBlocked(org.eclipse.core.runtime.IStatus) */ + @Override public void setBlocked(IStatus reason) { JobInfo info = getJobInfo(job); info.setBlockedStatus(reason); @@ -392,6 +403,7 @@ public class ProgressManager extends ProgressProvider implements return new StatusManager.INotificationListener(){ + @Override public void statusManagerNotified(int type, StatusAdapter[] adapters) { if(type == INotificationTypes.HANDLED){ FinishedJobs.getInstance().removeErrorJobs(); @@ -415,6 +427,7 @@ public class ProgressManager extends ProgressProvider implements * * @see org.eclipse.core.runtime.jobs.JobChangeAdapter#aboutToRun(org.eclipse.core.runtime.jobs.IJobChangeEvent) */ + @Override public void aboutToRun(IJobChangeEvent event) { JobInfo info = getJobInfo(event.getJob()); refreshJobInfo(info); @@ -432,6 +445,7 @@ public class ProgressManager extends ProgressProvider implements * * @see org.eclipse.core.runtime.jobs.JobChangeAdapter#done(org.eclipse.core.runtime.jobs.IJobChangeEvent) */ + @Override public void done(IJobChangeEvent event) { if (!PlatformUI.isWorkbenchRunning()) { return; @@ -474,6 +488,7 @@ public class ProgressManager extends ProgressProvider implements * * @see org.eclipse.core.runtime.jobs.JobChangeAdapter#scheduled(org.eclipse.core.runtime.jobs.IJobChangeEvent) */ + @Override public void scheduled(IJobChangeEvent event) { updateFor(event); if (event.getJob().isUser()) { @@ -487,6 +502,7 @@ public class ProgressManager extends ProgressProvider implements * * @see org.eclipse.ui.progress.UIJob#runInUIThread(org.eclipse.core.runtime.IProgressMonitor) */ + @Override public IStatus runInUIThread( IProgressMonitor monitor) { showInDialog(null, finalEvent.getJob()); @@ -521,6 +537,7 @@ public class ProgressManager extends ProgressProvider implements * * @see org.eclipse.core.runtime.jobs.JobChangeAdapter#awake(org.eclipse.core.runtime.jobs.IJobChangeEvent) */ + @Override public void awake(IJobChangeEvent event) { updateFor(event); } @@ -530,6 +547,7 @@ public class ProgressManager extends ProgressProvider implements * * @see org.eclipse.core.runtime.jobs.JobChangeAdapter#sleeping(org.eclipse.core.runtime.jobs.IJobChangeEvent) */ + @Override public void sleeping(IJobChangeEvent event) { if (jobs.containsKey(event.getJob()))// Are we showing this? @@ -605,6 +623,7 @@ public class ProgressManager extends ProgressProvider implements * * @see org.eclipse.core.runtime.jobs.ProgressProvider#createMonitor(org.eclipse.core.runtime.jobs.Job) */ + @Override public IProgressMonitor createMonitor(Job job) { return progressFor(job); } @@ -614,6 +633,7 @@ public class ProgressManager extends ProgressProvider implements * * @see org.eclipse.core.runtime.jobs.ProgressProvider#getDefaultMonitor() */ + @Override public IProgressMonitor getDefaultMonitor() { // only need a default monitor for operations the UI thread // and only if there is a display @@ -945,6 +965,7 @@ public class ProgressManager extends ProgressProvider implements * * @see org.eclipse.ui.progress.IProgressService#busyCursorWhile(org.eclipse.jface.operation.IRunnableWithProgress) */ + @Override public void busyCursorWhile(final IRunnableWithProgress runnable) throws InvocationTargetException, InterruptedException { final ProgressMonitorJobsDialog dialog = new ProgressMonitorJobsDialog( @@ -954,6 +975,7 @@ public class ProgressManager extends ProgressProvider implements final InterruptedException[] interrupt = new InterruptedException[1]; // show a busy cursor until the dialog opens Runnable dialogWaitRunnable = new Runnable() { + @Override public void run() { try { dialog.setOpenOnRun(false); @@ -1012,6 +1034,7 @@ public class ProgressManager extends ProgressProvider implements * * @see org.eclipse.ui.progress.UIJob#runInUIThread(org.eclipse.core.runtime.IProgressMonitor) */ + @Override public IStatus runInUIThread(IProgressMonitor monitor) { setUserInterfaceActive(true); if (ProgressManagerUtil.safeToOpen(dialog, null)) { @@ -1039,6 +1062,7 @@ public class ProgressManager extends ProgressProvider implements * * @see org.eclipse.core.runtime.jobs.ProgressProvider#createProgressGroup() */ + @Override public IProgressMonitor createProgressGroup() { return new GroupInfo(); } @@ -1049,6 +1073,7 @@ public class ProgressManager extends ProgressProvider implements * @see org.eclipse.core.runtime.jobs.ProgressProvider#createMonitor(org.eclipse.core.runtime.jobs.Job, * org.eclipse.core.runtime.IProgressMonitor, int) */ + @Override public IProgressMonitor createMonitor(Job job, IProgressMonitor group, int ticks) { JobMonitor monitor = progressFor(job); @@ -1137,6 +1162,7 @@ public class ProgressManager extends ProgressProvider implements * @see org.eclipse.ui.progress.IProgressService#showInDialog(org.eclipse.swt.widgets.Shell, * org.eclipse.core.runtime.jobs.Job) */ + @Override public void showInDialog(Shell shell, Job job) { if (shouldRunInBackground()) { return; @@ -1153,6 +1179,7 @@ public class ProgressManager extends ProgressProvider implements * @see org.eclipse.jface.operation.IRunnableContext#run(boolean, boolean, * org.eclipse.jface.operation.IRunnableWithProgress) */ + @Override public void run(boolean fork, boolean cancelable, IRunnableWithProgress runnable) throws InvocationTargetException, InterruptedException { @@ -1173,6 +1200,7 @@ public class ProgressManager extends ProgressProvider implements * @see org.eclipse.ui.progress.IProgressService#runInUI(org.eclipse.jface.operation.IRunnableWithProgress, * org.eclipse.core.runtime.jobs.ISchedulingRule) */ + @Override public void runInUI(final IRunnableContext context, final IRunnableWithProgress runnable, final ISchedulingRule rule) throws InvocationTargetException, InterruptedException { @@ -1181,6 +1209,7 @@ public class ProgressManager extends ProgressProvider implements runnable, rule); final Display display = Display.getDefault(); display.syncExec(new Runnable() { + @Override public void run() { BusyIndicator.showWhile(display, runnableWithStatus); } @@ -1204,6 +1233,7 @@ public class ProgressManager extends ProgressProvider implements * * @see org.eclipse.ui.progress.IProgressService#getLongOperationTime() */ + @Override public int getLongOperationTime() { return 800; } @@ -1214,6 +1244,7 @@ public class ProgressManager extends ProgressProvider implements * @see org.eclipse.ui.progress.IProgressService#registerIconForFamily(org.eclipse.jface.resource.ImageDescriptor, * java.lang.Object) */ + @Override public void registerIconForFamily(ImageDescriptor icon, Object family) { String key = IMAGE_KEY + String.valueOf(imageKeyTable.size()); imageKeyTable.put(family, key); @@ -1231,6 +1262,7 @@ public class ProgressManager extends ProgressProvider implements * * @see org.eclipse.ui.progress.IProgressService#getIconFor(org.eclipse.core.runtime.jobs.Job) */ + @Override public Image getIconFor(Job job) { Enumeration families = imageKeyTable.keys(); while (families.hasMoreElements()) { @@ -1340,6 +1372,7 @@ public class ProgressManager extends ProgressProvider implements this.rule = rule; } + @Override public void run() { IJobManager manager = Job.getJobManager(); try { @@ -1372,6 +1405,7 @@ public class ProgressManager extends ProgressProvider implements return new EventLoopProgressMonitor(new NullProgressMonitor()) { + @Override public void setBlocked(IStatus reason) { // Set a shell to open with as we want to create diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/progress/ProgressManagerUtil.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/progress/ProgressManagerUtil.java index 8f2fe6e1352..c39b964f08b 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/progress/ProgressManagerUtil.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/progress/ProgressManagerUtil.java @@ -50,6 +50,7 @@ public class ProgressManagerUtil { @SuppressWarnings("unchecked") static class ProgressViewerComparator extends ViewerComparator { + @Override @SuppressWarnings("rawtypes") public int compare(Viewer testViewer, Object e1, Object e2) { return ((Comparable) e1).compareTo(e2); @@ -72,6 +73,7 @@ public class ProgressManagerUtil { for (int retries = 3; retries > 0; retries--) { try { Arrays.sort(elements, new Comparator<Object>() { + @Override public int compare(Object a, Object b) { return ProgressViewerComparator.this.compare(viewer, a, b); } @@ -477,6 +479,7 @@ public class ProgressManagerUtil { * * @see org.eclipse.jface.window.IShellProvider#getShell() */ + @Override public Shell getShell() { return getDefaultParent(); } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/progress/ProgressMonitorFocusJobDialog.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/progress/ProgressMonitorFocusJobDialog.java index 9ad528acfc1..be191ebeb8e 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/progress/ProgressMonitorFocusJobDialog.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/progress/ProgressMonitorFocusJobDialog.java @@ -66,6 +66,7 @@ class ProgressMonitorFocusJobDialog extends ProgressMonitorJobsDialog { * * @see org.eclipse.jface.dialogs.ProgressMonitorDialog#cancelPressed() */ + @Override protected void cancelPressed() { job.cancel(); super.cancelPressed(); @@ -76,6 +77,7 @@ class ProgressMonitorFocusJobDialog extends ProgressMonitorJobsDialog { * * @see org.eclipse.jface.dialogs.ProgressMonitorDialog#configureShell(org.eclipse.swt.widgets.Shell) */ + @Override protected void configureShell(Shell shell) { super.configureShell(shell); shell.setText(job.getName()); @@ -87,6 +89,7 @@ class ProgressMonitorFocusJobDialog extends ProgressMonitorJobsDialog { * * @see org.eclipse.ui.internal.progress.ProgressMonitorJobsDialog#createButtonsForButtonBar(org.eclipse.swt.widgets.Composite) */ + @Override protected void createButtonsForButtonBar(Composite parent) { Button runInWorkspace = createButton( parent, @@ -99,6 +102,7 @@ class ProgressMonitorFocusJobDialog extends ProgressMonitorJobsDialog { * * @see org.eclipse.swt.events.SelectionAdapter#widgetSelected(org.eclipse.swt.events.SelectionEvent) */ + @Override public void widgetSelected(SelectionEvent e) { Rectangle shellPosition = getShell().getBounds(); job.setProperty(IProgressConstants.PROPERTY_IN_DIALOG, @@ -128,6 +132,7 @@ class ProgressMonitorFocusJobDialog extends ProgressMonitorJobsDialog { * * @see org.eclipse.core.runtime.jobs.IJobChangeListener#done(org.eclipse.core.runtime.jobs.IJobChangeEvent) */ + @Override public void done(IJobChangeEvent event) { // first of all, make sure this listener is removed event.getJob().removeJobChangeListener(this); @@ -145,6 +150,7 @@ class ProgressMonitorFocusJobDialog extends ProgressMonitorJobsDialog { * * @see org.eclipse.ui.progress.UIJob#runInUIThread(org.eclipse.core.runtime.IProgressMonitor) */ + @Override public IStatus runInUIThread(IProgressMonitor monitor) { Shell currentShell = getShell(); if (currentShell == null || currentShell.isDisposed()) { @@ -173,6 +179,7 @@ class ProgressMonitorFocusJobDialog extends ProgressMonitorJobsDialog { * @see org.eclipse.core.runtime.IProgressMonitor#beginTask(java.lang.String, * int) */ + @Override public void beginTask(String name, int totalWork) { final String finalName = name; final int finalWork = totalWork; @@ -182,6 +189,7 @@ class ProgressMonitorFocusJobDialog extends ProgressMonitorJobsDialog { * * @see java.lang.Runnable#run() */ + @Override public void run() { getProgressMonitor().beginTask(finalName, finalWork); } @@ -193,6 +201,7 @@ class ProgressMonitorFocusJobDialog extends ProgressMonitorJobsDialog { * * @see org.eclipse.core.runtime.IProgressMonitorWithBlocking#clearBlocked() */ + @Override public void clearBlocked() { runAsync(new Runnable() { /* @@ -200,6 +209,7 @@ class ProgressMonitorFocusJobDialog extends ProgressMonitorJobsDialog { * * @see java.lang.Runnable#run() */ + @Override public void run() { ((IProgressMonitorWithBlocking) getProgressMonitor()) .clearBlocked(); @@ -212,6 +222,7 @@ class ProgressMonitorFocusJobDialog extends ProgressMonitorJobsDialog { * * @see org.eclipse.core.runtime.IProgressMonitor#done() */ + @Override public void done() { runAsync(new Runnable() { /* @@ -219,6 +230,7 @@ class ProgressMonitorFocusJobDialog extends ProgressMonitorJobsDialog { * * @see java.lang.Runnable#run() */ + @Override public void run() { getProgressMonitor().done(); } @@ -230,6 +242,7 @@ class ProgressMonitorFocusJobDialog extends ProgressMonitorJobsDialog { * * @see org.eclipse.core.runtime.IProgressMonitor#internalWorked(double) */ + @Override public void internalWorked(double work) { final double finalWork = work; runAsync(new Runnable() { @@ -238,6 +251,7 @@ class ProgressMonitorFocusJobDialog extends ProgressMonitorJobsDialog { * * @see java.lang.Runnable#run() */ + @Override public void run() { getProgressMonitor().internalWorked(finalWork); } @@ -249,6 +263,7 @@ class ProgressMonitorFocusJobDialog extends ProgressMonitorJobsDialog { * * @see org.eclipse.core.runtime.IProgressMonitor#isCanceled() */ + @Override public boolean isCanceled() { return getProgressMonitor().isCanceled(); } @@ -281,6 +296,7 @@ class ProgressMonitorFocusJobDialog extends ProgressMonitorJobsDialog { * * @see java.lang.Runnable#run() */ + @Override public void run() { if (alreadyClosed) { return;// Check again as the async may come too @@ -300,6 +316,7 @@ class ProgressMonitorFocusJobDialog extends ProgressMonitorJobsDialog { * * @see org.eclipse.core.runtime.IProgressMonitorWithBlocking#setBlocked(org.eclipse.core.runtime.IStatus) */ + @Override public void setBlocked(IStatus reason) { final IStatus finalReason = reason; runAsync(new Runnable() { @@ -308,6 +325,7 @@ class ProgressMonitorFocusJobDialog extends ProgressMonitorJobsDialog { * * @see java.lang.Runnable#run() */ + @Override public void run() { ((IProgressMonitorWithBlocking) getProgressMonitor()) .setBlocked(finalReason); @@ -320,6 +338,7 @@ class ProgressMonitorFocusJobDialog extends ProgressMonitorJobsDialog { * * @see org.eclipse.core.runtime.IProgressMonitor#setCanceled(boolean) */ + @Override public void setCanceled(boolean value) { // Just a listener - doesn't matter. } @@ -329,6 +348,7 @@ class ProgressMonitorFocusJobDialog extends ProgressMonitorJobsDialog { * * @see org.eclipse.core.runtime.IProgressMonitor#setTaskName(java.lang.String) */ + @Override public void setTaskName(String name) { final String finalName = name; runAsync(new Runnable() { @@ -337,6 +357,7 @@ class ProgressMonitorFocusJobDialog extends ProgressMonitorJobsDialog { * * @see java.lang.Runnable#run() */ + @Override public void run() { getProgressMonitor().setTaskName(finalName); } @@ -348,6 +369,7 @@ class ProgressMonitorFocusJobDialog extends ProgressMonitorJobsDialog { * * @see org.eclipse.core.runtime.IProgressMonitor#subTask(java.lang.String) */ + @Override public void subTask(String name) { final String finalName = name; runAsync(new Runnable() { @@ -356,6 +378,7 @@ class ProgressMonitorFocusJobDialog extends ProgressMonitorJobsDialog { * * @see java.lang.Runnable#run() */ + @Override public void run() { getProgressMonitor().subTask(finalName); } @@ -367,6 +390,7 @@ class ProgressMonitorFocusJobDialog extends ProgressMonitorJobsDialog { * * @see org.eclipse.core.runtime.IProgressMonitor#worked(int) */ + @Override public void worked(int work) { internalWorked(work); } @@ -378,6 +402,7 @@ class ProgressMonitorFocusJobDialog extends ProgressMonitorJobsDialog { * * @see org.eclipse.jface.window.Window#open() */ + @Override public int open() { int result = super.open(); @@ -417,6 +442,7 @@ class ProgressMonitorFocusJobDialog extends ProgressMonitorJobsDialog { // want to preserve modality BusyIndicator.showWhile(PlatformUI.getWorkbench().getDisplay(), new Runnable() { + @Override public void run() { try { Thread @@ -435,6 +461,7 @@ class ProgressMonitorFocusJobDialog extends ProgressMonitorJobsDialog { * * @see org.eclipse.ui.progress.UIJob#runInUIThread(org.eclipse.core.runtime.IProgressMonitor) */ + @Override public IStatus runInUIThread(IProgressMonitor monitor) { // if the job is done at this point, we don't need the dialog @@ -478,6 +505,7 @@ class ProgressMonitorFocusJobDialog extends ProgressMonitorJobsDialog { * * @see org.eclipse.ui.internal.progress.ProgressMonitorJobsDialog#createDialogArea(org.eclipse.swt.widgets.Composite) */ + @Override protected Control createDialogArea(Composite parent) { Control area = super.createDialogArea(parent); // Give the job info as the initial details @@ -492,6 +520,7 @@ class ProgressMonitorFocusJobDialog extends ProgressMonitorJobsDialog { * * @see org.eclipse.ui.internal.progress.ProgressMonitorJobsDialog#createExtendedDialogArea(org.eclipse.swt.widgets.Composite) */ + @Override protected void createExtendedDialogArea(Composite parent) { showDialog = WorkbenchPlugin.getDefault().getPreferenceStore() @@ -512,6 +541,7 @@ class ProgressMonitorFocusJobDialog extends ProgressMonitorJobsDialog { * * @see org.eclipse.swt.events.SelectionAdapter#widgetSelected(org.eclipse.swt.events.SelectionEvent) */ + @Override public void widgetSelected(SelectionEvent e) { showDialog = showUserDialogButton.getSelection(); } @@ -525,6 +555,7 @@ class ProgressMonitorFocusJobDialog extends ProgressMonitorJobsDialog { * * @see org.eclipse.ui.internal.progress.ProgressMonitorJobsDialog#close() */ + @Override public boolean close() { if (getReturnCode() != CANCEL) WorkbenchPlugin.getDefault().getPreferenceStore().setValue( diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/progress/ProgressMonitorJobsDialog.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/progress/ProgressMonitorJobsDialog.java index c79fb8f7e1d..c29da1fd6ef 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/progress/ProgressMonitorJobsDialog.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/progress/ProgressMonitorJobsDialog.java @@ -75,7 +75,8 @@ public class ProgressMonitorJobsDialog extends ProgressMonitorDialog { * * @see org.eclipse.jface.dialogs.Dialog#createDialogArea(org.eclipse.swt.widgets.Composite) */ - protected Control createDialogArea(Composite parent) { + @Override + protected Control createDialogArea(Composite parent) { Composite top = (Composite) super.createDialogArea(parent); createExtendedDialogArea(parent); return top; @@ -128,13 +129,15 @@ public class ProgressMonitorJobsDialog extends ProgressMonitorDialog { * @see org.eclipse.jface.viewers.ViewerComparator#compare(org.eclipse.jface.viewers.Viewer, * java.lang.Object, java.lang.Object) */ - public int compare(Viewer testViewer, Object e1, Object e2) { + @Override + public int compare(Viewer testViewer, Object e1, Object e2) { return ((Comparable) e1).compareTo(e2); } }); viewer.setContentProvider(new ProgressViewerContentProvider(viewer,true,false){ - public Object[] getElements(Object inputElement) { + @Override + public Object[] getElements(Object inputElement) { return super.getElements(inputElement); }} ); @@ -158,7 +161,8 @@ public class ProgressMonitorJobsDialog extends ProgressMonitorDialog { * * @see org.eclipse.jface.dialogs.Dialog#createButtonsForButtonBar(org.eclipse.swt.widgets.Composite) */ - protected void createButtonsForButtonBar(Composite parent) { + @Override + protected void createButtonsForButtonBar(Composite parent) { super.createButtonsForButtonBar(parent); createDetailsButton(parent); } @@ -192,7 +196,8 @@ public class ProgressMonitorJobsDialog extends ProgressMonitorDialog { * * @see org.eclipse.swt.events.SelectionListener#widgetSelected(org.eclipse.swt.events.SelectionEvent) */ - public void widgetSelected(SelectionEvent e) { + @Override + public void widgetSelected(SelectionEvent e) { handleDetailsButtonSelect(); } }); @@ -205,7 +210,8 @@ public class ProgressMonitorJobsDialog extends ProgressMonitorDialog { * * @see org.eclipse.jface.dialogs.IconAndMessageDialog#createButtonBar(org.eclipse.swt.widgets.Composite) */ - protected Control createButtonBar(Composite parent) { + @Override + protected Control createButtonBar(Composite parent) { Composite composite = new Composite(parent, SWT.NONE); // create a layout with spacing and margins appropriate for the font // size. @@ -236,7 +242,8 @@ public class ProgressMonitorJobsDialog extends ProgressMonitorDialog { * * @see org.eclipse.jface.dialogs.ProgressMonitorDialog#clearCursors() */ - protected void clearCursors() { + @Override + protected void clearCursors() { if (detailsButton != null && !detailsButton.isDisposed()) { detailsButton.setCursor(null); } @@ -248,7 +255,8 @@ public class ProgressMonitorJobsDialog extends ProgressMonitorDialog { * * @see org.eclipse.jface.dialogs.ProgressMonitorDialog#updateForSetBlocked(org.eclipse.core.runtime.IStatus) */ - protected void updateForSetBlocked(IStatus reason) { + @Override + protected void updateForSetBlocked(IStatus reason) { if(alreadyClosed) return; @@ -265,7 +273,8 @@ public class ProgressMonitorJobsDialog extends ProgressMonitorDialog { * @see org.eclipse.jface.dialogs.ProgressMonitorDialog#run(boolean, * boolean, org.eclipse.jface.operation.IRunnableWithProgress) */ - public void run(boolean fork, boolean cancelable, + @Override + public void run(boolean fork, boolean cancelable, IRunnableWithProgress runnable) throws InvocationTargetException, InterruptedException { //if it is run in the UI Thread don't do anything. @@ -314,7 +323,8 @@ public class ProgressMonitorJobsDialog extends ProgressMonitorDialog { * @see org.eclipse.core.runtime.IProgressMonitor#beginTask(java.lang.String, * int) */ - public void beginTask(String name, int totalWork) { + @Override + public void beginTask(String name, int totalWork) { superMonitor.beginTask(name, totalWork); checkTicking(); } @@ -345,7 +355,8 @@ public class ProgressMonitorJobsDialog extends ProgressMonitorDialog { /* (non-Javadoc) * @see java.lang.Runnable#run() */ - public void run() { + @Override + public void run() { //Reset the watch if it is not safe to open if (!ProgressManagerUtil.safeToOpen(ProgressMonitorJobsDialog.this,null)){ watchTicks(); @@ -364,7 +375,8 @@ public class ProgressMonitorJobsDialog extends ProgressMonitorDialog { * * @see org.eclipse.core.runtime.IProgressMonitor#done() */ - public void done() { + @Override + public void done() { superMonitor.done(); checkTicking(); } @@ -374,7 +386,8 @@ public class ProgressMonitorJobsDialog extends ProgressMonitorDialog { * * @see org.eclipse.core.runtime.IProgressMonitor#internalWorked(double) */ - public void internalWorked(double work) { + @Override + public void internalWorked(double work) { superMonitor.internalWorked(work); checkTicking(); } @@ -384,7 +397,8 @@ public class ProgressMonitorJobsDialog extends ProgressMonitorDialog { * * @see org.eclipse.core.runtime.IProgressMonitor#isCanceled() */ - public boolean isCanceled() { + @Override + public boolean isCanceled() { return superMonitor.isCanceled(); } @@ -393,7 +407,8 @@ public class ProgressMonitorJobsDialog extends ProgressMonitorDialog { * * @see org.eclipse.core.runtime.IProgressMonitor#setCanceled(boolean) */ - public void setCanceled(boolean value) { + @Override + public void setCanceled(boolean value) { superMonitor.setCanceled(value); } @@ -403,7 +418,8 @@ public class ProgressMonitorJobsDialog extends ProgressMonitorDialog { * * @see org.eclipse.core.runtime.IProgressMonitor#setTaskName(java.lang.String) */ - public void setTaskName(String name) { + @Override + public void setTaskName(String name) { superMonitor.setTaskName(name); checkTicking(); @@ -414,7 +430,8 @@ public class ProgressMonitorJobsDialog extends ProgressMonitorDialog { * * @see org.eclipse.core.runtime.IProgressMonitor#subTask(java.lang.String) */ - public void subTask(String name) { + @Override + public void subTask(String name) { superMonitor.subTask(name); checkTicking(); } @@ -424,7 +441,8 @@ public class ProgressMonitorJobsDialog extends ProgressMonitorDialog { * * @see org.eclipse.core.runtime.IProgressMonitor#worked(int) */ - public void worked(int work) { + @Override + public void worked(int work) { superMonitor.worked(work); checkTicking(); @@ -435,7 +453,8 @@ public class ProgressMonitorJobsDialog extends ProgressMonitorDialog { * * @see org.eclipse.core.runtime.IProgressMonitorWithBlocking#clearBlocked() */ - public void clearBlocked() { + @Override + public void clearBlocked() { //We want to open on blocking too if (superMonitor instanceof IProgressMonitorWithBlocking) { ((IProgressMonitorWithBlocking) superMonitor) @@ -449,7 +468,8 @@ public class ProgressMonitorJobsDialog extends ProgressMonitorDialog { * * @see org.eclipse.core.runtime.IProgressMonitorWithBlocking#setBlocked(org.eclipse.core.runtime.IStatus) */ - public void setBlocked(IStatus reason) { + @Override + public void setBlocked(IStatus reason) { openDialog(); if (superMonitor instanceof IProgressMonitorWithBlocking) { ((IProgressMonitorWithBlocking) superMonitor) @@ -466,7 +486,8 @@ public class ProgressMonitorJobsDialog extends ProgressMonitorDialog { * * @see org.eclipse.jface.dialogs.ProgressMonitorDialog#getProgressMonitor() */ - public IProgressMonitor getProgressMonitor() { + @Override + public IProgressMonitor getProgressMonitor() { if (wrapperedMonitor == null) { createWrapperedMonitor(); } @@ -478,7 +499,8 @@ public class ProgressMonitorJobsDialog extends ProgressMonitorDialog { * * @see org.eclipse.jface.dialogs.ProgressMonitorDialog#close() */ - public boolean close() { + @Override + public boolean close() { alreadyClosed = true;//As this sometimes delayed cache if it was already closed boolean result = super.close(); if (!result) {//If it fails reset the flag @@ -491,7 +513,8 @@ public class ProgressMonitorJobsDialog extends ProgressMonitorDialog { * (non-Javadoc) * @see org.eclipse.jface.dialogs.Dialog#isResizable() */ - protected boolean isResizable() { + @Override + protected boolean isResizable() { return true; } } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/progress/ProgressRegion.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/progress/ProgressRegion.java index e70febc3579..34223b63639 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/progress/ProgressRegion.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/progress/ProgressRegion.java @@ -91,6 +91,7 @@ public class ProgressRegion implements IWindowTrim { * @see org.eclipse.swt.widgets.Composite#computeSize(int, int, * boolean) */ + @Override public Point computeSize(int wHint, int hHint, boolean changed) { Point size = super.computeSize(wHint, hHint, changed); if (isHorizontal(side)) @@ -132,7 +133,8 @@ public class ProgressRegion implements IWindowTrim { /* (non-Javadoc) * @see org.eclipse.ui.internal.progress.AnimationItem.IAnimationContainer#animationDone() */ - public void animationDone() { + @Override + public void animationDone() { //Add an extra refresh to the viewer in case //of stale input if the controls are not disposed if (viewer.getControl().isDisposed()) { @@ -144,7 +146,8 @@ public class ProgressRegion implements IWindowTrim { /* (non-Javadoc) * @see org.eclipse.ui.internal.progress.AnimationItem.IAnimationContainer#animationStart() */ - public void animationStart() { + @Override + public void animationStart() { // Nothing by default here. } @@ -165,7 +168,8 @@ public class ProgressRegion implements IWindowTrim { * * @see org.eclipse.swt.events.MouseAdapter#mouseDoubleClick(org.eclipse.swt.events.MouseEvent) */ - public void mouseDoubleClick(MouseEvent e) { + @Override + public void mouseDoubleClick(MouseEvent e) { processDoubleClick(); } }); @@ -178,7 +182,8 @@ public class ProgressRegion implements IWindowTrim { viewer.setLabelProvider(new ProgressViewerLabelProvider(viewerControl)); viewer.setComparator(ProgressManagerUtil.getProgressViewerComparator()); viewer.addFilter(new ViewerFilter() { - public boolean select(Viewer viewer, Object parentElement, Object element) { + @Override + public boolean select(Viewer viewer, Object parentElement, Object element) { if (element instanceof JobInfo) { JobInfo info= (JobInfo)element; if (info.isBlocked() || info.getJob().getState() == Job.WAITING) { @@ -206,7 +211,8 @@ public class ProgressRegion implements IWindowTrim { * * @return Control */ - public Control getControl() { + @Override + public Control getControl() { return region; } @@ -220,6 +226,7 @@ public class ProgressRegion implements IWindowTrim { /* (non-Javadoc) * @see org.eclipse.ui.internal.IWindowTrim#dock(int) */ + @Override public void dock(int dropSide) { int oldSide = side; side = dropSide; @@ -272,10 +279,12 @@ public class ProgressRegion implements IWindowTrim { /* (non-Javadoc) * @see org.eclipse.ui.internal.IWindowTrim#getId() */ + @Override public String getId() { return "org.eclipse.ui.internal.progress.ProgressRegion"; //$NON-NLS-1$ } + @Override public String getDisplayName() { return WorkbenchMessages.TrimCommon_Progress_TrimName; } @@ -283,6 +292,7 @@ public class ProgressRegion implements IWindowTrim { /* (non-Javadoc) * @see org.eclipse.ui.internal.IWindowTrim#getValidSides() */ + @Override public int getValidSides() { return SWT.BOTTOM | SWT.TOP | SWT.LEFT | SWT.RIGHT ; } @@ -290,6 +300,7 @@ public class ProgressRegion implements IWindowTrim { /* (non-Javadoc) * @see org.eclipse.ui.internal.IWindowTrim#isCloseable() */ + @Override public boolean isCloseable() { return false; } @@ -297,6 +308,7 @@ public class ProgressRegion implements IWindowTrim { /* (non-Javadoc) * @see org.eclipse.ui.internal.IWindowTrim#handleClose() */ + @Override public void handleClose() { // nothing to do... } @@ -306,6 +318,7 @@ public class ProgressRegion implements IWindowTrim { * * @see org.eclipse.ui.IWindowTrim#getWidthHint() */ + @Override public int getWidthHint() { return fWidthHint; } @@ -323,6 +336,7 @@ public class ProgressRegion implements IWindowTrim { * * @see org.eclipse.ui.IWindowTrim#getHeightHint() */ + @Override public int getHeightHint() { return fHeightHint; } @@ -338,6 +352,7 @@ public class ProgressRegion implements IWindowTrim { /* (non-Javadoc) * @see org.eclipse.ui.IWindowTrim#isResizeable() */ + @Override public boolean isResizeable() { return false; } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/progress/ProgressView.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/progress/ProgressView.java index 9050aa9d325..e595790a85f 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/progress/ProgressView.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/progress/ProgressView.java @@ -52,6 +52,7 @@ public class ProgressView extends ViewPart implements IViewPart { * * @see org.eclipse.ui.IWorkbenchPart#createPartControl(org.eclipse.swt.widgets.Composite) */ + @Override public void createPartControl(Composite parent) { viewer = new DetailedProgressViewer(parent, SWT.MULTI | SWT.H_SCROLL); viewer.setComparator(ProgressManagerUtil.getProgressViewerComparator()); @@ -76,6 +77,7 @@ public class ProgressView extends ViewPart implements IViewPart { * * @see org.eclipse.ui.IWorkbenchPart#setFocus() */ + @Override public void setFocus() { if (viewer != null) { viewer.setFocus(); @@ -99,6 +101,7 @@ public class ProgressView extends ViewPart implements IViewPart { Menu menu = menuMgr.createContextMenu(viewer.getControl()); menuMgr.add(cancelAction); menuMgr.addMenuListener(new IMenuListener() { + @Override public void menuAboutToShow(IMenuManager manager) { JobInfo info = getSelectedInfo(); if (info == null) { @@ -120,6 +123,7 @@ public class ProgressView extends ViewPart implements IViewPart { * * @see org.eclipse.ui.internal.preferences.ViewPreferencesAction#openViewPreferencesDialog() */ + @Override public void openViewPreferencesDialog() { new JobsViewPreferenceDialog(viewer.getControl().getShell()) .open(); @@ -182,6 +186,7 @@ public class ProgressView extends ViewPart implements IViewPart { * * @see org.eclipse.jface.action.Action#run() */ + @Override public void run() { viewer.cancelSelection(); } @@ -200,6 +205,7 @@ public class ProgressView extends ViewPart implements IViewPart { * * @see org.eclipse.jface.action.Action#run() */ + @Override public void run() { FinishedJobs.getInstance().clearAll(); } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/progress/ProgressViewUpdater.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/progress/ProgressViewUpdater.java index 2b265c53ad1..98303efc58b 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/progress/ProgressViewUpdater.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/progress/ProgressViewUpdater.java @@ -253,7 +253,8 @@ class ProgressViewUpdater implements IJobProgressManagerListener { * * @see org.eclipse.ui.progress.UIJob#runInUIThread(org.eclipse.core.runtime.IProgressMonitor) */ - public IStatus runInUIThread(IProgressMonitor monitor) { + @Override + public IStatus runInUIThread(IProgressMonitor monitor) { synchronized (updateScheduled) { // updates requested while we are running should cause it to // be rescheduled @@ -310,6 +311,7 @@ class ProgressViewUpdater implements IJobProgressManagerListener { * * @see org.eclipse.core.runtime.jobs.Job#canceling() */ + @Override protected void canceling() { synchronized (updateScheduled) { updateScheduled.value = false; @@ -356,7 +358,8 @@ class ProgressViewUpdater implements IJobProgressManagerListener { /* (non-Javadoc) * @see org.eclipse.ui.internal.progress.IJobProgressManagerListener#refreshJobInfo(org.eclipse.ui.internal.progress.JobInfo) */ - public void refreshJobInfo(JobInfo info) { + @Override + public void refreshJobInfo(JobInfo info) { if (isUpdateJob(info.getJob())) { return; @@ -373,7 +376,8 @@ class ProgressViewUpdater implements IJobProgressManagerListener { /* (non-Javadoc) * @see org.eclipse.ui.internal.progress.IJobProgressManagerListener#refreshGroup(org.eclipse.ui.internal.progress.GroupInfo) */ - public void refreshGroup(GroupInfo info) { + @Override + public void refreshGroup(GroupInfo info) { synchronized (updateLock) { currentInfo.refresh(info); } @@ -385,7 +389,8 @@ class ProgressViewUpdater implements IJobProgressManagerListener { /* (non-Javadoc) * @see org.eclipse.ui.internal.progress.IJobProgressManagerListener#addGroup(org.eclipse.ui.internal.progress.GroupInfo) */ - public void addGroup(GroupInfo info) { + @Override + public void addGroup(GroupInfo info) { synchronized (updateLock) { currentInfo.add(info); @@ -399,7 +404,8 @@ class ProgressViewUpdater implements IJobProgressManagerListener { * * @see org.eclipse.ui.internal.progress.IJobProgressManagerListener#refreshAll() */ - public void refreshAll() { + @Override + public void refreshAll() { synchronized (updateLock) { currentInfo.updateAll = true; @@ -415,7 +421,8 @@ class ProgressViewUpdater implements IJobProgressManagerListener { * * @see org.eclipse.ui.internal.progress.IJobProgressManagerListener#add(org.eclipse.ui.internal.progress.JobInfo) */ - public void addJob(JobInfo info) { + @Override + public void addJob(JobInfo info) { if (isUpdateJob(info.getJob())) { return; @@ -439,7 +446,8 @@ class ProgressViewUpdater implements IJobProgressManagerListener { * * @see org.eclipse.ui.internal.progress.IJobProgressManagerListener#removeJob(org.eclipse.ui.internal.progress.JobInfo) */ - public void removeJob(JobInfo info) { + @Override + public void removeJob(JobInfo info) { if (isUpdateJob(info.getJob())) { return; @@ -459,7 +467,8 @@ class ProgressViewUpdater implements IJobProgressManagerListener { /* (non-Javadoc) * @see org.eclipse.ui.internal.progress.IJobProgressManagerListener#removeGroup(org.eclipse.ui.internal.progress.GroupInfo) */ - public void removeGroup(GroupInfo group) { + @Override + public void removeGroup(GroupInfo group) { synchronized (updateLock) { currentInfo.remove(group); } @@ -472,7 +481,8 @@ class ProgressViewUpdater implements IJobProgressManagerListener { * * @see org.eclipse.ui.internal.progress.IJobProgressManagerListener#showsDebug() */ - public boolean showsDebug() { + @Override + public boolean showsDebug() { return debug; } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/progress/ProgressViewerContentProvider.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/progress/ProgressViewerContentProvider.java index 01d598ac577..dc08ad51abb 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/progress/ProgressViewerContentProvider.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/progress/ProgressViewerContentProvider.java @@ -66,6 +66,7 @@ public class ProgressViewerContentProvider extends ProgressContentProvider { * * @see org.eclipse.ui.internal.progress.FinishedJobs.KeptJobsListener#finished(org.eclipse.ui.internal.progress.JobTreeElement) */ + @Override public void finished(JobTreeElement jte) { final JobTreeElement element = jte; Job updateJob = new WorkbenchJob("Refresh finished") {//$NON-NLS-1$ @@ -74,6 +75,7 @@ public class ProgressViewerContentProvider extends ProgressContentProvider { * * @see org.eclipse.ui.progress.UIJob#runInUIThread(org.eclipse.core.runtime.IProgressMonitor) */ + @Override public IStatus runInUIThread(IProgressMonitor monitor) { refresh(new Object[] { element }); return Status.OK_STATUS; @@ -82,6 +84,7 @@ public class ProgressViewerContentProvider extends ProgressContentProvider { /* (non-Javadoc) * @see org.eclipse.ui.progress.WorkbenchJob#shouldSchedule() */ + @Override public boolean shouldSchedule() { return !progressViewer.getControl().isDisposed(); } @@ -90,6 +93,7 @@ public class ProgressViewerContentProvider extends ProgressContentProvider { /* (non-Javadoc) * @see org.eclipse.ui.progress.WorkbenchJob#shouldRun() */ + @Override public boolean shouldRun() { return !progressViewer.getControl().isDisposed(); } @@ -104,6 +108,7 @@ public class ProgressViewerContentProvider extends ProgressContentProvider { * * @see org.eclipse.ui.internal.progress.FinishedJobs.KeptJobsListener#removed(org.eclipse.ui.internal.progress.JobTreeElement) */ + @Override public void removed(JobTreeElement jte) { final JobTreeElement element = jte; Job updateJob = new WorkbenchJob("Remove finished") {//$NON-NLS-1$ @@ -112,6 +117,7 @@ public class ProgressViewerContentProvider extends ProgressContentProvider { * * @see org.eclipse.ui.progress.UIJob#runInUIThread(org.eclipse.core.runtime.IProgressMonitor) */ + @Override public IStatus runInUIThread(IProgressMonitor monitor) { if (element == null) { refresh(); @@ -136,6 +142,7 @@ public class ProgressViewerContentProvider extends ProgressContentProvider { * * @see org.eclipse.ui.internal.progress.IProgressUpdateCollector#refresh() */ + @Override public void refresh() { progressViewer.refresh(true); } @@ -145,6 +152,7 @@ public class ProgressViewerContentProvider extends ProgressContentProvider { * * @see org.eclipse.ui.internal.progress.IProgressUpdateCollector#refresh(org.eclipse.ui.internal.progress.JobTreeElement[]) */ + @Override public void refresh(Object[] elements) { Object[] refreshes = getRoots(elements, true); for (int i = 0; i < refreshes.length; i++) { @@ -157,6 +165,7 @@ public class ProgressViewerContentProvider extends ProgressContentProvider { * * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object) */ + @Override public Object[] getElements(Object inputElement) { Object[] elements = super.getElements(inputElement); @@ -220,11 +229,13 @@ public class ProgressViewerContentProvider extends ProgressContentProvider { return roots.toArray(); } + @Override public void add(Object[] elements) { progressViewer.add(elements); } + @Override public void remove(Object[] elements) { progressViewer.remove(elements); @@ -235,6 +246,7 @@ public class ProgressViewerContentProvider extends ProgressContentProvider { * * @see org.eclipse.jface.viewers.IContentProvider#dispose() */ + @Override public void dispose() { super.dispose(); if (keptJobListener != null) { diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/progress/ProgressViewerLabelProvider.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/progress/ProgressViewerLabelProvider.java index d7c0319133a..418a1804ee7 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/progress/ProgressViewerLabelProvider.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/progress/ProgressViewerLabelProvider.java @@ -24,7 +24,8 @@ public class ProgressViewerLabelProvider extends LabelProvider { * * @see org.eclipse.jface.viewers.LabelProvider#getText(java.lang.Object) */ - public String getText(Object element) { + @Override + public String getText(Object element) { JobTreeElement info = (JobTreeElement) element; return ProgressManagerUtil.shortenText( info.getCondensedDisplayString(), control); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/progress/SubTaskInfo.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/progress/SubTaskInfo.java index 9205d7971a1..9d68359dfcf 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/progress/SubTaskInfo.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/progress/SubTaskInfo.java @@ -35,6 +35,7 @@ class SubTaskInfo extends JobTreeElement { * * @see org.eclipse.ui.internal.progress.JobTreeElement#getChildren() */ + @Override Object[] getChildren() { return ProgressManagerUtil.EMPTY_OBJECT_ARRAY; } @@ -44,6 +45,7 @@ class SubTaskInfo extends JobTreeElement { * * @see org.eclipse.ui.internal.progress.JobTreeElement#getDisplayString() */ + @Override String getDisplayString() { if (taskName == null) { return ProgressMessages.SubTaskInfo_UndefinedTaskName; @@ -56,6 +58,7 @@ class SubTaskInfo extends JobTreeElement { * * @see org.eclipse.ui.internal.progress.JobTreeElement#hasChildren() */ + @Override boolean hasChildren() { return false; } @@ -84,6 +87,7 @@ class SubTaskInfo extends JobTreeElement { * * @see org.eclipse.ui.internal.progress.JobTreeElement#getParent() */ + @Override public Object getParent() { return jobInfo; } @@ -93,6 +97,7 @@ class SubTaskInfo extends JobTreeElement { * * @see org.eclipse.ui.internal.progress.JobTreeElement#isJobInfo() */ + @Override boolean isJobInfo() { return false; } @@ -102,6 +107,7 @@ class SubTaskInfo extends JobTreeElement { * * @see org.eclipse.ui.internal.progress.JobTreeElement#isActive() */ + @Override boolean isActive() { return jobInfo.isActive(); } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/progress/TaskInfo.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/progress/TaskInfo.java index 6566b06afa4..e86f30ea335 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/progress/TaskInfo.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/progress/TaskInfo.java @@ -78,6 +78,7 @@ public class TaskInfo extends SubTaskInfo { * * @see org.eclipse.ui.internal.progress.JobTreeElement#getDisplayString(boolean) */ + @Override String getDisplayString(boolean showProgress) { if (totalWork == IProgressMonitor.UNKNOWN) { diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/progress/WorkbenchSiteProgressService.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/progress/WorkbenchSiteProgressService.java index db9285fd668..9e958f8aeac 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/progress/WorkbenchSiteProgressService.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/progress/WorkbenchSiteProgressService.java @@ -117,7 +117,8 @@ public class WorkbenchSiteProgressService implements * * @see org.eclipse.ui.progress.UIJob#runInUIThread(org.eclipse.core.runtime.IProgressMonitor) */ - public IStatus runInUIThread(IProgressMonitor monitor) { + @Override + public IStatus runInUIThread(IProgressMonitor monitor) { Control control = (Control) site.getModel().getWidget(); if (control == null || control.isDisposed()) { return Status.CANCEL_STATUS; @@ -184,7 +185,8 @@ public class WorkbenchSiteProgressService implements * * @see org.eclipse.ui.progress.IProgressService#busyCursorWhile(org.eclipse.jface.operation.IRunnableWithProgress) */ - public void busyCursorWhile(IRunnableWithProgress runnable) + @Override + public void busyCursorWhile(IRunnableWithProgress runnable) throws InvocationTargetException, InterruptedException { getWorkbenchProgressService().busyCursorWhile(runnable); } @@ -195,7 +197,8 @@ public class WorkbenchSiteProgressService implements * @see org.eclipse.ui.progress.IWorkbenchSiteProgressService#schedule(org.eclipse.core.runtime.jobs.Job, * long, boolean) */ - public void schedule(Job job, long delay, boolean useHalfBusyCursor) { + @Override + public void schedule(Job job, long delay, boolean useHalfBusyCursor) { job.addJobChangeListener(getJobChangeListener(useHalfBusyCursor)); job.schedule(delay); } @@ -206,7 +209,8 @@ public class WorkbenchSiteProgressService implements * @see org.eclipse.ui.progress.IWorkbenchSiteProgressService#schedule(org.eclipse.core.runtime.jobs.Job, * int) */ - public void schedule(Job job, long delay) { + @Override + public void schedule(Job job, long delay) { schedule(job, delay, false); } @@ -215,7 +219,8 @@ public class WorkbenchSiteProgressService implements * * @see org.eclipse.ui.progress.IWorkbenchSiteProgressService#schedule(org.eclipse.core.runtime.jobs.Job) */ - public void schedule(Job job) { + @Override + public void schedule(Job job) { schedule(job, 0L, false); } @@ -224,7 +229,8 @@ public class WorkbenchSiteProgressService implements * * @see org.eclipse.ui.progress.IWorkbenchSiteProgressService#showBusyForFamily(java.lang.Object) */ - public void showBusyForFamily(Object family) { + @Override + public void showBusyForFamily(Object family) { ProgressManager.getInstance().addListenerToFamily(family, this); } @@ -244,6 +250,7 @@ public class WorkbenchSiteProgressService implements * org.eclipse.core.runtime.jobs.JobChangeAdapter#aboutToRun(org * .eclipse.core.runtime.jobs.IJobChangeEvent) */ + @Override public void aboutToRun(IJobChangeEvent event) { incrementBusy(event.getJob(), useHalfBusyCursor); } @@ -255,6 +262,7 @@ public class WorkbenchSiteProgressService implements * org.eclipse.core.runtime.jobs.JobChangeAdapter#done(org.eclipse * .core.runtime.jobs.IJobChangeEvent) */ + @Override public void done(IJobChangeEvent event) { Job job = event.getJob(); decrementBusy(job); @@ -268,7 +276,8 @@ public class WorkbenchSiteProgressService implements * * @see org.eclipse.ui.internal.progress.IJobBusyListener#decrementBusy(org.eclipse.core.runtime.jobs.Job) */ - public void decrementBusy(Job job) { + @Override + public void decrementBusy(Job job) { Object halfBusyCursorState; synchronized (busyLock) { halfBusyCursorState = busyJobs.remove(job); @@ -294,7 +303,8 @@ public class WorkbenchSiteProgressService implements * * @see org.eclipse.ui.internal.progress.IJobBusyListener#incrementBusy(org.eclipse.core.runtime.jobs.Job) */ - public void incrementBusy(Job job) { + @Override + public void incrementBusy(Job job) { incrementBusy(job, false); } @@ -334,7 +344,8 @@ public class WorkbenchSiteProgressService implements * * @see org.eclipse.ui.progress.IWorkbenchSiteProgressService#warnOfContentChange() */ - public void warnOfContentChange() { + @Override + public void warnOfContentChange() { MPart part = site.getModel(); if (!part.getTags().contains(CSSConstants.CSS_CONTENT_CHANGE_CLASS)) { part.getTags().add(CSSConstants.CSS_CONTENT_CHANGE_CLASS); @@ -347,7 +358,8 @@ public class WorkbenchSiteProgressService implements * @see org.eclipse.ui.progress.IProgressService#showInDialog(org.eclipse.swt.widgets.Shell, * org.eclipse.core.runtime.jobs.Job) */ - public void showInDialog(Shell shell, Job job) { + @Override + public void showInDialog(Shell shell, Job job) { getWorkbenchProgressService().showInDialog(shell, job); } @@ -366,7 +378,8 @@ public class WorkbenchSiteProgressService implements * @see org.eclipse.jface.operation.IRunnableContext#run(boolean, boolean, * org.eclipse.jface.operation.IRunnableWithProgress) */ - public void run(boolean fork, boolean cancelable, + @Override + public void run(boolean fork, boolean cancelable, IRunnableWithProgress runnable) throws InvocationTargetException, InterruptedException { getWorkbenchProgressService().run(fork, cancelable, runnable); @@ -376,7 +389,8 @@ public class WorkbenchSiteProgressService implements * (non-Javadoc) * @see org.eclipse.ui.progress.IProgressService#runInUI(org.eclipse.jface.operation.IRunnableContext, org.eclipse.jface.operation.IRunnableWithProgress, org.eclipse.core.runtime.jobs.ISchedulingRule) */ - public void runInUI(IRunnableContext context, + @Override + public void runInUI(IRunnableContext context, IRunnableWithProgress runnable, ISchedulingRule rule) throws InvocationTargetException, InterruptedException { getWorkbenchProgressService().runInUI(context, runnable, rule); @@ -385,28 +399,32 @@ public class WorkbenchSiteProgressService implements /* (non-Javadoc) * @see org.eclipse.ui.progress.IProgressService#getLongOperationTime() */ - public int getLongOperationTime() { + @Override + public int getLongOperationTime() { return getWorkbenchProgressService().getLongOperationTime(); } /* (non-Javadoc) * @see org.eclipse.ui.progress.IProgressService#registerIconForFamily(org.eclipse.jface.resource.ImageDescriptor, java.lang.Object) */ - public void registerIconForFamily(ImageDescriptor icon, Object family) { + @Override + public void registerIconForFamily(ImageDescriptor icon, Object family) { getWorkbenchProgressService().registerIconForFamily(icon, family); } /* (non-Javadoc) * @see org.eclipse.ui.progress.IProgressService#getIconFor(org.eclipse.core.runtime.jobs.Job) */ - public Image getIconFor(Job job) { + @Override + public Image getIconFor(Job job) { return getWorkbenchProgressService().getIconFor(job); } /* (non-Javadoc) * @see org.eclipse.ui.progress.IWorkbenchSiteProgressService#showBusy(boolean) */ - public void incrementBusy() { + @Override + public void incrementBusy() { synchronized (busyLock) { this.busyCount++; if (busyCount != 1) { @@ -423,6 +441,7 @@ public class WorkbenchSiteProgressService implements /* (non-Javadoc) * @see org.eclipse.ui.progress.IWorkbenchSiteProgressService#showBusy(boolean) */ + @Override public void decrementBusy() { synchronized (busyLock) { Assert diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/quickaccess/ActionElement.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/quickaccess/ActionElement.java index e6e2d1e6f16..21c481360ea 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/quickaccess/ActionElement.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/quickaccess/ActionElement.java @@ -31,18 +31,22 @@ public class ActionElement extends QuickAccessElement { this.item = item; } + @Override public void execute() { item.getAction().run(); } + @Override public String getId() { return item.getId(); } + @Override public ImageDescriptor getImageDescriptor() { return item.getAction().getImageDescriptor(); } + @Override public String getLabel() { IAction action = item.getAction(); if (action.getToolTipText() != null @@ -53,6 +57,7 @@ public class ActionElement extends QuickAccessElement { return LegacyActionTools.removeMnemonics(action.getText()); } + @Override public int hashCode() { final int prime = 31; int result = 1; @@ -60,6 +65,7 @@ public class ActionElement extends QuickAccessElement { return result; } + @Override public boolean equals(Object obj) { if (this == obj) return true; diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/quickaccess/ActionProvider.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/quickaccess/ActionProvider.java index 3cee9d4749b..06479818f1b 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/quickaccess/ActionProvider.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/quickaccess/ActionProvider.java @@ -34,15 +34,18 @@ public class ActionProvider extends QuickAccessProvider { private Map idToElement; + @Override public String getId() { return "org.eclipse.ui.actions"; //$NON-NLS-1$ } + @Override public QuickAccessElement getElementForId(String id) { getElements(); return (ActionElement) idToElement.get(id); } + @Override public QuickAccessElement[] getElements() { if (idToElement == null) { idToElement = new HashMap(); @@ -81,15 +84,18 @@ public class ActionProvider extends QuickAccessProvider { } } + @Override public ImageDescriptor getImageDescriptor() { return WorkbenchImages .getImageDescriptor(IWorkbenchGraphicConstants.IMG_OBJ_NODE); } + @Override public String getName() { return QuickAccessMessages.QuickAccess_Menus; } + @Override protected void doReset() { idToElement = null; } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/quickaccess/CommandElement.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/quickaccess/CommandElement.java index 65db3bb7bfe..9af0536ffbe 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/quickaccess/CommandElement.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/quickaccess/CommandElement.java @@ -44,6 +44,7 @@ public class CommandElement extends QuickAccessElement { this.command = command; } + @Override public void execute() { Object o = getProvider(); if (o instanceof CommandProvider) { @@ -74,10 +75,12 @@ public class CommandElement extends QuickAccessElement { } } + @Override public String getId() { return id; } + @Override public ImageDescriptor getImageDescriptor() { return null; } @@ -105,6 +108,7 @@ public class CommandElement extends QuickAccessElement { return label.toString(); } + @Override public String getLabel() { String command = getCommand(); String binding = getBinding(); @@ -133,6 +137,7 @@ public class CommandElement extends QuickAccessElement { return null; } + @Override public String getSortLabel() { try { return command.getName(); @@ -141,6 +146,7 @@ public class CommandElement extends QuickAccessElement { } } + @Override public int hashCode() { final int prime = 31; int result = 1; @@ -148,6 +154,7 @@ public class CommandElement extends QuickAccessElement { return result; } + @Override public boolean equals(Object obj) { if (this == obj) return true; diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/quickaccess/CommandProvider.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/quickaccess/CommandProvider.java index bd40ecfea47..c2c227eeb2e 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/quickaccess/CommandProvider.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/quickaccess/CommandProvider.java @@ -45,15 +45,18 @@ public class CommandProvider extends QuickAccessProvider { public CommandProvider() { } + @Override public String getId() { return "org.eclipse.ui.commands"; //$NON-NLS-1$ } + @Override public QuickAccessElement getElementForId(String id) { getElements(); return (CommandElement) idToElement.get(id); } + @Override public QuickAccessElement[] getElements() { if (idToElement == null) { idToElement = new HashMap(); @@ -87,11 +90,13 @@ public class CommandProvider extends QuickAccessProvider { new QuickAccessElement[idToElement.values().size()]); } + @Override public ImageDescriptor getImageDescriptor() { return WorkbenchImages .getImageDescriptor(IWorkbenchGraphicConstants.IMG_OBJ_NODE); } + @Override public String getName() { return QuickAccessMessages.QuickAccess_Commands; } @@ -108,6 +113,7 @@ public class CommandProvider extends QuickAccessProvider { return currentSnapshot; } + @Override protected void doReset() { idToElement = null; if (currentSnapshot instanceof ExpressionContext) { diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/quickaccess/EditorElement.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/quickaccess/EditorElement.java index e8b93538c73..82dbecd480c 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/quickaccess/EditorElement.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/quickaccess/EditorElement.java @@ -34,6 +34,7 @@ public class EditorElement extends QuickAccessElement { this.editorReference = editorReference; } + @Override public void execute() { IWorkbenchPart part = editorReference.getPart(true); if (part != null) { @@ -45,23 +46,28 @@ public class EditorElement extends QuickAccessElement { } } + @Override public String getId() { return editorReference.getId() + editorReference.getTitleToolTip(); } + @Override public ImageDescriptor getImageDescriptor() { return ImageDescriptor.createFromImage(editorReference.getTitleImage()); } + @Override public String getLabel() { boolean dirty = editorReference.isDirty(); return (dirty ? DIRTY_MARK : "") + editorReference.getTitle() + separator + editorReference.getTitleToolTip(); //$NON-NLS-1$ } + @Override public String getSortLabel() { return editorReference.getTitle(); } + @Override public int hashCode() { final int prime = 31; int result = 1; @@ -70,6 +76,7 @@ public class EditorElement extends QuickAccessElement { return result; } + @Override public boolean equals(Object obj) { if (this == obj) return true; diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/quickaccess/EditorProvider.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/quickaccess/EditorProvider.java index 8bbec08b396..275fe01ad40 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/quickaccess/EditorProvider.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/quickaccess/EditorProvider.java @@ -28,11 +28,13 @@ public class EditorProvider extends QuickAccessProvider { private Map idToElement; + @Override public QuickAccessElement getElementForId(String id) { getElements(); return (EditorElement) idToElement.get(id); } + @Override public QuickAccessElement[] getElements() { if (idToElement == null) { idToElement = new HashMap(); @@ -52,19 +54,23 @@ public class EditorProvider extends QuickAccessProvider { new QuickAccessElement[idToElement.values().size()]); } + @Override public String getId() { return "org.eclipse.ui.editors"; //$NON-NLS-1$ } + @Override public ImageDescriptor getImageDescriptor() { return WorkbenchImages .getImageDescriptor(IWorkbenchGraphicConstants.IMG_OBJ_NODE); } + @Override public String getName() { return QuickAccessMessages.QuickAccess_Editors; } + @Override protected void doReset() { idToElement = null; } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/quickaccess/PerspectiveElement.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/quickaccess/PerspectiveElement.java index ac80d4c04cf..42b7b984bef 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/quickaccess/PerspectiveElement.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/quickaccess/PerspectiveElement.java @@ -38,6 +38,7 @@ public class PerspectiveElement extends QuickAccessElement { this.descriptor = descriptor; } + @Override public void execute() { IWorkbench workbench = PlatformUI.getWorkbench(); IWorkbenchWindow window = workbench @@ -59,18 +60,22 @@ public class PerspectiveElement extends QuickAccessElement { } } + @Override public String getId() { return descriptor.getId(); } + @Override public ImageDescriptor getImageDescriptor() { return descriptor.getImageDescriptor(); } + @Override public String getLabel() { return descriptor.getLabel(); } + @Override public int hashCode() { final int prime = 31; int result = 1; @@ -79,6 +84,7 @@ public class PerspectiveElement extends QuickAccessElement { return result; } + @Override public boolean equals(Object obj) { if (this == obj) return true; diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/quickaccess/PerspectiveProvider.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/quickaccess/PerspectiveProvider.java index fa0f51319ac..1ccc39acd10 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/quickaccess/PerspectiveProvider.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/quickaccess/PerspectiveProvider.java @@ -29,15 +29,18 @@ public class PerspectiveProvider extends QuickAccessProvider { private QuickAccessElement[] cachedElements; private Map<String, PerspectiveElement> idToElement = new HashMap<String, PerspectiveElement>(); + @Override public String getId() { return "org.eclipse.ui.perspectives"; //$NON-NLS-1$ } + @Override public QuickAccessElement getElementForId(String id) { getElements(); return idToElement.get(id); } + @Override public QuickAccessElement[] getElements() { if (cachedElements == null) { IPerspectiveDescriptor[] perspectives = PlatformUI.getWorkbench() @@ -56,15 +59,18 @@ public class PerspectiveProvider extends QuickAccessProvider { return cachedElements; } + @Override public ImageDescriptor getImageDescriptor() { return WorkbenchImages .getImageDescriptor(ISharedImages.IMG_ETOOL_DEF_PERSPECTIVE); } + @Override public String getName() { return QuickAccessMessages.QuickAccess_Perspectives; } + @Override protected void doReset() { cachedElements = null; idToElement.clear(); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/quickaccess/PreferenceElement.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/quickaccess/PreferenceElement.java index 7bc8dc4ef1c..6eb85141cad 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/quickaccess/PreferenceElement.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/quickaccess/PreferenceElement.java @@ -36,6 +36,7 @@ public class PreferenceElement extends QuickAccessElement { this.prefix = prefix; } + @Override public void execute() { IWorkbenchWindow window = PlatformUI.getWorkbench() .getActiveWorkbenchWindow(); @@ -46,10 +47,12 @@ public class PreferenceElement extends QuickAccessElement { } } + @Override public String getId() { return preferenceNode.getId(); } + @Override public ImageDescriptor getImageDescriptor() { Image image = preferenceNode.getLabelImage(); if (image != null) { @@ -59,6 +62,7 @@ public class PreferenceElement extends QuickAccessElement { return null; } + @Override public String getLabel() { if (prefix != null && prefix.length() > 0) { return preferenceNode.getLabelText() + separator @@ -67,6 +71,7 @@ public class PreferenceElement extends QuickAccessElement { return preferenceNode.getLabelText(); } + @Override public int hashCode() { final int prime = 31; int result = 1; @@ -75,6 +80,7 @@ public class PreferenceElement extends QuickAccessElement { return result; } + @Override public boolean equals(Object obj) { if (this == obj) return true; diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/quickaccess/PreferenceProvider.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/quickaccess/PreferenceProvider.java index 3cdf813a0de..90ee844995d 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/quickaccess/PreferenceProvider.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/quickaccess/PreferenceProvider.java @@ -31,15 +31,18 @@ public class PreferenceProvider extends QuickAccessProvider { private QuickAccessElement[] cachedElements; private Map<String, PreferenceElement> idToElement = new HashMap<String, PreferenceElement>(); + @Override public String getId() { return "org.eclipse.ui.preferences"; //$NON-NLS-1$ } + @Override public QuickAccessElement getElementForId(String id) { getElements(); return idToElement.get(id); } + @Override public QuickAccessElement[] getElements() { if (cachedElements == null) { List<PreferenceElement> list = new ArrayList<PreferenceElement>(); @@ -68,15 +71,18 @@ public class PreferenceProvider extends QuickAccessProvider { } } + @Override public ImageDescriptor getImageDescriptor() { return WorkbenchImages .getImageDescriptor(IWorkbenchGraphicConstants.IMG_OBJ_NODE); } + @Override public String getName() { return QuickAccessMessages.QuickAccess_Preferences; } + @Override protected void doReset() { cachedElements = null; idToElement.clear(); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/quickaccess/PreviousPicksProvider.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/quickaccess/PreviousPicksProvider.java index d7c7b11d2f1..5d73d8533ca 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/quickaccess/PreviousPicksProvider.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/quickaccess/PreviousPicksProvider.java @@ -24,34 +24,42 @@ class PreviousPicksProvider extends QuickAccessProvider { this.previousPicksList = previousPicksList; } + @Override public QuickAccessElement getElementForId(String id) { return null; } + @Override public QuickAccessElement[] getElements() { return previousPicksList.toArray(new QuickAccessElement[previousPicksList.size()]); } + @Override public QuickAccessElement[] getElementsSorted() { return getElements(); } + @Override public String getId() { return "org.eclipse.ui.previousPicks"; //$NON-NLS-1$ } + @Override public ImageDescriptor getImageDescriptor() { return WorkbenchImages.getImageDescriptor(IWorkbenchGraphicConstants.IMG_OBJ_NODE); } + @Override public String getName() { return QuickAccessMessages.QuickAccess_Previous; } + @Override protected void doReset() { // operation not applicable for this provider } + @Override public boolean isAlwaysPresent() { return true; } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/quickaccess/PropertiesElement.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/quickaccess/PropertiesElement.java index f0f3d12ea0b..6a87dbbfa15 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/quickaccess/PropertiesElement.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/quickaccess/PropertiesElement.java @@ -33,6 +33,7 @@ public class PropertiesElement extends QuickAccessElement { this.preferenceNode = preferenceNode; } + @Override public void execute() { IWorkbenchWindow window = PlatformUI.getWorkbench() .getActiveWorkbenchWindow(); @@ -43,10 +44,12 @@ public class PropertiesElement extends QuickAccessElement { } } + @Override public String getId() { return preferenceNode.getId(); } + @Override public ImageDescriptor getImageDescriptor() { Image image = preferenceNode.getLabelImage(); if (image != null) { @@ -56,10 +59,12 @@ public class PropertiesElement extends QuickAccessElement { return null; } + @Override public String getLabel() { return preferenceNode.getLabelText(); } + @Override public int hashCode() { final int prime = 31; int result = 1; @@ -68,6 +73,7 @@ public class PropertiesElement extends QuickAccessElement { return result; } + @Override public boolean equals(Object obj) { if (this == obj) return true; diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/quickaccess/PropertiesProvider.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/quickaccess/PropertiesProvider.java index a25ead67cae..1a8602a1cf1 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/quickaccess/PropertiesProvider.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/quickaccess/PropertiesProvider.java @@ -34,11 +34,13 @@ public class PropertiesProvider extends QuickAccessProvider { private Map idToElement; + @Override public QuickAccessElement getElementForId(String id) { getElements(); return (PropertiesElement) idToElement.get(id); } + @Override public QuickAccessElement[] getElements() { if (idToElement == null) { idToElement = new HashMap(); @@ -70,19 +72,23 @@ public class PropertiesProvider extends QuickAccessProvider { new QuickAccessElement[idToElement.values().size()]); } + @Override public String getId() { return "org.eclipse.ui.properties"; //$NON-NLS-1$ } + @Override public ImageDescriptor getImageDescriptor() { return WorkbenchImages .getImageDescriptor(IWorkbenchGraphicConstants.IMG_OBJ_NODE); } + @Override public String getName() { return QuickAccessMessages.QuickAccess_Properties; } + @Override protected void doReset() { idToElement = null; } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/quickaccess/QuickAccessContents.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/quickaccess/QuickAccessContents.java index 9e6a75440a0..fe5784dae9e 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/quickaccess/QuickAccessContents.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/quickaccess/QuickAccessContents.java @@ -488,6 +488,7 @@ public abstract class QuickAccessContents { public void hookFilterText(Text filterText) { this.filterText = filterText; filterText.addKeyListener(new KeyListener() { + @Override public void keyPressed(KeyEvent e) { switch (e.keyCode) { case SWT.CR: @@ -512,11 +513,13 @@ public abstract class QuickAccessContents { } } + @Override public void keyReleased(KeyEvent e) { // do nothing } }); filterText.addModifyListener(new ModifyListener() { + @Override public void modifyText(ModifyEvent e) { String text = ((Text) e.widget).getText().toLowerCase(); refresh(text); @@ -533,6 +536,7 @@ public abstract class QuickAccessContents { */ public Table createTable(Composite composite, int defaultOrientation) { composite.addDisposeListener(new DisposeListener() { + @Override public void widgetDisposed(DisposeEvent e) { doDispose(); } @@ -563,11 +567,13 @@ public abstract class QuickAccessContents { tableColumnLayout.setColumnData(new TableColumn(table, SWT.NONE), new ColumnWeightData(100, 100)); table.getShell().addControlListener(new ControlAdapter() { + @Override public void controlResized(ControlEvent e) { if (!showAllMatches) { if (!resized) { resized = true; e.display.timerExec(100, new Runnable() { + @Override public void run() { if (table != null && !table.isDisposed()) { refresh(filterText.getText().toLowerCase()); @@ -581,6 +587,7 @@ public abstract class QuickAccessContents { }); table.addKeyListener(new KeyListener() { + @Override public void keyPressed(KeyEvent e) { if (e.keyCode == SWT.ARROW_UP && table.getSelectionIndex() == 0) { filterText.setFocus(); @@ -589,11 +596,13 @@ public abstract class QuickAccessContents { } } + @Override public void keyReleased(KeyEvent e) { // do nothing } }); table.addMouseListener(new MouseAdapter() { + @Override public void mouseUp(MouseEvent e) { if (table.getSelectionCount() < 1) @@ -614,6 +623,7 @@ public abstract class QuickAccessContents { table.addMouseMoveListener(new MouseMoveListener() { TableItem lastItem = null; + @Override public void mouseMove(MouseEvent e) { if (table.equals(e.getSource())) { Object o = table.getItem(new Point(e.x, e.y)); @@ -634,10 +644,12 @@ public abstract class QuickAccessContents { }); table.addSelectionListener(new SelectionListener() { + @Override public void widgetSelected(SelectionEvent e) { // do nothing } + @Override public void widgetDefaultSelected(SelectionEvent e) { handleSelection(); } @@ -653,6 +665,7 @@ public abstract class QuickAccessContents { boldStyle = null; } Listener listener = new Listener() { + @Override public void handleEvent(Event event) { QuickAccessEntry entry = (QuickAccessEntry) event.item.getData(); if (entry != null) { diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/quickaccess/QuickAccessDialog.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/quickaccess/QuickAccessDialog.java index 9e6647cdbaa..a3dbfc7bd24 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/quickaccess/QuickAccessDialog.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/quickaccess/QuickAccessDialog.java @@ -83,6 +83,7 @@ public class QuickAccessDialog extends PopupDialog { BusyIndicator.showWhile(window.getShell() == null ? null : window.getShell().getDisplay(), new Runnable() { + @Override public void run() { QuickAccessProvider[] providers = new QuickAccessProvider[] { new PreviousPicksProvider(previousPicksList), @@ -96,6 +97,7 @@ public class QuickAccessDialog extends PopupDialog { providerMap.put(providers[i].getId(), providers[i]); } QuickAccessDialog.this.contents = new QuickAccessContents(providers) { + @Override protected void updateFeedback(boolean filterTextEmpty, boolean showAllMatches) { if (filterTextEmpty) { @@ -221,6 +223,7 @@ public class QuickAccessDialog extends PopupDialog { // Ugly hack to avoid bug 184045. If this gets fixed, replace the // following code with a call to refresh(""). getShell().getDisplay().asyncExec(new Runnable() { + @Override public void run() { final Shell shell = getShell(); if (shell != null && !shell.isDisposed()) { @@ -231,6 +234,7 @@ public class QuickAccessDialog extends PopupDialog { }); } + @Override protected Control createTitleControl(Composite parent) { filterText = new Text(parent, SWT.NONE); @@ -249,6 +253,7 @@ public class QuickAccessDialog extends PopupDialog { * org.eclipse.jface.dialogs.PopupDialog#createDialogArea(org.eclipse.swt * .widgets.Composite) */ + @Override protected Control createDialogArea(Composite parent) { Composite composite = (Composite) super.createDialogArea(parent); boolean isWin32 = Util.isWindows(); @@ -276,6 +281,7 @@ public class QuickAccessDialog extends PopupDialog { private KeyAdapter getKeyAdapter() { if (keyAdapter == null) { keyAdapter = new KeyAdapter() { + @Override public void keyPressed(KeyEvent e) { int accelerator = SWTKeySupport.convertEventToUnmodifiedAccelerator(e); KeySequence keySequence = KeySequence.getInstance(SWTKeySupport @@ -296,19 +302,23 @@ public class QuickAccessDialog extends PopupDialog { return keyAdapter; } + @Override protected Control getFocusControl() { return filterText; } + @Override public boolean close() { storeDialog(getDialogSettings()); return super.close(); } + @Override protected Point getDefaultSize() { return new Point(350, 420); } + @Override protected Point getDefaultLocation(Point initialSize) { Point size = new Point(400, 400); Rectangle parentBounds = getParentShell().getBounds(); @@ -317,6 +327,7 @@ public class QuickAccessDialog extends PopupDialog { return new Point(x, y); } + @Override protected IDialogSettings getDialogSettings() { final IDialogSettings workbenchDialogSettings = WorkbenchPlugin.getDefault() .getDialogSettings(); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/quickaccess/QuickAccessHandler.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/quickaccess/QuickAccessHandler.java index f02dfa69997..6c6a2c1ba80 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/quickaccess/QuickAccessHandler.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/quickaccess/QuickAccessHandler.java @@ -35,6 +35,7 @@ public class QuickAccessHandler extends AbstractHandler { public QuickAccessHandler() { } + @Override public Object execute(ExecutionEvent executionEvent) { window = HandlerUtil.getActiveWorkbenchWindow(executionEvent); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/quickaccess/QuickAccessProvider.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/quickaccess/QuickAccessProvider.java index 6b7b57d2775..7fdd9122e0d 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/quickaccess/QuickAccessProvider.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/quickaccess/QuickAccessProvider.java @@ -55,6 +55,7 @@ public abstract class QuickAccessProvider { if (sortedElements == null) { sortedElements = getElements(); Arrays.sort(sortedElements, new Comparator<QuickAccessElement>() { + @Override public int compare(QuickAccessElement e1, QuickAccessElement e2) { return e1.getSortLabel().compareTo(e2.getSortLabel()); } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/quickaccess/SearchField.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/quickaccess/SearchField.java index d151bcf5e90..c9eaf494b81 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/quickaccess/SearchField.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/quickaccess/SearchField.java @@ -120,10 +120,12 @@ public class SearchField { text = createText(comp); parent.getShell().addControlListener(new ControlListener() { + @Override public void controlResized(ControlEvent e) { closeDropDown(); } + @Override public void controlMoved(ControlEvent e) { closeDropDown(); } @@ -149,9 +151,11 @@ public class SearchField { restoreDialog(); quickAccessContents = new QuickAccessContents(providers) { + @Override protected void updateFeedback(boolean filterTextEmpty, boolean showAllMatches) { } + @Override protected void doClose() { text.setText(""); //$NON-NLS-1$ resetProviders(); @@ -161,10 +165,12 @@ public class SearchField { removeAccessibleListener(); } + @Override protected QuickAccessElement getPerfectMatch(String filter) { return elementMap.get(filter); } + @Override protected void handleElementSelected(String string, Object selectedElement) { if (selectedElement instanceof QuickAccessElement) { QuickAccessElement element = (QuickAccessElement) selectedElement; @@ -205,15 +211,18 @@ public class SearchField { GridLayoutFactory.fillDefaults().applyTo(shell); table = quickAccessContents.createTable(shell, Window.getDefaultOrientation()); text.addFocusListener(new FocusListener() { + @Override public void focusLost(FocusEvent e) { // Once the focus event is complete, check if we should close the shell table.getDisplay().asyncExec(new Runnable() { + @Override public void run() { checkFocusLost(table, text); } }); } + @Override public void focusGained(FocusEvent e) { IHandlerService hs = SearchField.this.window.getContext() .get(IHandlerService.class); @@ -226,10 +235,12 @@ public class SearchField { }); table.addFocusListener(new FocusAdapter() { + @Override public void focusLost(FocusEvent e) { // Once the focus event is complete, check if we should close // the shell table.getDisplay().asyncExec(new Runnable() { + @Override public void run() { checkFocusLost(table, text); } @@ -237,6 +248,7 @@ public class SearchField { } }); text.addModifyListener(new ModifyListener() { + @Override public void modifyText(ModifyEvent e) { boolean wasVisible = shell.getVisible(); boolean nowVisible = text.getText().length() > 0; @@ -312,24 +324,28 @@ public class SearchField { IHandlerService whService = windowContext.get(IHandlerService.class); whService.activateHandler(IWorkbenchCommandConstants.EDIT_SELECT_ALL, new AbstractHandler() { + @Override public Object execute(ExecutionEvent event) { text.selectAll(); return null; } }, focusExpr); whService.activateHandler(IWorkbenchCommandConstants.EDIT_CUT, new AbstractHandler() { + @Override public Object execute(ExecutionEvent event) { text.cut(); return null; } }, focusExpr); whService.activateHandler(IWorkbenchCommandConstants.EDIT_COPY, new AbstractHandler() { + @Override public Object execute(ExecutionEvent event) { text.copy(); return null; } }, focusExpr); whService.activateHandler(IWorkbenchCommandConstants.EDIT_PASTE, new AbstractHandler() { + @Override public Object execute(ExecutionEvent event) { text.paste(); return null; @@ -455,6 +471,7 @@ public class SearchField { private void addAccessibleListener() { if (accessibleListener == null) { accessibleListener = new AccessibleAdapter() { + @Override public void getName(AccessibleEvent e) { e.result = selectedString; } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/quickaccess/ViewElement.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/quickaccess/ViewElement.java index f269456b792..1e063167e44 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/quickaccess/ViewElement.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/quickaccess/ViewElement.java @@ -100,6 +100,7 @@ public class ViewElement extends QuickAccessElement { return LocalizationHelper.getLocalized(viewDescriptor.getLabel(), viewDescriptor, window.getContext()); } + @Override public int hashCode() { final int prime = 31; int result = 1; @@ -108,6 +109,7 @@ public class ViewElement extends QuickAccessElement { return result; } + @Override public boolean equals(Object obj) { if (this == obj) return true; diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/quickaccess/WizardElement.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/quickaccess/WizardElement.java index 906da98c70b..6a99776162d 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/quickaccess/WizardElement.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/quickaccess/WizardElement.java @@ -32,6 +32,7 @@ public class WizardElement extends QuickAccessElement { this.wizardDescriptor = wizardDescriptor; } + @Override public void execute() { IWorkbenchWindow window = PlatformUI.getWorkbench() .getActiveWorkbenchWindow(); @@ -42,19 +43,23 @@ public class WizardElement extends QuickAccessElement { } } + @Override public String getId() { return wizardDescriptor.getId(); } + @Override public ImageDescriptor getImageDescriptor() { return wizardDescriptor.getImageDescriptor(); } + @Override public String getLabel() { return wizardDescriptor.getLabel() + separator + wizardDescriptor.getDescription(); } + @Override public int hashCode() { final int prime = 31; int result = 1; @@ -64,6 +69,7 @@ public class WizardElement extends QuickAccessElement { return result; } + @Override public boolean equals(Object obj) { if (this == obj) return true; diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/quickaccess/WizardProvider.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/quickaccess/WizardProvider.java index f6f1a4c1a78..89d0b559d08 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/quickaccess/WizardProvider.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/quickaccess/WizardProvider.java @@ -33,11 +33,13 @@ public class WizardProvider extends QuickAccessProvider { private QuickAccessElement[] cachedElements; private Map<String, WizardElement> idToElement = new HashMap<String, WizardElement>(); + @Override public QuickAccessElement getElementForId(String id) { getElements(); return idToElement.get(id); } + @Override public QuickAccessElement[] getElements() { if (cachedElements == null) { IWizardCategory rootCategory = WorkbenchPlugin.getDefault() @@ -66,19 +68,23 @@ public class WizardProvider extends QuickAccessProvider { } } + @Override public String getId() { return "org.eclipse.ui.wizards"; //$NON-NLS-1$ } + @Override public ImageDescriptor getImageDescriptor() { return WorkbenchImages .getImageDescriptor(IWorkbenchGraphicConstants.IMG_OBJ_NODE); } + @Override public String getName() { return QuickAccessMessages.QuickAccess_New; } + @Override protected void doReset() { cachedElements = null; idToElement.clear(); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/registry/ActionSetDescriptor.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/registry/ActionSetDescriptor.java index 60c023d0272..c3844494f9f 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/registry/ActionSetDescriptor.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/registry/ActionSetDescriptor.java @@ -76,7 +76,8 @@ public class ActionSetDescriptor implements IActionSetDescriptor, IAdaptable, * * @return the action set */ - public IActionSet createActionSet() throws CoreException { + @Override + public IActionSet createActionSet() throws CoreException { return new PluginActionSet(this); } @@ -85,7 +86,8 @@ public class ActionSetDescriptor implements IActionSetDescriptor, IAdaptable, * associated with this object. Returns <code>null</code> if * no such object can be found. */ - public Object getAdapter(Class adapter) { + @Override + public Object getAdapter(Class adapter) { if (adapter == IWorkbenchAdapter.class) { return this; } @@ -95,7 +97,8 @@ public class ActionSetDescriptor implements IActionSetDescriptor, IAdaptable, /** * @see IWorkbenchAdapter#getChildren */ - public Object[] getChildren(Object o) { + @Override + public Object[] getChildren(Object o) { return NO_CHILDREN; @@ -105,7 +108,8 @@ public class ActionSetDescriptor implements IActionSetDescriptor, IAdaptable, /* (non-Javadoc) * @see org.eclipse.ui.internal.registry.IActionSetDescriptor#getConfigurationElement() */ - public IConfigurationElement getConfigurationElement() { + @Override + public IConfigurationElement getConfigurationElement() { return configElement; } @@ -115,7 +119,8 @@ public class ActionSetDescriptor implements IActionSetDescriptor, IAdaptable, * * @return the description */ - public String getDescription() { + @Override + public String getDescription() { return description; } @@ -126,7 +131,8 @@ public class ActionSetDescriptor implements IActionSetDescriptor, IAdaptable, * * @return the action set id */ - public String getId() { + @Override + public String getId() { return id; } @@ -136,14 +142,16 @@ public class ActionSetDescriptor implements IActionSetDescriptor, IAdaptable, * * @return the label */ - public String getLabel() { + @Override + public String getLabel() { return label; } /** * @see IWorkbenchAdapter#getLabel */ - public String getLabel(Object o) { + @Override + public String getLabel(Object o) { if (o == this) { return getLabel(); } @@ -153,7 +161,8 @@ public class ActionSetDescriptor implements IActionSetDescriptor, IAdaptable, /** * Returns whether this action set is initially visible. */ - public boolean isInitiallyVisible() { + @Override + public boolean isInitiallyVisible() { if (id == null) { return visible; } @@ -171,7 +180,8 @@ public class ActionSetDescriptor implements IActionSetDescriptor, IAdaptable, * * @since 3.0 */ - public void setInitiallyVisible(boolean newValue) { + @Override + public void setInitiallyVisible(boolean newValue) { if (id == null) { return; } @@ -183,32 +193,37 @@ public class ActionSetDescriptor implements IActionSetDescriptor, IAdaptable, /* (non-Javadoc) * @see org.eclipse.ui.model.IWorkbenchAdapter#getImageDescriptor(java.lang.Object) */ - public ImageDescriptor getImageDescriptor(Object object) { + @Override + public ImageDescriptor getImageDescriptor(Object object) { return null; } /* (non-Javadoc) * @see org.eclipse.ui.model.IWorkbenchAdapter#getParent(java.lang.Object) */ - public Object getParent(Object o) { + @Override + public Object getParent(Object o) { return null; } /* (non-Javadoc) * @see org.eclipse.ui.IPluginContribution#getLocalId() */ - public String getLocalId() { + @Override + public String getLocalId() { return id; } /* (non-Javadoc) * @see org.eclipse.ui.IPluginContribution#getPluginId() */ - public String getPluginId() { + @Override + public String getPluginId() { return pluginId; } - public boolean equals(Object arg0) { + @Override + public boolean equals(Object arg0) { if (!(arg0 instanceof ActionSetDescriptor)) { return false; } @@ -218,7 +233,8 @@ public class ActionSetDescriptor implements IActionSetDescriptor, IAdaptable, return id.equals(descr.id) && descr.pluginId.equals(pluginId); } - public int hashCode() { + @Override + public int hashCode() { return id.hashCode() + pluginId.hashCode(); } } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/registry/ActionSetRegistry.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/registry/ActionSetRegistry.java index bb0dff0edfe..c4e88f8332c 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/registry/ActionSetRegistry.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/registry/ActionSetRegistry.java @@ -229,7 +229,8 @@ public class ActionSetRegistry implements IExtensionChangeHandler { /* (non-Javadoc) * @see org.eclipse.core.runtime.dynamichelpers.IExtensionChangeHandler#addExtension(org.eclipse.core.runtime.dynamichelpers.IExtensionTracker, org.eclipse.core.runtime.IExtension) */ - public void addExtension(IExtensionTracker tracker, IExtension extension) { + @Override + public void addExtension(IExtensionTracker tracker, IExtension extension) { String extensionPointUniqueIdentifier = extension.getExtensionPointUniqueIdentifier(); if (extensionPointUniqueIdentifier.equals(getActionSetExtensionPoint().getUniqueIdentifier())) { addActionSets(tracker, extension); @@ -307,7 +308,8 @@ public class ActionSetRegistry implements IExtensionChangeHandler { /* (non-Javadoc) * @see org.eclipse.core.runtime.dynamichelpers.IExtensionChangeHandler#removeExtension(org.eclipse.core.runtime.IExtension, java.lang.Object[]) */ - public void removeExtension(IExtension extension, Object[] objects) { + @Override + public void removeExtension(IExtension extension, Object[] objects) { String extensionPointUniqueIdentifier = extension.getExtensionPointUniqueIdentifier(); if (extensionPointUniqueIdentifier.equals(getActionSetExtensionPoint().getUniqueIdentifier())) { removeActionSets(objects); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/registry/Category.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/registry/Category.java index 126ea4d6137..a54cd548297 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/registry/Category.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/registry/Category.java @@ -111,7 +111,8 @@ public class Category implements IWorkbenchAdapter, IPluginContribution, IAdapta /* (non-Javadoc) * Method declared on IAdaptable. */ - public Object getAdapter(Class adapter) { + @Override + public Object getAdapter(Class adapter) { if (adapter == IWorkbenchAdapter.class) { return this; } else if (adapter == IConfigurationElement.class) { @@ -124,21 +125,24 @@ public class Category implements IWorkbenchAdapter, IPluginContribution, IAdapta /* (non-Javadoc) * Method declared on IWorkbenchAdapter. */ - public Object[] getChildren(Object o) { + @Override + public Object[] getChildren(Object o) { return getElements().toArray(); } /* (non-Javadoc) * Method declared on IWorkbenchAdapter. */ - public ImageDescriptor getImageDescriptor(Object object) { + @Override + public ImageDescriptor getImageDescriptor(Object object) { return WorkbenchImages.getImageDescriptor(ISharedImages.IMG_OBJ_FOLDER); } /* (non-Javadoc) * Method declared on IWorkbenchAdapter. */ - public String getLabel(Object o) { + @Override + public String getLabel(Object o) { return getLabel(); } @@ -247,21 +251,24 @@ public class Category implements IWorkbenchAdapter, IPluginContribution, IAdapta /* (non-Javadoc) * @see org.eclipse.ui.model.IWorkbenchAdapter#getParent(java.lang.Object) */ - public Object getParent(Object o) { + @Override + public Object getParent(Object o) { return null; } /* (non-Javadoc) * @see org.eclipse.ui.activities.support.IPluginContribution#getLocalId() */ - public String getLocalId() { + @Override + public String getLocalId() { return id; } /* (non-Javadoc) * @see org.eclipse.ui.activities.support.IPluginContribution#getPluginId() */ - public String getPluginId() { + @Override + public String getPluginId() { return configurationElement == null ? pluginId : configurationElement .getNamespace(); } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/registry/EditorDescriptor.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/registry/EditorDescriptor.java index 930e876fe21..4f122b72700 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/registry/EditorDescriptor.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/registry/EditorDescriptor.java @@ -256,7 +256,8 @@ public final class EditorDescriptor implements IEditorDescriptor, Serializable, * * @return the id */ - public String getId() { + @Override + public String getId() { if (program == null) { if (configurationElement == null) { return Util.safeString(id); @@ -272,7 +273,8 @@ public final class EditorDescriptor implements IEditorDescriptor, Serializable, * * @return the image descriptor */ - public ImageDescriptor getImageDescriptor() { + @Override + public ImageDescriptor getImageDescriptor() { ImageDescriptor tempDescriptor = null; synchronized (imageDescLock) { @@ -346,7 +348,8 @@ public final class EditorDescriptor implements IEditorDescriptor, Serializable, * * @return the label */ - public String getLabel() { + @Override + public String getLabel() { if (program == null) { if (configurationElement == null) { return editorName; @@ -391,21 +394,24 @@ public final class EditorDescriptor implements IEditorDescriptor, Serializable, /* (non-Javadoc) * @see org.eclipse.ui.IEditorDescriptor#isInternal */ - public boolean isInternal() { + @Override + public boolean isInternal() { return getOpenMode() == OPEN_INTERNAL; } /* (non-Javadoc) * @see org.eclipse.ui.IEditorDescriptor#isOpenInPlace */ - public boolean isOpenInPlace() { + @Override + public boolean isOpenInPlace() { return getOpenMode() == OPEN_INPLACE; } /* (non-Javadoc) * @see org.eclipse.ui.IEditorDescriptor#isOpenExternal */ - public boolean isOpenExternal() { + @Override + public boolean isOpenExternal() { return getOpenMode() == OPEN_EXTERNAL; } @@ -598,28 +604,32 @@ public final class EditorDescriptor implements IEditorDescriptor, Serializable, /** * For debugging purposes only. */ - public String toString() { + @Override + public String toString() { return "EditorDescriptor(id=" + getId() + ", label=" + getLabel() + ")"; //$NON-NLS-2$ //$NON-NLS-3$//$NON-NLS-1$ } /* (non-Javadoc) * @see org.eclipse.ui.activities.support.IPluginContribution#getLocalId() */ - public String getLocalId() { + @Override + public String getLocalId() { return getId(); } /* (non-Javadoc) * @see org.eclipse.ui.activities.support.IPluginContribution#getPluginId() */ - public String getPluginId() { + @Override + public String getPluginId() { return getPluginID(); } /* (non-Javadoc) * @see org.eclipse.ui.IEditorDescriptor#getEditorManagementPolicy() */ - public IEditorMatchingStrategy getEditorMatchingStrategy() { + @Override + public IEditorMatchingStrategy getEditorMatchingStrategy() { if (matchingStrategy == null && !matchingStrategyChecked) { matchingStrategyChecked = true; if (program == null && configurationElement != null) { diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/registry/EditorRegistry.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/registry/EditorRegistry.java index f8e89c41f0c..129a4b67fe9 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/registry/EditorRegistry.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/registry/EditorRegistry.java @@ -143,6 +143,7 @@ public class EditorRegistry extends EventManager implements IEditorRegistry, private static final Comparator comparer = new Comparator() { private Collator collator = Collator.getInstance(); + @Override public int compare(Object arg0, Object arg1) { String s1 = ((IEditorDescriptor) arg0).getLabel(); String s2 = ((IEditorDescriptor) arg1).getLabel(); @@ -295,14 +296,16 @@ public class EditorRegistry extends EventManager implements IEditorRegistry, /* * (non-Javadoc) Method declared on IEditorRegistry. */ - public void addPropertyListener(IPropertyListener l) { + @Override + public void addPropertyListener(IPropertyListener l) { addListenerObject(l); } /* * (non-Javadoc) Method declared on IEditorRegistry. */ - public IEditorDescriptor findEditor(String id) { + @Override + public IEditorDescriptor findEditor(String id) { Object desc = mapIDtoEditor.get(id); if (WorkbenchActivityHelper.restrictUseOf(desc)) { return null; @@ -321,7 +324,8 @@ public class EditorRegistry extends EventManager implements IEditorRegistry, for (int nX = 0; nX < array.length; nX++) { final IPropertyListener l = (IPropertyListener) array[nX]; Platform.run(new SafeRunnable() { - public void run() { + @Override + public void run() { l.propertyChanged(EditorRegistry.this, type); } }); @@ -333,7 +337,8 @@ public class EditorRegistry extends EventManager implements IEditorRegistry, * * @deprecated */ - public IEditorDescriptor getDefaultEditor() { + @Override + public IEditorDescriptor getDefaultEditor() { // the default editor will always be the system external editor // this should never return null return findEditor(IEditorRegistry.SYSTEM_EXTERNAL_EDITOR_ID); @@ -342,7 +347,8 @@ public class EditorRegistry extends EventManager implements IEditorRegistry, /* * (non-Javadoc) Method declared on IEditorRegistry. */ - public IEditorDescriptor getDefaultEditor(String filename) { + @Override + public IEditorDescriptor getDefaultEditor(String filename) { IEditorDescriptor defaultEditor = getDefaultEditor(filename, guessAtContentType(filename)); if (defaultEditor != null) { return defaultEditor; @@ -383,14 +389,16 @@ public class EditorRegistry extends EventManager implements IEditorRegistry, /* * (non-Javadoc) Method declared on IEditorRegistry. */ - public IEditorDescriptor[] getEditors(String filename) { + @Override + public IEditorDescriptor[] getEditors(String filename) { return getEditors(filename, guessAtContentType(filename)); } /* * (non-Javadoc) Method declared on IEditorRegistry. */ - public IFileEditorMapping[] getFileEditorMappings() { + @Override + public IFileEditorMapping[] getFileEditorMappings() { FileEditorMapping[] array = typeEditorMappings.allMappings(); final Collator collator = Collator.getInstance(); Arrays.sort(array, new Comparator() { @@ -398,7 +406,8 @@ public class EditorRegistry extends EventManager implements IEditorRegistry, /* (non-Javadoc) * @see java.util.Comparator#compare(java.lang.Object, java.lang.Object) */ - public int compare(Object o1, Object o2) { + @Override + public int compare(Object o1, Object o2) { String s1 = ((FileEditorMapping) o1).getLabel(); String s2 = ((FileEditorMapping) o2).getLabel(); return collator.compare(s1, s2); @@ -410,7 +419,8 @@ public class EditorRegistry extends EventManager implements IEditorRegistry, /* * (non-Javadoc) Method declared on IEditorRegistry. */ - public ImageDescriptor getImageDescriptor(String filename) { + @Override + public ImageDescriptor getImageDescriptor(String filename) { return getImageDescriptor(filename, guessAtContentType(filename)); } @@ -991,7 +1001,8 @@ public class EditorRegistry extends EventManager implements IEditorRegistry, /* * (non-Javadoc) Method declared on IEditorRegistry. */ - public void removePropertyListener(IPropertyListener l) { + @Override + public void removePropertyListener(IPropertyListener l) { removeListenerObject(l); } @@ -1121,7 +1132,8 @@ public class EditorRegistry extends EventManager implements IEditorRegistry, /* * (non-Javadoc) Method declared on IEditorRegistry. */ - public void setDefaultEditor(String fileName, String editorId) { + @Override + public void setDefaultEditor(String fileName, String editorId) { EditorDescriptor desc = (EditorDescriptor) findEditor(editorId); FileEditorMapping[] mapping = getMappingForFilename(fileName); if (mapping[0] != null) { @@ -1241,7 +1253,8 @@ public class EditorRegistry extends EventManager implements IEditorRegistry, * * @see org.eclipse.ui.IEditorRegistry#isSystemInPlaceEditorAvailable(String) */ - public boolean isSystemInPlaceEditorAvailable(String filename) { + @Override + public boolean isSystemInPlaceEditorAvailable(String filename) { return ComponentSupport.inPlaceEditorAvailable(filename); } @@ -1250,7 +1263,8 @@ public class EditorRegistry extends EventManager implements IEditorRegistry, * * @see org.eclipse.ui.IEditorRegistry#isSystemExternalEditorAvailable(String) */ - public boolean isSystemExternalEditorAvailable(String filename) { + @Override + public boolean isSystemExternalEditorAvailable(String filename) { int nDot = filename.lastIndexOf('.'); if (nDot >= 0) { String strName = filename.substring(nDot); @@ -1264,7 +1278,8 @@ public class EditorRegistry extends EventManager implements IEditorRegistry, * * @see org.eclipse.ui.IEditorRegistry#getSystemExternalEditorImageDescriptor(java.lang.String) */ - public ImageDescriptor getSystemExternalEditorImageDescriptor( + @Override + public ImageDescriptor getSystemExternalEditorImageDescriptor( String filename) { Program externalProgram = null; int extensionIndex = filename.lastIndexOf('.'); @@ -1313,7 +1328,8 @@ public class EditorRegistry extends EventManager implements IEditorRegistry, /* (non-Javadoc) * @see org.eclipse.core.runtime.dynamicHelpers.IExtensionChangeHandler#removeExtension(org.eclipse.core.runtime.IExtension, java.lang.Object[]) */ - public void removeExtension(IExtension source, Object[] objects) { + @Override + public void removeExtension(IExtension source, Object[] objects) { for (int i = 0; i < objects.length; i++) { if (objects[i] instanceof EditorDescriptor) { EditorDescriptor desc = (EditorDescriptor) objects[i]; @@ -1380,6 +1396,7 @@ public class EditorRegistry extends EventManager implements IEditorRegistry, /* (non-Javadoc) * @see org.eclipse.core.runtime.dynamicHelpers.IExtensionChangeHandler#addExtension(org.eclipse.core.runtime.dynamicHelpers.IExtensionTracker, org.eclipse.core.runtime.IExtension) */ + @Override public void addExtension(IExtensionTracker tracker, IExtension extension) { EditorRegistryReader eReader = new EditorRegistryReader(); IConfigurationElement[] elements = extension.getConfigurationElements(); @@ -1399,6 +1416,7 @@ public class EditorRegistry extends EventManager implements IEditorRegistry, /* (non-Javadoc) * @see org.eclipse.ui.IEditorRegistry#getDefaultEditor(java.lang.String, org.eclipse.core.runtime.content.IContentType) */ + @Override public IEditorDescriptor getDefaultEditor(String fileName, IContentType contentType) { return getEditorForContentType(fileName, contentType); } @@ -1424,6 +1442,7 @@ public class EditorRegistry extends EventManager implements IEditorRegistry, /* (non-Javadoc) * @see org.eclipse.ui.IEditorRegistry#getEditors(java.lang.String, org.eclipse.core.runtime.content.IContentType) */ + @Override public IEditorDescriptor[] getEditors(String fileName, IContentType contentType) { return findRelatedObjects(contentType, fileName, relatedRegistry); } @@ -1431,6 +1450,7 @@ public class EditorRegistry extends EventManager implements IEditorRegistry, /* (non-Javadoc) * @see org.eclipse.ui.IEditorRegistry#getImageDescriptor(java.lang.String, org.eclipse.core.runtime.content.IContentType) */ + @Override public ImageDescriptor getImageDescriptor(String filename, IContentType contentType) { if (filename == null) { return getDefaultImage(); @@ -1705,6 +1725,7 @@ class MockMapping implements IFileEditorMapping { this.extension = ext; } + @Override public IEditorDescriptor getDefaultEditor() { IEditorDescriptor[] candidates = ((EditorRegistry) PlatformUI .getWorkbench().getEditorRegistry()) @@ -1716,6 +1737,7 @@ class MockMapping implements IFileEditorMapping { return candidates[0]; } + @Override public IEditorDescriptor[] getEditors() { IEditorDescriptor[] editorsForContentType = ((EditorRegistry) PlatformUI .getWorkbench().getEditorRegistry()) @@ -1724,14 +1746,17 @@ class MockMapping implements IFileEditorMapping { .restrictArray(editorsForContentType); } + @Override public IEditorDescriptor[] getDeletedEditors() { return new IEditorDescriptor[0]; } + @Override public String getExtension() { return extension; } + @Override public ImageDescriptor getImageDescriptor() { IEditorDescriptor editor = getDefaultEditor(); if (editor == null) { @@ -1742,10 +1767,12 @@ class MockMapping implements IFileEditorMapping { return editor.getImageDescriptor(); } + @Override public String getLabel() { return filename + '.' + extension; } + @Override public String getName() { return filename; } @@ -1753,6 +1780,7 @@ class MockMapping implements IFileEditorMapping { /* (non-Javadoc) * @see java.lang.Object#equals(java.lang.Object) */ + @Override public boolean equals(Object obj) { if (this == obj) { return true; diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/registry/EditorRegistryReader.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/registry/EditorRegistryReader.java index a5264686fc7..18eb5fb733a 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/registry/EditorRegistryReader.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/registry/EditorRegistryReader.java @@ -47,7 +47,8 @@ public class EditorRegistryReader extends RegistryReader { * Implementation of the abstract method that * processes one configuration element. */ - protected boolean readElement(IConfigurationElement element) { + @Override + protected boolean readElement(IConfigurationElement element) { if (!element.getName().equals(IWorkbenchRegistryConstants.TAG_EDITOR)) { return false; } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/registry/FileEditorMapping.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/registry/FileEditorMapping.java index 4502db781d1..b99cc5ffca1 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/registry/FileEditorMapping.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/registry/FileEditorMapping.java @@ -89,7 +89,8 @@ public class FileEditorMapping extends Object implements IFileEditorMapping, /** * Clone the receiver. */ - public Object clone() { + @Override + public Object clone() { try { FileEditorMapping clone = (FileEditorMapping) super.clone(); clone.editors = (List) ((ArrayList) editors).clone(); @@ -104,7 +105,8 @@ public class FileEditorMapping extends Object implements IFileEditorMapping, /* (non-Javadoc) * @see java.lang.Object#equals(java.lang.Object) */ - public boolean equals(Object obj) { + @Override + public boolean equals(Object obj) { if (this == obj) { return true; } @@ -149,7 +151,8 @@ public class FileEditorMapping extends Object implements IFileEditorMapping, return true; } - public int hashCode() { + @Override + public int hashCode() { final int prime = 31; int result = 1; result = prime * result @@ -164,7 +167,8 @@ public class FileEditorMapping extends Object implements IFileEditorMapping, /* (non-Javadoc) * Method declared on IFileEditorMapping. */ - public IEditorDescriptor getDefaultEditor() { + @Override + public IEditorDescriptor getDefaultEditor() { if (editors.size() == 0 || WorkbenchActivityHelper.restrictUseOf(editors.get(0))) { return null; @@ -183,7 +187,8 @@ public class FileEditorMapping extends Object implements IFileEditorMapping, /* (non-Javadoc) * Method declared on IFileEditorMapping. */ - public IEditorDescriptor[] getEditors() { + @Override + public IEditorDescriptor[] getEditors() { Collection descs = WorkbenchActivityHelper.restrictCollection(editors, new ArrayList()); return (IEditorDescriptor[]) descs.toArray(new IEditorDescriptor[descs.size()]); } @@ -191,7 +196,8 @@ public class FileEditorMapping extends Object implements IFileEditorMapping, /* (non-Javadoc) * Method declared on IFileEditorMapping. */ - public IEditorDescriptor[] getDeletedEditors() { + @Override + public IEditorDescriptor[] getDeletedEditors() { IEditorDescriptor[] array = new IEditorDescriptor[deletedEditors.size()]; deletedEditors.toArray(array); return array; @@ -200,14 +206,16 @@ public class FileEditorMapping extends Object implements IFileEditorMapping, /* (non-Javadoc) * Method declared on IFileEditorMapping. */ - public String getExtension() { + @Override + public String getExtension() { return extension; } /* (non-Javadoc) * Method declared on IFileEditorMapping. */ - public ImageDescriptor getImageDescriptor() { + @Override + public ImageDescriptor getImageDescriptor() { IEditorDescriptor editor = getDefaultEditor(); if (editor == null) { return WorkbenchImages @@ -219,14 +227,16 @@ public class FileEditorMapping extends Object implements IFileEditorMapping, /* (non-Javadoc) * Method declared on IFileEditorMapping. */ - public String getLabel() { + @Override + public String getLabel() { return TextProcessor.process(name + (extension.length() == 0 ? "" : DOT + extension), STAR + DOT); //$NON-NLS-1$ } /* (non-Javadoc) * Method declared on IFileEditorMapping. */ - public String getName() { + @Override + public String getName() { return name; } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/registry/KeywordRegistry.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/registry/KeywordRegistry.java index faa2b926f1d..8c49b5f25b8 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/registry/KeywordRegistry.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/registry/KeywordRegistry.java @@ -71,6 +71,7 @@ public final class KeywordRegistry implements IExtensionChangeHandler { /* (non-Javadoc) * @see org.eclipse.core.runtime.dynamicHelpers.IExtensionChangeHandler#addExtension(org.eclipse.core.runtime.dynamicHelpers.IExtensionTracker, org.eclipse.core.runtime.IExtension) */ + @Override public void addExtension(IExtensionTracker tracker, IExtension extension) { IConfigurationElement[] elements = extension.getConfigurationElements(); for (int i = 0; i < elements.length; i++) { @@ -102,6 +103,7 @@ public final class KeywordRegistry implements IExtensionChangeHandler { /* (non-Javadoc) * @see org.eclipse.core.runtime.dynamicHelpers.IExtensionChangeHandler#removeExtension(org.eclipse.core.runtime.IExtension, java.lang.Object[]) */ + @Override public void removeExtension(IExtension extension, Object[] objects) { for (int i = 0; i < objects.length; i++) { if (objects[i] instanceof String) { diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/registry/PerspectiveDescriptor.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/registry/PerspectiveDescriptor.java index 187f8f4694a..d13ba22aae7 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/registry/PerspectiveDescriptor.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/registry/PerspectiveDescriptor.java @@ -79,6 +79,7 @@ public class PerspectiveDescriptor implements IPerspectiveDescriptor, } } + @Override public String getDescription() { return configElement == null ? null : RegistryReader.getDescription(configElement); } @@ -88,6 +89,7 @@ public class PerspectiveDescriptor implements IPerspectiveDescriptor, * * @see org.eclipse.ui.IPerspectiveDescriptor#getId() */ + @Override public String getId() { return id; } @@ -105,6 +107,7 @@ public class PerspectiveDescriptor implements IPerspectiveDescriptor, * * @see org.eclipse.ui.IPerspectiveDescriptor#getImageDescriptor() */ + @Override public ImageDescriptor getImageDescriptor() { if (image != null) return image; @@ -130,6 +133,7 @@ public class PerspectiveDescriptor implements IPerspectiveDescriptor, * * @see org.eclipse.ui.IPerspectiveDescriptor#getLabel() */ + @Override public String getLabel() { return configElement == null ? label : configElement .getAttribute(IWorkbenchRegistryConstants.ATT_NAME); @@ -140,6 +144,7 @@ public class PerspectiveDescriptor implements IPerspectiveDescriptor, * * @see org.eclipse.ui.IPluginContribution#getLocalId() */ + @Override public String getLocalId() { return getId(); } @@ -149,6 +154,7 @@ public class PerspectiveDescriptor implements IPerspectiveDescriptor, * * @see org.eclipse.ui.IPluginContribution#getPluginId() */ + @Override public String getPluginId() { return configElement == null ? pluginId : configElement.getNamespaceIdentifier(); } @@ -185,6 +191,7 @@ public class PerspectiveDescriptor implements IPerspectiveDescriptor, return false; } + @Override public String toString() { return this.getClass().getName() + " {id=" + getId() + "}"; //$NON-NLS-1$//$NON-NLS-2$ } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/registry/PerspectiveParameterValues.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/registry/PerspectiveParameterValues.java index f5a6213294d..154c14e2916 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/registry/PerspectiveParameterValues.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/registry/PerspectiveParameterValues.java @@ -25,6 +25,7 @@ import org.eclipse.ui.PlatformUI; */ public final class PerspectiveParameterValues implements IParameterValues { + @Override public final Map getParameterValues() { final Map values = new HashMap(); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/registry/PerspectiveRegistry.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/registry/PerspectiveRegistry.java index 3fc7152220e..57bc3116b20 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/registry/PerspectiveRegistry.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/registry/PerspectiveRegistry.java @@ -103,6 +103,7 @@ public class PerspectiveRegistry implements IPerspectiveRegistry, IExtensionChan * org.eclipse.ui.IPerspectiveRegistry#clonePerspective(java.lang.String, * java.lang.String, org.eclipse.ui.IPerspectiveDescriptor) */ + @Override public IPerspectiveDescriptor clonePerspective(String id, String label, IPerspectiveDescriptor desc) throws IllegalArgumentException { // FIXME: compat clonePerspective. Not called in 3.8 @@ -117,6 +118,7 @@ public class PerspectiveRegistry implements IPerspectiveRegistry, IExtensionChan * org.eclipse.ui.IPerspectiveRegistry#deletePerspective(org.eclipse.ui. * IPerspectiveDescriptor) */ + @Override public void deletePerspective(IPerspectiveDescriptor toDelete) { PerspectiveDescriptor perspective = (PerspectiveDescriptor) toDelete; if (perspective.isPredefined()) @@ -152,6 +154,7 @@ public class PerspectiveRegistry implements IPerspectiveRegistry, IExtensionChan * org.eclipse.ui.IPerspectiveRegistry#findPerspectiveWithId(java.lang.String * ) */ + @Override public IPerspectiveDescriptor findPerspectiveWithId(String perspectiveId) { return findPerspectiveWithId(perspectiveId, true); } @@ -172,6 +175,7 @@ public class PerspectiveRegistry implements IPerspectiveRegistry, IExtensionChan * org.eclipse.ui.IPerspectiveRegistry#findPerspectiveWithLabel(java.lang * .String) */ + @Override public IPerspectiveDescriptor findPerspectiveWithLabel(String label) { for (IPerspectiveDescriptor descriptor : descriptors.values()) { if (descriptor.getLabel().equals(label)) { @@ -189,6 +193,7 @@ public class PerspectiveRegistry implements IPerspectiveRegistry, IExtensionChan * * @see org.eclipse.ui.IPerspectiveRegistry#getDefaultPerspective() */ + @Override public String getDefaultPerspective() { String defaultId = PrefUtil.getAPIPreferenceStore().getString( IWorkbenchPreferenceConstants.DEFAULT_PERSPECTIVE_ID); @@ -207,6 +212,7 @@ public class PerspectiveRegistry implements IPerspectiveRegistry, IExtensionChan * * @see org.eclipse.ui.IPerspectiveRegistry#getPerspectives() */ + @Override public IPerspectiveDescriptor[] getPerspectives() { Collection<?> descs = WorkbenchActivityHelper.restrictCollection(descriptors.values(), new ArrayList<Object>()); @@ -216,6 +222,7 @@ public class PerspectiveRegistry implements IPerspectiveRegistry, IExtensionChan /** * @see IPerspectiveRegistry#setDefaultPerspective(String) */ + @Override public void setDefaultPerspective(String id) { IPerspectiveDescriptor desc = findPerspectiveWithId(id); if (desc != null) { @@ -249,6 +256,7 @@ public class PerspectiveRegistry implements IPerspectiveRegistry, IExtensionChan * org.eclipse.ui.IPerspectiveRegistry#revertPerspective(org.eclipse.ui. * IPerspectiveDescriptor) */ + @Override public void revertPerspective(IPerspectiveDescriptor perspToRevert) { PerspectiveDescriptor perspective = (PerspectiveDescriptor) perspToRevert; if (!perspective.isPredefined()) @@ -274,6 +282,7 @@ public class PerspectiveRegistry implements IPerspectiveRegistry, IExtensionChan * @see org.eclipse.core.runtime.dynamicHelpers.IExtensionChangeHandler# * removeExtension(org.eclipse.core.runtime.IExtension, java.lang.Object[]) */ + @Override public void removeExtension(IExtension source, Object[] objects) { // TODO compat: what do we do about disappearing extensions } @@ -286,6 +295,7 @@ public class PerspectiveRegistry implements IPerspectiveRegistry, IExtensionChan * (org.eclipse.core.runtime.dynamicHelpers.IExtensionTracker, * org.eclipse.core.runtime.IExtension) */ + @Override public void addExtension(IExtensionTracker tracker, IExtension addedExtension) { // TODO compat: what do we do about appeaering extensions } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/registry/PreferencePageParameterValues.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/registry/PreferencePageParameterValues.java index c3108f4ca4c..a67d0a1b1a7 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/registry/PreferencePageParameterValues.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/registry/PreferencePageParameterValues.java @@ -52,6 +52,7 @@ public final class PreferencePageParameterValues implements IParameterValues { * * @see org.eclipse.core.runtime.IRegistryChangeListener#registryChanged(org.eclipse.core.runtime.IRegistryChangeEvent) */ + @Override public void registryChanged(IRegistryChangeEvent event) { if (event.getExtensionDeltas(PlatformUI.PLUGIN_ID, IWorkbenchRegistryConstants.PL_PREFERENCES).length > 0) { @@ -98,6 +99,7 @@ public final class PreferencePageParameterValues implements IParameterValues { } } + @Override public final Map getParameterValues() { if (preferenceMap == null) { preferenceMap = new TreeMap(); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/registry/PreferencePageRegistryReader.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/registry/PreferencePageRegistryReader.java index 12344f36644..59d7a80d300 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/registry/PreferencePageRegistryReader.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/registry/PreferencePageRegistryReader.java @@ -54,6 +54,7 @@ public class PreferencePageRegistryReader extends CategorizedPageRegistryReader /* (non-Javadoc) * @see org.eclipse.ui.internal.registry.CategorizedPageRegistryReader.CategoryNode#getLabelText() */ + @Override String getLabelText() { return node.getLabelText(); } @@ -61,6 +62,7 @@ public class PreferencePageRegistryReader extends CategorizedPageRegistryReader /* (non-Javadoc) * @see org.eclipse.ui.internal.registry.CategorizedPageRegistryReader.CategoryNode#getLabelText(java.lang.Object) */ + @Override String getLabelText(Object element) { return ((WorkbenchPreferenceNode) element).getLabelText(); } @@ -68,6 +70,7 @@ public class PreferencePageRegistryReader extends CategorizedPageRegistryReader /* (non-Javadoc) * @see org.eclipse.ui.internal.registry.CategorizedPageRegistryReader.CategoryNode#getNode() */ + @Override Object getNode() { return node; } @@ -85,6 +88,7 @@ public class PreferencePageRegistryReader extends CategorizedPageRegistryReader /* (non-Javadoc) * @see org.eclipse.ui.internal.registry.CategorizedPageRegistryReader#findNode(java.lang.String) */ + @Override Object findNode(String id) { for (int i = 0; i < nodes.size(); i++) { WorkbenchPreferenceNode node = (WorkbenchPreferenceNode) nodes.get(i); @@ -98,6 +102,7 @@ public class PreferencePageRegistryReader extends CategorizedPageRegistryReader /* (non-Javadoc) * @see org.eclipse.ui.internal.registry.CategorizedPageRegistryReader#findNode(java.lang.Object, java.lang.String) */ + @Override Object findNode(Object parent, String currentToken) { IPreferenceNode[] subNodes = ((WorkbenchPreferenceNode) parent).getSubNodes(); for (int i = 0; i < subNodes.length; i++) { @@ -112,6 +117,7 @@ public class PreferencePageRegistryReader extends CategorizedPageRegistryReader /* (non-Javadoc) * @see org.eclipse.ui.internal.registry.CategorizedPageRegistryReader#add(java.lang.Object, java.lang.Object) */ + @Override void add(Object parent, Object node) { ((IPreferenceNode) parent).add((IPreferenceNode) node); } @@ -119,6 +125,7 @@ public class PreferencePageRegistryReader extends CategorizedPageRegistryReader /* (non-Javadoc) * @see org.eclipse.ui.internal.registry.CategorizedPageRegistryReader#createCategoryNode(org.eclipse.ui.internal.registry.CategorizedPageRegistryReader, java.lang.Object) */ + @Override CategoryNode createCategoryNode(CategorizedPageRegistryReader reader, Object object) { return new PreferencesCategoryNode(reader, (WorkbenchPreferenceNode) object); } @@ -126,6 +133,7 @@ public class PreferencePageRegistryReader extends CategorizedPageRegistryReader /* (non-Javadoc) * @see org.eclipse.ui.internal.registry.CategorizedPageRegistryReader#getCategory(java.lang.Object) */ + @Override String getCategory(Object node) { return ((WorkbenchPreferenceNode) node).getCategory(); } @@ -147,6 +155,7 @@ public class PreferencePageRegistryReader extends CategorizedPageRegistryReader /* (non-Javadoc) * @see org.eclipse.ui.internal.registry.CategorizedPageRegistryReader#getNodes() */ + @Override Collection getNodes() { return nodes; } @@ -174,6 +183,7 @@ public class PreferencePageRegistryReader extends CategorizedPageRegistryReader /** * Read preference page element. */ + @Override protected boolean readElement(IConfigurationElement element) { if (element.getName().equals(TAG_PAGE) == false) { return false; diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/registry/PreferenceTransferRegistryReader.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/registry/PreferenceTransferRegistryReader.java index 7ca82236bef..00e6fa3759f 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/registry/PreferenceTransferRegistryReader.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/registry/PreferenceTransferRegistryReader.java @@ -83,6 +83,7 @@ public class PreferenceTransferRegistryReader extends RegistryReader { PreferenceTransferElement[] transfers = new PreferenceTransferElement[preferenceTransfers .size()]; Collections.sort(preferenceTransfers, new Comparator() { + @Override public int compare(Object o1, Object o2) { String name1 = ((PreferenceTransferElement) o1).getName(); String name2 = ((PreferenceTransferElement) o2).getName(); @@ -99,6 +100,7 @@ public class PreferenceTransferRegistryReader extends RegistryReader { * * @see org.eclipse.ui.internal.registry.RegistryReader#readElement(org.eclipse.core.runtime.IConfigurationElement) */ + @Override protected boolean readElement(IConfigurationElement element) { if (element.getName().equals(IWorkbenchRegistryConstants.TAG_TRANSFER)) { diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/registry/PropertyPagesRegistryReader.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/registry/PropertyPagesRegistryReader.java index 0341789a644..56cc59f79ab 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/registry/PropertyPagesRegistryReader.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/registry/PropertyPagesRegistryReader.java @@ -103,6 +103,7 @@ public class PropertyPagesRegistryReader extends CategorizedPageRegistryReader { * * @see org.eclipse.ui.internal.registry.CategorizedPageRegistryReader.CategoryNode#getLabelText() */ + @Override String getLabelText() { return page.getPageName(); } @@ -112,6 +113,7 @@ public class PropertyPagesRegistryReader extends CategorizedPageRegistryReader { * * @see org.eclipse.ui.internal.registry.CategorizedPageRegistryReader.CategoryNode#getLabelText(java.lang.Object) */ + @Override String getLabelText(Object element) { return ((RegistryPageContributor) element).getPageName(); } @@ -121,6 +123,7 @@ public class PropertyPagesRegistryReader extends CategorizedPageRegistryReader { * * @see org.eclipse.ui.internal.registry.CategorizedPageRegistryReader.CategoryNode#getNode() */ + @Override Object getNode() { return page; } @@ -189,6 +192,7 @@ public class PropertyPagesRegistryReader extends CategorizedPageRegistryReader { * * public for dynamic UI */ + @Override public boolean readElement(IConfigurationElement element) { if (element.getName().equals(TAG_PAGE)) { processPageElement(element); @@ -228,6 +232,7 @@ public class PropertyPagesRegistryReader extends CategorizedPageRegistryReader { * @see org.eclipse.ui.internal.registry.CategorizedPageRegistryReader#add(java.lang.Object, * java.lang.Object) */ + @Override void add(Object parent, Object node) { ((RegistryPageContributor) parent) .addSubPage((RegistryPageContributor) node); @@ -240,6 +245,7 @@ public class PropertyPagesRegistryReader extends CategorizedPageRegistryReader { * @see org.eclipse.ui.internal.registry.CategorizedPageRegistryReader#createCategoryNode(org.eclipse.ui.internal.registry.CategorizedPageRegistryReader, * java.lang.Object) */ + @Override CategoryNode createCategoryNode(CategorizedPageRegistryReader reader, Object object) { return new PropertyCategoryNode(reader, @@ -252,6 +258,7 @@ public class PropertyPagesRegistryReader extends CategorizedPageRegistryReader { * @see org.eclipse.ui.internal.registry.CategorizedPageRegistryReader#findNode(java.lang.Object, * java.lang.String) */ + @Override Object findNode(Object parent, String currentToken) { return ((RegistryPageContributor) parent).getChild(currentToken); } @@ -261,6 +268,7 @@ public class PropertyPagesRegistryReader extends CategorizedPageRegistryReader { * * @see org.eclipse.ui.internal.registry.CategorizedPageRegistryReader#findNode(java.lang.String) */ + @Override Object findNode(String id) { Iterator iterator = pages.iterator(); while (iterator.hasNext()) { @@ -277,6 +285,7 @@ public class PropertyPagesRegistryReader extends CategorizedPageRegistryReader { * * @see org.eclipse.ui.internal.registry.CategorizedPageRegistryReader#getCategory(java.lang.Object) */ + @Override String getCategory(Object node) { return ((RegistryPageContributor) node).getCategory(); } @@ -300,6 +309,7 @@ public class PropertyPagesRegistryReader extends CategorizedPageRegistryReader { * * @see org.eclipse.ui.internal.registry.CategorizedPageRegistryReader#getNodes() */ + @Override Collection getNodes() { return pages; } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/registry/RegistryReader.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/registry/RegistryReader.java index e1ade98f198..a24b510063e 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/registry/RegistryReader.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/registry/RegistryReader.java @@ -103,7 +103,8 @@ public abstract class RegistryReader { IExtension[] sortedExtension = new IExtension[extensions.length]; System.arraycopy(extensions, 0, sortedExtension, 0, extensions.length); Comparator comparer = new Comparator() { - public int compare(Object arg0, Object arg1) { + @Override + public int compare(Object arg0, Object arg1) { String s1 = ((IExtension) arg0).getNamespace(); String s2 = ((IExtension) arg1).getNamespace(); return s1.compareToIgnoreCase(s2); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/registry/ShowViewHandler.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/registry/ShowViewHandler.java index 7ea6e548e26..6de4732295d 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/registry/ShowViewHandler.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/registry/ShowViewHandler.java @@ -46,6 +46,7 @@ public final class ShowViewHandler extends AbstractHandler { this.viewId = viewId; } + @Override public final Object execute(final ExecutionEvent event) throws ExecutionException { final IWorkbenchWindow activeWorkbenchWindow = HandlerUtil diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/registry/StickyViewDescriptor.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/registry/StickyViewDescriptor.java index 6d77dee35cd..7437e56e9b1 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/registry/StickyViewDescriptor.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/registry/StickyViewDescriptor.java @@ -76,7 +76,8 @@ public class StickyViewDescriptor implements IStickyViewDescriptor, /* (non-Javadoc) * @see org.eclipse.ui.views.IStickyViewDescriptor#getLocation() */ - public int getLocation() { + @Override + public int getLocation() { int direction = IPageLayout.RIGHT; String location = configurationElement.getAttribute(IWorkbenchRegistryConstants.ATT_LOCATION); @@ -96,15 +97,18 @@ public class StickyViewDescriptor implements IStickyViewDescriptor, /* (non-Javadoc) * @see org.eclipse.ui.internal.registry.IStickyViewDescriptor#getId() */ - public String getId() { + @Override + public String getId() { return id; } - public String getLocalId() { + @Override + public String getLocalId() { return id; } - public String getPluginId() { + @Override + public String getPluginId() { return configurationElement.getContributor().getName(); } @@ -112,7 +116,8 @@ public class StickyViewDescriptor implements IStickyViewDescriptor, /* (non-Javadoc) * @see org.eclipse.ui.internal.registry.IStickyViewDescriptor#isFixed() */ - public boolean isCloseable() { + @Override + public boolean isCloseable() { boolean closeable = true; String closeableString = configurationElement.getAttribute(IWorkbenchRegistryConstants.ATT_CLOSEABLE); if (closeableString != null) { @@ -124,7 +129,8 @@ public class StickyViewDescriptor implements IStickyViewDescriptor, /* (non-Javadoc) * @see org.eclipse.ui.internal.registry.IStickyViewDescriptor#isMoveable() */ - public boolean isMoveable() { + @Override + public boolean isMoveable() { boolean moveable = true; String moveableString = configurationElement.getAttribute(IWorkbenchRegistryConstants.ATT_MOVEABLE); if (moveableString != null) { diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/registry/UIExtensionTracker.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/registry/UIExtensionTracker.java index 991afb1f7f9..468f6ba7b75 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/registry/UIExtensionTracker.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/registry/UIExtensionTracker.java @@ -38,13 +38,15 @@ public class UIExtensionTracker extends ExtensionTracker { this.display = display; } + @Override protected void applyRemove(final IExtensionChangeHandler handler, final IExtension removedExtension, final Object[] objects) { if (display.isDisposed()) return; display.syncExec(new Runnable() { - public void run() { + @Override + public void run() { try { handler.removeExtension(removedExtension, objects); } catch (Exception e) { @@ -54,12 +56,14 @@ public class UIExtensionTracker extends ExtensionTracker { }); } - protected void applyAdd(final IExtensionChangeHandler handler, final IExtension addedExtension) { + @Override + protected void applyAdd(final IExtensionChangeHandler handler, final IExtension addedExtension) { if (display.isDisposed()) return; display.syncExec(new Runnable() { - public void run() { + @Override + public void run() { try { handler.addExtension(UIExtensionTracker.this, addedExtension); } catch (Exception e) { diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/registry/ViewCategory.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/registry/ViewCategory.java index fae86e08f14..237c423337b 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/registry/ViewCategory.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/registry/ViewCategory.java @@ -37,20 +37,24 @@ public class ViewCategory implements IViewCategory { descriptors.add(descriptor); } + @Override public IViewDescriptor[] getViews() { Collection<?> allowedViews = WorkbenchActivityHelper.restrictCollection(descriptors, new ArrayList<Object>()); return allowedViews.toArray(new IViewDescriptor[allowedViews.size()]); } + @Override public String getId() { return id; } + @Override public String getLabel() { return label; } + @Override public IPath getPath() { return path; } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/registry/ViewDescriptor.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/registry/ViewDescriptor.java index 464df0b77bf..7a2e0512f12 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/registry/ViewDescriptor.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/registry/ViewDescriptor.java @@ -54,6 +54,7 @@ public class ViewDescriptor implements IViewDescriptor, IPluginContribution { * * @see org.eclipse.ui.views.IViewDescriptor#createView() */ + @Override public IViewPart createView() throws CoreException { if (element == null) { throw new CoreException(new Status(IStatus.ERROR, WorkbenchPlugin.PI_WORKBENCH, @@ -67,6 +68,7 @@ public class ViewDescriptor implements IViewDescriptor, IPluginContribution { * * @see org.eclipse.ui.views.IViewDescriptor#getCategoryPath() */ + @Override public String[] getCategoryPath() { return categoryPath; } @@ -76,6 +78,7 @@ public class ViewDescriptor implements IViewDescriptor, IPluginContribution { * * @see org.eclipse.ui.views.IViewDescriptor#getDescription() */ + @Override public String getDescription() { return element == null ? "" : RegistryReader.getDescription(element); //$NON-NLS-1$ } @@ -85,6 +88,7 @@ public class ViewDescriptor implements IViewDescriptor, IPluginContribution { * * @see org.eclipse.ui.views.IViewDescriptor#getId() */ + @Override public String getId() { return descriptor.getElementId(); } @@ -94,6 +98,7 @@ public class ViewDescriptor implements IViewDescriptor, IPluginContribution { * * @see org.eclipse.ui.views.IViewDescriptor#getImageDescriptor() */ + @Override public ImageDescriptor getImageDescriptor() { if (imageDescriptor == null) { String iconURI = descriptor.getIconURI(); @@ -117,6 +122,7 @@ public class ViewDescriptor implements IViewDescriptor, IPluginContribution { * * @see org.eclipse.ui.views.IViewDescriptor#getLabel() */ + @Override public String getLabel() { return LocalizationHelper.getLocalized(descriptor.getLabel(), descriptor, application.getContext()); @@ -127,6 +133,7 @@ public class ViewDescriptor implements IViewDescriptor, IPluginContribution { * * @see org.eclipse.ui.views.IViewDescriptor#getFastViewWidthRatio() */ + @Override public float getFastViewWidthRatio() { // TODO Auto-generated method stub return 0; @@ -137,6 +144,7 @@ public class ViewDescriptor implements IViewDescriptor, IPluginContribution { * * @see org.eclipse.ui.views.IViewDescriptor#getAllowMultiple() */ + @Override public boolean getAllowMultiple() { return descriptor.isAllowMultiple(); } @@ -146,6 +154,7 @@ public class ViewDescriptor implements IViewDescriptor, IPluginContribution { * * @see org.eclipse.ui.views.IViewDescriptor#isRestorable() */ + @Override public boolean isRestorable() { if (element == null) { return false; @@ -158,6 +167,7 @@ public class ViewDescriptor implements IViewDescriptor, IPluginContribution { /* (non-Javadoc) * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class) */ + @Override public Object getAdapter(Class adapter) { if (adapter != null && adapter.equals(IConfigurationElement.class)) { return getConfigurationElement(); @@ -174,6 +184,7 @@ public class ViewDescriptor implements IViewDescriptor, IPluginContribution { * * @see org.eclipse.ui.IPluginContribution#getLocalId() */ + @Override public String getLocalId() { return getId(); } @@ -183,6 +194,7 @@ public class ViewDescriptor implements IViewDescriptor, IPluginContribution { * * @see org.eclipse.ui.IPluginContribution#getPluginId() */ + @Override public String getPluginId() { return getConfigurationElement().getNamespaceIdentifier(); } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/registry/ViewParameterValues.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/registry/ViewParameterValues.java index 73772e6e036..43c03ef1be9 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/registry/ViewParameterValues.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/registry/ViewParameterValues.java @@ -25,6 +25,7 @@ import org.eclipse.ui.views.IViewDescriptor; */ public final class ViewParameterValues implements IParameterValues { + @Override public final Map getParameterValues() { final Map values = new HashMap(); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/registry/WizardParameterValues.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/registry/WizardParameterValues.java index 800b1f4aae8..d022171e98e 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/registry/WizardParameterValues.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/registry/WizardParameterValues.java @@ -34,6 +34,7 @@ public abstract class WizardParameterValues implements IParameterValues { * Provides the parameter values for export wizards. */ public static final class Export extends WizardParameterValues { + @Override protected IWizardRegistry getWizardRegistry() { return PlatformUI.getWorkbench().getExportWizardRegistry(); } @@ -43,6 +44,7 @@ public abstract class WizardParameterValues implements IParameterValues { * Provides the parameter values for import wizards. */ public static final class Import extends WizardParameterValues { + @Override protected IWizardRegistry getWizardRegistry() { return PlatformUI.getWorkbench().getImportWizardRegistry(); } @@ -52,6 +54,7 @@ public abstract class WizardParameterValues implements IParameterValues { * Provides the parameter values for new wizards. */ public static final class New extends WizardParameterValues { + @Override protected IWizardRegistry getWizardRegistry() { return PlatformUI.getWorkbench().getNewWizardRegistry(); } @@ -86,6 +89,7 @@ public abstract class WizardParameterValues implements IParameterValues { } } + @Override public Map getParameterValues() { final Map values = new HashMap(); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/registry/WizardsRegistryReader.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/registry/WizardsRegistryReader.java index d54d14d7d83..d2c17ff80ca 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/registry/WizardsRegistryReader.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/registry/WizardsRegistryReader.java @@ -98,7 +98,8 @@ public class WizardsRegistryReader extends RegistryReader { private static final Comparator comparer = new Comparator() { private Collator collator = Collator.getInstance(); - public int compare(Object arg0, Object arg1) { + @Override + public int compare(Object arg0, Object arg1) { String s1 = ((CategoryNode) arg0).getPath(); String s2 = ((CategoryNode) arg1).getPath(); return collator.compare(s1, s2); @@ -421,7 +422,8 @@ public class WizardsRegistryReader extends RegistryReader { /** * Implement this method to read element attributes. */ - public boolean readElement(IConfigurationElement element) { + @Override + public boolean readElement(IConfigurationElement element) { if (element.getName().equals(IWorkbenchRegistryConstants.TAG_CATEGORY)) { deferCategory(element); return true; diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/registry/WorkingSetDescriptor.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/registry/WorkingSetDescriptor.java index 235191fc46c..fe30bb60038 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/registry/WorkingSetDescriptor.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/registry/WorkingSetDescriptor.java @@ -284,10 +284,12 @@ public class WorkingSetDescriptor implements IPluginContribution { return getPageClassName() != null; } + @Override public String getLocalId() { return getId(); } + @Override public String getPluginId() { return getDeclaringNamespace(); } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/registry/WorkingSetRegistry.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/registry/WorkingSetRegistry.java index 84f71a816d3..01f22e05755 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/registry/WorkingSetRegistry.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/registry/WorkingSetRegistry.java @@ -209,6 +209,7 @@ public class WorkingSetRegistry implements IExtensionChangeHandler { /* (non-Javadoc) * @see org.eclipse.core.runtime.dynamichelpers.IExtensionChangeHandler#addExtension(org.eclipse.core.runtime.dynamichelpers.IExtensionTracker, org.eclipse.core.runtime.IExtension) */ + @Override public void addExtension(IExtensionTracker tracker, IExtension extension) { WorkingSetRegistryReader reader = new WorkingSetRegistryReader(this); IConfigurationElement[] elements = extension.getConfigurationElements(); @@ -220,6 +221,7 @@ public class WorkingSetRegistry implements IExtensionChangeHandler { /* (non-Javadoc) * @see org.eclipse.core.runtime.dynamichelpers.IExtensionChangeHandler#removeExtension(org.eclipse.core.runtime.IExtension, java.lang.Object[]) */ + @Override public void removeExtension(IExtension extension, Object[] objects) { for (int i = 0; i < objects.length; i++) { if (objects[i] instanceof WorkingSetDescriptor) { diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/registry/WorkingSetRegistryReader.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/registry/WorkingSetRegistryReader.java index 5eac376cefe..d4e24798629 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/registry/WorkingSetRegistryReader.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/registry/WorkingSetRegistryReader.java @@ -46,7 +46,8 @@ public class WorkingSetRegistryReader extends RegistryReader { * * @see RegistryReader#readElement(IConfigurationElement) */ - public boolean readElement(IConfigurationElement element) { + @Override + public boolean readElement(IConfigurationElement element) { if (element.getName().equals(IWorkbenchRegistryConstants.TAG_WORKING_SET)) { try { WorkingSetDescriptor desc = new WorkingSetDescriptor(element); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/services/ActionSetSourceProvider.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/services/ActionSetSourceProvider.java index e421c7829ec..e061de8daaf 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/services/ActionSetSourceProvider.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/services/ActionSetSourceProvider.java @@ -50,6 +50,7 @@ public final class ActionSetSourceProvider extends AbstractSourceProvider super(); } + @Override public final void actionSetsChanged(final ActionSetsEvent event) { final IActionSetDescriptor[] newActionSets = event.getNewActionSets(); if (!Util.equals(newActionSets, activeActionSets)) { @@ -75,16 +76,19 @@ public final class ActionSetSourceProvider extends AbstractSourceProvider } } + @Override public final void dispose() { activeActionSets = null; } + @Override public final Map getCurrentState() { final Map currentState = new HashMap(); currentState.put(ISources.ACTIVE_ACTION_SETS_NAME, activeActionSets); return currentState; } + @Override public final String[] getProvidedSourceNames() { return PROVIDED_SOURCE_NAMES; } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/services/EvaluationReference.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/services/EvaluationReference.java index 7258356815f..f1c432d562e 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/services/EvaluationReference.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/services/EvaluationReference.java @@ -55,6 +55,7 @@ public class EvaluationReference extends RunAndTrack implements IEvaluationRefer * @see * org.eclipse.ui.internal.services.IEvaluationResultCache#clearResult() */ + @Override public void clearResult() { } @@ -64,6 +65,7 @@ public class EvaluationReference extends RunAndTrack implements IEvaluationRefer * @see * org.eclipse.ui.internal.services.IEvaluationResultCache#getExpression() */ + @Override public Expression getExpression() { return expression; } @@ -75,6 +77,7 @@ public class EvaluationReference extends RunAndTrack implements IEvaluationRefer * org.eclipse.ui.internal.services.IEvaluationResultCache#getSourcePriority * () */ + @Override public int getSourcePriority() { return sourcePriority; } @@ -86,6 +89,7 @@ public class EvaluationReference extends RunAndTrack implements IEvaluationRefer * org.eclipse.ui.internal.services.IEvaluationResultCache#evaluate(org. * eclipse.core.expressions.IEvaluationContext) */ + @Override public boolean evaluate(IEvaluationContext context) { if (expression == null) { cache = true; @@ -106,6 +110,7 @@ public class EvaluationReference extends RunAndTrack implements IEvaluationRefer * org.eclipse.ui.internal.services.IEvaluationResultCache#setResult(boolean * ) */ + @Override public void setResult(boolean result) { cache = result; } @@ -117,6 +122,7 @@ public class EvaluationReference extends RunAndTrack implements IEvaluationRefer * org.eclipse.e4.core.services.context.IRunAndTrack#notify(org.eclipse. * e4.core.services.context.ContextChangeEvent) */ + @Override public boolean changed(IEclipseContext context) { if (!participating) { return false; @@ -152,6 +158,7 @@ public class EvaluationReference extends RunAndTrack implements IEvaluationRefer * * @see org.eclipse.ui.services.IEvaluationReference#getListener() */ + @Override public IPropertyChangeListener getListener() { return listener; } @@ -161,6 +168,7 @@ public class EvaluationReference extends RunAndTrack implements IEvaluationRefer * * @see org.eclipse.ui.services.IEvaluationReference#getProperty() */ + @Override public String getProperty() { return property; } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/services/EvaluationResultCache.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/services/EvaluationResultCache.java index 85048ddcb55..5cd95af2c1c 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/services/EvaluationResultCache.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/services/EvaluationResultCache.java @@ -60,10 +60,12 @@ public abstract class EvaluationResultCache implements IEvaluationResultCache { .computeSourcePriority(expression); } + @Override public final void clearResult() { evaluationResult = null; } + @Override public final boolean evaluate(final IEvaluationContext context) { if (expression == null) { return true; @@ -88,14 +90,17 @@ public abstract class EvaluationResultCache implements IEvaluationResultCache { return evaluationResult != EvaluationResult.FALSE; } + @Override public final Expression getExpression() { return expression; } + @Override public final int getSourcePriority() { return sourcePriority; } + @Override public final void setResult(final boolean result) { if (result) { evaluationResult = EvaluationResult.TRUE; diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/services/EvaluationResultCacheComparator.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/services/EvaluationResultCacheComparator.java index d979a0c37ad..45089bb59e0 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/services/EvaluationResultCacheComparator.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/services/EvaluationResultCacheComparator.java @@ -31,6 +31,7 @@ import org.eclipse.ui.internal.util.Util; */ public final class EvaluationResultCacheComparator implements Comparator { + @Override public final int compare(final Object object1, final Object object2) { if (Util.equals(object2, object1)) { return 0; diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/services/EvaluationService.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/services/EvaluationService.java index 0227cddb7a2..b1414150a20 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/services/EvaluationService.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/services/EvaluationService.java @@ -111,10 +111,12 @@ public final class EvaluationService implements IEvaluationService { }; contextUpdater = new ISourceProviderListener() { + @Override public void sourceChanged(int sourcePriority, String sourceName, Object sourceValue) { changeVariable(sourceName, sourceValue); } + @Override public void sourceChanged(int sourcePriority, Map sourceValuesByName) { Iterator i = sourceValuesByName.entrySet().iterator(); while (i.hasNext()) { @@ -154,6 +156,7 @@ public final class EvaluationService implements IEvaluationService { * org.eclipse.ui.services.IServiceWithSources#addSourceProvider(org.eclipse * .ui.ISourceProvider) */ + @Override public void addSourceProvider(ISourceProvider provider) { sourceProviders.add(provider); provider.addSourceProviderListener(contextUpdater); @@ -184,6 +187,7 @@ public final class EvaluationService implements IEvaluationService { * org.eclipse.ui.services.IServiceWithSources#removeSourceProvider(org. * eclipse.ui.ISourceProvider) */ + @Override public void removeSourceProvider(ISourceProvider provider) { provider.removeSourceProviderListener(contextUpdater); sourceProviders.remove(provider); @@ -203,6 +207,7 @@ public final class EvaluationService implements IEvaluationService { * * @see org.eclipse.ui.services.IDisposable#dispose() */ + @Override public void dispose() { for (EvaluationReference ref : refs) { invalidate(ref, false); @@ -218,6 +223,7 @@ public final class EvaluationService implements IEvaluationService { * org.eclipse.ui.services.IEvaluationService#addServiceListener(org.eclipse * .jface.util.IPropertyChangeListener) */ + @Override public void addServiceListener(IPropertyChangeListener listener) { serviceListeners.add(listener); } @@ -229,6 +235,7 @@ public final class EvaluationService implements IEvaluationService { * org.eclipse.ui.services.IEvaluationService#removeServiceListener(org. * eclipse.jface.util.IPropertyChangeListener) */ + @Override public void removeServiceListener(IPropertyChangeListener listener) { serviceListeners.remove(listener); } @@ -241,6 +248,7 @@ public final class EvaluationService implements IEvaluationService { * eclipse.core.expressions.Expression, * org.eclipse.jface.util.IPropertyChangeListener, java.lang.String) */ + @Override public IEvaluationReference addEvaluationListener(Expression expression, IPropertyChangeListener listener, String property) { EvaluationReference ref = new EvaluationReference(ratContext, expression, listener, @@ -256,6 +264,7 @@ public final class EvaluationService implements IEvaluationService { * org.eclipse.ui.services.IEvaluationService#addEvaluationReference(org * .eclipse.ui.services.IEvaluationReference) */ + @Override public void addEvaluationReference(IEvaluationReference ref) { EvaluationReference eref = (EvaluationReference) ref; refs.add(eref); @@ -299,6 +308,7 @@ public final class EvaluationService implements IEvaluationService { * org.eclipse.ui.services.IEvaluationService#removeEvaluationListener(org * .eclipse.ui.services.IEvaluationReference) */ + @Override public void removeEvaluationListener(IEvaluationReference ref) { invalidate(ref, true); } @@ -308,6 +318,7 @@ public final class EvaluationService implements IEvaluationService { * * @see org.eclipse.ui.services.IEvaluationService#getCurrentState() */ + @Override public IEvaluationContext getCurrentState() { return legacyContext; } @@ -315,6 +326,7 @@ public final class EvaluationService implements IEvaluationService { /* (non-Javadoc) * @see org.eclipse.ui.services.IEvaluationService#requestEvaluation(java.lang.String) */ + @Override public void requestEvaluation(String propertyName) { // Trigger evaluation of properties via context String pokeVar = propertyName + ".evaluationServiceLink"; //$NON-NLS-1$ @@ -377,10 +389,12 @@ public final class EvaluationService implements IEvaluationService { for (int i = 0; i < listeners.length; i++) { final IPropertyChangeListener listener = (IPropertyChangeListener) listeners[i]; SafeRunner.run(new ISafeRunnable() { + @Override public void handleException(Throwable exception) { WorkbenchPlugin.log(exception); } + @Override public void run() throws Exception { listener.propertyChange(new PropertyChangeEvent(EvaluationService.this, property, oldValue, newValue)); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/services/EvaluationServiceFactory.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/services/EvaluationServiceFactory.java index 5e79763c671..73fdf86a270 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/services/EvaluationServiceFactory.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/services/EvaluationServiceFactory.java @@ -28,6 +28,7 @@ public class EvaluationServiceFactory extends AbstractServiceFactory { * org.eclipse.ui.services.IServiceLocator, * org.eclipse.ui.services.IServiceLocator) */ + @Override public Object create(Class serviceInterface, IServiceLocator parentLocator, IServiceLocator locator) { if (!IEvaluationService.class.equals(serviceInterface)) { diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/services/ExpressionAuthority.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/services/ExpressionAuthority.java index 3c3b02c1769..1bd39306e6c 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/services/ExpressionAuthority.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/services/ExpressionAuthority.java @@ -272,6 +272,7 @@ public abstract class ExpressionAuthority implements ISourceProviderListener { // this is a no-op, since we're late in the game } + @Override public final void sourceChanged(final int sourcePriority, final Map sourceValuesByName) { // If the selection has changed, invalidate the current state. @@ -291,6 +292,7 @@ public abstract class ExpressionAuthority implements ISourceProviderListener { .toArray(new String[0])); } + @Override public final void sourceChanged(final int sourcePriority, final String sourceName, final Object sourceValue) { // If the selection has changed, invalidate the current state. diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/services/MenuSourceProvider.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/services/MenuSourceProvider.java index 088f8953052..968bdfc7d50 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/services/MenuSourceProvider.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/services/MenuSourceProvider.java @@ -80,12 +80,14 @@ public final class MenuSourceProvider extends AbstractSourceProvider { fireSourceChanged(ISources.ACTIVE_MENU, m); } + @Override public final void dispose() { menuIds.clear(); selection = null; input = null; } + @Override public final Map getCurrentState() { final Map state = new HashMap(); state.put(ISources.ACTIVE_MENU_NAME, menuIds); @@ -97,6 +99,7 @@ public final class MenuSourceProvider extends AbstractSourceProvider { return state; } + @Override public final String[] getProvidedSourceNames() { return PROVIDED_SOURCE_NAMES; } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/services/PreferencePersistence.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/services/PreferencePersistence.java index 5a34c562afa..5a3d2255e3b 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/services/PreferencePersistence.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/services/PreferencePersistence.java @@ -390,6 +390,7 @@ public abstract class PreferencePersistence extends RegistryPersistence { /** * Detaches the preference change listener from the registry. */ + @Override public final void dispose() { super.dispose(); @@ -413,6 +414,7 @@ public abstract class PreferencePersistence extends RegistryPersistence { * Reads the various elements from the registry. Subclasses should extend, * but must not override. */ + @Override protected void read() { super.read(); @@ -431,6 +433,7 @@ public abstract class PreferencePersistence extends RegistryPersistence { super(); preferenceChangeListener = new IPropertyChangeListener() { + @Override public final void propertyChange(final PropertyChangeEvent event) { if (isChangeImportant(event)) { read(); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/services/RegistryPersistence.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/services/RegistryPersistence.java index 9e8df9d69db..84d4f1367c6 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/services/RegistryPersistence.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/services/RegistryPersistence.java @@ -61,6 +61,7 @@ public abstract class RegistryPersistence implements IDisposable, * The expression to return when there is an error. Never <code>null</code>. */ protected static final Expression ERROR_EXPRESSION = new Expression() { + @Override public final EvaluationResult evaluate(final IEvaluationContext context) { return null; } @@ -591,9 +592,11 @@ public abstract class RegistryPersistence implements IDisposable, */ protected RegistryPersistence() { registryChangeListener = new IRegistryChangeListener() { + @Override public final void registryChanged(final IRegistryChangeEvent event) { if (isChangeImportant(event)) { Display.getDefault().asyncExec(new Runnable() { + @Override public final void run() { read(); } @@ -606,6 +609,7 @@ public abstract class RegistryPersistence implements IDisposable, /** * Detaches the registry change listener from the registry. */ + @Override public void dispose() { final IExtensionRegistry registry = Platform.getExtensionRegistry(); registry.removeRegistryChangeListener(registryChangeListener); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/services/ServiceLocator.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/services/ServiceLocator.java index fc3c1cd29c4..0e547b309d9 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/services/ServiceLocator.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/services/ServiceLocator.java @@ -42,6 +42,7 @@ public final class ServiceLocator implements IDisposable, INestable, * @see * org.eclipse.ui.services.IServiceLocator#getService(java.lang.Class) */ + @Override public Object getService(Class api) { if (key.equals(api)) { return locator.getService(key); @@ -55,6 +56,7 @@ public final class ServiceLocator implements IDisposable, INestable, * @see * org.eclipse.ui.services.IServiceLocator#hasService(java.lang.Class) */ + @Override public boolean hasService(Class api) { if (key.equals(api)) { return true; @@ -104,6 +106,7 @@ public final class ServiceLocator implements IDisposable, INestable, this.owner = owner; } + @Override public final void activate() { activated = true; @@ -114,6 +117,7 @@ public final class ServiceLocator implements IDisposable, INestable, } } + @Override public final void deactivate() { activated = false; @@ -124,6 +128,7 @@ public final class ServiceLocator implements IDisposable, INestable, } } + @Override public final void dispose() { Iterator<Object> i = servicesToDispose.values().iterator(); while (i.hasNext()) { @@ -137,6 +142,7 @@ public final class ServiceLocator implements IDisposable, INestable, disposed = true; } + @Override public final Object getService(final Class key) { if (disposed) { return null; @@ -180,6 +186,7 @@ public final class ServiceLocator implements IDisposable, INestable, return service; } + @Override public final boolean hasService(final Class key) { if (disposed) { return false; diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/services/ServiceLocatorCreator.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/services/ServiceLocatorCreator.java index 9681f4bace4..7f86cc3dbef 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/services/ServiceLocatorCreator.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/services/ServiceLocatorCreator.java @@ -23,6 +23,7 @@ import org.eclipse.ui.services.IServiceLocator; */ public class ServiceLocatorCreator implements IServiceLocatorCreator { + @Override public IServiceLocator createServiceLocator(IServiceLocator parent, AbstractServiceFactory factory, IDisposable owner) { ServiceLocator serviceLocator = new ServiceLocator(parent, factory, owner); @@ -36,6 +37,7 @@ public class ServiceLocatorCreator implements IServiceLocatorCreator { return serviceLocator; } + @Override public IServiceLocator createServiceLocator(IServiceLocator parent, AbstractServiceFactory factory, IDisposable owner, IEclipseContext context) { ServiceLocator serviceLocator = new ServiceLocator(parent, factory, owner); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/services/SlaveEvaluationService.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/services/SlaveEvaluationService.java index 6c56a0f7ecf..7a197675425 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/services/SlaveEvaluationService.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/services/SlaveEvaluationService.java @@ -46,6 +46,7 @@ public class SlaveEvaluationService implements IEvaluationService { * @see org.eclipse.ui.services.IEvaluationService#addEvaluationListener(org.eclipse.core.expressions.Expression, * org.eclipse.jface.util.IPropertyChangeListener, java.lang.String) */ + @Override public IEvaluationReference addEvaluationListener(Expression expression, IPropertyChangeListener listener, String property) { IEvaluationReference ref = parentService.addEvaluationListener( @@ -59,6 +60,7 @@ public class SlaveEvaluationService implements IEvaluationService { /* (non-Javadoc) * @see org.eclipse.ui.services.IEvaluationService#addEvaluationReference(org.eclipse.ui.services.IEvaluationReference) */ + @Override public void addEvaluationReference(IEvaluationReference ref) { if (!evaluationReferences.contains(ref)) { evaluationReferences.add(ref); @@ -69,6 +71,7 @@ public class SlaveEvaluationService implements IEvaluationService { /** * @see org.eclipse.ui.services.IEvaluationService#addServiceListener(org.eclipse.jface.util.IPropertyChangeListener) */ + @Override public void addServiceListener(IPropertyChangeListener listener) { if (!serviceListeners.contains(listener)) { serviceListeners.add(listener); @@ -79,6 +82,7 @@ public class SlaveEvaluationService implements IEvaluationService { /** * @see org.eclipse.ui.services.IServiceWithSources#addSourceProvider(org.eclipse.ui.ISourceProvider) */ + @Override public void addSourceProvider(ISourceProvider provider) { if (!sourceProviders.contains(provider)) { sourceProviders.add(provider); @@ -89,6 +93,7 @@ public class SlaveEvaluationService implements IEvaluationService { /** * @see org.eclipse.ui.services.IEvaluationService#getCurrentState() */ + @Override public IEvaluationContext getCurrentState() { return parentService.getCurrentState(); } @@ -96,6 +101,7 @@ public class SlaveEvaluationService implements IEvaluationService { /** * @see org.eclipse.ui.services.IEvaluationService#removeEvaluationListener(org.eclipse.ui.services.IEvaluationReference) */ + @Override public void removeEvaluationListener(IEvaluationReference ref) { evaluationReferences.remove(ref); parentService.removeEvaluationListener(ref); @@ -104,6 +110,7 @@ public class SlaveEvaluationService implements IEvaluationService { /** * @see org.eclipse.ui.services.IEvaluationService#removeServiceListener(org.eclipse.jface.util.IPropertyChangeListener) */ + @Override public void removeServiceListener(IPropertyChangeListener listener) { serviceListeners.remove(listener); parentService.removeServiceListener(listener); @@ -112,6 +119,7 @@ public class SlaveEvaluationService implements IEvaluationService { /** * @see org.eclipse.ui.services.IServiceWithSources#removeSourceProvider(org.eclipse.ui.ISourceProvider) */ + @Override public void removeSourceProvider(ISourceProvider provider) { sourceProviders.remove(provider); parentService.removeSourceProvider(provider); @@ -122,6 +130,7 @@ public class SlaveEvaluationService implements IEvaluationService { * * @see org.eclipse.ui.services.IDisposable#dispose() */ + @Override public void dispose() { if (!evaluationReferences.isEmpty()) { Object[] array = evaluationReferences.toArray(); @@ -152,6 +161,7 @@ public class SlaveEvaluationService implements IEvaluationService { /* (non-Javadoc) * @see org.eclipse.ui.services.IEvaluationService#requestEvaluation(java.lang.String) */ + @Override public void requestEvaluation(String propertyName) { parentService.requestEvaluation(propertyName); } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/services/SourceProviderService.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/services/SourceProviderService.java index 8816c0831e6..06ca04ea91b 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/services/SourceProviderService.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/services/SourceProviderService.java @@ -56,6 +56,7 @@ public final class SourceProviderService implements ISourceProviderService, this.locator = locator; } + @Override public final void dispose() { final Iterator sourceProviderItr = sourceProviders.iterator(); while (sourceProviderItr.hasNext()) { @@ -67,10 +68,12 @@ public final class SourceProviderService implements ISourceProviderService, sourceProvidersByName.clear(); } + @Override public final ISourceProvider getSourceProvider(final String sourceName) { return (ISourceProvider) sourceProvidersByName.get(sourceName); } + @Override public final ISourceProvider[] getSourceProviders() { return (ISourceProvider[]) sourceProviders .toArray(new ISourceProvider[sourceProviders.size()]); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/services/WorkbenchLocationService.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/services/WorkbenchLocationService.java index 8984bbcacf6..9d7b23f852f 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/services/WorkbenchLocationService.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/services/WorkbenchLocationService.java @@ -51,6 +51,7 @@ public class WorkbenchLocationService implements IWorkbenchLocationService, * @seeorg.eclipse.ui.internal.services.IWorkbenchLocationService# * getMultiPageEditorSite() */ + @Override public IEditorSite getMultiPageEditorSite() { return mpepSite; } @@ -61,6 +62,7 @@ public class WorkbenchLocationService implements IWorkbenchLocationService, * @see * org.eclipse.ui.internal.services.IWorkbenchLocationService#getPageSite() */ + @Override public IPageSite getPageSite() { return pageSite; } @@ -71,6 +73,7 @@ public class WorkbenchLocationService implements IWorkbenchLocationService, * @see * org.eclipse.ui.internal.services.IWorkbenchLocationService#getPartSite() */ + @Override public IWorkbenchPartSite getPartSite() { return partSite; } @@ -82,6 +85,7 @@ public class WorkbenchLocationService implements IWorkbenchLocationService, * org.eclipse.ui.internal.services.IWorkbenchLocationService#getServiceScope * () */ + @Override public String getServiceScope() { return serviceScope; } @@ -92,6 +96,7 @@ public class WorkbenchLocationService implements IWorkbenchLocationService, * @see * org.eclipse.ui.internal.services.IWorkbenchLocationService#getWorkbench() */ + @Override public IWorkbench getWorkbench() { return workbench; } @@ -103,6 +108,7 @@ public class WorkbenchLocationService implements IWorkbenchLocationService, * org.eclipse.ui.internal.services.IWorkbenchLocationService#getWorkbenchWindow * () */ + @Override public IWorkbenchWindow getWorkbenchWindow() { return window; } @@ -112,6 +118,7 @@ public class WorkbenchLocationService implements IWorkbenchLocationService, * * @see org.eclipse.ui.services.IDisposable#dispose() */ + @Override public void dispose() { mpepSite = null; pageSite = null; @@ -124,6 +131,7 @@ public class WorkbenchLocationService implements IWorkbenchLocationService, /* (non-Javadoc) * @see org.eclipse.ui.internal.services.IWorkbenchLocationService#getServiceLevel() */ + @Override public int getServiceLevel() { return level; } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/services/WorkbenchServiceRegistry.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/services/WorkbenchServiceRegistry.java index 7925e3a388a..53bbe819636 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/services/WorkbenchServiceRegistry.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/services/WorkbenchServiceRegistry.java @@ -74,10 +74,12 @@ public class WorkbenchServiceRegistry implements IExtensionChangeHandler { * Used as the global service locator's parent. */ public static final IServiceLocator GLOBAL_PARENT = new IServiceLocator() { + @Override public Object getService(Class api) { return null; } + @Override public boolean hasService(Class api) { return false; } @@ -232,12 +234,14 @@ public class WorkbenchServiceRegistry implements IExtensionChangeHandler { } } + @Override public void addExtension(IExtensionTracker tracker, IExtension extension) { // we don't need to react to adds because we are not caching the extensions we find - // next time a service is requested, we will look at all extensions again in // loadFromRegistry } + @Override public void removeExtension(IExtension extension, Object[] objects) { for (int i = 0; i < objects.length; i++) { Object object = objects[i]; @@ -246,6 +250,7 @@ public class WorkbenchServiceRegistry implements IExtensionChangeHandler { Set locatorSet = handle.serviceLocators.keySet(); ServiceLocator[] locators = (ServiceLocator[]) locatorSet.toArray(new ServiceLocator[locatorSet.size()]); Arrays.sort(locators, new Comparator(){ + @Override public int compare(Object o1, Object o2) { ServiceLocator loc1 = (ServiceLocator) o1; ServiceLocator loc2 = (ServiceLocator) o2; diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/services/WorkbenchSourceProvider.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/services/WorkbenchSourceProvider.java index ebccbb84e7e..51d3f2fdb83 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/services/WorkbenchSourceProvider.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/services/WorkbenchSourceProvider.java @@ -83,6 +83,7 @@ public class WorkbenchSourceProvider extends AbstractSourceProvider implements * org.eclipse.ui.AbstractSourceProvider#initialize(org.eclipse.ui.services * .IServiceLocator) */ + @Override public void initialize(IServiceLocator locator) { // this.locator = locator; super.initialize(locator); @@ -100,6 +101,7 @@ public class WorkbenchSourceProvider extends AbstractSourceProvider implements * * @see org.eclipse.ui.ISourceProvider#dispose() */ + @Override public void dispose() { if (lastWindow != null) lastWindow.getSelectionService().removeSelectionListener(this); @@ -117,6 +119,7 @@ public class WorkbenchSourceProvider extends AbstractSourceProvider implements * * @see org.eclipse.ui.ISourceProvider#getProvidedSourceNames() */ + @Override public String[] getProvidedSourceNames() { return PROVIDED_SOURCE_NAMES; } @@ -126,6 +129,7 @@ public class WorkbenchSourceProvider extends AbstractSourceProvider implements * * @see org.eclipse.ui.ISourceProvider#getCurrentState() */ + @Override public Map getCurrentState() { final Map currentState = new HashMap(); @@ -161,6 +165,7 @@ public class WorkbenchSourceProvider extends AbstractSourceProvider implements return sources; } + @Override public final void selectionChanged(final IWorkbenchPart part, final ISelection newSelection) { @@ -231,22 +236,27 @@ public class WorkbenchSourceProvider extends AbstractSourceProvider implements private final IPartListener partListener = new IPartListener() { + @Override public final void partActivated(final IWorkbenchPart part) { checkActivePart(); } + @Override public final void partBroughtToTop(final IWorkbenchPart part) { checkActivePart(); } + @Override public final void partClosed(final IWorkbenchPart part) { checkActivePart(); } + @Override public final void partDeactivated(final IWorkbenchPart part) { checkActivePart(); } + @Override public final void partOpened(final IWorkbenchPart part) { checkActivePart(); } @@ -255,10 +265,12 @@ public class WorkbenchSourceProvider extends AbstractSourceProvider implements private final IWindowListener windowListener = new IWindowListener() { + @Override public final void windowActivated(final IWorkbenchWindow window) { checkActivePart(); } + @Override public final void windowClosed(final IWorkbenchWindow window) { if (window != null) { window.getPartService().removePartListener(partListener); @@ -266,10 +278,12 @@ public class WorkbenchSourceProvider extends AbstractSourceProvider implements checkActivePart(); } + @Override public final void windowDeactivated(final IWorkbenchWindow window) { checkActivePart(); } + @Override public final void windowOpened(final IWorkbenchWindow window) { if (window != null) { window.getPartService().addPartListener(partListener); @@ -588,6 +602,7 @@ public class WorkbenchSourceProvider extends AbstractSourceProvider implements */ private final IPropertyChangeListener propertyListener = new IPropertyChangeListener() { + @Override public void propertyChange(PropertyChangeEvent event) { if (WorkbenchWindow.PROP_COOLBAR_VISIBLE .equals(event.getProperty())) { @@ -631,6 +646,7 @@ public class WorkbenchSourceProvider extends AbstractSourceProvider implements }; IPerspectiveListener perspectiveListener = new IPerspectiveListener() { + @Override public void perspectiveActivated(IWorkbenchPage page, IPerspectiveDescriptor perspective) { String id = perspective == null ? null : perspective.getId(); @@ -648,12 +664,14 @@ public class WorkbenchSourceProvider extends AbstractSourceProvider implements lastPerspectiveId = id; } + @Override public void perspectiveChanged(IWorkbenchPage page, IPerspectiveDescriptor perspective, String changeId) { } }; private IPropertyListener editorListener = new IPropertyListener() { + @Override public void propertyChanged(Object source, int propId) { if (propId == IEditorPart.PROP_INPUT) { handleInputChanged((IEditorPart) source); @@ -669,6 +687,7 @@ public class WorkbenchSourceProvider extends AbstractSourceProvider implements /** * Notifies all listeners that the source has changed. */ + @Override public final void handleEvent(final Event event) { if (!(event.widget instanceof Shell)) { if (DEBUG) { diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/splash/EclipseSplashHandler.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/splash/EclipseSplashHandler.java index fa3de278c8e..04eb33bbf7a 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/splash/EclipseSplashHandler.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/splash/EclipseSplashHandler.java @@ -38,6 +38,7 @@ public class EclipseSplashHandler extends BasicSplashHandler { * @param splash * the shell that contains the splash screen */ + @Override public void init(Shell splash) { super.init(splash); String progressRectString = null; diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/splash/SplashHandlerFactory.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/splash/SplashHandlerFactory.java index 7942dc31215..dd9fa498073 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/splash/SplashHandlerFactory.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/splash/SplashHandlerFactory.java @@ -136,6 +136,7 @@ public final class SplashHandlerFactory { * * @see org.eclipse.core.runtime.ISafeRunnable#run() */ + @Override public void run() throws Exception { handler[0] = (AbstractSplashHandler) WorkbenchPlugin .createExtension(splashElement, @@ -147,6 +148,7 @@ public final class SplashHandlerFactory { * * @see org.eclipse.jface.util.SafeRunnable#handleException(java.lang.Throwable) */ + @Override public void handleException(Throwable e) { WorkbenchPlugin .log("Problem creating splash implementation", e); //$NON-NLS-1$ diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/statushandlers/DefaultDetailsArea.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/statushandlers/DefaultDetailsArea.java index 1b80475f27f..6ab1e638ef3 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/statushandlers/DefaultDetailsArea.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/statushandlers/DefaultDetailsArea.java @@ -99,6 +99,7 @@ public class DefaultDetailsArea extends AbstractStatusAreaProvider { * (org.eclipse.swt.widgets.Composite, * org.eclipse.ui.statushandlers.StatusAdapter) */ + @Override public Control createSupportArea(Composite parent, StatusAdapter statusAdapter) { Composite area = createArea(parent); @@ -130,6 +131,7 @@ public class DefaultDetailsArea extends AbstractStatusAreaProvider { ArrayList keyList = new ArrayList(); + @Override public void keyPressed(KeyEvent e) { // get the character. reverse the ctrl modifier if necessary char character = e.character; @@ -169,12 +171,14 @@ public class DefaultDetailsArea extends AbstractStatusAreaProvider { } } + @Override public void keyReleased(KeyEvent e) { // no op } }); text.addSelectionListener(new SelectionListener() { + @Override public void widgetSelected(SelectionEvent e) { if (text.getSelectionText().length() == 0) { if (copyAction != null && !copyAction.isDisposed()) { @@ -187,6 +191,7 @@ public class DefaultDetailsArea extends AbstractStatusAreaProvider { } } + @Override public void widgetDefaultSelected(SelectionEvent e) { widgetSelected(e); } @@ -250,15 +255,18 @@ public class DefaultDetailsArea extends AbstractStatusAreaProvider { DragSource ds = new DragSource(text, DND.DROP_COPY); ds.setTransfer(new Transfer[] { TextTransfer.getInstance() }); ds.addDragListener(new DragSourceListener() { + @Override public void dragFinished(DragSourceEvent event) { } + @Override public void dragSetData(DragSourceEvent event) { if (TextTransfer.getInstance().isSupportedType(event.dataType)) { event.data = text.getSelectionText(); } } + @Override public void dragStart(DragSourceEvent event) { } }); @@ -277,6 +285,7 @@ public class DefaultDetailsArea extends AbstractStatusAreaProvider { * org.eclipse.swt.events.SelectionAdapter#widgetSelected(org.eclipse * .swt.events.SelectionEvent) */ + @Override public void widgetSelected(SelectionEvent e) { copyToClipboard(); super.widgetSelected(e); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/statushandlers/InternalDialog.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/statushandlers/InternalDialog.java index 7967e3cac16..a5fd3854cc8 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/statushandlers/InternalDialog.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/statushandlers/InternalDialog.java @@ -154,6 +154,7 @@ public class InternalDialog extends TrayDialog { super(ProgressManagerUtil.getDefaultParent()); this.dialogState = dialogState; supportTray = new SupportTray(dialogState, new Listener() { + @Override public void handleEvent(Event event) { dialogState.put(IStatusDialogConstants.TRAY_OPENED, Boolean.FALSE); @@ -172,6 +173,7 @@ public class InternalDialog extends TrayDialog { } } + @Override protected void buttonPressed(int id) { if (id == GOTO_ACTION_ID) { IAction gotoAction = getGotoAction(); @@ -194,6 +196,7 @@ public class InternalDialog extends TrayDialog { /* * (non-Javadoc) Method declared in Window. */ + @Override final protected void configureShell(Shell shell) { super.configureShell(shell); shell.setText(getString(IStatusDialogConstants.TITLE)); @@ -202,6 +205,7 @@ public class InternalDialog extends TrayDialog { /** * Status dialog button should be aligned SWT.END. */ + @Override protected void setButtonLayoutData(Button button) { GridData data = new GridData(SWT.END, SWT.CENTER, false, false); int widthHint = convertHorizontalDLUsToPixels(IDialogConstants.BUTTON_WIDTH); @@ -215,6 +219,7 @@ public class InternalDialog extends TrayDialog { * * @see org.eclipse.jface.dialogs.Dialog#createDialogArea(org.eclipse.swt.widgets.Composite) */ + @Override protected Control createDialogArea(Composite parent) { createTitleArea(parent); createListArea(parent); @@ -228,6 +233,7 @@ public class InternalDialog extends TrayDialog { * * @see org.eclipse.jface.dialogs.Dialog#isResizable() */ + @Override protected boolean isResizable() { return true; } @@ -322,6 +328,7 @@ public class InternalDialog extends TrayDialog { * * @see org.eclipse.jface.window.Window#open() */ + @Override public int open() { boolean modalitySwitch = getBooleanValue(IStatusDialogConstants.MODALITY_SWITCH); int result = super.open(); @@ -344,6 +351,7 @@ public class InternalDialog extends TrayDialog { /* (non-Javadoc) * @see org.eclipse.jface.dialogs.TrayDialog#closeTray() */ + @Override public void closeTray() throws IllegalStateException { if (getTray() != null) { super.closeTray(); @@ -464,6 +472,7 @@ public class InternalDialog extends TrayDialog { /** * This method should initialize the dialog bounds. */ + @Override protected void initializeBounds() { super.initializeBounds(); refreshDialogSize(); @@ -480,6 +489,7 @@ public class InternalDialog extends TrayDialog { * org.eclipse.jface.dialogs.Dialog#getInitialLocation(org.eclipse.swt.graphics * .Point) */ + @Override public Point getInitialLocation(Point initialSize) { // TODO Auto-generated method stub return super.getInitialLocation(initialSize); @@ -527,6 +537,7 @@ public class InternalDialog extends TrayDialog { initContentProvider(); initLabelProvider(); statusListViewer.addPostSelectionChangedListener(new ISelectionChangedListener() { + @Override public void selectionChanged(SelectionChangedEvent event) { handleSelectionChange(); if ((getTray() == null) && getBooleanValue(IStatusDialogConstants.TRAY_OPENED) @@ -604,6 +615,7 @@ public class InternalDialog extends TrayDialog { * This method creates button bar that is available on the bottom of the * dialog. */ + @Override protected Control createButtonBar(Composite parent) { Composite composite = new Composite(parent, SWT.NONE); GridLayout layout = new GridLayout(); @@ -625,6 +637,7 @@ public class InternalDialog extends TrayDialog { /** * This method creates buttons that are placed on button bar. */ + @Override protected void createButtonsForButtonBar(Composite parent) { IAction gotoAction = getGotoAction(); String text = null; @@ -677,13 +690,16 @@ public class InternalDialog extends TrayDialog { .getColumnText(getCurrentStatusAdapter(), 0)); singleStatusLabel.addMouseListener(new MouseListener() { + @Override public void mouseDoubleClick(MouseEvent e) { } + @Override public void mouseDown(MouseEvent e) { showDetailsArea(); } + @Override public void mouseUp(MouseEvent e) { } }); @@ -693,6 +709,7 @@ public class InternalDialog extends TrayDialog { /** * This method closes the dialog. */ + @Override public boolean close() { boolean modalitySwitch = getBooleanValue(IStatusDialogConstants.MODALITY_SWITCH); if (detailsManager.isOpen()) { @@ -803,6 +820,7 @@ public class InternalDialog extends TrayDialog { /** * Opens the dialog tray (support area at the right side of the dialog) */ + @Override public void openTray(DialogTray tray) throws IllegalStateException, UnsupportedOperationException { if (launchTrayLink != null && !launchTrayLink.isDisposed()) { @@ -856,6 +874,7 @@ public class InternalDialog extends TrayDialog { * * @see org.eclipse.jface.viewers.IContentProvider#dispose() */ + @Override public void dispose() { // Nothing of interest here } @@ -867,6 +886,7 @@ public class InternalDialog extends TrayDialog { * org.eclipse.jface.viewers.IStructuredContentProvider#getElements * (java.lang.Object) */ + @Override public Object[] getElements(Object inputElement) { return ((Collection) dialogState .get(IStatusDialogConstants.STATUS_ADAPTERS)).toArray(); @@ -880,6 +900,7 @@ public class InternalDialog extends TrayDialog { * .eclipse.jface.viewers.Viewer, java.lang.Object, * java.lang.Object) */ + @Override public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { if (newInput != null) { @@ -913,6 +934,7 @@ public class InternalDialog extends TrayDialog { // the composite should be as small as possible when there is no // additional controls on it + @Override public Point computeSize(int wHint, int hHint, boolean changed) { Point newSize = super.computeSize(wHint, hHint, changed); if (getChildren().length == 0) { @@ -953,6 +975,7 @@ public class InternalDialog extends TrayDialog { link .setToolTipText(WorkbenchMessages.WorkbenchStatusDialog_SupportTooltip); link.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { openTray(); } @@ -964,6 +987,7 @@ public class InternalDialog extends TrayDialog { private Link createShowErrorLogLink() { Link link = new Link(linkComposite, SWT.NONE); link.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { try { Workbench.getInstance().getActiveWorkbenchWindow() diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/statushandlers/LabelProviderWrapper.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/statushandlers/LabelProviderWrapper.java index b7a4b57eb53..ea93fff5de4 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/statushandlers/LabelProviderWrapper.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/statushandlers/LabelProviderWrapper.java @@ -60,6 +60,7 @@ public class LabelProviderWrapper extends ViewerComparator implements * org.eclipse.jface.viewers.IBaseLabelProvider#addListener(org.eclipse * .jface.viewers.ILabelProviderListener) */ + @Override public void addListener(ILabelProviderListener listener) { // Do nothing } @@ -69,6 +70,7 @@ public class LabelProviderWrapper extends ViewerComparator implements * * @see org.eclipse.jface.viewers.IBaseLabelProvider#dispose() */ + @Override public void dispose() { manager.dispose(); } @@ -80,6 +82,7 @@ public class LabelProviderWrapper extends ViewerComparator implements * org.eclipse.jface.viewers.ITableLabelProvider#getColumnImage(java * .lang.Object, int) */ + @Override public Image getColumnImage(Object element, int columnIndex) { Image result = null; if (element != null) { @@ -103,6 +106,7 @@ public class LabelProviderWrapper extends ViewerComparator implements * org.eclipse.jface.viewers.ITableLabelProvider#getColumnText(java. * lang.Object, int) */ + @Override public String getColumnText(Object element, int columnIndex) { StatusAdapter statusAdapter = (StatusAdapter) element; String text = WorkbenchMessages.WorkbenchStatusDialog_ProblemOccurred; @@ -163,6 +167,7 @@ public class LabelProviderWrapper extends ViewerComparator implements * org.eclipse.jface.viewers.IBaseLabelProvider#isLabelProperty(java * .lang.Object, java.lang.String) */ + @Override public boolean isLabelProperty(Object element, String property) { return false; } @@ -174,6 +179,7 @@ public class LabelProviderWrapper extends ViewerComparator implements * org.eclipse.jface.viewers.IBaseLabelProvider#removeListener(org.eclipse * .jface.viewers.ILabelProviderListener) */ + @Override public void removeListener(ILabelProviderListener listener) { // Do nothing } @@ -203,6 +209,7 @@ public class LabelProviderWrapper extends ViewerComparator implements * org.eclipse.jface.viewers.ITableLabelProvider#getColumnImage(java.lang * .Object, int) */ + @Override public Image getColumnImage(Object element, int columnIndex) { return labelProvider.getColumnImage(element, columnIndex); } @@ -214,6 +221,7 @@ public class LabelProviderWrapper extends ViewerComparator implements * org.eclipse.jface.viewers.ITableLabelProvider#getColumnText(java.lang * .Object, int) */ + @Override public String getColumnText(Object element, int columnIndex) { return getLabelProvider().getColumnText(element, columnIndex); } @@ -225,6 +233,7 @@ public class LabelProviderWrapper extends ViewerComparator implements * org.eclipse.jface.viewers.IBaseLabelProvider#addListener(org.eclipse. * jface.viewers.ILabelProviderListener) */ + @Override public void addListener(ILabelProviderListener listener) { getLabelProvider().addListener(listener); } @@ -235,6 +244,7 @@ public class LabelProviderWrapper extends ViewerComparator implements * * @see org.eclipse.jface.viewers.IBaseLabelProvider#dispose() */ + @Override public void dispose() { boolean modalitySwitch = ((Boolean) dialogState.get(IStatusDialogConstants.MODALITY_SWITCH)) .booleanValue(); @@ -250,6 +260,7 @@ public class LabelProviderWrapper extends ViewerComparator implements * org.eclipse.jface.viewers.IBaseLabelProvider#isLabelProperty(java.lang * .Object, java.lang.String) */ + @Override public boolean isLabelProperty(Object element, String property) { return getLabelProvider().isLabelProperty(element, property); } @@ -261,6 +272,7 @@ public class LabelProviderWrapper extends ViewerComparator implements * org.eclipse.jface.viewers.IBaseLabelProvider#removeListener(org.eclipse * .jface.viewers.ILabelProviderListener) */ + @Override public void removeListener(ILabelProviderListener listener) { getLabelProvider().removeListener(listener); } @@ -506,6 +518,7 @@ public class LabelProviderWrapper extends ViewerComparator implements * org.eclipse.jface.viewers.ViewerComparator#compare(org.eclipse.jface. * viewers.Viewer, java.lang.Object, java.lang.Object) */ + @Override public int compare(Viewer testViewer, Object o1, Object o2) { if (o1 instanceof StatusAdapter && o2 instanceof StatusAdapter) { return compare((StatusAdapter) o1, (StatusAdapter) o2); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/statushandlers/StackTraceSupportArea.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/statushandlers/StackTraceSupportArea.java index 5a38f5b28ae..e99efe6879e 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/statushandlers/StackTraceSupportArea.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/statushandlers/StackTraceSupportArea.java @@ -61,6 +61,7 @@ public class StackTraceSupportArea extends AbstractStatusAreaProvider { * @see org.eclipse.ui.statushandlers.AbstractStatusAreaProvider#createSupportArea(org.eclipse.swt.widgets.Composite, * org.eclipse.ui.statushandlers.StatusAdapter) */ + @Override public Control createSupportArea(final Composite parent, StatusAdapter statusAdapter) { @@ -79,6 +80,7 @@ public class StackTraceSupportArea extends AbstractStatusAreaProvider { * * @see org.eclipse.swt.events.SelectionAdapter#widgetSelected(org.eclipse.swt.events.SelectionEvent) */ + @Override public void widgetSelected(SelectionEvent e) { list.selectAll(); super.widgetSelected(e); @@ -98,16 +100,19 @@ public class StackTraceSupportArea extends AbstractStatusAreaProvider { DragSource ds = new DragSource(list, DND.DROP_COPY); ds.setTransfer(new Transfer[] { TextTransfer.getInstance() }); ds.addDragListener(new DragSourceListener() { + @Override public void dragFinished(DragSourceEvent event) { } + @Override public void dragSetData(DragSourceEvent event) { if (TextTransfer.getInstance().isSupportedType(event.dataType)) { event.data = prepareCopyString(); } } + @Override public void dragStart(DragSourceEvent event) { list.selectAll(); } @@ -126,6 +131,7 @@ public class StackTraceSupportArea extends AbstractStatusAreaProvider { * org.eclipse.swt.events.SelectionAdapter#widgetSelected(org.eclipse * .swt.events.SelectionEvent) */ + @Override public void widgetSelected(SelectionEvent e) { Clipboard clipboard = null; try { @@ -179,6 +185,7 @@ public class StackTraceSupportArea extends AbstractStatusAreaProvider { return list; } + @Override public boolean validFor(StatusAdapter statusAdapter) { return statusAdapter.getStatus().getException() != null; } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/statushandlers/StatusHandlerDescriptor.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/statushandlers/StatusHandlerDescriptor.java index 7d6e83977c0..1d37ee94329 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/statushandlers/StatusHandlerDescriptor.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/statushandlers/StatusHandlerDescriptor.java @@ -118,6 +118,7 @@ public class StatusHandlerDescriptor implements IPluginContribution { * * @see org.eclipse.ui.IPluginContribution#getLocalId() */ + @Override public String getLocalId() { return id; } @@ -127,6 +128,7 @@ public class StatusHandlerDescriptor implements IPluginContribution { * * @see org.eclipse.ui.IPluginContribution#getPluginId() */ + @Override public String getPluginId() { return pluginId; } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/statushandlers/StatusHandlerProductBindingDescriptor.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/statushandlers/StatusHandlerProductBindingDescriptor.java index 55ffdc51b27..e9105874d35 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/statushandlers/StatusHandlerProductBindingDescriptor.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/statushandlers/StatusHandlerProductBindingDescriptor.java @@ -53,6 +53,7 @@ class StatusHandlerProductBindingDescriptor implements * * @see org.eclipse.ui.IPluginContribution#getLocalId() */ + @Override public String getLocalId() { return id; } @@ -62,6 +63,7 @@ class StatusHandlerProductBindingDescriptor implements * * @see org.eclipse.ui.IPluginContribution#getPluginId() */ + @Override public String getPluginId() { return pluginId; } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/statushandlers/StatusHandlerRegistry.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/statushandlers/StatusHandlerRegistry.java index e783d58e59b..33255065685 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/statushandlers/StatusHandlerRegistry.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/statushandlers/StatusHandlerRegistry.java @@ -99,6 +99,7 @@ public class StatusHandlerRegistry implements IExtensionChangeHandler { * @see org.eclipse.core.runtime.dynamichelpers.IExtensionChangeHandler#addExtension(org.eclipse.core.runtime.dynamichelpers.IExtensionTracker, * org.eclipse.core.runtime.IExtension) */ + @Override public void addExtension(IExtensionTracker tracker, IExtension extension) { IConfigurationElement[] configElements = extension .getConfigurationElements(); @@ -127,6 +128,7 @@ public class StatusHandlerRegistry implements IExtensionChangeHandler { * @see org.eclipse.core.runtime.dynamichelpers.IExtensionChangeHandler#removeExtension(org.eclipse.core.runtime.IExtension, * java.lang.Object[]) */ + @Override public void removeExtension(IExtension extension, Object[] objects) { for (int i = 0; i < objects.length; i++) { if (objects[i] instanceof StatusHandlerDescriptor) { diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/statushandlers/SupportTray.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/statushandlers/SupportTray.java index bdb6ff64b0d..b34771448a2 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/statushandlers/SupportTray.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/statushandlers/SupportTray.java @@ -86,6 +86,7 @@ public class SupportTray extends DialogTray implements * * @see org.eclipse.jface.dialogs.DialogTray#createContents(org.eclipse.swt.widgets.Composite) */ + @Override protected Control createContents(Composite parent) { Composite container = new Composite(parent, SWT.NONE); @@ -105,6 +106,7 @@ public class SupportTray extends DialogTray implements container.setLayoutData(layoutData); container.addListener(SWT.Dispose, new Listener() { + @Override public void handleEvent(Event event) { destroyImages(); } @@ -206,6 +208,7 @@ public class SupportTray extends DialogTray implements private void createActions() { createImages(); closeAction = new ContributionItem() { + @Override public void fill(ToolBar parent, int index) { final ToolItem item = new ToolItem(parent, SWT.PUSH); item.setImage(normal); @@ -319,6 +322,7 @@ public class SupportTray extends DialogTray implements * * @see org.eclipse.jface.viewers.ISelectionChangedListener#selectionChanged(org.eclipse.jface.viewers.SelectionChangedEvent) */ + @Override public void selectionChanged(SelectionChangedEvent event) { lastSelectedStatus = getStatusAdapterFromEvent(event); if (supportArea != null && !supportArea.isDisposed()) { diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/statushandlers/WorkbenchStatusDialogManagerImpl.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/statushandlers/WorkbenchStatusDialogManagerImpl.java index 0f6bdb70db9..042a2040124 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/statushandlers/WorkbenchStatusDialogManagerImpl.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/statushandlers/WorkbenchStatusDialogManagerImpl.java @@ -61,6 +61,7 @@ public class WorkbenchStatusDialogManagerImpl { private final class StatusDialogDisposeListener implements DisposeListener { + @Override public void widgetDisposed(org.eclipse.swt.events.DisposeEvent e) { cleanUp(); } @@ -347,6 +348,7 @@ public class WorkbenchStatusDialogManagerImpl { * @param labelProvider * a label provider to be used when displaying status adapters. */ + @Deprecated public void setStatusListLabelProvider(ITableLabelProvider labelProvider) { Assert.isLegal(labelProvider != null, "Label Provider cannot be null"); //$NON-NLS-1$ dialogState.put(IStatusDialogConstants.CUSTOM_LABEL_PROVIDER, diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/testing/PluginContributionAdapterFactory.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/testing/PluginContributionAdapterFactory.java index a96ab1aa235..ec9d0a9e854 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/testing/PluginContributionAdapterFactory.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/testing/PluginContributionAdapterFactory.java @@ -36,6 +36,7 @@ import org.osgi.framework.FrameworkUtil; */ public class PluginContributionAdapterFactory implements IAdapterFactory { + @Override public Object getAdapter(Object adaptableObject, Class adapterType) { if (adapterType != ContributionInfo.class) { return null; @@ -89,6 +90,7 @@ public class PluginContributionAdapterFactory implements IAdapterFactory { return null; } + @Override public Class[] getAdapterList() { return new Class[] { ContributionInfo.class }; } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/testing/WorkbenchPartTestable.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/testing/WorkbenchPartTestable.java index a194445234f..de5e0831b67 100755 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/testing/WorkbenchPartTestable.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/testing/WorkbenchPartTestable.java @@ -38,6 +38,7 @@ public class WorkbenchPartTestable implements IWorkbenchPartTestable { /* (non-Javadoc) * @see org.eclipse.ui.testing.IWorkbenchPartTestable#getControl() */ + @Override public Composite getControl() { return composite; } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/testing/WorkbenchTestable.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/testing/WorkbenchTestable.java index 1c79f755653..97abb5e4b6e 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/testing/WorkbenchTestable.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/testing/WorkbenchTestable.java @@ -58,7 +58,8 @@ public class WorkbenchTestable extends TestableObject { if (getTestHarness() != null) { // don't use a job, since tests often wait for all jobs to complete before proceeding Runnable runnable = new Runnable() { - public void run() { + @Override + public void run() { // disable workbench auto-save during tests if ("true".equalsIgnoreCase(System.getProperty(PlatformUI.PLUGIN_ID + ".testsDisableWorkbenchAutoSave"))) { //$NON-NLS-1$ //$NON-NLS-2$ if (WorkbenchTestable.this.workbench instanceof Workbench) { @@ -97,7 +98,8 @@ public class WorkbenchTestable extends TestableObject { * <code>TestableObject</code> method ensures that the workbench * has been set. */ - public void testingStarting() { + @Override + public void testingStarting() { Assert.isNotNull(workbench); oldAutomatedMode = ErrorDialog.AUTOMATED_MODE; ErrorDialog.AUTOMATED_MODE = true; @@ -111,7 +113,8 @@ public class WorkbenchTestable extends TestableObject { * runs the test in a <code>syncExec</code>, then flushes the * event queue again. */ - public void runTest(Runnable testRunnable) { + @Override + public void runTest(Runnable testRunnable) { Assert.isNotNull(workbench); display.syncExec(testRunnable); } @@ -121,10 +124,12 @@ public class WorkbenchTestable extends TestableObject { * <code>TestableObject</code> method flushes the event queue, * then closes the workbench. */ - public void testingFinished() { + @Override + public void testingFinished() { // force events to be processed, and ensure the close is done in the UI thread display.syncExec(new Runnable() { - public void run() { + @Override + public void run() { Assert.isTrue(workbench.close()); } }); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/themes/CascadingColorRegistry.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/themes/CascadingColorRegistry.java index a76e2f2c9f1..1afd3037afe 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/themes/CascadingColorRegistry.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/themes/CascadingColorRegistry.java @@ -29,7 +29,8 @@ public class CascadingColorRegistry extends ColorRegistry { private ColorRegistry parent; private IPropertyChangeListener listener = new IPropertyChangeListener() { - public void propertyChange(PropertyChangeEvent event) { + @Override + public void propertyChange(PropertyChangeEvent event) { // check to see if we have an override for the given key. If so, // then a change in our parent registry shouldn't cause a change in // us. Without this check we will propagate a new value @@ -55,7 +56,8 @@ public class CascadingColorRegistry extends ColorRegistry { /* (non-Javadoc) * @see org.eclipse.jface.resource.ColorRegistry#get(java.lang.String) */ - public Color get(String symbolicName) { + @Override + public Color get(String symbolicName) { if (super.hasValueFor(symbolicName)) { return super.get(symbolicName); } @@ -66,7 +68,8 @@ public class CascadingColorRegistry extends ColorRegistry { /* (non-Javadoc) * @see org.eclipse.jface.resource.ColorRegistry#getKeySet() */ - public Set getKeySet() { + @Override + public Set getKeySet() { Set keyUnion = new HashSet(super.getKeySet()); keyUnion.addAll(parent.getKeySet()); return keyUnion; @@ -75,7 +78,8 @@ public class CascadingColorRegistry extends ColorRegistry { /* (non-Javadoc) * @see org.eclipse.jface.resource.ColorRegistry#getRGB(java.lang.String) */ - public RGB getRGB(String symbolicName) { + @Override + public RGB getRGB(String symbolicName) { if (super.hasValueFor(symbolicName)) { return super.getRGB(symbolicName); } @@ -86,7 +90,8 @@ public class CascadingColorRegistry extends ColorRegistry { /* (non-Javadoc) * @see org.eclipse.jface.resource.ColorRegistry#hasValueFor(java.lang.String) */ - public boolean hasValueFor(String colorKey) { + @Override + public boolean hasValueFor(String colorKey) { return super.hasValueFor(colorKey) || parent.hasValueFor(colorKey); } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/themes/CascadingFontRegistry.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/themes/CascadingFontRegistry.java index 52f107f7b82..a957f346383 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/themes/CascadingFontRegistry.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/themes/CascadingFontRegistry.java @@ -29,7 +29,8 @@ public class CascadingFontRegistry extends FontRegistry { private FontRegistry parent; private IPropertyChangeListener listener = new IPropertyChangeListener() { - public void propertyChange(PropertyChangeEvent event) { + @Override + public void propertyChange(PropertyChangeEvent event) { // check to see if we have an override for the given key. If so, // then a change in our parent registry shouldn't cause a change in // us. Without this check we will propagate a new value @@ -56,7 +57,8 @@ public class CascadingFontRegistry extends FontRegistry { /* (non-Javadoc) * @see org.eclipse.jface.resource.FontRegistry#get(java.lang.String) */ - public Font get(String symbolicName) { + @Override + public Font get(String symbolicName) { if (super.hasValueFor(symbolicName)) { return super.get(symbolicName); } @@ -66,13 +68,15 @@ public class CascadingFontRegistry extends FontRegistry { /* (non-Javadoc) * @see org.eclipse.jface.resource.FontRegistry#getKeySet() */ - public Set getKeySet() { + @Override + public Set getKeySet() { Set keyUnion = new HashSet(super.getKeySet()); keyUnion.addAll(parent.getKeySet()); return keyUnion; } - public FontData[] getFontData(String symbolicName) { + @Override + public FontData[] getFontData(String symbolicName) { if (super.hasValueFor(symbolicName)) { return super.getFontData(symbolicName); } @@ -82,7 +86,8 @@ public class CascadingFontRegistry extends FontRegistry { /* (non-Javadoc) * @see org.eclipse.jface.resource.ColorRegistry#hasValueFor(java.lang.String) */ - public boolean hasValueFor(String colorKey) { + @Override + public boolean hasValueFor(String colorKey) { return super.hasValueFor(colorKey) || parent.hasValueFor(colorKey); } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/themes/CascadingTheme.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/themes/CascadingTheme.java index 00b60503a1c..f899d2738c4 100755 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/themes/CascadingTheme.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/themes/CascadingTheme.java @@ -32,7 +32,8 @@ public class CascadingTheme extends EventManager implements ITheme { private IPropertyChangeListener listener = new IPropertyChangeListener() { - public void propertyChange(PropertyChangeEvent event) { + @Override + public void propertyChange(PropertyChangeEvent event) { fire(event); } }; @@ -65,49 +66,56 @@ public class CascadingTheme extends EventManager implements ITheme { /* (non-Javadoc) * @see org.eclipse.ui.themes.ITheme#addPropertyChangeListener(org.eclipse.jface.util.IPropertyChangeListener) */ - public void addPropertyChangeListener(IPropertyChangeListener listener) { + @Override + public void addPropertyChangeListener(IPropertyChangeListener listener) { addListenerObject(listener); } /* (non-Javadoc) * @see org.eclipse.ui.themes.ITheme#removePropertyChangeListener(org.eclipse.jface.util.IPropertyChangeListener) */ - public void removePropertyChangeListener(IPropertyChangeListener listener) { + @Override + public void removePropertyChangeListener(IPropertyChangeListener listener) { removeListenerObject(listener); } /* (non-Javadoc) * @see org.eclipse.ui.themes.ITheme#getId() */ - public String getId() { + @Override + public String getId() { return currentTheme.getId(); } /* (non-Javadoc) * @see org.eclipse.ui.themes.ITheme#getLabel() */ - public String getLabel() { + @Override + public String getLabel() { return currentTheme.getLabel(); } /* (non-Javadoc) * @see org.eclipse.ui.themes.ITheme#getColorRegistry() */ - public ColorRegistry getColorRegistry() { + @Override + public ColorRegistry getColorRegistry() { return colorRegistry; } /* (non-Javadoc) * @see org.eclipse.ui.themes.ITheme#getFontRegistry() */ - public FontRegistry getFontRegistry() { + @Override + public FontRegistry getFontRegistry() { return fontRegistry; } /* (non-Javadoc) * @see org.eclipse.ui.themes.ITheme#dispose() */ - public void dispose() { + @Override + public void dispose() { colorRegistry.removeListener(listener); fontRegistry.removeListener(listener); } @@ -115,28 +123,32 @@ public class CascadingTheme extends EventManager implements ITheme { /* (non-Javadoc) * @see org.eclipse.ui.themes.ITheme#getString(java.lang.String) */ - public String getString(String key) { + @Override + public String getString(String key) { return currentTheme.getString(key); } /* (non-Javadoc) * @see org.eclipse.ui.themes.ITheme#getInt(java.lang.String) */ - public int getInt(String key) { + @Override + public int getInt(String key) { return currentTheme.getInt(key); } /* (non-Javadoc) * @see org.eclipse.ui.themes.ITheme#getBoolean(java.lang.String) */ - public boolean getBoolean(String key) { + @Override + public boolean getBoolean(String key) { return currentTheme.getBoolean(key); } /* (non-Javadoc) * @see org.eclipse.ui.themes.ITheme#keySet() */ - public Set keySet() { + @Override + public Set keySet() { return currentTheme.keySet(); } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/themes/ColorAndFontProviderImpl.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/themes/ColorAndFontProviderImpl.java index aa6ebaa347c..77e8646063d 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/themes/ColorAndFontProviderImpl.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/themes/ColorAndFontProviderImpl.java @@ -30,6 +30,7 @@ public class ColorAndFontProviderImpl implements IColorAndFontProvider { * org.eclipse.e4.ui.internal.css.swt.definition.IColorAndFontProvider#getFont * (java.lang.String) */ + @Override public FontData[] getFont(String symbolicName) { return getCurrentTheme().getFontRegistry().getFontData(symbolicName); } @@ -41,6 +42,7 @@ public class ColorAndFontProviderImpl implements IColorAndFontProvider { * org.eclipse.e4.ui.internal.css.swt.definition.IColorAndFontProvider#getColor * (java.lang.String) */ + @Override public RGB getColor(String symbolicName) { return getCurrentTheme().getColorRegistry().getRGB(symbolicName); } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/themes/ColorDefinition.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/themes/ColorDefinition.java index 2d56397fc53..4915acd151e 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/themes/ColorDefinition.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/themes/ColorDefinition.java @@ -85,21 +85,24 @@ public class ColorDefinition extends ThemeElementDefinition implements IPluginCo /** * @return the defaultsTo value, or <code>null</code> if none was supplied. */ - public String getDefaultsTo() { + @Override + public String getDefaultsTo() { return defaultsTo; } /* (non-Javadoc) * @see org.eclipse.ui.IPluginContribution#getLocalId() */ - public String getLocalId() { + @Override + public String getLocalId() { return getId(); } /* (non-Javadoc) * @see org.eclipse.ui.IPluginContribution#getPluginId() */ - public String getPluginId() { + @Override + public String getPluginId() { return pluginId; } @@ -107,7 +110,8 @@ public class ColorDefinition extends ThemeElementDefinition implements IPluginCo * @return the value. Any SWT constants supplied to the constructor will be * evaluated and converted into their RGB value. */ - public RGB getValue() { + @Override + public RGB getValue() { if (parsedValue == null) { try { parsedValue = ColorUtil.getColorValue(rawValue); @@ -132,21 +136,24 @@ public class ColorDefinition extends ThemeElementDefinition implements IPluginCo * * @see java.lang.Object#toString() */ - public String toString() { + @Override + public String toString() { return getId(); } /* (non-Javadoc) * @see org.eclipse.ui.internal.themes.IEditable#isEditable() */ - public boolean isEditable() { + @Override + public boolean isEditable() { return isEditable; } /* (non-Javadoc) * @see java.lang.Object#equals(java.lang.Object) */ - public boolean equals(Object obj) { + @Override + public boolean equals(Object obj) { if (obj instanceof ColorDefinition) { return getId().equals(((ColorDefinition)obj).getId()); } @@ -156,7 +163,8 @@ public class ColorDefinition extends ThemeElementDefinition implements IPluginCo /* (non-Javadoc) * @see java.lang.Object#hashCode() */ - public int hashCode() { + @Override + public int hashCode() { return getId().hashCode(); } @@ -166,6 +174,7 @@ public class ColorDefinition extends ThemeElementDefinition implements IPluginCo * @see org.eclipse.e4.ui.internal.css.swt.definition. * IThemeElementDefinitionOverridable#setValue(java.lang.Object) */ + @Override public void setValue(RGB data) { if (data != null) { parsedValue = data; diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/themes/ColorsAndFontsPreferencePage.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/themes/ColorsAndFontsPreferencePage.java index 2320b63e15f..6693f863664 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/themes/ColorsAndFontsPreferencePage.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/themes/ColorsAndFontsPreferencePage.java @@ -138,7 +138,8 @@ public final class ColorsAndFontsPreferencePage extends PreferencePage /* (non-Javadoc) * @see org.eclipse.jface.viewers.ITreeContentProvider#getChildren(java.lang.Object) */ - public Object[] getChildren(Object parentElement) { + @Override + public Object[] getChildren(Object parentElement) { if (parentElement instanceof ThemeElementCategory) { String categoryId = ((ThemeElementCategory) parentElement) .getId(); @@ -260,7 +261,8 @@ public final class ColorsAndFontsPreferencePage extends PreferencePage /* (non-Javadoc) * @see org.eclipse.jface.viewers.ITreeContentProvider#getParent(java.lang.Object) */ - public Object getParent(Object element) { + @Override + public Object getParent(Object element) { if (element instanceof ThemeElementCategory) return registry; @@ -292,7 +294,8 @@ public final class ColorsAndFontsPreferencePage extends PreferencePage /* (non-Javadoc) * @see org.eclipse.jface.viewers.ITreeContentProvider#hasChildren(java.lang.Object) */ - public boolean hasChildren(Object element) { + @Override + public boolean hasChildren(Object element) { if (element instanceof ThemeElementCategory) { return true; } @@ -325,7 +328,8 @@ public final class ColorsAndFontsPreferencePage extends PreferencePage * * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object) */ - public Object[] getElements(Object inputElement) { + @Override + public Object[] getElements(Object inputElement) { ArrayList list = new ArrayList(); Object[] uncatChildren = getCategoryChildren(null); list.addAll(Arrays.asList(uncatChildren)); @@ -347,14 +351,16 @@ public final class ColorsAndFontsPreferencePage extends PreferencePage /* (non-Javadoc) * @see org.eclipse.jface.viewers.IContentProvider#dispose() */ - public void dispose() { + @Override + public void dispose() { categoryMap.clear(); } /* (non-Javadoc) * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object) */ - public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { + @Override + public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { categoryMap.clear(); registry = (IThemeRegistry) newInput; } @@ -374,7 +380,8 @@ public final class ColorsAndFontsPreferencePage extends PreferencePage private int usableImageSize = -1; private IPropertyChangeListener listener = new IPropertyChangeListener() { - public void propertyChange(PropertyChangeEvent event) { + @Override + public void propertyChange(PropertyChangeEvent event) { if (event.getNewValue() != null) { fireLabelProviderChanged(new LabelProviderChangedEvent( PresentationLabelProvider.this)); @@ -403,7 +410,8 @@ public final class ColorsAndFontsPreferencePage extends PreferencePage /* (non-Javadoc) * @see org.eclipse.jface.viewers.IBaseLabelProvider#dispose() */ - public void dispose() { + @Override + public void dispose() { super.dispose(); colorRegistry.removeListener(listener); fontRegistry.removeListener(listener); @@ -443,7 +451,8 @@ public final class ColorsAndFontsPreferencePage extends PreferencePage /* (non-Javadoc) * @see org.eclipse.jface.viewers.IFontProvider#getFont(java.lang.Object) */ - public Font getFont(Object element) { + @Override + public Font getFont(Object element) { Display display = tree.getDisplay(); if (element instanceof FontDefinition) { int parentHeight = tree.getViewer().getControl().getFont() @@ -468,7 +477,8 @@ public final class ColorsAndFontsPreferencePage extends PreferencePage /* (non-Javadoc) * @see org.eclipse.jface.viewers.ILabelProvider#getImage(java.lang.Object) */ - public Image getImage(Object element) { + @Override + public Image getImage(Object element) { if (element instanceof ColorDefinition) { Display display = tree.getDisplay(); Color c = colorRegistry @@ -523,7 +533,8 @@ public final class ColorsAndFontsPreferencePage extends PreferencePage /* (non-Javadoc) * @see org.eclipse.jface.viewers.ILabelProvider#getText(java.lang.Object) */ - public String getText(Object element) { + @Override + public String getText(Object element) { if (element instanceof IHierarchalThemeElementDefinition) { IHierarchalThemeElementDefinition themeElement = (IHierarchalThemeElementDefinition) element; if (themeElement.getDefaultsTo() != null) { @@ -789,6 +800,7 @@ public final class ColorsAndFontsPreferencePage extends PreferencePage * @param data * the data to be applied */ + @Override public void applyData(Object data) { if (tree == null || !(data instanceof String)) return; @@ -870,11 +882,13 @@ public final class ColorsAndFontsPreferencePage extends PreferencePage /* (non-Javadoc) * @see org.eclipse.jface.preference.PreferencePage#createContents(org.eclipse.swt.widgets.Composite) */ - protected Control createContents(Composite parent) { + @Override + protected Control createContents(Composite parent) { PlatformUI.getWorkbench().getHelpSystem().setHelp(parent, IWorkbenchHelpContextIds.FONTS_PREFERENCE_PAGE); parent.addDisposeListener(new DisposeListener() { - public void widgetDisposed(DisposeEvent e) { + @Override + public void widgetDisposed(DisposeEvent e) { if (appliedDialogFont != null) appliedDialogFont.dispose(); } @@ -992,6 +1006,7 @@ public final class ColorsAndFontsPreferencePage extends PreferencePage * * @since 3.7 */ + @Override protected boolean isLeafMatch(Viewer viewer, Object element) { if (super.isLeafMatch(viewer, element)) return true; @@ -1020,6 +1035,7 @@ public final class ColorsAndFontsPreferencePage extends PreferencePage tree.getViewer().setLabelProvider(labelProvider); tree.getViewer().setContentProvider(new ThemeContentProvider()); tree.getViewer().setComparator(new ViewerComparator() { + @Override public int category(Object element) { if (element instanceof ThemeElementCategory) return 0; @@ -1028,6 +1044,7 @@ public final class ColorsAndFontsPreferencePage extends PreferencePage }); tree.getViewer().setInput(WorkbenchPlugin.getDefault().getThemeRegistry()); tree.getViewer().addDoubleClickListener(new IDoubleClickListener() { + @Override public void doubleClick(DoubleClickEvent event) { IStructuredSelection s = (IStructuredSelection) event.getSelection(); Object element = s.getFirstElement(); @@ -1056,7 +1073,8 @@ public final class ColorsAndFontsPreferencePage extends PreferencePage /* (non-Javadoc) * @see org.eclipse.jface.dialogs.IDialogPage#dispose() */ - public void dispose() { + @Override + public void dispose() { eventBroker.unsubscribe(themeRegistryRestyledHandler); workbench.getThemeManager().removePropertyChangeListener(themeChangeListener); clearPreviews(); @@ -1230,13 +1248,15 @@ getPreferenceStore(), private void hookListeners() { TreeViewer viewer = tree.getViewer(); viewer.addSelectionChangedListener(new ISelectionChangedListener() { - public void selectionChanged(SelectionChangedEvent event) { + @Override + public void selectionChanged(SelectionChangedEvent event) { updateTreeSelection(event.getSelection()); } }); fontChangeButton.addSelectionListener(new SelectionAdapter() { - public void widgetSelected(SelectionEvent event) { + @Override + public void widgetSelected(SelectionEvent event) { Display display = event.display; if (isFontSelected()) editFont(display); @@ -1248,7 +1268,8 @@ getPreferenceStore(), fontResetButton.addSelectionListener(new SelectionAdapter() { - public void widgetSelected(SelectionEvent e) { + @Override + public void widgetSelected(SelectionEvent e) { if (isFontSelected()) resetFont(getSelectedFontDefinition(), false); else if (isColorSelected()) @@ -1258,7 +1279,8 @@ getPreferenceStore(), }); fontSystemButton.addSelectionListener(new SelectionAdapter() { - public void widgetSelected(SelectionEvent event) { + @Override + public void widgetSelected(SelectionEvent event) { FontDefinition definition = getSelectedFontDefinition(); if (definition == null) return; @@ -1269,6 +1291,7 @@ getPreferenceStore(), }); editDefaultButton.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent event) { Display display = event.display; FontDefinition fontDefinition = getSelectedFontDefinition(); @@ -1290,6 +1313,7 @@ getPreferenceStore(), }); goToDefaultButton.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent event) { FontDefinition fontDefinition = getSelectedFontDefinition(); if (fontDefinition != null) { @@ -1314,14 +1338,16 @@ getPreferenceStore(), /* (non-Javadoc) * @see org.eclipse.ui.IWorkbenchPreferencePage#init(org.eclipse.ui.IWorkbench) */ - public void init(IWorkbench aWorkbench) { + @Override + public void init(IWorkbench aWorkbench) { this.workbench = (Workbench) aWorkbench; themeEngine = (IThemeEngine) workbench.getService(IThemeEngine.class); setPreferenceStore(PrefUtil.getInternalPreferenceStore()); final IThemeManager themeManager = aWorkbench.getThemeManager(); themeChangeListener = new IPropertyChangeListener() { - public void propertyChange(PropertyChangeEvent event) { + @Override + public void propertyChange(PropertyChangeEvent event) { if (event.getProperty().equals( IThemeManager.CHANGE_CURRENT_THEME)) { updateThemeInfo(themeManager); @@ -1467,7 +1493,8 @@ getPreferenceStore(), /** * @see org.eclipse.jface.preference.PreferencePage#performApply() */ - protected void performApply() { + @Override + protected void performApply() { super.performApply(); //Apply the default font to the dialog. @@ -1532,7 +1559,8 @@ getPreferenceStore(), /* (non-Javadoc) * @see org.eclipse.jface.preference.PreferencePage#performDefaults() */ - protected void performDefaults() { + @Override + protected void performDefaults() { performColorDefaults(); performFontDefaults(); updateControls(); @@ -1571,7 +1599,8 @@ getPreferenceStore(), /* (non-Javadoc) * @see org.eclipse.jface.preference.IPreferencePage#performOk() */ - public boolean performOk() { + @Override + public boolean performOk() { saveTreeExpansion(); saveTreeSelection(); boolean result = performColorOk() && performFontOk(); @@ -2051,6 +2080,7 @@ getPreferenceStore(), fontSampler.setLayoutData(new GridData(GridData.FILL_BOTH)); fontSampler.addPaintListener(new PaintListener() { + @Override public void paintControl(PaintEvent e) { if (currentFont != null) // do the font preview paintFontSample(e.gc); @@ -2094,6 +2124,7 @@ getPreferenceStore(), colorSampler.setLayoutData(new GridData(GridData.FILL_BOTH)); colorSampler.addPaintListener(new PaintListener() { + @Override public void paintControl(PaintEvent e) { if (currentColor != null) // do the color preview paintColorSample(e.gc); @@ -2255,6 +2286,7 @@ getPreferenceStore(), super(currentTheme, colorRegistry, fontRegistry); } + @Override public void fire(PropertyChangeEvent event) { super.fire(event); } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/themes/FontDefinition.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/themes/FontDefinition.java index ee438cf6587..c9ab294f788 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/themes/FontDefinition.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/themes/FontDefinition.java @@ -72,7 +72,8 @@ public class FontDefinition extends ThemeElementDefinition implements * that this font defualts to. * @return String or <pre>null</pre>. */ - public String getDefaultsTo() { + @Override + public String getDefaultsTo() { return defaultsTo; } @@ -81,7 +82,8 @@ public class FontDefinition extends ThemeElementDefinition implements * * @return FontData [] */ - public FontData[] getValue() { + @Override + public FontData[] getValue() { if (value == null) { return null; } @@ -104,14 +106,16 @@ public class FontDefinition extends ThemeElementDefinition implements /* (non-Javadoc) * @see org.eclipse.ui.internal.themes.IEditable#isEditable() */ - public boolean isEditable() { + @Override + public boolean isEditable() { return isEditable; } /* (non-Javadoc) * @see java.lang.Object#equals(java.lang.Object) */ - public boolean equals(Object obj) { + @Override + public boolean equals(Object obj) { if (obj instanceof FontDefinition) { return getId().equals(((FontDefinition)obj).getId()); } @@ -121,7 +125,8 @@ public class FontDefinition extends ThemeElementDefinition implements /* (non-Javadoc) * @see java.lang.Object#hashCode() */ - public int hashCode() { + @Override + public int hashCode() { return getId().hashCode(); } @@ -132,6 +137,7 @@ public class FontDefinition extends ThemeElementDefinition implements * org.eclipse.e4.ui.css.swt.definition.IDefinitionOverridable#setData(java * .lang.Object) */ + @Override public void setValue(FontData[] data) { if (data != null && data.length > 0) { if (defaultValue == null) { diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/themes/IThemeRegistry.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/themes/IThemeRegistry.java index fbe2033dfa4..34ddd5ea547 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/themes/IThemeRegistry.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/themes/IThemeRegistry.java @@ -45,7 +45,8 @@ public interface IThemeRegistry { /* (non-Javadoc) * @see java.util.Comparator#compare(java.lang.Object, java.lang.Object) */ - public int compare(Object arg0, Object arg1) { + @Override + public int compare(Object arg0, Object arg1) { String def0 = arg0 == null ? null : ((IHierarchalThemeElementDefinition) arg0) .getDefaultsTo(); @@ -95,7 +96,8 @@ public interface IThemeRegistry { /* (non-Javadoc) * @see java.util.Comparator#compare(java.lang.Object, java.lang.Object) */ - public int compare(Object arg0, Object arg1) { + @Override + public int compare(Object arg0, Object arg1) { String str0 = getCompareString(arg0); String str1 = getCompareString(arg1); return str0.compareTo(str1); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/themes/LightColorFactory.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/themes/LightColorFactory.java index 86b53b9059b..bb72e4fd250 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/themes/LightColorFactory.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/themes/LightColorFactory.java @@ -57,6 +57,7 @@ public class LightColorFactory implements IColorFactory, * @see org.eclipse.core.runtime.IExecutableExtension#setInitializationData(org.eclipse.core.runtime.IConfigurationElement, * java.lang.String, java.lang.Object) */ + @Override public void setInitializationData(IConfigurationElement config, String propertyName, Object data) { @@ -148,6 +149,7 @@ public class LightColorFactory implements IColorFactory, * * @see org.eclipse.ui.themes.IColorFactory#createColor() */ + @Override public RGB createColor() { //should have base, otherwise error in the xml if (baseColorName == null || definitionId == null) diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/themes/RGBBrightnessColorFactory.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/themes/RGBBrightnessColorFactory.java index 23821e990f5..d668d5ad061 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/themes/RGBBrightnessColorFactory.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/themes/RGBBrightnessColorFactory.java @@ -30,6 +30,7 @@ public class RGBBrightnessColorFactory implements IColorFactory, IExecutableExte /* (non-Javadoc) * @see org.eclipse.ui.themes.IColorFactory#createColor() */ + @Override public RGB createColor() { RGB rgb = ColorUtil.getColorValue(color); float scale = Float.parseFloat(scaleFactor); @@ -54,6 +55,7 @@ public class RGBBrightnessColorFactory implements IColorFactory, IExecutableExte * @see org.eclipse.core.runtime.IExecutableExtension#setInitializationData(org.eclipse.core.runtime.IConfigurationElement, * java.lang.String, java.lang.Object) */ + @Override public void setInitializationData(IConfigurationElement config, String propertyName, Object data) throws CoreException { if (data instanceof Hashtable) { diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/themes/RGBContrastFactory.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/themes/RGBContrastFactory.java index cc35f36f623..5a10a01b3f6 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/themes/RGBContrastFactory.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/themes/RGBContrastFactory.java @@ -109,7 +109,8 @@ public class RGBContrastFactory implements IColorFactory, IExecutableExtension { return (0.4000 * lp) + (0.4000 * mp) + (0.2000 * sp); } - public RGB createColor() { + @Override + public RGB createColor() { /** * Determine which pair has a higher contrast by selecting * the colour with the furthest distance in lightness. @@ -153,7 +154,8 @@ public class RGBContrastFactory implements IColorFactory, IExecutableExtension { * * @see org.eclipse.core.runtime.IExecutableExtension#setInitializationData(org.eclipse.core.runtime.IConfigurationElement, java.lang.String, java.lang.Object) */ - public void setInitializationData(IConfigurationElement config, + @Override + public void setInitializationData(IConfigurationElement config, String propertyName, Object data) throws CoreException { if (data instanceof Hashtable) { Hashtable table = (Hashtable) data; diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/themes/Theme.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/themes/Theme.java index cc1a985f038..d40eac09c6c 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/themes/Theme.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/themes/Theme.java @@ -109,7 +109,8 @@ public class Theme extends EventManager implements ITheme { /* (non-Javadoc) * @see org.eclipse.jface.util.IPropertyChangeListener#propertyChange(org.eclipse.jface.util.PropertyChangeEvent) */ - public void propertyChange(PropertyChangeEvent event) { + @Override + public void propertyChange(PropertyChangeEvent event) { String[] split = ThemeElementHelper.splitPropertyName( Theme.this, event.getProperty()); String key = split[1]; @@ -205,7 +206,8 @@ public class Theme extends EventManager implements ITheme { /* (non-Javadoc) * @see org.eclipse.jface.util.IPropertyChangeListener#propertyChange(org.eclipse.jface.util.PropertyChangeEvent) */ - public void propertyChange(PropertyChangeEvent event) { + @Override + public void propertyChange(PropertyChangeEvent event) { firePropertyChange(event); } }; @@ -213,7 +215,8 @@ public class Theme extends EventManager implements ITheme { return themeListener; } - public ColorRegistry getColorRegistry() { + @Override + public ColorRegistry getColorRegistry() { if (themeColorRegistry != null) { return themeColorRegistry; } @@ -222,7 +225,8 @@ public class Theme extends EventManager implements ITheme { .getDefaultThemeColorRegistry(); } - public FontRegistry getFontRegistry() { + @Override + public FontRegistry getFontRegistry() { if (themeFontRegistry != null) { return themeFontRegistry; } @@ -231,7 +235,8 @@ public class Theme extends EventManager implements ITheme { .getDefaultThemeFontRegistry(); } - public void dispose() { + @Override + public void dispose() { if (themeColorRegistry != null) { themeColorRegistry.removeListener(themeListener); themeColorRegistry.dispose(); @@ -247,7 +252,8 @@ public class Theme extends EventManager implements ITheme { /* (non-Javadoc) * @see org.eclipse.ui.internal.themes.ITheme#getId() */ - public String getId() { + @Override + public String getId() { return descriptor == null ? IThemeManager.DEFAULT_THEME : descriptor .getId(); } @@ -255,14 +261,16 @@ public class Theme extends EventManager implements ITheme { /* (non-Javadoc) * @see org.eclipse.ui.IWorkbench#addPropertyChangeListener(org.eclipse.jface.util.IPropertyChangeListener) */ - public void addPropertyChangeListener(IPropertyChangeListener listener) { + @Override + public void addPropertyChangeListener(IPropertyChangeListener listener) { addListenerObject(listener); } /* (non-Javadoc) * @see org.eclipse.ui.IWorkbench#removePropertyChangeListener(org.eclipse.jface.util.IPropertyChangeListener) */ - public void removePropertyChangeListener(IPropertyChangeListener listener) { + @Override + public void removePropertyChangeListener(IPropertyChangeListener listener) { removeListenerObject(listener); } @@ -276,7 +284,8 @@ public class Theme extends EventManager implements ITheme { /* (non-Javadoc) * @see org.eclipse.ui.internal.themes.ITheme#getLabel() */ - public String getLabel() { + @Override + public String getLabel() { return descriptor == null ? RESOURCE_BUNDLE .getString("DefaultTheme.label") : descriptor.getName(); //$NON-NLS-1$ } @@ -284,7 +293,8 @@ public class Theme extends EventManager implements ITheme { /* (non-Javadoc) * @see org.eclipse.ui.themes.ITheme#getString(java.lang.String) */ - public String getString(String key) { + @Override + public String getString(String key) { if (dataMap != null) { return (String) dataMap.get(key); } @@ -294,7 +304,8 @@ public class Theme extends EventManager implements ITheme { /* (non-Javadoc) * @see org.eclipse.ui.themes.ITheme#keySet() */ - public Set keySet() { + @Override + public Set keySet() { if (dataMap != null) { return dataMap.keySet(); } @@ -305,7 +316,8 @@ public class Theme extends EventManager implements ITheme { /* (non-Javadoc) * @see org.eclipse.ui.themes.ITheme#getInt(java.lang.String) */ - public int getInt(String key) { + @Override + public int getInt(String key) { String string = getString(key); if (string == null) { return 0; @@ -320,7 +332,8 @@ public class Theme extends EventManager implements ITheme { /* (non-Javadoc) * @see org.eclipse.ui.themes.ITheme#getBoolean(java.lang.String) */ - public boolean getBoolean(String key) { + @Override + public boolean getBoolean(String key) { String string = getString(key); if (string == null) { return false; diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/themes/ThemeDescriptor.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/themes/ThemeDescriptor.java index b75c8302082..33c67af385e 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/themes/ThemeDescriptor.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/themes/ThemeDescriptor.java @@ -92,7 +92,8 @@ public class ThemeDescriptor implements IThemeDescriptor { /* (non-Javadoc) * @see org.eclipse.ui.internal.themes.IThemeDescriptor#getColorOverrides() */ - public ColorDefinition[] getColors() { + @Override + public ColorDefinition[] getColors() { ColorDefinition[] defs = (ColorDefinition[]) colors .toArray(new ColorDefinition[colors.size()]); Arrays.sort(defs, IThemeRegistry.ID_COMPARATOR); @@ -102,14 +103,16 @@ public class ThemeDescriptor implements IThemeDescriptor { /* (non-Javadoc) * @see org.eclipse.ui.internal.themes.IThemeElementDefinition#getDescription() */ - public String getDescription() { + @Override + public String getDescription() { return description; } /* (non-Javadoc) * @see org.eclipse.ui.internal.themes.IThemeDescriptor#getFontOverrides() */ - public FontDefinition[] getFonts() { + @Override + public FontDefinition[] getFonts() { FontDefinition[] defs = (FontDefinition[]) fonts .toArray(new FontDefinition[fonts.size()]); Arrays.sort(defs, IThemeRegistry.ID_COMPARATOR); @@ -119,14 +122,16 @@ public class ThemeDescriptor implements IThemeDescriptor { /* (non-Javadoc) * @see org.eclipse.ui.internal.registry.IThemeDescriptor#getID() */ - public String getId() { + @Override + public String getId() { return id; } /* (non-Javadoc) * @see org.eclipse.ui.internal.registry.IThemeDescriptor#getName() */ - public String getName() { + @Override + public String getName() { if (name == null) return getId(); return name; @@ -155,7 +160,8 @@ public class ThemeDescriptor implements IThemeDescriptor { /* (non-Javadoc) * @see org.eclipse.ui.internal.themes.IThemeDescriptor#getData() */ - public Map getData() { + @Override + public Map getData() { return Collections.unmodifiableMap(dataMap); } } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/themes/ThemeElementCategory.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/themes/ThemeElementCategory.java index b6b8d025221..496629eb0eb 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/themes/ThemeElementCategory.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/themes/ThemeElementCategory.java @@ -72,7 +72,8 @@ public class ThemeElementCategory implements IPluginContribution, /** * @return Returns the description. */ - public String getDescription() { + @Override + public String getDescription() { return description; } @@ -86,28 +87,32 @@ public class ThemeElementCategory implements IPluginContribution, /* (non-Javadoc) * @see org.eclipse.ui.internal.themes.IThemeElementDefinition#getId() */ - public String getId() { + @Override + public String getId() { return id; } /* (non-Javadoc) * @see org.eclipse.ui.internal.themes.IThemeElementDefinition#getLabel() */ - public String getName() { + @Override + public String getName() { return label; } /* (non-Javadoc) * @see org.eclipse.ui.IPluginContribution#getLocalId() */ - public String getLocalId() { + @Override + public String getLocalId() { return id; } /* (non-Javadoc) * @see org.eclipse.ui.IPluginContribution#getPluginId() */ - public String getPluginId() { + @Override + public String getPluginId() { return pluginId; } @@ -121,7 +126,8 @@ public class ThemeElementCategory implements IPluginContribution, /* (non-Javadoc) * @see java.lang.Object#equals(java.lang.Object) */ - public boolean equals(Object obj) { + @Override + public boolean equals(Object obj) { if (obj instanceof ThemeElementCategory) { return getId().equals(((ThemeElementCategory)obj).getId()); } @@ -131,7 +137,8 @@ public class ThemeElementCategory implements IPluginContribution, /* (non-Javadoc) * @see java.lang.Object#hashCode() */ - public int hashCode() { + @Override + public int hashCode() { return id.hashCode(); } } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/themes/ThemeRegistry.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/themes/ThemeRegistry.java index d510a702200..f7a2dfd4c37 100755 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/themes/ThemeRegistry.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/themes/ThemeRegistry.java @@ -76,21 +76,24 @@ public class ThemeRegistry implements IThemeRegistry { /* (non-Javadoc) * @see org.eclipse.ui.internal.themes.IThemeRegistry#findCategory(java.lang.String) */ - public ThemeElementCategory findCategory(String id) { + @Override + public ThemeElementCategory findCategory(String id) { return (ThemeElementCategory) findDescriptor(getCategories(), id); } /* (non-Javadoc) * @see org.eclipse.ui.internal.themes.IThemeRegistry#findColor(java.lang.String) */ - public ColorDefinition findColor(String id) { + @Override + public ColorDefinition findColor(String id) { return (ColorDefinition) findDescriptor(getColors(), id); } /* (non-Javadoc) * @see org.eclipse.ui.internal.registry.IThemeRegistry#find(java.lang.String) */ - public IThemeDescriptor findTheme(String id) { + @Override + public IThemeDescriptor findTheme(String id) { return (IThemeDescriptor) findDescriptor(getThemes(), id); } @@ -131,7 +134,8 @@ public class ThemeRegistry implements IThemeRegistry { /* (non-Javadoc) * @see org.eclipse.ui.internal.registry.IThemeRegistry#getLookNFeels() */ - public IThemeDescriptor[] getThemes() { + @Override + public IThemeDescriptor[] getThemes() { int nSize = themes.size(); IThemeDescriptor[] retArray = new IThemeDescriptor[nSize]; themes.toArray(retArray); @@ -142,7 +146,8 @@ public class ThemeRegistry implements IThemeRegistry { /* (non-Javadoc) * @see org.eclipse.ui.internal.registry.IThemeRegistry#getLookNFeels() */ - public ColorDefinition[] getColors() { + @Override + public ColorDefinition[] getColors() { int nSize = colors.size(); ColorDefinition[] retArray = new ColorDefinition[nSize]; colors.toArray(retArray); @@ -153,7 +158,8 @@ public class ThemeRegistry implements IThemeRegistry { /* (non-Javadoc) * @see org.eclipse.ui.internal.themes.IThemeRegistry#getColorsFor(java.lang.String) */ - public ColorDefinition[] getColorsFor(String themeId) { + @Override + public ColorDefinition[] getColorsFor(String themeId) { ColorDefinition[] defs = getColors(); if (themeId.equals(IThemeManager.DEFAULT_THEME)) { return defs; @@ -167,7 +173,8 @@ public class ThemeRegistry implements IThemeRegistry { /* (non-Javadoc) * @see org.eclipse.ui.internal.themes.IThemeRegistry#getFontsFor(java.lang.String) */ - public FontDefinition[] getFontsFor(String themeId) { + @Override + public FontDefinition[] getFontsFor(String themeId) { FontDefinition[] defs = getFonts(); if (themeId.equals(IThemeManager.DEFAULT_THEME)) { return defs; @@ -231,7 +238,8 @@ public class ThemeRegistry implements IThemeRegistry { /* (non-Javadoc) * @see org.eclipse.ui.internal.themes.IThemeRegistry#getGradients() */ - public FontDefinition[] getFonts() { + @Override + public FontDefinition[] getFonts() { int nSize = fonts.size(); FontDefinition[] retArray = new FontDefinition[nSize]; fonts.toArray(retArray); @@ -242,7 +250,8 @@ public class ThemeRegistry implements IThemeRegistry { /* (non-Javadoc) * @see org.eclipse.ui.internal.themes.IThemeRegistry#findFont(java.lang.String) */ - public FontDefinition findFont(String id) { + @Override + public FontDefinition findFont(String id) { return (FontDefinition) findDescriptor(getFonts(), id); } @@ -259,7 +268,8 @@ public class ThemeRegistry implements IThemeRegistry { /* (non-Javadoc) * @see org.eclipse.ui.internal.themes.IThemeRegistry#getCategories() */ - public ThemeElementCategory[] getCategories() { + @Override + public ThemeElementCategory[] getCategories() { int nSize = categories.size(); ThemeElementCategory[] retArray = new ThemeElementCategory[nSize]; categories.toArray(retArray); @@ -282,7 +292,8 @@ public class ThemeRegistry implements IThemeRegistry { /* (non-Javadoc) * @see org.eclipse.ui.internal.themes.IThemeRegistry#getData() */ - public Map getData() { + @Override + public Map getData() { return Collections.unmodifiableMap(dataMap); } @@ -321,7 +332,8 @@ public class ThemeRegistry implements IThemeRegistry { /* (non-Javadoc) * @see org.eclipse.ui.internal.themes.IThemeRegistry#getPresentationsBindingsFor(org.eclipse.ui.internal.themes.ThemeElementCategory) */ - public Set getPresentationsBindingsFor(ThemeElementCategory category) { + @Override + public Set getPresentationsBindingsFor(ThemeElementCategory category) { return (Set) categoryBindingMap.get(category.getId()); } } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/themes/ThemeRegistryReader.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/themes/ThemeRegistryReader.java index d48e4d02168..c23aaec9b16 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/themes/ThemeRegistryReader.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/themes/ThemeRegistryReader.java @@ -233,7 +233,8 @@ public class ThemeRegistryReader extends RegistryReader { /* (non-Javadoc) * @see org.eclipse.ui.internal.registry.RegistryReader#readElement(org.eclipse.core.runtime.IConfigurationElement) */ - public boolean readElement(IConfigurationElement element) { + @Override + public boolean readElement(IConfigurationElement element) { String elementName = element.getName(); if (themeDescriptor == null && elementName.equals(IWorkbenchRegistryConstants.TAG_COLORDEFINITION)) { ColorDefinition definition = readColor(element); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/themes/ThemesExtension.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/themes/ThemesExtension.java index 9b6881e6f12..6759c80e074 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/themes/ThemesExtension.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/themes/ThemesExtension.java @@ -35,6 +35,7 @@ public class ThemesExtension implements IThemesExtension { * @see org.eclipse.e4.ui.internal.css.swt.definition.IThemesExtension# * addFontDefinition(java.lang.String) */ + @Override public void addFontDefinition(String symbolicName) { FontDefinition definition = new FontDefinition(formatDefaultName(FontDefinition.class, symbolicName), symbolicName, null, null, DEFAULT_CATEGORY_ID, true, @@ -49,6 +50,7 @@ public class ThemesExtension implements IThemesExtension { * @see org.eclipse.e4.ui.internal.css.swt.definition.IThemesExtension# * addColorDefinition(java.lang.String) */ + @Override public void addColorDefinition(String symbolicName) { ColorDefinition definition = new ColorDefinition(formatDefaultName(ColorDefinition.class, symbolicName), symbolicName, null, null, DEFAULT_CATEGORY_ID, true, diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/themes/WorkbenchPreview.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/themes/WorkbenchPreview.java index 1ea3ec2c5d8..a3bdde32940 100755 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/themes/WorkbenchPreview.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/themes/WorkbenchPreview.java @@ -55,7 +55,8 @@ public class WorkbenchPreview implements IThemePreview { private ViewForm viewForm; private IPropertyChangeListener fontAndColorListener = new IPropertyChangeListener() { - public void propertyChange(PropertyChangeEvent event) { + @Override + public void propertyChange(PropertyChangeEvent event) { if (!disposed) { setColorsAndFonts(); //viewMessage.setSize(viewMessage.computeSize(SWT.DEFAULT, SWT.DEFAULT, true)); @@ -67,7 +68,8 @@ public class WorkbenchPreview implements IThemePreview { /* (non-Javadoc) * @see org.eclipse.ui.IPresentationPreview#createControl(org.eclipse.swt.widgets.Composite, org.eclipse.ui.themes.ITheme) */ - public void createControl(Composite parent, ITheme currentTheme) { + @Override + public void createControl(Composite parent, ITheme currentTheme) { this.theme = currentTheme; folder = new CTabFolder(parent, SWT.BORDER); folder.setUnselectedCloseVisible(false); @@ -162,7 +164,8 @@ public class WorkbenchPreview implements IThemePreview { /* (non-Javadoc) * @see org.eclipse.ui.IPresentationPreview#dispose() */ - public void dispose() { + @Override + public void dispose() { disposed = true; theme.removePropertyChangeListener(fontAndColorListener); } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/themes/WorkbenchThemeManager.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/themes/WorkbenchThemeManager.java index 9dae06d2356..e48f158f0a3 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/themes/WorkbenchThemeManager.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/themes/WorkbenchThemeManager.java @@ -82,6 +82,7 @@ public class WorkbenchThemeManager extends EventManager implements if (instance == null) { if (PlatformUI.getWorkbench().getDisplay() != null) { PlatformUI.getWorkbench().getDisplay().syncExec(new Runnable() { + @Override public void run() { getInternalInstance(); } @@ -108,6 +109,7 @@ public class WorkbenchThemeManager extends EventManager implements private IPropertyChangeListener currentThemeListener = new IPropertyChangeListener() { + @Override public void propertyChange(PropertyChangeEvent event) { firePropertyChange(event); if (event.getSource() instanceof FontRegistry) { @@ -164,6 +166,7 @@ public class WorkbenchThemeManager extends EventManager implements final boolean highContrast = Display.getCurrent().getHighContrast(); Display.getCurrent().addListener(SWT.Settings, new Listener() { + @Override public void handleEvent(Event event) { updateThemes(); } @@ -218,6 +221,7 @@ public class WorkbenchThemeManager extends EventManager implements * * @see org.eclipse.ui.themes.IThemeManager#addPropertyChangeListener(org.eclipse.jface.util.IPropertyChangeListener) */ + @Override public void addPropertyChangeListener(IPropertyChangeListener listener) { addListenerObject(listener); } @@ -271,6 +275,7 @@ public class WorkbenchThemeManager extends EventManager implements * * @see org.eclipse.ui.themes.IThemeManager#getCurrentTheme() */ + @Override public ITheme getCurrentTheme() { if (currentTheme == null) { String themeId = PrefUtil.getAPIPreferenceStore().getString( @@ -328,6 +333,7 @@ public class WorkbenchThemeManager extends EventManager implements * * @see org.eclipse.ui.themes.IThemeManager#getTheme(java.lang.String) */ + @Override public ITheme getTheme(String id) { if (id.equals(IThemeManager.DEFAULT_THEME)) { return getTheme((IThemeDescriptor) null); @@ -355,6 +361,7 @@ public class WorkbenchThemeManager extends EventManager implements * * @see org.eclipse.ui.themes.IThemeManager#removePropertyChangeListener(org.eclipse.jface.util.IPropertyChangeListener) */ + @Override public void removePropertyChangeListener(IPropertyChangeListener listener) { removeListenerObject(listener); } @@ -364,6 +371,7 @@ public class WorkbenchThemeManager extends EventManager implements * * @see org.eclipse.ui.themes.IThemeManager#setCurrentTheme(java.lang.String) */ + @Override public void setCurrentTheme(String id) { ITheme oldTheme = currentTheme; if (WorkbenchThemeManager.getInstance().doSetCurrentTheme(id)) { @@ -412,6 +420,7 @@ public class WorkbenchThemeManager extends EventManager implements } public static class WorkbenchThemeChangedHandler implements EventHandler { + @Override public void handleEvent(org.osgi.service.event.Event event) { IStylingEngine engine = getStylingEngine(); ThemeRegistry themeRegistry = getThemeRegistry(); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/tweaklets/AllowGrabFocus.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/tweaklets/AllowGrabFocus.java index 05e449e1513..8bc7ab158c2 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/tweaklets/AllowGrabFocus.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/tweaklets/AllowGrabFocus.java @@ -25,6 +25,7 @@ public class AllowGrabFocus extends GrabFocus { * * @see org.eclipse.ui.internal.tweaklets.GrabFocusManager#allowGrabFocus(org.eclipse.ui.IWorkbenchPart) */ + @Override public boolean grabFocusAllowed(IWorkbenchPart part) { return true; } @@ -34,12 +35,14 @@ public class AllowGrabFocus extends GrabFocus { * * @see org.eclipse.ui.internal.tweaklets.GrabFocusManager#init(Display) */ + @Override public void init(Display display) { } /* (non-Javadoc) * @see org.eclipse.ui.internal.tweaklets.GrabFocusManager#dispose() */ + @Override public void dispose() { } } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/tweaklets/DummyTitlePathUpdater.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/tweaklets/DummyTitlePathUpdater.java index 831410391b9..946c83b23fc 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/tweaklets/DummyTitlePathUpdater.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/tweaklets/DummyTitlePathUpdater.java @@ -19,6 +19,7 @@ import org.eclipse.swt.widgets.Shell; */ public class DummyTitlePathUpdater extends TitlePathUpdater { + @Override public void updateTitlePath(Shell window, String path) { // do nothing } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/tweaklets/ImageAnimationTweak.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/tweaklets/ImageAnimationTweak.java index c610926a662..a9fbe4c17a8 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/tweaklets/ImageAnimationTweak.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/tweaklets/ImageAnimationTweak.java @@ -28,6 +28,7 @@ public class ImageAnimationTweak extends Animations { /* (non-Javadoc) * @see org.eclipse.ui.internal.tweaklets.Animations#getFeedback() */ + @Override public RectangleAnimationFeedbackBase createFeedback(Shell shell) { return new RectangleAnimationImageFeedback(shell, null, null); } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/tweaklets/InterceptContributions.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/tweaklets/InterceptContributions.java index 145b7ced2b9..2e9f70d21d0 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/tweaklets/InterceptContributions.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/tweaklets/InterceptContributions.java @@ -26,9 +26,11 @@ public abstract class InterceptContributions { static { Tweaklets.setDefault(InterceptContributions.KEY, new InterceptContributions() { + @Override public IViewPart tweakView(Object viewContribution) { return (IViewPart) viewContribution; } + @Override public IEditorPart tweakEditor(Object editorContribution) { return (IEditorPart) editorContribution; } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/tweaklets/LegacyAnimations.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/tweaklets/LegacyAnimations.java index 668f053ba0c..52eec2a768a 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/tweaklets/LegacyAnimations.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/tweaklets/LegacyAnimations.java @@ -28,6 +28,7 @@ public class LegacyAnimations extends Animations { /* (non-Javadoc) * @see org.eclipse.ui.internal.tweaklets.Animations#getFeedback() */ + @Override public RectangleAnimationFeedbackBase createFeedback(Shell shell) { return new LegacyAnimationFeedback(shell, null, null); } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/tweaklets/TabBehaviourMRU.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/tweaklets/TabBehaviourMRU.java index 13bf68acfee..d7b81f714fb 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/tweaklets/TabBehaviourMRU.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/tweaklets/TabBehaviourMRU.java @@ -34,10 +34,12 @@ import org.eclipse.ui.internal.registry.EditorDescriptor; */ public class TabBehaviourMRU extends TabBehaviour { + @Override public boolean alwaysShowPinAction() { return false; } + @Override public IEditorReference findReusableEditor(WorkbenchPage page) { boolean reuse = WorkbenchPlugin.getDefault().getPreferenceStore() .getBoolean(IPreferenceConstants.REUSE_EDITORS_BOOLEAN); @@ -114,6 +116,7 @@ public class TabBehaviourMRU extends TabBehaviour { MessageDialog.QUESTION, new String[] { IDialogConstants.YES_LABEL, IDialogConstants.NO_LABEL, WorkbenchMessages.EditorManager_openNewEditorLabel }, 0) { + @Override protected int getShellStyle() { return super.getShellStyle() | SWT.SHEET; } @@ -130,6 +133,7 @@ public class TabBehaviourMRU extends TabBehaviour { return dirtyEditor; } + @Override public IEditorReference reuseInternalEditor(WorkbenchPage page, Object manager, Object editorPresentation, diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/tweaklets/Tweaklets.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/tweaklets/Tweaklets.java index 559656dde56..0c32f3b3336 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/tweaklets/Tweaklets.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/tweaklets/Tweaklets.java @@ -40,6 +40,7 @@ public class Tweaklets { /* (non-Javadoc) * @see java.lang.Object#hashCode() */ + @Override public int hashCode() { final int prime = 31; int result = 1; @@ -51,6 +52,7 @@ public class Tweaklets { /* (non-Javadoc) * @see java.lang.Object#equals(java.lang.Object) */ + @Override public boolean equals(Object obj) { if (this == obj) return true; diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/util/ConfigurationElementMemento.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/util/ConfigurationElementMemento.java index 28190303774..0f46e0a5c4a 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/util/ConfigurationElementMemento.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/util/ConfigurationElementMemento.java @@ -27,15 +27,18 @@ public final class ConfigurationElementMemento implements IMemento { this.configurationElement = configurationElement; } - public IMemento createChild(String type) { + @Override + public IMemento createChild(String type) { return null; } - public IMemento createChild(String type, String id) { + @Override + public IMemento createChild(String type, String id) { return null; } - public IMemento getChild(String type) { + @Override + public IMemento getChild(String type) { IConfigurationElement[] configurationElements = configurationElement .getChildren(type); @@ -46,13 +49,15 @@ public final class ConfigurationElementMemento implements IMemento { return null; } + @Override public IMemento[] getChildren() { IConfigurationElement[] configurationElements = configurationElement.getChildren(); return getMementoArray(configurationElements); } - public IMemento[] getChildren(String type) { + @Override + public IMemento[] getChildren(String type) { IConfigurationElement[] configurationElements = configurationElement .getChildren(type); @@ -74,7 +79,8 @@ public final class ConfigurationElementMemento implements IMemento { return new IMemento[0]; } - public Float getFloat(String key) { + @Override + public Float getFloat(String key) { String string = configurationElement.getAttribute(key); if (string != null) { @@ -87,15 +93,18 @@ public final class ConfigurationElementMemento implements IMemento { return null; } - public String getType() { + @Override + public String getType() { return configurationElement.getName(); } - public String getID() { + @Override + public String getID() { return configurationElement.getAttribute(TAG_ID); } - public Integer getInteger(String key) { + @Override + public Integer getInteger(String key) { String string = configurationElement.getAttribute(key); if (string != null) { @@ -108,11 +117,13 @@ public final class ConfigurationElementMemento implements IMemento { return null; } - public String getString(String key) { + @Override + public String getString(String key) { return configurationElement.getAttribute(key); } - public Boolean getBoolean(String key) { + @Override + public Boolean getBoolean(String key) { String string = configurationElement.getAttribute(key); if (string==null) { return null; @@ -120,30 +131,38 @@ public final class ConfigurationElementMemento implements IMemento { return Boolean.valueOf(string); } - public String getTextData() { + @Override + public String getTextData() { return configurationElement.getValue(); } - public String[] getAttributeKeys() { + @Override + public String[] getAttributeKeys() { return configurationElement.getAttributeNames(); } - public void putFloat(String key, float value) { + @Override + public void putFloat(String key, float value) { } - public void putInteger(String key, int value) { + @Override + public void putInteger(String key, int value) { } - public void putMemento(IMemento memento) { + @Override + public void putMemento(IMemento memento) { } - public void putString(String key, String value) { + @Override + public void putString(String key, String value) { } - public void putBoolean(String key, boolean value) { + @Override + public void putBoolean(String key, boolean value) { } - public void putTextData(String data) { + @Override + public void putTextData(String data) { } public String getContributorName() { diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/util/Descriptors.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/util/Descriptors.java index f1244989df8..189c9f53433 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/util/Descriptors.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/util/Descriptors.java @@ -157,7 +157,8 @@ public final class Descriptors { } private static DisposeListener disposeListener = new DisposeListener() { - public void widgetDisposed(DisposeEvent e) { + @Override + public void widgetDisposed(DisposeEvent e) { doDispose(e.widget); } }; diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/wizards/AbstractExtensionWizardRegistry.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/wizards/AbstractExtensionWizardRegistry.java index aa453af62f5..ead7017c1e9 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/wizards/AbstractExtensionWizardRegistry.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/wizards/AbstractExtensionWizardRegistry.java @@ -42,6 +42,7 @@ public abstract class AbstractExtensionWizardRegistry extends /* (non-Javadoc) * @see org.eclipse.core.runtime.dynamicHelpers.IExtensionChangeHandler#addExtension(org.eclipse.core.runtime.dynamicHelpers.IExtensionTracker, org.eclipse.core.runtime.IExtension) */ + @Override public void addExtension(IExtensionTracker tracker, IExtension extension) { WizardsRegistryReader reader = new WizardsRegistryReader(getPlugin(), getExtensionPoint()); @@ -77,6 +78,7 @@ public abstract class AbstractExtensionWizardRegistry extends /* (non-Javadoc) * @see org.eclipse.ui.internal.wizards.AbstractWizardRegistry#dispose() */ + @Override public void dispose() { super.dispose(); PlatformUI.getWorkbench().getExtensionTracker() @@ -88,6 +90,7 @@ public abstract class AbstractExtensionWizardRegistry extends * * @see org.eclipse.ui.internal.wizards.AbstractWizardRegistry#doInitialize() */ + @Override protected void doInitialize() { PlatformUI.getWorkbench().getExtensionTracker().registerHandler(this, ExtensionTracker.createExtensionPointFilter(getExtensionPointFilter())); @@ -170,6 +173,7 @@ public abstract class AbstractExtensionWizardRegistry extends /* (non-Javadoc) * @see org.eclipse.core.runtime.dynamicHelpers.IExtensionChangeHandler#removeExtension(org.eclipse.core.runtime.IExtension, java.lang.Object[]) */ + @Override public void removeExtension(IExtension extension, Object[] objects) { if (!extension.getExtensionPointUniqueIdentifier().equals( getExtensionPointFilter().getUniqueIdentifier())) { diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/wizards/AbstractWizardRegistry.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/wizards/AbstractWizardRegistry.java index 335d3afb5ff..bcab494edef 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/wizards/AbstractWizardRegistry.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/wizards/AbstractWizardRegistry.java @@ -56,6 +56,7 @@ public abstract class AbstractWizardRegistry implements IWizardRegistry { * * @see org.eclipse.ui.wizards.IWizardRegistry#findCategory(java.lang.String) */ + @Override public IWizardCategory findCategory(String id) { initialize(); return wizardElements.findCategory(id); @@ -66,6 +67,7 @@ public abstract class AbstractWizardRegistry implements IWizardRegistry { * * @see org.eclipse.ui.wizards.IWizardRegistry#findWizard(java.lang.String) */ + @Override public IWizardDescriptor findWizard(String id) { initialize(); return wizardElements.findWizard(id, true); @@ -76,6 +78,7 @@ public abstract class AbstractWizardRegistry implements IWizardRegistry { * * @see org.eclipse.ui.wizards.IWizardRegistry#getPrimaryWizards() */ + @Override public IWizardDescriptor[] getPrimaryWizards() { initialize(); return primaryWizards; @@ -86,6 +89,7 @@ public abstract class AbstractWizardRegistry implements IWizardRegistry { * * @see org.eclipse.ui.wizards.IWizardRegistry#getRootCategory() */ + @Override public IWizardCategory getRootCategory() { initialize(); return wizardElements; diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/wizards/ExportWizardRegistry.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/wizards/ExportWizardRegistry.java index 9874d677ea7..4042a805a70 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/wizards/ExportWizardRegistry.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/wizards/ExportWizardRegistry.java @@ -45,6 +45,7 @@ public class ExportWizardRegistry extends AbstractExtensionWizardRegistry { /* (non-Javadoc) * @see org.eclipse.ui.internal.wizards.AbstractExtensionWizardRegistry#getExtensionPoint() */ + @Override protected String getExtensionPoint() { return IWorkbenchRegistryConstants.PL_EXPORT; } @@ -52,6 +53,7 @@ public class ExportWizardRegistry extends AbstractExtensionWizardRegistry { /* (non-Javadoc) * @see org.eclipse.ui.internal.wizards.AbstractExtensionWizardRegistry#getPlugin() */ + @Override protected String getPlugin() { return PlatformUI.PLUGIN_ID; } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/wizards/ImportWizardRegistry.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/wizards/ImportWizardRegistry.java index 4b6f7f5a883..0b3c3ad07dd 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/wizards/ImportWizardRegistry.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/wizards/ImportWizardRegistry.java @@ -46,6 +46,7 @@ public class ImportWizardRegistry extends AbstractExtensionWizardRegistry { /* (non-Javadoc) * @see org.eclipse.ui.internal.wizards.AbstractExtensionWizardRegistry#getExtensionPoint() */ + @Override protected String getExtensionPoint() { return IWorkbenchRegistryConstants.PL_IMPORT; } @@ -53,6 +54,7 @@ public class ImportWizardRegistry extends AbstractExtensionWizardRegistry { /* (non-Javadoc) * @see org.eclipse.ui.internal.wizards.AbstractExtensionWizardRegistry#getPlugin() */ + @Override protected String getPlugin() { return PlatformUI.PLUGIN_ID; } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/wizards/NewWizardRegistry.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/wizards/NewWizardRegistry.java index 234d4afae80..89e3d0de167 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/wizards/NewWizardRegistry.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/wizards/NewWizardRegistry.java @@ -45,6 +45,7 @@ public final class NewWizardRegistry extends AbstractExtensionWizardRegistry { /* (non-Javadoc) * @see org.eclipse.ui.internal.wizards.AbstractExtensionWizardRegistry#getExtensionPoint() */ + @Override protected String getExtensionPoint() { return IWorkbenchRegistryConstants.PL_NEW; } @@ -52,6 +53,7 @@ public final class NewWizardRegistry extends AbstractExtensionWizardRegistry { /* (non-Javadoc) * @see org.eclipse.ui.internal.wizards.AbstractExtensionWizardRegistry#getPlugin() */ + @Override protected String getPlugin() { return PlatformUI.PLUGIN_ID; } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/wizards/preferences/PreferencesContentProvider.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/wizards/preferences/PreferencesContentProvider.java index 7c020c07855..265d9af0610 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/wizards/preferences/PreferencesContentProvider.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/wizards/preferences/PreferencesContentProvider.java @@ -22,28 +22,34 @@ import org.eclipse.ui.internal.preferences.PreferenceTransferElement; */ public class PreferencesContentProvider implements ITreeContentProvider { + @Override public Object[] getChildren(Object parentElement) { return null; } + @Override public Object getParent(Object element) { return null; } + @Override public boolean hasChildren(Object element) { return false; } + @Override public Object[] getElements(Object inputElement) { if (inputElement instanceof PreferenceTransferElement[]) return (PreferenceTransferElement[]) inputElement; return null; } + @Override public void dispose() { } + @Override public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/wizards/preferences/PreferencesExportWizard.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/wizards/preferences/PreferencesExportWizard.java index d21cd4a86a9..46cd9f03f28 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/wizards/preferences/PreferencesExportWizard.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/wizards/preferences/PreferencesExportWizard.java @@ -63,7 +63,8 @@ public class PreferencesExportWizard extends Wizard implements IExportWizard { /* (non-Javadoc) * Method declared on IWizard. */ - public void addPages() { + @Override + public void addPages() { super.addPages(); mainPage = new WizardPreferencesExportPage1(); addPage(mainPage); @@ -72,7 +73,8 @@ public class PreferencesExportWizard extends Wizard implements IExportWizard { /* (non-Javadoc) * Method declared on IWorkbenchWizard. */ - public void init(IWorkbench workbench, IStructuredSelection currentSelection) { + @Override + public void init(IWorkbench workbench, IStructuredSelection currentSelection) { setWindowTitle(PreferencesMessages.PreferencesExportWizard_export); setDefaultPageImageDescriptor(WorkbenchImages .getImageDescriptor(IWorkbenchGraphicConstants.IMG_WIZBAN_EXPORT_PREF_WIZ)); @@ -82,7 +84,8 @@ public class PreferencesExportWizard extends Wizard implements IExportWizard { /* (non-Javadoc) * Method declared on IWizard. */ - public boolean performFinish() { + @Override + public boolean performFinish() { return mainPage.finish(); } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/wizards/preferences/PreferencesImportWizard.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/wizards/preferences/PreferencesImportWizard.java index 49040345d3d..4a779377ae7 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/wizards/preferences/PreferencesImportWizard.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/wizards/preferences/PreferencesImportWizard.java @@ -65,7 +65,8 @@ public class PreferencesImportWizard extends Wizard implements IImportWizard { /* (non-Javadoc) * Method declared on IWizard. */ - public void addPages() { + @Override + public void addPages() { super.addPages(); mainPage = new WizardPreferencesImportPage1(); addPage(mainPage); @@ -74,7 +75,8 @@ public class PreferencesImportWizard extends Wizard implements IImportWizard { /* (non-Javadoc) * Method declared on IWorkbenchWizard. */ - public void init(IWorkbench workbench, IStructuredSelection currentSelection) { + @Override + public void init(IWorkbench workbench, IStructuredSelection currentSelection) { setWindowTitle(PreferencesMessages.PreferencesImportWizard_import); setDefaultPageImageDescriptor(WorkbenchImages .getImageDescriptor(IWorkbenchGraphicConstants.IMG_WIZBAN_IMPORT_PREF_WIZ)); @@ -84,7 +86,8 @@ public class PreferencesImportWizard extends Wizard implements IImportWizard { /* (non-Javadoc) * Method declared on IWizard. */ - public boolean performFinish() { + @Override + public boolean performFinish() { return mainPage.finish(); } } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/wizards/preferences/WizardPreferencesExportPage1.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/wizards/preferences/WizardPreferencesExportPage1.java index b15b4ae441e..75f82f302e4 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/wizards/preferences/WizardPreferencesExportPage1.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/wizards/preferences/WizardPreferencesExportPage1.java @@ -60,6 +60,7 @@ public class WizardPreferencesExportPage1 extends WizardPreferencesPage { * * @return java.lang.String */ + @Override protected String getDestinationValue() { String idealSuffix = getOutputSuffix(); String destinationText = super.getDestinationValue(); @@ -86,10 +87,12 @@ public class WizardPreferencesExportPage1 extends WizardPreferencesPage { } + @Override protected String getAllButtonText() { return PreferencesMessages.WizardPreferencesExportPage1_all; } + @Override protected String getChooseButtonText() { return PreferencesMessages.WizardPreferencesExportPage1_choose; } @@ -97,6 +100,7 @@ public class WizardPreferencesExportPage1 extends WizardPreferencesPage { /** * @param composite */ + @Override protected void createTransferArea(Composite composite) { createTransfersList(composite); createDestinationGroup(composite); @@ -108,6 +112,7 @@ public class WizardPreferencesExportPage1 extends WizardPreferencesPage { * * @return java.lang.String */ + @Override protected String getDestinationLabel() { return PreferencesMessages.WizardPreferencesExportPage1_file; } @@ -115,6 +120,7 @@ public class WizardPreferencesExportPage1 extends WizardPreferencesPage { /* * return the PreferenceTransgerElements specified */ + @Override protected PreferenceTransferElement[] getTransfers() { PreferenceTransferElement[] elements = super.getTransfers(); PreferenceTransferElement[] returnElements = new PreferenceTransferElement[elements.length]; @@ -146,6 +152,7 @@ public class WizardPreferencesExportPage1 extends WizardPreferencesPage { * @return <code>true</code> if the transfer was succesful, and * <code>false</code> otherwise */ + @Override protected boolean transfer(IPreferenceFilter[] transfers) { File exportFile = new File(getDestinationValue()); if (!ensureTargetIsValid(exportFile)) { @@ -191,10 +198,12 @@ public class WizardPreferencesExportPage1 extends WizardPreferencesPage { return true; } + @Override protected String getFileDialogTitle() { return PreferencesMessages.WizardPreferencesExportPage1_title; } + @Override protected int getFileDialogStyle() { return SWT.SAVE | SWT.SHEET; } @@ -202,6 +211,7 @@ public class WizardPreferencesExportPage1 extends WizardPreferencesPage { /* (non-Javadoc) * @see org.eclipse.ui.internal.wizards.preferences.WizardPreferencesPage#getInvalidDestinationMessage() */ + @Override protected String getInvalidDestinationMessage() { return PreferencesMessages.WizardPreferencesExportPage1_noPrefFile; } @@ -212,6 +222,7 @@ public class WizardPreferencesExportPage1 extends WizardPreferencesPage { * @seeorg.eclipse.ui.internal.wizards.preferences.WizardPreferencesPage# * shouldSaveTransferAll() */ + @Override protected boolean shouldSaveTransferAll() { return true; } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/wizards/preferences/WizardPreferencesImportPage1.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/wizards/preferences/WizardPreferencesImportPage1.java index bb829f2759d..d1d0e790d22 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/wizards/preferences/WizardPreferencesImportPage1.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/wizards/preferences/WizardPreferencesImportPage1.java @@ -54,14 +54,16 @@ public class WizardPreferencesImportPage1 extends WizardPreferencesPage { /* (non-Javadoc) * @see org.eclipse.ui.internal.wizards.preferences.WizardPreferencesPage#getAllButtonText() */ - protected String getAllButtonText() { + @Override + protected String getAllButtonText() { return PreferencesMessages.WizardPreferencesImportPage1_all; } /* (non-Javadoc) * @see org.eclipse.ui.internal.wizards.preferences.WizardPreferencesPage#getChooseButtonText() */ - protected String getChooseButtonText() { + @Override + protected String getChooseButtonText() { return PreferencesMessages.WizardPreferencesImportPage1_choose; } @@ -69,7 +71,8 @@ public class WizardPreferencesImportPage1 extends WizardPreferencesPage { /* (non-Javadoc) * @see org.eclipse.ui.internal.wizards.preferences.WizardPreferencesPage#getTransfers() */ - protected PreferenceTransferElement[] getTransfers() { + @Override + protected PreferenceTransferElement[] getTransfers() { if (validFromFile()) { FileInputStream fis; @@ -130,7 +133,8 @@ public class WizardPreferencesImportPage1 extends WizardPreferencesPage { return fromFile.exists() && !fromFile.isDirectory(); } - protected void setPreferenceTransfers() { + @Override + protected void setPreferenceTransfers() { super.setPreferenceTransfers(); if (validFromFile() @@ -145,7 +149,8 @@ public class WizardPreferencesImportPage1 extends WizardPreferencesPage { /* (non-Javadoc) * @see org.eclipse.ui.internal.wizards.preferences.WizardPreferencesPage#createTransferArea(org.eclipse.swt.widgets.Composite) */ - protected void createTransferArea(Composite composite) { + @Override + protected void createTransferArea(Composite composite) { createDestinationGroup(composite); createTransfersList(composite); } @@ -155,7 +160,8 @@ public class WizardPreferencesImportPage1 extends WizardPreferencesPage { * * @return java.lang.String */ - protected String getDestinationLabel() { + @Override + protected String getDestinationLabel() { return PreferencesMessages.WizardPreferencesImportPage1_file; } @@ -164,7 +170,8 @@ public class WizardPreferencesImportPage1 extends WizardPreferencesPage { * @return <code>true</code> if the transfer was succesful, and * <code>false</code> otherwise */ - protected boolean transfer(IPreferenceFilter[] filters) { + @Override + protected boolean transfer(IPreferenceFilter[] filters) { File importFile = new File(getDestinationValue()); FileInputStream fis = null; try { @@ -212,7 +219,8 @@ public class WizardPreferencesImportPage1 extends WizardPreferencesPage { * @param e * Event */ - public void handleEvent(Event e) { + @Override + public void handleEvent(Event e) { if (e.widget == destinationNameField) { setPreferenceTransfers(); } @@ -223,13 +231,15 @@ public class WizardPreferencesImportPage1 extends WizardPreferencesPage { /* (non-Javadoc) * @see org.eclipse.ui.internal.wizards.preferences.WizardPreferencesPage#getFileDialogTitle() */ - protected String getFileDialogTitle(){ + @Override + protected String getFileDialogTitle(){ return PreferencesMessages.WizardPreferencesImportPage1_title; } /* (non-Javadoc) * @see org.eclipse.ui.internal.wizards.preferences.WizardPreferencesPage#getFileDialogStyle() */ + @Override protected int getFileDialogStyle() { return SWT.OPEN | SWT.SHEET; } @@ -237,6 +247,7 @@ public class WizardPreferencesImportPage1 extends WizardPreferencesPage { /* (non-Javadoc) * @see org.eclipse.ui.internal.wizards.preferences.WizardPreferencesPage#validDestination() */ + @Override protected boolean validDestination() { return super.validDestination() && validFromFile(); } @@ -244,6 +255,7 @@ public class WizardPreferencesImportPage1 extends WizardPreferencesPage { /* (non-Javadoc) * @see org.eclipse.ui.internal.wizards.preferences.WizardPreferencesPage#getInvalidDestinationMessage() */ + @Override protected String getInvalidDestinationMessage() { return PreferencesMessages.WizardPreferencesImportPage1_invalidPrefFile; } @@ -254,6 +266,7 @@ public class WizardPreferencesImportPage1 extends WizardPreferencesPage { * @seeorg.eclipse.ui.internal.wizards.preferences.WizardPreferencesPage# * shouldSaveTransferAll() */ + @Override protected boolean shouldSaveTransferAll() { return false; } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/wizards/preferences/WizardPreferencesPage.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/wizards/preferences/WizardPreferencesPage.java index 0e60a90aa4a..293de9b7834 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/wizards/preferences/WizardPreferencesPage.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/wizards/preferences/WizardPreferencesPage.java @@ -175,6 +175,7 @@ public abstract class WizardPreferencesPage extends WizardPage implements /** * (non-Javadoc) Method declared on IDialogPage. */ + @Override public void createControl(Composite parent) { initializeDialogUnits(parent); Composite composite = new Composite(parent, SWT.NULL); @@ -291,6 +292,7 @@ public abstract class WizardPreferencesPage extends WizardPage implements descText.setLayoutData(descriptionData); transferAllButton.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { if (transferAllButton.getSelection()) { viewer.setAllChecked(false); @@ -302,12 +304,14 @@ public abstract class WizardPreferencesPage extends WizardPage implements viewer.addSelectionChangedListener(new ISelectionChangedListener() { + @Override public void selectionChanged(SelectionChangedEvent event) { updateDescription(); } }); viewer.addCheckStateListener(new ICheckStateListener() { + @Override public void checkStateChanged(CheckStateChangedEvent event) { transferAllButton.setSelection(false); updateEnablement(); @@ -336,6 +340,7 @@ public abstract class WizardPreferencesPage extends WizardPage implements int style = SWT.SINGLE | SWT.H_SCROLL | SWT.V_SCROLL | SWT.BORDER; FilteredTree transfersTree = new FilteredTree(group, style, new PatternFilter(), true) { + @Override protected TreeViewer doCreateTreeViewer(Composite parent, int style) { return new CheckboxTreeViewer(parent, style); } @@ -369,6 +374,7 @@ public abstract class WizardPreferencesPage extends WizardPage implements PreferencesMessages.SelectionDialog_selectLabel, false); SelectionListener listener = new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { viewer.setAllChecked(true); updatePageCompletion(); @@ -382,6 +388,7 @@ public abstract class WizardPreferencesPage extends WizardPage implements PreferencesMessages.SelectionDialog_deselectLabel, false); listener = new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { viewer.setAllChecked(false); updatePageCompletion(); @@ -501,6 +508,7 @@ public abstract class WizardPreferencesPage extends WizardPage implements PreferencesMessages.Question, (Image) null, message, MessageDialog.NONE, new String[] { IDialogConstants.YES_LABEL, IDialogConstants.NO_LABEL }, 0) { + @Override protected int getShellStyle() { return super.getShellStyle() | SWT.SHEET; } @@ -604,11 +612,13 @@ public abstract class WizardPreferencesPage extends WizardPage implements // all nodes of the Instance and Configuration scopes transfers[0] = new IPreferenceFilter() { + @Override public String[] getScopes() { return new String[] { InstanceScope.SCOPE, ConfigurationScope.SCOPE }; } + @Override public Map getMapping(String scope) { return null; } @@ -801,6 +811,7 @@ public abstract class WizardPreferencesPage extends WizardPage implements * @param e * Event */ + @Override public void handleEvent(Event e) { Widget source = e.widget; @@ -942,6 +953,7 @@ public abstract class WizardPreferencesPage extends WizardPage implements * * @see org.eclipse.jface.dialogs.DialogPage#dispose() */ + @Override public void dispose() { super.dispose(); transfers = null; @@ -965,6 +977,7 @@ public abstract class WizardPreferencesPage extends WizardPage implements * @return the user's reply: one of <code>"YES"</code>, <code>"NO"</code>, * <code>"ALL"</code>, or <code>"CANCEL"</code> */ + @Override public String queryOverwrite(String pathString) { Path path = new Path(pathString); @@ -992,6 +1005,7 @@ public abstract class WizardPreferencesPage extends WizardPage implements IDialogConstants.NO_LABEL, IDialogConstants.NO_TO_ALL_LABEL, IDialogConstants.CANCEL_LABEL }, 0) { + @Override protected int getShellStyle() { return super.getShellStyle() | SWT.SHEET; } @@ -1000,6 +1014,7 @@ public abstract class WizardPreferencesPage extends WizardPage implements // run in syncExec because callback is from an operation, // which is probably not running in the UI thread. getControl().getDisplay().syncExec(new Runnable() { + @Override public void run() { dialog.open(); } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/intro/IIntroSite.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/intro/IIntroSite.java index a74a4617f21..0933008c2b6 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/intro/IIntroSite.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/intro/IIntroSite.java @@ -57,7 +57,8 @@ public interface IIntroSite extends IWorkbenchSite { * @deprecated Use IServiceLocator#getService(*) to retrieve * IContextService and IHandlerService instead. */ - public IKeyBindingService getKeyBindingService(); + @Deprecated + public IKeyBindingService getKeyBindingService(); /** * Returns the action bars for this part site. diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/keys/CharacterKey.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/keys/CharacterKey.java index 2f7354b725f..63079dfeb64 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/keys/CharacterKey.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/keys/CharacterKey.java @@ -31,6 +31,7 @@ import org.eclipse.jface.bindings.keys.KeyLookupFactory; * org.eclipse.jface.bindings.keys.KeyLookupFactory * @since 3.0 */ +@Deprecated public final class CharacterKey extends NaturalKey { /** diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/keys/IKeyFormatter.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/keys/IKeyFormatter.java index 4478e277fa8..e0a6496d67f 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/keys/IKeyFormatter.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/keys/IKeyFormatter.java @@ -20,6 +20,7 @@ package org.eclipse.ui.keys; * @deprecated Please use org.eclipse.jface.bindings.keys.IKeyFormatter * @since 3.0 */ +@Deprecated public interface IKeyFormatter { /** diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/keys/Key.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/keys/Key.java index ecee7690d72..e9e0983326f 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/keys/Key.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/keys/Key.java @@ -39,6 +39,7 @@ import org.eclipse.ui.internal.util.Util; * @since 3.0 * @noextend This class is not intended to be subclassed by clients. */ +@Deprecated public abstract class Key implements Comparable { /** @@ -62,6 +63,7 @@ public abstract class Key implements Comparable { /** * @see java.lang.Comparable#compareTo(java.lang.Object) */ + @Override public final int compareTo(final Object object) { return Util.compare(key, ((Key) object).key); } @@ -69,6 +71,7 @@ public abstract class Key implements Comparable { /** * @see java.lang.Object#equals(java.lang.Object) */ + @Override public final boolean equals(final Object object) { if (!(object instanceof Key)) { return false; @@ -80,6 +83,7 @@ public abstract class Key implements Comparable { /** * @see java.lang.Object#hashCode() */ + @Override public final int hashCode() { return Util.hashCode(key); } @@ -91,6 +95,7 @@ public abstract class Key implements Comparable { * be <code>null</code>. * @see java.lang.Object#toString() */ + @Override public final String toString() { final IKeyLookup lookup = KeyLookupFactory.getDefault(); return lookup.formalNameLookup(key); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/keys/KeyFormatterFactory.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/keys/KeyFormatterFactory.java index de1a348ef18..d4c943a5290 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/keys/KeyFormatterFactory.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/keys/KeyFormatterFactory.java @@ -24,6 +24,7 @@ import org.eclipse.ui.internal.keys.FormalKeyFormatter; * @since 3.0 * @see org.eclipse.ui.keys.IKeyFormatter */ +@Deprecated public final class KeyFormatterFactory { private static final IKeyFormatter COMPACT_KEY_FORMATTER = new CompactKeyFormatter(); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/keys/KeySequence.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/keys/KeySequence.java index 83469b551d0..11ebdacf164 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/keys/KeySequence.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/keys/KeySequence.java @@ -46,6 +46,7 @@ import org.eclipse.ui.internal.util.Util; * @deprecated Please use org.eclipse.jface.bindings.keys.KeySequence * @since 3.0 */ +@Deprecated public final class KeySequence implements Comparable { /** @@ -255,7 +256,8 @@ public final class KeySequence implements Comparable { /** * @see java.lang.Object#equals(java.lang.Object) */ - public int compareTo(Object object) { + @Override + public int compareTo(Object object) { KeySequence castedObject = (KeySequence) object; int compareTo = Util.compare(keyStrokes, castedObject.keyStrokes); return compareTo; @@ -284,7 +286,8 @@ public final class KeySequence implements Comparable { /** * @see java.lang.Object#equals(java.lang.Object) */ - public boolean equals(Object object) { + @Override + public boolean equals(Object object) { if (!(object instanceof KeySequence)) { return false; } @@ -316,7 +319,8 @@ public final class KeySequence implements Comparable { /** * @see java.lang.Object#hashCode() */ - public int hashCode() { + @Override + public int hashCode() { if (!hashCodeComputed) { hashCode = HASH_INITIAL; hashCode = hashCode * HASH_FACTOR + keyStrokes.hashCode(); @@ -375,7 +379,8 @@ public final class KeySequence implements Comparable { * Guaranteed not to be <code>null</code>. * @see java.lang.Object#toString() */ - public String toString() { + @Override + public String toString() { return KeyFormatterFactory.getFormalKeyFormatter().format(this); } } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/keys/KeyStroke.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/keys/KeyStroke.java index 23c0f136f6e..37a2720196c 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/keys/KeyStroke.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/keys/KeyStroke.java @@ -50,6 +50,7 @@ import org.eclipse.ui.internal.util.Util; * @see org.eclipse.ui.keys.ModifierKey * @see org.eclipse.ui.keys.NaturalKey */ +@Deprecated public final class KeyStroke implements Comparable { /** @@ -263,7 +264,8 @@ public final class KeyStroke implements Comparable { /** * @see java.lang.Comparable#compareTo(java.lang.Object) */ - public int compareTo(Object object) { + @Override + public int compareTo(Object object) { KeyStroke castedObject = (KeyStroke) object; int compareTo = Util.compare(modifierKeysAsArray, castedObject.modifierKeysAsArray); @@ -278,7 +280,8 @@ public final class KeyStroke implements Comparable { /** * @see java.lang.Object#equals(java.lang.Object) */ - public boolean equals(Object object) { + @Override + public boolean equals(Object object) { if (!(object instanceof KeyStroke)) { return false; } @@ -324,7 +327,8 @@ public final class KeyStroke implements Comparable { /** * @see java.lang.Object#hashCode() */ - public int hashCode() { + @Override + public int hashCode() { if (!hashCodeComputed) { hashCode = HASH_INITIAL; hashCode = hashCode * HASH_FACTOR + modifierKeys.hashCode(); @@ -352,7 +356,8 @@ public final class KeyStroke implements Comparable { * not to be <code>null</code>. * @see java.lang.Object#toString() */ - public String toString() { + @Override + public String toString() { return KeyFormatterFactory.getFormalKeyFormatter().format(this); } } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/keys/ModifierKey.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/keys/ModifierKey.java index 8d38a64d87e..c71eb849d80 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/keys/ModifierKey.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/keys/ModifierKey.java @@ -35,6 +35,7 @@ import org.eclipse.jface.util.Util; * @since 3.0 * @see org.eclipse.ui.keys.NaturalKey */ +@Deprecated public final class ModifierKey extends Key { /** diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/keys/NaturalKey.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/keys/NaturalKey.java index d5896c64284..ff480d46352 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/keys/NaturalKey.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/keys/NaturalKey.java @@ -29,6 +29,7 @@ package org.eclipse.ui.keys; * @since 3.0 * @noextend This class is not intended to be subclassed by clients. */ +@Deprecated public abstract class NaturalKey extends Key { /** diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/keys/ParseException.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/keys/ParseException.java index 7c4205245ee..90631aec952 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/keys/ParseException.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/keys/ParseException.java @@ -24,6 +24,7 @@ package org.eclipse.ui.keys; * @deprecated Please use org.eclipse.jface.bindings.keys.ParseException * @since 3.0 */ +@Deprecated public final class ParseException extends Exception { /** diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/keys/SWTKeySupport.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/keys/SWTKeySupport.java index 5a49fb3a9c3..01f611c5d07 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/keys/SWTKeySupport.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/keys/SWTKeySupport.java @@ -25,6 +25,7 @@ import org.eclipse.ui.internal.keys.NativeKeyFormatter; * @deprecated Please use {@link org.eclipse.jface.bindings.keys.SWTKeySupport} * @since 3.0 */ +@Deprecated public final class SWTKeySupport { /** diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/keys/SpecialKey.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/keys/SpecialKey.java index 396f1ed20d4..89b6cbaff70 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/keys/SpecialKey.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/keys/SpecialKey.java @@ -35,6 +35,7 @@ import org.eclipse.jface.bindings.keys.KeyLookupFactory; * org.eclipse.jface.bindings.keys.KeyLookupFactory * @since 3.0 */ +@Deprecated public final class SpecialKey extends NaturalKey { /** diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/menus/AbstractWorkbenchTrimWidget.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/menus/AbstractWorkbenchTrimWidget.java index 7f82247a23a..eacca62b35b 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/menus/AbstractWorkbenchTrimWidget.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/menus/AbstractWorkbenchTrimWidget.java @@ -44,6 +44,7 @@ public abstract class AbstractWorkbenchTrimWidget extends AbstractTrimWidget imp * * @see org.eclipse.ui.menus.IWorkbenchWidget#init(org.eclipse.ui.IWorkbenchWindow) */ + @Override public void init(IWorkbenchWindow workbenchWindow) { wbWindow = workbenchWindow; } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/menus/CommandContributionItem.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/menus/CommandContributionItem.java index 675bf664655..19c2c5cf797 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/menus/CommandContributionItem.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/menus/CommandContributionItem.java @@ -274,6 +274,7 @@ public class CommandContributionItem extends ContributionItem { * The style of this menu contribution. See the STYLE_* contants. * @deprecated create the {@link CommandContributionItemParameter} */ + @Deprecated public CommandContributionItem(IServiceLocator serviceLocator, String id, String commandId, Map parameters, ImageDescriptor icon, ImageDescriptor disabledIcon, ImageDescriptor hoverIcon, @@ -306,6 +307,7 @@ public class CommandContributionItem extends ContributionItem { private ICommandListener getCommandListener() { if (commandListener == null) { commandListener = new ICommandListener() { + @Override public void commandChanged(CommandEvent commandEvent) { if (commandEvent.isHandledChanged() || commandEvent.isEnabledChanged() @@ -323,6 +325,7 @@ public class CommandContributionItem extends ContributionItem { dropDownMenuOverride = null; } Runnable update = new Runnable() { + @Override public void run() { if (commandEvent.isEnabledChanged() || commandEvent.isHandledChanged()) { @@ -418,6 +421,7 @@ public class CommandContributionItem extends ContributionItem { * org.eclipse.jface.action.ContributionItem#fill(org.eclipse.swt.widgets * .Menu, int) */ + @Override public void fill(Menu parent, int index) { if (command == null) { return; @@ -454,6 +458,7 @@ public class CommandContributionItem extends ContributionItem { /* (non-Javadoc) * @see org.eclipse.jface.action.ContributionItem#fill(org.eclipse.swt.widgets.Composite) */ + @Override public void fill(Composite parent) { if (command == null) { return; @@ -489,6 +494,7 @@ public class CommandContributionItem extends ContributionItem { * org.eclipse.jface.action.ContributionItem#fill(org.eclipse.swt.widgets * .ToolBar, int) */ + @Override public void fill(ToolBar parent, int index) { if (command == null) { return; @@ -521,6 +527,7 @@ public class CommandContributionItem extends ContributionItem { * * @see org.eclipse.jface.action.ContributionItem#update() */ + @Override public void update() { update(null); } @@ -530,6 +537,7 @@ public class CommandContributionItem extends ContributionItem { * * @see org.eclipse.jface.action.ContributionItem#update(java.lang.String) */ + @Override public void update(String id) { if (widget != null) { if (widget instanceof MenuItem) { @@ -705,6 +713,7 @@ public class CommandContributionItem extends ContributionItem { } } + @Override public void setParent(IContributionManager parent) { super.setParent(parent); if (parent == null) @@ -715,30 +724,37 @@ public class CommandContributionItem extends ContributionItem { if (command != null) { UIElement callback = new UIElement(serviceLocator) { + @Override public void setChecked(boolean checked) { CommandContributionItem.this.setChecked(checked); } + @Override public void setDisabledIcon(ImageDescriptor desc) { CommandContributionItem.this.setDisabledIcon(desc); } + @Override public void setHoverIcon(ImageDescriptor desc) { CommandContributionItem.this.setHoverIcon(desc); } + @Override public void setIcon(ImageDescriptor desc) { CommandContributionItem.this.setIcon(desc); } + @Override public void setText(String text) { CommandContributionItem.this.setText(text); } + @Override public void setTooltip(String text) { CommandContributionItem.this.setTooltip(text); } + @Override public void setDropDownId(String id) { dropDownMenuOverride = id; } @@ -776,6 +792,7 @@ public class CommandContributionItem extends ContributionItem { * * @see org.eclipse.jface.action.ContributionItem#dispose() */ + @Override public void dispose() { if (widget != null) { widget.dispose(); @@ -803,6 +820,7 @@ public class CommandContributionItem extends ContributionItem { private Listener getItemListener() { if (menuItemListener == null) { menuItemListener = new Listener() { + @Override public void handleEvent(Event event) { switch (event.type) { case SWT.Dispose: @@ -881,6 +899,7 @@ public class CommandContributionItem extends ContributionItem { workbenchHelpSystem.setHelp(menu, helpContextId); } menuManager.addMenuListener(new IMenuListener2() { + @Override public void menuAboutToShow(IMenuManager manager) { String id = getId(); if (dropDownMenuOverride != null) { @@ -889,8 +908,10 @@ public class CommandContributionItem extends ContributionItem { menuService.populateContributionManager( menuManager, "menu:" + id); //$NON-NLS-1$ } + @Override public void menuAboutToHide(IMenuManager manager) { display.asyncExec(new Runnable() { + @Override public void run() { menuService.releaseContributions(menuManager); menuManager.dispose(); @@ -988,6 +1009,7 @@ public class CommandContributionItem extends ContributionItem { * * @see org.eclipse.jface.action.ContributionItem#isEnabled() */ + @Override public boolean isEnabled() { if (command != null) { command.getCommand().setEnabled(menuService.getCurrentState()); @@ -999,6 +1021,7 @@ public class CommandContributionItem extends ContributionItem { /** * @since 3.4 */ + @Override public boolean isVisible() { if (visibleEnabled) { return super.isVisible() && isEnabled(); @@ -1008,6 +1031,7 @@ public class CommandContributionItem extends ContributionItem { private IBindingManagerListener bindingManagerListener = new IBindingManagerListener() { + @Override public void bindingManagerChanged(BindingManagerEvent event) { if (event.isActiveBindingsChanged() && event.isActiveBindingsChangedFor(getCommand())) { diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/menus/ExtensionContributionFactory.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/menus/ExtensionContributionFactory.java index 44b21706209..63cb1f6be92 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/menus/ExtensionContributionFactory.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/menus/ExtensionContributionFactory.java @@ -53,6 +53,7 @@ public abstract class ExtensionContributionFactory extends * * @see org.eclipse.ui.menus.AbstractContributionFactory#getLocation() */ + @Override public final String getLocation() { return locationURI; } @@ -62,6 +63,7 @@ public abstract class ExtensionContributionFactory extends * * @see org.eclipse.ui.menus.AbstractContributionFactory#getNamespace() */ + @Override public final String getNamespace() { return namespace; } @@ -74,6 +76,7 @@ public abstract class ExtensionContributionFactory extends * @throws CoreException * so that a subclass may throw this */ + @Override public void setInitializationData(IConfigurationElement config, String propertyName, Object data) throws CoreException { locationURI = config diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/menus/WorkbenchWindowControlContribution.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/menus/WorkbenchWindowControlContribution.java index c804d0f0ea5..9b08a1ce30d 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/menus/WorkbenchWindowControlContribution.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/menus/WorkbenchWindowControlContribution.java @@ -65,6 +65,7 @@ public abstract class WorkbenchWindowControlContribution extends InternalControl * @return Returns the workbench window currently hosting * the control. */ + @Override public final IWorkbenchWindow getWorkbenchWindow() { return super.getWorkbenchWindow(); } @@ -74,10 +75,12 @@ public abstract class WorkbenchWindowControlContribution extends InternalControl * control is currently being display on. This allows derivatives * to tailor their created control based on the orientation... */ + @Override public final int getCurSide() { return super.getCurSide(); } + @Override public final int getOrientation() { if (getCurSide() == SWT.LEFT || getCurSide() == SWT.RIGHT) return SWT.VERTICAL; diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/model/AdaptableList.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/model/AdaptableList.java index 9306f8e2928..20b3d1a383b 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/model/AdaptableList.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/model/AdaptableList.java @@ -111,7 +111,8 @@ public class AdaptableList extends WorkbenchAdapter implements IAdaptable { /* (non-Javadoc) * @see IAdaptable#getAdapter */ - public Object getAdapter(Class adapter) { + @Override + public Object getAdapter(Class adapter) { if (adapter == IWorkbenchAdapter.class) { return this; } @@ -121,7 +122,8 @@ public class AdaptableList extends WorkbenchAdapter implements IAdaptable { /* (non-Javadoc) * @see IWorkbenchAdapter */ - public Object[] getChildren(Object o) { + @Override + public Object[] getChildren(Object o) { // @issue suspicious - does not reference parameter return children.toArray(); } @@ -150,7 +152,8 @@ public class AdaptableList extends WorkbenchAdapter implements IAdaptable { /* (non-javadoc) * For debugging purposes only. */ - public String toString() { + @Override + public String toString() { return children.toString(); } } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/model/BaseWorkbenchContentProvider.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/model/BaseWorkbenchContentProvider.java index 6803f266319..bc696de5205 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/model/BaseWorkbenchContentProvider.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/model/BaseWorkbenchContentProvider.java @@ -37,7 +37,8 @@ public class BaseWorkbenchContentProvider implements ITreeContentProvider { /* (non-Javadoc) * Method declared on IContentProvider. */ - public void dispose() { + @Override + public void dispose() { // do nothing } @@ -58,7 +59,8 @@ public class BaseWorkbenchContentProvider implements ITreeContentProvider { /* (non-Javadoc) * Method declared on ITreeContentProvider. */ - public Object[] getChildren(Object element) { + @Override + public Object[] getChildren(Object element) { IWorkbenchAdapter adapter = getAdapter(element); if (adapter != null) { return adapter.getChildren(element); @@ -69,14 +71,16 @@ public class BaseWorkbenchContentProvider implements ITreeContentProvider { /* (non-Javadoc) * Method declared on IStructuredContentProvider. */ - public Object[] getElements(Object element) { + @Override + public Object[] getElements(Object element) { return getChildren(element); } /* (non-Javadoc) * Method declared on ITreeContentProvider. */ - public Object getParent(Object element) { + @Override + public Object getParent(Object element) { IWorkbenchAdapter adapter = getAdapter(element); if (adapter != null) { return adapter.getParent(element); @@ -87,14 +91,16 @@ public class BaseWorkbenchContentProvider implements ITreeContentProvider { /* (non-Javadoc) * Method declared on ITreeContentProvider. */ - public boolean hasChildren(Object element) { + @Override + public boolean hasChildren(Object element) { return getChildren(element).length > 0; } /* (non-Javadoc) * Method declared on IContentProvider. */ - public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { + @Override + public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { // do nothing } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/model/ContributionComparator.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/model/ContributionComparator.java index 07a7b795162..ef787601425 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/model/ContributionComparator.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/model/ContributionComparator.java @@ -39,6 +39,7 @@ public class ContributionComparator extends ViewerComparator implements * This implementation of {@link Comparator#compare(Object, Object)} does a * blind cast on each element to {@link IComparableContribution}. */ + @Override public int compare(Object o1, Object o2) { IComparableContribution c1 = null, c2 = null; @@ -128,6 +129,7 @@ public class ContributionComparator extends ViewerComparator implements * @see org.eclipse.jface.viewers.ViewerComparator#compare(org.eclipse.jface.viewers.Viewer, * java.lang.Object, java.lang.Object) */ + @Override public int compare(Viewer viewer, Object e1, Object e2) { return compare(e1, e2); } @@ -156,6 +158,7 @@ public class ContributionComparator extends ViewerComparator implements * * @see org.eclipse.jface.viewers.ViewerComparator#category(java.lang.Object) */ + @Override public int category(Object element) { return category((IComparableContribution) element); } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/model/IComparableContribution.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/model/IComparableContribution.java index 8a05670ffe3..d685f641a82 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/model/IComparableContribution.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/model/IComparableContribution.java @@ -53,6 +53,7 @@ public interface IComparableContribution extends IAdaptable { * provided by the platform will provide this adapter.</dd> * </dl> */ + @Override public Object getAdapter(Class adapter); } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/model/PerspectiveLabelProvider.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/model/PerspectiveLabelProvider.java index 02b75098f8d..da354be4fb9 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/model/PerspectiveLabelProvider.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/model/PerspectiveLabelProvider.java @@ -70,7 +70,8 @@ public final class PerspectiveLabelProvider extends LabelProvider implements /* (non-Javadoc) * @see org.eclipse.jface.viewers.ILabelProvider */ - public final Image getImage(Object element) { + @Override + public final Image getImage(Object element) { if (element instanceof IPerspectiveDescriptor) { IPerspectiveDescriptor desc = (IPerspectiveDescriptor) element; ImageDescriptor imageDescriptor = desc.getImageDescriptor(); @@ -91,7 +92,8 @@ public final class PerspectiveLabelProvider extends LabelProvider implements /* (non-Javadoc) * @see org.eclipse.jface.viewers.ILabelProvider */ - public final void dispose() { + @Override + public final void dispose() { for (Iterator i = imageCache.values().iterator(); i.hasNext();) { ((Image) i.next()).dispose(); } @@ -101,7 +103,8 @@ public final class PerspectiveLabelProvider extends LabelProvider implements /* (non-Javadoc) * @see org.eclipse.jface.viewers.ILabelProvider */ - public final String getText(Object element) { + @Override + public final String getText(Object element) { if (element instanceof IPerspectiveDescriptor) { IPerspectiveDescriptor desc = (IPerspectiveDescriptor) element; String label = desc.getLabel(); @@ -120,14 +123,16 @@ public final class PerspectiveLabelProvider extends LabelProvider implements /** * @see ITableLabelProvider#getColumnImage */ - public final Image getColumnImage(Object element, int columnIndex) { + @Override + public final Image getColumnImage(Object element, int columnIndex) { return getImage(element); } /** * @see ITableLabelProvider#getColumnText */ - public final String getColumnText(Object element, int columnIndex) { + @Override + public final String getColumnText(Object element, int columnIndex) { return getText(element); } } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/model/WorkbenchAdapter.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/model/WorkbenchAdapter.java index e83e50b5f35..301f05095e2 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/model/WorkbenchAdapter.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/model/WorkbenchAdapter.java @@ -33,7 +33,8 @@ public abstract class WorkbenchAdapter implements IWorkbenchAdapter, * The default implementation of this <code>IWorkbenchAdapter</code> method * returns the empty list. Subclasses may override. */ - public Object[] getChildren(Object object) { + @Override + public Object[] getChildren(Object object) { return NO_CHILDREN; } @@ -41,7 +42,8 @@ public abstract class WorkbenchAdapter implements IWorkbenchAdapter, * The default implementation of this <code>IWorkbenchAdapter</code> method * returns <code>null</code>. Subclasses may override. */ - public ImageDescriptor getImageDescriptor(Object object) { + @Override + public ImageDescriptor getImageDescriptor(Object object) { return null; } @@ -50,7 +52,8 @@ public abstract class WorkbenchAdapter implements IWorkbenchAdapter, * returns the empty string if the object is <code>null</code>, and * the object's <code>toString</code> otherwise. Subclasses may override. */ - public String getLabel(Object object) { + @Override + public String getLabel(Object object) { return object == null ? "" : object.toString(); //$NON-NLS-1$ } @@ -58,7 +61,8 @@ public abstract class WorkbenchAdapter implements IWorkbenchAdapter, * The default implementation of this <code>IWorkbenchAdapter</code> method * returns <code>null</code>. Subclasses may override. */ - public Object getParent(Object object) { + @Override + public Object getParent(Object object) { return null; } @@ -66,7 +70,8 @@ public abstract class WorkbenchAdapter implements IWorkbenchAdapter, * The default implementation of this <code>IWorkbenchAdapter2</code> method * returns <code>null</code>. Subclasses may override. */ - public RGB getBackground(Object element) { + @Override + public RGB getBackground(Object element) { return null; } @@ -74,7 +79,8 @@ public abstract class WorkbenchAdapter implements IWorkbenchAdapter, * The default implementation of this <code>IWorkbenchAdapter2</code> method * returns <code>null</code>. Subclasses may override. */ - public RGB getForeground(Object element) { + @Override + public RGB getForeground(Object element) { return null; } @@ -82,7 +88,8 @@ public abstract class WorkbenchAdapter implements IWorkbenchAdapter, * The default implementation of this <code>IWorkbenchAdapter2</code> method * returns <code>null</code>. Subclasses may override. */ - public FontData getFont(Object element) { + @Override + public FontData getFont(Object element) { return null; } @@ -96,6 +103,7 @@ public abstract class WorkbenchAdapter implements IWorkbenchAdapter, * * @since 3.7 */ + @Override public StyledString getStyledText(Object object) { return new StyledString(getLabel(object)); } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/model/WorkbenchLabelProvider.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/model/WorkbenchLabelProvider.java index 803968809a8..7af7b2b02cf 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/model/WorkbenchLabelProvider.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/model/WorkbenchLabelProvider.java @@ -66,6 +66,7 @@ public class WorkbenchLabelProvider extends LabelProvider implements * associations in the registry. */ private IPropertyListener editorRegistryListener = new IPropertyListener() { + @Override public void propertyChanged(Object source, int propId) { if (propId == IEditorRegistry.PROP_CONTENTS) { fireLabelProviderChanged(new LabelProviderChangedEvent(WorkbenchLabelProvider.this)); @@ -117,7 +118,8 @@ public class WorkbenchLabelProvider extends LabelProvider implements /* (non-Javadoc) * Method declared on ILabelProvider */ - public void dispose() { + @Override + public void dispose() { PlatformUI.getWorkbench().getEditorRegistry().removePropertyListener(editorRegistryListener); if (resourceManager != null) resourceManager.dispose(); @@ -177,7 +179,8 @@ public class WorkbenchLabelProvider extends LabelProvider implements /* (non-Javadoc) * Method declared on ILabelProvider */ - public final Image getImage(Object element) { + @Override + public final Image getImage(Object element) { //obtain the base image by querying the element IWorkbenchAdapter adapter = getAdapter(element); if (adapter == null) { @@ -205,7 +208,8 @@ public class WorkbenchLabelProvider extends LabelProvider implements * * @since 3.7 */ - public StyledString getStyledText(Object element) { + @Override + public StyledString getStyledText(Object element) { IWorkbenchAdapter3 adapter = getAdapter3(element); if (adapter == null) { // If adapter class doesn't implement IWorkbenchAdapter3 than use @@ -241,7 +245,8 @@ public class WorkbenchLabelProvider extends LabelProvider implements /* (non-Javadoc) * Method declared on ILabelProvider */ - public final String getText(Object element) { + @Override + public final String getText(Object element) { //query the element for its label IWorkbenchAdapter adapter = getAdapter(element); if (adapter == null) { @@ -256,21 +261,24 @@ public class WorkbenchLabelProvider extends LabelProvider implements /* (non-Javadoc) * @see org.eclipse.jface.viewers.IColorProvider#getForeground(java.lang.Object) */ - public Color getForeground(Object element) { + @Override + public Color getForeground(Object element) { return getColor(element, true); } /* (non-Javadoc) * @see org.eclipse.jface.viewers.IColorProvider#getBackground(java.lang.Object) */ - public Color getBackground(Object element) { + @Override + public Color getBackground(Object element) { return getColor(element, false); } /* (non-Javadoc) * @see org.eclipse.jface.viewers.IFontProvider#getFont(java.lang.Object) */ - public Font getFont(Object element) { + @Override + public Font getFont(Object element) { IWorkbenchAdapter2 adapter = getAdapter2(element); if (adapter == null) { return null; diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/model/WorkbenchPartLabelProvider.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/model/WorkbenchPartLabelProvider.java index 82f78c80313..ee8a61cc1d4 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/model/WorkbenchPartLabelProvider.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/model/WorkbenchPartLabelProvider.java @@ -50,7 +50,8 @@ public final class WorkbenchPartLabelProvider extends LabelProvider implements /* (non-Javadoc) * @see org.eclipse.jface.viewers.ILabelProvider */ - public final Image getImage(Object element) { + @Override + public final Image getImage(Object element) { if (element instanceof IWorkbenchPart) { return ((IWorkbenchPart) element).getTitleImage(); } @@ -79,7 +80,8 @@ public final class WorkbenchPartLabelProvider extends LabelProvider implements /* (non-Javadoc) * @see org.eclipse.jface.viewers.ILabelProvider */ - public final String getText(Object element) { + @Override + public final String getText(Object element) { if (element instanceof IWorkbenchPart) { IWorkbenchPart part = (IWorkbenchPart) element; String path = part.getTitleToolTip(); @@ -103,14 +105,16 @@ public final class WorkbenchPartLabelProvider extends LabelProvider implements /** * @see ITableLabelProvider#getColumnImage */ - public final Image getColumnImage(Object element, int columnIndex) { + @Override + public final Image getColumnImage(Object element, int columnIndex) { return getImage(element); } /** * @see ITableLabelProvider#getColumnText */ - public final String getColumnText(Object element, int columnIndex) { + @Override + public final String getColumnText(Object element, int columnIndex) { return getText(element); } @@ -119,7 +123,8 @@ public final class WorkbenchPartLabelProvider extends LabelProvider implements * * @since 3.2 */ - public void dispose() { + @Override + public void dispose() { resourceManager.dispose(); super.dispose(); } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/model/WorkbenchViewerComparator.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/model/WorkbenchViewerComparator.java index cf2f25f1c4b..c7f5bb6e491 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/model/WorkbenchViewerComparator.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/model/WorkbenchViewerComparator.java @@ -45,7 +45,8 @@ public class WorkbenchViewerComparator extends ViewerComparator { /* (non-Javadoc) * Method declared on ViewerComparator. */ - public boolean isSorterProperty(Object element, String propertyId) { + @Override + public boolean isSorterProperty(Object element, String propertyId) { return propertyId.equals(IBasicPropertyConstants.P_TEXT); } } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/model/WorkbenchViewerSorter.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/model/WorkbenchViewerSorter.java index a2b94d97533..addcbf5d5d3 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/model/WorkbenchViewerSorter.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/model/WorkbenchViewerSorter.java @@ -23,6 +23,7 @@ import org.eclipse.jface.viewers.ViewerSorter; * @see IWorkbenchAdapter * @deprecated as of 3.3, use {@link WorkbenchViewerComparator} instead */ +@Deprecated public class WorkbenchViewerSorter extends ViewerSorter { /** @@ -44,7 +45,8 @@ public class WorkbenchViewerSorter extends ViewerSorter { /* (non-Javadoc) * Method declared on ViewerSorter. */ - public boolean isSorterProperty(Object element, String propertyId) { + @Override + public boolean isSorterProperty(Object element, String propertyId) { return propertyId.equals(IBasicPropertyConstants.P_TEXT); } } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/operations/LinearUndoViolationUserApprover.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/operations/LinearUndoViolationUserApprover.java index 89436e3f32d..45da2c26aa1 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/operations/LinearUndoViolationUserApprover.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/operations/LinearUndoViolationUserApprover.java @@ -69,6 +69,7 @@ public final class LinearUndoViolationUserApprover extends * org.eclipse.core.commands.operations.IOperationHistory, * org.eclipse.core.runtime.IAdaptable) */ + @Override protected IStatus allowLinearRedoViolation(IUndoableOperation operation, IUndoContext context, IOperationHistory history, IAdaptable uiInfo) { @@ -81,6 +82,7 @@ public final class LinearUndoViolationUserApprover extends getTitle(part), operation.getLabel()); final boolean [] proceed = new boolean[1]; PlatformUI.getWorkbench().getDisplay().syncExec(new Runnable() { + @Override public void run() { // Show a dialog. part.setFocus(); @@ -120,6 +122,7 @@ public final class LinearUndoViolationUserApprover extends * org.eclipse.core.commands.operations.IOperationHistory, * org.eclipse.core.runtime.IAdaptable) */ + @Override protected IStatus allowLinearUndoViolation(IUndoableOperation operation, IUndoContext context, IOperationHistory history, IAdaptable uiInfo) { @@ -132,6 +135,7 @@ public final class LinearUndoViolationUserApprover extends getTitle(part), operation.getLabel()); final boolean [] proceed = new boolean[1]; PlatformUI.getWorkbench().getDisplay().syncExec(new Runnable() { + @Override public void run() { // Show a dialog. part.setFocus(); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/operations/NonLocalUndoUserApprover.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/operations/NonLocalUndoUserApprover.java index 78ac5b61d89..bb1af0c4f6f 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/operations/NonLocalUndoUserApprover.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/operations/NonLocalUndoUserApprover.java @@ -107,6 +107,7 @@ public final class NonLocalUndoUserApprover implements IOperationApprover { * org.eclipse.core.commands.operations.IOperationHistory, * org.eclipse.core.runtime.IAdaptable) */ + @Override public IStatus proceedRedoing(IUndoableOperation operation, IOperationHistory history, IAdaptable uiInfo) { @@ -128,6 +129,7 @@ public final class NonLocalUndoUserApprover implements IOperationApprover { * org.eclipse.core.commands.operations.IOperationHistory, * org.eclipse.core.runtime.IAdaptable) */ + @Override public IStatus proceedUndoing(IUndoableOperation operation, IOperationHistory history, IAdaptable uiInfo) { @@ -210,6 +212,7 @@ public final class NonLocalUndoUserApprover implements IOperationApprover { // a background thread. final int[] answer = new int[1]; PlatformUI.getWorkbench().getDisplay().syncExec(new Runnable() { + @Override public void run() { MessageDialog dialog = new MessageDialog(part.getSite().getShell(), title, null, message, MessageDialog.QUESTION, new String[] { IDialogConstants.OK_LABEL, diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/operations/OperationHistoryActionHandler.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/operations/OperationHistoryActionHandler.java index cba7c869f49..8d657c9254f 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/operations/OperationHistoryActionHandler.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/operations/OperationHistoryActionHandler.java @@ -80,18 +80,21 @@ public abstract class OperationHistoryActionHandler extends Action implements /** * @see IPartListener#partActivated(IWorkbenchPart) */ + @Override public void partActivated(IWorkbenchPart part) { } /** * @see IPartListener#partBroughtToTop(IWorkbenchPart) */ + @Override public void partBroughtToTop(IWorkbenchPart part) { } /** * @see IPartListener#partClosed(IWorkbenchPart) */ + @Override public void partClosed(IWorkbenchPart part) { if (site != null && part.equals(site.getPart())) { dispose(); @@ -107,18 +110,21 @@ public abstract class OperationHistoryActionHandler extends Action implements /** * @see IPartListener#partDeactivated(IWorkbenchPart) */ + @Override public void partDeactivated(IWorkbenchPart part) { } /** * @see IPartListener#partOpened(IWorkbenchPart) */ + @Override public void partOpened(IWorkbenchPart part) { } } private class HistoryListener implements IOperationHistoryListener { + @Override public void historyNotification(final OperationHistoryEvent event) { IWorkbenchWindow workbenchWindow = getWorkbenchWindow(); if (workbenchWindow == null) @@ -135,6 +141,7 @@ public abstract class OperationHistoryActionHandler extends Action implements case OperationHistoryEvent.REDONE: if (event.getOperation().hasContext(undoContext)) { display.asyncExec(new Runnable() { + @Override public void run() { update(); } @@ -144,6 +151,7 @@ public abstract class OperationHistoryActionHandler extends Action implements case OperationHistoryEvent.OPERATION_NOT_OK: if (event.getOperation().hasContext(undoContext)) { display.asyncExec(new Runnable() { + @Override public void run() { if (pruning) { IStatus status = event.getStatus(); @@ -169,6 +177,7 @@ public abstract class OperationHistoryActionHandler extends Action implements case OperationHistoryEvent.OPERATION_CHANGED: if (event.getOperation() == getOperation()) { display.asyncExec(new Runnable() { + @Override public void run() { update(); } @@ -217,6 +226,7 @@ public abstract class OperationHistoryActionHandler extends Action implements * * @see org.eclipse.ui.actions.ActionFactory.IWorkbenchAction#dispose() */ + @Override public void dispose() { IOperationHistory history = getHistory(); @@ -290,6 +300,7 @@ public abstract class OperationHistoryActionHandler extends Action implements * * @see org.eclipse.ui.actions.ActionFactory.IWorkbenchAction#run() */ + @Override public final void run() { if (isInvalid()) { return; @@ -300,6 +311,7 @@ public abstract class OperationHistoryActionHandler extends Action implements getWorkbenchWindow().getWorkbench().getProgressService() .getLongOperationTime()); IRunnableWithProgress runnable = new IRunnableWithProgress() { + @Override public void run(IProgressMonitor pm) throws InvocationTargetException { try { @@ -344,6 +356,7 @@ public abstract class OperationHistoryActionHandler extends Action implements * * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class) */ + @Override public Object getAdapter(Class adapter) { if (adapter.equals(IUndoContext.class)) { return undoContext; diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/operations/RedoActionHandler.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/operations/RedoActionHandler.java index 5f7b06e8dab..4df6b72d4be 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/operations/RedoActionHandler.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/operations/RedoActionHandler.java @@ -50,35 +50,43 @@ public final class RedoActionHandler extends OperationHistoryActionHandler { setActionDefinitionId(IWorkbenchCommandConstants.EDIT_REDO); } + @Override void flush() { getHistory().dispose(getUndoContext(), false, true, false); } + @Override String getCommandString() { return WorkbenchMessages.Operations_redoCommand; } + @Override String getTooltipString() { return WorkbenchMessages.Operations_redoTooltipCommand; } + @Override String getSimpleCommandString() { return WorkbenchMessages.Workbench_redo; } + @Override String getSimpleTooltipString() { return WorkbenchMessages.Workbench_redoToolTip; } + @Override IUndoableOperation getOperation() { return getHistory().getRedoOperation(getUndoContext()); } + @Override IStatus runCommand(IProgressMonitor pm) throws ExecutionException { return getHistory().redo(getUndoContext(), pm, this); } + @Override boolean shouldBeEnabled() { return getHistory().canRedo(getUndoContext()); } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/operations/UndoActionHandler.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/operations/UndoActionHandler.java index 1a2ac4d0302..82253c29001 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/operations/UndoActionHandler.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/operations/UndoActionHandler.java @@ -51,35 +51,43 @@ public final class UndoActionHandler extends OperationHistoryActionHandler { setActionDefinitionId(IWorkbenchCommandConstants.EDIT_UNDO); } + @Override void flush() { getHistory().dispose(getUndoContext(), true, false, false); } + @Override String getCommandString() { return WorkbenchMessages.Operations_undoCommand; } + @Override String getTooltipString() { return WorkbenchMessages.Operations_undoTooltipCommand; } + @Override String getSimpleCommandString() { return WorkbenchMessages.Workbench_undo; } + @Override String getSimpleTooltipString() { return WorkbenchMessages.Workbench_undoToolTip; } + @Override IUndoableOperation getOperation() { return getHistory().getUndoOperation(getUndoContext()); } + @Override IStatus runCommand(IProgressMonitor pm) throws ExecutionException { return getHistory().undo(getUndoContext(), pm, this); } + @Override boolean shouldBeEnabled() { return getHistory().canUndo(getUndoContext()); } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/operations/UndoRedoActionGroup.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/operations/UndoRedoActionGroup.java index 09f6f9d8ff4..d31a60dee0a 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/operations/UndoRedoActionGroup.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/operations/UndoRedoActionGroup.java @@ -64,6 +64,7 @@ public final class UndoRedoActionGroup extends ActionGroup { * * @see org.eclipse.ui.actions.ActionGroup#fillActionBars(org.eclipse.ui.IActionBars) */ + @Override public void fillActionBars(IActionBars actionBars) { super.fillActionBars(actionBars); if (undoActionHandler != null) { diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/part/AbstractMultiEditor.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/part/AbstractMultiEditor.java index 3b54c1c70ca..015565ea26a 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/part/AbstractMultiEditor.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/part/AbstractMultiEditor.java @@ -70,7 +70,8 @@ public abstract class AbstractMultiEditor extends EditorPart { /* * @see IEditorPart#doSave(IProgressMonitor) */ - public void doSave(IProgressMonitor monitor) { + @Override + public void doSave(IProgressMonitor monitor) { for (int i = 0; i < innerEditors.length; i++) { IEditorPart e = innerEditors[i]; e.doSave(monitor); @@ -80,14 +81,16 @@ public abstract class AbstractMultiEditor extends EditorPart { /* * @see IEditorPart#doSaveAs() */ - public void doSaveAs() { + @Override + public void doSaveAs() { //no-op } /* * @see IEditorPart#init(IEditorSite, IEditorInput) */ - public void init(IEditorSite site, IEditorInput input) + @Override + public void init(IEditorSite site, IEditorInput input) throws PartInitException { init(site, (MultiEditorInput) input); } @@ -111,7 +114,8 @@ public abstract class AbstractMultiEditor extends EditorPart { /* * @see IEditorPart#isDirty() */ - public boolean isDirty() { + @Override + public boolean isDirty() { for (int i = 0; i < innerEditors.length; i++) { IEditorPart e = innerEditors[i]; if (e.isDirty()) { @@ -124,14 +128,16 @@ public abstract class AbstractMultiEditor extends EditorPart { /* * @see IEditorPart#isSaveAsAllowed() */ - public boolean isSaveAsAllowed() { + @Override + public boolean isSaveAsAllowed() { return false; } /* * @see IWorkbenchPart#setFocus() */ - public void setFocus() { + @Override + public void setFocus() { innerEditors[activeEditorIndex].setFocus(); } @@ -166,6 +172,7 @@ public abstract class AbstractMultiEditor extends EditorPart { for (int i = 0; i < children.length; i++) { children[i].addPropertyListener( new IPropertyListener() { + @Override public void propertyChanged(Object source, int propId) { handlePropertyChange(propId); } @@ -216,12 +223,15 @@ public abstract class AbstractMultiEditor extends EditorPart { */ private void setupEvents() { propagationListener = new IPartListener2() { + @Override public void partActivated(IWorkbenchPartReference partRef) { } + @Override public void partBroughtToTop(IWorkbenchPartReference partRef) { } + @Override public void partClosed(IWorkbenchPartReference partRef) { IWorkbenchPart part = partRef.getPart(false); if (part == AbstractMultiEditor.this && innerEditors != null) { @@ -230,9 +240,11 @@ public abstract class AbstractMultiEditor extends EditorPart { } } + @Override public void partDeactivated(IWorkbenchPartReference partRef) { } + @Override public void partOpened(IWorkbenchPartReference partRef) { IWorkbenchPart part = partRef.getPart(false); if (part == AbstractMultiEditor.this && innerEditors != null) { @@ -249,12 +261,15 @@ public abstract class AbstractMultiEditor extends EditorPart { } } + @Override public void partHidden(IWorkbenchPartReference partRef) { } + @Override public void partVisible(IWorkbenchPartReference partRef) { } + @Override public void partInputChanged(IWorkbenchPartReference partRef) { } }; @@ -266,6 +281,7 @@ public abstract class AbstractMultiEditor extends EditorPart { * * @since 3.2 */ + @Override public void dispose() { getSite().getPage().removePartListener(propagationListener); super.dispose(); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/part/CellEditorActionHandler.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/part/CellEditorActionHandler.java index 4d4586e66c5..fa8dd939b3c 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/part/CellEditorActionHandler.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/part/CellEditorActionHandler.java @@ -112,7 +112,8 @@ public class CellEditorActionHandler { private HashMap controlToEditor = new HashMap(); private class ControlListener implements Listener { - public void handleEvent(Event event) { + @Override + public void handleEvent(Event event) { switch (event.type) { case SWT.Activate: activeEditor = (CellEditor) controlToEditor.get(event.widget); @@ -143,7 +144,8 @@ public class CellEditorActionHandler { this.actionHandler = actionHandler; } - public void propertyChange(PropertyChangeEvent event) { + @Override + public void propertyChange(PropertyChangeEvent event) { if (activeEditor != null) { return; } @@ -169,7 +171,8 @@ public class CellEditorActionHandler { } private class CellChangeListener implements IPropertyChangeListener { - public void propertyChange(PropertyChangeEvent event) { + @Override + public void propertyChange(PropertyChangeEvent event) { if (activeEditor == null) { return; } @@ -216,7 +219,8 @@ public class CellEditorActionHandler { PlatformUI.getWorkbench().getHelpSystem().setHelp(this, IWorkbenchHelpContextIds.CELL_CUT_ACTION); } - public void runWithEvent(Event event) { + @Override + public void runWithEvent(Event event) { if (activeEditor != null) { activeEditor.performCut(); return; @@ -247,7 +251,8 @@ public class CellEditorActionHandler { PlatformUI.getWorkbench().getHelpSystem().setHelp(this, IWorkbenchHelpContextIds.CELL_COPY_ACTION); } - public void runWithEvent(Event event) { + @Override + public void runWithEvent(Event event) { if (activeEditor != null) { activeEditor.performCopy(); return; @@ -278,7 +283,8 @@ public class CellEditorActionHandler { PlatformUI.getWorkbench().getHelpSystem().setHelp(this, IWorkbenchHelpContextIds.CELL_PASTE_ACTION); } - public void runWithEvent(Event event) { + @Override + public void runWithEvent(Event event) { if (activeEditor != null) { activeEditor.performPaste(); return; @@ -309,7 +315,8 @@ public class CellEditorActionHandler { PlatformUI.getWorkbench().getHelpSystem().setHelp(this, IWorkbenchHelpContextIds.CELL_DELETE_ACTION); } - public void runWithEvent(Event event) { + @Override + public void runWithEvent(Event event) { if (activeEditor != null) { activeEditor.performDelete(); return; @@ -340,7 +347,8 @@ public class CellEditorActionHandler { PlatformUI.getWorkbench().getHelpSystem().setHelp(this, IWorkbenchHelpContextIds.CELL_SELECT_ALL_ACTION); } - public void runWithEvent(Event event) { + @Override + public void runWithEvent(Event event) { if (activeEditor != null) { activeEditor.performSelectAll(); return; @@ -371,7 +379,8 @@ public class CellEditorActionHandler { PlatformUI.getWorkbench().getHelpSystem().setHelp(this, IWorkbenchHelpContextIds.CELL_FIND_ACTION); } - public void runWithEvent(Event event) { + @Override + public void runWithEvent(Event event) { if (activeEditor != null) { activeEditor.performFind(); return; @@ -402,7 +411,8 @@ public class CellEditorActionHandler { PlatformUI.getWorkbench().getHelpSystem().setHelp(this, IWorkbenchHelpContextIds.CELL_UNDO_ACTION); } - public void runWithEvent(Event event) { + @Override + public void runWithEvent(Event event) { if (activeEditor != null) { activeEditor.performUndo(); return; @@ -437,7 +447,8 @@ public class CellEditorActionHandler { PlatformUI.getWorkbench().getHelpSystem().setHelp(this, IWorkbenchHelpContextIds.CELL_REDO_ACTION); } - public void runWithEvent(Event event) { + @Override + public void runWithEvent(Event event) { if (activeEditor != null) { activeEditor.performRedo(); return; diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/part/DrillDownAdapter.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/part/DrillDownAdapter.java index ff1c274bbef..5961723185f 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/part/DrillDownAdapter.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/part/DrillDownAdapter.java @@ -154,7 +154,8 @@ public class DrillDownAdapter implements ISelectionChangedListener { // Home. homeAction = new Action(WorkbenchMessages.GoHome_text) { - public void run() { + @Override + public void run() { goHome(); } }; @@ -167,7 +168,8 @@ public class DrillDownAdapter implements ISelectionChangedListener { // Back. ISharedImages images = PlatformUI.getWorkbench().getSharedImages(); backAction = new Action(WorkbenchMessages.GoBack_text) { - public void run() { + @Override + public void run() { goBack(); } }; @@ -180,7 +182,8 @@ public class DrillDownAdapter implements ISelectionChangedListener { // Forward. forwardAction = new Action(WorkbenchMessages.GoInto_text) { - public void run() { + @Override + public void run() { goInto(); } }; @@ -325,7 +328,8 @@ public class DrillDownAdapter implements ISelectionChangedListener { * Updates the navigation buttons when a selection change occurs * in the tree. */ - public void selectionChanged(SelectionChangedEvent event) { + @Override + public void selectionChanged(SelectionChangedEvent event) { updateNavigationButtons(); } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/part/DrillFrame.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/part/DrillFrame.java index f852ec515d4..a0ea8636043 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/part/DrillFrame.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/part/DrillFrame.java @@ -45,7 +45,8 @@ import java.util.List; * @return <code>true</code> if this object is the same as the obj * argument; <code>false</code> otherwise. */ - public boolean equals(Object obj) { + @Override + public boolean equals(Object obj) { // Compare handles. if (this == obj) { return true; diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/part/EditorActionBarContributor.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/part/EditorActionBarContributor.java index e9c9dac63ac..3d8a89df460 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/part/EditorActionBarContributor.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/part/EditorActionBarContributor.java @@ -132,7 +132,8 @@ public class EditorActionBarContributor implements IEditorActionBarContributor { * <code>IEditorActionBarContributor</code> method does nothing, * subclasses may override. */ - public void dispose() { + @Override + public void dispose() { } /** @@ -141,7 +142,8 @@ public class EditorActionBarContributor implements IEditorActionBarContributor { * then forwards the call to <code>init(IActionBars)</code> for * backward compatibility */ - public void init(IActionBars bars, IWorkbenchPage page) { + @Override + public void init(IActionBars bars, IWorkbenchPage page) { this.page = page; init(bars); } @@ -184,6 +186,7 @@ public class EditorActionBarContributor implements IEditorActionBarContributor { * * @param targetEditor the new target editor */ - public void setActiveEditor(IEditorPart targetEditor) { + @Override + public void setActiveEditor(IEditorPart targetEditor) { } } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/part/EditorInputTransfer.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/part/EditorInputTransfer.java index d7b0b42f016..b395211d36e 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/part/EditorInputTransfer.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/part/EditorInputTransfer.java @@ -123,7 +123,8 @@ public class EditorInputTransfer extends ByteArrayTransfer { /* (non-Javadoc) * Method declared on Transfer. */ - protected int[] getTypeIds() { + @Override + protected int[] getTypeIds() { return new int[] { TYPEID }; } @@ -132,14 +133,16 @@ public class EditorInputTransfer extends ByteArrayTransfer { * * @return the list of type names */ - protected String[] getTypeNames() { + @Override + protected String[] getTypeNames() { return new String[] { TYPE_NAME }; } /* (non-Javadoc) * Method declared on Transfer. */ - public void javaToNative(Object data, TransferData transferData) { + @Override + public void javaToNative(Object data, TransferData transferData) { if (!(data instanceof EditorInputData[])) { return; @@ -181,7 +184,8 @@ public class EditorInputTransfer extends ByteArrayTransfer { /* (non-Javadoc) * Method declared on Transfer. */ - public Object nativeToJava(TransferData transferData) { + @Override + public Object nativeToJava(TransferData transferData) { byte[] bytes = (byte[]) super.nativeToJava(transferData); if (bytes == null) { diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/part/EditorPart.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/part/EditorPart.java index 6548c7af27d..8121af946c7 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/part/EditorPart.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/part/EditorPart.java @@ -84,7 +84,8 @@ public abstract class EditorPart extends WorkbenchPart implements IEditorPart { /* (non-Javadoc) * @see org.eclipse.ui.IPropertyListener#propertyChanged(java.lang.Object, int) */ - public void propertyChanged(Object source, int propId) { + @Override + public void propertyChanged(Object source, int propId) { if (propId == IWorkbenchPartConstants.PROP_TITLE) { setDefaultPartName(); } @@ -109,7 +110,8 @@ public abstract class EditorPart extends WorkbenchPart implements IEditorPart { * * @see IEditorPart */ - public abstract void doSave(IProgressMonitor monitor); + @Override + public abstract void doSave(IProgressMonitor monitor); /* (non-Javadoc) * Saves the contents of this editor to another object. @@ -120,19 +122,22 @@ public abstract class EditorPart extends WorkbenchPart implements IEditorPart { * * @see IEditorPart */ - public abstract void doSaveAs(); + @Override + public abstract void doSaveAs(); /* (non-Javadoc) * Method declared on IEditorPart. */ - public IEditorInput getEditorInput() { + @Override + public IEditorInput getEditorInput() { return editorInput; } /* (non-Javadoc) * Method declared on IEditorPart. */ - public IEditorSite getEditorSite() { + @Override + public IEditorSite getEditorSite() { return (IEditorSite) getSite(); } @@ -141,7 +146,8 @@ public abstract class EditorPart extends WorkbenchPart implements IEditorPart { * * @return the tool tip text */ - public String getTitleToolTip() { + @Override + public String getTitleToolTip() { if (editorInput == null) { return super.getTitleToolTip(); } @@ -162,7 +168,8 @@ public abstract class EditorPart extends WorkbenchPart implements IEditorPart { * setInput(input); * </pre> */ - public abstract void init(IEditorSite site, IEditorInput input) + @Override + public abstract void init(IEditorSite site, IEditorInput input) throws PartInitException; /* (non-Javadoc) @@ -175,7 +182,8 @@ public abstract class EditorPart extends WorkbenchPart implements IEditorPart { * * @see IEditorPart */ - public abstract boolean isDirty(); + @Override + public abstract boolean isDirty(); /* (non-Javadoc) * Returns whether the "save as" operation is supported by this editor. @@ -186,7 +194,8 @@ public abstract class EditorPart extends WorkbenchPart implements IEditorPart { * * @see IEditorPart */ - public abstract boolean isSaveAsAllowed(); + @Override + public abstract boolean isSaveAsAllowed(); /* (non-Javadoc) * Returns whether the contents of this editor should be saved when the editor @@ -196,7 +205,8 @@ public abstract class EditorPart extends WorkbenchPart implements IEditorPart { * (<code>isDirty</code>). * </p> */ - public boolean isSaveOnCloseNeeded() { + @Override + public boolean isSaveOnCloseNeeded() { return isDirty(); } @@ -247,7 +257,8 @@ public abstract class EditorPart extends WorkbenchPart implements IEditorPart { /* (non-Javadoc) * @see org.eclipse.ui.part.WorkbenchPart#setContentDescription(java.lang.String) */ - protected void setContentDescription(String description) { + @Override + protected void setContentDescription(String description) { if (compatibilityTitleListener != null) { removePropertyListener(compatibilityTitleListener); compatibilityTitleListener = null; @@ -259,7 +270,8 @@ public abstract class EditorPart extends WorkbenchPart implements IEditorPart { /* (non-Javadoc) * @see org.eclipse.ui.part.WorkbenchPart#setPartName(java.lang.String) */ - protected void setPartName(String partName) { + @Override + protected void setPartName(String partName) { if (compatibilityTitleListener != null) { removePropertyListener(compatibilityTitleListener); compatibilityTitleListener = null; @@ -271,7 +283,8 @@ public abstract class EditorPart extends WorkbenchPart implements IEditorPart { /* (non-Javadoc) * @see org.eclipse.core.runtime.IExecutableExtension#setInitializationData(org.eclipse.core.runtime.IConfigurationElement, java.lang.String, java.lang.Object) */ - public void setInitializationData(IConfigurationElement cfig, + @Override + public void setInitializationData(IConfigurationElement cfig, String propertyName, Object data) { super.setInitializationData(cfig, propertyName, data); @@ -290,7 +303,8 @@ public abstract class EditorPart extends WorkbenchPart implements IEditorPart { /** * Set the default title for the receiver. */ - void setDefaultTitle() { + @Override + void setDefaultTitle() { setTitle(getPartName()); } @@ -301,7 +315,8 @@ public abstract class EditorPart extends WorkbenchPart implements IEditorPart { * @param site the site to check * @since 3.1 */ - protected final void checkSite(IWorkbenchPartSite site) { + @Override + protected final void checkSite(IWorkbenchPartSite site) { super.checkSite(site); Assert.isTrue(site instanceof IEditorSite, "The site for an editor must be an IEditorSite"); //$NON-NLS-1$ } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/part/IntroPart.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/part/IntroPart.java index 8a6bb1a4f0b..db601eb6c44 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/part/IntroPart.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/part/IntroPart.java @@ -80,7 +80,8 @@ public abstract class IntroPart extends EventManager implements IIntroPart, /* (non-Javadoc) * @see org.eclipse.ui.intro.IIntroPart#addPropertyListener(org.eclipse.ui.IPropertyListener) */ - public void addPropertyListener(IPropertyListener l) { + @Override + public void addPropertyListener(IPropertyListener l) { addListenerObject(l); } @@ -93,14 +94,16 @@ public abstract class IntroPart extends EventManager implements IIntroPart, * * @see IIntroPart */ - public abstract void createPartControl(Composite parent); + @Override + public abstract void createPartControl(Composite parent); /** * The <code>IntroPart</code> implementation of this * <code>IIntroPart</code> method disposes the title image loaded by * <code>setInitializationData</code>. Subclasses may extend. */ - public void dispose() { + @Override + public void dispose() { if (titleImage != null) { JFaceResources.getResources().destroyImage(imageDescriptor); titleImage = null; @@ -124,7 +127,8 @@ public abstract class IntroPart extends EventManager implements IIntroPart, final IPropertyListener l = (IPropertyListener) array[nX]; Platform.run(new SafeRunnable() { - public void run() { + @Override + public void run() { l.propertyChanged(this, propertyId); } }); @@ -139,7 +143,8 @@ public abstract class IntroPart extends EventManager implements IIntroPart, * invoke the method on their superclass to ensure that the Platform's * adapter manager is consulted). */ - public Object getAdapter(Class adapter) { + @Override + public Object getAdapter(Class adapter) { return Platform.getAdapterManager().getAdapter(this, adapter); } @@ -169,14 +174,16 @@ public abstract class IntroPart extends EventManager implements IIntroPart, * * @see org.eclipse.ui.intro.IIntroPart#getIntroSite() */ - public final IIntroSite getIntroSite() { + @Override + public final IIntroSite getIntroSite() { return partSite; } /* (non-Javadoc) * @see org.eclipse.ui.intro.IIntroPart#getTitleImage() */ - public Image getTitleImage() { + @Override + public Image getTitleImage() { if (titleImage != null) { return titleImage; } @@ -186,7 +193,8 @@ public abstract class IntroPart extends EventManager implements IIntroPart, /* (non-Javadoc) * @see org.eclipse.ui.intro.IIntroPart#getTitle() */ - public String getTitle() { + @Override + public String getTitle() { if (titleLabel != null) { return titleLabel; } @@ -215,7 +223,8 @@ public abstract class IntroPart extends EventManager implements IIntroPart, * @exception PartInitException * if this part was not initialized successfully */ - public void init(IIntroSite site, IMemento memento) + @Override + public void init(IIntroSite site, IMemento memento) throws PartInitException { setSite(site); } @@ -235,7 +244,8 @@ public abstract class IntroPart extends EventManager implements IIntroPart, /* (non-Javadoc) * @see org.eclipse.ui.intro.IIntroPart#removePropertyListener(org.eclipse.ui.IPropertyListener) */ - public void removePropertyListener(IPropertyListener l) { + @Override + public void removePropertyListener(IPropertyListener l) { removeListenerObject(l); } @@ -246,7 +256,8 @@ public abstract class IntroPart extends EventManager implements IIntroPart, * @param memento * a memento to receive the object state */ - public void saveState(IMemento memento) { + @Override + public void saveState(IMemento memento) { //no-op } @@ -259,7 +270,8 @@ public abstract class IntroPart extends EventManager implements IIntroPart, * * @see IIntroPart */ - public abstract void setFocus(); + @Override + public abstract void setFocus(); /** * The <code>IntroPart</code> implementation of this @@ -271,7 +283,8 @@ public abstract class IntroPart extends EventManager implements IIntroPart, * Should not be called by clients. It is called by the core plugin when * creating this executable extension. */ - public void setInitializationData(IConfigurationElement cfig, + @Override + public void setInitializationData(IConfigurationElement cfig, String propertyName, Object data) { // Save config element. diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/part/MessagePage.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/part/MessagePage.java index 2a7c4b05a22..4872c946c09 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/part/MessagePage.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/part/MessagePage.java @@ -42,7 +42,8 @@ public class MessagePage extends Page { /* (non-Javadoc) * Method declared on IPage. */ - public void createControl(Composite parent) { + @Override + public void createControl(Composite parent) { // Message in default page of Outline should have margins pgComp = new Composite(parent, SWT.NULL); pgComp.setLayout(new FillLayout()); @@ -54,14 +55,16 @@ public class MessagePage extends Page { /* (non-Javadoc) * Method declared on IPage. */ - public Control getControl() { + @Override + public Control getControl() { return pgComp; } /** * Sets focus to a part in the page. */ - public void setFocus() { + @Override + public void setFocus() { // important to give focus to the composite rather than the label // as the composite will actually take focus (though hidden), // but setFocus on a Label is a no-op diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/part/MultiEditor.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/part/MultiEditor.java index 290377ed080..420b882a750 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/part/MultiEditor.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/part/MultiEditor.java @@ -106,7 +106,8 @@ public abstract class MultiEditor extends AbstractMultiEditor { content.setLayout(new FillLayout()); e.createPartControl(content); parent.addListener(SWT.Activate, new Listener() { - public void handleEvent(Event event) { + @Override + public void handleEvent(Event event) { if (event.type == SWT.Activate) { activateEditor(e); } @@ -118,7 +119,8 @@ public abstract class MultiEditor extends AbstractMultiEditor { /* * @see IWorkbenchPart#setFocus() */ - public void setFocus() { + @Override + public void setFocus() { super.setFocus(); updateGradient(getActiveEditor()); } @@ -129,7 +131,8 @@ public abstract class MultiEditor extends AbstractMultiEditor { * @param part the nested editor * @since 3.5 */ - public void activateEditor(IEditorPart part) { + @Override + public void activateEditor(IEditorPart part) { IEditorPart oldEditor = getActiveEditor(); super.activateEditor(part); updateGradient(oldEditor); @@ -144,12 +147,14 @@ public abstract class MultiEditor extends AbstractMultiEditor { return window.getShellActivated(); } + @Override public Composite getInnerEditorContainer( IEditorReference innerEditorReference) { // This method is not used by MutliEditor return null; } + @Override protected void innerEditorsCreated() { // Nothing to do } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/part/MultiEditorInput.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/part/MultiEditorInput.java index 588b18384a9..f47ac8a8f80 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/part/MultiEditorInput.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/part/MultiEditorInput.java @@ -57,21 +57,24 @@ public class MultiEditorInput implements IEditorInput { /* * @see IEditorInput#exists() */ - public boolean exists() { + @Override + public boolean exists() { return true; } /* * @see IEditorInput#getImageDescriptor() */ - public ImageDescriptor getImageDescriptor() { + @Override + public ImageDescriptor getImageDescriptor() { return null; } /* * @see IEditorInput#getName() */ - public String getName() { + @Override + public String getName() { String name = ""; //$NON-NLS-1$ for (int i = 0; i < (input.length - 1); i++) { name = name + input[i].getName() + "/"; //$NON-NLS-1$ @@ -83,21 +86,24 @@ public class MultiEditorInput implements IEditorInput { /* * @see IEditorInput#getPersistable() */ - public IPersistableElement getPersistable() { + @Override + public IPersistableElement getPersistable() { return null; } /* * @see IEditorInput#getToolTipText() */ - public String getToolTipText() { + @Override + public String getToolTipText() { return getName(); } /* * @see IAdaptable#getAdapter(Class) */ - public Object getAdapter(Class adapter) { + @Override + public Object getAdapter(Class adapter) { return null; } @@ -105,7 +111,8 @@ public class MultiEditorInput implements IEditorInput { /* (non-Javadoc) * @see java.lang.Object#equals(java.lang.Object) */ - public boolean equals(Object obj) { + @Override + public boolean equals(Object obj) { if (this == obj) { return true; } @@ -120,7 +127,8 @@ public class MultiEditorInput implements IEditorInput { /* (non-Javadoc) * @see java.lang.Object#hashCode() */ - public int hashCode() { + @Override + public int hashCode() { int hash = 0; for (int i = 0; i < editors.length; i++) { hash = hash * 37 + editors[i].hashCode(); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/part/MultiPageEditor.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/part/MultiPageEditor.java index 22cc53164d5..5ac3b7cba27 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/part/MultiPageEditor.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/part/MultiPageEditor.java @@ -57,6 +57,7 @@ import org.eclipse.swt.widgets.TabFolder; * * @deprecated Use the class <code>MultiPageEditorPart</code> instead */ +@Deprecated public abstract class MultiPageEditor extends EditorPart { private List syncVector; @@ -67,7 +68,8 @@ public abstract class MultiPageEditor extends EditorPart { * * @deprecated Use the class <code>MultiPageEditorPart</code> instead */ - public MultiPageEditor() { + @Deprecated + public MultiPageEditor() { super(); } @@ -93,10 +95,12 @@ public abstract class MultiPageEditor extends EditorPart { * The <code>MultiPageEditor</code> implementation of this <code>IWorkbenchPart</code> * method creates a <code>TabFolder</code> control. */ - public void createPartControl(Composite parent) { + @Override + public void createPartControl(Composite parent) { tabFolder = new TabFolder(parent, SWT.NONE); tabFolder.addSelectionListener(new SelectionAdapter() { - public void widgetSelected(SelectionEvent e) { + @Override + public void widgetSelected(SelectionEvent e) { sync(); } }); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/part/MultiPageEditorActionBarContributor.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/part/MultiPageEditorActionBarContributor.java index 80d9cee26e1..10f8fa04141 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/part/MultiPageEditorActionBarContributor.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/part/MultiPageEditorActionBarContributor.java @@ -42,7 +42,8 @@ public abstract class MultiPageEditorActionBarContributor extends * editor action redirection when the active page is changed, and sets * the active page. */ - public void setActiveEditor(IEditorPart part) { + @Override + public void setActiveEditor(IEditorPart part) { IEditorPart activeNestedEditor = null; if (part instanceof MultiPageEditorPart) { activeNestedEditor = ((MultiPageEditorPart) part).getActiveEditor(); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/part/MultiPageEditorPart.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/part/MultiPageEditorPart.java index 3e9cd72c25f..f211a6ebc05 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/part/MultiPageEditorPart.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/part/MultiPageEditorPart.java @@ -242,6 +242,7 @@ public abstract class MultiPageEditorPart extends EditorPart implements IPageCha parent2.setLayout(new FillLayout()); editor.createPartControl(parent2); editor.addPropertyListener(new IPropertyListener() { + @Override public void propertyChanged(Object source, int propertyId) { MultiPageEditorPart.this.handlePropertyChange(propertyId); } @@ -287,6 +288,7 @@ public abstract class MultiPageEditorPart extends EditorPart implements IPageCha final CTabFolder newContainer = new CTabFolder(parent, SWT.BOTTOM | SWT.FLAT); newContainer.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { int newPageIndex = newContainer.indexOf((CTabItem) e.item); pageChange(newPageIndex); @@ -294,6 +296,7 @@ public abstract class MultiPageEditorPart extends EditorPart implements IPageCha }); newContainer.addTraverseListener(new TraverseListener() { // see https://bugs.eclipse.org/bugs/show_bug.cgi?id=199499 : Switching tabs by Ctrl+PageUp/PageDown must not be caught on the inner tab set + @Override public void keyTraversed(TraverseEvent e) { switch (e.detail) { case SWT.TRAVERSE_PAGE_NEXT: @@ -352,6 +355,7 @@ public abstract class MultiPageEditorPart extends EditorPart implements IPageCha * The parent in which the editor should be created; must not be * <code>null</code>. */ + @Override public final void createPartControl(Composite parent) { Composite pageContainer = createPageContainer(parent); this.container = createContainer(pageContainer); @@ -382,6 +386,7 @@ public abstract class MultiPageEditorPart extends EditorPart implements IPageCha */ protected void initializePageSwitching() { new PageSwitcher(this) { + @Override public Object[] getPages() { int pageCount = getPageCount(); Object[] result = new Object[pageCount]; @@ -391,10 +396,12 @@ public abstract class MultiPageEditorPart extends EditorPart implements IPageCha return result; } + @Override public String getName(Object page) { return getPageText(((Integer) page).intValue()); } + @Override public ImageDescriptor getImageDescriptor(Object page) { Image image = getPageImage(((Integer) page).intValue()); if (image == null) @@ -403,10 +410,12 @@ public abstract class MultiPageEditorPart extends EditorPart implements IPageCha return ImageDescriptor.createFromImage(image); } + @Override public void activatePage(Object page) { setActivePage(((Integer) page).intValue()); } + @Override public int getCurrentPageIndex() { return getActivePage(); } @@ -426,6 +435,7 @@ public abstract class MultiPageEditorPart extends EditorPart implements IPageCha * @throws ExecutionException * if an exception occurred during execution */ + @Override public Object execute(ExecutionEvent event) throws ExecutionException { int n= getPageCount(); if (n == 0) @@ -445,6 +455,7 @@ public abstract class MultiPageEditorPart extends EditorPart implements IPageCha * @throws ExecutionException * if an exception occurred during execution */ + @Override public Object execute(ExecutionEvent event) throws ExecutionException { int n= getPageCount(); if (n == 0) @@ -497,6 +508,7 @@ public abstract class MultiPageEditorPart extends EditorPart implements IPageCha * <code>IWorkbenchPart</code> method disposes all nested editors. * Subclasses may extend. */ + @Override public void dispose() { deactivateSite(true, false); @@ -648,6 +660,7 @@ public abstract class MultiPageEditorPart extends EditorPart implements IPageCha IServiceLocatorCreator slc = (IServiceLocatorCreator) getSite() .getService(IServiceLocatorCreator.class); IServiceLocator sl = slc.createServiceLocator(getSite(), null, new IDisposable(){ + @Override public void dispose() { close(); } @@ -682,6 +695,7 @@ public abstract class MultiPageEditorPart extends EditorPart implements IPageCha IServiceLocatorCreator slc = (IServiceLocatorCreator) getSite() .getService(IServiceLocatorCreator.class); pageContainerSite = slc.createServiceLocator(getSite(), null, new IDisposable(){ + @Override public void dispose() { close(); } @@ -787,6 +801,7 @@ public abstract class MultiPageEditorPart extends EditorPart implements IPageCha * @throws PartInitException * If the initialization of the part fails -- currently never. */ + @Override public void init(IEditorSite site, IEditorInput input) throws PartInitException { setSite(site); @@ -806,6 +821,7 @@ public abstract class MultiPageEditorPart extends EditorPart implements IPageCha * @return <code>true</code> if any of the nested editors are dirty; * <code>false</code> otherwise. */ + @Override public boolean isDirty() { // use nestedEditors to avoid SWT requests; see bug 12996 for (Iterator i = nestedEditors.iterator(); i.hasNext();) { @@ -1013,6 +1029,7 @@ public abstract class MultiPageEditorPart extends EditorPart implements IPageCha */ private void disposePart(final IWorkbenchPart part) { SafeRunner.run(new ISafeRunnable() { + @Override public void run() { IWorkbenchPartSite partSite = part.getSite(); part.dispose(); @@ -1021,6 +1038,7 @@ public abstract class MultiPageEditorPart extends EditorPart implements IPageCha } } + @Override public void handleException(Throwable e) { // Exception has already being logged by Core. Do nothing. } @@ -1104,6 +1122,7 @@ public abstract class MultiPageEditorPart extends EditorPart implements IPageCha * Subclasses may extend or reimplement. * </p> */ + @Override public void setFocus() { setFocus(getActivePage()); } @@ -1167,6 +1186,7 @@ public abstract class MultiPageEditorPart extends EditorPart implements IPageCha * * @see org.eclipse.ui.part.WorkbenchPart#getAdapter(java.lang.Class) */ + @Override public Object getAdapter(Class adapter) { Object result = super.getAdapter(adapter); // restrict delegating to the UI thread for bug 144851 @@ -1235,6 +1255,7 @@ public abstract class MultiPageEditorPart extends EditorPart implements IPageCha * @since 3.5 * @see #getActivePage() */ + @Override public Object getSelectedPage() { int index = getActivePage(); if (index == -1) { @@ -1260,6 +1281,7 @@ public abstract class MultiPageEditorPart extends EditorPart implements IPageCha * * @since 3.5 */ + @Override public void addPageChangedListener(IPageChangedListener listener) { pageChangeListeners.add(listener); } @@ -1274,6 +1296,7 @@ public abstract class MultiPageEditorPart extends EditorPart implements IPageCha * * @since 3.5 */ + @Override public void removePageChangedListener(IPageChangedListener listener) { pageChangeListeners.remove(listener); } @@ -1283,6 +1306,7 @@ public abstract class MultiPageEditorPart extends EditorPart implements IPageCha for (int i = 0; i < listeners.length; ++i) { final IPageChangedListener l = (IPageChangedListener) listeners[i]; SafeRunnable.run(new SafeRunnable() { + @Override public void run() { l.pageChanged(event); } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/part/MultiPageEditorSite.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/part/MultiPageEditorSite.java index 6bc3785c2af..50969c9e867 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/part/MultiPageEditorSite.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/part/MultiPageEditorSite.java @@ -134,6 +134,7 @@ public class MultiPageEditorSite implements IEditorSite, INestable { context = site.getModel().getContext().createChild("MultiPageEditorSite"); //$NON-NLS-1$ serviceLocator = (ServiceLocator) slc.createServiceLocator( multiPageEditor.getSite(), null, new IDisposable(){ + @Override public void dispose() { getMultiPageEditor().close(); } @@ -153,6 +154,7 @@ public class MultiPageEditorSite implements IEditorSite, INestable { this, null, 3)); serviceLocator.registerService(IMultiPageEditorSiteHolder.class, new IMultiPageEditorSiteHolder() { + @Override public MultiPageEditorSite getSite() { return MultiPageEditorSite.this; } @@ -182,6 +184,7 @@ public class MultiPageEditorSite implements IEditorSite, INestable { * * @since 3.2 */ + @Override public final void activate() { active = true; context.activate(); @@ -198,6 +201,7 @@ public class MultiPageEditorSite implements IEditorSite, INestable { * * @since 3.2 */ + @Override public final void deactivate() { active = false; if (contextService != null) { @@ -250,6 +254,7 @@ public class MultiPageEditorSite implements IEditorSite, INestable { * * @return <code>null</code> */ + @Override public IEditorActionBarContributor getActionBarContributor() { return null; } @@ -261,6 +266,7 @@ public class MultiPageEditorSite implements IEditorSite, INestable { * * @return The action bars from the parent multi-page editor. */ + @Override public IActionBars getActionBars() { return multiPageEditor.getEditorSite().getActionBars(); } @@ -270,6 +276,7 @@ public class MultiPageEditorSite implements IEditorSite, INestable { * * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class) */ + @Override public Object getAdapter(Class adapter) { return null; } @@ -282,6 +289,7 @@ public class MultiPageEditorSite implements IEditorSite, INestable { * @return The decorator from the workbench window. * @deprecated use IWorkbench.getDecoratorManager() */ + @Deprecated public ILabelDecorator getDecoratorManager() { return getWorkbenchWindow().getWorkbench().getDecoratorManager() .getLabelDecorator(); @@ -303,6 +311,7 @@ public class MultiPageEditorSite implements IEditorSite, INestable { * * @return An empty string. */ + @Override public String getId() { return ""; //$NON-NLS-1$ } @@ -310,6 +319,7 @@ public class MultiPageEditorSite implements IEditorSite, INestable { /* * (non-Javadoc) Method declared on IEditorSite. */ + @Override public IKeyBindingService getKeyBindingService() { if (service == null) { service = getMultiPageEditor().getEditorSite() @@ -347,6 +357,7 @@ public class MultiPageEditorSite implements IEditorSite, INestable { * * @return The workbench page in which this editor site resides. */ + @Override public IWorkbenchPage getPage() { return getMultiPageEditor().getSite().getPage(); } @@ -356,6 +367,7 @@ public class MultiPageEditorSite implements IEditorSite, INestable { * * @see org.eclipse.ui.IWorkbenchPartSite#getPart() */ + @Override public IWorkbenchPart getPart() { return editor; } @@ -367,6 +379,7 @@ public class MultiPageEditorSite implements IEditorSite, INestable { * * @return An empty string. */ + @Override public String getPluginId() { return ""; //$NON-NLS-1$ } @@ -380,6 +393,7 @@ public class MultiPageEditorSite implements IEditorSite, INestable { private ISelectionChangedListener getPostSelectionChangedListener() { if (postSelectionChangedListener == null) { postSelectionChangedListener = new ISelectionChangedListener() { + @Override public void selectionChanged(SelectionChangedEvent event) { MultiPageEditorSite.this.handlePostSelectionChanged(event); } @@ -395,6 +409,7 @@ public class MultiPageEditorSite implements IEditorSite, INestable { * * @return An empty string. */ + @Override public String getRegisteredName() { return ""; //$NON-NLS-1$ } @@ -408,6 +423,7 @@ public class MultiPageEditorSite implements IEditorSite, INestable { private ISelectionChangedListener getSelectionChangedListener() { if (selectionChangedListener == null) { selectionChangedListener = new ISelectionChangedListener() { + @Override public void selectionChanged(SelectionChangedEvent event) { MultiPageEditorSite.this.handleSelectionChanged(event); } @@ -423,10 +439,12 @@ public class MultiPageEditorSite implements IEditorSite, INestable { * * @return The current selection provider. */ + @Override public ISelectionProvider getSelectionProvider() { return selectionProvider; } + @Override public final Object getService(final Class key) { Object service = serviceLocator.getService(key); if (active && service instanceof INestable) { @@ -443,6 +461,7 @@ public class MultiPageEditorSite implements IEditorSite, INestable { * * @return The shell in which this editor site resides. */ + @Override public Shell getShell() { return getMultiPageEditor().getSite().getShell(); } @@ -454,6 +473,7 @@ public class MultiPageEditorSite implements IEditorSite, INestable { * * @return The workbench window in which this editor site resides. */ + @Override public IWorkbenchWindow getWorkbenchWindow() { return getMultiPageEditor().getSite().getWorkbenchWindow(); } @@ -502,6 +522,7 @@ public class MultiPageEditorSite implements IEditorSite, INestable { } } + @Override public final boolean hasService(final Class key) { return serviceLocator.hasService(key); } @@ -516,12 +537,14 @@ public class MultiPageEditorSite implements IEditorSite, INestable { * @param selProvider * The selection provider. */ + @Override public void registerContextMenu(MenuManager menuManager, ISelectionProvider selProvider) { getMultiPageEditor().getSite().registerContextMenu(menuManager, selProvider); } + @Override public final void registerContextMenu(final MenuManager menuManager, final ISelectionProvider selectionProvider, final boolean includeEditorInput) { @@ -541,6 +564,7 @@ public class MultiPageEditorSite implements IEditorSite, INestable { * @param selProvider * The selection provider. */ + @Override public void registerContextMenu(String menuID, MenuManager menuMgr, ISelectionProvider selProvider) { if (menuExtenders == null) { @@ -550,6 +574,7 @@ public class MultiPageEditorSite implements IEditorSite, INestable { menuExtenders); } + @Override public final void registerContextMenu(final String menuId, final MenuManager menuManager, final ISelectionProvider selectionProvider, @@ -572,6 +597,7 @@ public class MultiPageEditorSite implements IEditorSite, INestable { * The selection provider. * @see MultiPageEditorSite#handleSelectionChanged(SelectionChangedEvent) */ + @Override public void setSelectionProvider(ISelectionProvider provider) { ISelectionProvider oldSelectionProvider = selectionProvider; selectionProvider = provider; diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/part/MultiPageSelectionProvider.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/part/MultiPageSelectionProvider.java index 39eb4f90cda..6cc2d0edfb0 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/part/MultiPageSelectionProvider.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/part/MultiPageSelectionProvider.java @@ -64,7 +64,8 @@ public class MultiPageSelectionProvider implements IPostSelectionProvider { /* (non-Javadoc) * Method declared on <code>ISelectionProvider</code>. */ - public void addSelectionChangedListener(ISelectionChangedListener listener) { + @Override + public void addSelectionChangedListener(ISelectionChangedListener listener) { listeners.add(listener); } @@ -74,7 +75,8 @@ public class MultiPageSelectionProvider implements IPostSelectionProvider { * @param listener a selection changed listener * @since 3.2 */ - public void addPostSelectionChangedListener(ISelectionChangedListener listener) { + @Override + public void addPostSelectionChangedListener(ISelectionChangedListener listener) { postListeners.add(listener); } @@ -106,7 +108,8 @@ public class MultiPageSelectionProvider implements IPostSelectionProvider { for (int i = 0; i < listeners.length; ++i) { final ISelectionChangedListener l = (ISelectionChangedListener) listeners[i]; SafeRunner.run(new SafeRunnable() { - public void run() { + @Override + public void run() { l.selectionChanged(event); } }); @@ -124,7 +127,8 @@ public class MultiPageSelectionProvider implements IPostSelectionProvider { /* (non-Javadoc) * Method declared on <code>ISelectionProvider</code>. */ - public ISelection getSelection() { + @Override + public ISelection getSelection() { IEditorPart activeEditor = multiPageEditor.getActiveEditor(); if (activeEditor != null) { ISelectionProvider selectionProvider = activeEditor.getSite() @@ -139,7 +143,8 @@ public class MultiPageSelectionProvider implements IPostSelectionProvider { /* (non-JavaDoc) * Method declaed on <code>ISelectionProvider</code>. */ - public void removeSelectionChangedListener( + @Override + public void removeSelectionChangedListener( ISelectionChangedListener listener) { listeners.remove(listener); } @@ -150,14 +155,16 @@ public class MultiPageSelectionProvider implements IPostSelectionProvider { * @param listener a selection changed listener * @since 3.2 */ - public void removePostSelectionChangedListener(ISelectionChangedListener listener) { + @Override + public void removePostSelectionChangedListener(ISelectionChangedListener listener) { postListeners.remove(listener); } /* (non-Javadoc) * Method declared on <code>ISelectionProvider</code>. */ - public void setSelection(ISelection selection) { + @Override + public void setSelection(ISelection selection) { IEditorPart activeEditor = multiPageEditor.getActiveEditor(); if (activeEditor != null) { ISelectionProvider selectionProvider = activeEditor.getSite() diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/part/Page.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/part/Page.java index 438756d640c..39cb7053609 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/part/Page.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/part/Page.java @@ -59,14 +59,16 @@ public abstract class Page implements IPageBookViewPage { /* (non-Javadoc) * Method declared on IPage. */ - public abstract void createControl(Composite parent); + @Override + public abstract void createControl(Composite parent); /** * The <code>Page</code> implementation of this <code>IPage</code> method * disposes of this page's control (if it has one and it has not already * been disposed). Subclasses may extend. */ - public void dispose() { + @Override + public void dispose() { Control ctrl = getControl(); if (ctrl != null && !ctrl.isDisposed()) { ctrl.dispose(); @@ -77,7 +79,8 @@ public abstract class Page implements IPageBookViewPage { * The <code>Page</code> implementation of this <code>IPage</code> method returns * <code>null</code>. Subclasses must reimplement. */ - public abstract Control getControl(); + @Override + public abstract Control getControl(); /* (non-Javadoc) * This method exists for backward compatibility. @@ -91,7 +94,8 @@ public abstract class Page implements IPageBookViewPage { * This method exists for backward compatibility. * Subclasses should reimplement <code>init</code>. */ - public void setActionBars(IActionBars actionBars) { + @Override + public void setActionBars(IActionBars actionBars) { makeContributions(actionBars.getMenuManager(), actionBars .getToolBarManager(), actionBars.getStatusLineManager()); } @@ -106,7 +110,8 @@ public abstract class Page implements IPageBookViewPage { * * @since 2.0 */ - public void init(IPageSite pageSite) { + @Override + public void init(IPageSite pageSite) { site = pageSite; } @@ -115,7 +120,8 @@ public abstract class Page implements IPageBookViewPage { * * @return the site which contains this page */ - public IPageSite getSite() { + @Override + public IPageSite getSite() { return site; } @@ -123,5 +129,6 @@ public abstract class Page implements IPageBookViewPage { * The <code>Page</code> implementation of this <code>IPage</code> method * does nothing. Subclasses must implement. */ - public abstract void setFocus(); + @Override + public abstract void setFocus(); } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/part/PageBook.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/part/PageBook.java index 9c5f6212b35..f4543de26f7 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/part/PageBook.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/part/PageBook.java @@ -39,7 +39,8 @@ public class PageBook extends Composite { */ public class PageBookLayout extends Layout { - protected Point computeSize(Composite composite, int wHint, int hHint, + @Override + protected Point computeSize(Composite composite, int wHint, int hHint, boolean flushCache) { if (wHint != SWT.DEFAULT && hHint != SWT.DEFAULT) { return new Point(wHint, hHint); @@ -62,7 +63,8 @@ public class PageBook extends Composite { return result; } - protected void layout(Composite composite, boolean flushCache) { + @Override + protected void layout(Composite composite, boolean flushCache) { if (currentPage != null && !currentPage.isDisposed()) { currentPage.setBounds(composite.getClientArea()); } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/part/PageBookView.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/part/PageBookView.java index 2e7fab5b13a..03258e8156e 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/part/PageBookView.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/part/PageBookView.java @@ -153,6 +153,7 @@ public abstract class PageBookView extends ViewPart implements IPartListener { * The action bar property listener. */ private IPropertyChangeListener actionBarPropListener = new IPropertyChangeListener() { + @Override public void propertyChange(PropertyChangeEvent event) { if (event.getProperty().equals(SubActionBars.P_ACTION_HANDLERS) && activeRec != null @@ -166,6 +167,7 @@ public abstract class PageBookView extends ViewPart implements IPartListener { * Selection change listener to listen for page selection changes */ private ISelectionChangedListener selectionChangedListener = new ISelectionChangedListener() { + @Override public void selectionChanged(SelectionChangedEvent event) { pageSelectionChanged(event); } @@ -175,6 +177,7 @@ public abstract class PageBookView extends ViewPart implements IPartListener { * Selection change listener to listen for page selection changes */ private ISelectionChangedListener postSelectionListener = new ISelectionChangedListener() { + @Override public void selectionChanged(SelectionChangedEvent event) { postSelectionChanged(event); } @@ -258,6 +261,7 @@ public abstract class PageBookView extends ViewPart implements IPartListener { for (int i = 0; i < listeners.length; ++i) { final ISelectionChangedListener l = (ISelectionChangedListener) listeners[i]; Platform.run(new SafeRunnable() { + @Override public void run() { l.selectionChanged(event); } @@ -280,6 +284,7 @@ public abstract class PageBookView extends ViewPart implements IPartListener { /* * (non-Javadoc) Method declared on ISelectionProvider. */ + @Override public void addSelectionChangedListener( ISelectionChangedListener listener) { fSelectionListener.addSelectionChangedListener(listener); @@ -288,6 +293,7 @@ public abstract class PageBookView extends ViewPart implements IPartListener { /* * (non-Javadoc) Method declared on ISelectionProvider. */ + @Override public ISelection getSelection() { // get the selection provider from the current page IPage currentPage = getCurrentPage(); @@ -310,6 +316,7 @@ public abstract class PageBookView extends ViewPart implements IPartListener { /* * (non-Javadoc) Method declared on ISelectionProvider. */ + @Override public void removeSelectionChangedListener( ISelectionChangedListener listener) { fSelectionListener.removeSelectionChangedListener(listener); @@ -339,6 +346,7 @@ public abstract class PageBookView extends ViewPart implements IPartListener { /* * (non-Javadoc) Method declared on ISelectionProvider. */ + @Override public void setSelection(ISelection selection) { // get the selection provider from the current page IPage currentPage = getCurrentPage(); @@ -363,6 +371,7 @@ public abstract class PageBookView extends ViewPart implements IPartListener { * * @see org.eclipse.jface.viewers.IPostSelectionProvider#addPostSelectionChangedListener(org.eclipse.jface.viewers.ISelectionChangedListener) */ + @Override public void addPostSelectionChangedListener( ISelectionChangedListener listener) { fPostSelectionListeners.addSelectionChangedListener(listener); @@ -373,6 +382,7 @@ public abstract class PageBookView extends ViewPart implements IPartListener { * * @see org.eclipse.jface.viewers.IPostSelectionProvider#removePostSelectionChangedListener(org.eclipse.jface.viewers.ISelectionChangedListener) */ + @Override public void removePostSelectionChangedListener( ISelectionChangedListener listener) { fPostSelectionListeners.removeSelectionChangedListener(listener); @@ -483,6 +493,7 @@ public abstract class PageBookView extends ViewPart implements IPartListener { * <code>IWorkbenchPart</code> method creates a <code>PageBook</code> * control with its default page showing. Subclasses may extend. */ + @Override public void createPartControl(Composite parent) { // Create the page book. @@ -506,6 +517,7 @@ public abstract class PageBookView extends ViewPart implements IPartListener { * <code>IWorkbenchPart</code> method cleans up all the pages. Subclasses * may extend. */ + @Override public void dispose() { // stop listening to part activation getSite().getPage().removePartListener(partListener); @@ -581,6 +593,7 @@ public abstract class PageBookView extends ViewPart implements IPartListener { * <code>IAdaptable</code> method delegates to the current page, if it * implements <code>IAdaptable</code>. */ + @Override public Object getAdapter(Class key) { // delegate to the current page, if supported IPage page = getCurrentPage(); @@ -738,6 +751,7 @@ public abstract class PageBookView extends ViewPart implements IPartListener { /* * (non-Javadoc) Method declared on IViewPart. */ + @Override public void init(IViewSite site) throws PartInitException { site.setSelectionProvider(selectionProvider); super.init(site); @@ -748,6 +762,7 @@ public abstract class PageBookView extends ViewPart implements IPartListener { * <code>IPartListener</code> method shows the page when the given part is * activated. Subclasses may extend. */ + @Override public void partActivated(IWorkbenchPart part) { // Is this an important part? If not just return. if (isImportant(part)) { @@ -783,6 +798,7 @@ public abstract class PageBookView extends ViewPart implements IPartListener { * The <code>PageBookView</code> implementation of this * <code>IPartListener</code> method does nothing. Subclasses may extend. */ + @Override public void partBroughtToTop(IWorkbenchPart part) { // Do nothing by default } @@ -792,6 +808,7 @@ public abstract class PageBookView extends ViewPart implements IPartListener { * <code>IPartListener</code> method deal with the closing of the active * part. Subclasses may extend. */ + @Override public void partClosed(IWorkbenchPart part) { // Update the active part. if (activeRec != null && activeRec.part == part) { @@ -812,6 +829,7 @@ public abstract class PageBookView extends ViewPart implements IPartListener { * The <code>PageBookView</code> implementation of this * <code>IPartListener</code> method does nothing. Subclasses may extend. */ + @Override public void partDeactivated(IWorkbenchPart part) { // Do nothing. } @@ -821,6 +839,7 @@ public abstract class PageBookView extends ViewPart implements IPartListener { * * @see org.eclipse.ui.IPartListener#partOpened(org.eclipse.ui.IWorkbenchPart) */ + @Override public void partOpened(IWorkbenchPart part) { // Do nothing by default. } @@ -896,6 +915,7 @@ public abstract class PageBookView extends ViewPart implements IPartListener { /* * (non-Javadoc) Method declared on IWorkbenchPart. */ + @Override public void setFocus() { // first set focus on the page book, in case the page // doesn't properly handle setFocus @@ -1052,6 +1072,7 @@ public abstract class PageBookView extends ViewPart implements IPartListener { } private IPartListener2 partListener = new IPartListener2() { + @Override public void partActivated(IWorkbenchPartReference partRef) { if (partRef == null) { WorkbenchPlugin.log("partRef is null in PageBookView partActivated"); //$NON-NLS-1$ @@ -1061,29 +1082,36 @@ public abstract class PageBookView extends ViewPart implements IPartListener { PageBookView.this.partActivated(part); } + @Override public void partBroughtToTop(IWorkbenchPartReference partRef) { PageBookView.this.partBroughtToTop(partRef.getPart(false)); } + @Override public void partClosed(IWorkbenchPartReference partRef) { PageBookView.this.partClosed(partRef.getPart(false)); } + @Override public void partDeactivated(IWorkbenchPartReference partRef) { PageBookView.this.partDeactivated(partRef.getPart(false)); } + @Override public void partHidden(IWorkbenchPartReference partRef) { PageBookView.this.partHidden(partRef.getPart(false)); } + @Override public void partInputChanged(IWorkbenchPartReference partRef) { } + @Override public void partOpened(IWorkbenchPartReference partRef) { PageBookView.this.partOpened(partRef.getPart(false)); } + @Override public void partVisible(IWorkbenchPartReference partRef) { PageBookView.this.partVisible(partRef.getPart(false)); } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/part/PageSite.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/part/PageSite.java index dd4b169aac4..5555c3f3d30 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/part/PageSite.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/part/PageSite.java @@ -98,6 +98,7 @@ public class PageSite implements IPageSite, INestable { e4Context = ((PartSite) parentViewSite).getContext().createChild("PageSite"); //$NON-NLS-1$ this.serviceLocator = (ServiceLocator) slc.createServiceLocator(parentViewSite, null, new IDisposable() { + @Override public void dispose() { // final Control control = // ((PartSite)parentViewSite).getPane().getControl(); @@ -120,6 +121,7 @@ public class PageSite implements IPageSite, INestable { getWorkbenchWindow(), parentSite, null, this, 3)); serviceLocator.registerService(IPageSiteHolder.class, new IPageSiteHolder() { + @Override public IPageSite getSite() { return PageSite.this; } @@ -179,6 +181,7 @@ public class PageSite implements IPageSite, INestable { * * @return the subactionbars for this site */ + @Override public IActionBars getActionBars() { return subActionBars; } @@ -188,6 +191,7 @@ public class PageSite implements IPageSite, INestable { * * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class) */ + @Override public Object getAdapter(Class adapter) { return Platform.getAdapterManager().getAdapter(this, adapter); } @@ -195,6 +199,7 @@ public class PageSite implements IPageSite, INestable { /* * (non-Javadoc) Method declared on IPageSite. */ + @Override public IWorkbenchPage getPage() { return parentSite.getPage(); } @@ -202,10 +207,12 @@ public class PageSite implements IPageSite, INestable { /* * (non-Javadoc) Method declared on IPageSite. */ + @Override public ISelectionProvider getSelectionProvider() { return selectionProvider; } + @Override public final Object getService(final Class key) { Object service = serviceLocator.getService(key); if (active && service instanceof INestable) { @@ -217,6 +224,7 @@ public class PageSite implements IPageSite, INestable { /* * (non-Javadoc) Method declared on IPageSite. */ + @Override public Shell getShell() { return parentSite.getShell(); } @@ -224,10 +232,12 @@ public class PageSite implements IPageSite, INestable { /* * (non-Javadoc) Method declared on IPageSite. */ + @Override public IWorkbenchWindow getWorkbenchWindow() { return parentSite.getWorkbenchWindow(); } + @Override public final boolean hasService(final Class key) { return serviceLocator.hasService(key); } @@ -235,6 +245,7 @@ public class PageSite implements IPageSite, INestable { /* * (non-Javadoc) Method declared on IPageSite. */ + @Override public void registerContextMenu(String menuID, MenuManager menuMgr, ISelectionProvider selProvider) { if (menuExtenders == null) { @@ -247,6 +258,7 @@ public class PageSite implements IPageSite, INestable { /* * (non-Javadoc) Method declared on IPageSite. */ + @Override public void setSelectionProvider(ISelectionProvider provider) { selectionProvider = provider; } @@ -262,6 +274,7 @@ public class PageSite implements IPageSite, INestable { * * @since 3.2 */ + @Override public void activate() { active = true; @@ -279,6 +292,7 @@ public class PageSite implements IPageSite, INestable { * * @since 3.2 */ + @Override public void deactivate() { active = false; if (contextService != null) { diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/part/PluginDropAdapter.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/part/PluginDropAdapter.java index 6b2480bba46..6bac417b33e 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/part/PluginDropAdapter.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/part/PluginDropAdapter.java @@ -56,7 +56,8 @@ public class PluginDropAdapter extends ViewerDropAdapter { * Method declared on DropTargetAdapter. * The user has dropped something on the desktop viewer. */ - public void drop(DropTargetEvent event) { + @Override + public void drop(DropTargetEvent event) { try { if (PluginTransfer.getInstance().isSupportedType( event.currentDataType)) { @@ -113,7 +114,8 @@ public class PluginDropAdapter extends ViewerDropAdapter { /** * @see ViewerDropAdapter#performDrop */ - public boolean performDrop(Object data) { + @Override + public boolean performDrop(Object data) { //should never be called, since we override the drop() method. return false; } @@ -123,7 +125,8 @@ public class PluginDropAdapter extends ViewerDropAdapter { * <code>ViewerDropAdapter</code> method is used to notify the action that some * aspect of the drop operation has changed. Subclasses may override. */ - public boolean validateDrop(Object target, int operation, + @Override + public boolean validateDrop(Object target, int operation, TransferData transferType) { currentTransfer = transferType; if (currentTransfer != null diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/part/PluginTransfer.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/part/PluginTransfer.java index 8a8929a4c92..c630d1b095a 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/part/PluginTransfer.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/part/PluginTransfer.java @@ -73,7 +73,8 @@ public class PluginTransfer extends ByteArrayTransfer { /* (non-Javadoc) * Method declared on Transfer. */ - protected int[] getTypeIds() { + @Override + protected int[] getTypeIds() { return new int[] { TYPEID }; } @@ -82,14 +83,16 @@ public class PluginTransfer extends ByteArrayTransfer { * * @return the list of type names */ - protected String[] getTypeNames() { + @Override + protected String[] getTypeNames() { return new String[] { TYPE_NAME }; } /* (non-Javadoc) * Method declared on Transfer. */ - protected void javaToNative(Object data, TransferData transferData) { + @Override + protected void javaToNative(Object data, TransferData transferData) { PluginTransferData realData = (PluginTransferData) data; if (data == null) { return; @@ -110,7 +113,8 @@ public class PluginTransfer extends ByteArrayTransfer { /* (non-Javadoc) * Method declared on Transfer. */ - protected Object nativeToJava(TransferData transferData) { + @Override + protected Object nativeToJava(TransferData transferData) { try { byte[] bytes = (byte[]) super.nativeToJava(transferData); ByteArrayInputStream in = new ByteArrayInputStream(bytes); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/part/ViewPart.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/part/ViewPart.java index 5ddced11905..487204cf13c 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/part/ViewPart.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/part/ViewPart.java @@ -71,7 +71,8 @@ public abstract class ViewPart extends WorkbenchPart implements IViewPart { /* (non-Javadoc) * @see org.eclipse.ui.IPropertyListener#propertyChanged(java.lang.Object, int) */ - public void propertyChanged(Object source, int propId) { + @Override + public void propertyChanged(Object source, int propId) { if (propId == IWorkbenchPartConstants.PROP_TITLE) { setDefaultContentDescription(); } @@ -90,7 +91,8 @@ public abstract class ViewPart extends WorkbenchPart implements IViewPart { /* (non-Javadoc) * Method declared on IViewPart. */ - public IViewSite getViewSite() { + @Override + public IViewSite getViewSite() { return (IViewSite) getSite(); } @@ -98,7 +100,8 @@ public abstract class ViewPart extends WorkbenchPart implements IViewPart { /* (non-Javadoc) * @see org.eclipse.ui.IViewPart#init(org.eclipse.ui.IViewSite) */ - public void init(IViewSite site) throws PartInitException { + @Override + public void init(IViewSite site) throws PartInitException { setSite(site); setDefaultContentDescription(); @@ -108,7 +111,8 @@ public abstract class ViewPart extends WorkbenchPart implements IViewPart { * (non-Javadoc) * @see org.eclipse.ui.IViewPart#init(org.eclipse.ui.IViewSite, org.eclipse.ui.IMemento) */ - public void init(IViewSite site, IMemento memento) throws PartInitException { + @Override + public void init(IViewSite site, IMemento memento) throws PartInitException { /* * Initializes this view with the given view site. A memento is passed to * the view which contains a snapshot of the views state from a previous @@ -126,14 +130,16 @@ public abstract class ViewPart extends WorkbenchPart implements IViewPart { /* (non-Javadoc) * @see org.eclipse.ui.IViewPart#saveState(org.eclipse.ui.IMemento) */ - public void saveState(IMemento memento) { + @Override + public void saveState(IMemento memento) { // do nothing } /* (non-Javadoc) * @see org.eclipse.ui.part.WorkbenchPart#setPartName(java.lang.String) */ - protected void setPartName(String partName) { + @Override + protected void setPartName(String partName) { if (compatibilityTitleListener != null) { removePropertyListener(compatibilityTitleListener); compatibilityTitleListener = null; @@ -145,7 +151,8 @@ public abstract class ViewPart extends WorkbenchPart implements IViewPart { /* (non-Javadoc) * @see org.eclipse.ui.part.WorkbenchPart#setContentDescription(java.lang.String) */ - protected void setContentDescription(String description) { + @Override + protected void setContentDescription(String description) { if (compatibilityTitleListener != null) { removePropertyListener(compatibilityTitleListener); compatibilityTitleListener = null; @@ -157,7 +164,8 @@ public abstract class ViewPart extends WorkbenchPart implements IViewPart { /* (non-Javadoc) * @see org.eclipse.core.runtime.IExecutableExtension#setInitializationData(org.eclipse.core.runtime.IConfigurationElement, java.lang.String, java.lang.Object) */ - public void setInitializationData(IConfigurationElement cfig, + @Override + public void setInitializationData(IConfigurationElement cfig, String propertyName, Object data) { super.setInitializationData(cfig, propertyName, data); @@ -186,7 +194,8 @@ public abstract class ViewPart extends WorkbenchPart implements IViewPart { * @param site the site to check * @since 3.1 */ - protected final void checkSite(IWorkbenchPartSite site) { + @Override + protected final void checkSite(IWorkbenchPartSite site) { super.checkSite(site); Assert.isTrue(site instanceof IViewSite, "The site for a view must be an IViewSite"); //$NON-NLS-1$ } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/part/WorkbenchPart.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/part/WorkbenchPart.java index d01011c3026..a3e7ccd519f 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/part/WorkbenchPart.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/part/WorkbenchPart.java @@ -83,7 +83,8 @@ public abstract class WorkbenchPart extends EventManager implements /* (non-Javadoc) * Method declared on IWorkbenchPart. */ - public void addPropertyListener(IPropertyListener l) { + @Override + public void addPropertyListener(IPropertyListener l) { addListenerObject(l); } @@ -97,14 +98,16 @@ public abstract class WorkbenchPart extends EventManager implements * @param parent the parent control * @see IWorkbenchPart */ - public abstract void createPartControl(Composite parent); + @Override + public abstract void createPartControl(Composite parent); /** * The <code>WorkbenchPart</code> implementation of this * <code>IWorkbenchPart</code> method disposes the title image * loaded by <code>setInitializationData</code>. Subclasses may extend. */ - public void dispose() { + @Override + public void dispose() { if (imageDescriptor != null) { JFaceResources.getResources().destroyImage(imageDescriptor); } @@ -140,7 +143,8 @@ public abstract class WorkbenchPart extends EventManager implements * should invoke the method on their superclass to ensure that the * Platform's adapter manager is consulted). */ - public Object getAdapter(Class adapter) { + @Override + public Object getAdapter(Class adapter) { /** * This implementation of the method declared by <code>IAdaptable</code> @@ -174,7 +178,8 @@ public abstract class WorkbenchPart extends EventManager implements /* (non-Javadoc) * Method declared on IWorkbenchPart. */ - public IWorkbenchPartSite getSite() { + @Override + public IWorkbenchPartSite getSite() { return partSite; } @@ -185,14 +190,16 @@ public abstract class WorkbenchPart extends EventManager implements * Parts should set their title by calling setPartName and/or setContentDescription. * </p> */ - public String getTitle() { + @Override + public String getTitle() { return title; } /* (non-Javadoc) * Method declared on IWorkbenchPart. */ - public Image getTitleImage() { + @Override + public Image getTitleImage() { if (titleImage != null) { return titleImage; } @@ -204,14 +211,16 @@ public abstract class WorkbenchPart extends EventManager implements * * @return the tool tip text */ - public String getTitleToolTip() { + @Override + public String getTitleToolTip() { return toolTip; } /* (non-Javadoc) * Method declared on IWorkbenchPart. */ - public void removePropertyListener(IPropertyListener l) { + @Override + public void removePropertyListener(IPropertyListener l) { removeListenerObject(l); } @@ -226,7 +235,8 @@ public abstract class WorkbenchPart extends EventManager implements * * @see IWorkbenchPart */ - public abstract void setFocus(); + @Override + public abstract void setFocus(); /** * {@inheritDoc} @@ -239,7 +249,8 @@ public abstract class WorkbenchPart extends EventManager implements * Should not be called by clients. It is called by the core plugin when creating * this executable extension. */ - public void setInitializationData(IConfigurationElement cfig, + @Override + public void setInitializationData(IConfigurationElement cfig, String propertyName, Object data) { // Save config element. @@ -300,7 +311,8 @@ public abstract class WorkbenchPart extends EventManager implements * * @param title the title, or <code>null</code> to clear */ - protected void setTitle(String title) { + @Deprecated + protected void setTitle(String title) { title = Util.safeString(title); //Do not send changes if they are the same @@ -365,7 +377,8 @@ public abstract class WorkbenchPart extends EventManager implements * Parts should call setPartName to change their part name. * </p> */ - public String getPartName() { + @Override + public String getPartName() { return partName; } @@ -411,7 +424,8 @@ public abstract class WorkbenchPart extends EventManager implements * Parts should call setContentDescription to change their content description. * </p> */ - public String getContentDescription() { + @Override + public String getContentDescription() { return contentDescription; } @@ -474,7 +488,8 @@ public abstract class WorkbenchPart extends EventManager implements /* (non-Javadoc) * @see org.eclipse.ui.part.IWorkbenchPartOrientation#getOrientation() */ - public int getOrientation(){ + @Override + public int getOrientation(){ //By default use the orientation in Window return Window.getDefaultOrientation(); } @@ -482,14 +497,16 @@ public abstract class WorkbenchPart extends EventManager implements /* (non-Javadoc) * @see org.eclipse.ui.IWorkbenchPart3#addPartPropertyListener(org.eclipse.jface.util.IPropertyChangeListener) */ - public void addPartPropertyListener(IPropertyChangeListener listener) { + @Override + public void addPartPropertyListener(IPropertyChangeListener listener) { partChangeListeners.add(listener); } /* (non-Javadoc) * @see org.eclipse.ui.IWorkbenchPart3#removePartPropertyListener(org.eclipse.jface.util.IPropertyChangeListener) */ - public void removePartPropertyListener(IPropertyChangeListener listener) { + @Override + public void removePartPropertyListener(IPropertyChangeListener listener) { partChangeListeners.remove(listener); } @@ -513,7 +530,8 @@ public abstract class WorkbenchPart extends EventManager implements /* (non-Javadoc) * @see org.eclipse.ui.IWorkbenchPart3#setPartProperty(java.lang.String, java.lang.String) */ - public void setPartProperty(String key, String value) { + @Override + public void setPartProperty(String key, String value) { String oldValue = (String) partProperties.get(key); if (value==null) { partProperties.remove(key); @@ -526,14 +544,16 @@ public abstract class WorkbenchPart extends EventManager implements /* (non-Javadoc) * @see org.eclipse.ui.IWorkbenchPart3#getPartProperty(java.lang.String) */ - public String getPartProperty(String key) { + @Override + public String getPartProperty(String key) { return (String)partProperties.get(key); } /* (non-Javadoc) * @see org.eclipse.ui.IWorkbenchPart3#getPartProperties() */ - public Map getPartProperties() { + @Override + public Map getPartProperties() { return Collections.unmodifiableMap(partProperties); } } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/plugin/AbstractUIPlugin.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/plugin/AbstractUIPlugin.java index 8b98883de20..5d8f4b4e733 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/plugin/AbstractUIPlugin.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/plugin/AbstractUIPlugin.java @@ -166,7 +166,8 @@ public abstract class AbstractUIPlugin extends Plugin { * org.eclipse.core.runtime.compatibility plug-in (or, as in this case, * subclasses which might). */ - public AbstractUIPlugin(IPluginDescriptor descriptor) { + @Deprecated + public AbstractUIPlugin(IPluginDescriptor descriptor) { super(descriptor); } @@ -322,7 +323,8 @@ public abstract class AbstractUIPlugin extends Plugin { * @deprecated this is only called if the runtime compatibility layer is * present. See {@link #initializeDefaultPluginPreferences}. */ - protected void initializeDefaultPreferences(IPreferenceStore store) { + @Deprecated + protected void initializeDefaultPreferences(IPreferenceStore store) { // spec'ed to do nothing } @@ -347,7 +349,9 @@ public abstract class AbstractUIPlugin extends Plugin { * @see #initializeDefaultPreferences * @since 2.0 */ - protected void initializeDefaultPluginPreferences() { + @Deprecated + @Override + protected void initializeDefaultPluginPreferences() { // N.B. by the time this method is called, the plug-in has a // core runtime preference store (no default values) @@ -460,7 +464,8 @@ public abstract class AbstractUIPlugin extends Plugin { * The plug-ins preferences are loaded from the file regardless of what * this method does. */ - protected void loadPreferenceStore() { + @Deprecated + protected void loadPreferenceStore() { // do nothing by default } @@ -482,7 +487,8 @@ public abstract class AbstractUIPlugin extends Plugin { // but refreshPluginActions must run in the UI thread, // so use asyncExec. See bug 6623 for more details. Display.getDefault().asyncExec(new Runnable() { - public void run() { + @Override + public void run() { WWinPluginAction.refreshActionList(); } }); @@ -522,7 +528,8 @@ public abstract class AbstractUIPlugin extends Plugin { * This method now calls <code>savePluginPreferences</code>, and exists only for * backwards compatibility. */ - protected void savePreferenceStore() { + @Deprecated + protected void savePreferenceStore() { savePluginPreferences(); } @@ -544,7 +551,9 @@ public abstract class AbstractUIPlugin extends Plugin { * org.eclipse.core.runtime.compatibility plug-in; in contrast, * the <code>start</code> method is always called. */ - public void startup() throws CoreException { + @Deprecated + @Override + public void startup() throws CoreException { // this method no longer does anything // the code that used to be here in 2.1 has moved to start(BundleContext) super.startup(); @@ -565,7 +574,9 @@ public abstract class AbstractUIPlugin extends Plugin { * org.eclipse.core.runtime.compatibility plug-in; * in contrast, the <code>stop</code> method is always called. */ - public void shutdown() throws CoreException { + @Deprecated + @Override + public void shutdown() throws CoreException { // this method no longer does anything interesting // the code that used to be here in 2.1 has moved to stop(BundleContext), // which is called regardless of whether the plug-in being instantiated @@ -581,7 +592,8 @@ public abstract class AbstractUIPlugin extends Plugin { * * @since 3.0 */ - public void start(BundleContext context) throws Exception { + @Override + public void start(BundleContext context) throws Exception { super.start(context); final BundleContext fc = context; // Should only attempt refreshPluginActions() once the bundle @@ -592,7 +604,8 @@ public abstract class AbstractUIPlugin extends Plugin { // We don't want to have created any delegates if this happens. // See bug 63324 for more details. bundleListener = new BundleListener() { - public void bundleChanged(BundleEvent event) { + @Override + public void bundleChanged(BundleEvent event) { if (event.getBundle() == getBundle()) { if (event.getType() == BundleEvent.STARTED) { // We're getting notified that the bundle has been started. @@ -621,7 +634,8 @@ public abstract class AbstractUIPlugin extends Plugin { * * @since 3.0 */ - public void stop(BundleContext context) throws Exception { + @Override + public void stop(BundleContext context) throws Exception { try { if (bundleListener != null) { context.removeBundleListener(bundleListener); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/preferences/ScopedPreferenceStore.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/preferences/ScopedPreferenceStore.java index cad50d7d5f4..d3feab47029 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/preferences/ScopedPreferenceStore.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/preferences/ScopedPreferenceStore.java @@ -147,6 +147,7 @@ public class ScopedPreferenceStore extends EventManager implements * * @see org.eclipse.core.runtime.preferences.IEclipsePreferences.INodeChangeListener#added(org.eclipse.core.runtime.preferences.IEclipsePreferences.NodeChangeEvent) */ + @Override public void added(NodeChangeEvent event) { if (nodeQualifier.equals(event.getChild().name()) && isListenerAttached()) { @@ -160,6 +161,7 @@ public class ScopedPreferenceStore extends EventManager implements * * @see org.eclipse.core.runtime.preferences.IEclipsePreferences.INodeChangeListener#removed(org.eclipse.core.runtime.preferences.IEclipsePreferences.NodeChangeEvent) */ + @Override public void removed(NodeChangeEvent event) { // Do nothing as there are no events from removed node } @@ -177,6 +179,7 @@ public class ScopedPreferenceStore extends EventManager implements * * @see org.eclipse.core.runtime.preferences.IEclipsePreferences.IPreferenceChangeListener#preferenceChange(org.eclipse.core.runtime.preferences.IEclipsePreferences.PreferenceChangeEvent) */ + @Override public void preferenceChange(PreferenceChangeEvent event) { if (silentRunning) { @@ -255,6 +258,7 @@ public class ScopedPreferenceStore extends EventManager implements * * @see org.eclipse.jface.preference.IPreferenceStore#addPropertyChangeListener(org.eclipse.jface.util.IPropertyChangeListener) */ + @Override public void addPropertyChangeListener(IPropertyChangeListener listener) { initializePreferencesListener();// Create the preferences listener if it // does not exist @@ -343,6 +347,7 @@ public class ScopedPreferenceStore extends EventManager implements * * @see org.eclipse.jface.preference.IPreferenceStore#contains(java.lang.String) */ + @Override public boolean contains(String name) { if (name == null) { return false; @@ -357,6 +362,7 @@ public class ScopedPreferenceStore extends EventManager implements * @see org.eclipse.jface.preference.IPreferenceStore#firePropertyChangeEvent(java.lang.String, * java.lang.Object, java.lang.Object) */ + @Override public void firePropertyChangeEvent(String name, Object oldValue, Object newValue) { // important: create intermediate array to protect against listeners @@ -371,6 +377,7 @@ public class ScopedPreferenceStore extends EventManager implements final IPropertyChangeListener listener = (IPropertyChangeListener) list[i]; SafeRunner.run(new SafeRunnable(JFaceResources .getString("PreferenceStore.changeError")) { //$NON-NLS-1$ + @Override public void run() { listener.propertyChange(event); } @@ -383,6 +390,7 @@ public class ScopedPreferenceStore extends EventManager implements * * @see org.eclipse.jface.preference.IPreferenceStore#getBoolean(java.lang.String) */ + @Override public boolean getBoolean(String name) { String value = internalGet(name); return value == null ? BOOLEAN_DEFAULT_DEFAULT : Boolean.valueOf(value) @@ -394,6 +402,7 @@ public class ScopedPreferenceStore extends EventManager implements * * @see org.eclipse.jface.preference.IPreferenceStore#getDefaultBoolean(java.lang.String) */ + @Override public boolean getDefaultBoolean(String name) { return getDefaultPreferences() .getBoolean(name, BOOLEAN_DEFAULT_DEFAULT); @@ -404,6 +413,7 @@ public class ScopedPreferenceStore extends EventManager implements * * @see org.eclipse.jface.preference.IPreferenceStore#getDefaultDouble(java.lang.String) */ + @Override public double getDefaultDouble(String name) { return getDefaultPreferences().getDouble(name, DOUBLE_DEFAULT_DEFAULT); } @@ -413,6 +423,7 @@ public class ScopedPreferenceStore extends EventManager implements * * @see org.eclipse.jface.preference.IPreferenceStore#getDefaultFloat(java.lang.String) */ + @Override public float getDefaultFloat(String name) { return getDefaultPreferences().getFloat(name, FLOAT_DEFAULT_DEFAULT); } @@ -422,6 +433,7 @@ public class ScopedPreferenceStore extends EventManager implements * * @see org.eclipse.jface.preference.IPreferenceStore#getDefaultInt(java.lang.String) */ + @Override public int getDefaultInt(String name) { return getDefaultPreferences().getInt(name, INT_DEFAULT_DEFAULT); } @@ -431,6 +443,7 @@ public class ScopedPreferenceStore extends EventManager implements * * @see org.eclipse.jface.preference.IPreferenceStore#getDefaultLong(java.lang.String) */ + @Override public long getDefaultLong(String name) { return getDefaultPreferences().getLong(name, LONG_DEFAULT_DEFAULT); } @@ -440,6 +453,7 @@ public class ScopedPreferenceStore extends EventManager implements * * @see org.eclipse.jface.preference.IPreferenceStore#getDefaultString(java.lang.String) */ + @Override public String getDefaultString(String name) { return getDefaultPreferences().get(name, STRING_DEFAULT_DEFAULT); } @@ -449,6 +463,7 @@ public class ScopedPreferenceStore extends EventManager implements * * @see org.eclipse.jface.preference.IPreferenceStore#getDouble(java.lang.String) */ + @Override public double getDouble(String name) { String value = internalGet(name); if (value == null) { @@ -480,6 +495,7 @@ public class ScopedPreferenceStore extends EventManager implements * * @see org.eclipse.jface.preference.IPreferenceStore#getFloat(java.lang.String) */ + @Override public float getFloat(String name) { String value = internalGet(name); if (value == null) { @@ -497,6 +513,7 @@ public class ScopedPreferenceStore extends EventManager implements * * @see org.eclipse.jface.preference.IPreferenceStore#getInt(java.lang.String) */ + @Override public int getInt(String name) { String value = internalGet(name); if (value == null) { @@ -514,6 +531,7 @@ public class ScopedPreferenceStore extends EventManager implements * * @see org.eclipse.jface.preference.IPreferenceStore#getLong(java.lang.String) */ + @Override public long getLong(String name) { String value = internalGet(name); if (value == null) { @@ -531,6 +549,7 @@ public class ScopedPreferenceStore extends EventManager implements * * @see org.eclipse.jface.preference.IPreferenceStore#getString(java.lang.String) */ + @Override public String getString(String name) { String value = internalGet(name); return value == null ? STRING_DEFAULT_DEFAULT : value; @@ -541,6 +560,7 @@ public class ScopedPreferenceStore extends EventManager implements * * @see org.eclipse.jface.preference.IPreferenceStore#isDefault(java.lang.String) */ + @Override public boolean isDefault(String name) { if (name == null) { return false; @@ -554,6 +574,7 @@ public class ScopedPreferenceStore extends EventManager implements * * @see org.eclipse.jface.preference.IPreferenceStore#needsSaving() */ + @Override public boolean needsSaving() { return dirty; } @@ -564,6 +585,7 @@ public class ScopedPreferenceStore extends EventManager implements * @see org.eclipse.jface.preference.IPreferenceStore#putValue(java.lang.String, * java.lang.String) */ + @Override public void putValue(String name, String value) { try { // Do not notify listeners @@ -581,6 +603,7 @@ public class ScopedPreferenceStore extends EventManager implements * * @see org.eclipse.jface.preference.IPreferenceStore#removePropertyChangeListener(org.eclipse.jface.util.IPropertyChangeListener) */ + @Override public void removePropertyChangeListener(IPropertyChangeListener listener) { removeListenerObject(listener); if (!isListenerAttached()) { @@ -594,6 +617,7 @@ public class ScopedPreferenceStore extends EventManager implements * @see org.eclipse.jface.preference.IPreferenceStore#setDefault(java.lang.String, * double) */ + @Override public void setDefault(String name, double value) { getDefaultPreferences().putDouble(name, value); } @@ -604,6 +628,7 @@ public class ScopedPreferenceStore extends EventManager implements * @see org.eclipse.jface.preference.IPreferenceStore#setDefault(java.lang.String, * float) */ + @Override public void setDefault(String name, float value) { getDefaultPreferences().putFloat(name, value); } @@ -614,6 +639,7 @@ public class ScopedPreferenceStore extends EventManager implements * @see org.eclipse.jface.preference.IPreferenceStore#setDefault(java.lang.String, * int) */ + @Override public void setDefault(String name, int value) { getDefaultPreferences().putInt(name, value); } @@ -624,6 +650,7 @@ public class ScopedPreferenceStore extends EventManager implements * @see org.eclipse.jface.preference.IPreferenceStore#setDefault(java.lang.String, * long) */ + @Override public void setDefault(String name, long value) { getDefaultPreferences().putLong(name, value); } @@ -634,6 +661,7 @@ public class ScopedPreferenceStore extends EventManager implements * @see org.eclipse.jface.preference.IPreferenceStore#setDefault(java.lang.String, * java.lang.String) */ + @Override public void setDefault(String name, String defaultObject) { getDefaultPreferences().put(name, defaultObject); } @@ -644,6 +672,7 @@ public class ScopedPreferenceStore extends EventManager implements * @see org.eclipse.jface.preference.IPreferenceStore#setDefault(java.lang.String, * boolean) */ + @Override public void setDefault(String name, boolean value) { getDefaultPreferences().putBoolean(name, value); } @@ -653,6 +682,7 @@ public class ScopedPreferenceStore extends EventManager implements * * @see org.eclipse.jface.preference.IPreferenceStore#setToDefault(java.lang.String) */ + @Override public void setToDefault(String name) { String oldValue = getString(name); @@ -679,6 +709,7 @@ public class ScopedPreferenceStore extends EventManager implements * @see org.eclipse.jface.preference.IPreferenceStore#setValue(java.lang.String, * double) */ + @Override public void setValue(String name, double value) { double oldValue = getDouble(name); if (oldValue == value) { @@ -705,6 +736,7 @@ public class ScopedPreferenceStore extends EventManager implements * @see org.eclipse.jface.preference.IPreferenceStore#setValue(java.lang.String, * float) */ + @Override public void setValue(String name, float value) { float oldValue = getFloat(name); if (oldValue == value) { @@ -730,6 +762,7 @@ public class ScopedPreferenceStore extends EventManager implements * @see org.eclipse.jface.preference.IPreferenceStore#setValue(java.lang.String, * int) */ + @Override public void setValue(String name, int value) { int oldValue = getInt(name); if (oldValue == value) { @@ -756,6 +789,7 @@ public class ScopedPreferenceStore extends EventManager implements * @see org.eclipse.jface.preference.IPreferenceStore#setValue(java.lang.String, * long) */ + @Override public void setValue(String name, long value) { long oldValue = getLong(name); if (oldValue == value) { @@ -781,6 +815,7 @@ public class ScopedPreferenceStore extends EventManager implements * @see org.eclipse.jface.preference.IPreferenceStore#setValue(java.lang.String, * java.lang.String) */ + @Override public void setValue(String name, String value) { // Do not turn on silent running here as Strings are propagated if (getDefaultString(name).equals(value)) { @@ -797,6 +832,7 @@ public class ScopedPreferenceStore extends EventManager implements * @see org.eclipse.jface.preference.IPreferenceStore#setValue(java.lang.String, * boolean) */ + @Override public void setValue(String name, boolean value) { boolean oldValue = getBoolean(name); if (oldValue == value) { @@ -822,6 +858,7 @@ public class ScopedPreferenceStore extends EventManager implements * * @see org.eclipse.jface.preference.IPersistentPreferenceStore#save() */ + @Override public void save() throws IOException { try { getStorePreferences().flush(); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/preferences/ViewPreferencesAction.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/preferences/ViewPreferencesAction.java index a81b5ab6b98..07cc601e1c5 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/preferences/ViewPreferencesAction.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/preferences/ViewPreferencesAction.java @@ -31,6 +31,7 @@ public abstract class ViewPreferencesAction extends Action { /* (non-Javadoc) * @see org.eclipse.jface.action.Action#run() */ + @Override public void run() { openViewPreferencesDialog(); } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/preferences/ViewSettingsDialog.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/preferences/ViewSettingsDialog.java index 3157267df32..97e1f770687 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/preferences/ViewSettingsDialog.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/preferences/ViewSettingsDialog.java @@ -40,6 +40,7 @@ public class ViewSettingsDialog extends Dialog { /* (non-Javadoc) * @see org.eclipse.jface.dialogs.Dialog#buttonPressed(int) */ + @Override protected void buttonPressed(int buttonId) { if (buttonId == DEFAULTS_BUTTON_ID) { performDefaults(); @@ -63,6 +64,7 @@ public class ViewSettingsDialog extends Dialog { /* (non-Javadoc) * @see org.eclipse.jface.dialogs.Dialog#createButtonsForButtonBar(org.eclipse.swt.widgets.Composite) */ + @Override protected void createButtonsForButtonBar(Composite parent) { parent.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/preferences/WizardPropertyPage.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/preferences/WizardPropertyPage.java index 811dbd5d56b..fd4323df22f 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/preferences/WizardPropertyPage.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/preferences/WizardPropertyPage.java @@ -50,21 +50,26 @@ public abstract class WizardPropertyPage extends PropertyPage { fWizard= wizard; } + @Override public IWizardPage getCurrentPage() { return fWizard.getPages()[0]; } + @Override public Shell getShell() { return fPage.getShell(); } + @Override public void showPage(IWizardPage page) { } + @Override public void updateButtons() { fPage.setValid(fWizard.canFinish()); } + @Override public void updateMessage() { IWizardPage page= getCurrentPage(); @@ -91,6 +96,7 @@ public abstract class WizardPropertyPage extends PropertyPage { } } + @Override public void updateTitleBar() { IWizardPage page= getCurrentPage(); String name= page.getTitle(); @@ -100,9 +106,11 @@ public abstract class WizardPropertyPage extends PropertyPage { fPage.setMessage(name); } + @Override public void updateWindowTitle() { } + @Override public void run(boolean fork, boolean cancelable, IRunnableWithProgress runnable) throws InvocationTargetException, InterruptedException { ProgressMonitorDialog dialog= new ProgressMonitorDialog(getShell()); dialog.run(fork, cancelable, runnable); @@ -137,6 +145,7 @@ public abstract class WizardPropertyPage extends PropertyPage { /** * {@inheritDoc} */ + @Override protected Control createContents(final Composite parent) { fWizardPageContainer= new Composite(parent, SWT.NONE); fWizardPageContainer.setFont(parent.getFont()); @@ -220,6 +229,7 @@ public abstract class WizardPropertyPage extends PropertyPage { /** * {@inheritDoc} */ + @Override public boolean performOk() { fWizard.performFinish(); applyChanges(); @@ -231,6 +241,7 @@ public abstract class WizardPropertyPage extends PropertyPage { /** * {@inheritDoc} */ + @Override public boolean performCancel() { fWizard.performCancel(); fWizard.dispose(); @@ -241,6 +252,7 @@ public abstract class WizardPropertyPage extends PropertyPage { /** * {@inheritDoc} */ + @Override protected void performApply() { fWizard.performFinish(); applyChanges(); @@ -254,6 +266,7 @@ public abstract class WizardPropertyPage extends PropertyPage { /** * {@inheritDoc} */ + @Override protected void performDefaults() { fWizard.performCancel(); fWizard.dispose(); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/preferences/WorkingCopyManager.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/preferences/WorkingCopyManager.java index 6732619051a..eaacf315a75 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/preferences/WorkingCopyManager.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/preferences/WorkingCopyManager.java @@ -37,6 +37,7 @@ public class WorkingCopyManager implements IWorkingCopyManager{ /* (non-Javadoc) * @see org.eclipse.ui.preferences.IWorkingCopyManager#getWorkingCopy(org.eclipse.core.runtime.preferences.IEclipsePreferences) */ + @Override public IEclipsePreferences getWorkingCopy(IEclipsePreferences original) { if (original instanceof WorkingCopyPreferences) { throw new IllegalArgumentException("Trying to get a working copy of a working copy"); //$NON-NLS-1$ @@ -54,6 +55,7 @@ public class WorkingCopyManager implements IWorkingCopyManager{ /* (non-Javadoc) * @see org.eclipse.ui.preferences.IWorkingCopyManager#applyChanges() */ + @Override public void applyChanges() throws BackingStoreException { Collection values = workingCopies.values(); WorkingCopyPreferences[] valuesArray = (WorkingCopyPreferences[]) values.toArray(new WorkingCopyPreferences[values.size()]); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/presentations/PresentationUtil.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/presentations/PresentationUtil.java index 668904a0794..d3f84895c70 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/presentations/PresentationUtil.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/presentations/PresentationUtil.java @@ -44,7 +44,8 @@ public class PresentationUtil { private static Control dragSource; private static Listener dragListener = new Listener() { - public void handleEvent(Event event) { + @Override + public void handleEvent(Event event) { dragEvent = event; if (dragSource != event.widget) { dragSource = null; @@ -63,19 +64,22 @@ public class PresentationUtil { } private static Listener moveListener = new Listener() { - public void handleEvent(Event event) { + @Override + public void handleEvent(Event event) { handleMouseMove(event); } }; private static Listener clickListener = new Listener() { - public void handleEvent(Event e) { + @Override + public void handleEvent(Event e) { handleMouseClick(e); } }; private static Listener mouseDownListener = new Listener() { - public void handleEvent(Event event) { + @Override + public void handleEvent(Event event) { if (event.widget instanceof Control) { // Remember the button that started the drag so we // can forward it on the call to the 'externalDragListener' diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/presentations/StackPresentation.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/presentations/StackPresentation.java index f5c4d26f9dd..a79fee61a39 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/presentations/StackPresentation.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/presentations/StackPresentation.java @@ -103,14 +103,16 @@ public abstract class StackPresentation implements ISizeProvider { * * @deprecated replaced by computePreferredSize */ - public Point computeMinimumSize() { + @Deprecated + public Point computeMinimumSize() { return new Point(0,0); } /* * @see ISizeProvider#getSizeFlags(boolean) */ - public int getSizeFlags(boolean width) { + @Override + public int getSizeFlags(boolean width) { boolean hasMaximumSize = getSite().getState() == IStackPresentationSite.STATE_MINIMIZED; return SWT.MIN | (hasMaximumSize ? SWT.MAX : 0); @@ -119,7 +121,8 @@ public abstract class StackPresentation implements ISizeProvider { /* * @see ISizeProvider#computePreferredSize(boolean, int, int, int) */ - public int computePreferredSize(boolean width, int availableParallel, int availablePerpendicular, int preferredResult) { + @Override + public int computePreferredSize(boolean width, int availableParallel, int availablePerpendicular, int preferredResult) { int minSize = Geometry.getCoordinate(computeMinimumSize(), width); if (getSite().getState() == IStackPresentationSite.STATE_MINIMIZED || preferredResult < minSize) { diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/progress/DeferredTreeContentManager.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/progress/DeferredTreeContentManager.java index 2f8240a135e..eb4c4ea4212 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/progress/DeferredTreeContentManager.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/progress/DeferredTreeContentManager.java @@ -88,6 +88,7 @@ public class DeferredTreeContentManager { * @param site * @deprecated in 3.4. provider is not used by this class */ + @Deprecated public DeferredTreeContentManager(ITreeContentProvider provider, AbstractTreeViewer viewer, IWorkbenchPartSite site) { this(viewer, site); @@ -103,6 +104,7 @@ public class DeferredTreeContentManager { * The tree viewer that the results are added to * @deprecated in 3.4. provider is not used by this class */ + @Deprecated public DeferredTreeContentManager(ITreeContentProvider provider, AbstractTreeViewer viewer) { this(viewer); @@ -231,6 +233,7 @@ public class DeferredTreeContentManager { * * @see org.eclipse.core.jobs.Job#run(org.eclipse.core.runtime.IProgressMonitor) */ + @Override public IStatus run(IProgressMonitor monitor) { adapter.fetchDeferredChildren(parent, collector, monitor); if (monitor.isCanceled()) { @@ -244,6 +247,7 @@ public class DeferredTreeContentManager { * * @see org.eclipse.core.jobs.Job#belongsTo(java.lang.Object) */ + @Override public boolean belongsTo(Object family) { if (family instanceof DeferredContentFamily) { DeferredContentFamily contentFamily = (DeferredContentFamily) family; @@ -300,6 +304,7 @@ public class DeferredTreeContentManager { * * @see org.eclipse.core.runtime.jobs.JobChangeAdapter#done(org.eclipse.core.runtime.jobs.IJobChangeEvent) */ + @Override public void done(IJobChangeEvent event) { runClearPlaceholderJob(placeholder); } @@ -345,6 +350,7 @@ public class DeferredTreeContentManager { * * @see org.eclipse.ui.progress.UIJob#runInUIThread(org.eclipse.core.runtime.IProgressMonitor) */ + @Override public IStatus runInUIThread(IProgressMonitor updateMonitor) { // Cancel the job if the tree viewer got closed if (treeViewer.getControl().isDisposed() @@ -391,6 +397,7 @@ public class DeferredTreeContentManager { * * @see org.eclipse.ui.progress.UIJob#runInUIThread(org.eclipse.core.runtime.IProgressMonitor) */ + @Override public IStatus runInUIThread(IProgressMonitor monitor) { if (!placeholder.isRemoved()) { Control control = treeViewer.getControl(); @@ -448,6 +455,7 @@ public class DeferredTreeContentManager { * @see org.eclipse.jface.progress.IElementCollector#add(java.lang.Object, * org.eclipse.core.runtime.IProgressMonitor) */ + @Override public void add(Object element, IProgressMonitor monitor) { add(new Object[] { element }, monitor); } @@ -458,6 +466,7 @@ public class DeferredTreeContentManager { * @see org.eclipse.jface.progress.IElementCollector#add(java.lang.Object[], * org.eclipse.core.runtime.IProgressMonitor) */ + @Override public void add(Object[] elements, IProgressMonitor monitor) { addChildren(parent, elements, monitor); } @@ -467,6 +476,7 @@ public class DeferredTreeContentManager { * * @see org.eclipse.jface.progress.IElementCollector#done() */ + @Override public void done() { runClearPlaceholderJob(placeholder); } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/progress/IProgressService.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/progress/IProgressService.java index 28df879524d..6aff1f27f0f 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/progress/IProgressService.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/progress/IProgressService.java @@ -144,7 +144,8 @@ public interface IProgressService extends IRunnableContext { * * @since 3.2 */ - public void run(boolean fork, boolean cancelable, IRunnableWithProgress runnable) throws InvocationTargetException, InterruptedException; + @Override + public void run(boolean fork, boolean cancelable, IRunnableWithProgress runnable) throws InvocationTargetException, InterruptedException; /** * Open a dialog on job when it starts to run and close it diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/progress/IWorkbenchSiteProgressService.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/progress/IWorkbenchSiteProgressService.java index 52ac2e0ce4e..17342798219 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/progress/IWorkbenchSiteProgressService.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/progress/IWorkbenchSiteProgressService.java @@ -48,7 +48,8 @@ public interface IWorkbenchSiteProgressService extends IProgressService { * The property that is sent with busy notifications. * @deprecated this property is no longer in use in the Eclipse SDK */ - public static final String BUSY_PROPERTY = "SITE_BUSY"; //$NON-NLS-1$ + @Deprecated + public static final String BUSY_PROPERTY = "SITE_BUSY"; //$NON-NLS-1$ /** * Jobs scheduled with this method will cause the part's presentation to be diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/progress/PendingUpdateAdapter.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/progress/PendingUpdateAdapter.java index 411a7f6cadd..413cabe695e 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/progress/PendingUpdateAdapter.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/progress/PendingUpdateAdapter.java @@ -51,7 +51,8 @@ public class PendingUpdateAdapter implements IWorkbenchAdapter, IAdaptable { /* (non-Javadoc) * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class) */ - public Object getAdapter(Class adapter) { + @Override + public Object getAdapter(Class adapter) { if (adapter == IWorkbenchAdapter.class) { return this; } @@ -61,35 +62,40 @@ public class PendingUpdateAdapter implements IWorkbenchAdapter, IAdaptable { /* (non-Javadoc) * @see org.eclipse.ui.model.IWorkbenchAdapter#getChildren(java.lang.Object) */ - public Object[] getChildren(Object o) { + @Override + public Object[] getChildren(Object o) { return new Object[0]; } /* (non-Javadoc) * @see org.eclipse.ui.model.IWorkbenchAdapter#getImageDescriptor(java.lang.Object) */ - public ImageDescriptor getImageDescriptor(Object object) { + @Override + public ImageDescriptor getImageDescriptor(Object object) { return null; } /* (non-Javadoc) * @see org.eclipse.ui.model.IWorkbenchAdapter#getLabel(java.lang.Object) */ - public String getLabel(Object o) { + @Override + public String getLabel(Object o) { return ProgressMessages.PendingUpdateAdapter_PendingLabel; } /* (non-Javadoc) * @see org.eclipse.ui.model.IWorkbenchAdapter#getParent(java.lang.Object) */ - public Object getParent(Object o) { + @Override + public Object getParent(Object o) { return null; } /** * @since 3.4 */ - public String toString() { + @Override + public String toString() { return getLabel(null); } } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/progress/UIJob.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/progress/UIJob.java index 2662dec1538..a225f2eed3f 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/progress/UIJob.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/progress/UIJob.java @@ -72,7 +72,8 @@ public abstract class UIJob extends Job { * Note: this message is marked final. Implementors should use * runInUIThread() instead. */ - public final IStatus run(final IProgressMonitor monitor) { + @Override + public final IStatus run(final IProgressMonitor monitor) { if (monitor.isCanceled()) { return Status.CANCEL_STATUS; } @@ -81,7 +82,8 @@ public abstract class UIJob extends Job { return Status.CANCEL_STATUS; } asyncDisplay.asyncExec(new Runnable() { - public void run() { + @Override + public void run() { IStatus result = null; Throwable throwable = null; try { diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/progress/WorkbenchJob.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/progress/WorkbenchJob.java index bc34c527223..6ec95d6d131 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/progress/WorkbenchJob.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/progress/WorkbenchJob.java @@ -59,7 +59,8 @@ public abstract class WorkbenchJob extends UIJob { /* (non-Javadoc) * @see org.eclipse.core.runtime.jobs.JobChangeAdapter#done(org.eclipse.core.runtime.jobs.IJobChangeEvent) */ - public void done(IJobChangeEvent event) { + @Override + public void done(IJobChangeEvent event) { //Abort if it is not running if (!PlatformUI.isWorkbenchRunning()) { @@ -87,14 +88,16 @@ public abstract class WorkbenchJob extends UIJob { /* (non-Javadoc) * @see org.eclipse.core.internal.jobs.InternalJob#shouldSchedule() */ - public boolean shouldSchedule() { + @Override + public boolean shouldSchedule() { return super.shouldSchedule() && PlatformUI.isWorkbenchRunning(); } /* (non-Javadoc) * @see org.eclipse.core.runtime.jobs.Job#shouldRun() */ - public boolean shouldRun() { + @Override + public boolean shouldRun() { return super.shouldRun() && PlatformUI.isWorkbenchRunning(); } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/splash/BasicSplashHandler.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/splash/BasicSplashHandler.java index 6284cec0cae..2ba1da36fdf 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/splash/BasicSplashHandler.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/splash/BasicSplashHandler.java @@ -56,10 +56,12 @@ public abstract class BasicSplashHandler extends AbstractSplashHandler { /* (non-Javadoc) * @see org.eclipse.jface.wizard.ProgressMonitorPart#beginTask(java.lang.String, int) */ + @Override public void beginTask(final String name, final int totalWork) { updateUI(new Runnable() { + @Override public void run() { if (isDisposed()) return; @@ -75,10 +77,12 @@ public abstract class BasicSplashHandler extends AbstractSplashHandler { * * @see org.eclipse.jface.wizard.ProgressMonitorPart#done() */ + @Override public void done() { updateUI(new Runnable() { + @Override public void run() { if (isDisposed()) return; @@ -93,10 +97,12 @@ public abstract class BasicSplashHandler extends AbstractSplashHandler { * * @see org.eclipse.jface.wizard.ProgressMonitorPart#internalWorked(double) */ + @Override public void internalWorked(final double work) { updateUI(new Runnable() { + @Override public void run() { if (isDisposed()) return; @@ -112,10 +118,12 @@ public abstract class BasicSplashHandler extends AbstractSplashHandler { * * @see org.eclipse.jface.wizard.ProgressMonitorPart#setFont(org.eclipse.swt.graphics.Font) */ + @Override public void setFont(final Font font) { updateUI(new Runnable() { + @Override public void run() { if (isDisposed()) return; @@ -130,10 +138,12 @@ public abstract class BasicSplashHandler extends AbstractSplashHandler { * * @see org.eclipse.jface.wizard.ProgressMonitorPart#updateLabel() */ + @Override protected void updateLabel() { updateUI(new Runnable() { + @Override public void run() { if (isDisposed()) return; @@ -154,6 +164,7 @@ public abstract class BasicSplashHandler extends AbstractSplashHandler { * * @see org.eclipse.ui.splash.AbstractSplashHandler#getBundleProgressMonitor() */ + @Override public IProgressMonitor getBundleProgressMonitor() { if (monitor == null) { Composite parent = new Composite(getSplash(), Window.getDefaultOrientation()); @@ -185,6 +196,7 @@ public abstract class BasicSplashHandler extends AbstractSplashHandler { * * @see org.eclipse.ui.splash.AbstractSplashHandler#dispose() */ + @Override public void dispose() { if (foreground != null) foreground.dispose(); @@ -288,6 +300,7 @@ public abstract class BasicSplashHandler extends AbstractSplashHandler { // the UI is fully initialized StartupRunnable startupRunnable = new StartupRunnable() { + @Override public void runWithException() throws Throwable { r.run(); } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/statushandlers/AbstractStatusAreaProvider.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/statushandlers/AbstractStatusAreaProvider.java index 90f89f12e24..36c5f7c702d 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/statushandlers/AbstractStatusAreaProvider.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/statushandlers/AbstractStatusAreaProvider.java @@ -53,6 +53,7 @@ public abstract class AbstractStatusAreaProvider extends ErrorSupportProvider { * @see org.eclipse.jface.dialogs.ErrorSupportProvider#createSupportArea(org.eclipse.swt.widgets.Composite, * org.eclipse.core.runtime.IStatus) */ + @Override public final Control createSupportArea(Composite parent, IStatus status) { return createSupportArea(parent, new StatusAdapter(status)); } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/statushandlers/StatusAdapter.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/statushandlers/StatusAdapter.java index 35c5eb9a81a..4e2e47b1c5b 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/statushandlers/StatusAdapter.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/statushandlers/StatusAdapter.java @@ -34,6 +34,7 @@ public class StatusAdapter implements IAdaptable { * * @deprecated use {@link IStatusAdapterConstants#TITLE_PROPERTY} instead */ + @Deprecated public static final QualifiedName TITLE_PROPERTY = IStatusAdapterConstants.TITLE_PROPERTY; /** @@ -48,6 +49,7 @@ public class StatusAdapter implements IAdaptable { * @deprecated use {@link IStatusAdapterConstants#TIMESTAMP_PROPERTY} * instead */ + @Deprecated public static final QualifiedName TIMESTAMP_PROPERTY = IStatusAdapterConstants.TIMESTAMP_PROPERTY; private IStatus status; @@ -88,6 +90,7 @@ public class StatusAdapter implements IAdaptable { * * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class) */ + @Override public Object getAdapter(Class adapter) { if (adapters == null) { return null; diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/statushandlers/StatusManager.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/statushandlers/StatusManager.java index 510f6652212..51baef45458 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/statushandlers/StatusManager.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/statushandlers/StatusManager.java @@ -302,6 +302,7 @@ public class StatusManager { * @see org.eclipse.core.runtime.ILogListener#logging(org.eclipse.core.runtime.IStatus, * java.lang.String) */ + @Override public void logging(IStatus status, String plugin) { if (!loggedStatuses.contains(status)) { handle(status, StatusManager.NONE); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/statushandlers/WorkbenchErrorHandler.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/statushandlers/WorkbenchErrorHandler.java index 35cdd79e763..a37cf5cd341 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/statushandlers/WorkbenchErrorHandler.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/statushandlers/WorkbenchErrorHandler.java @@ -30,6 +30,7 @@ public class WorkbenchErrorHandler extends AbstractStatusHandler { /* (non-Javadoc) * @see org.eclipse.ui.statushandlers.AbstractStatusHandler#supportsNotification(int) */ + @Override public boolean supportsNotification(int type) { if (type == INotificationTypes.HANDLED) { return true; @@ -45,6 +46,7 @@ public class WorkbenchErrorHandler extends AbstractStatusHandler { * @see org.eclipse.ui.statushandlers.AbstractStatusHandler#handle(org.eclipse.ui.statushandlers.StatusAdapter, * int) */ + @Override public void handle(final StatusAdapter statusAdapter, int style) { statusAdapter.setProperty(WorkbenchStatusDialogManager.HINT, new Integer(style)); @@ -58,6 +60,7 @@ public class WorkbenchErrorHandler extends AbstractStatusHandler { } else { if (block) { Display.getDefault().syncExec(new Runnable() { + @Override public void run() { showStatusAdapter(statusAdapter, true); } @@ -65,6 +68,7 @@ public class WorkbenchErrorHandler extends AbstractStatusHandler { } else { Display.getDefault().asyncExec(new Runnable() { + @Override public void run() { showStatusAdapter(statusAdapter, false); } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/statushandlers/WorkbenchStatusDialogManager.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/statushandlers/WorkbenchStatusDialogManager.java index 21ceee87722..6a51cf290d2 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/statushandlers/WorkbenchStatusDialogManager.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/statushandlers/WorkbenchStatusDialogManager.java @@ -96,6 +96,7 @@ public class WorkbenchStatusDialogManager { * @deprecated As of 3.4 the <code>parentShell<code> is ignored * @see #WorkbenchStatusDialogManager(int, String) */ + @Deprecated public WorkbenchStatusDialogManager(Shell parentShell, int displayMask, String dialogTitle) { this(displayMask, dialogTitle); @@ -122,6 +123,7 @@ public class WorkbenchStatusDialogManager { * @deprecated As of 3.4 the <code>parentShell<code> is ignored * @see #WorkbenchStatusDialogManager(String) */ + @Deprecated public WorkbenchStatusDialogManager(Shell parentShell, String dialogTitle) { this(dialogTitle); } @@ -205,6 +207,7 @@ public class WorkbenchStatusDialogManager { * @param labelProvider * a label provider to be used when displaying status adapters. */ + @Deprecated public void setStatusListLabelProvider(ITableLabelProvider labelProvider) { manager.setStatusListLabelProvider(labelProvider); } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/themes/RGBBlendColorFactory.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/themes/RGBBlendColorFactory.java index fb77ec7b5bb..d7927c32520 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/themes/RGBBlendColorFactory.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/themes/RGBBlendColorFactory.java @@ -53,7 +53,8 @@ public class RGBBlendColorFactory implements IColorFactory, /* (non-Javadoc) * @see org.eclipse.ui.themes.IColorFactory#createColor() */ - public RGB createColor() { + @Override + public RGB createColor() { if (color1 == null && color2 == null) { return new RGB(0, 0, 0); } else if (color1 != null && color2 == null) { @@ -76,7 +77,8 @@ public class RGBBlendColorFactory implements IColorFactory, * * @see org.eclipse.core.runtime.IExecutableExtension#setInitializationData(org.eclipse.core.runtime.IConfigurationElement, java.lang.String, java.lang.Object) */ - public void setInitializationData(IConfigurationElement config, + @Override + public void setInitializationData(IConfigurationElement config, String propertyName, Object data) throws CoreException { if (data instanceof Hashtable) { diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/views/IViewDescriptor.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/views/IViewDescriptor.java index c38aea75a06..3083a9ae584 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/views/IViewDescriptor.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/views/IViewDescriptor.java @@ -62,19 +62,22 @@ public interface IViewDescriptor extends IWorkbenchPartDescriptor, IAdaptable { * * @return the id */ - public String getId(); + @Override + public String getId(); /** * Returns the descriptor for the icon to show for this view. */ - public ImageDescriptor getImageDescriptor(); + @Override + public ImageDescriptor getImageDescriptor(); /** * Returns the label to show for this view. * * @return the label */ - public String getLabel(); + @Override + public String getLabel(); /** * Returns the default fast view width ratio for this view. |