Comparator to lambda.

And other lambda conversions done by the quick fix.

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

3 files changed, 27 insertions, 57 deletions

diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/HyperlinkDetectorsConfigurationBlock.java b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/HyperlinkDetectorsConfigurationBlock.java
index 8b4817f3723..a6f1aa7d5fe 100644
--- a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/HyperlinkDetectorsConfigurationBlock.java
+++ b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/HyperlinkDetectorsConfigurationBlock.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2007, 2015 IBM Corporation and others.
+ * Copyright (c) 2007, 2018 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -21,8 +21,6 @@ import com.ibm.icu.text.Collator;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.KeyEvent;
 import org.eclipse.swt.events.KeyListener;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.events.SelectionListener;
@@ -46,11 +44,9 @@ import org.eclipse.jface.dialogs.IMessageProvider;
 import org.eclipse.jface.layout.PixelConverter;
 import org.eclipse.jface.layout.TableColumnLayout;
 import org.eclipse.jface.preference.PreferencePage;
-import org.eclipse.jface.viewers.CheckStateChangedEvent;
 import org.eclipse.jface.viewers.CheckboxTableViewer;
 import org.eclipse.jface.viewers.ColumnLayoutData;
 import org.eclipse.jface.viewers.ColumnWeightData;
-import org.eclipse.jface.viewers.ICheckStateListener;
 import org.eclipse.jface.viewers.ILabelProviderListener;
 import org.eclipse.jface.viewers.IStructuredContentProvider;
 import org.eclipse.jface.viewers.ITableLabelProvider;
@@ -266,12 +262,7 @@ class HyperlinkDetectorsConfigurationBlock implements IPreferenceConfigurationBl
 			}
 		});
 
-		fHyperlinkDefaultKeyModifierText.addModifyListener(new ModifyListener() {
-			@Override
-			public void modifyText(ModifyEvent e) {
-				handleHyperlinkDefaultKeyModifierModified();
-			}
-		});
+		fHyperlinkDefaultKeyModifierText.addModifyListener(e -> handleHyperlinkDefaultKeyModifierModified());
 
 		addFiller(composite, 2);
 
@@ -318,14 +309,11 @@ class HyperlinkDetectorsConfigurationBlock implements IPreferenceConfigurationBl
 		fHyperlinkDetectorsViewer= new CheckboxTableViewer(hyperlinkDetectorTable);
 		fHyperlinkDetectorsViewer.setUseHashlookup(true);
 
-		fHyperlinkDetectorsViewer.addCheckStateListener(new ICheckStateListener() {
-			@Override
-			public void checkStateChanged(CheckStateChangedEvent event) {
-				String id= ((ListItem)event.getElement()).id;
-				if (id == null)
-					return;
-				fStore.setValue(id, !event.getChecked());
-			}
+		fHyperlinkDetectorsViewer.addCheckStateListener(event -> {
+			String id= ((ListItem) event.getElement()).id;
+			if (id == null)
+				return;
+			fStore.setValue(id, !event.getChecked());
 		});
 
 		fHyperlinkDetectorsViewer.setLabelProvider(new ItemLabelProvider());
@@ -380,12 +368,7 @@ class HyperlinkDetectorsConfigurationBlock implements IPreferenceConfigurationBl
 			}
 		});
 
-		fHyperlinkKeyModifierText.addModifyListener(new ModifyListener() {
-			@Override
-			public void modifyText(ModifyEvent e) {
-				handleHyperlinkKeyModifierModified();
-			}
-		});
+		fHyperlinkKeyModifierText.addModifyListener(e -> handleHyperlinkKeyModifierModified());
 
 		return composite;
 	}
@@ -435,13 +418,10 @@ class HyperlinkDetectorsConfigurationBlock implements IPreferenceConfigurationBl
 		textControl.setLayoutData(gd);
 		textControl.setTextLimit(textLimit);
 
-		textControl.addModifyListener(new ModifyListener() {
-			@Override
-			public void modifyText(ModifyEvent e) {
-				String value= textControl.getText();
-				if (key != null)
-					fStore.setValue(key, value);
-			}
+		textControl.addModifyListener(e -> {
+			String value= textControl.getText();
+			if (key != null)
+				fStore.setValue(key, value);
 		});
 
 		return new Control[] {labelControl, textControl};
@@ -525,14 +505,11 @@ class HyperlinkDetectorsConfigurationBlock implements IPreferenceConfigurationBl
 			listModelItems.add(new ListItem(desc.getId(), desc.getName(), target.getName(), modifierKeys));
 		}
 
-		Comparator<ListItem> comparator= new Comparator<ListItem>() {
-			@Override
-			public int compare(ListItem o1, ListItem o2) {
-				String label1= o1.name;
-				String label2= o2.name;
-				return Collator.getInstance().compare(label1, label2);
+		Comparator<ListItem> comparator= (o1, o2) -> {
+			String label1= o1.name;
+			String label2= o2.name;
+			return Collator.getInstance().compare(label1, label2);
 
-			}
 		};
 		Collections.sort(listModelItems, comparator);
 
diff --git a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/rulers/RulerColumnRegistry.java b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/rulers/RulerColumnRegistry.java
index 9baa4e649c5..beaa24efa9b 100644
--- a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/rulers/RulerColumnRegistry.java
+++ b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/rulers/RulerColumnRegistry.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2015 IBM Corporation and others.
+ * Copyright (c) 2000, 2018 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -233,16 +233,13 @@ public final class RulerColumnRegistry {
 			}
 		}
 
-		Comparator<RulerColumnDescriptor> gravityComp= new Comparator<RulerColumnDescriptor>() {
-			@Override
-			public int compare(RulerColumnDescriptor o1, RulerColumnDescriptor o2) {
-				float diff= o1.getPlacement().getGravity() - o2.getPlacement().getGravity();
-				if (diff == 0)
-					return 0;
-				if (diff < 0)
-					return -1;
-				return 1;
-			}
+		Comparator<RulerColumnDescriptor> gravityComp = (o1, o2) -> {
+			float diff = o1.getPlacement().getGravity() - o2.getPlacement().getGravity();
+			if (diff == 0)
+				return 0;
+			if (diff < 0)
+				return -1;
+			return 1;
 		};
 
 		/* Topological sort - always select the source with the least gravity */
diff --git a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/templates/TemplateVariableProcessor.java b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/templates/TemplateVariableProcessor.java
index 18b983acc2b..f543351a01b 100644
--- a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/templates/TemplateVariableProcessor.java
+++ b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/templates/TemplateVariableProcessor.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2015 IBM Corporation and others.
+ * Copyright (c) 2000, 2018 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -37,12 +37,8 @@ import org.eclipse.jface.text.templates.TemplateVariableResolver;
  */
 final class TemplateVariableProcessor implements IContentAssistProcessor {
 
-	private static Comparator<TemplateVariableProposal> fgTemplateVariableProposalComparator= new Comparator<TemplateVariableProposal>() {
-		@Override
-		public int compare(TemplateVariableProposal proposal0, TemplateVariableProposal proposal1) {
-			return proposal0.getDisplayString().compareTo(proposal1.getDisplayString());
-		}
-	};
+	private static Comparator<TemplateVariableProposal> fgTemplateVariableProposalComparator = (proposal0,
+			proposal1) -> proposal0.getDisplayString().compareTo(proposal1.getDisplayString());
 
 
 	/** the context type */