Bug 497962 - Use lambdas where possible

Enable convert to lambdas and run initial conversion to not interfere
with later commits. Slightly smaller and faster code is worth it at SWT
level.

Change-Id: Ia94b6c25beb09555626eaa455b9e9f43e329f7e6
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>

4 files changed, 33 insertions, 60 deletions

diff --git a/bundles/org.eclipse.swt/Eclipse SWT/emulated/coolbar/org/eclipse/swt/widgets/CoolBar.java b/bundles/org.eclipse.swt/Eclipse SWT/emulated/coolbar/org/eclipse/swt/widgets/CoolBar.java
index 6c288e34e9..4713723e21 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/emulated/coolbar/org/eclipse/swt/widgets/CoolBar.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/emulated/coolbar/org/eclipse/swt/widgets/CoolBar.java
@@ -96,19 +96,16 @@ public CoolBar (Composite parent, int style) {
 		hoverCursor = new Cursor(display, SWT.CURSOR_SIZEWE);
 	}
 	dragCursor = new Cursor(display, SWT.CURSOR_SIZEALL);
-	Listener listener = new Listener() {
-		@Override
-		public void handleEvent(Event event) {
-			switch (event.type) {
-				case SWT.Dispose:      		onDispose(event);        	break;
-				case SWT.MouseDown:    		onMouseDown(event);			break;
-				case SWT.MouseExit:    		onMouseExit();      		break;
-				case SWT.MouseMove:    		onMouseMove(event); 		break;
-				case SWT.MouseUp:      		onMouseUp(event);   		break;
-				case SWT.MouseDoubleClick:	onMouseDoubleClick(event); 	break;
-				case SWT.Paint:        		onPaint(event);     		break;
-				case SWT.Resize:          	onResize();     			break;
-			}
+	Listener listener = event -> {
+		switch (event.type) {
+			case SWT.Dispose:      		onDispose(event);        	break;
+			case SWT.MouseDown:    		onMouseDown(event);			break;
+			case SWT.MouseExit:    		onMouseExit();      		break;
+			case SWT.MouseMove:    		onMouseMove(event); 		break;
+			case SWT.MouseUp:      		onMouseUp(event);   		break;
+			case SWT.MouseDoubleClick:	onMouseDoubleClick(event); 	break;
+			case SWT.Paint:        		onPaint(event);     		break;
+			case SWT.Resize:          	onResize();     			break;
 		}
 	};
 	int[] events = new int[] {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/emulated/coolbar/org/eclipse/swt/widgets/CoolItem.java b/bundles/org.eclipse.swt/Eclipse SWT/emulated/coolbar/org/eclipse/swt/widgets/CoolItem.java
index 21e277db59..8ec14bc1c3 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/emulated/coolbar/org/eclipse/swt/widgets/CoolItem.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/emulated/coolbar/org/eclipse/swt/widgets/CoolItem.java
@@ -621,12 +621,7 @@ void updateChevron() {
 			if (chevron == null) {
 				chevron = new ToolBar (parent, SWT.FLAT | SWT.NO_FOCUS);
 				ToolItem toolItem = new ToolItem (chevron, SWT.PUSH);
-				toolItem.addListener (SWT.Selection, new Listener() {
-					@Override
-					public void handleEvent (Event event) {
-						CoolItem.this.onSelection (event);
-					}
-				});
+				toolItem.addListener (SWT.Selection, event -> CoolItem.this.onSelection (event));
 			}
 			int controlHeight, currentImageHeight = 0;
 			if ((parent.style & SWT.VERTICAL) != 0) {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/emulated/expand/org/eclipse/swt/widgets/ExpandBar.java b/bundles/org.eclipse.swt/Eclipse SWT/emulated/expand/org/eclipse/swt/widgets/ExpandBar.java
index a0270bd22a..5f321c51c6 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/emulated/expand/org/eclipse/swt/widgets/ExpandBar.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/emulated/expand/org/eclipse/swt/widgets/ExpandBar.java
@@ -11,8 +11,8 @@
 package org.eclipse.swt.widgets;
 
 import org.eclipse.swt.*;
-import org.eclipse.swt.graphics.*;
 import org.eclipse.swt.events.*;
+import org.eclipse.swt.graphics.*;
 
 /**
  * Instances of this class support the layout of selectable
@@ -85,20 +85,17 @@ public ExpandBar (Composite parent, int style) {
 	super (parent, checkStyle (style));
 	items = new ExpandItem [4];
 
-	listener = new Listener () {
-		@Override
-		public void handleEvent (Event event) {
-			switch (event.type) {
-				case SWT.Dispose:		onDispose (event);        	break;
-				case SWT.MouseDown:		onMouseDown (event);   		break;
-				case SWT.MouseUp:		onMouseUp (event);   		break;
-				case SWT.Paint:			onPaint (event);     		break;
-				case SWT.Resize:		onResize ();     			break;
-				case SWT.KeyDown:		onKeyDown (event);    		break;
-				case SWT.FocusIn:		onFocus ();     			break;
-				case SWT.FocusOut:		onFocus ();     			break;
-				case SWT.Traverse:		onTraverse (event);   		break;
-			}
+	listener = event -> {
+		switch (event.type) {
+			case SWT.Dispose:		onDispose (event);        	break;
+			case SWT.MouseDown:		onMouseDown (event);   		break;
+			case SWT.MouseUp:		onMouseUp (event);   		break;
+			case SWT.Paint:			onPaint (event);     		break;
+			case SWT.Resize:		onResize ();     			break;
+			case SWT.KeyDown:		onKeyDown (event);    		break;
+			case SWT.FocusIn:		onFocus ();     			break;
+			case SWT.FocusOut:		onFocus ();     			break;
+			case SWT.Traverse:		onTraverse (event);   		break;
 		}
 	};
 	addListener (SWT.Dispose, listener);
@@ -113,12 +110,7 @@ public ExpandBar (Composite parent, int style) {
 
 	ScrollBar verticalBar = getVerticalBar ();
 	if (verticalBar != null) {
-		verticalBar.addListener (SWT.Selection, new Listener () {
-			@Override
-			public void handleEvent (Event event) {
-				onScroll (event);
-			}
-		});
+		verticalBar.addListener (SWT.Selection, event -> onScroll (event));
 	}
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/emulated/tooltip/org/eclipse/swt/widgets/ToolTip.java b/bundles/org.eclipse.swt/Eclipse SWT/emulated/tooltip/org/eclipse/swt/widgets/ToolTip.java
index 85ba6c08f4..056c23abba 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/emulated/tooltip/org/eclipse/swt/widgets/ToolTip.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/emulated/tooltip/org/eclipse/swt/widgets/ToolTip.java
@@ -12,8 +12,8 @@ package org.eclipse.swt.widgets;
 
 
 import org.eclipse.swt.*;
-import org.eclipse.swt.graphics.*;
 import org.eclipse.swt.events.*;
+import org.eclipse.swt.graphics.*;
 
 /**
  * Instances of this class represent popup windows that are used
@@ -98,25 +98,17 @@ public ToolTip (Shell parent, int style) {
 	tip = new Shell (parent, SWT.ON_TOP | SWT.NO_TRIM);
 	Color background = display.getSystemColor (SWT.COLOR_INFO_BACKGROUND);
 	tip.setBackground (background);
-	listener = new Listener () {
-		@Override
-		public void handleEvent (Event event) {
-			switch (event.type) {
-				case SWT.Dispose: onDispose (event); break;
-				case SWT.Paint: onPaint (event); break;
-				case SWT.MouseDown: onMouseDown (event); break;
-			}
+	listener = event -> {
+		switch (event.type) {
+			case SWT.Dispose: onDispose (event); break;
+			case SWT.Paint: onPaint (event); break;
+			case SWT.MouseDown: onMouseDown (event); break;
 		}
 	};
 	addListener (SWT.Dispose, listener);
 	tip.addListener (SWT.Paint, listener);
 	tip.addListener (SWT.MouseDown, listener);
-	parentListener = new Listener () {
-		@Override
-		public void handleEvent (Event event) {
-			dispose ();
-		}
-	};
+	parentListener = event -> dispose ();
 	parent.addListener(SWT.Dispose, parentListener);
 }
 
@@ -633,11 +625,8 @@ public void setVisible (boolean visible) {
 	if (runnable != null) display.timerExec (-1, runnable);
 	runnable = null;
 	if (autohide && visible) {
-		runnable = new Runnable () {
-			@Override
-			public void run () {
-				if (!isDisposed ()) setVisible (false);
-			}
+		runnable = () -> {
+			if (!isDisposed ()) setVisible (false);
 		};
 		display.timerExec(DELAY, runnable);
 	}