Bug 479210 - Use annotations in org.eclipse.ui.cheatsheets and removeI20151103-0800I20151029-1100I20151028-2000I20151028-0800I20151027-2000I20151027-0800I20151026-2000I20151026-0800I20151025-2000I20151020-0800I20151014-1100I20151013-0800

Non-Javadoc

Change-Id: Ie404da2ce4b92dbbe730059cc10ed2ce57ddd5f0
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>

70 files changed, 291 insertions, 12 deletions

diff --git a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/cheatsheets/CheatSheetExtensionFactory.java b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/cheatsheets/CheatSheetExtensionFactory.java
index ae4f8bf58..0ef297f78 100644
--- a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/cheatsheets/CheatSheetExtensionFactory.java
+++ b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/cheatsheets/CheatSheetExtensionFactory.java
@@ -54,6 +54,7 @@ public class CheatSheetExtensionFactory implements IExecutableExtensionFactory,
 	 * 
 	 * @see org.eclipse.core.runtime.IExecutableExtensionFactory#create()
 	 */
+	@Override
 	public Object create() throws CoreException {
 		if (HELP_MENU_ACTION.equals(id))
 			return configure(new CheatSheetHelpMenuAction());
@@ -68,6 +69,7 @@ public class CheatSheetExtensionFactory 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/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/cheatsheets/OpenCheatSheetAction.java b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/cheatsheets/OpenCheatSheetAction.java
index bc8d20b85..cf2528c67 100644
--- a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/cheatsheets/OpenCheatSheetAction.java
+++ b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/cheatsheets/OpenCheatSheetAction.java
@@ -112,6 +112,7 @@ public final class OpenCheatSheetAction extends Action {
 	 * for the cheat sheet with the id passed to this action.
 	 * @see IAction#run()
 	 */
+	@Override
 	public void run() {
 		Shell shell = Display.getDefault().getActiveShell();
 		// are we in a dialog that can show a cheat sheet?
diff --git a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/cheatsheets/OpenCheatSheetFromHelpAction.java b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/cheatsheets/OpenCheatSheetFromHelpAction.java
index 0a07f670a..0b5989e30 100644
--- a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/cheatsheets/OpenCheatSheetFromHelpAction.java
+++ b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/cheatsheets/OpenCheatSheetFromHelpAction.java
@@ -42,6 +42,7 @@ public final class OpenCheatSheetFromHelpAction implements ILiveHelpAction {
 	 * registered cheat sheet in order for the action to work.
 	 * @see ILiveHelpAction#setInitializationString(String)
 	 */
+	@Override
 	public void setInitializationString(String data) {
 		cheatsheetID = data;
 	}
@@ -49,9 +50,11 @@ public final class OpenCheatSheetFromHelpAction implements ILiveHelpAction {
 	/* (non-javadoc)
 	 * @see java.lang.Runnable#run()
 	 */
+	@Override
 	public void run() {
 		// Active help does not run on the UI thread, so we must use syncExec
 		Display.getDefault().syncExec(new Runnable() {
+			@Override
 			public void run() {
 				new OpenCheatSheetAction(cheatsheetID).run();
 			}
diff --git a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/ActionRunner.java b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/ActionRunner.java
index 34f80dbf7..d3d813542 100644
--- a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/ActionRunner.java
+++ b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/ActionRunner.java
@@ -56,6 +56,7 @@ public class ActionRunner {
 		final boolean[] listenerFired = { false };
 		final boolean[] listenerResult = { false };
 		IPropertyChangeListener propertyChangeListener = new IPropertyChangeListener() {
+			@Override
 			public void propertyChange(PropertyChangeEvent event) {
 				if(event.getProperty().equals(IAction.RESULT) && event.getNewValue() instanceof Boolean) {
 					listenerFired[0] = true;
diff --git a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/CheatSheetPlugin.java b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/CheatSheetPlugin.java
index 670be2a2e..c9546d711 100644
--- a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/CheatSheetPlugin.java
+++ b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/CheatSheetPlugin.java
@@ -146,6 +146,7 @@ public class CheatSheetPlugin extends AbstractUIPlugin {
 		CheatSheetPlugin.getPlugin().getLog().log(errorStatus);
 	}
 	
+	@Override
 	protected void initializeImageRegistry(ImageRegistry reg) {
 		IPath path = ICONS_PATH.append(T_OBJ).append("cheatsheet_obj.gif");//$NON-NLS-1$
 		ImageDescriptor imageDescriptor = createImageDescriptor(getPlugin().getBundle(), path);
@@ -239,6 +240,7 @@ public class CheatSheetPlugin extends AbstractUIPlugin {
 	 */
 	private void restoreCheatSheetHistory() {
 		SafeRunner.run(new SafeRunnable() {
+			@Override
 			public void run() {
 				IMemento memento;				
 				memento = readMemento(HISTORY_FILENAME);
@@ -249,6 +251,7 @@ public class CheatSheetPlugin extends AbstractUIPlugin {
 					}
 				}
 			}
+			@Override
 			public void handleException(Throwable e) {
 				String message = Messages.ERROR_READING_STATE_FILE;
 				IStatus status = new Status(IStatus.ERROR, ICheatSheetResource.CHEAT_SHEET_PLUGIN_ID, IStatus.OK, message, e);
@@ -302,6 +305,7 @@ public class CheatSheetPlugin extends AbstractUIPlugin {
 	 */
 	private void saveCheatSheetHistory() {
 		SafeRunner.run(new SafeRunnable() {
+			@Override
 			public void run() {
 				XMLMemento memento = XMLMemento.createWriteRoot(MEMENTO_TAG_CHEATSHEET);
 
@@ -316,6 +320,7 @@ public class CheatSheetPlugin extends AbstractUIPlugin {
 					CheatSheetPlugin.getPlugin().getLog().log(status);
 				}
 			}
+			@Override
 			public void handleException(Throwable e) {
 				String message = Messages.ERROR_WRITING_STATE_FILE;
 				IStatus status = new Status(IStatus.ERROR, ICheatSheetResource.CHEAT_SHEET_PLUGIN_ID, IStatus.OK, message, e);
@@ -357,9 +362,7 @@ public class CheatSheetPlugin extends AbstractUIPlugin {
 		}
 	}
 
-	/* (non-Javadoc)
-	 * @see org.osgi.framework.BundleActivator#start(org.osgi.framework.BundleContext)
-	 */
+	@Override
 	public void start(BundleContext context) throws Exception {
 		super.start(context);
 
@@ -368,9 +371,7 @@ public class CheatSheetPlugin extends AbstractUIPlugin {
 		// allow the MRU history to be lazily initialized by getCheatSheetHistory
 	}
 
-	/* (non-Javadoc)
-	 * @see org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundleContext)
-	 */
+	@Override
 	public void stop(BundleContext context) throws Exception {
 		super.stop(context);
 		
diff --git a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/CheatsheetSearchParticipant.java b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/CheatsheetSearchParticipant.java
index a1903ca21..c156afbe9 100644
--- a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/CheatsheetSearchParticipant.java
+++ b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/CheatsheetSearchParticipant.java
@@ -37,6 +37,7 @@ public class CheatsheetSearchParticipant extends SearchParticipantXML {
 	 * 
 	 * @return a set of hrefs for documents managed by this participant.
 	 */
+	@Override
 	public Set getAllDocuments(String locale) {
 		HashSet set = new HashSet();
 		IConfigurationElement[] elements = Platform.getExtensionRegistry()
@@ -64,6 +65,7 @@ public class CheatsheetSearchParticipant extends SearchParticipantXML {
 		return set;
 	}
 
+	@Override
 	public Set getContributingPlugins() {
 		IConfigurationElement[] elements = Platform.getExtensionRegistry()
 				.getConfigurationElementsFor(
@@ -79,6 +81,7 @@ public class CheatsheetSearchParticipant extends SearchParticipantXML {
 		return set;
 	}
 
+	@Override
 	protected void handleStartElement(String name, Attributes attributes,
 			IParsedXMLContent data) {
 		if (name.equals(IParserTags.CHEATSHEET)) {
@@ -97,9 +100,11 @@ public class CheatsheetSearchParticipant extends SearchParticipantXML {
 	    }
 	}
 
+	@Override
 	protected void handleEndElement(String name, IParsedXMLContent data) {
 	}
 
+	@Override
 	protected void handleText(String text, IParsedXMLContent data) {
 		String stackPath = getElementStackPath();
 		String top = getTopElement();
@@ -120,6 +125,7 @@ public class CheatsheetSearchParticipant extends SearchParticipantXML {
 		}
 	}
 
+	@Override
 	public boolean open(String id) {
 		Action openAction = new OpenCheatSheetAction(id);
 		openAction.run();
diff --git a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/actions/CheatSheetCategoryBasedSelectionAction.java b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/actions/CheatSheetCategoryBasedSelectionAction.java
index 299645c57..166221dee 100644
--- a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/actions/CheatSheetCategoryBasedSelectionAction.java
+++ b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/actions/CheatSheetCategoryBasedSelectionAction.java
@@ -54,6 +54,7 @@ public class CheatSheetCategoryBasedSelectionAction extends Action {
 	/**
 	 * @see Action#run()
 	 */
+	@Override
 	public void run() {
 		CheatSheetCollectionElement cheatSheets = (CheatSheetCollectionElement)CheatSheetRegistryReader.getInstance().getCheatSheets();
 
diff --git a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/actions/CheatSheetHelpMenuAction.java b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/actions/CheatSheetHelpMenuAction.java
index 9714bbfe6..a1d9bb40e 100644
--- a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/actions/CheatSheetHelpMenuAction.java
+++ b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/actions/CheatSheetHelpMenuAction.java
@@ -22,18 +22,21 @@ public class CheatSheetHelpMenuAction implements IWorkbenchWindowActionDelegate
 	/* (non-Javadoc)
 	 * @see org.eclipse.ui.IWorkbenchWindowActionDelegate#dispose()
 	 */
+	@Override
 	public void dispose() {
 	}
 
 	/* (non-Javadoc)
 	 * @see org.eclipse.ui.IWorkbenchWindowActionDelegate#init(org.eclipse.ui.IWorkbenchWindow)
 	 */
+	@Override
 	public void init(IWorkbenchWindow window) {
 	}
 
 	/* (non-Javadoc)
 	 * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction)
 	 */
+	@Override
 	public void run(IAction action) {
 		new CheatSheetCategoryBasedSelectionAction().run();
 	}
@@ -41,6 +44,7 @@ public class CheatSheetHelpMenuAction implements IWorkbenchWindowActionDelegate
 	/* (non-Javadoc)
 	 * @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction, org.eclipse.jface.viewers.ISelection)
 	 */
+	@Override
 	public void selectionChanged(IAction action, ISelection selection) {
 	}
 }
diff --git a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/actions/CheatSheetMenu.java b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/actions/CheatSheetMenu.java
index f2070f6dd..402642c9f 100644
--- a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/actions/CheatSheetMenu.java
+++ b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/actions/CheatSheetMenu.java
@@ -51,6 +51,7 @@ public class CheatSheetMenu extends ContributionItem {
 	private Comparator comparator = new Comparator() {
 		private Collator collator = Collator.getInstance();
 
+		@Override
 		public int compare(Object ob1, Object ob2) {
 			if(ob1 == null || ob2 == null) {
 				return -1;
@@ -89,6 +90,7 @@ public class CheatSheetMenu extends ContributionItem {
 		mi.setImage(CheatSheetPlugin.getPlugin().getImageRegistry().get(key));
 		mi.setSelection(bCheck);
 		mi.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent e) {
 				run(element, e);
 			}
@@ -102,6 +104,7 @@ public class CheatSheetMenu extends ContributionItem {
 		MenuItem mi = new MenuItem(menu, SWT.PUSH, index);
 		mi.setText(Messages.CHEAT_SHEET_OTHER_MENU);
 		mi.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent e) {
 				runOther(e);
 			}
@@ -111,6 +114,7 @@ public class CheatSheetMenu extends ContributionItem {
 	/* (non-Javadoc)
 	 * Fills the menu with cheatsheet items.
 	 */
+	@Override
 	public void fill(Menu menu, int index) {
 		// Get the checked cheatsheet.
 		String checkID = null;
@@ -269,6 +273,7 @@ public class CheatSheetMenu extends ContributionItem {
 	/* (non-Javadoc)
 	 * Returns whether this menu is dynamic.
 	 */
+	@Override
 	public boolean isDynamic() {
 		return true;
 	}
@@ -276,6 +281,7 @@ public class CheatSheetMenu extends ContributionItem {
 	/* (non-Javadoc)
 	 * @see org.eclipse.jface.action.IContributionItem#isVisible()
 	 */
+	@Override
 	public boolean isVisible() {
 		return getActiveWorkbenchPage() != null;
 	}
diff --git a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/actions/CheatSheetMenuAction.java b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/actions/CheatSheetMenuAction.java
index bf5970181..442ea5686 100644
--- a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/actions/CheatSheetMenuAction.java
+++ b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/actions/CheatSheetMenuAction.java
@@ -43,6 +43,7 @@ public class CheatSheetMenuAction implements IWorkbenchWindowPulldownDelegate2,
 	/* (non-Javadoc)
 	 * @see IWorkbenchWindowActionDelegate#dispose
 	 */
+	@Override
 	public void dispose() {
 		setMenu(null);
 		CheatSheetPlugin.getPlugin().getCheatSheetHistory().removeListener(this);
@@ -61,6 +62,7 @@ public class CheatSheetMenuAction implements IWorkbenchWindowPulldownDelegate2,
 	/* (non-Javadoc)
 	 * @see org.eclipse.ui.IWorkbenchWindowPulldownDelegate#getMenu(org.eclipse.swt.widgets.Control)
 	 */
+	@Override
 	public Menu getMenu(Control parent) {
 		return null;
 	}
@@ -68,6 +70,7 @@ public class CheatSheetMenuAction implements IWorkbenchWindowPulldownDelegate2,
 	/* (non-Javadoc)
 	 * @see org.eclipse.ui.IWorkbenchWindowPulldownDelegate2#getMenu(org.eclipse.swt.widgets.Menu)
 	 */
+	@Override
 	public Menu getMenu(Menu parent) {
 		setMenu(new Menu(parent));
 		fillMenu(fMenu);
@@ -78,6 +81,7 @@ public class CheatSheetMenuAction implements IWorkbenchWindowPulldownDelegate2,
 	/* (non-Javadoc)
 	 * @see IWorkbenchWindowActionDelegate#init
 	 */
+	@Override
 	public void init(IWorkbenchWindow window) {
 	}
 
@@ -88,6 +92,7 @@ public class CheatSheetMenuAction implements IWorkbenchWindowPulldownDelegate2,
 		// Add listener to repopulate the menu each time
 		// it is shown because of dynamic history list
 		fMenu.addMenuListener(new MenuAdapter() {
+			@Override
 			public void menuShown(MenuEvent e) {
 				if (fRecreateMenu) {
 					Menu m = (Menu)e.widget;
@@ -105,6 +110,7 @@ public class CheatSheetMenuAction implements IWorkbenchWindowPulldownDelegate2,
 	/* (non-Javadoc)
 	 * @see org.eclipse.ui.IPropertyListener#propertyChanged(java.lang.Object, int)
 	 */
+	@Override
 	public void propertyChanged(Object source, int propId) {
 		fRecreateMenu = true;
 	}
@@ -112,12 +118,14 @@ public class CheatSheetMenuAction implements IWorkbenchWindowPulldownDelegate2,
 	/* (non-Javadoc)
 	 * @see IWorkbenchWindowActionDelegate#run
 	 */
+	@Override
 	public void run(IAction action) {
 	}
 
 	/* (non-Javadoc)
 	 * @see IWorkbenchWindowActionDelegate#selectionChanged
 	 */
+	@Override
 	public void selectionChanged(IAction action, ISelection selection) {
 	}
 
diff --git a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/actions/OpenPerspective.java b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/actions/OpenPerspective.java
index 2e0d55743..feae23f12 100644
--- a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/actions/OpenPerspective.java
+++ b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/actions/OpenPerspective.java
@@ -37,6 +37,7 @@ public class OpenPerspective extends Action implements ICheatSheetAction {
 	/**
 	 * @see Action#run()
 	 */
+	@Override
 	public void run(String[] params, ICheatSheetManager manager) {
 		try {
 			if(params == null || params[0] == null) {
diff --git a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/explorer/AbstractOverlayIcon.java b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/explorer/AbstractOverlayIcon.java
index 245e30dd9..3a9f13a55 100644
--- a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/explorer/AbstractOverlayIcon.java
+++ b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/explorer/AbstractOverlayIcon.java
@@ -66,6 +66,7 @@ public abstract class AbstractOverlayIcon extends CompositeImageDescriptor {
 
 	protected abstract ImageData getBaseImageData();
 
+	@Override
 	protected void drawCompositeImage(int width, int height) {
 		ImageData base = getBaseImageData();
 		drawImage(base, 0, 0);
@@ -110,6 +111,7 @@ public abstract class AbstractOverlayIcon extends CompositeImageDescriptor {
 		}
 	}
 
+	@Override
 	protected Point getSize() {
 		return fSize;
 	}
diff --git a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/explorer/ConfirmRestartDialog.java b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/explorer/ConfirmRestartDialog.java
index 7f54a2cf8..860e3a681 100644
--- a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/explorer/ConfirmRestartDialog.java
+++ b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/explorer/ConfirmRestartDialog.java
@@ -34,14 +34,17 @@ import org.eclipse.ui.internal.cheatsheets.composite.model.AbstractTask;
 public class ConfirmRestartDialog extends Dialog {
 
 	public class TaskLabelProvider extends LabelProvider implements ITableLabelProvider {
+		@Override
 		public String getColumnText(Object obj, int index) {
 			return treeLabelProvider.getText(obj);
 		}
 		
+		@Override
 		public Image getColumnImage(Object obj, int index) {
 			return treeLabelProvider.getImage(obj);
 		}
 		
+		@Override
 		public Image getImage(Object obj) {
 			return PlatformUI.getWorkbench().
 					getSharedImages().getImage(ISharedImages.IMG_OBJ_ELEMENT);
@@ -53,13 +56,16 @@ public class ConfirmRestartDialog extends Dialog {
 		
 		Object[] input;
 		
+		@Override
 		public void inputChanged(Viewer v, Object oldInput, Object newInput) {
 			input = (Object[])newInput;
 		}
 		
+		@Override
 		public void dispose() {
 		}	
 		
+		@Override
 		public Object[] getElements(Object parent) {
 			return input;
 		}
@@ -76,6 +82,7 @@ public class ConfirmRestartDialog extends Dialog {
 		this.treeLabelProvider = treeLabelProvider;
 	}
 	
+	@Override
 	protected Control createDialogArea(Composite parent) {
 		Composite composite = new Composite(parent, SWT.NULL);
 		composite.setLayout(new GridLayout());
@@ -94,6 +101,7 @@ public class ConfirmRestartDialog extends Dialog {
 		return composite;
 	}
 	
+	@Override
 	protected void configureShell(Shell newShell) {
 		super.configureShell(newShell);
 		newShell.setImage(CheatSheetPlugin.getPlugin().getImage(ICheatSheetResource.CHEATSHEET_RETURN));
diff --git a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/explorer/OverlayIcon.java b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/explorer/OverlayIcon.java
index 461e4c201..0eeda3f27 100644
--- a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/explorer/OverlayIcon.java
+++ b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/explorer/OverlayIcon.java
@@ -31,6 +31,7 @@ public class OverlayIcon extends AbstractOverlayIcon {
 			fBase = ImageDescriptor.getMissingImageDescriptor();
 	}
 
+	@Override
 	protected ImageData getBaseImageData() {
 		return fBase.getImageData();
 	}
diff --git a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/explorer/ResetTaskAction.java b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/explorer/ResetTaskAction.java
index f9d926076..5596ce2dc 100644
--- a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/explorer/ResetTaskAction.java
+++ b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/explorer/ResetTaskAction.java
@@ -37,6 +37,7 @@ public class ResetTaskAction extends Action {
 		this.setImageDescriptor(restartImage);
 	}
 	
+	@Override
 	public void run() {
 		AbstractTask[] restartTasks = TaskStateUtilities.getRestartTasks(task);
 		if (restartTasks.length == 0) return;
diff --git a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/explorer/RestartAllAction.java b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/explorer/RestartAllAction.java
index df6004409..c906e655c 100644
--- a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/explorer/RestartAllAction.java
+++ b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/explorer/RestartAllAction.java
@@ -33,6 +33,7 @@ public class RestartAllAction extends Action {
 		this.setImageDescriptor(restartImage);
 	}
 	
+	@Override
 	public void run() {
 		if (confirmRestart()) {
 		    ((CompositeCheatSheetModel)model).resetAllTasks(null);
diff --git a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/explorer/SkipAction.java b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/explorer/SkipAction.java
index 36af70fef..aa5beec92 100644
--- a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/explorer/SkipAction.java
+++ b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/explorer/SkipAction.java
@@ -32,6 +32,7 @@ public class SkipAction extends Action {
 		this.setImageDescriptor(skipImage);
 	}
 	
+	@Override
 	public void run() {
 	    task.setState(ICompositeCheatSheetTask.SKIPPED);
 	}
diff --git a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/explorer/StartAction.java b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/explorer/StartAction.java
index 11ffb2d96..c4e86b836 100644
--- a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/explorer/StartAction.java
+++ b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/explorer/StartAction.java
@@ -31,6 +31,7 @@ public class StartAction extends Action {
 		this.setImageDescriptor(startImage);
 	}
 	
+	@Override
 	public void run() {
 		task.setState(ICompositeCheatSheetTask.IN_PROGRESS);
 	}
diff --git a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/explorer/TreeContentProvider.java b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/explorer/TreeContentProvider.java
index acf2cf79e..00de93990 100644
--- a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/explorer/TreeContentProvider.java
+++ b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/explorer/TreeContentProvider.java
@@ -18,6 +18,7 @@ import org.eclipse.ui.internal.provisional.cheatsheets.ICompositeCheatSheet;
 import org.eclipse.ui.internal.provisional.cheatsheets.ITaskGroup;
 
 class TreeContentProvider implements ITreeContentProvider {
+	@Override
 	public Object[] getChildren(Object parentElement) {
 		if (parentElement instanceof ICompositeCheatSheet) {
 			final Object[] rootTask = {((ICompositeCheatSheet) parentElement).getRootTask()};
@@ -28,6 +29,7 @@ class TreeContentProvider implements ITreeContentProvider {
 		return new Object[0];
 	}
 
+	@Override
 	public Object getParent(Object element) {
 		if (element instanceof  AbstractTask) {
 			return ((AbstractTask)element).getParent();
@@ -35,6 +37,7 @@ class TreeContentProvider implements ITreeContentProvider {
 		return null;
 	}
 
+	@Override
 	public boolean hasChildren(Object element) {
 		if (element instanceof ICompositeCheatSheet)
 			return true;
@@ -43,13 +46,16 @@ class TreeContentProvider implements ITreeContentProvider {
 		return false;
 	}
 
+	@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/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/explorer/TreeExplorerMenu.java b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/explorer/TreeExplorerMenu.java
index 635473bb2..ef2e5c689 100644
--- a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/explorer/TreeExplorerMenu.java
+++ b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/explorer/TreeExplorerMenu.java
@@ -35,6 +35,7 @@ public class TreeExplorerMenu {
 		MenuManager menuMgr = new MenuManager(null);
 		menuMgr.setRemoveAllWhenShown(true);
 		menuMgr.addMenuListener(new IMenuListener() {
+			@Override
 			public void menuAboutToShow(IMenuManager manager) {
 				fillContextMenu(manager);
 			}
diff --git a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/explorer/TreeLabelProvider.java b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/explorer/TreeLabelProvider.java
index 7ad77dc7b..f5be72b57 100644
--- a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/explorer/TreeLabelProvider.java
+++ b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/explorer/TreeLabelProvider.java
@@ -65,6 +65,7 @@ public class TreeLabelProvider extends LabelProvider {
 		imageMap = new HashMap();
 	}
 
+	@Override
 	public String getText(Object obj) {
 		String result;
 		if (obj instanceof ICompositeCheatSheetTask) {
@@ -78,6 +79,7 @@ public class TreeLabelProvider extends LabelProvider {
 		return result;
 	}
 
+	@Override
 	public Image getImage(Object obj) {
 		if (obj instanceof ICompositeCheatSheetTask) {
 			ICompositeCheatSheetTask task = (ICompositeCheatSheetTask) obj;
@@ -196,6 +198,7 @@ public class TreeLabelProvider extends LabelProvider {
 		}
 	}
 
+	@Override
 	public void dispose() {
 		if (imageMap != null) {
 			for (Iterator iter = imageMap.values().iterator(); iter.hasNext(); ) {
diff --git a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/explorer/TreeTaskExplorer.java b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/explorer/TreeTaskExplorer.java
index a7fbe2ff7..2a02ab91a 100644
--- a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/explorer/TreeTaskExplorer.java
+++ b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/explorer/TreeTaskExplorer.java
@@ -28,10 +28,12 @@ public class TreeTaskExplorer extends TaskExplorer {
 	private TreeViewer viewer;
 
 	
+	@Override
 	public String getId() {
 		return ICompositeCheatsheetTags.TREE;
 	}	
 
+	@Override
 	public void createControl(Composite parent, FormToolkit toolkit) {
 		Tree tree = new Tree(parent, toolkit.getOrientation());
 		toolkit.adapt(tree, false, false);
@@ -40,30 +42,37 @@ public class TreeTaskExplorer extends TaskExplorer {
 		viewer.setLabelProvider(new TreeLabelProvider());
 	}
 	
+	@Override
 	public void taskUpdated(ICompositeCheatSheetTask task) {
 		viewer.update(task, null);
 	}
 
+	@Override
 	public Control getControl() {
 		return viewer.getControl();
 	}
 
+	@Override
 	public void setFocus() {
 		viewer.getControl().setFocus();
 	}
 
+	@Override
 	public ISelectionProvider getSelectionProvider() {
 		return viewer;
 	}
 
+	@Override
 	public void setCompositeCheatSheet(ICompositeCheatSheet compositeCheatSheet) {
 		viewer.setInput(compositeCheatSheet);
 	}
 
+	@Override
 	public void dispose() {
 		viewer.getLabelProvider().dispose();		
 	}
 
+	@Override
 	public void setSelection(ISelection selection, boolean reveal) {
 		viewer.setSelection(selection, reveal);
 	}
diff --git a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/model/AbstractTask.java b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/model/AbstractTask.java
index ca7d3bbcf..e2ddf8b8d 100644
--- a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/model/AbstractTask.java
+++ b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/model/AbstractTask.java
@@ -66,22 +66,27 @@ public abstract class AbstractTask implements ICompositeCheatSheetTask {
 		requiredTasks = new ArrayList();
 	}
 
+	@Override
 	public String getId() {
 		return id;
 	}
 
+	@Override
 	public String getName() {
 		return name;
 	}
 
+	@Override
 	public String getKind() {
 		return kind;
 	}
 
+	@Override
 	public Dictionary getParameters() {
 		return parameters;
 	}
 
+	@Override
 	public String getDescription() {
 		return description;
 	}
@@ -94,10 +99,12 @@ public abstract class AbstractTask implements ICompositeCheatSheetTask {
 		this.completionMessage = completionMessage;
 	}
 
+	@Override
 	public String getCompletionMessage() {
 		return completionMessage;
 	}
 
+	@Override
 	public ICompositeCheatSheetTask[] getRequiredTasks() {
 		if (requiredTasks==null) return EMPTY;
 		return (ICompositeCheatSheetTask[])requiredTasks.toArray(new ICompositeCheatSheetTask[requiredTasks.size()]);
@@ -117,6 +124,7 @@ public abstract class AbstractTask implements ICompositeCheatSheetTask {
 		task.successorTasks.add(this);
 	}
 
+	@Override
 	public int getState() {
 		return state;
 	}
@@ -125,6 +133,7 @@ public abstract class AbstractTask implements ICompositeCheatSheetTask {
 		setState(COMPLETED);
 	}
 
+	@Override
 	public boolean requiredTasksCompleted() {
 		boolean startable = true;
 		ICompositeCheatSheetTask[] requiredTasks = getRequiredTasks();
@@ -190,18 +199,21 @@ public abstract class AbstractTask implements ICompositeCheatSheetTask {
 
 	}
 
+	@Override
 	public ICompositeCheatSheet getCompositeCheatSheet() {
 		return model;
 	}
 	
 	public abstract ITaskParseStrategy getParserStrategy();
 
+	@Override
 	public abstract ICompositeCheatSheetTask[] getSubtasks();
 
 	public void setSkippable(boolean skippable) {
 		this.skippable = skippable;
 	}
 
+	@Override
 	public boolean isSkippable() {
 		return skippable;
 	}
@@ -210,10 +222,12 @@ public abstract class AbstractTask implements ICompositeCheatSheetTask {
 		this.parent = parent;
 	}
 
+	@Override
 	public ITaskGroup getParent() {
 		return parent;
 	}
 	
+	@Override
 	public int hashCode() {
 		return getId().hashCode();
 	}
diff --git a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/model/CompositeCheatSheetModel.java b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/model/CompositeCheatSheetModel.java
index c0fa5f57e..64c89316a 100644
--- a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/model/CompositeCheatSheetModel.java
+++ b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/model/CompositeCheatSheetModel.java
@@ -58,10 +58,12 @@ public class CompositeCheatSheetModel extends Observable implements ICompositeCh
 		return description;
 	}
 
+	@Override
 	public String getTaskExplorerId() {
 		return explorerId;
 	}
 	
+	@Override
 	public ICompositeCheatSheetTask getRootTask() {
 		return rootTask;
 	}
@@ -127,6 +129,7 @@ public class CompositeCheatSheetModel extends Observable implements ICompositeCh
 		 return saveHelper.getTaskMemento(id);
 	}
 
+	@Override
 	public ICheatSheetManager getCheatSheetManager() {
 		return manager;
 	}
diff --git a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/model/EditableTask.java b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/model/EditableTask.java
index 324b1d901..cc8fcaddb 100644
--- a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/model/EditableTask.java
+++ b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/model/EditableTask.java
@@ -37,10 +37,12 @@ public class EditableTask extends AbstractTask implements IEditableTask {
 		parserStrategy = new EditableTaskParseStrategy();
 	}
 	
+	@Override
 	public ITaskParseStrategy getParserStrategy() {
 		return parserStrategy;
 	}
 
+	@Override
 	public ICompositeCheatSheetTask[] getSubtasks() {
 		return EMPTY;
 	}
diff --git a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/model/TaskChoiceCompletionStrategy.java b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/model/TaskChoiceCompletionStrategy.java
index 9e5d1734b..a4c7aab61 100644
--- a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/model/TaskChoiceCompletionStrategy.java
+++ b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/model/TaskChoiceCompletionStrategy.java
@@ -22,6 +22,7 @@ public class TaskChoiceCompletionStrategy implements TaskGroup.CompletionStrateg
 	 * IN_PROGRESS otherwise
 	 * @return
 	 */
+	@Override
 	public int computeState(TaskGroup taskGroup) {
 		boolean noChildrenStarted = true;
 		boolean atLeastOneChildCompleted = false;
diff --git a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/model/TaskGroup.java b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/model/TaskGroup.java
index d5efc4157..12fab17d4 100644
--- a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/model/TaskGroup.java
+++ b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/model/TaskGroup.java
@@ -45,10 +45,12 @@ public class TaskGroup extends AbstractTask implements ITaskGroup {
 		return new TaskSetCompletionStrategy();
 	}
 
+	@Override
 	public ITaskParseStrategy getParserStrategy() {
 		return parserStrategy;
 	}
 	
+	@Override
 	public ICompositeCheatSheetTask[] getSubtasks() {
 		if (subtasks==null) return EMPTY;
 		return (ICompositeCheatSheetTask[])subtasks.toArray(new ICompositeCheatSheetTask[subtasks.size()]);
diff --git a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/model/TaskSetCompletionStrategy.java b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/model/TaskSetCompletionStrategy.java
index be85b142b..0ddad9d5a 100644
--- a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/model/TaskSetCompletionStrategy.java
+++ b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/model/TaskSetCompletionStrategy.java
@@ -22,6 +22,7 @@ public class TaskSetCompletionStrategy implements TaskGroup.CompletionStrategy {
 	 * IN_PROGRESS otherwise
 	 * @return
 	 */
+	@Override
 	public int computeState(TaskGroup taskGroup) {
 		boolean noChildrenStarted = true;
 		boolean allChildrenCompleted = true;
diff --git a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/parser/CompositeCheatSheetParser.java b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/parser/CompositeCheatSheetParser.java
index 6fc2f8891..79236be82 100644
--- a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/parser/CompositeCheatSheetParser.java
+++ b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/parser/CompositeCheatSheetParser.java
@@ -70,6 +70,7 @@ public class CompositeCheatSheetParser implements IStatusContainer {
 		return documentBuilder;
 	}
 		
+	@Override
 	public void addStatus(int severity, String message, Throwable exception) { 
 		status = ParserStatusUtility.addStatus(status, severity, message, exception);
 	}
diff --git a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/parser/EditableTaskParseStrategy.java b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/parser/EditableTaskParseStrategy.java
index 3d357adc8..1ec86c11e 100644
--- a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/parser/EditableTaskParseStrategy.java
+++ b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/parser/EditableTaskParseStrategy.java
@@ -22,10 +22,12 @@ public class EditableTaskParseStrategy implements ITaskParseStrategy {
 	
 	private boolean editableChildErrorReported;
 	
+	@Override
 	public void init() {
 		editableChildErrorReported = false;
 	}
 
+	@Override
 	public boolean parseElementNode(Node childNode, Node parentNode,
 			AbstractTask parentTask, IStatusContainer status) {	
 		boolean isElementHandled = true;
@@ -44,6 +46,7 @@ public class EditableTaskParseStrategy implements ITaskParseStrategy {
 		return isElementHandled;
 	}
 
+	@Override
 	public void parsingComplete(AbstractTask parentTask, IStatusContainer status) {
 		if (parentTask.getKind() == null) {
 			String message = NLS.bind(
diff --git a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/parser/TaskGroupParseStrategy.java b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/parser/TaskGroupParseStrategy.java
index 372990789..d1980d1b5 100644
--- a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/parser/TaskGroupParseStrategy.java
+++ b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/parser/TaskGroupParseStrategy.java
@@ -25,9 +25,11 @@ public class TaskGroupParseStrategy implements ITaskParseStrategy {
 	public TaskGroupParseStrategy() {
 	}
 	
+	@Override
 	public void init() {	
 	}
 	
+	@Override
 	public boolean parseElementNode(Node childNode, Node parentNode,
 			AbstractTask parentTask, IStatusContainer status) 
     {
@@ -35,6 +37,7 @@ public class TaskGroupParseStrategy implements ITaskParseStrategy {
 		return false;
 	}
 
+	@Override
 	public void parsingComplete(AbstractTask parentTask, IStatusContainer status) {
 		String kind = parentTask.getKind();
 		if (ITaskGroup.SEQUENCE.equals(kind)) {
diff --git a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/views/CheatsheetTaskEditor.java b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/views/CheatsheetTaskEditor.java
index 1999f37d8..062efba42 100644
--- a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/views/CheatsheetTaskEditor.java
+++ b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/views/CheatsheetTaskEditor.java
@@ -34,16 +34,19 @@ public class CheatsheetTaskEditor extends TaskEditor {
 	private CheatSheetViewer viewer;
 	private IEditableTask task;
 
+	@Override
 	public void createControl(Composite parent, FormToolkit toolkit) {
 		viewer = (CheatSheetViewer)CheatSheetViewerFactory.createCheatSheetView();
 		viewer.createPartControl(parent);
 	}
 	
+	@Override
 	public Control getControl() {
 		return viewer.getControl();
 	}
 
 
+	@Override
 	public void setInput(IEditableTask task, IMemento memento) {
 		this.task = task;	
 		Dictionary params = task.getParameters();
@@ -92,6 +95,7 @@ public class CheatsheetTaskEditor extends TaskEditor {
 	 */
 	private class TaskListener extends CheatSheetListener {
 
+		@Override
 		public void cheatSheetEvent(ICheatSheetEvent event) {
 			if (event.getEventType() == ICheatSheetEvent.CHEATSHEET_COMPLETED) {
 				task.complete();
@@ -99,6 +103,7 @@ public class CheatsheetTaskEditor extends TaskEditor {
 		}	
 	}
 
+	@Override
 	public void saveState(IMemento memento) {
 		viewer.saveState(memento);
 	}
diff --git a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/views/CompositeCheatSheetPage.java b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/views/CompositeCheatSheetPage.java
index 0cef6ba67..114e7ec99 100644
--- a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/views/CompositeCheatSheetPage.java
+++ b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/views/CompositeCheatSheetPage.java
@@ -91,6 +91,7 @@ public class CompositeCheatSheetPage extends Page implements ISelectionChangedLi
 		saveHelper = new CompositeCheatSheetSaveHelper(stateManager);
 	}
 
+	@Override
 	public void createPart(Composite parent) {
 		init(parent.getDisplay());
 		toolkit.getHyperlinkGroup().setHyperlinkUnderlineMode(HyperlinkSettings.UNDERLINE_HOVER);
@@ -117,6 +118,7 @@ public class CompositeCheatSheetPage extends Page implements ISelectionChangedLi
 		gd.heightHint = 10;
 		sash.setLayoutData(gd);
 		sash.addControlListener(new ControlAdapter() {
+			@Override
 			public void controlResized(ControlEvent e) {
 				Point size = sash.getSize();
 				if (size.x>size.y)
@@ -176,6 +178,7 @@ public class CompositeCheatSheetPage extends Page implements ISelectionChangedLi
 		((Composite)children[1]).layout();
 	}
 
+	@Override
 	public void dispose() {
 		mform.dispose();
 		super.dispose();
@@ -200,6 +203,7 @@ public class CompositeCheatSheetPage extends Page implements ISelectionChangedLi
 			updateSelectedTask(model.getRootTask());
 		}
 		model.addObserver(new Observer() {
+			@Override
 			public void update(Observable o, Object arg) {
 				ICompositeCheatSheetTask task = (ICompositeCheatSheetTask)arg;
 				if (currentExplorer!=null)
@@ -267,6 +271,7 @@ public class CompositeCheatSheetPage extends Page implements ISelectionChangedLi
 		return explorer;
 	}
 
+	@Override
 	public void selectionChanged(SelectionChangedEvent event) {
 		updateForSelection(event.getSelection());
 	}
@@ -397,6 +402,7 @@ public class CompositeCheatSheetPage extends Page implements ISelectionChangedLi
 	 * description panel.
 	 */
 	private final class DescriptionLinkListener extends HyperlinkAdapter {
+		@Override
 		public void linkActivated(HyperlinkEvent e) {
 			String ref = (String)e.getHref();
 			if (ref.equals(START_HREF)) {
@@ -434,6 +440,7 @@ public class CompositeCheatSheetPage extends Page implements ISelectionChangedLi
 	 * end review panel
 	 */
 	private final class EndReviewListener extends HyperlinkAdapter {
+		@Override
 		public void linkActivated(HyperlinkEvent e) {
 			String ref = (String)e.getHref();
 			if (ref.startsWith(END_REVIEW_TAG)) {
@@ -478,14 +485,17 @@ public class CompositeCheatSheetPage extends Page implements ISelectionChangedLi
 		return editable.getEditor();	
 	}
 
+	@Override
 	public Control getControl() {
 		return form;
 	}
 
+	@Override
 	protected String getTitle() {
 		return model.getName();
 	}
 
+	@Override
 	public void initialized() {
 		// Open the model
 		model.setSaveHelper(saveHelper);
@@ -495,6 +505,7 @@ public class CompositeCheatSheetPage extends Page implements ISelectionChangedLi
 		initialized  = true;
 	}
 
+	@Override
 	public int contributeToViewMenu(Menu menu, int index) {	
 		if (!initialized) {
 			return index;
@@ -508,6 +519,7 @@ public class CompositeCheatSheetPage extends Page implements ISelectionChangedLi
 		item.setText(Messages.RESTART_ALL_MENU);
 		item.setImage(CheatSheetPlugin.getPlugin().getImage(ICheatSheetResource.COMPOSITE_RESTART_ALL));
 		item.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent e) {
 				if (model != null) {
 					if (RestartAllAction.confirmRestart()) {
@@ -541,7 +553,8 @@ public class CompositeCheatSheetPage extends Page implements ISelectionChangedLi
     		item.setSelection(isCurrentExplorer);
     		item.setImage(TaskExplorerManager.getInstance().getImage(id));
     		item.addSelectionListener(new SelectionAdapter() {
-    			public void widgetSelected(SelectionEvent e) {
+    			@Override
+				public void widgetSelected(SelectionEvent e) {
     				setCurrentExplorerFromId(id);
     			}
     		});
diff --git a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/data/Action.java b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/data/Action.java
index ed86c8cf3..54638983f 100644
--- a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/data/Action.java
+++ b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/data/Action.java
@@ -65,6 +65,7 @@ public class Action extends AbstractExecutable {
 		this.pluginID = pluginId;
 	}
 
+	@Override
 	public boolean handleAttribute(Node attribute) {
 		if (attribute.getNodeName().equals(IParserTags.PLUGINID)) {
 			hasPluginId = true;
@@ -78,6 +79,7 @@ public class Action extends AbstractExecutable {
 		return false;
 	}
 
+	@Override
 	public String checkAttributes(Node node) {
 		if(!hasClassAttr) {
 			return NLS.bind(Messages.ERROR_PARSING_NO_CLASS, (new Object[] {node.getNodeName()}));
@@ -91,15 +93,18 @@ public class Action extends AbstractExecutable {
 		return null;
 	}
 
+	@Override
 	public boolean isCheatSheetManagerUsed() {
 		return true;
 	}
 
 
+	@Override
 	public IStatus execute(CheatSheetManager csm) {
 		return new ActionRunner().runAction(this, csm);
 	}
 
+	@Override
 	public boolean hasParams() {
 		return true;
 	}
diff --git a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/data/CheatSheetCommand.java b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/data/CheatSheetCommand.java
index c631b0b3c..cbd244730 100644
--- a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/data/CheatSheetCommand.java
+++ b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/data/CheatSheetCommand.java
@@ -36,18 +36,22 @@ public class CheatSheetCommand extends AbstractExecutable {
 		return serialization;
 	}
 
+	@Override
 	public boolean isCheatSheetManagerUsed() {
 		return true;
 	}
 
+	@Override
 	public IStatus execute(CheatSheetManager csm) {
 		return new CommandRunner().executeCommand(this, csm);
 	}
 
+	@Override
 	public boolean hasParams() {
 		return false;
 	}
 
+	@Override
 	public boolean handleAttribute(Node attribute) {
 		if (IParserTags.SERIALIZATION.equals(attribute.getNodeName())) {
 		    setSerialization(attribute.getNodeValue());
@@ -60,6 +64,7 @@ public class CheatSheetCommand extends AbstractExecutable {
 		return false;
 	}
 
+	@Override
 	public String checkAttributes(Node node) {
 		if(!serializationFound) {
 			return NLS.bind(Messages.ERROR_PARSING_NO_SERIALIZATION, (new Object[] {node.getNodeName()}));
diff --git a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/data/CheatSheetParser.java b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/data/CheatSheetParser.java
index 88fd3d702..3d9f5e77a 100644
--- a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/data/CheatSheetParser.java
+++ b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/data/CheatSheetParser.java
@@ -96,6 +96,7 @@ public class CheatSheetParser implements IStatusContainer {
 		return status;
 	}
 	
+	@Override
 	public void addStatus(int severity, String message, Throwable exception) { 
 		status = ParserStatusUtility.addStatus(status, severity, message, exception);
 	}
@@ -1073,6 +1074,7 @@ public class CheatSheetParser implements IStatusContainer {
 		private static final String ATTRIBUTE_VALUE = "value"; //$NON-NLS-1$
 		private static final String NAME_PATH = "path"; //$NON-NLS-1$
 		
+		@Override
 		public short handle(UAElement element, String id) {
 			if (id != null && ELEMENT_PARAM.equals(element.getElementName())) {
 				String name = element.getAttribute(ATTRIBUTE_NAME);
diff --git a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/data/ConditionalSubItem.java b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/data/ConditionalSubItem.java
index d21ee5189..6484ff29b 100644
--- a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/data/ConditionalSubItem.java
+++ b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/data/ConditionalSubItem.java
@@ -51,6 +51,7 @@ public class ConditionalSubItem extends AbstractSubItem implements ISubItemItem
 	/**
 	 * @param subItem the SubItem to add.
 	 */
+	@Override
 	public void addSubItem(AbstractSubItem subItem) {
 		if(subItems == null) {
 			subItems = new ArrayList();
@@ -61,6 +62,7 @@ public class ConditionalSubItem extends AbstractSubItem implements ISubItemItem
 	/**
 	 * @return Returns the subItems.
 	 */
+	@Override
 	public ArrayList getSubItems() {
 		return subItems;
 	}
diff --git a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/data/Item.java b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/data/Item.java
index 1064708dd..0c48fbbfe 100644
--- a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/data/Item.java
+++ b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/data/Item.java
@@ -120,6 +120,7 @@ public class Item extends Intro implements IExecutableItem, IPerformWhenItem, IS
 	/**
 	 * @return Returns the performWhen.
 	 */
+	@Override
 	public PerformWhen getPerformWhen() {
 		return performWhen;
 	}
@@ -127,6 +128,7 @@ public class Item extends Intro implements IExecutableItem, IPerformWhenItem, IS
 	/**
 	 * @param performWhen The performWhen to set.
 	 */
+	@Override
 	public void setPerformWhen(PerformWhen performWhen) {
 		this.performWhen = performWhen;
 	}
@@ -134,6 +136,7 @@ public class Item extends Intro implements IExecutableItem, IPerformWhenItem, IS
 	/**
 	 * @param subItem the SubItem to add.
 	 */
+	@Override
 	public void addSubItem(AbstractSubItem subItem) {
 		if(subItems == null) {
 			subItems = new ArrayList();
@@ -144,6 +147,7 @@ public class Item extends Intro implements IExecutableItem, IPerformWhenItem, IS
 	/**
 	 * @return Returns the subItems.
 	 */
+	@Override
 	public ArrayList getSubItems() {
 		return subItems;
 	}
@@ -163,10 +167,12 @@ public class Item extends Intro implements IExecutableItem, IPerformWhenItem, IS
 		return false;
 	}
 
+	@Override
 	public AbstractExecutable getExecutable() {
 		return executable;
 	}
 
+	@Override
 	public void setExecutable(AbstractExecutable executable) {
 		this.executable = executable;	
 	}
diff --git a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/data/PerformWhen.java b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/data/PerformWhen.java
index b1932a1b0..e94381a9c 100644
--- a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/data/PerformWhen.java
+++ b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/data/PerformWhen.java
@@ -69,6 +69,7 @@ public class PerformWhen implements IExecutableItem  {
 	 * This method always returns <code>null</code>, it is only here aid in parsing.
 	 * @return Returns the executables.
 	 */
+	@Override
 	public AbstractExecutable getExecutable() {
 		return null;
 	}
@@ -77,6 +78,7 @@ public class PerformWhen implements IExecutableItem  {
 	 * Delegate to the addAbstractExecutable metod.
 	 * @param executable the AbstractExecutable to add.
 	 */
+	@Override
 	public void setExecutable(AbstractExecutable executable) {
 		addExecutable(executable);
 	}
diff --git a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/data/RepeatedSubItem.java b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/data/RepeatedSubItem.java
index ffce7e1f3..b95c4dddb 100644
--- a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/data/RepeatedSubItem.java
+++ b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/data/RepeatedSubItem.java
@@ -47,6 +47,7 @@ public class RepeatedSubItem extends AbstractSubItem implements ISubItemItem {
 	/**
 	 * @param subItem the SubItem to add.
 	 */
+	@Override
 	public void addSubItem(AbstractSubItem subItem) {
 		if(subItems == null) {
 			subItems = new ArrayList();
@@ -58,6 +59,7 @@ public class RepeatedSubItem extends AbstractSubItem implements ISubItemItem {
 	 * Returns a list which will always only contain at most 1 entry.
 	 * @return Returns the subItems.
 	 */
+	@Override
 	public ArrayList getSubItems() {
 		return subItems;
 	}
diff --git a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/data/SubItem.java b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/data/SubItem.java
index ab4fcaade..1ea1fcaf4 100644
--- a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/data/SubItem.java
+++ b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/data/SubItem.java
@@ -75,6 +75,7 @@ public class SubItem extends AbstractSubItem implements IExecutableItem, IPerfor
 	/**
 	 * @return Returns the action.
 	 */
+	@Override
 	public AbstractExecutable getExecutable() {
 		return executable;
 	}
@@ -82,6 +83,7 @@ public class SubItem extends AbstractSubItem implements IExecutableItem, IPerfor
 	/**
 	 * @param Executable The Executable to set.
 	 */
+	@Override
 	public void setExecutable(AbstractExecutable executable) {
 		this.executable = executable;
 	}
@@ -89,6 +91,7 @@ public class SubItem extends AbstractSubItem implements IExecutableItem, IPerfor
 	/**
 	 * @return Returns the performWhen.
 	 */
+	@Override
 	public PerformWhen getPerformWhen() {
 		return performWhen;
 	}
@@ -96,6 +99,7 @@ public class SubItem extends AbstractSubItem implements IExecutableItem, IPerfor
 	/**
 	 * @param performWhen The performWhen to set.
 	 */
+	@Override
 	public void setPerformWhen(PerformWhen performWhen) {
 		this.performWhen = performWhen;
 	}
diff --git a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/dialogs/CheatSheetCategoryBasedSelectionDialog.java b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/dialogs/CheatSheetCategoryBasedSelectionDialog.java
index 232abfaf2..abb1a27eb 100644
--- a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/dialogs/CheatSheetCategoryBasedSelectionDialog.java
+++ b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/dialogs/CheatSheetCategoryBasedSelectionDialog.java
@@ -147,6 +147,7 @@ public class CheatSheetCategoryBasedSelectionDialog extends TrayDialog //extends
 		 * @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 (WorkbenchActivityHelper.filterItem(element)) {
@@ -174,6 +175,7 @@ public class CheatSheetCategoryBasedSelectionDialog extends TrayDialog //extends
 	}
 
 	private class CheatsheetLabelProvider extends LabelProvider {
+		@Override
 		public String getText(Object obj) {
 			if (obj instanceof WorkbenchAdapter) {
 				return ((WorkbenchAdapter) obj).getLabel(null);
@@ -181,6 +183,7 @@ public class CheatSheetCategoryBasedSelectionDialog extends TrayDialog //extends
 			return super.getText(obj);
 		}
 
+		@Override
 		public Image getImage(Object obj) {
 			if (obj instanceof CheatSheetElement) {
 				CheatSheetElement element = (CheatSheetElement)obj;
@@ -216,6 +219,7 @@ public class CheatSheetCategoryBasedSelectionDialog extends TrayDialog //extends
 	/*
 	 * (non-Javadoc) Method declared on Window.
 	 */
+	@Override
 	protected void configureShell(Shell newShell) {
 		super.configureShell(newShell);
 		if (title != null) {
@@ -227,6 +231,7 @@ public class CheatSheetCategoryBasedSelectionDialog extends TrayDialog //extends
 	/*
 	 * (non-Javadoc) Method declared on Dialog.
 	 */
+	@Override
 	protected void createButtonsForButtonBar(Composite parent) {
 		super.createButtonsForButtonBar(parent);
 
@@ -236,6 +241,7 @@ public class CheatSheetCategoryBasedSelectionDialog extends TrayDialog //extends
 	/*
 	 * (non-Javadoc) Method declared on Dialog.
 	 */
+	@Override
 	protected Control createDialogArea(Composite parent) {
 		initializeDialogUnits(parent);
 		
@@ -294,6 +300,7 @@ public class CheatSheetCategoryBasedSelectionDialog extends TrayDialog //extends
 
 		// Add double-click listener
 		treeViewer.addDoubleClickListener(new IDoubleClickListener() {
+			@Override
 			public void doubleClick(DoubleClickEvent event) {
 				IStructuredSelection selection = (IStructuredSelection)event.getSelection();
 				Object obj = selection.getFirstElement();
@@ -355,10 +362,12 @@ public class CheatSheetCategoryBasedSelectionDialog extends TrayDialog //extends
 	
 	private class RadioSelectionListener implements SelectionListener {
 
+		@Override
 		public void widgetSelected(SelectionEvent e) {
 			checkRadioButtons();			
 		}
 
+		@Override
 		public void widgetDefaultSelected(SelectionEvent e) {
 			// do nothing
 		}
@@ -366,6 +375,7 @@ public class CheatSheetCategoryBasedSelectionDialog extends TrayDialog //extends
 	
 	private class BrowseListener implements SelectionListener {
 
+		@Override
 		public void widgetSelected(SelectionEvent e) {
 			// Launch a file dialog to select a cheatsheet file
 			FileDialog fileDlg = new FileDialog(getShell());
@@ -381,6 +391,7 @@ public class CheatSheetCategoryBasedSelectionDialog extends TrayDialog //extends
 			}
 		}
 
+		@Override
 		public void widgetDefaultSelected(SelectionEvent e) {
 			// do nothing			
 		}
@@ -388,6 +399,7 @@ public class CheatSheetCategoryBasedSelectionDialog extends TrayDialog //extends
 	
 	private class FileAndUrlListener implements ModifyListener {
 
+		@Override
 		public void modifyText(ModifyEvent e) {
 			setOkButton();
 		}	
@@ -424,6 +436,7 @@ public class CheatSheetCategoryBasedSelectionDialog extends TrayDialog //extends
 			 * 
 			 * @see org.eclipse.swt.events.SelectionAdapter#widgetSelected(org.eclipse.swt.events.SelectionEvent)
 			 */
+			@Override
 			public void widgetSelected(SelectionEvent e) {
 				if (showAllButton.getSelection()) {
 					treeViewer.resetFilters();
@@ -480,6 +493,7 @@ public class CheatSheetCategoryBasedSelectionDialog extends TrayDialog //extends
 	protected IContentProvider getCheatSheetProvider() {
 		// want to get the cheatsheets of the collection element
 		return new BaseWorkbenchContentProvider() {
+			@Override
 			public Object[] getChildren(Object o) {
 				Object[] cheatsheets;
 				Object[] subCategories;
@@ -523,6 +537,7 @@ public class CheatSheetCategoryBasedSelectionDialog extends TrayDialog //extends
 	 * @param newSelection
 	 *            ISelection
 	 */
+	@Override
 	public void selectionChanged(SelectionChangedEvent selectionEvent) {
 		Object obj = getSingleSelection(selectionEvent.getSelection());
 		if (obj instanceof CheatSheetCollectionElement) {
@@ -555,6 +570,7 @@ public class CheatSheetCategoryBasedSelectionDialog extends TrayDialog //extends
 	/*
 	 * (non-Javadoc) Method declared on Dialog.
 	 */
+	@Override
 	protected void okPressed() {
 		/*
 		 * Prevent the cheat sheet from opening inside this dialog's tray
@@ -811,6 +827,7 @@ public class CheatSheetCategoryBasedSelectionDialog extends TrayDialog //extends
      * 
      * @since 3.2
      */
+	@Override
 	protected IDialogSettings getDialogBoundsSettings() {
         IDialogSettings settings = CheatSheetPlugin.getPlugin().getDialogSettings();
         IDialogSettings section = settings.getSection(DIALOG_SETTINGS_SECTION);
diff --git a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/handlers/DialogIntegerValueConverter.java b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/handlers/DialogIntegerValueConverter.java
index e7f331e6e..fd0dae6b7 100644
--- a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/handlers/DialogIntegerValueConverter.java
+++ b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/handlers/DialogIntegerValueConverter.java
@@ -22,6 +22,7 @@ import org.eclipse.core.commands.ParameterValueConversionException;
 public class DialogIntegerValueConverter extends
 		AbstractParameterValueConverter {
 
+	@Override
 	public Object convertToObject(String parameterValue)
 			throws ParameterValueConversionException {
 
@@ -34,6 +35,7 @@ public class DialogIntegerValueConverter extends
 		}
 	}
 
+	@Override
 	public String convertToString(Object parameterValue)
 			throws ParameterValueConversionException {
 
diff --git a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/handlers/OpenCheatSheetHandler.java b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/handlers/OpenCheatSheetHandler.java
index 08d476570..fa27e7391 100644
--- a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/handlers/OpenCheatSheetHandler.java
+++ b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/handlers/OpenCheatSheetHandler.java
@@ -26,6 +26,7 @@ public class OpenCheatSheetHandler extends AbstractHandler {
 
 	private static final String PARAM_ID_CHEAT_SHEET_ID = "cheatSheetId"; //$NON-NLS-1$
 
+	@Override
 	public Object execute(ExecutionEvent event) throws ExecutionException {
 
 		String cheatSheetId = event.getParameter(PARAM_ID_CHEAT_SHEET_ID);
diff --git a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/handlers/OpenCheatSheetURLHandler.java b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/handlers/OpenCheatSheetURLHandler.java
index 7d4a6ed7e..f15a350e1 100644
--- a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/handlers/OpenCheatSheetURLHandler.java
+++ b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/handlers/OpenCheatSheetURLHandler.java
@@ -31,6 +31,7 @@ public class OpenCheatSheetURLHandler extends AbstractHandler {
 
 	private static final String PARAM_ID_URL = "url"; //$NON-NLS-1$
 
+	@Override
 	public Object execute(ExecutionEvent event) throws ExecutionException {
 
 		String cheatSheetId = event.getParameter(PARAM_ID_CHEAT_SHEET_ID);
diff --git a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/handlers/OpenInputDialogHandler.java b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/handlers/OpenInputDialogHandler.java
index f0bbc635c..bccc3126a 100644
--- a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/handlers/OpenInputDialogHandler.java
+++ b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/handlers/OpenInputDialogHandler.java
@@ -35,6 +35,7 @@ public class OpenInputDialogHandler extends AbstractHandler {
 
 	private static final String PARAM_ID_CANCEL_RETURNS = "cancelReturns"; //$NON-NLS-1$
 
+	@Override
 	public Object execute(ExecutionEvent event) throws ExecutionException {
 
 		String title = event.getParameter(PARAM_ID_TITLE);
diff --git a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/handlers/OpenMessageDialogHandler.java b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/handlers/OpenMessageDialogHandler.java
index 6dc7cd778..0fae3c850 100644
--- a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/handlers/OpenMessageDialogHandler.java
+++ b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/handlers/OpenMessageDialogHandler.java
@@ -44,6 +44,7 @@ public class OpenMessageDialogHandler extends AbstractHandler {
 
 	private static final int CANCEL_RETURN_CODE = -1;
 	
+	@Override
 	public Object execute(ExecutionEvent event) throws ExecutionException {
 
 		String title = event.getParameter(PARAM_ID_TITLE);
diff --git a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/registry/Category.java b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/registry/Category.java
index 7028bd1b4..8baa6c47c 100644
--- a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/registry/Category.java
+++ b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/registry/Category.java
@@ -108,6 +108,7 @@ public class Category implements IWorkbenchAdapter, IPluginContribution,
 	/*
 	 * (non-Javadoc) Method declared on IAdaptable.
 	 */
+	@Override
 	public Object getAdapter(Class adapter) {
 		if (adapter == IWorkbenchAdapter.class)
 			return this;
@@ -120,6 +121,7 @@ public class Category implements IWorkbenchAdapter, IPluginContribution,
 	/*
 	 * (non-Javadoc) Method declared on IWorkbenchAdapter.
 	 */
+	@Override
 	public Object[] getChildren(Object o) {
 		return getElements().toArray();
 	}
@@ -127,6 +129,7 @@ public class Category implements IWorkbenchAdapter, IPluginContribution,
 	/*
 	 * (non-Javadoc) Method declared on IWorkbenchAdapter.
 	 */
+	@Override
 	public ImageDescriptor getImageDescriptor(Object object) {
 		return null;
 	}
@@ -134,6 +137,7 @@ public class Category implements IWorkbenchAdapter, IPluginContribution,
 	/*
 	 * (non-Javadoc) Method declared on IWorkbenchAdapter.
 	 */
+	@Override
 	public String getLabel(Object o) {
 		return getLabel();
 	}
@@ -242,6 +246,7 @@ public class Category implements IWorkbenchAdapter, IPluginContribution,
 	 * 
 	 * @see org.eclipse.ui.model.IWorkbenchAdapter#getParent(java.lang.Object)
 	 */
+	@Override
 	public Object getParent(Object o) {
 		return null;
 	}
@@ -251,6 +256,7 @@ public class Category implements IWorkbenchAdapter, IPluginContribution,
 	 * 
 	 * @see org.eclipse.ui.activities.support.IPluginContribution#getLocalId()
 	 */
+	@Override
 	public String getLocalId() {
 		return id;
 	}
@@ -260,6 +266,7 @@ public class Category implements IWorkbenchAdapter, IPluginContribution,
 	 * 
 	 * @see org.eclipse.ui.activities.support.IPluginContribution#getPluginId()
 	 */
+	@Override
 	public String getPluginId() {
 		return configurationElement == null ? pluginId : configurationElement
 				.getContributor().getName();
diff --git a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/registry/CheatSheetCollectionElement.java b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/registry/CheatSheetCollectionElement.java
index f3748c5fc..e067b2c39 100644
--- a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/registry/CheatSheetCollectionElement.java
+++ b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/registry/CheatSheetCollectionElement.java
@@ -124,6 +124,7 @@ public class CheatSheetCollectionElement extends WorkbenchAdapter implements IPl
 	/**
 	 * Returns the label for this collection.
 	 */
+	@Override
 	public String getLabel(Object o) {
 		return name;
 	}
@@ -131,6 +132,7 @@ public class CheatSheetCollectionElement extends WorkbenchAdapter implements IPl
 	/**
 	 * Returns the logical parent of the given object in its tree.
 	 */
+	@Override
 	public Object getParent(Object o) {
 		return parent;
 	}
@@ -176,6 +178,7 @@ public class CheatSheetCollectionElement extends WorkbenchAdapter implements IPl
 	/**
 	 * For debugging purposes.
 	 */
+	@Override
 	public String toString() {
 		StringBuffer buf = new StringBuffer("CheatSheetCollection, "); //$NON-NLS-1$
 		buf.append(childCollections.size());
@@ -185,10 +188,12 @@ public class CheatSheetCollectionElement extends WorkbenchAdapter implements IPl
 		return buf.toString();
 	}
 
+	@Override
 	public String getLocalId() {
 		return getId();
 	}
 
+	@Override
 	public String getPluginId() {
 		return pluginId;
 	}
diff --git a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/registry/CheatSheetCollectionSorter.java b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/registry/CheatSheetCollectionSorter.java
index 271eb8f1a..2d2f55e10 100644
--- a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/registry/CheatSheetCollectionSorter.java
+++ b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/registry/CheatSheetCollectionSorter.java
@@ -42,6 +42,7 @@ public class CheatSheetCollectionSorter extends ViewerComparator {
 	 * 			a value less than <code>0</code> if o1 is less than o2;
 	 *			and a value greater than <code>0</code> if o1 is greater than o2.
 	 */
+	@Override
 	public int compare(Viewer viewer, Object o1, Object o2) {
 		String name1 = ((WorkbenchAdapter)o1).getLabel(o1);
 		String name2 = ((WorkbenchAdapter)o2).getLabel(o2);
@@ -56,6 +57,7 @@ public class CheatSheetCollectionSorter extends ViewerComparator {
 	 *	Return true if this sorter is affected by a property 
 	 *	change of propertyName on the specified element.
 	 */
+	@Override
 	public boolean isSorterProperty(Object object, String propertyId) {
 		return propertyId.equals(IBasicPropertyConstants.P_TEXT);
 	}
diff --git a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/registry/CheatSheetElement.java b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/registry/CheatSheetElement.java
index bef87cb20..94629d1ef 100644
--- a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/registry/CheatSheetElement.java
+++ b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/registry/CheatSheetElement.java
@@ -48,6 +48,7 @@ public class CheatSheetElement extends WorkbenchAdapter implements IAdaptable, I
 	 * associated with this object. Returns <code>null</code> if
 	 * no such object can be found.
 	 */
+	@Override
 	public Object getAdapter(Class adapter) {
 		if (adapter == IWorkbenchAdapter.class) {
 			return this;
@@ -93,6 +94,7 @@ public class CheatSheetElement extends WorkbenchAdapter implements IAdaptable, I
 	/**
 	 * Returns the name of this cheatsheet element.
 	 */
+	@Override
 	public String getLabel(Object element) {
 		return name;
 	}
@@ -180,10 +182,12 @@ public class CheatSheetElement extends WorkbenchAdapter implements IAdaptable, I
 		return null;
 	}
 
+	@Override
 	public String getLocalId() {
 		return id;
 	}
 
+	@Override
 	public String getPluginId() {
 		return configurationElement.getContributor().getName();
 	}
diff --git a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/registry/CheatSheetItemExtensionElement.java b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/registry/CheatSheetItemExtensionElement.java
index cd3e278a5..3fe2a69ed 100644
--- a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/registry/CheatSheetItemExtensionElement.java
+++ b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/registry/CheatSheetItemExtensionElement.java
@@ -39,6 +39,7 @@ public class CheatSheetItemExtensionElement extends WorkbenchAdapter implements
 	 * associated with this object. Returns <code>null</code> if
 	 * no such object can be found.
 	 */
+	@Override
 	public Object getAdapter(Class adapter) {
 		if (adapter == IWorkbenchAdapter.class) {
 			return this;
diff --git a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/registry/CheatSheetParameterValues.java b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/registry/CheatSheetParameterValues.java
index 15bd0b8f1..5a9cc91ce 100644
--- a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/registry/CheatSheetParameterValues.java
+++ b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/registry/CheatSheetParameterValues.java
@@ -22,6 +22,7 @@ import org.eclipse.core.commands.IParameterValues;
  */
 public class CheatSheetParameterValues implements IParameterValues {
 
+	@Override
 	public Map getParameterValues() {
 		Map values = new TreeMap();
 
diff --git a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/registry/CheatSheetRegistryReader.java b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/registry/CheatSheetRegistryReader.java
index 3bafaa6be..eaaf69661 100644
--- a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/registry/CheatSheetRegistryReader.java
+++ b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/registry/CheatSheetRegistryReader.java
@@ -327,6 +327,7 @@ public class CheatSheetRegistryReader extends RegistryReader implements IRegistr
 		Sorter sorter = new Sorter() {
 			private Collator collator = Collator.getInstance();
 
+			@Override
 			public boolean compare(Object o1, Object o2) {
 				String s1 = ((CategoryNode) o1).getPath();
 				String s2 = ((CategoryNode) o2).getPath();
@@ -650,6 +651,7 @@ public class CheatSheetRegistryReader extends RegistryReader implements IRegistr
 	/**
 	 * Implement this method to read element attributes.
 	 */
+	@Override
 	protected boolean readElement(IConfigurationElement element) {
 		if (element.getName().equals(TAG_CATEGORY)) {
 			deferCategory(element);
@@ -677,6 +679,7 @@ public class CheatSheetRegistryReader extends RegistryReader implements IRegistr
 	/* (non-Javadoc)
 	 * @see org.eclipse.core.runtime.IRegistryChangeListener#registryChanged(org.eclipse.core.runtime.IRegistryChangeEvent)
 	 */
+	@Override
 	public void registryChanged(IRegistryChangeEvent event) {
 		IExtensionDelta[] cheatSheetDeltas = event.getExtensionDeltas(ICheatSheetResource.CHEAT_SHEET_PLUGIN_ID, CHEAT_SHEET_CONTENT);
 		if (cheatSheetDeltas.length > 0) {
diff --git a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/registry/RegistryReader.java b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/registry/RegistryReader.java
index e1bafc08d..1f9f06f50 100644
--- a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/registry/RegistryReader.java
+++ b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/registry/RegistryReader.java
@@ -89,6 +89,7 @@ public abstract class RegistryReader {
 		// more than one extension for an extension point is
 		// dependent in the order listed in the XML file.
 		Sorter sorter = new Sorter() {
+			@Override
 			public boolean compare(Object extension1, Object extension2) {
 				String s1 = ((IExtension) extension1).getContributor().getName().toUpperCase();
 				String s2 = ((IExtension) extension2).getContributor().getName().toUpperCase();
diff --git a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/state/DefaultStateManager.java b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/state/DefaultStateManager.java
index d9ba0b0a1..820517a5f 100644
--- a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/state/DefaultStateManager.java
+++ b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/state/DefaultStateManager.java
@@ -37,6 +37,7 @@ public class DefaultStateManager implements ICheatSheetStateManager {
 	private CheatSheetElement element;
 	private boolean propertiesRead = false;
 
+	@Override
 	public Properties getProperties() {
 		if (!propertiesRead) {
 			props = saveHelper.loadState(element.getID());
@@ -45,6 +46,7 @@ public class DefaultStateManager implements ICheatSheetStateManager {
 		return props;
 	}
 
+	@Override
 	public CheatSheetManager getCheatSheetManager() {	
 		CheatSheetManager result = new CheatSheetManager(element);
 		if (getProperties() != null) {
@@ -53,10 +55,12 @@ public class DefaultStateManager implements ICheatSheetStateManager {
 		return result;
 	}
 
+	@Override
 	public void setElement(CheatSheetElement element) {
 		this.element = element;
 	}
 
+	@Override
 	public IStatus saveState(Properties properties, CheatSheetManager manager) {
 		return saveHelper.saveState(properties, manager);
 	}
diff --git a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/state/MementoStateManager.java b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/state/MementoStateManager.java
index 1665c51b0..78b271917 100644
--- a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/state/MementoStateManager.java
+++ b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/state/MementoStateManager.java
@@ -48,6 +48,7 @@ public class MementoStateManager implements ICheatSheetStateManager {
 	/**
 	 * Load properties from the memento.
 	 */
+	@Override
 	public Properties getProperties() {
 		if (memento == null) {
 			return null;
@@ -58,6 +59,7 @@ public class MementoStateManager implements ICheatSheetStateManager {
 		return props;
 	}
 
+	@Override
 	public CheatSheetManager getCheatSheetManager() {
 		CheatSheetManager result = new CheatSheetManager(element);
 		if (getProperties() != null) {
@@ -67,10 +69,12 @@ public class MementoStateManager implements ICheatSheetStateManager {
 		return result;
 	}
 
+	@Override
 	public void setElement(CheatSheetElement element) {
 		this.element = element;
 	}
 
+	@Override
 	public IStatus saveState(Properties properties, CheatSheetManager manager) {
 		// The real save will use a memento, this is an empty method
 		return Status.OK_STATUS;
diff --git a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/state/NoSaveStateManager.java b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/state/NoSaveStateManager.java
index 28bdde630..5647537e2 100644
--- a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/state/NoSaveStateManager.java
+++ b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/state/NoSaveStateManager.java
@@ -31,19 +31,23 @@ import org.eclipse.ui.internal.cheatsheets.views.CheatSheetManager;
 public class NoSaveStateManager implements ICheatSheetStateManager {
 
 	private CheatSheetElement element;
+	@Override
 	public Properties getProperties() {
 		return null;
 	}
 
+	@Override
 	public CheatSheetManager getCheatSheetManager() {	
 		CheatSheetManager result = new CheatSheetManager(element);
 		return result;
 	}
 
+	@Override
 	public void setElement(CheatSheetElement element) {
 		this.element = element;
 	}
 
+	@Override
 	public IStatus saveState(Properties properties, CheatSheetManager manager) {
 		return Status.OK_STATUS;
 	}
diff --git a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/state/TrayStateManager.java b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/state/TrayStateManager.java
index 81b3974b5..bf336d1be 100644
--- a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/state/TrayStateManager.java
+++ b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/state/TrayStateManager.java
@@ -29,14 +29,17 @@ public class TrayStateManager implements ICheatSheetStateManager {
 	private Properties properties;
 	private CheatSheetManager manager;
 
+	@Override
 	public Properties getProperties() {
 		return properties;
 	}
 
+	@Override
 	public void setElement(CheatSheetElement element) {
         // element not used
 	}
 
+	@Override
 	public CheatSheetManager getCheatSheetManager() {
 		return manager;
 	}
@@ -45,6 +48,7 @@ public class TrayStateManager implements ICheatSheetStateManager {
 	 * Save the properties and cheat sheet manager locally so they can be passed
 	 * to and from a cheat sheet viewer in a tray dialog.
 	 */
+	@Override
 	public IStatus saveState(Properties properties, CheatSheetManager manager) {
         this.properties = properties;
 		this.manager = manager;
diff --git a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/views/CheatSheetEvent.java b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/views/CheatSheetEvent.java
index 3246c9629..ab7f642e5 100644
--- a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/views/CheatSheetEvent.java
+++ b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/views/CheatSheetEvent.java
@@ -29,6 +29,7 @@ public class CheatSheetEvent implements ICheatSheetEvent {
 	/**
 	 * @return
 	 */
+	@Override
 	public int getEventType() {
 		return type;
 	}
@@ -36,6 +37,7 @@ public class CheatSheetEvent implements ICheatSheetEvent {
 	/**
 	 * @return
 	 */
+	@Override
 	public String getCheatSheetID() {
 		return cheatsheetID;
 	}
@@ -43,6 +45,7 @@ public class CheatSheetEvent implements ICheatSheetEvent {
 	/* (non-Javadoc)
 	 * @see org.eclipse.ui.cheatsheets.events.ICheatSheetEvent#getCheatSheetManager()
 	 */
+	@Override
 	public ICheatSheetManager getCheatSheetManager() {
 		return csm;
 	}
diff --git a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/views/CheatSheetExpandRestoreAction.java b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/views/CheatSheetExpandRestoreAction.java
index b34aa868c..2e1257070 100644
--- a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/views/CheatSheetExpandRestoreAction.java
+++ b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/views/CheatSheetExpandRestoreAction.java
@@ -42,6 +42,7 @@ public class CheatSheetExpandRestoreAction extends Action {
 	/*
 	 * @see Action#actionPerformed
 	 */
+	@Override
 	public void run() {
 		viewer.toggleExpandRestore();	
 	}
diff --git a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/views/CheatSheetHelpPart.java b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/views/CheatSheetHelpPart.java
index 474c559b7..994a834d8 100644
--- a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/views/CheatSheetHelpPart.java
+++ b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/views/CheatSheetHelpPart.java
@@ -74,6 +74,7 @@ public class CheatSheetHelpPart extends AbstractFormPart implements IHelpPart {
 	/**
 	 * This part doesn't require a context menu.
 	 */
+	@Override
 	public boolean fillContextMenu(IMenuManager manager) {
 		return false;
 	}
@@ -81,6 +82,7 @@ public class CheatSheetHelpPart extends AbstractFormPart implements IHelpPart {
 	/**
 	 * Returns the part's top Control.
 	 */
+	@Override
 	public Control getControl() {
 		return viewer.getControl();
 	}
@@ -88,6 +90,7 @@ public class CheatSheetHelpPart extends AbstractFormPart implements IHelpPart {
 	/**
 	 * This part doesn't use any global actions.
 	 */
+	@Override
 	public IAction getGlobalAction(String id) {
 		return null;
 	}
@@ -97,6 +100,7 @@ public class CheatSheetHelpPart extends AbstractFormPart implements IHelpPart {
 	 * 
 	 * @param the unique id for the part
 	 */
+	@Override
 	public String getId() {
 		return id;
 	}
@@ -107,6 +111,7 @@ public class CheatSheetHelpPart extends AbstractFormPart implements IHelpPart {
 	 * 
 	 * @param control the Control in focus
 	 */
+	@Override
 	public boolean hasFocusControl(Control control) {
 		return viewer.hasFocusControl(control);
 	}
@@ -114,6 +119,7 @@ public class CheatSheetHelpPart extends AbstractFormPart implements IHelpPart {
 	/**
 	 * Initializes the part.
 	 */
+	@Override
 	public void init(ReusableHelpPart parent, String id, IMemento memento) {
 		this.id = id;
 	}
@@ -121,12 +127,14 @@ public class CheatSheetHelpPart extends AbstractFormPart implements IHelpPart {
 	/**
 	 * No filtering required.
 	 */
+	@Override
 	public void refilter() {
 	}
 	
 	/**
 	 * The cheat sheet automatically saves its state; no action required.
 	 */
+	@Override
 	public void saveState(IMemento memento) {
 	}
 	
@@ -135,6 +143,7 @@ public class CheatSheetHelpPart extends AbstractFormPart implements IHelpPart {
 	 * 
 	 * @param whether or not the part should be visible
 	 */
+	@Override
 	public void setVisible(boolean visible) {
 		viewer.getControl().setVisible(visible);
 	}
@@ -142,12 +151,14 @@ public class CheatSheetHelpPart extends AbstractFormPart implements IHelpPart {
 	/**
 	 * No action needed for this part here.
 	 */
+	@Override
 	public void stop() {
 	}
 	
 	/**
 	 * No action needed for this part here.
 	 */
+	@Override
 	public void toggleRoleFilter() {
 	}
 }
diff --git a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/views/CheatSheetManager.java b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/views/CheatSheetManager.java
index 9e93aff92..d377033cb 100644
--- a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/views/CheatSheetManager.java
+++ b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/views/CheatSheetManager.java
@@ -46,6 +46,7 @@ public class CheatSheetManager implements ICheatSheetManager {
 	/* (non-Javadoc)
 	 * @see org.eclipse.ui.cheatsheets.ICheatSheetManager#getCheatSheetID()
 	 */
+	@Override
 	public String getCheatSheetID() {
 		return cheatsheetID;
 	}
@@ -74,6 +75,7 @@ public class CheatSheetManager implements ICheatSheetManager {
 		dataTable = data;
 	}
 
+	@Override
 	public String getData(String key) {
 		if (dataTable == null)
 			return null;
@@ -141,6 +143,7 @@ public class CheatSheetManager implements ICheatSheetManager {
 	/* (non-Javadoc)
 	 * @see org.eclipse.ui.cheatsheets.ICheatSheetManager#setData(java.lang.String, java.lang.String)
 	 */
+	@Override
 	public void setData(String key, String data) {
 		if (key == null) {
 			throw new IllegalArgumentException();
@@ -185,6 +188,7 @@ public class CheatSheetManager implements ICheatSheetManager {
 		}
 	}
 
+	@Override
 	public ICheatSheetManager getParent() {
 		return parent;
 	}
@@ -193,6 +197,7 @@ public class CheatSheetManager implements ICheatSheetManager {
 		this.parent = parent;
 	}
 
+	@Override
 	public Set getKeySet() {
 		if (dataTable == null) {
 			return new HashSet();
diff --git a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/views/CheatSheetPage.java b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/views/CheatSheetPage.java
index e33bff715..f1a889a6f 100644
--- a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/views/CheatSheetPage.java
+++ b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/views/CheatSheetPage.java
@@ -56,6 +56,7 @@ public class CheatSheetPage extends Page implements IMenuContributor {
 		this.viewer = cheatSheetViewer;
 	}
 
+	@Override
 	public void createPart(Composite parent) {
 		CheatSheetStopWatch.startStopWatch("CheatSheetPage.createPart()"); //$NON-NLS-1$		
 		super.createPart(parent);
@@ -108,12 +109,14 @@ public class CheatSheetPage extends Page implements IMenuContributor {
 	 * @param parent
 	 *            the SWT parent for the title area composite
 	 */
+	@Override
 	protected String getTitle() {
 		if (cheatSheet != null && cheatSheet.getTitle() != null)
 			return cheatSheet.getTitle();
 		return ICheatSheetResource.EMPTY_STRING;
 	}
 
+	@Override
 	public void dispose() {
 		super.dispose();
 
@@ -133,6 +136,7 @@ public class CheatSheetPage extends Page implements IMenuContributor {
 		introColor = null;
 	}
 
+	@Override
 	protected void init(Display display) {
 		super.init(display);
 		computeColors(display);
@@ -216,6 +220,7 @@ public class CheatSheetPage extends Page implements IMenuContributor {
 		return ((bg.getBlue() + bg.getRed() + bg.getGreen()) < 380);
 	}
 
+	@Override
 	public void initialized() {
 		for (Iterator iter = viewItemList.iterator(); iter.hasNext();) {
 			ViewItem item = (ViewItem) iter.next();
@@ -241,6 +246,7 @@ public class CheatSheetPage extends Page implements IMenuContributor {
 		item.setImage(CheatSheetPlugin.getPlugin().getImage(ICheatSheetResource.CHEATSHEET_RETURN));
 		
 		item.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent e) {
 				viewer.restart();
 			}
@@ -248,6 +254,7 @@ public class CheatSheetPage extends Page implements IMenuContributor {
 		return index;
 	}
 
+	@Override
 	public int contributeToViewMenu(Menu menu, int index) {
 		return contributeRestartItem(menu, index);
 	}
diff --git a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/views/CheatSheetView.java b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/views/CheatSheetView.java
index a2bac53b8..b068ac1bb 100644
--- a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/views/CheatSheetView.java
+++ b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/views/CheatSheetView.java
@@ -48,6 +48,7 @@ public class CheatSheetView extends ViewPart {
 		expandRestoreAction = new CheatSheetExpandRestoreAction(Messages.COLLAPSE_ALL_BUT_CURRENT_TOOLTIP, false, viewer);
 		
 		copyAction = new Action("copy") { //$NON-NLS-1$
+			@Override
 			public void run() {
 				viewer.copy();
 			}
@@ -86,6 +87,7 @@ public class CheatSheetView extends ViewPart {
 	 *
 	 * @param parent the parent control
 	 */
+	@Override
 	public void createPartControl(Composite parent) {
 		CheatSheetStopWatch.startStopWatch("CheatSheetView.createPartControl"); //$NON-NLS-1$
 
@@ -108,6 +110,7 @@ public class CheatSheetView extends ViewPart {
 	/**
 	 * @see org.eclipse.ui.IWorkbenchPart#dispose()
 	 */
+	@Override
 	public void dispose() {
 		super.dispose();
 	}
@@ -143,6 +146,7 @@ public class CheatSheetView extends ViewPart {
 	 * a fresh state.  Subclasses may override the implementation to perform any
 	 * state restoration as needed.
 	 */
+	@Override
 	public void init(IViewSite site, IMemento memento) throws PartInitException {
 		init(site);
 		this.memento = memento;
@@ -176,6 +180,7 @@ public class CheatSheetView extends ViewPart {
 	/* (non-Javadoc)
 	 * Method declared on IViewPart.
 	 */
+	@Override
 	public void saveState(IMemento memento) {
 		if(viewer != null) {
 			CheatSheetElement element = viewer.getContent();
@@ -204,6 +209,7 @@ public class CheatSheetView extends ViewPart {
 	/**
 	 * Passing the focus request to the viewer's control.
 	 */
+	@Override
 	public void setFocus() {		
 		if(viewer != null) {
 			viewer.setFocus();
diff --git a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/views/CheatSheetViewer.java b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/views/CheatSheetViewer.java
index 717e42a14..a61884da0 100644
--- a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/views/CheatSheetViewer.java
+++ b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/views/CheatSheetViewer.java
@@ -622,6 +622,7 @@ public class CheatSheetViewer implements ICheatSheetViewer, IMenuContributor {
 	 *
 	 * @param parent the parent control
 	 */
+	@Override
 	public void createPartControl(Composite parent) {
 		control = new Composite(parent, SWT.NONE);
 		GridLayout layout = new GridLayout();
@@ -633,6 +634,7 @@ public class CheatSheetViewer implements ICheatSheetViewer, IMenuContributor {
 		control.setLayout(layout);
 
 		control.addDisposeListener(new DisposeListener(){
+			@Override
 			public void widgetDisposed(DisposeEvent e) {
 				dispose();
 			}
@@ -683,6 +685,7 @@ public class CheatSheetViewer implements ICheatSheetViewer, IMenuContributor {
 			Display.getCurrent().removeFilter(SWT.Show, listener);
 
 			helpPart.getControl().addListener(SWT.Dispose, new Listener() {
+				@Override
 				public void handleEvent(Event event) {
 					control.setVisible(true);
 					Display.getCurrent().addFilter(SWT.Show, listener);
@@ -716,6 +719,7 @@ public class CheatSheetViewer implements ICheatSheetViewer, IMenuContributor {
 	/* (non-Javadoc)
 	 * @see org.eclipse.ui.cheatsheets.ICheatSheetViewer#getCheatSheetID()
 	 */
+	@Override
 	public String getCheatSheetID() {
 		if(getContent() != null) {
 			return getContent().getID();
@@ -736,6 +740,7 @@ public class CheatSheetViewer implements ICheatSheetViewer, IMenuContributor {
 	/* (non-Javadoc)
 	 * @see org.eclipse.ui.cheatsheets.ICheatSheetViewer#getControl()
 	 */
+	@Override
 	public Control getControl() {
 		return control;
 	}
@@ -797,6 +802,7 @@ public class CheatSheetViewer implements ICheatSheetViewer, IMenuContributor {
 		 */
 		if (!inDialog && isInDialogItem() && (Platform.getBundle("org.eclipse.help.ui") != null)) { //$NON-NLS-1$
 			listener = new Listener() {
+				@Override
 				public void handleEvent(Event event) {
 					if (isTrayDialog(event.widget)) {
 						dialogOpened((TrayDialog)((Shell)event.widget).getData());
@@ -1198,6 +1204,7 @@ public class CheatSheetViewer implements ICheatSheetViewer, IMenuContributor {
 	/**
 	 * Passing the focus request to the viewer's control.
 	 */
+	@Override
 	public void setFocus() {
 		//need this to have current item selected. (Assumes that when you reactivate the view you will work with current item.)
 		if (currentItem != null) {
@@ -1211,6 +1218,7 @@ public class CheatSheetViewer implements ICheatSheetViewer, IMenuContributor {
 	/* (non-Javadoc)
 	 * @see org.eclipse.ui.cheatsheets.ICheatSheetViewer#setInput(java.lang.String)
 	 */
+	@Override
 	public void setInput(String id) {
 		setInput(id, new DefaultStateManager());
 	}
@@ -1249,6 +1257,7 @@ public class CheatSheetViewer implements ICheatSheetViewer, IMenuContributor {
 	/* (non-Javadoc)
 	 * @see org.eclipse.ui.cheatsheets.ICheatSheetViewer#setInput(java.lang.String, java.lang.String, java.net.URL)
 	 */
+	@Override
 	public void setInput(String id, String name, URL url) {
 		setInput(id, name, url, new DefaultStateManager(), false);
 	}
@@ -1316,6 +1325,7 @@ public class CheatSheetViewer implements ICheatSheetViewer, IMenuContributor {
 		}
 	}
 
+	@Override
 	public int contributeToViewMenu(Menu menu, int index) {
 		if (currentPage instanceof IMenuContributor) {
 			return ((IMenuContributor)currentPage).contributeToViewMenu(menu, index);
@@ -1339,6 +1349,7 @@ public class CheatSheetViewer implements ICheatSheetViewer, IMenuContributor {
 		}
 	}
 
+	@Override
 	public void reset(Map cheatSheetData) {
 		if (currentPage instanceof CheatSheetPage) {
 			restart();
diff --git a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/views/CoreItem.java b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/views/CoreItem.java
index 40b56a3ad..4d0b6bb3f 100644
--- a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/views/CoreItem.java
+++ b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/views/CoreItem.java
@@ -85,6 +85,7 @@ public class CoreItem extends ViewItem {
 			final ImageHyperlink startButton = createButtonWithText(buttonComposite, CheatSheetPlugin.getPlugin().getImage(ICheatSheetResource.CHEATSHEET_ITEM_BUTTON_START), this, itemColor, Messages.PERFORM_TASK_TOOLTIP);
 			startButton.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false));
 			startButton.addHyperlinkListener(new HyperlinkAdapter() {
+				@Override
 				public void linkActivated(HyperlinkEvent e) {
 					viewer.runPerformExecutable(startButton);
 				}
@@ -93,6 +94,7 @@ public class CoreItem extends ViewItem {
 		if (!isActionShown || executable.isConfirm() || !executable.isRequired()) {
 			final ImageHyperlink completeButton = createButtonWithText(buttonComposite, CheatSheetPlugin.getPlugin().getImage(ICheatSheetResource.CHEATSHEET_ITEM_BUTTON_COMPLETE), this, itemColor, Messages.COMPLETE_TASK_TOOLTIP);
 			completeButton.addHyperlinkListener(new HyperlinkAdapter() {
+				@Override
 				public void linkActivated(HyperlinkEvent e) {
 					viewer.advanceItem(completeButton, true);
 				}
@@ -101,6 +103,7 @@ public class CoreItem extends ViewItem {
 		if (item.isSkip()) {
 			final ImageHyperlink skipButton = createButtonWithText(buttonComposite, CheatSheetPlugin.getPlugin().getImage(ICheatSheetResource.CHEATSHEET_ITEM_SKIP), this, itemColor, Messages.SKIP_TASK_TOOLTIP);
 			skipButton.addHyperlinkListener(new HyperlinkAdapter() {
+				@Override
 				public void linkActivated(HyperlinkEvent e) {
 					viewer.advanceItem(skipButton, false);
 				}
@@ -194,6 +197,7 @@ public class CoreItem extends ViewItem {
 			startButton = createButton(buttonComposite, CheatSheetPlugin.getPlugin().getImage(ICheatSheetResource.CHEATSHEET_ITEM_BUTTON_START), this, itemColor, Messages.PERFORM_TASK_TOOLTIP);
 			final ImageHyperlink finalStartButton = startButton;
 			startButton.addHyperlinkListener(new HyperlinkAdapter() {
+				@Override
 				public void linkActivated(HyperlinkEvent e) {
 					viewer.runSubItemPerformExecutable(finalStartButton, fi);
 				}
@@ -204,6 +208,7 @@ public class CoreItem extends ViewItem {
 			added++;
 			final ImageHyperlink completeButton = createButton(buttonComposite, CheatSheetPlugin.getPlugin().getImage(ICheatSheetResource.CHEATSHEET_ITEM_BUTTON_COMPLETE), this, itemColor, Messages.COMPLETE_TASK_TOOLTIP);
 			completeButton.addHyperlinkListener(new HyperlinkAdapter() {
+				@Override
 				public void linkActivated(HyperlinkEvent e) {
 					viewer.advanceSubItem(completeButton, true, fi);
 				}
@@ -214,6 +219,7 @@ public class CoreItem extends ViewItem {
 			added++;
 			final ImageHyperlink skipButton = createButton(buttonComposite, CheatSheetPlugin.getPlugin().getImage(ICheatSheetResource.CHEATSHEET_ITEM_SKIP), this, itemColor, Messages.SKIP_TASK_TOOLTIP);
 			skipButton.addHyperlinkListener(new HyperlinkAdapter() {
+				@Override
 				public void linkActivated(HyperlinkEvent e) {
 					viewer.advanceSubItem(skipButton, false, fi);
 				}
@@ -309,6 +315,7 @@ public class CoreItem extends ViewItem {
 	/**
 	 * @see org.eclipse.ui.internal.cheatsheets.ViewItem#handleButtons()
 	 */
+	@Override
 	/*package*/ void handleButtons() {
 		if(item.isDynamic()) {
 			handleDynamicButtons();
@@ -544,7 +551,8 @@ public class CoreItem extends ViewItem {
 		buttonsHandled = handled;
 	}
 	
-	/*package*/ void setIncomplete() {
+	/*package*/ @Override
+	void setIncomplete() {
 		super.setIncomplete();
 			
 		//check for sub items and reset their icons.
@@ -562,7 +570,8 @@ public class CoreItem extends ViewItem {
 		}	
 	}
 
-	/*package*/ void setRestartImage() {
+	/*package*/ @Override
+	void setRestartImage() {
 		ImageHyperlink startButton = getStartButton();
 		if (startButton != null) {
 			startButton.setImage(CheatSheetPlugin.getPlugin().getImage(ICheatSheetResource.CHEATSHEET_ITEM_BUTTON_RESTART));
@@ -571,7 +580,8 @@ public class CoreItem extends ViewItem {
 		}
 	}
 
-	/*package*/ void setStartImage() {
+	/*package*/ @Override
+	void setStartImage() {
 		ImageHyperlink startButton = getStartButton();
 		if (startButton != null) {
 			startButton.setImage(CheatSheetPlugin.getPlugin().getImage(ICheatSheetResource.CHEATSHEET_ITEM_BUTTON_START));
@@ -582,6 +592,7 @@ public class CoreItem extends ViewItem {
 		}
 	}
 
+	@Override
 	boolean hasCompletionMessage() {
 		return item.getCompletionMessage() != null;
 	}
@@ -593,6 +604,7 @@ public class CoreItem extends ViewItem {
 	 * and a button to advance to the next step or return to the introduction if 
 	 * this is the last step.
 	 */
+	@Override
 	void createCompletionComposite(boolean isFinalItem) {
 		String completionMessage = viewer.getManager().performVariableSubstitution
 		    (item.getCompletionMessage());
@@ -619,6 +631,7 @@ public class CoreItem extends ViewItem {
 					backgroundColor, 
 					getCompletionButtonTooltip(isFinalItem));
 			completeButton.addHyperlinkListener(new HyperlinkAdapter() {
+				@Override
 				public void linkActivated(HyperlinkEvent e) {
 					viewer.advanceItem(completeButton, true);
 				}
@@ -663,6 +676,7 @@ public class CoreItem extends ViewItem {
 		}
 	}
 	
+	@Override
 	protected void setFocus() {
 		ArrayList list = getListOfSubItemCompositeHolders();
 		Control subitemLabel = null;
diff --git a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/views/ErrorPage.java b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/views/ErrorPage.java
index 155fb05fb..57ed099ff 100644
--- a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/views/ErrorPage.java
+++ b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/views/ErrorPage.java
@@ -82,6 +82,7 @@ public class ErrorPage extends Page {
 		this.status = status;
 	}
 
+	@Override
 	public void createPart(Composite parent) {
 		super.createPart(parent);
 		if (status != null) {
@@ -134,10 +135,12 @@ public class ErrorPage extends Page {
 	 *
 	 * @param parent the SWT parent for the title area composite
 	 */
+	@Override
 	protected String getTitle() {
 		return Messages.ERROR_LOADING_CHEATSHEET_CONTENT;
 	}
 
+	@Override
 	public void initialized() {
 		// No initialization required
 	}
diff --git a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/views/IntroItem.java b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/views/IntroItem.java
index 6b6e8182a..06d739f87 100644
--- a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/views/IntroItem.java
+++ b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/views/IntroItem.java
@@ -32,14 +32,16 @@ public class IntroItem extends ViewItem {
 	}
 
 
-	/*package*/ void setStartImage() {
+	/*package*/ @Override
+	void setStartImage() {
 		startButton.setImage(CheatSheetPlugin.getPlugin().getImage(ICheatSheetResource.COMPOSITE_TASK_START));
 		startButton.setText(Messages.START_CHEATSHEET_TOOLTIP);
 		startButton.setToolTipText(Messages.START_CHEATSHEET_TOOLTIP);
 //		startButton.setFAccessibleName(startButton.getToolTipText());
 	}
 
-	/*package*/ void setRestartImage() {
+	/*package*/ @Override
+	void setRestartImage() {
 		startButton.setImage(CheatSheetPlugin.getPlugin().getImage(ICheatSheetResource.CHEATSHEET_RETURN));
 		startButton.setText(Messages.RESTART_CHEATSHEET_TOOLTIP);
 		startButton.setToolTipText(Messages.RESTART_CHEATSHEET_TOOLTIP);
@@ -49,6 +51,7 @@ public class IntroItem extends ViewItem {
 	/**
 	 * @see org.eclipse.ui.internal.cheatsheets.data.ViewItem#handleButtons(Composite)
 	 */
+	@Override
 	/*package*/ void handleButtons() {
 		buttonComposite = page.getToolkit().createComposite(bodyWrapperComposite);
 		GridLayout buttonlayout = new GridLayout(4, false);
@@ -70,16 +73,19 @@ public class IntroItem extends ViewItem {
 		startButton = createButtonWithText(buttonComposite, CheatSheetPlugin.getPlugin().getImage(ICheatSheetResource.COMPOSITE_TASK_START), this, itemColor, Messages.START_CHEATSHEET_TOOLTIP);
 		startButton.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false));
 		startButton.addHyperlinkListener(new HyperlinkAdapter() {
+			@Override
 			public void linkActivated(HyperlinkEvent e) {
 				viewer.advanceIntroItem();
 			}
 		});
 	}
 
+	@Override
 	boolean hasCompletionMessage() {
 		return false;
 	}
 
+	@Override
 	void createCompletionComposite(boolean isFinalItem) {
 		// Not called	
 	}
diff --git a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/views/ViewItem.java b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/views/ViewItem.java
index e65035345..2a96d3b82 100644
--- a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/views/ViewItem.java
+++ b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/views/ViewItem.java
@@ -120,6 +120,7 @@ public abstract class ViewItem {
 
 		
 		mainItemComposite.addExpansionListener(new ExpansionAdapter() {
+			@Override
 			public void expansionStateChanged(ExpansionEvent e) {
 				page.getForm().reflow(true);
 			}
@@ -154,6 +155,7 @@ public abstract class ViewItem {
 			number++;
 			ImageHyperlink helpButton = createButton(titleComposite, CheatSheetPlugin.getPlugin().getImage(ICheatSheetResource.CHEATSHEET_ITEM_HELP), this, itemColor, Messages.HELP_BUTTON_TOOLTIP);
 			helpButton.addHyperlinkListener(new HyperlinkAdapter() {
+				@Override
 				public void linkActivated(HyperlinkEvent e) {
 					// If we have a context id, handle this first and ignore an hrefs
 					if(item.getContextId() != null) {
@@ -190,6 +192,7 @@ public abstract class ViewItem {
 
 		bodyText = page.getToolkit().createFormText(bodyWrapperComposite, false);
 		bodyText.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent e) {
 				Action copyAction = viewer.getCopyAction();
 				if (copyAction!=null)
@@ -197,11 +200,13 @@ public abstract class ViewItem {
 			}
 		});
 		bodyText.addFocusListener(new FocusListener() {
+			@Override
 			public void focusGained(FocusEvent e) {
 				Action copyAction = viewer.getCopyAction();
 				if (copyAction!=null)
 					copyAction.setEnabled(bodyText.canCopy());
 			}
+			@Override
 			public void focusLost(FocusEvent e) {
 				Action copyAction = viewer.getCopyAction();
 				if (copyAction!=null)