From 012adcd2f6d6b57c8af9b495af0ac5a7b58b1170 Mon Sep 17 00:00:00 2001 From: Lars Vogel Date: Mon, 20 Jan 2020 16:16:40 +0100 Subject: Optimize lambdas Uses method references if possible Removes unnecessary brackets Using the upcoming JDT cleanup from https://git.eclipse.org/r/#/c/148248/ Method references are faster in execution and shorter. Change-Id: I4b8edca1ad34eb1c8788e6729c9bb76f1eefb335 Signed-off-by: Lars Vogel --- .../internal/text/codemining/CodeMiningLineHeaderAnnotation.java | 2 +- .../eclipse/jface/internal/text/codemining/CodeMiningManager.java | 4 ++-- .../eclipse/jface/internal/text/revisions/RevisionPainter.java | 2 +- .../src/org/eclipse/jface/internal/text/source/DiffPainter.java | 2 +- .../eclipse/jface/text/hyperlink/DefaultHyperlinkPresenter.java | 2 +- .../src/org/eclipse/jface/text/source/AbstractRulerColumn.java | 2 +- .../src/org/eclipse/jface/text/source/AnnotationRulerColumn.java | 8 ++++---- .../src/org/eclipse/jface/text/source/ChangeRulerColumn.java | 2 +- .../src/org/eclipse/jface/text/source/CompositeRuler.java | 2 +- .../src/org/eclipse/jface/text/source/LineNumberRulerColumn.java | 2 +- .../src/org/eclipse/jface/text/source/OverviewRuler.java | 4 ++-- .../src/org/eclipse/jface/text/source/VerticalRuler.java | 2 +- .../jface/text/source/inlined/AbstractInlinedAnnotation.java | 2 +- .../org/eclipse/search/ui/text/AbstractTextSearchViewPage.java | 2 +- .../internal/ui/text/DecoratingFileSearchLabelProvider.java | 2 +- .../eclipse/text/quicksearch/internal/ui/QuickSearchDialog.java | 2 +- .../ui/internal/editors/text/QuickDiffConfigurationBlock.java | 2 +- .../eclipse/ui/internal/editors/text/SelectResourcesDialog.java | 2 +- .../eclipse/ui/internal/texteditor/PropertyEventDispatcher.java | 2 +- .../genericeditor/GenericEditorWithIconAssociationOverride.java | 4 +--- .../src/org/eclipse/ui/texteditor/AbstractTextEditor.java | 2 +- .../src/org/eclipse/ui/texteditor/InfoForm.java | 2 +- .../src/org/eclipse/ui/texteditor/RetargetTextEditorAction.java | 2 +- .../eclipse/ui/texteditor/templates/AbstractTemplatesPage.java | 4 ++-- .../eclipse/ui/texteditor/templates/TemplatePreferencePage.java | 2 +- .../src/org/eclipse/ui/texteditor/templates/TemplatesView.java | 2 +- 26 files changed, 32 insertions(+), 34 deletions(-) diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/codemining/CodeMiningLineHeaderAnnotation.java b/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/codemining/CodeMiningLineHeaderAnnotation.java index 5108f7a09da..b7188eae92c 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/codemining/CodeMiningLineHeaderAnnotation.java +++ b/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/codemining/CodeMiningLineHeaderAnnotation.java @@ -91,7 +91,7 @@ public class CodeMiningLineHeaderAnnotation extends LineHeaderAnnotation impleme if (fResolvedMinings == null || fResolvedMinings.length == 0) { return false; } - return Stream.of(fResolvedMinings).anyMatch(m -> CodeMiningManager.isValidMining(m)); + return Stream.of(fResolvedMinings).anyMatch(CodeMiningManager::isValidMining); } @Override diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/codemining/CodeMiningManager.java b/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/codemining/CodeMiningManager.java index 727d0114115..4b950c468d6 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/codemining/CodeMiningManager.java +++ b/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/codemining/CodeMiningManager.java @@ -194,7 +194,7 @@ public class CodeMiningManager implements Runnable { })) .collect(Collectors.toList()); return CompletableFuture.allOf(com.toArray(new CompletableFuture[com.size()])).thenApply( - v -> com.stream().map(CompletableFuture::join).flatMap(l -> l.stream()).collect(Collectors.toList())); + v -> com.stream().map(CompletableFuture::join).flatMap(java.util.Collection::stream).collect(Collectors.toList())); } /** @@ -267,7 +267,7 @@ public class CodeMiningManager implements Runnable { monitor.isCanceled(); fInlinedAnnotationSupport.updateAnnotations(currentAnnotations); // redraw the existing codemining annotations since their content can change - annotationsToRedraw.stream().forEach(ann -> ann.redraw()); + annotationsToRedraw.stream().forEach(ICodeMiningAnnotation::redraw); } /** diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/revisions/RevisionPainter.java b/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/revisions/RevisionPainter.java index ceab558ab1d..0bf666e140c 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/revisions/RevisionPainter.java +++ b/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/revisions/RevisionPainter.java @@ -1377,7 +1377,7 @@ public final class RevisionPainter { if (isConnected() && !fControl.isDisposed()) { Display d= fControl.getDisplay(); if (d != null) { - d.asyncExec(() -> redraw()); + d.asyncExec(this::redraw); } } } diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/source/DiffPainter.java b/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/source/DiffPainter.java index 0658f4fb82e..00b0414f174 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/source/DiffPainter.java +++ b/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/source/DiffPainter.java @@ -358,7 +358,7 @@ public final class DiffPainter { if (isConnected() && !fControl.isDisposed()) { Display d= fControl.getDisplay(); if (d != null) { - d.asyncExec(() -> redraw()); + d.asyncExec(this::redraw); } } } diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/hyperlink/DefaultHyperlinkPresenter.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/hyperlink/DefaultHyperlinkPresenter.java index 02e543b829f..4edf9d887b7 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/text/hyperlink/DefaultHyperlinkPresenter.java +++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/hyperlink/DefaultHyperlinkPresenter.java @@ -300,7 +300,7 @@ public class DefaultHyperlinkPresenter implements IHyperlinkPresenter, IHyperlin StyledText widget= fTextViewer.getTextWidget(); if (widget != null && !widget.isDisposed()) { - widget.getDisplay().asyncExec(() -> hideHyperlinks()); + widget.getDisplay().asyncExec(this::hideHyperlinks); } } } diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/source/AbstractRulerColumn.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/source/AbstractRulerColumn.java index 7c0bd445c1f..f0b37e3cb6a 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/text/source/AbstractRulerColumn.java +++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/source/AbstractRulerColumn.java @@ -196,7 +196,7 @@ public abstract class AbstractRulerColumn implements IVerticalRulerColumn, IVert fCanvas.setBackground(getDefaultBackground()); fCanvas.setFont(getFont()); - fCanvas.addPaintListener(event -> AbstractRulerColumn.this.paintControl(event)); + fCanvas.addPaintListener(AbstractRulerColumn.this::paintControl); fCanvas.addMouseListener(fMouseHandler); fCanvas.addMouseMoveListener(fMouseHandler); diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/source/AnnotationRulerColumn.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/source/AnnotationRulerColumn.java index 324ada5eeb3..106a6fb1b78 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/text/source/AnnotationRulerColumn.java +++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/source/AnnotationRulerColumn.java @@ -184,7 +184,7 @@ public class AnnotationRulerColumn implements IVerticalRulerColumn, IVerticalRul */ private MouseListener fMouseListener; - private Consumer lineHeightChangeHandler= (t) -> postRedraw(); + private Consumer lineHeightChangeHandler= t -> postRedraw(); private ITextListener fLineListener = new ITextListener() { private int previousLineCount = -1; @@ -322,9 +322,9 @@ public class AnnotationRulerColumn implements IVerticalRulerColumn, IVerticalRul }; fCanvas.addMouseListener(fMouseListener); - fCanvas.addMouseMoveListener(e -> handleMouseMove(e)); + fCanvas.addMouseMoveListener(this::handleMouseMove); - fCanvas.addMouseWheelListener(e -> handleMouseScrolled(e)); + fCanvas.addMouseWheelListener(this::handleMouseScrolled); if (fCachedTextViewer != null) { VisibleLinesTracker.track(fCachedTextViewer, lineHeightChangeHandler); @@ -820,7 +820,7 @@ public class AnnotationRulerColumn implements IVerticalRulerColumn, IVerticalRul if (fCanvas != null && !fCanvas.isDisposed()) { Display d= fCanvas.getDisplay(); if (d != null) { - d.asyncExec(() -> redraw()); + d.asyncExec(this::redraw); } } } diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/source/ChangeRulerColumn.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/source/ChangeRulerColumn.java index 991c3d284f3..94ff48fb9af 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/text/source/ChangeRulerColumn.java +++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/source/ChangeRulerColumn.java @@ -422,7 +422,7 @@ public final class ChangeRulerColumn implements IChangeRulerColumn, IRevisionRul if (fCanvas != null && !fCanvas.isDisposed()) { Display d= fCanvas.getDisplay(); if (d != null) { - d.asyncExec(() -> redraw()); + d.asyncExec(this::redraw); } } } diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/source/CompositeRuler.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/source/CompositeRuler.java index 0ac7a836423..253281181a7 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/text/source/CompositeRuler.java +++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/source/CompositeRuler.java @@ -637,7 +637,7 @@ public class CompositeRuler implements IVerticalRuler, IVerticalRulerExtension, if (fComposite != null && !fComposite.isDisposed()) { Display d= fComposite.getDisplay(); if (d != null) { - d.asyncExec(() -> immediateUpdate()); + d.asyncExec(this::immediateUpdate); } } } diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/source/LineNumberRulerColumn.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/source/LineNumberRulerColumn.java index 1e2098486a9..b46c7c6b069 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/text/source/LineNumberRulerColumn.java +++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/source/LineNumberRulerColumn.java @@ -419,7 +419,7 @@ public class LineNumberRulerColumn implements IVerticalRulerColumn { * * @since 3.13 */ - private Consumer lineHeightChangeHandler= (t) -> postRedraw(); + private Consumer lineHeightChangeHandler= t -> postRedraw(); /** * Constructs a new vertical ruler column. diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/source/OverviewRuler.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/source/OverviewRuler.java index 3544a55abb8..14693a3048a 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/text/source/OverviewRuler.java +++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/source/OverviewRuler.java @@ -604,9 +604,9 @@ public class OverviewRuler implements IOverviewRulerExtension, IOverviewRuler { } }); - fCanvas.addMouseMoveListener(event -> handleMouseMove(event)); + fCanvas.addMouseMoveListener(this::handleMouseMove); - fCanvas.addMouseWheelListener(e -> handleMouseScrolled(e)); + fCanvas.addMouseWheelListener(this::handleMouseScrolled); if (fTextViewer != null) { fTextViewer.addTextListener(fInternalListener); diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/source/VerticalRuler.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/source/VerticalRuler.java index d37753f040e..c63e6a45c1e 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/text/source/VerticalRuler.java +++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/source/VerticalRuler.java @@ -450,7 +450,7 @@ public final class VerticalRuler implements IVerticalRuler, IVerticalRulerExtens if (fCanvas != null && !fCanvas.isDisposed()) { Display d= fCanvas.getDisplay(); if (d != null) { - d.asyncExec(() -> redraw()); + d.asyncExec(this::redraw); } } } diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/source/inlined/AbstractInlinedAnnotation.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/source/inlined/AbstractInlinedAnnotation.java index 5fd7a0c9ab6..2644080db91 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/text/source/inlined/AbstractInlinedAnnotation.java +++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/source/inlined/AbstractInlinedAnnotation.java @@ -120,7 +120,7 @@ public abstract class AbstractInlinedAnnotation extends Annotation { */ public void redraw() { StyledText text= getTextWidget(); - InlinedAnnotationSupport.runInUIThread(text, (t) -> { + InlinedAnnotationSupport.runInUIThread(text, t -> { Position pos= getPosition(); int offset= pos.getOffset(); ISourceViewer viewer= getViewer(); diff --git a/org.eclipse.search/new search/org/eclipse/search/ui/text/AbstractTextSearchViewPage.java b/org.eclipse.search/new search/org/eclipse/search/ui/text/AbstractTextSearchViewPage.java index d5b28d11dda..dce993d119f 100644 --- a/org.eclipse.search/new search/org/eclipse/search/ui/text/AbstractTextSearchViewPage.java +++ b/org.eclipse.search/new search/org/eclipse/search/ui/text/AbstractTextSearchViewPage.java @@ -301,7 +301,7 @@ public abstract class AbstractTextSearchViewPage extends Page implements ISearch fBatchedUpdates = new HashSet<>(); fBatchedClearAll= false; - fListener = e -> handleSearchResultChanged(e); + fListener = this::handleSearchResultChanged; fFilterActions= null; fElementLimit= null; } diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/text/DecoratingFileSearchLabelProvider.java b/org.eclipse.search/search/org/eclipse/search/internal/ui/text/DecoratingFileSearchLabelProvider.java index 46a538c9357..530dd9b9925 100644 --- a/org.eclipse.search/search/org/eclipse/search/internal/ui/text/DecoratingFileSearchLabelProvider.java +++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/text/DecoratingFileSearchLabelProvider.java @@ -93,7 +93,7 @@ public class DecoratingFileSearchLabelProvider extends DecoratingStyledCellLabel String property= event.getProperty(); if (property.equals(JFacePreferences.QUALIFIER_COLOR) || property.equals(JFacePreferences.COUNTER_COLOR) || property.equals(JFacePreferences.DECORATIONS_COLOR) || property.equals(HIGHLIGHT_BG_COLOR_NAME) || property.equals(IWorkbenchPreferenceConstants.USE_COLORED_LABELS)) { - Display.getDefault().asyncExec(() -> refresh()); + Display.getDefault().asyncExec(this::refresh); } } diff --git a/org.eclipse.text.quicksearch/src/org/eclipse/text/quicksearch/internal/ui/QuickSearchDialog.java b/org.eclipse.text.quicksearch/src/org/eclipse/text/quicksearch/internal/ui/QuickSearchDialog.java index bc3d86874a3..793f6dadeff 100644 --- a/org.eclipse.text.quicksearch/src/org/eclipse/text/quicksearch/internal/ui/QuickSearchDialog.java +++ b/org.eclipse.text.quicksearch/src/org/eclipse/text/quicksearch/internal/ui/QuickSearchDialog.java @@ -716,7 +716,7 @@ public class QuickSearchDialog extends SelectionStatusDialog { contextMenuManager = new MenuManager(); contextMenuManager.setRemoveAllWhenShown(true); - contextMenuManager.addMenuListener(manager -> fillContextMenu(manager)); + contextMenuManager.addMenuListener(this::fillContextMenu); final Table table = list.getTable(); Menu menu= contextMenuManager.createContextMenu(table); diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/QuickDiffConfigurationBlock.java b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/QuickDiffConfigurationBlock.java index 28ad62179f1..db32c1090fc 100644 --- a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/QuickDiffConfigurationBlock.java +++ b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/QuickDiffConfigurationBlock.java @@ -402,7 +402,7 @@ class QuickDiffConfigurationBlock implements IPreferenceConfigurationBlock { String label = fQuickDiffProvider[1]; fQuickDiffProviderCombo.add(label); } - fQuickDiffProviderCombo.getDisplay().asyncExec(() -> updateProviderList()); + fQuickDiffProviderCombo.getDisplay().asyncExec(this::updateProviderList); initializeFields(); } diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/SelectResourcesDialog.java b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/SelectResourcesDialog.java index 11f4c4c1f46..c982cf56e7f 100644 --- a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/SelectResourcesDialog.java +++ b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/SelectResourcesDialog.java @@ -241,7 +241,7 @@ class SelectResourcesDialog extends Dialog { private void filterSelection() { - final IFilter filter= resource -> hasAcceptedFileType(resource); + final IFilter filter= this::hasAcceptedFileType; List list= fResourceGroup.getAllWhiteCheckedItems(); final IResource[] resources= list.toArray(new IResource[list.size()]); diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/texteditor/PropertyEventDispatcher.java b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/texteditor/PropertyEventDispatcher.java index d096f2d6992..f0267ea89b6 100644 --- a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/texteditor/PropertyEventDispatcher.java +++ b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/texteditor/PropertyEventDispatcher.java @@ -28,7 +28,7 @@ public final class PropertyEventDispatcher { private final Map fHandlerMap= new HashMap<>(); private final Map fReverseMap= new HashMap<>(); private final IPreferenceStore fStore; - private final IPropertyChangeListener fListener= event -> firePropertyChange(event); + private final IPropertyChangeListener fListener= this::firePropertyChange; public PropertyEventDispatcher(IPreferenceStore store) { Assert.isLegal(store != null); fStore= store; diff --git a/org.eclipse.ui.genericeditor/src/org/eclipse/ui/internal/genericeditor/GenericEditorWithIconAssociationOverride.java b/org.eclipse.ui.genericeditor/src/org/eclipse/ui/internal/genericeditor/GenericEditorWithIconAssociationOverride.java index 033d52311b0..37136e44df0 100644 --- a/org.eclipse.ui.genericeditor/src/org/eclipse/ui/internal/genericeditor/GenericEditorWithIconAssociationOverride.java +++ b/org.eclipse.ui.genericeditor/src/org/eclipse/ui/internal/genericeditor/GenericEditorWithIconAssociationOverride.java @@ -41,9 +41,7 @@ public class GenericEditorWithIconAssociationOverride implements IEditorAssociat @Override public IEditorDescriptor[] overrideEditors(String fileName, IContentType contentType, IEditorDescriptor[] editorDescriptors) { - return Arrays.stream(editorDescriptors).map(descriptor -> { - return getEditorDescriptorForFile(descriptor, fileName); - }).toArray(size -> new IEditorDescriptor[size]); + return Arrays.stream(editorDescriptors).map(descriptor -> getEditorDescriptorForFile(descriptor, fileName)).toArray(size -> new IEditorDescriptor[size]); } @Override diff --git a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/AbstractTextEditor.java b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/AbstractTextEditor.java index 6ace776d378..ed3d77f07a3 100644 --- a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/AbstractTextEditor.java +++ b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/AbstractTextEditor.java @@ -972,7 +972,7 @@ public abstract class AbstractTextEditor extends EditorPart implements ITextEdit * http://dev.eclipse.org/bugs/show_bug.cgi?id=11731 * Will be removed when SWT has solved the problem. */ - window.getShell().getDisplay().asyncExec(() -> handleActivation()); + window.getShell().getDisplay().asyncExec(this::handleActivation); } } diff --git a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/InfoForm.java b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/InfoForm.java index ccc5e44ff6c..6d4a5322c04 100644 --- a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/InfoForm.java +++ b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/InfoForm.java @@ -70,7 +70,7 @@ public class InfoForm { fForegroundColor= display.getSystemColor(SWT.COLOR_LIST_FOREGROUND); fSeparatorColor= new Color(display, 152, 170, 203); - fPropertyChangeListener = event -> handlePropertyChange(event); + fPropertyChangeListener = this::handlePropertyChange; JFaceResources.getFontRegistry().addListener(fPropertyChangeListener); fScrolledComposite= new ScrolledComposite(parent, SWT.H_SCROLL | SWT.V_SCROLL); diff --git a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/RetargetTextEditorAction.java b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/RetargetTextEditorAction.java index 66e1d13867e..d388e1f0fa8 100644 --- a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/RetargetTextEditorAction.java +++ b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/RetargetTextEditorAction.java @@ -45,7 +45,7 @@ public final class RetargetTextEditorAction extends ResourceAction { */ private HelpListener fLocalHelpListener; /** The listener to pick up changes of the target action. */ - private IPropertyChangeListener fListener= event -> update(event); + private IPropertyChangeListener fListener= this::update; /** * Creates a new action. The action configures its initial visual diff --git a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/templates/AbstractTemplatesPage.java b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/templates/AbstractTemplatesPage.java index 9e0deea451c..9be5cf36e80 100644 --- a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/templates/AbstractTemplatesPage.java +++ b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/templates/AbstractTemplatesPage.java @@ -502,7 +502,7 @@ public abstract class AbstractTemplatesPage extends Page implements ITemplatesPa int sashSize= fPreferenceStore.getInt(SASH_SIZE_PREF_ID); fControl.setWeights(new int[] { sashSize, 100 - sashSize }); - fTemplateChangeListener = event -> getShell().getDisplay().asyncExec(() -> refresh()); + fTemplateChangeListener = event -> getShell().getDisplay().asyncExec(this::refresh); getTemplatePreferenceStore().addPropertyChangeListener(fTemplateChangeListener); updateContextTypes(getEditorContextTypeIds()); } @@ -1111,7 +1111,7 @@ public abstract class AbstractTemplatesPage extends Page implements ITemplatesPa private void hookContextMenu() { MenuManager menuMgr= new MenuManager(POPUP_MENU_ID); menuMgr.setRemoveAllWhenShown(true); - menuMgr.addMenuListener(manager -> fillContextMenu(manager)); + menuMgr.addMenuListener(this::fillContextMenu); fContextMenu= menuMgr.createContextMenu(fTreeViewer.getControl()); fTreeViewer.getControl().setMenu(fContextMenu); getSite().registerContextMenu(POPUP_MENU_ID, menuMgr, fTreeViewer); diff --git a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/templates/TemplatePreferencePage.java b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/templates/TemplatePreferencePage.java index 6b2e08d731a..5db91d5668c 100644 --- a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/templates/TemplatePreferencePage.java +++ b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/templates/TemplatePreferencePage.java @@ -586,7 +586,7 @@ public abstract class TemplatePreferencePage extends PreferencePage implements I // create context menu MenuManager manager= new MenuManager(null, null); manager.setRemoveAllWhenShown(true); - manager.addMenuListener(mgr -> fillContextMenu(mgr)); + manager.addMenuListener(this::fillContextMenu); StyledText text= fPatternEditor.getTextWidget(); Menu menu= manager.createContextMenu(text); diff --git a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/templates/TemplatesView.java b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/templates/TemplatesView.java index 3c7a1c3ffcd..d7a9c8b0f14 100644 --- a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/templates/TemplatesView.java +++ b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/templates/TemplatesView.java @@ -171,7 +171,7 @@ public final class TemplatesView extends PageBookView { @Override public T getAdapter(Class key) { if (key == IContributedContentsView.class) { - return key.cast((IContributedContentsView) () -> getCurrentContributingPart()); + return key.cast((IContributedContentsView) this::getCurrentContributingPart); } return super.getAdapter(key); } -- cgit v1.2.3