diff options
author | Lars Vogel | 2020-01-27 11:59:48 +0000 |
---|---|---|
committer | Lars Vogel | 2020-01-29 09:02:48 +0000 |
commit | 33fac208db82348263b1b5832a46acb4c4728451 (patch) | |
tree | e4186f63bacdb4f292957a54908d9b4fcb8c7a2c /bundles | |
parent | 814da6b26cf99346daef91814558ad5aa4f020d6 (diff) | |
download | eclipse.platform.team-33fac208db82348263b1b5832a46acb4c4728451.tar.gz eclipse.platform.team-33fac208db82348263b1b5832a46acb4c4728451.tar.xz eclipse.platform.team-33fac208db82348263b1b5832a46acb4c4728451.zip |
Use method reference instead of lambdas in teamI20200205-0030I20200204-1800
Method references are slightly faster than lambdas and better readable.
Commited after the lambda as these are two different cleanups (one from
JDT and one from Autorefactor)
Change-Id: If1344d96aa08458e2a636a4c7036e3c8861bccd1
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
Diffstat (limited to 'bundles')
14 files changed, 19 insertions, 19 deletions
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/ContentMergeViewer.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/ContentMergeViewer.java index a153f1271..cab519f96 100644 --- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/ContentMergeViewer.java +++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/ContentMergeViewer.java @@ -387,11 +387,11 @@ public abstract class ContentMergeViewer extends ContentViewer fAncestorVisible= Utilities.getBoolean(cc, ICompareUIConstants.PROP_ANCESTOR_VISIBLE, fAncestorVisible); fConfirmSave= Utilities.getBoolean(cc, CompareEditor.CONFIRM_SAVE_PROPERTY, fConfirmSave); - fCompareInputChangeListener = (input) -> { if (input == getInput()) handleCompareInputChange(); }; + fCompareInputChangeListener = input -> { if (input == getInput()) handleCompareInputChange(); }; // Make sure the compare configuration is not null fCompareConfiguration = cc != null ? cc : new CompareConfiguration(); - fPropertyChangeListener = event -> handlePropertyChangeEvent(event); + fPropertyChangeListener = this::handlePropertyChangeEvent; fCompareConfiguration.addPropertyChangeListener(fPropertyChangeListener); fPreferenceChangeListener = event -> { if (event.getProperty().equals(ComparePreferencePage.SWAPPED)) { diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java index 63ae28658..2d35b8b20 100644 --- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java +++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java @@ -1376,7 +1376,7 @@ public class TextMergeViewer extends ContentMergeViewer implements IAdaptable { @Override public Point getSelection() { - return Optional.ofNullable(getTarget()).map(target -> target.getSelection()) + return Optional.ofNullable(getTarget()).map(IFindReplaceTarget::getSelection) .orElse(new Point(-1, -1)); } @@ -1521,7 +1521,7 @@ public class TextMergeViewer extends ContentMergeViewer implements IAdaptable { public TextMergeViewer(Composite parent, int style, CompareConfiguration configuration) { super(style, ResourceBundle.getBundle(BUNDLE_NAME), configuration); - operationHistoryListener = event -> TextMergeViewer.this.historyNotification(event); + operationHistoryListener = TextMergeViewer.this::historyNotification; OperationHistoryFactory.getOperationHistory() .addOperationHistoryListener(operationHistoryListener); @@ -1611,7 +1611,7 @@ public class TextMergeViewer extends ContentMergeViewer implements IAdaptable { fIsMac= Util.isMac(); - fPreferenceChangeListener= event -> TextMergeViewer.this.handlePropertyChangeEvent(event); + fPreferenceChangeListener= TextMergeViewer.this::handlePropertyChangeEvent; fPreferenceStore= createChainedPreferenceStore(); if (fPreferenceStore != null) { diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/MergeSourceViewer.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/MergeSourceViewer.java index f44b6ef84..9012bfca7 100644 --- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/MergeSourceViewer.java +++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/MergeSourceViewer.java @@ -496,7 +496,7 @@ public class MergeSourceViewer implements ISelectionChangedListener, fContainer.registerContextMenu(menu, getSourceViewer()); // for listening to editor show/hide line number preference value - fPreferenceChangeListener= event -> MergeSourceViewer.this.handlePropertyChangeEvent(event); + fPreferenceChangeListener= MergeSourceViewer.this::handlePropertyChangeEvent; EditorsUI.getPreferenceStore().addPropertyChangeListener(fPreferenceChangeListener); fShowLineNumber= EditorsUI.getPreferenceStore().getBoolean(AbstractDecoratedTextEditorPreferenceConstants.EDITOR_LINE_NUMBER_RULER); if(fShowLineNumber){ @@ -1054,7 +1054,7 @@ public class MergeSourceViewer implements ISelectionChangedListener, // when the undo history changes. It could be localized to UNDO and REDO. IUndoContext context = getUndoContext(); if (context != null && event.getOperation().hasContext(context)) { - Display.getDefault().asyncExec(() -> updateContentDependantActions()); + Display.getDefault().asyncExec(this::updateContentDependantActions); } } diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DiffTreeViewer.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DiffTreeViewer.java index aed63ed10..e866c2116 100644 --- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DiffTreeViewer.java +++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DiffTreeViewer.java @@ -237,7 +237,7 @@ public class DiffTreeViewer extends TreeViewer { // Register for notification with the CompareConfiguration. fCompareConfiguration= configuration; if (fCompareConfiguration != null) { - fPropertyChangeListener = event -> propertyChange(event); + fPropertyChangeListener = this::propertyChange; fCompareConfiguration.addPropertyChangeListener(fPropertyChangeListener); } diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/StructureDiffViewer.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/StructureDiffViewer.java index af1093d5f..30558588f 100644 --- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/StructureDiffViewer.java +++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/StructureDiffViewer.java @@ -96,7 +96,7 @@ public class StructureDiffViewer extends DiffTreeViewer { private class StructureInfo { private ITypedElement fInput; private IStructureComparator fStructureComparator; - private IRunnableWithProgress refreshTask = monitor -> refresh(monitor); + private IRunnableWithProgress refreshTask = this::refresh; public boolean setInput(ITypedElement newInput, boolean force, IProgressMonitor monitor) { boolean changed = false; @@ -211,7 +211,7 @@ public class StructureDiffViewer extends DiffTreeViewer { setAutoExpandLevel(3); - fContentChangedListener= changed -> StructureDiffViewer.this.contentChanged(changed); + fContentChangedListener= StructureDiffViewer.this::contentChanged; fCompareInputChangeListener = input -> StructureDiffViewer.this.compareInputChanged(input, true); } diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/mapping/provider/SynchronizationScopeManager.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/mapping/provider/SynchronizationScopeManager.java index 9228d7da0..4125c8e32 100644 --- a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/mapping/provider/SynchronizationScopeManager.java +++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/mapping/provider/SynchronizationScopeManager.java @@ -175,7 +175,7 @@ public class SynchronizationScopeManager extends PlatformObject implements ISync @Override public void initialize( IProgressMonitor monitor) throws CoreException { - ResourcesPlugin.getWorkspace().run((IWorkspaceRunnable) monitor1 -> internalPrepareContext(monitor1), + ResourcesPlugin.getWorkspace().run((IWorkspaceRunnable) this::internalPrepareContext, getSchedulingRule(), IResource.NONE, monitor); } diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/streams/TimeoutInputStream.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/streams/TimeoutInputStream.java index df4dc0599..454e1ee6d 100644 --- a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/streams/TimeoutInputStream.java +++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/streams/TimeoutInputStream.java @@ -64,7 +64,7 @@ public class TimeoutInputStream extends FilterInputStream { this.readTimeout = readTimeout; this.closeTimeout = closeTimeout; this.iobuffer = new byte[bufferSize]; - thread = new Thread((Runnable) () -> runThread(), "TimeoutInputStream");//$NON-NLS-1$ + thread = new Thread((Runnable) this::runThread, "TimeoutInputStream");//$NON-NLS-1$ thread.setDaemon(true); thread.start(); } diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/streams/TimeoutOutputStream.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/streams/TimeoutOutputStream.java index 3af0922c0..406a4cb78 100644 --- a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/streams/TimeoutOutputStream.java +++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/streams/TimeoutOutputStream.java @@ -64,7 +64,7 @@ public class TimeoutOutputStream extends FilterOutputStream { this.writeTimeout = writeTimeout; this.closeTimeout = closeTimeout; this.iobuffer = new byte[bufferSize]; - thread = new Thread((Runnable) () -> runThread(), "TimeoutOutputStream");//$NON-NLS-1$ + thread = new Thread((Runnable) this::runThread, "TimeoutOutputStream");//$NON-NLS-1$ thread.setDaemon(true); thread.start(); } diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ModelCompareEditorInput.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ModelCompareEditorInput.java index c857fb7db..a3e90b8f2 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ModelCompareEditorInput.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ModelCompareEditorInput.java @@ -189,7 +189,7 @@ public class ModelCompareEditorInput extends SaveableCompareEditorInput implemen super.registerContextMenu(menu, provider); Saveable saveable = getSaveable(); if (saveable instanceof LocalResourceSaveableComparison) { - menu.addMenuListener(manager -> handleMenuAboutToShow(manager)); + menu.addMenuListener(this::handleMenuAboutToShow); } } diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/AbstractSynchronizeModelProvider.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/AbstractSynchronizeModelProvider.java index 12d68ac5d..bb350d1e7 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/AbstractSynchronizeModelProvider.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/AbstractSynchronizeModelProvider.java @@ -366,7 +366,7 @@ public abstract class AbstractSynchronizeModelProvider implements ISynchronizeMo // Only refresh the view if there is now background update in // progress. If there is, the background update will refresh if (!updateHandler.isPerformingBackgroundUpdate()) { - Utils.asyncExec((Runnable) () -> refreshModelRoot(), getViewer()); + Utils.asyncExec((Runnable) this::refreshModelRoot, getViewer()); } } } diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizeModelUpdateHandler.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizeModelUpdateHandler.java index f9ad69236..5f3323172 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizeModelUpdateHandler.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizeModelUpdateHandler.java @@ -257,7 +257,7 @@ public class SynchronizeModelUpdateHandler extends BackgroundEventHandler implem if (pendingLabelUpdates.isEmpty()) { return false; } else { - Utils.asyncExec((Runnable) () -> firePendingLabelUpdates(), getViewer()); + Utils.asyncExec((Runnable) this::firePendingLabelUpdates, getViewer()); return true; } } diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/ChangeSetActionGroup.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/ChangeSetActionGroup.java index 6fe2c9cc6..613acd584 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/ChangeSetActionGroup.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/ChangeSetActionGroup.java @@ -335,7 +335,7 @@ public class ChangeSetActionGroup extends SynchronizePageActionGroup { if (getChangeSetCapability().supportsActiveChangeSets()) { addToChangeSet = new MenuManager(TeamUIMessages.ChangeLogModelProvider_12); addToChangeSet.setRemoveAllWhenShown(true); - addToChangeSet.addMenuListener(manager -> addChangeSets(manager)); + addToChangeSet.addMenuListener(this::addChangeSets); createChangeSet = new CreateChangeSetAction(configuration); addToChangeSet.add(createChangeSet); addToChangeSet.add(new Separator()); diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/history/HistoryPageCompareEditorInput.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/history/HistoryPageCompareEditorInput.java index 7ba671538..79b87f5e7 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/history/HistoryPageCompareEditorInput.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/history/HistoryPageCompareEditorInput.java @@ -47,7 +47,7 @@ public class HistoryPageCompareEditorInput extends PageCompareEditorInput { private DialogHistoryPageSite site; private final Object object; private final IHistoryPageSource pageSource; - private final IPropertyChangeListener changeListener = event -> handlePropertyChange(event); + private final IPropertyChangeListener changeListener = this::handlePropertyChange; private boolean isReplace; /** diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/mapping/MergeActionHandler.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/mapping/MergeActionHandler.java index 3fa1c6e39..09f0d3d4a 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/mapping/MergeActionHandler.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/mapping/MergeActionHandler.java @@ -46,7 +46,7 @@ public abstract class MergeActionHandler extends AbstractHandler { private final ISynchronizePageConfiguration configuration; private boolean enabled = false; private IStructuredSelection selection; - private ISelectionChangedListener listener = event -> updatedEnablement(event); + private ISelectionChangedListener listener = this::updatedEnablement; /** * Return an instance of the default handler for the given merge action id. |