bug 520779 - Use adapter and lambda helper methods for SWTEventListeners

in org.eclipse.ui.regex


Change-Id: I4527bc547432aa0543abb9d5bb8f9a3ad013e530
Signed-off-by: Fabian Pfaff <fabian.pfaff@vogella.com>

5 files changed, 57 insertions, 119 deletions

diff --git a/bundles/org.eclipse.ui.regex/src/org/eclipse/ui/regex/view/AssistPopup.java b/bundles/org.eclipse.ui.regex/src/org/eclipse/ui/regex/view/AssistPopup.java
index 17f311d6..7276a369 100644
--- a/bundles/org.eclipse.ui.regex/src/org/eclipse/ui/regex/view/AssistPopup.java
+++ b/bundles/org.eclipse.ui.regex/src/org/eclipse/ui/regex/view/AssistPopup.java
@@ -11,16 +11,15 @@
  ******************************************************************************/

 package org.eclipse.ui.regex.view;

 

+import static org.eclipse.swt.events.KeyListener.keyPressedAdapter;

+import static org.eclipse.swt.events.MouseListener.mouseUpAdapter;

+

 import java.util.ArrayList;

 import java.util.Iterator;

 

 import org.eclipse.swt.SWT;

+import org.eclipse.swt.events.ControlAdapter;

 import org.eclipse.swt.events.ControlEvent;

-import org.eclipse.swt.events.ControlListener;

-import org.eclipse.swt.events.KeyEvent;

-import org.eclipse.swt.events.KeyListener;

-import org.eclipse.swt.events.MouseEvent;

-import org.eclipse.swt.events.MouseListener;

 import org.eclipse.swt.graphics.Color;

 import org.eclipse.swt.graphics.Point;

 import org.eclipse.swt.graphics.Rectangle;

