diff options
author | Lars Vogel | 2020-01-27 11:55:23 +0000 |
---|---|---|
committer | Lars Vogel | 2020-01-29 09:01:48 +0000 |
commit | 814da6b26cf99346daef91814558ad5aa4f020d6 (patch) | |
tree | 6923fe545e0bf8455d47ae5e49af0e841db1adf8 | |
parent | 198aa64fa30bb9849cd92fc8bb9941ecd6edd7b3 (diff) | |
download | eclipse.platform.team-814da6b26cf99346daef91814558ad5aa4f020d6.tar.gz eclipse.platform.team-814da6b26cf99346daef91814558ad5aa4f020d6.tar.xz eclipse.platform.team-814da6b26cf99346daef91814558ad5aa4f020d6.zip |
Use lambdas in team repo
Use batch clean from JDT to convert to lambdas for selected team
plug-ins.
Change-Id: I402e8f137be4f518f2b8f0e9534aed848ae14d0f
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
7 files changed, 35 insertions, 68 deletions
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/Utilities.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/Utilities.java index 785dbef78..20cfc357a 100644 --- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/Utilities.java +++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/Utilities.java @@ -86,8 +86,6 @@ import org.eclipse.jface.util.PropertyChangeEvent; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.swt.custom.BusyIndicator; -import org.eclipse.swt.events.DisposeEvent; -import org.eclipse.swt.events.DisposeListener; import org.eclipse.swt.graphics.Image; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; @@ -974,13 +972,10 @@ public class Utilities { /* IWorkbenchGraphicConstants */"IMG_LCL_VIEW_MENU"); //$NON-NLS-1$ } else { image = CompareUIPlugin.getImageDescriptor("elcl16/view_menu.png").createImage(); //$NON-NLS-1$ - item.addDisposeListener(new DisposeListener() { - @Override - public void widgetDisposed(DisposeEvent e) { - Image img = item.getImage(); - if ((img != null) && (!img.isDisposed())) { - img.dispose(); - } + item.addDisposeListener(e -> { + Image img = item.getImage(); + if ((img != null) && (!img.isDisposed())) { + img.dispose(); } }); } diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PatchWizard.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PatchWizard.java index cf95f10eb..a25a8fb4f 100644 --- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PatchWizard.java +++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PatchWizard.java @@ -20,7 +20,6 @@ import org.eclipse.compare.CompareConfiguration; import org.eclipse.compare.internal.CompareUIPlugin; import org.eclipse.compare.internal.ExceptionHandler; import org.eclipse.compare.internal.Utilities; -import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IResource; import org.eclipse.core.resources.IStorage; import org.eclipse.core.resources.ResourcesPlugin; @@ -166,12 +165,7 @@ public class PatchWizard extends Wizard { @Override protected void execute(IProgressMonitor monitor) throws InvocationTargetException { try { - fPatcher.applyAll(monitor, new Patcher.IFileValidator() { - @Override - public boolean validateResources(IFile[] resoures) { - return Utilities.validateResources(resoures, getShell(), PatchMessages.PatchWizard_title); - } - }); + fPatcher.applyAll(monitor, resoures -> Utilities.validateResources(resoures, getShell(), PatchMessages.PatchWizard_title)); } catch (CoreException e) { throw new InvocationTargetException(e); } diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/mapping/ChangeTracker.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/mapping/ChangeTracker.java index d5df9451e..9827983cf 100644 --- a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/mapping/ChangeTracker.java +++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/mapping/ChangeTracker.java @@ -24,7 +24,6 @@ import org.eclipse.core.resources.IResource; import org.eclipse.core.resources.IResourceChangeEvent; import org.eclipse.core.resources.IResourceChangeListener; import org.eclipse.core.resources.IResourceDelta; -import org.eclipse.core.resources.IResourceDeltaVisitor; import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.CoreException; import org.eclipse.team.core.RepositoryProvider; @@ -135,14 +134,11 @@ public abstract class ChangeTracker { private IResource[] getProjectChanges(IProject project, IResourceDelta projectDelta) { final List<IResource> result = new ArrayList<>(); try { - projectDelta.accept(new IResourceDeltaVisitor() { - @Override - public boolean visit(IResourceDelta delta) throws CoreException { - if (isResourceOfInterest(delta.getResource()) & isChangeOfInterest(delta)) { - result.add(delta.getResource()); - } - return true; + projectDelta.accept(delta -> { + if (isResourceOfInterest(delta.getResource()) & isChangeOfInterest(delta)) { + result.add(delta.getResource()); } + return true; }); } catch (CoreException e) { TeamPlugin.log(e); diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/subscribers/Subscriber.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/subscribers/Subscriber.java index fa888f14e..e22539efa 100644 --- a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/subscribers/Subscriber.java +++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/subscribers/Subscriber.java @@ -504,23 +504,20 @@ abstract public class Subscriber { ResourceTraversal[] traversals = mapping.getTraversals(new SubscriberResourceMappingContext(this, true), monitor); final int[] direction = new int[] { 0 }; final int[] kind = new int[] { 0 }; - accept(traversals, new IDiffVisitor() { - @Override - public boolean visit(IDiff diff) { - if (diff instanceof IThreeWayDiff) { - IThreeWayDiff twd = (IThreeWayDiff) diff; - direction[0] |= twd.getDirection(); - } - // If the traversals contain a combination of kinds, return a CHANGE - int diffKind = diff.getKind(); - if (kind[0] == 0) - kind[0] = diffKind; - if (kind[0] != diffKind) { - kind[0] = IDiff.CHANGE; - } - // Only need to visit the children of a change - return diffKind == IDiff.CHANGE; + accept(traversals, diff -> { + if (diff instanceof IThreeWayDiff) { + IThreeWayDiff twd = (IThreeWayDiff) diff; + direction[0] |= twd.getDirection(); + } + // If the traversals contain a combination of kinds, return a CHANGE + int diffKind = diff.getKind(); + if (kind[0] == 0) + kind[0] = diffKind; + if (kind[0] != diffKind) { + kind[0] = IDiff.CHANGE; } + // Only need to visit the children of a change + return diffKind == IDiff.CHANGE; }); return (direction[0] | kind[0]) & stateMask; } diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/variants/ThreeWaySynchronizer.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/variants/ThreeWaySynchronizer.java index 38a258c58..4b06b5bb1 100644 --- a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/variants/ThreeWaySynchronizer.java +++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/variants/ThreeWaySynchronizer.java @@ -36,7 +36,6 @@ import org.eclipse.team.core.TeamException; import org.eclipse.team.internal.core.Policy; import org.eclipse.team.internal.core.subscribers.BatchingLock; import org.eclipse.team.internal.core.subscribers.BatchingLock.IFlushOperation; -import org.eclipse.team.internal.core.subscribers.BatchingLock.ThreadInfo; import org.eclipse.team.internal.core.subscribers.SyncByteConverter; /** @@ -52,20 +51,15 @@ import org.eclipse.team.internal.core.subscribers.SyncByteConverter; * @since 3.0 */ public class ThreeWaySynchronizer { - - private IFlushOperation flushOperation = new IFlushOperation() { - /** - * Callback which is invoked when the batching resource lock is released - * or when a flush is requested (see beginBatching(IResource)). - * - * @see BatchingLock#flush(IProgressMonitor) - */ - @Override - public void flush(ThreadInfo info, IProgressMonitor monitor) - throws TeamException { - if (info != null && !info.isEmpty()) { - broadcastSyncChanges(info.getChangedResources()); - } + /** + * Callback which is invoked when the batching resource lock is released or when + * a flush is requested (see beginBatching(IResource)). + * + * @see BatchingLock#flush(IProgressMonitor) + */ + private IFlushOperation flushOperation = (info, monitor) -> { + if (info != null && !info.isEmpty()) { + broadcastSyncChanges(info.getChangedResources()); } }; diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/dialogs/PromptingDialog.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/dialogs/PromptingDialog.java index 4b08473c5..f52f40054 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/dialogs/PromptingDialog.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/dialogs/PromptingDialog.java @@ -17,7 +17,6 @@ import java.util.ArrayList; import java.util.List; import org.eclipse.core.resources.IResource; -import org.eclipse.jface.window.IShellProvider; import org.eclipse.swt.widgets.Shell; /** @@ -41,12 +40,7 @@ public class PromptingDialog extends MultipleYesNoPrompter { } public PromptingDialog(final Shell shell, IResource[] resources, IPromptCondition condition, String title, boolean allOrNothing) { - super(new IShellProvider() { - @Override - public Shell getShell() { - return shell; - } - }, title, resources.length > 1, allOrNothing); + super(() -> shell, title, resources.length > 1, allOrNothing); this.resources = resources; this.condition = condition; } diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ConfigureRefreshScheduleDialog.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ConfigureRefreshScheduleDialog.java index 99381f2d3..1fffb4b7e 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ConfigureRefreshScheduleDialog.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ConfigureRefreshScheduleDialog.java @@ -39,12 +39,9 @@ public class ConfigureRefreshScheduleDialog extends DetailsDialog { @Override protected void createMainDialogArea(Composite parent) { - IPageValidator validator = new IPageValidator() { - @Override - public void setComplete(String errorMessage) { - setPageComplete(errorMessage == null); - setErrorMessage(errorMessage); - } + IPageValidator validator = errorMessage -> { + setPageComplete(errorMessage == null); + setErrorMessage(errorMessage); }; scheduleComposite = new ConfigureSynchronizeScheduleComposite(parent, schedule, validator); Dialog.applyDialogFont(parent); |