Bug 431530 - Add @Override and @Deprecated annotations to platform.ui

bundles 

Change-Id: I2942b55744ab85e90fa567e800ede8763938f729
Signed-off-by: Lars Vogel <Lars.Vogel@gmail.com>

6 files changed, 52 insertions, 0 deletions

diff --git a/bundles/org.eclipse.e4.ui.workbench.addons.swt/src/org/eclipse/e4/ui/workbench/addons/cleanupaddon/CleanupAddon.java b/bundles/org.eclipse.e4.ui.workbench.addons.swt/src/org/eclipse/e4/ui/workbench/addons/cleanupaddon/CleanupAddon.java
index a48d8154d65..cde9aec83dc 100644
--- a/bundles/org.eclipse.e4.ui.workbench.addons.swt/src/org/eclipse/e4/ui/workbench/addons/cleanupaddon/CleanupAddon.java
+++ b/bundles/org.eclipse.e4.ui.workbench.addons.swt/src/org/eclipse/e4/ui/workbench/addons/cleanupaddon/CleanupAddon.java
@@ -53,6 +53,7 @@ public class CleanupAddon {
 	MApplication app;
 
 	private EventHandler childrenHandler = new EventHandler() {
+		@Override
 		public void handleEvent(Event event) {
 			Object changedObj = event.getProperty(UIEvents.EventTags.ELEMENT);
 			if (UIEvents.isREMOVE(event)) {
@@ -76,6 +77,7 @@ public class CleanupAddon {
 				// Stall the removal to handle cases where the container is only transiently empty
 				if (display != null) {
 					Display.getCurrent().asyncExec(new Runnable() {
+						@Override
 						public void run() {
 							// Remove it from the display if no visible children
 							int tbrCount = modelService.toBeRenderedCount(container);
@@ -141,6 +143,7 @@ public class CleanupAddon {
 	};
 
 	private EventHandler visibilityChangeHandler = new EventHandler() {
+		@Override
 		public void handleEvent(Event event) {
 			MUIElement changedObj = (MUIElement) event.getProperty(UIEvents.EventTags.ELEMENT);
 			if (changedObj instanceof MTrimBar
@@ -234,6 +237,7 @@ public class CleanupAddon {
 	};
 
 	private EventHandler renderingChangeHandler = new EventHandler() {
+		@Override
 		public void handleEvent(Event event) {
 			MUIElement changedObj = (MUIElement) event.getProperty(UIEvents.EventTags.ELEMENT);
 			MElementContainer<MUIElement> container = null;
@@ -279,6 +283,7 @@ public class CleanupAddon {
 				final MElementContainer<MUIElement> theContainer = container;
 				if (visCount == 0) {
 					Display.getCurrent().asyncExec(new Runnable() {
+						@Override
 						public void run() {
 							int visCount = modelService.countRenderableChildren(theContainer);
 							if (!isLastEditorStack(theContainer) && visCount == 0)
diff --git a/bundles/org.eclipse.e4.ui.workbench.addons.swt/src/org/eclipse/e4/ui/workbench/addons/dndaddon/DnDManager.java b/bundles/org.eclipse.e4.ui.workbench.addons.swt/src/org/eclipse/e4/ui/workbench/addons/dndaddon/DnDManager.java
index 71357898e45..9cc52cc85f0 100644
--- a/bundles/org.eclipse.e4.ui.workbench.addons.swt/src/org/eclipse/e4/ui/workbench/addons/dndaddon/DnDManager.java
+++ b/bundles/org.eclipse.e4.ui.workbench.addons.swt/src/org/eclipse/e4/ui/workbench/addons/dndaddon/DnDManager.java
@@ -73,6 +73,7 @@ class DnDManager {
 	private List<Rectangle> frames = new ArrayList<Rectangle>();
 
 	DragDetectListener dragDetector = new DragDetectListener() {
+		@Override
 		public void dragDetected(DragDetectEvent e) {
 			if (dragging || e.widget.isDisposed())
 				return;
@@ -126,6 +127,7 @@ class DnDManager {
 		hookWidgets();
 
 		getDragShell().addDisposeListener(new DisposeListener() {
+			@Override
 			public void widgetDisposed(DisposeEvent e) {
 				dispose();
 			}
@@ -138,6 +140,7 @@ class DnDManager {
 	 */
 	private void hookWidgets() {
 		EventHandler stackWidgetHandler = new EventHandler() {
+			@Override
 			public void handleEvent(org.osgi.service.event.Event event) {
 				MUIElement element = (MUIElement) event.getProperty(UIEvents.EventTags.ELEMENT);
 
@@ -184,6 +187,7 @@ class DnDManager {
 
 	private void track() {
 		Display.getCurrent().syncExec(new Runnable() {
+			@Override
 			public void run() {
 				info.update();
 				dragAgent.track(info);
@@ -201,6 +205,7 @@ class DnDManager {
 		setRectangle(offScreenRect);
 
 		tracker.addKeyListener(new KeyListener() {
+			@Override
 			public void keyReleased(KeyEvent e) {
 				if (e.keyCode == SWT.MOD1) {
 					isModified = false;
@@ -208,6 +213,7 @@ class DnDManager {
 				}
 			}
 
+			@Override
 			public void keyPressed(KeyEvent e) {
 				if (e.keyCode == SWT.MOD1) {
 					isModified = true;
@@ -217,6 +223,7 @@ class DnDManager {
 		});
 
 		tracker.addListener(SWT.Move, new Listener() {
+			@Override
 			public void handleEvent(final Event event) {
 				track();
 			}
@@ -395,6 +402,7 @@ class DnDManager {
 			stylingEngine.style(overlayFrame);
 
 			overlayFrame.addPaintListener(new PaintListener() {
+				@Override
 				public void paintControl(PaintEvent e) {
 					for (int i = 0; i < images.size(); i++) {
 						Image image = images.get(i);
diff --git a/bundles/org.eclipse.e4.ui.workbench.addons.swt/src/org/eclipse/e4/ui/workbench/addons/dndaddon/Overlay.java b/bundles/org.eclipse.e4.ui.workbench.addons.swt/src/org/eclipse/e4/ui/workbench/addons/dndaddon/Overlay.java
index 1e142e4e05c..f46246f6af2 100644
--- a/bundles/org.eclipse.e4.ui.workbench.addons.swt/src/org/eclipse/e4/ui/workbench/addons/dndaddon/Overlay.java
+++ b/bundles/org.eclipse.e4.ui.workbench.addons.swt/src/org/eclipse/e4/ui/workbench/addons/dndaddon/Overlay.java
@@ -126,6 +126,7 @@ class Overlay {
 
 		blue = new Color(baseShell.getDisplay(), 0, 0, 128);
 		overlayShell.addPaintListener(new PaintListener() {
+			@Override
 			public void paintControl(PaintEvent e) {
 				e.gc.setForeground(blue);
 				e.gc.setBackground(blue);
diff --git a/bundles/org.eclipse.e4.ui.workbench.addons.swt/src/org/eclipse/e4/ui/workbench/addons/minmax/MinMaxAddon.java b/bundles/org.eclipse.e4.ui.workbench.addons.swt/src/org/eclipse/e4/ui/workbench/addons/minmax/MinMaxAddon.java
index 7e10647ec25..c6ec7bb2b8e 100644
--- a/bundles/org.eclipse.e4.ui.workbench.addons.swt/src/org/eclipse/e4/ui/workbench/addons/minmax/MinMaxAddon.java
+++ b/bundles/org.eclipse.e4.ui.workbench.addons.swt/src/org/eclipse/e4/ui/workbench/addons/minmax/MinMaxAddon.java
@@ -103,23 +103,28 @@ public class MinMaxAddon {
 			return parentElement != null ? parentElement.getCurSharedRef() : element;
 		}
 
+		@Override
 		public void maximize(CTabFolderEvent event) {
 			setState(getElementToChange(event), MAXIMIZED);
 		}
 
+		@Override
 		public void minimize(CTabFolderEvent event) {
 			setState(getElementToChange(event), MINIMIZED);
 		}
 
+		@Override
 		public void restore(CTabFolderEvent event) {
 			setState(getElementToChange(event), null);
 		}
 	};
 
 	private MouseListener CTFDblClickListener = new MouseListener() {
+		@Override
 		public void mouseUp(MouseEvent e) {
 		}
 
+		@Override
 		public void mouseDown(MouseEvent e) {
 			// HACK! If this is an empty stack treat it as though it was the editor area
 			// and tear down any open trim stacks (see bug 384814)
@@ -155,6 +160,7 @@ public class MinMaxAddon {
 			return parentElement != null ? parentElement.getCurSharedRef() : element;
 		}
 
+		@Override
 		public void mouseDoubleClick(MouseEvent e) {
 			// only maximize if the primary mouse button was used
 			if (e.button == 1) {
@@ -318,6 +324,7 @@ public class MinMaxAddon {
 
 		final Shell winShell = (Shell) window.getWidget();
 		winShell.getDisplay().asyncExec(new Runnable() {
+			@Override
 			public void run() {
 				if (!winShell.isDisposed()) {
 					winShell.layout(true, true);
diff --git a/bundles/org.eclipse.e4.ui.workbench.addons.swt/src/org/eclipse/e4/ui/workbench/addons/minmax/TrimPaneLayout.java b/bundles/org.eclipse.e4.ui.workbench.addons.swt/src/org/eclipse/e4/ui/workbench/addons/minmax/TrimPaneLayout.java
index e37071a0e98..2f2f7dc54a2 100644
--- a/bundles/org.eclipse.e4.ui.workbench.addons.swt/src/org/eclipse/e4/ui/workbench/addons/minmax/TrimPaneLayout.java
+++ b/bundles/org.eclipse.e4.ui.workbench.addons.swt/src/org/eclipse/e4/ui/workbench/addons/minmax/TrimPaneLayout.java
@@ -125,6 +125,7 @@ public class TrimPaneLayout extends Layout {
 			return;
 
 		composite.addMouseMoveListener(new MouseMoveListener() {
+			@Override
 			public void mouseMove(MouseEvent e) {
 				Point p = e.display.getCursorLocation();
 				if (trackState == NOT_SIZING) {
@@ -141,6 +142,7 @@ public class TrimPaneLayout extends Layout {
 
 		composite.addMouseListener(new MouseListener() {
 
+			@Override
 			public void mouseUp(MouseEvent e) {
 				composite.setCapture(false);
 
@@ -154,6 +156,7 @@ public class TrimPaneLayout extends Layout {
 				trackState = NOT_SIZING;
 			}
 
+			@Override
 			public void mouseDown(MouseEvent e) {
 				Point p = new Point(e.x, e.y);
 				if (hSizingRect.contains(p)) {
@@ -171,19 +174,23 @@ public class TrimPaneLayout extends Layout {
 				}
 			}
 
+			@Override
 			public void mouseDoubleClick(MouseEvent e) {
 			}
 		});
 
 		composite.addMouseTrackListener(new MouseTrackListener() {
+			@Override
 			public void mouseHover(MouseEvent e) {
 			}
 
+			@Override
 			public void mouseExit(MouseEvent e) {
 				Composite comp = (Composite) e.widget;
 				comp.setCursor(null);
 			}
 
+			@Override
 			public void mouseEnter(MouseEvent e) {
 			}
 		});
diff --git a/bundles/org.eclipse.e4.ui.workbench.addons.swt/src/org/eclipse/e4/ui/workbench/addons/minmax/TrimStack.java b/bundles/org.eclipse.e4.ui.workbench.addons.swt/src/org/eclipse/e4/ui/workbench/addons/minmax/TrimStack.java
index 40ee44651d9..3fd6033117e 100644
--- a/bundles/org.eclipse.e4.ui.workbench.addons.swt/src/org/eclipse/e4/ui/workbench/addons/minmax/TrimStack.java
+++ b/bundles/org.eclipse.e4.ui.workbench.addons.swt/src/org/eclipse/e4/ui/workbench/addons/minmax/TrimStack.java
@@ -123,17 +123,20 @@ public class TrimStack {
 	private Map<String, Image> imageMap = new HashMap<String, Image>();
 
 	ControlListener caResizeListener = new ControlListener() {
+		@Override
 		public void controlResized(ControlEvent e) {
 			if (hostPane != null && hostPane.isVisible())
 				setPaneLocation();
 		}
 
+		@Override
 		public void controlMoved(ControlEvent e) {
 		}
 	};
 
 	// Listens to ESC and closes the active fast view
 	private Listener escapeListener = new Listener() {
+		@Override
 		public void handleEvent(Event event) {
 			if (event.character == SWT.ESC) {
 				showStack(false);
@@ -252,6 +255,7 @@ public class TrimStack {
 	 * http://wiki.eclipse.org/Eclipse4/RCP/Event_Model
 	 */
 	private EventHandler closeHandler = new EventHandler() {
+		@Override
 		public void handleEvent(org.osgi.service.event.Event event) {
 			if (!isShowing)
 				return;
@@ -284,6 +288,7 @@ public class TrimStack {
 	
 	// Close any open stacks before shutting down
 	private EventHandler shutdownHandler = new EventHandler() {
+		@Override
 		public void handleEvent(org.osgi.service.event.Event event) {
 			showStack(false);
 		}
@@ -364,6 +369,7 @@ public class TrimStack {
 	 * http://wiki.eclipse.org/Eclipse4/RCP/Event_Model
 	 */
 	private EventHandler openHandler = new EventHandler() {
+		@Override
 		public void handleEvent(org.osgi.service.event.Event event) {
 			if (isShowing)
 				return;
@@ -404,6 +410,7 @@ public class TrimStack {
 	 * http://wiki.eclipse.org/Eclipse4/RCP/Event_Model
 	 */
 	private EventHandler toBeRenderedHandler = new EventHandler() {
+		@Override
 		public void handleEvent(org.osgi.service.event.Event event) {
 			if (minimizedElement == null || trimStackTB == null)
 				return;
@@ -420,6 +427,7 @@ public class TrimStack {
 			MUIElement parentElement = changedElement.getParent();
 			if (parentElement == minimizedElement) {
 				trimStackTB.getDisplay().asyncExec(new Runnable() {
+					@Override
 					public void run() {
 						updateTrimStackItems();
 					}
@@ -434,6 +442,7 @@ public class TrimStack {
 	 * http://wiki.eclipse.org/Eclipse4/RCP/Event_Model
 	 */
 	private EventHandler childrenHandler = new EventHandler() {
+		@Override
 		public void handleEvent(org.osgi.service.event.Event event) {
 			if (minimizedElement == null || trimStackTB == null)
 				return;
@@ -443,6 +452,7 @@ public class TrimStack {
 			// if a child has been added or removed, re-scape the CTF
 			if (changedObj == minimizedElement) {
 				trimStackTB.getDisplay().asyncExec(new Runnable() {
+					@Override
 					public void run() {
 						updateTrimStackItems();
 					}
@@ -457,6 +467,7 @@ public class TrimStack {
 	 * http://wiki.eclipse.org/Eclipse4/RCP/Event_Model
 	 */
 	private EventHandler widgetHandler = new EventHandler() {
+		@Override
 		public void handleEvent(org.osgi.service.event.Event event) {
 			Object changedObj = event.getProperty(UIEvents.EventTags.ELEMENT);
 			if (changedObj != minimizedElement)
@@ -464,6 +475,7 @@ public class TrimStack {
 
 			if (minimizedElement.getWidget() != null) {
 				trimStackTB.getDisplay().asyncExec(new Runnable() {
+					@Override
 					public void run() {
 						updateTrimStackItems();
 					}
@@ -480,6 +492,7 @@ public class TrimStack {
 	// Listener attached to every ToolItem in a TrimStack. Responsible for activating the
 	// appropriate part.
 	private SelectionListener toolItemSelectionListener = new SelectionListener() {
+		@Override
 		public void widgetSelected(SelectionEvent e) {
 			ToolItem toolItem = (ToolItem) e.widget;
 			MUIElement uiElement = (MUIElement) toolItem.getData();
@@ -500,6 +513,7 @@ public class TrimStack {
 			showStack(true);
 		}
 
+		@Override
 		public void widgetDefaultSelected(SelectionEvent e) {
 			widgetSelected(e);
 		}
@@ -569,6 +583,7 @@ public class TrimStack {
 		}
 		trimStackTB = new ToolBar(parent, orientation | SWT.FLAT | SWT.WRAP);
 		trimStackTB.addDisposeListener(new DisposeListener() {
+			@Override
 			public void widgetDisposed(DisposeEvent e) {
 				showStack(false);
 
@@ -578,6 +593,7 @@ public class TrimStack {
 		});
 
 		trimStackTB.addListener(SWT.MenuDetect, new Listener() {
+			@Override
 			public void handleEvent(Event event) {
 				// Clear any existing menus
 				while (trimStackMenu.getItemCount() > 0)
@@ -615,6 +631,7 @@ public class TrimStack {
 		restoreBtn.setToolTipText(Messages.TrimStack_RestoreText);
 		restoreBtn.setImage(getRestoreImage());
 		restoreBtn.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent e) {
 				minimizedElement.getTags().remove(IPresentationEngine.MINIMIZED);
 			}
@@ -630,6 +647,7 @@ public class TrimStack {
 		MenuItem restoreItem = new MenuItem(trimStackMenu, SWT.NONE);
 		restoreItem.setText(Messages.TrimStack_RestoreText);
 		restoreItem.addListener(SWT.Selection, new Listener() {
+			@Override
 			public void handleEvent(Event event) {
 				minimizedElement.getTags().remove(IPresentationEngine.MINIMIZED);
 			}
@@ -644,6 +662,7 @@ public class TrimStack {
 		useOverlaysItem.setText(Messages.TrimStack_Use_Overlays);
 		useOverlaysItem.setSelection(useOverlays());
 		useOverlaysItem.addListener(SWT.Selection, new Listener() {
+			@Override
 			public void handleEvent(Event event) {
 				if (minMaxAddon != null) {
 					minMaxAddon.getPersistedState().put(USE_OVERLAYS_KEY,
@@ -671,6 +690,7 @@ public class TrimStack {
 		MenuItem defaultItem = new MenuItem(orientationMenu, SWT.RADIO);
 		defaultItem.setText(Messages.TrimStack_DefaultOrientationItem);
 		defaultItem.addListener(SWT.Selection, new Listener() {
+			@Override
 			public void handleEvent(Event event) {
 				boolean doRefresh = minimizedElement.getTags().remove(
 						IPresentationEngine.ORIENTATION_HORIZONTAL);
@@ -685,6 +705,7 @@ public class TrimStack {
 		MenuItem horizontalItem = new MenuItem(orientationMenu, SWT.RADIO);
 		horizontalItem.setText(Messages.TrimStack_Horizontal);
 		horizontalItem.addListener(SWT.Selection, new Listener() {
+			@Override
 			public void handleEvent(Event event) {
 				if (!minimizedElement.getTags()
 						.contains(IPresentationEngine.ORIENTATION_HORIZONTAL)) {
@@ -700,6 +721,7 @@ public class TrimStack {
 		MenuItem verticalItem = new MenuItem(orientationMenu, SWT.RADIO);
 		verticalItem.setText(Messages.TrimStack_Vertical);
 		verticalItem.addListener(SWT.Selection, new Listener() {
+			@Override
 			public void handleEvent(Event event) {
 				if (!minimizedElement.getTags().contains(IPresentationEngine.ORIENTATION_VERTICAL)) {
 					minimizedElement.getTags().remove(IPresentationEngine.ORIENTATION_HORIZONTAL);
@@ -723,6 +745,7 @@ public class TrimStack {
 		MenuItem restoreItem = new MenuItem(trimStackMenu, SWT.NONE);
 		restoreItem.setText(Messages.TrimStack_RestoreText);
 		restoreItem.addListener(SWT.Selection, new Listener() {
+			@Override
 			public void handleEvent(Event event) {
 				minimizedElement.getTags().remove(IPresentationEngine.MINIMIZED);
 				partService.activate(selectedPart);
@@ -734,6 +757,7 @@ public class TrimStack {
 			MenuItem closeItem = new MenuItem(trimStackMenu, SWT.NONE);
 			closeItem.setText(Messages.TrimStack_CloseText);
 			closeItem.addListener(SWT.Selection, new Listener() {
+				@Override
 				public void handleEvent(Event event) {
 					partService.hidePart(selectedPart);
 				}