@@ -49,10 +48,7 @@ public class AssistPopup {
 		shell.addListener(SWT.Deactivate, e -> shell.setVisible(false));

 

 		// resize shell when list resizes

-		shell.addControlListener(new ControlListener() {

-			@Override

-			public void controlMoved(ControlEvent e) {

-			}

+		shell.addControlListener(new ControlAdapter() {

 

 			@Override

 			public void controlResized(ControlEvent e) {

@@ -62,33 +58,12 @@ public class AssistPopup {
 		});

 

 		// return list selection on Mouse Up or Carriage Return

-		list.addMouseListener(new MouseListener() {

-			@Override

-			public void mouseDoubleClick(MouseEvent e) {

-			}

-

-			@Override

-			public void mouseDown(MouseEvent e) {

-			}

-

-			@Override

-			public void mouseUp(MouseEvent e) {

+		list.addMouseListener(mouseUpAdapter(e -> shell.setVisible(false)));

+		list.addKeyListener(keyPressedAdapter(e -> {

+			if (e.character == '\r') {

 				shell.setVisible(false);

 			}

-		});

-		list.addKeyListener(new KeyListener() {

-			@Override

-			public void keyReleased(KeyEvent e) {

-			}

-

-			@Override

-			public void keyPressed(KeyEvent e) {

-				if (e.character == '\r') {

-					shell.setVisible(false);

-				}

-			}

-		});

-

+		}));

 	}

 

 	private static int checkStyle(int style) {

diff --git a/bundles/org.eclipse.ui.regex/src/org/eclipse/ui/regex/view/FontPreferencePage.java b/bundles/org.eclipse.ui.regex/src/org/eclipse/ui/regex/view/FontPreferencePage.java
index 42762f27..db6a1f7f 100644
--- a/bundles/org.eclipse.ui.regex/src/org/eclipse/ui/regex/view/FontPreferencePage.java
+++ b/bundles/org.eclipse.ui.regex/src/org/eclipse/ui/regex/view/FontPreferencePage.java
@@ -199,8 +199,7 @@ public class FontPreferencePage extends PreferencePage implements IWorkbenchPref
 

 	@Override

 	public void widgetDefaultSelected(SelectionEvent e) {

-		// TODO Auto-generated method stub

-

+		// do nothing on purpose

 	}

 

 	private String buildDescription(String fontName, int fontHeight) {

diff --git a/bundles/org.eclipse.ui.regex/src/org/eclipse/ui/regex/view/RegExView.java b/bundles/org.eclipse.ui.regex/src/org/eclipse/ui/regex/view/RegExView.java
index 49859460..e979634b 100644
--- a/bundles/org.eclipse.ui.regex/src/org/eclipse/ui/regex/view/RegExView.java
+++ b/bundles/org.eclipse.ui.regex/src/org/eclipse/ui/regex/view/RegExView.java
@@ -11,6 +11,8 @@
  ******************************************************************************/

 package org.eclipse.ui.regex.view;

 

+import static org.eclipse.swt.events.SelectionListener.widgetSelectedAdapter;

+

 import java.util.Iterator;

 import java.util.regex.Matcher;

 import java.util.regex.Pattern;

@@ -33,7 +35,6 @@ import org.eclipse.swt.events.FocusEvent;
 import org.eclipse.swt.events.FocusListener;

 import org.eclipse.swt.events.MenuEvent;

 import org.eclipse.swt.events.MenuListener;

-import org.eclipse.swt.events.SelectionAdapter;

 import org.eclipse.swt.events.SelectionEvent;

 import org.eclipse.swt.events.SelectionListener;

 import org.eclipse.swt.graphics.Color;

@@ -236,22 +237,11 @@ public class RegExView extends ViewPart implements SelectionListener, IRegExList
 		new MenuItem(txt_RegExp.getMenu(), SWT.BAR);

 		mit_EvalSelection = new MenuItem(txt_RegExp.getMenu(), SWT.NONE);

 		mit_EvalSelection.setText("Eval Selection Only");

-		mit_EvalSelection.addSelectionListener(new SelectionListener() {

-

-			@Override

-			public void widgetSelected(SelectionEvent e) {

-				regex.setRegExp(txt_RegExp.getSelectionText());

-				regex.setSearchText(txt_SearchText.getText());

-				regex.process();

-

-			}

-

-			@Override

-			public void widgetDefaultSelected(SelectionEvent e) {

-				// TODO Auto-generated method stub

-

-			}

-		});

+		mit_EvalSelection.addSelectionListener(widgetSelectedAdapter(e -> {

+			regex.setRegExp(txt_RegExp.getSelectionText());

+			regex.setSearchText(txt_SearchText.getText());

+			regex.process();

+		}));

 

 		SashForm sashForm = new SashForm(parent, SWT.VERTICAL);

 		sashForm.setLayoutData(new GridData(GridData.FILL_BOTH));

@@ -309,18 +299,14 @@ public class RegExView extends ViewPart implements SelectionListener, IRegExList
 			liveEval.start();

 		}

 

-		btn_LiveEval.addSelectionListener(new SelectionAdapter() {

-

-			@Override

-			public void widgetSelected(SelectionEvent e) {

-				Button check = (Button) e.widget;

-				if (check.getSelection()) {

-					liveEval.start();

-				} else {

-					liveEval.stop();

-				}

+		btn_LiveEval.addSelectionListener(widgetSelectedAdapter(e -> {

+			Button check = (Button) e.widget;

+			if (check.getSelection()) {

+				liveEval.start();

+			} else {

+				liveEval.stop();

 			}

-		});

+		}));

 

 		StyledTextActionHandler styledTextActionHandler = new StyledTextActionHandler(

 				this.getViewSite().getActionBars());

@@ -418,25 +404,20 @@ public class RegExView extends ViewPart implements SelectionListener, IRegExList
 	}

 

 	private void setPatternFlagMenu(Menu menu) {

-		class FlagStatusAdapter extends SelectionAdapter {

-

-			@Override

-			public void widgetSelected(SelectionEvent e) {

-				MenuItem menItem = (MenuItem) e.widget;

-				Integer flag = (Integer) menItem.getData();

-				if (menItem.getSelection()) {

-					regex.addPatternFlag(flag.intValue());

-				} else {

-					regex.removePatternFlag(flag.intValue());

-				}

-				if (liveEval.isLiveEval()) {

-					processRegEx();

-					updateFoundStatus();

-				}

-				txt_RegExp.setToolTipText(regex.getPatternFlagsAsString());

+		SelectionListener flagStatusAdapter = widgetSelectedAdapter(e -> {

+			MenuItem menItem = (MenuItem) e.widget;

+			Integer flag = (Integer) menItem.getData();

+			if (menItem.getSelection()) {

+				regex.addPatternFlag(flag.intValue());

+			} else {

+				regex.removePatternFlag(flag.intValue());

 			}

-		}

-		FlagStatusAdapter flagStatusAdapter = new FlagStatusAdapter();

+			if (liveEval.isLiveEval()) {

+				processRegEx();

+				updateFoundStatus();

+			}

+			txt_RegExp.setToolTipText(regex.getPatternFlagsAsString());

+		});

 

 		men_PatternFlags = new Menu(menu);

 		MenuItem mit_PatternFlags = new MenuItem(menu, SWT.CASCADE);

@@ -488,19 +469,15 @@ public class RegExView extends ViewPart implements SelectionListener, IRegExList
 		new MenuItem(men_PatternFlags, SWT.BAR);

 		MenuItem mit_Flags_deactivateAll = new MenuItem(men_PatternFlags, SWT.NONE);

 		mit_Flags_deactivateAll.setText("Deactivate &All");

-		mit_Flags_deactivateAll.addSelectionListener(new SelectionAdapter() {

-

-			@Override

-			public void widgetSelected(SelectionEvent e) {

-				MenuItem widget = (MenuItem) e.widget;

-				Menu menu = widget.getParent();

-				MenuItem[] menuItems = menu.getItems();

-				for (MenuItem menuItem : menuItems) {

-					menuItem.setSelection(false);

-				}

-				regex.resetPatternFlag();

+		mit_Flags_deactivateAll.addSelectionListener(widgetSelectedAdapter(e -> {

+			MenuItem widget = (MenuItem) e.widget;

+			Menu parentMenu = widget.getParent();

+			MenuItem[] menuItems = parentMenu.getItems();

+			for (MenuItem menuItem : menuItems) {

+				menuItem.setSelection(false);

 			}

-		});

+			regex.resetPatternFlag();

+		}));

 

 	}

 

diff --git a/bundles/org.eclipse.ui.regex/src/org/eclipse/ui/regex/view/actions/ClearActionMenuCreator.java b/bundles/org.eclipse.ui.regex/src/org/eclipse/ui/regex/view/actions/ClearActionMenuCreator.java
index 1c56cdea..bd2151ec 100644
--- a/bundles/org.eclipse.ui.regex/src/org/eclipse/ui/regex/view/actions/ClearActionMenuCreator.java
+++ b/bundles/org.eclipse.ui.regex/src/org/eclipse/ui/regex/view/actions/ClearActionMenuCreator.java
@@ -11,10 +11,11 @@
  ******************************************************************************/

 package org.eclipse.ui.regex.view.actions;

 

+import static org.eclipse.swt.events.SelectionListener.widgetSelectedAdapter;

+

 import org.eclipse.jface.action.IMenuCreator;

 import org.eclipse.swt.SWT;

-import org.eclipse.swt.events.SelectionAdapter;

-import org.eclipse.swt.events.SelectionEvent;

+import org.eclipse.swt.events.SelectionListener;

 import org.eclipse.swt.widgets.Control;

 import org.eclipse.swt.widgets.Menu;

 import org.eclipse.swt.widgets.MenuItem;

@@ -23,11 +24,7 @@ public class ClearActionMenuCreator implements IMenuCreator {
 

 	Menu menu;

 	ClearAction clearAction;

-	ClearSelection clearSelection = new ClearSelection();

-

-	class ClearSelection extends SelectionAdapter {

-		@Override

-		public void widgetSelected(SelectionEvent e) {

+	SelectionListener clearSelection = widgetSelectedAdapter(e -> {

 			MenuItem menuItem = (MenuItem) e.widget;

 			boolean selected = menuItem.getSelection();

 			int mode = ((Integer) menuItem.getData()).intValue();

@@ -35,8 +32,7 @@ public class ClearActionMenuCreator implements IMenuCreator {
 			if (selected) {

 				clearAction.setMode(mode);

 			}

-		}

-	}

+	});

 

 	public ClearActionMenuCreator(ClearAction action) {

 		clearAction = action;

diff --git a/bundles/org.eclipse.ui.regex/src/org/eclipse/ui/regex/view/actions/StyledTextActionHandler.java b/bundles/org.eclipse.ui.regex/src/org/eclipse/ui/regex/view/actions/StyledTextActionHandler.java
index 9cab4e16..0b7f9011 100644
--- a/bundles/org.eclipse.ui.regex/src/org/eclipse/ui/regex/view/actions/StyledTextActionHandler.java
+++ b/bundles/org.eclipse.ui.regex/src/org/eclipse/ui/regex/view/actions/StyledTextActionHandler.java
@@ -17,16 +17,17 @@
 

 package org.eclipse.ui.regex.view.actions;

 

+import static org.eclipse.swt.events.KeyListener.keyReleasedAdapter;

+import static org.eclipse.swt.events.MouseListener.mouseUpAdapter;

+

 import org.eclipse.jface.action.Action;

 import org.eclipse.jface.action.IAction;

 import org.eclipse.jface.util.IPropertyChangeListener;

 import org.eclipse.jface.util.PropertyChangeEvent;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.custom.StyledText;

-import org.eclipse.swt.events.KeyAdapter;

-import org.eclipse.swt.events.KeyEvent;

-import org.eclipse.swt.events.MouseAdapter;

-import org.eclipse.swt.events.MouseEvent;

+import org.eclipse.swt.events.KeyListener;

+import org.eclipse.swt.events.MouseListener;

 import org.eclipse.swt.widgets.Event;

 import org.eclipse.swt.widgets.Listener;

 import org.eclipse.ui.IActionBars;

@@ -72,18 +73,8 @@ public class StyledTextActionHandler {
 	private Listener textControlListener = new TextControlListener();

 	private StyledText activeTextControl;

 

-	private MouseAdapter mouseAdapter = new MouseAdapter() {

-		@Override

-		public void mouseUp(MouseEvent e) {

-			updateActionsEnableState();

-		}

-	};

-	private KeyAdapter keyAdapter = new KeyAdapter() {

-		@Override

-		public void keyReleased(KeyEvent e) {

-			updateActionsEnableState();

-		}

-	};

+	private MouseListener mouseAdapter = mouseUpAdapter(e -> updateActionsEnableState());

+	private KeyListener keyAdapter = keyReleasedAdapter(e -> updateActionsEnableState());

 

 	private class TextControlListener implements Listener {

 		@Override