Lambda conversions.

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

17 files changed, 238 insertions, 308 deletions

diff --git a/examples/org.eclipse.compare.examples.xml/META-INF/MANIFEST.MF b/examples/org.eclipse.compare.examples.xml/META-INF/MANIFEST.MF
index b01dc5584..6eafd2767 100644
--- a/examples/org.eclipse.compare.examples.xml/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.compare.examples.xml/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.compare.examples.xml; singleton:=true
-Bundle-Version: 3.4.300.qualifier
+Bundle-Version: 3.4.400.qualifier
 Bundle-Activator: org.eclipse.compare.examples.xml.XMLPlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/examples/org.eclipse.compare.examples.xml/pom.xml b/examples/org.eclipse.compare.examples.xml/pom.xml
index 8a2b62639..31d413e7d 100644
--- a/examples/org.eclipse.compare.examples.xml/pom.xml
+++ b/examples/org.eclipse.compare.examples.xml/pom.xml
@@ -19,6 +19,6 @@
   </parent>
   <groupId>org.eclipse.compare</groupId>
   <artifactId>org.eclipse.compare.examples.xml</artifactId>
-  <version>3.4.300-SNAPSHOT</version>
+  <version>3.4.400-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/XMLPlugin.java b/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/XMLPlugin.java
index b41f55f26..d18c76dc9 100644
--- a/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/XMLPlugin.java
+++ b/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/XMLPlugin.java
@@ -358,12 +358,7 @@ public final class XMLPlugin extends AbstractUIPlugin {
 		IWorkbenchWindow window= fgXMLPlugin.getWorkbench().getActiveWorkbenchWindow();
 		if (window == null) {
 			final WindowRef windowRef= new WindowRef();
-			Display.getDefault().syncExec(new Runnable() {
-				@Override
-				public void run() {
-					setActiveWorkbenchWindow(windowRef);
-				}
-			});
+			Display.getDefault().syncExec(() -> setActiveWorkbenchWindow(windowRef));
 			return windowRef.window;
 		}
 		return window;
diff --git a/examples/org.eclipse.team.examples.filesystem/META-INF/MANIFEST.MF b/examples/org.eclipse.team.examples.filesystem/META-INF/MANIFEST.MF
index b028b63b9..632eda215 100644
--- a/examples/org.eclipse.team.examples.filesystem/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.team.examples.filesystem/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.team.examples.filesystem; singleton:=true
-Bundle-Version: 3.5.200.qualifier
+Bundle-Version: 3.5.300.qualifier
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Export-Package: org.eclipse.team.examples.filesystem,
diff --git a/examples/org.eclipse.team.examples.filesystem/pom.xml b/examples/org.eclipse.team.examples.filesystem/pom.xml
index 36446d1dc..144866ab9 100644
--- a/examples/org.eclipse.team.examples.filesystem/pom.xml
+++ b/examples/org.eclipse.team.examples.filesystem/pom.xml
@@ -19,6 +19,6 @@
   </parent>
   <groupId>org.eclipse.team</groupId>
   <artifactId>org.eclipse.team.examples.filesystem</artifactId>
-  <version>3.5.200-SNAPSHOT</version>
+  <version>3.5.300-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/NonSyncModelMergeOperation.java b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/NonSyncModelMergeOperation.java
index cfaa2e924..32c0d8cf9 100644
--- a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/NonSyncModelMergeOperation.java
+++ b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/NonSyncModelMergeOperation.java
@@ -92,11 +92,7 @@ public class NonSyncModelMergeOperation extends ModelMergeOperation {
 	protected void handlePreviewRequest() {
 		// We perform a syncExec so that the job will dispose of the scope manager
 		// after the dialog closes
-		Display.getDefault().syncExec(new Runnable() {
-			public void run() {
-				NonSyncMergeDialog.openFor(NonSyncModelMergeOperation.this);
-			}
-		});
+		Display.getDefault().syncExec(() -> NonSyncMergeDialog.openFor(NonSyncModelMergeOperation.this));
 	}
 	
 	/* (non-Javadoc)
diff --git a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/OpenFileSystemRevisionAction.java b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/OpenFileSystemRevisionAction.java
index b70a0af5d..965c67188 100644
--- a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/OpenFileSystemRevisionAction.java
+++ b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/OpenFileSystemRevisionAction.java
@@ -20,7 +20,6 @@ import java.lang.reflect.InvocationTargetException;
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IStorage;
 import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.Platform;
 import org.eclipse.core.runtime.content.IContentType;
 import org.eclipse.jface.dialogs.MessageDialog;
@@ -60,26 +59,24 @@ public class OpenFileSystemRevisionAction extends BaseSelectionListenerAction {
 			if (revision == null || !revision.exists()) {
 				MessageDialog.openError(page.getSite().getShell(), "Deleted Revision", "Can't open a deleted revision");
 			} else {
-				IRunnableWithProgress runnable = new IRunnableWithProgress() {
-					public void run(IProgressMonitor monitor) throws InvocationTargetException {
-						IStorage file;
-						try {
-							file = revision.getStorage(monitor);
-							String id = getEditorID(file.getName(), file.getContents());
-
-							if (file instanceof IFile) {
-								//if this is the current workspace file, open it
-								IDE.openEditor(page.getSite().getPage(), (IFile) file);
-							} else {
-								FileSystemRevisionEditorInput fileRevEditorInput = new FileSystemRevisionEditorInput(revision);
-								if (!editorAlreadyOpenOnContents(fileRevEditorInput))
-									page.getSite().getPage().openEditor(fileRevEditorInput, id);
-							}
-						} catch (CoreException e) {
-							throw new InvocationTargetException(e);
+				IRunnableWithProgress runnable = monitor -> {
+					IStorage file;
+					try {
+						file = revision.getStorage(monitor);
+						String id = getEditorID(file.getName(), file.getContents());
+
+						if (file instanceof IFile) {
+							//if this is the current workspace file, open it
+							IDE.openEditor(page.getSite().getPage(), (IFile) file);
+						} else {
+							FileSystemRevisionEditorInput fileRevEditorInput = new FileSystemRevisionEditorInput(revision);
+							if (!editorAlreadyOpenOnContents(fileRevEditorInput))
+								page.getSite().getPage().openEditor(fileRevEditorInput, id);
 						}
-
+					} catch (CoreException e) {
+						throw new InvocationTargetException(e);
 					}
+
 				};
 
 				IProgressService progressService = PlatformUI.getWorkbench().getProgressService();
diff --git a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/ShowHistoryAction.java b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/ShowHistoryAction.java
index d3b165a8d..bc320a60a 100644
--- a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/ShowHistoryAction.java
+++ b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/ShowHistoryAction.java
@@ -16,10 +16,8 @@ package org.eclipse.team.examples.filesystem.ui;
 import java.lang.reflect.InvocationTargetException;
 
 import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.jface.action.IAction;
 import org.eclipse.jface.dialogs.ProgressMonitorDialog;
-import org.eclipse.jface.operation.IRunnableWithProgress;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.swt.widgets.Display;
@@ -38,17 +36,11 @@ public class ShowHistoryAction extends ActionDelegate implements IObjectActionDe
 	public void run(IAction action) {
 		final Shell shell = Display.getDefault().getActiveShell();
 		try {
-			new ProgressMonitorDialog(shell).run(true, true, new IRunnableWithProgress() {
-				public void run(IProgressMonitor monitor) {
-					final IResource resource = (IResource) fSelection.getFirstElement();
-					Runnable r = new Runnable() {
-						public void run() {
-							TeamUI.showHistoryFor(TeamUIPlugin.getActivePage(), resource, null);
-						}
-					};
+			new ProgressMonitorDialog(shell).run(true, true, monitor -> {
+				final IResource resource = (IResource) fSelection.getFirstElement();
+				Runnable r = () -> TeamUI.showHistoryFor(TeamUIPlugin.getActivePage(), resource, null);
 
-					FileSystemPlugin.getStandardDisplay().asyncExec(r);
-				}
+				FileSystemPlugin.getStandardDisplay().asyncExec(r);
 			});
 		} catch (InvocationTargetException exception) {
 			// ignore
diff --git a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/model/ui/ModelNavigatorContentProvider.java b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/model/ui/ModelNavigatorContentProvider.java
index 24af182eb..94be06133 100644
--- a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/model/ui/ModelNavigatorContentProvider.java
+++ b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/model/ui/ModelNavigatorContentProvider.java
@@ -194,27 +194,21 @@ public class ModelNavigatorContentProvider extends BaseWorkbenchContentProvider
 	}
 
 	private void refreshProjects(final ModelProject[] projects) {
-		Display.getDefault().asyncExec(new Runnable() {
-			public void run() {
-				if (!getViewer().getControl().isDisposed()) {
-					for (int i = 0; i < projects.length; i++) {
-						ModelProject project = projects[i];
-						((AbstractTreeViewer)getViewer()).refresh(project, true);
-					}
+		Display.getDefault().asyncExec(() -> {
+			if (!getViewer().getControl().isDisposed()) {
+				for (int i = 0; i < projects.length; i++) {
+					ModelProject project = projects[i];
+					((AbstractTreeViewer)getViewer()).refresh(project, true);
 				}
 			}
-		
 		});
 	}
 
 	private void refreshViewer() {
-		Display.getDefault().asyncExec(new Runnable() {
-			public void run() {
-				if (!getViewer().getControl().isDisposed()) {
-					getViewer().refresh();
-				}
+		Display.getDefault().asyncExec(() -> {
+			if (!getViewer().getControl().isDisposed()) {
+				getViewer().refresh();
 			}
-		
 		});
 	}
 
diff --git a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/pessimistic/PessimisticFilesystemProvider.java b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/pessimistic/PessimisticFilesystemProvider.java
index f12074c5c..33d390713 100644
--- a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/pessimistic/PessimisticFilesystemProvider.java
+++ b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/pessimistic/PessimisticFilesystemProvider.java
@@ -76,29 +76,27 @@ public class PessimisticFilesystemProvider extends RepositoryProvider  {
 			return;
 		}
 		final Set toAdd= new HashSet(resources.length);
-		IWorkspaceRunnable runnable= new IWorkspaceRunnable() {
-			public void run(IProgressMonitor monitor) throws CoreException {
-				for (int i = 0; i < resources.length; i++) {
-					IResource resource= resources[i];
-					if (!isControlled(resource)) {
-						toAdd.add(resource);
-					}
+		IWorkspaceRunnable runnable= monitor1 -> {
+			for (int i1 = 0; i1 < resources.length; i1++) {
+				IResource resource= resources[i1];
+				if (!isControlled(resource)) {
+					toAdd.add(resource);
 				}
-				Map byParent= sortByParent(toAdd);
+			}
+			Map byParent= sortByParent(toAdd);
 
-				monitor.beginTask("Adding to control", 1000);
-				for (Iterator i= byParent.keySet().iterator(); i.hasNext();) {
-					IContainer parent= (IContainer) i.next();
-					Set controlledResources= (Set)fControlledResources.get(parent);
-					if (controlledResources == null) {
-						controlledResources= new HashSet(1);
-						fControlledResources.put(parent, controlledResources);
-					}
-					controlledResources.addAll((Set)byParent.get(parent));
-					writeControlFile(parent, monitor);
+			monitor1.beginTask("Adding to control", 1000);
+			for (Iterator i2= byParent.keySet().iterator(); i2.hasNext();) {
+				IContainer parent= (IContainer) i2.next();
+				Set controlledResources= (Set)fControlledResources.get(parent);
+				if (controlledResources == null) {
+					controlledResources= new HashSet(1);
+					fControlledResources.put(parent, controlledResources);
 				}
-				monitor.done();				
+				controlledResources.addAll((Set)byParent.get(parent));
+				writeControlFile(parent, monitor1);
 			}
+			monitor1.done();				
 		};
 		run(runnable, monitor);
 		fireStateChanged(toAdd, false);
@@ -122,41 +120,39 @@ public class PessimisticFilesystemProvider extends RepositoryProvider  {
 			return;
 		}
 		final Set toRemove= new HashSet(resources.length);
-		IWorkspaceRunnable runnable= new IWorkspaceRunnable() {
-			public void run(IProgressMonitor monitor) throws CoreException {
-				for (int i = 0; i < resources.length; i++) {
-					IResource resource= resources[i];
-					if (isControlled(resource)) {	
-						toRemove.add(resource);
-					}
+		IWorkspaceRunnable runnable= monitor1 -> {
+			for (int i1 = 0; i1 < resources.length; i1++) {
+				IResource resource1= resources[i1];
+				if (isControlled(resource1)) {	
+					toRemove.add(resource1);
 				}
-				Map byParent= sortByParent(toRemove);
+			}
+			Map byParent= sortByParent(toRemove);
 
-				monitor.beginTask("Removing from control", 1000);
-				for (Iterator i= byParent.keySet().iterator(); i.hasNext();) {
-					IContainer parent= (IContainer) i.next();
-					Set controlledResources= (Set)fControlledResources.get(parent);
-					if (controlledResources == null) {
-						deleteControlFile(parent, monitor);
+			monitor1.beginTask("Removing from control", 1000);
+			for (Iterator i2= byParent.keySet().iterator(); i2.hasNext();) {
+				IContainer parent= (IContainer) i2.next();
+				Set controlledResources= (Set)fControlledResources.get(parent);
+				if (controlledResources == null) {
+					deleteControlFile(parent, monitor1);
+				} else {
+					Set toRemove1= (Set)byParent.get(parent);
+					controlledResources.removeAll(toRemove1);
+					if (controlledResources.isEmpty()) {
+						fControlledResources.remove(parent);
+						deleteControlFile(parent, monitor1);
 					} else {
-						Set toRemove= (Set)byParent.get(parent);
-						controlledResources.removeAll(toRemove);
-						if (controlledResources.isEmpty()) {
-							fControlledResources.remove(parent);
-							deleteControlFile(parent, monitor);
-						} else {
-							writeControlFile(parent, monitor);
-						}
-						for (Iterator j= controlledResources.iterator(); j.hasNext();) {
-							IResource resource= (IResource) j.next();
-							if (!resource.exists()) {
-								j.remove();
-							}
+						writeControlFile(parent, monitor1);
+					}
+					for (Iterator j= controlledResources.iterator(); j.hasNext();) {
+						IResource resource2= (IResource) j.next();
+						if (!resource2.exists()) {
+							j.remove();
 						}
 					}
 				}
-				monitor.done();
 			}
+			monitor1.done();
 		};
 		run(runnable, monitor);
 		fireStateChanged(toRemove, false);
@@ -184,15 +180,13 @@ public class PessimisticFilesystemProvider extends RepositoryProvider  {
 	 * Deletes the control file for the given container.
 	 */
 	private void deleteControlFile(final IContainer container, IProgressMonitor monitor) {
-		IWorkspaceRunnable runnable= new IWorkspaceRunnable() {
-			public void run(IProgressMonitor monitor) throws CoreException {
-				IFile controlFile= getControlFile(container, monitor);
-				monitor.beginTask("Deleting control file " + controlFile, 1);
-				if (controlFile.exists()) {
-					controlFile.delete(true, false, monitor);
-				}
-				monitor.done();
+		IWorkspaceRunnable runnable= monitor1 -> {
+			IFile controlFile= getControlFile(container, monitor1);
+			monitor1.beginTask("Deleting control file " + controlFile, 1);
+			if (controlFile.exists()) {
+				controlFile.delete(true, false, monitor1);
 			}
+			monitor1.done();
 		};
 		run(runnable, monitor);
 	}
@@ -371,17 +365,15 @@ public class PessimisticFilesystemProvider extends RepositoryProvider  {
 		set.add(project);
 		fControlledResources.put(project.getParent(), set);
 		try {
-			getProject().accept(new IResourceVisitor() {
-				public boolean visit(IResource resource) {
-					if (resource.getType() == IResource.FILE) {
-						if (CONTROL_FILE_NAME.equals(resource.getName())) {
-							Set controlledResources= readControlFile((IFile)resource);
-							fControlledResources.put(resource.getParent(), controlledResources);
-						}
-						return false;
+			getProject().accept(resource -> {
+				if (resource.getType() == IResource.FILE) {
+					if (CONTROL_FILE_NAME.equals(resource.getName())) {
+						Set controlledResources= readControlFile((IFile)resource);
+						fControlledResources.put(resource.getParent(), controlledResources);
 					}
-					return true;
+					return false;
 				}
+				return true;
 			});
 		} catch (CoreException e) {
 			PessimisticFilesystemProviderPlugin.getInstance().logError(e, "Problems traversing resource tree");
@@ -406,20 +398,18 @@ public class PessimisticFilesystemProvider extends RepositoryProvider  {
 			return;
 		}
 		final Set modified= new HashSet(1);
-		IWorkspaceRunnable runnable= new IWorkspaceRunnable() {
-			public void run(IProgressMonitor monitor) {
-				monitor.beginTask("Checking in resources", 1000);
-				for(int i= 0; i < resources.length; i++) {
-					IResource resource= resources[i];
-					if (isControlled(resource)) { 
-						if (resource.exists()) {
-							resource.setReadOnly(true);
-							modified.add(resource);
-						}
+		IWorkspaceRunnable runnable= monitor1 -> {
+			monitor1.beginTask("Checking in resources", 1000);
+			for(int i= 0; i < resources.length; i++) {
+				IResource resource= resources[i];
+				if (isControlled(resource)) { 
+					if (resource.exists()) {
+						resource.setReadOnly(true);
+						modified.add(resource);
 					}
 				}
-				monitor.done();
 			}
+			monitor1.done();
 		};
 		run(runnable, monitor);
 		fireStateChanged(modified, false);
@@ -446,20 +436,18 @@ public class PessimisticFilesystemProvider extends RepositoryProvider  {
 			return;
 		}
 		final Set modified= new HashSet(1);
-		IWorkspaceRunnable runnable= new IWorkspaceRunnable() {
-			public void run(IProgressMonitor monitor) {
-				monitor.beginTask("Unchecking in resources", 1000);
-				for(int i= 0; i < resources.length; i++) {
-					IResource resource= resources[i];
-					if (isControlled(resource)) {
-						if (resource.exists()) {
-							resource.setReadOnly(true);
-							modified.add(resource);
-						}
+		IWorkspaceRunnable runnable= monitor1 -> {
+			monitor1.beginTask("Unchecking in resources", 1000);
+			for(int i= 0; i < resources.length; i++) {
+				IResource resource= resources[i];
+				if (isControlled(resource)) {
+					if (resource.exists()) {
+						resource.setReadOnly(true);
+						modified.add(resource);
 					}
 				}
-				monitor.done();
 			}
+			monitor1.done();
 		};
 		run(runnable, monitor);
 		fireStateChanged(modified, false);
@@ -483,20 +471,18 @@ public class PessimisticFilesystemProvider extends RepositoryProvider  {
 			return;
 		}
 		final Set modified= new HashSet(1);
-		IWorkspaceRunnable runnable= new IWorkspaceRunnable() {
-			public void run(IProgressMonitor monitor) {
-				monitor.beginTask("Checking out resources", 1000);
-				for(int i= 0; i < resources.length; i++) {
-					IResource resource= resources[i];
-					if (isControlled(resource)) {
-						if(resource.exists()) {
-							resource.setReadOnly(false);								
-							modified.add(resource);
-						}
+		IWorkspaceRunnable runnable= monitor1 -> {
+			monitor1.beginTask("Checking out resources", 1000);
+			for(int i= 0; i < resources.length; i++) {
+				IResource resource= resources[i];
+				if (isControlled(resource)) {
+					if(resource.exists()) {
+						resource.setReadOnly(false);								
+						modified.add(resource);
 					}
 				}
-				monitor.done();
 			}
+			monitor1.done();
 		};
 		run(runnable, monitor);
 		fireStateChanged(modified, false);
@@ -660,20 +646,16 @@ public class PessimisticFilesystemProvider extends RepositoryProvider  {
 		}
 
 		if (queueAfterWorkspaceOperation) {
-			Thread t= new Thread(new Runnable() {
-				public void run() {
-					try {
-						ResourcesPlugin.getWorkspace().run(
-							new IWorkspaceRunnable() {
-								public void run(IProgressMonitor monitor) {
-								}
-							}, 
-							null);
-					} catch (CoreException e) {
-						PessimisticFilesystemProviderPlugin.getInstance().logError(e, "Problem during empty runnable");
-					}
-					fireStateChanged(resources, false);
+			Thread t= new Thread(() -> {
+				try {
+					ResourcesPlugin.getWorkspace().run(
+						(IWorkspaceRunnable) monitor -> {
+						}, 
+						null);
+				} catch (CoreException e) {
+					PessimisticFilesystemProviderPlugin.getInstance().logError(e, "Problem during empty runnable");
 				}
+				fireStateChanged(resources, false);
 			});
 			t.start();
 		} else {
@@ -688,17 +670,15 @@ public class PessimisticFilesystemProvider extends RepositoryProvider  {
 	 */
 	private Collection getSubtreeMembers(IResource resource) {
 		final Set resources= new HashSet(1);
-		IResourceVisitor visitor= new IResourceVisitor() {
-			public boolean visit(IResource resource) {
-				switch (resource.getType()) {
-					case IResource.PROJECT:
-					case IResource.FOLDER:
-					case IResource.FILE:
-						resources.add(resource);
-						return true;
-				}
-				return true;
+		IResourceVisitor visitor= resource1 -> {
+			switch (resource1.getType()) {
+				case IResource.PROJECT:
+				case IResource.FOLDER:
+				case IResource.FILE:
+					resources.add(resource1);
+					return true;
 			}
+			return true;
 		};
 		try {
 			resource.accept(visitor);
diff --git a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/pessimistic/PessimisticModificationValidator.java b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/pessimistic/PessimisticModificationValidator.java
index e8c286b2c..427d39f7e 100644
--- a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/pessimistic/PessimisticModificationValidator.java
+++ b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/pessimistic/PessimisticModificationValidator.java
@@ -234,31 +234,29 @@ public class PessimisticModificationValidator
 			if (shell != null && !shell.isDisposed()) {
 				Display display = shell.getDisplay();
 				final Set[] result = {resources};
-				display.syncExec(new Runnable() {
-					public void run() {
-						ILabelProvider labelProvider= new WorkbenchLabelProvider();
-						Object[] resourceArray= result[0].toArray();
-						ITreeContentProvider contentProvider= new ResourceSetContentProvider(result[0]);
-						CheckedTreeSelectionDialog dialog= new CheckedTreeSelectionDialog(shell, labelProvider, contentProvider);
-						dialog.setMessage("Select resources to be checked out.");
-						dialog.setTitle("Check out resources");
-						dialog.setContainerMode(true);
-						dialog.setBlockOnOpen(true);
-						dialog.setComparator(new ResourceComparator(ResourceComparator.NAME));
-						dialog.setExpandedElements(resourceArray);
-						dialog.setInitialSelections(resourceArray);
-						dialog.setInput(ResourcesPlugin.getWorkspace().getRoot());
-						int status= dialog.open();
-						result[0]= null;
-						if (status == Window.OK) {
-							Object[] results= dialog.getResult();
-							result[0] = new HashSet(results.length);
-							for (int i= 0; i < results.length; i++) {
-								result[0].add(results[i]);
-							}
-						} else if(status == Window.CANCEL) {
-							statusCode[0] = IStatus.CANCEL;
+				display.syncExec(() -> {
+					ILabelProvider labelProvider= new WorkbenchLabelProvider();
+					Object[] resourceArray= result[0].toArray();
+					ITreeContentProvider contentProvider= new ResourceSetContentProvider(result[0]);
+					CheckedTreeSelectionDialog dialog= new CheckedTreeSelectionDialog(shell, labelProvider, contentProvider);
+					dialog.setMessage("Select resources to be checked out.");
+					dialog.setTitle("Check out resources");
+					dialog.setContainerMode(true);
+					dialog.setBlockOnOpen(true);
+					dialog.setComparator(new ResourceComparator(ResourceComparator.NAME));
+					dialog.setExpandedElements(resourceArray);
+					dialog.setInitialSelections(resourceArray);
+					dialog.setInput(ResourcesPlugin.getWorkspace().getRoot());
+					int status= dialog.open();
+					result[0]= null;
+					if (status == Window.OK) {
+						Object[] results= dialog.getResult();
+						result[0] = new HashSet(results.length);
+						for (int i= 0; i < results.length; i++) {
+							result[0].add(results[i]);
 						}
+					} else if(status == Window.CANCEL) {
+						statusCode[0] = IStatus.CANCEL;
 					}
 				});
 				resources= result[0];			
diff --git a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/pessimistic/ResourceChangeListener.java b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/pessimistic/ResourceChangeListener.java
index 8b0a53d25..9c54c219a 100644
--- a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/pessimistic/ResourceChangeListener.java
+++ b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/pessimistic/ResourceChangeListener.java
@@ -132,28 +132,24 @@ public class ResourceChangeListener implements IResourceDeltaVisitor, IResourceC
 		}
 
 		if (!fRemoved.isEmpty() || !fAdded.isEmpty()) {
-			final IWorkspaceRunnable workspaceRunnable= new IWorkspaceRunnable() {
-				public void run(final IProgressMonitor monitor) {
-					if (!fRemoved.isEmpty()) {
-						remove(monitor);
-					}
-					
-					if (!fAdded.isEmpty()) {
-						add(monitor);
-					}					
+			final IWorkspaceRunnable workspaceRunnable= monitor -> {
+				if (!fRemoved.isEmpty()) {
+					remove(monitor);
 				}
+				
+				if (!fAdded.isEmpty()) {
+					add(monitor);
+				}					
 			};
 			// must fork since we are in resource callback.
-			Runnable run= new Runnable() {
-				public void run() {
-					try {
-						IWorkspace workspace= ResourcesPlugin.getWorkspace();
-						if (workspace != null) {
-							workspace.run(workspaceRunnable, null);
-						}
-					} catch (CoreException e) {
-						PessimisticFilesystemProviderPlugin.getInstance().logError(e, "Problems encountered during attempt to add/remove control.");
+			Runnable run= () -> {
+				try {
+					IWorkspace workspace= ResourcesPlugin.getWorkspace();
+					if (workspace != null) {
+						workspace.run(workspaceRunnable, null);
 					}
+				} catch (CoreException e) {
+					PessimisticFilesystemProviderPlugin.getInstance().logError(e, "Problems encountered during attempt to add/remove control.");
 				}
 			};
 			new Thread(run).start();
@@ -188,29 +184,27 @@ public class ResourceChangeListener implements IResourceDeltaVisitor, IResourceC
 				final Shell shell= getShell();
 				if (shell != null && !shell.isDisposed()) {
 					final Set resources= new HashSet(fAdded);
-					Runnable run= new Runnable() {
-						public void run() {
-							CheckedTreeSelectionDialog dialog= new CheckedTreeSelectionDialog(shell, new WorkbenchLabelProvider(), new ResourceSetContentProvider(resources));
-							dialog.setMessage("Select the resources to be added to the control of the repository.");
-							dialog.setTitle("Add resources to control");
-							dialog.setContainerMode(true);
-							dialog.setBlockOnOpen(true);
-							dialog.setComparator(new ResourceComparator(ResourceComparator.NAME));
-							Object[] resourceArray= resources.toArray();
-							dialog.setExpandedElements(resourceArray);
-							dialog.setInitialSelections(resourceArray);
-							dialog.setInput(ResourcesPlugin.getWorkspace().getRoot());
-							int status= dialog.open();
-							
-							if (status == Window.OK) {
-								Object[] results= dialog.getResult();
-								if (results != null) {
-									Set resources= new HashSet(results.length);
-									for (int i= 0; i < results.length; i++) {
-										resources.add(results[i]);
-									}
-									addToControl(resources, monitor);
+					Runnable run= () -> {
+						CheckedTreeSelectionDialog dialog= new CheckedTreeSelectionDialog(shell, new WorkbenchLabelProvider(), new ResourceSetContentProvider(resources));
+						dialog.setMessage("Select the resources to be added to the control of the repository.");
+						dialog.setTitle("Add resources to control");
+						dialog.setContainerMode(true);
+						dialog.setBlockOnOpen(true);
+						dialog.setComparator(new ResourceComparator(ResourceComparator.NAME));
+						Object[] resourceArray= resources.toArray();
+						dialog.setExpandedElements(resourceArray);
+						dialog.setInitialSelections(resourceArray);
+						dialog.setInput(ResourcesPlugin.getWorkspace().getRoot());
+						int status= dialog.open();
+						
+						if (status == Window.OK) {
+							Object[] results= dialog.getResult();
+							if (results != null) {
+								Set resources1= new HashSet(results.length);
+								for (int i= 0; i < results.length; i++) {
+									resources1.add(results[i]);
 								}
+								addToControl(resources1, monitor);
 							}
 						}
 					};
diff --git a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/pessimistic/ui/AddToControlAction.java b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/pessimistic/ui/AddToControlAction.java
index 6f30a0c4f..654a17ad5 100644
--- a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/pessimistic/ui/AddToControlAction.java
+++ b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/pessimistic/ui/AddToControlAction.java
@@ -20,7 +20,6 @@ import java.util.Set;
 
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.jface.action.IAction;
 import org.eclipse.jface.operation.IRunnableWithProgress;
 import org.eclipse.team.examples.pessimistic.PessimisticFilesystemProvider;
@@ -52,17 +51,15 @@ public class AddToControlAction extends PessimisticProviderAction {
 		}
 		if (!resourceSet.isEmpty()) {
 			final Map byProject= sortByProject(resourceSet);
-			IRunnableWithProgress runnable= new IRunnableWithProgress() {
-				public void run(IProgressMonitor monitor) {
-					for (Iterator i= byProject.keySet().iterator(); i.hasNext();) {
-						IProject project= (IProject) i.next();
-						PessimisticFilesystemProvider provider= getProvider(project);
-						if (provider != null) {
-							Set set= (Set)byProject.get(project);
-							IResource[] resources= new IResource[set.size()];
-							set.toArray(resources);
-							provider.addToControl(resources, monitor);
-						}
+			IRunnableWithProgress runnable= monitor -> {
+				for (Iterator i= byProject.keySet().iterator(); i.hasNext();) {
+					IProject project= (IProject) i.next();
+					PessimisticFilesystemProvider provider= getProvider(project);
+					if (provider != null) {
+						Set set= (Set)byProject.get(project);
+						IResource[] resources1= new IResource[set.size()];
+						set.toArray(resources1);
+						provider.addToControl(resources1, monitor);
 					}
 				}
 			};
diff --git a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/pessimistic/ui/DisconnectAction.java b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/pessimistic/ui/DisconnectAction.java
index ee664702e..2a3f8ea27 100644
--- a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/pessimistic/ui/DisconnectAction.java
+++ b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/pessimistic/ui/DisconnectAction.java
@@ -22,7 +22,6 @@ import org.eclipse.core.resources.IResource;
 import org.eclipse.core.resources.IWorkspaceRunnable;
 import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.jface.action.IAction;
 import org.eclipse.jface.operation.IRunnableWithProgress;
 import org.eclipse.team.core.RepositoryProvider;
@@ -53,31 +52,26 @@ public class DisconnectAction extends PessimisticProviderAction {
 			}
 		}
 		if (!projects.isEmpty()) {
-			IRunnableWithProgress runnable= new IRunnableWithProgress() {
-				public void run(IProgressMonitor monitor) {
-					IWorkspaceRunnable runnable= new IWorkspaceRunnable() {
-						public void run(IProgressMonitor monitor)
-							throws CoreException {
-							for (Iterator i= projects.iterator(); i.hasNext();) {
-								IProject project= (IProject) i.next();
-								PessimisticFilesystemProvider provider= getProvider(project);
-								if (provider != null) {
-									try {
-										RepositoryProvider.unmap(project);	
-									} catch (TeamException e) {
-										PessimisticFilesystemProviderPlugin.getInstance().logError(e, "Could not unmap " + project);
-									}						
-								}
-							}
-						}				
-					};
-					try {
-						ResourcesPlugin.getWorkspace().run(runnable, monitor);
-					} catch (CoreException e) {
-						PessimisticFilesystemProviderPlugin.getInstance().logError(e, "Problem during unmap runnable");	
+			IRunnableWithProgress runnable= monitor -> {
+				IWorkspaceRunnable runnable1= monitor1 -> {
+				for (Iterator i= projects.iterator(); i.hasNext();) {
+					IProject project= (IProject) i.next();
+					PessimisticFilesystemProvider provider= getProvider(project);
+					if (provider != null) {
+						try {
+							RepositoryProvider.unmap(project);	
+						} catch (TeamException e1) {
+							PessimisticFilesystemProviderPlugin.getInstance().logError(e1, "Could not unmap " + project);
+						}						
 					}
-					
 				}
+};
+				try {
+					ResourcesPlugin.getWorkspace().run(runnable1, monitor);
+				} catch (CoreException e2) {
+					PessimisticFilesystemProviderPlugin.getInstance().logError(e2, "Problem during unmap runnable");	
+				}
+				
 			};
 			runWithProgressDialog(runnable);
 		}
diff --git a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/pessimistic/ui/PessimisticDecorator.java b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/pessimistic/ui/PessimisticDecorator.java
index cfbdbdd56..a5a66078c 100644
--- a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/pessimistic/ui/PessimisticDecorator.java
+++ b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/pessimistic/ui/PessimisticDecorator.java
@@ -88,11 +88,9 @@ public class PessimisticDecorator extends LabelProvider implements ILabelDecorat
 	 */
 	private void postLabelEvents(final LabelProviderChangedEvent[] events) {
 		if (events != null && events.length > 0) {
-			Display.getDefault().asyncExec(new Runnable() {
-				public void run() {
-					for (int i= 0; i < events.length; i++) {
-						fireLabelProviderChanged(events[i]);
-					}
+			Display.getDefault().asyncExec(() -> {
+				for (int i= 0; i < events.length; i++) {
+					fireLabelProviderChanged(events[i]);
 				}
 			});
 		}
diff --git a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/pessimistic/ui/RemoveFromControlAction.java b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/pessimistic/ui/RemoveFromControlAction.java
index 6b014987e..ba24b1251 100644
--- a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/pessimistic/ui/RemoveFromControlAction.java
+++ b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/pessimistic/ui/RemoveFromControlAction.java
@@ -20,7 +20,6 @@ import java.util.Set;
 
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.jface.action.IAction;
 import org.eclipse.jface.operation.IRunnableWithProgress;
 import org.eclipse.team.examples.pessimistic.PessimisticFilesystemProvider;
@@ -49,17 +48,15 @@ public class RemoveFromControlAction extends PessimisticProviderAction {
 		}
 		if (!resourceSet.isEmpty()) {
 			final Map byProject= sortByProject(resourceSet);			
-			IRunnableWithProgress runnable= new IRunnableWithProgress() {
-				public void run(IProgressMonitor monitor) {
-					for (Iterator i= byProject.keySet().iterator(); i.hasNext();) {
-						IProject project= (IProject) i.next();
-						PessimisticFilesystemProvider provider= getProvider(project);
-						if (provider != null) {
-							Set set= (Set)byProject.get(project);
-							IResource[] resources= new IResource[set.size()];
-							set.toArray(resources);
-							provider.removeFromControl(resources, monitor);
-						}
+			IRunnableWithProgress runnable= monitor -> {
+				for (Iterator i= byProject.keySet().iterator(); i.hasNext();) {
+					IProject project= (IProject) i.next();
+					PessimisticFilesystemProvider provider= getProvider(project);
+					if (provider != null) {
+						Set set= (Set)byProject.get(project);
+						IResource[] resources1= new IResource[set.size()];
+						set.toArray(resources1);
+						provider.removeFromControl(resources1, monitor);
 					}
 				}
 			};
diff --git a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/pessimistic/ui/SourceManagementAction.java b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/pessimistic/ui/SourceManagementAction.java
index 260835a1b..ffe6985cd 100644
--- a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/pessimistic/ui/SourceManagementAction.java
+++ b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/pessimistic/ui/SourceManagementAction.java
@@ -50,17 +50,15 @@ public abstract class SourceManagementAction extends PessimisticProviderAction {
 		}
 		if (!resourceSet.isEmpty()) {
 			final Map byProject= sortByProject(resourceSet);
-			IRunnableWithProgress runnable= new IRunnableWithProgress() {
-				public void run(IProgressMonitor monitor) {
-					for (Iterator i= byProject.keySet().iterator(); i.hasNext();) {
-						IProject project= (IProject) i.next();
-						PessimisticFilesystemProvider provider= getProvider(project);
-						if (provider != null) {
-							Set set= (Set)byProject.get(project);
-							IResource[] resources= new IResource[set.size()];
-							set.toArray(resources);
-							manageResources(provider, resources, monitor);
-						}
+			IRunnableWithProgress runnable= monitor -> {
+				for (Iterator i= byProject.keySet().iterator(); i.hasNext();) {
+					IProject project= (IProject) i.next();
+					PessimisticFilesystemProvider provider= getProvider(project);
+					if (provider != null) {
+						Set set= (Set)byProject.get(project);
+						IResource[] resources1= new IResource[set.size()];
+						set.toArray(resources1);
+						manageResources(provider, resources1, monitor);
 					}
 				}
 			};