Bug 547304 - [cleanup] Fix wrong space/tab indentationS4_12_0_RC2S4_12_0_RC1aS4_12_0_RC1S4_12_0_M3R4_12I20190605-1800I20190605-0600I20190604-1800I20190604-0600I20190603-1800I20190603-0600I20190602-1800I20190602-0600I20190601-1800I20190531-1800I20190531-0245I20190529-2005I20190529-1800I20190529-0600I20190528-1800I20190528-0915I20190528-0850I20190528-0600I20190527-1805I20190527-0600I20190526-1800I20190526-0600I20190525-1800I20190525-0600I20190524-1800I20190524-0135I20190522-1800I20190522-0600I20190521-1800I20190521-0600I20190520-1805I20190520-0600R4_12_maintenance

This change fixes space or mixed tab/space indentations in all Java
files. This also includes two or three space indentations and even fix
most stray single spaces in indentations.
The change includes only whitespace formatting and no code changes.

Change-Id: I4149aaf4e48ccf7b49083f36d52e0c7a67433c7d

10 files changed, 720 insertions, 720 deletions

diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/dialogs/AdditionalMappingsDialog.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/dialogs/AdditionalMappingsDialog.java
index 261d26183..5d0e47d81 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/dialogs/AdditionalMappingsDialog.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/dialogs/AdditionalMappingsDialog.java
@@ -29,64 +29,64 @@ import org.eclipse.team.internal.ui.TeamUIMessages;
 
 public class AdditionalMappingsDialog extends DetailsDialog {
 
-    private ResourceMappingHierarchyArea selectedMappingsArea;
-    private ResourceMappingHierarchyArea allMappingsArea;
+	private ResourceMappingHierarchyArea selectedMappingsArea;
+	private ResourceMappingHierarchyArea allMappingsArea;
 	private final ISynchronizationScope scope;
 	private final ISynchronizationContext context;
 	private String previewMessage;
 	protected boolean forcePreview = true;
 
-    public AdditionalMappingsDialog(Shell parentShell, String dialogTitle, ISynchronizationScope scope, ISynchronizationContext context) {
-        super(parentShell, dialogTitle);
+	public AdditionalMappingsDialog(Shell parentShell, String dialogTitle, ISynchronizationScope scope, ISynchronizationContext context) {
+		super(parentShell, dialogTitle);
 		this.scope = scope;
 		this.context = context;
-    }
+	}
 
 	@Override
 	protected void createMainDialogArea(Composite parent) {
-        createWrappingLabel(parent, TeamUIMessages.AdditionalMappingsDialog_0);
-        createSelectedMappingsArea(parent);
-        createAllMappingsArea(parent);
-        createPreviewOptionArea(parent);
-    }
+		createWrappingLabel(parent, TeamUIMessages.AdditionalMappingsDialog_0);
+		createSelectedMappingsArea(parent);
+		createAllMappingsArea(parent);
+		createPreviewOptionArea(parent);
+	}
 
 	/*
-     * Create a list that allows the selection of mappings via checkbox
-     */
-    private void createSelectedMappingsArea(Composite parent) {
-        Composite composite = createComposite(parent);
-        GridLayout layout = new GridLayout(1, false);
-        layout.marginHeight = 0;
-        layout.marginWidth = 0;
-        composite.setLayout(layout);
-        selectedMappingsArea = ResourceMappingHierarchyArea.create(scope.asInputScope(), null /* no context */);
-        selectedMappingsArea.setDescription(TeamUIMessages.AdditionalMappingsDialog_1);
-        selectedMappingsArea.createArea(composite);
-        // Create a separator between the two sets of buttons
-        Label seperator = new Label(composite, SWT.SEPARATOR | SWT.HORIZONTAL);
-        seperator.setLayoutData(new GridData (GridData.FILL_HORIZONTAL));
-    }
-
-    /*
-     * Create a list that allows the selection of mappings via checkbox
-     */
-    private void createAllMappingsArea(Composite parent) {
-        Composite composite = createComposite(parent);
-        GridLayout layout = new GridLayout(1, false);
-        layout.marginHeight = 0;
-        layout.marginWidth = 0;
-        composite.setLayout(layout);
-        allMappingsArea = ResourceMappingHierarchyArea.create(scope, context);
-        allMappingsArea.setDescription(TeamUIMessages.AdditionalMappingsDialog_2);
-        //allMappingsArea.addPropertyChangeListener(this);
-        allMappingsArea.createArea(composite);
-    }
-
-    private void createPreviewOptionArea(Composite parent) {
-    	if (previewMessage != null) {
-    		final Button forcePreviewButton = SWTUtils.createCheckBox(parent, previewMessage);
-    		forcePreviewButton.setSelection(forcePreview);
-    		forcePreviewButton.addSelectionListener(new SelectionListener() {
+	 * Create a list that allows the selection of mappings via checkbox
+	 */
+	private void createSelectedMappingsArea(Composite parent) {
+		Composite composite = createComposite(parent);
+		GridLayout layout = new GridLayout(1, false);
+		layout.marginHeight = 0;
+		layout.marginWidth = 0;
+		composite.setLayout(layout);
+		selectedMappingsArea = ResourceMappingHierarchyArea.create(scope.asInputScope(), null /* no context */);
+		selectedMappingsArea.setDescription(TeamUIMessages.AdditionalMappingsDialog_1);
+		selectedMappingsArea.createArea(composite);
+		// Create a separator between the two sets of buttons
+		Label seperator = new Label(composite, SWT.SEPARATOR | SWT.HORIZONTAL);
+		seperator.setLayoutData(new GridData (GridData.FILL_HORIZONTAL));
+	}
+
+	/*
+	 * Create a list that allows the selection of mappings via checkbox
+	 */
+	private void createAllMappingsArea(Composite parent) {
+		Composite composite = createComposite(parent);
+		GridLayout layout = new GridLayout(1, false);
+		layout.marginHeight = 0;
+		layout.marginWidth = 0;
+		composite.setLayout(layout);
+		allMappingsArea = ResourceMappingHierarchyArea.create(scope, context);
+		allMappingsArea.setDescription(TeamUIMessages.AdditionalMappingsDialog_2);
+		//allMappingsArea.addPropertyChangeListener(this);
+		allMappingsArea.createArea(composite);
+	}
+
+	private void createPreviewOptionArea(Composite parent) {
+		if (previewMessage != null) {
+			final Button forcePreviewButton = SWTUtils.createCheckBox(parent, previewMessage);
+			forcePreviewButton.setSelection(forcePreview);
+			forcePreviewButton.addSelectionListener(new SelectionListener() {
 				@Override
 				public void widgetDefaultSelected(SelectionEvent e) {
 					// Ignore
@@ -96,25 +96,25 @@ public class AdditionalMappingsDialog extends DetailsDialog {
 					forcePreview  = forcePreviewButton.getSelection();
 				}
 			});
-    	}
+		}
 	}
 
-    @Override
+	@Override
 	protected Composite createDropDownDialogArea(Composite parent) {
-        // TODO Auto-generated method stub
-        return null;
-    }
+		// TODO Auto-generated method stub
+		return null;
+	}
 
-    @Override
+	@Override
 	protected void updateEnablements() {
-        // TODO Auto-generated method stub
+		// TODO Auto-generated method stub
 
-    }
+	}
 
-    @Override
+	@Override
 	protected boolean includeDetailsButton() {
-        return false;
-    }
+		return false;
+	}
 
 	public String getPreviewMessage() {
 		return previewMessage;
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/dialogs/DetailsDialog.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/dialogs/DetailsDialog.java
index 7915698a3..40a59e754 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/dialogs/DetailsDialog.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/dialogs/DetailsDialog.java
@@ -107,10 +107,10 @@ abstract public class DetailsDialog extends TrayDialog {
 	protected void configureShell(Shell shell) {
 		super.configureShell(shell);
 		shell.setText(title);
-        String helpContextId = getHelpContextId();
-        if (helpContextId != null) {
-            PlatformUI.getWorkbench().getHelpSystem().setHelp(shell, helpContextId);
-        }
+		String helpContextId = getHelpContextId();
+		if (helpContextId != null) {
+			PlatformUI.getWorkbench().getHelpSystem().setHelp(shell, helpContextId);
+		}
 	}
 
 	@Override
@@ -149,13 +149,13 @@ abstract public class DetailsDialog extends TrayDialog {
 		// create composite
 		Composite composite = (Composite)super.createDialogArea(parent);
 		if (!isMainGrabVertical()) {
-		    composite.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false));
+			composite.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false));
 		}
 
-        String helpContextId = getHelpContextId();
-        if (helpContextId != null) {
-            PlatformUI.getWorkbench().getHelpSystem().setHelp(composite, helpContextId);
-        }
+		String helpContextId = getHelpContextId();
+		if (helpContextId != null) {
+			PlatformUI.getWorkbench().getHelpSystem().setHelp(composite, helpContextId);
+		}
 
 		// create image
 		String key = getImageKey();
@@ -194,7 +194,7 @@ abstract public class DetailsDialog extends TrayDialog {
 			right.setLayoutData(new GridData(GridData.FILL_BOTH));
 			createMainDialogArea(right);
 		} else {
-		    createMainDialogArea(composite);
+			createMainDialogArea(composite);
 		}
 
 		if(includeErrorMessage()) {
@@ -205,32 +205,32 @@ abstract public class DetailsDialog extends TrayDialog {
 			errorMessageLabel.setForeground(getShell().getDisplay().getSystemColor(SWT.COLOR_RED));
 		}
 
-        Dialog.applyDialogFont(parent);
+		Dialog.applyDialogFont(parent);
 		return composite;
 	}
 
-    /**
-     * Return the help context id to be used for the dialog.
-     * This context Id will be registered by this class.
-     * By default, this method returns <code>null</code>.
-     * @return the help context id to be used for the dialog.
-     */
+	/**
+	 * Return the help context id to be used for the dialog.
+	 * This context Id will be registered by this class.
+	 * By default, this method returns <code>null</code>.
+	 * @return the help context id to be used for the dialog.
+	 */
 	protected String getHelpContextId() {
-        return null;
-    }
+		return null;
+	}
 
-    /**
+	/**
 	 * Return whether the main area should grab excess vertical space.
 	 * The default is <code>true</code> but subclasses can override
 	 * in cases where the main is more or less fixed but the details
 	 * needs to grab.
-     * @return whether the main area should grab excess vertical space
-     */
-    protected boolean isMainGrabVertical() {
-        return true;
-    }
+	 * @return whether the main area should grab excess vertical space
+	 */
+	protected boolean isMainGrabVertical() {
+		return true;
+	}
 
-    /**
+	/**
 	 * Creates the dialog's top composite
 	 *
 	 * @param parent the parent composite
@@ -262,7 +262,7 @@ abstract public class DetailsDialog extends TrayDialog {
 			detailsCreated = true;
 			detailsButton.setText(getDetailsButtonLabelHide());
 		}
-        Dialog.applyDialogFont(getContents());
+		Dialog.applyDialogFont(getContents());
 		Point newSize = getContents().computeSize(SWT.DEFAULT, SWT.DEFAULT);
 
 		getShell().setSize(new Point(windowSize.x, windowSize.y + (newSize.y - oldSize.y)));
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/dialogs/DetailsDialogWithProjects.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/dialogs/DetailsDialogWithProjects.java
index 45c6e8a5e..918a5b9aa 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/dialogs/DetailsDialogWithProjects.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/dialogs/DetailsDialogWithProjects.java
@@ -104,9 +104,9 @@ public class DetailsDialogWithProjects extends DetailsDialog {
 		return includeCancelButton;
 	}
 
-    @Override
+	@Override
 	protected boolean isMainGrabVertical() {
-        return false;
-    }
+		return false;
+	}
 
 }
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/dialogs/DialogArea.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/dialogs/DialogArea.java
index 27fbd4218..24ec1f7fe 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/dialogs/DialogArea.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/dialogs/DialogArea.java
@@ -197,10 +197,10 @@ public abstract class DialogArea {
 	}
 
 	protected int convertVerticalDLUsToPixels(int dlus) {
-	    return Dialog.convertVerticalDLUsToPixels(fontMetrics, dlus);
+		return Dialog.convertVerticalDLUsToPixels(fontMetrics, dlus);
 	}
 
 	protected int convertHorizontalDLUsToPixels(int dlus) {
-	    return Dialog.convertHorizontalDLUsToPixels(fontMetrics, dlus);
+		return Dialog.convertHorizontalDLUsToPixels(fontMetrics, dlus);
 	}
 }
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/dialogs/IResourceMappingResourceFilter.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/dialogs/IResourceMappingResourceFilter.java
index 116c0c4d6..32f5c3645 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/dialogs/IResourceMappingResourceFilter.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/dialogs/IResourceMappingResourceFilter.java
@@ -24,13 +24,13 @@ import org.eclipse.core.runtime.CoreException;
  */
 public interface IResourceMappingResourceFilter {
 
-    /**
-     * Return whether the resource should be included in this filter.
-     * @param resource the resource
-     * @param mapping the mapping chiehc containes the resource
-     * @param traversal the traversal from which the resource was obtained
-     * @return whether the resource passes the filter
-     * @throws CoreException
-     */
-    boolean select(IResource resource, ResourceMapping mapping, ResourceTraversal traversal) throws CoreException;
+	/**
+	 * Return whether the resource should be included in this filter.
+	 * @param resource the resource
+	 * @param mapping the mapping chiehc containes the resource
+	 * @param traversal the traversal from which the resource was obtained
+	 * @return whether the resource passes the filter
+	 * @throws CoreException
+	 */
+	boolean select(IResource resource, ResourceMapping mapping, ResourceTraversal traversal) throws CoreException;
 }
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/dialogs/NoChangesDialog.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/dialogs/NoChangesDialog.java
index a06094bcc..38cb7c2cf 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/dialogs/NoChangesDialog.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/dialogs/NoChangesDialog.java
@@ -27,10 +27,10 @@ import org.eclipse.team.core.mapping.ISynchronizationScope;
 
 public class NoChangesDialog extends DetailsDialog {
 
-    private String message;
-    private Label messageLabel;
-    private Label imageLabel;
-    private ResourceMappingHierarchyArea selectedMappingsArea;
+	private String message;
+	private Label messageLabel;
+	private Label imageLabel;
+	private ResourceMappingHierarchyArea selectedMappingsArea;
 	private final ISynchronizationScope scope;
 	private final String description;
 
@@ -56,20 +56,20 @@ public class NoChangesDialog extends DetailsDialog {
 		layout.horizontalSpacing = convertHorizontalDLUsToPixels(IDialogConstants.HORIZONTAL_SPACING);
 		composite.setLayout(layout);
 		composite.setLayoutData(new GridData(GridData.FILL_BOTH));
-        selectedMappingsArea = ResourceMappingHierarchyArea.create(scope, null /* no context */);
-        selectedMappingsArea.setDescription(description);
-        selectedMappingsArea.createArea(composite);
-        return composite;
+		selectedMappingsArea = ResourceMappingHierarchyArea.create(scope, null /* no context */);
+		selectedMappingsArea.setDescription(description);
+		selectedMappingsArea.createArea(composite);
+		return composite;
 	}
 
 	@Override
 	protected void createMainDialogArea(Composite parent) {
-        Composite composite = new Composite(parent, SWT.NONE);
-        GridLayout layout = new GridLayout();
-        layout.marginHeight = 0;
-        layout.marginWidth = 0;
-        layout.numColumns = 2;
-        composite.setLayout(layout);
+		Composite composite = new Composite(parent, SWT.NONE);
+		GridLayout layout = new GridLayout();
+		layout.marginHeight = 0;
+		layout.marginWidth = 0;
+		layout.numColumns = 2;
+		composite.setLayout(layout);
 		createMessageArea(composite);
 	}
 
@@ -82,60 +82,60 @@ public class NoChangesDialog extends DetailsDialog {
 	 * Code copied from IconandMessageDialog
 	 */
 	private Control createMessageArea(Composite composite) {
-        // create composite
-        // create image
-        Image image = getSWTImage(SWT.ICON_INFORMATION);
-        if (image != null) {
-            imageLabel = new Label(composite, SWT.NULL);
-            image.setBackground(imageLabel.getBackground());
-            imageLabel.setImage(image);
-            imageLabel.setLayoutData(new GridData(
-                    GridData.HORIZONTAL_ALIGN_CENTER
-                            | GridData.VERTICAL_ALIGN_BEGINNING));
-        }
-        // create message
-        if (message != null) {
-            messageLabel = new Label(composite, SWT.WRAP);
-            messageLabel.setText(message);
-            GridData data = new GridData(GridData.GRAB_HORIZONTAL
-                    | GridData.HORIZONTAL_ALIGN_FILL
-                    | GridData.VERTICAL_ALIGN_BEGINNING);
-            data.widthHint = convertHorizontalDLUsToPixels(IDialogConstants.MINIMUM_MESSAGE_AREA_WIDTH);
-            messageLabel.setLayoutData(data);
-        }
-        return composite;
-    }
+		// create composite
+		// create image
+		Image image = getSWTImage(SWT.ICON_INFORMATION);
+		if (image != null) {
+			imageLabel = new Label(composite, SWT.NULL);
+			image.setBackground(imageLabel.getBackground());
+			imageLabel.setImage(image);
+			imageLabel.setLayoutData(new GridData(
+					GridData.HORIZONTAL_ALIGN_CENTER
+							| GridData.VERTICAL_ALIGN_BEGINNING));
+		}
+		// create message
+		if (message != null) {
+			messageLabel = new Label(composite, SWT.WRAP);
+			messageLabel.setText(message);
+			GridData data = new GridData(GridData.GRAB_HORIZONTAL
+					| GridData.HORIZONTAL_ALIGN_FILL
+					| GridData.VERTICAL_ALIGN_BEGINNING);
+			data.widthHint = convertHorizontalDLUsToPixels(IDialogConstants.MINIMUM_MESSAGE_AREA_WIDTH);
+			messageLabel.setLayoutData(data);
+		}
+		return composite;
+	}
 
 	/*
 	 * Code copied from IconandMessageDialog
 	 */
-    private Image getSWTImage(final int imageID) {
-        Shell shell = getShell();
-        final Display display;
-        if (shell == null) {
-            shell = getParentShell();
-        }
-        if (shell == null) {
-            display = Display.getCurrent();
-        } else {
-            display = shell.getDisplay();
-        }
-
-        final Image[] image = new Image[1];
-        display.syncExec(() -> image[0] = display.getSystemImage(imageID));
-
-        return image[0];
-    }
-
-    @Override
+	private Image getSWTImage(final int imageID) {
+		Shell shell = getShell();
+		final Display display;
+		if (shell == null) {
+			shell = getParentShell();
+		}
+		if (shell == null) {
+			display = Display.getCurrent();
+		} else {
+			display = shell.getDisplay();
+		}
+
+		final Image[] image = new Image[1];
+		display.syncExec(() -> image[0] = display.getSystemImage(imageID));
+
+		return image[0];
+	}
+
+	@Override
 	public boolean isHelpAvailable() {
-    	return false;
-    }
+		return false;
+	}
 
-    @Override
+	@Override
 	protected boolean includeCancelButton() {
-    	return false;
-    }
+		return false;
+	}
 
 	public static void open(Shell shell, String title, String message, String description, ISynchronizationScope scope) {
 		new NoChangesDialog(shell, title, message, description, scope).open();
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/dialogs/PreferencePageContainerDialog.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/dialogs/PreferencePageContainerDialog.java
index 3dd65964a..008107569 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/dialogs/PreferencePageContainerDialog.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/dialogs/PreferencePageContainerDialog.java
@@ -88,8 +88,8 @@ public class PreferencePageContainerDialog extends TrayDialog
 	 * @see #setMinimumPageSize(Point)
 	 */
 	private Point fMinimumPageSize = new Point(200,200);
-    private TabFolder tabFolder;
-    private Map<TabItem, PreferencePage> pageMap = new HashMap<>();
+	private TabFolder tabFolder;
+	private Map<TabItem, PreferencePage> pageMap = new HashMap<>();
 
 	/**
 	 * Must declare our own images as the JFaceResource images will not be created unless
@@ -111,9 +111,9 @@ public class PreferencePageContainerDialog extends TrayDialog
 	@Override
 	protected void okPressed() {
 		for (int i = 0; i < pages.length; i++) {
-            PreferencePage page = pages[i];
+			PreferencePage page = pages[i];
 			page.performOk();
-        }
+		}
 
 		handleSave();
 
@@ -139,9 +139,9 @@ public class PreferencePageContainerDialog extends TrayDialog
 		createDescriptionArea(composite);
 
 		if (isSinglePage()) {
-		    createSinglePageArea(composite, pages[0]);
+			createSinglePageArea(composite, pages[0]);
 		} else {
-		    createMultiplePageArea(composite);
+			createMultiplePageArea(composite);
 		}
 
 		// Build the separator line
@@ -158,63 +158,63 @@ public class PreferencePageContainerDialog extends TrayDialog
 		return composite;
 	}
 
-    private void createMultiplePageArea(Composite composite) {
+	private void createMultiplePageArea(Composite composite) {
 		// create a tab folder for the page
 		tabFolder = new TabFolder(composite, SWT.NONE);
 		tabFolder.setLayoutData(new GridData(GridData.FILL_BOTH));
 
 		for (int i = 0; i < pages.length; i++) {
-            PreferencePage page = pages[i];
+			PreferencePage page = pages[i];
 			// text decoration options
 			TabItem tabItem = new TabItem(tabFolder, SWT.NONE);
 			tabItem.setText(page.getTitle());//
 			tabItem.setControl(createPageArea(tabFolder, page));
 			pageMap.put(tabItem, page);
-        }
+		}
 
 		tabFolder.addSelectionListener(new SelectionAdapter() {
-            @Override
+			@Override
 			public void widgetSelected(SelectionEvent e) {
-                updatePageSelection();
-            }
-        });
+				updatePageSelection();
+			}
+		});
 		updatePageSelection();
-    }
-
-    protected void updatePageSelection() {
-        TabItem[] items = tabFolder.getSelection();
-        if (items.length == 1) {
-            currentPage = pageMap.get(items[0]);
-            updateMessage();
-        }
-        firePageChanged(new PageChangedEvent(this, currentPage));
-    }
-
-    private boolean isSinglePage() {
-        return pages.length == 1;
-    }
-
-    /*
-     * Create the page contents for a single preferences page
-     */
-    private void createSinglePageArea(Composite composite, PreferencePage page) {
+	}
+
+	protected void updatePageSelection() {
+		TabItem[] items = tabFolder.getSelection();
+		if (items.length == 1) {
+			currentPage = pageMap.get(items[0]);
+			updateMessage();
+		}
+		firePageChanged(new PageChangedEvent(this, currentPage));
+	}
+
+	private boolean isSinglePage() {
+		return pages.length == 1;
+	}
+
+	/*
+	 * Create the page contents for a single preferences page
+	 */
+	private void createSinglePageArea(Composite composite, PreferencePage page) {
 		createPageArea(composite, page);
 		currentPage = page;
 		updateMessage();
-    }
+	}
 
-    private Control createPageArea(Composite composite, PreferencePage page) {
-        // Build the Page container
+	private Control createPageArea(Composite composite, PreferencePage page) {
+		// Build the Page container
 		fPageContainer = createPageContainer(composite);
 		fPageContainer.setLayoutData(new GridData(GridData.FILL_BOTH));
 
 		page.setContainer(this);
 		page.createControl(fPageContainer);
 		return fPageContainer;
-    }
+	}
 
-    private void createDescriptionArea(Composite composite) {
-        // Build the title area and separator line
+	private void createDescriptionArea(Composite composite) {
+		// Build the title area and separator line
 		Composite titleComposite = new Composite(composite, SWT.NONE);
 		GridLayout layout = new GridLayout();
 		layout.marginHeight = 0;
@@ -229,9 +229,9 @@ public class PreferencePageContainerDialog extends TrayDialog
 		Label titleBarSeparator = new Label(titleComposite, SWT.HORIZONTAL | SWT.SEPARATOR);
 		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 		titleBarSeparator.setLayoutData(gd);
-    }
+	}
 
-    /**
+	/**
 	 * Creates the dialog's title area.
 	 *
 	 * @param parent the SWT parent for the title area composite
@@ -371,7 +371,7 @@ public class PreferencePageContainerDialog extends TrayDialog
 
 	@Override
 	public void updateMessage() {
-	    if (currentPage != null) {
+		if (currentPage != null) {
 			String pageMessage = currentPage.getMessage();
 			String pageErrorMessage = currentPage.getErrorMessage();
 
@@ -383,19 +383,19 @@ public class PreferencePageContainerDialog extends TrayDialog
 
 			// Set the message and error message
 			if (pageMessage == null) {
-			    if (isSinglePage()) {
-			        setMessage(TeamUIMessages.PreferencePageContainerDialog_6);
-			    } else {
-			    	//remove mnemonic see bug 75886
-			    	String title = currentPage.getTitle();
-			    	title = title.replaceAll("&", "");//$NON-NLS-1$ //$NON-NLS-2$
-			    	setMessage(title);
-			    }
+				if (isSinglePage()) {
+					setMessage(TeamUIMessages.PreferencePageContainerDialog_6);
+				} else {
+					//remove mnemonic see bug 75886
+					String title = currentPage.getTitle();
+					title = title.replaceAll("&", "");//$NON-NLS-1$ //$NON-NLS-2$
+					setMessage(title);
+				}
 			} else {
 				setMessage(pageMessage);
 			}
 			setErrorMessage(pageErrorMessage);
-	    }
+		}
 	}
 
 	@Override
@@ -406,14 +406,14 @@ public class PreferencePageContainerDialog extends TrayDialog
 	@Override
 	public void updateButtons() {
 		if (fOkButton != null) {
-		    boolean isValid = true;
-		    for (int i = 0; i < pages.length; i++) {
-	            PreferencePage page = pages[i];
-	            if (!page.isValid()) {
-	                isValid = false;
-	                break;
-	            }
-		    }
+			boolean isValid = true;
+			for (int i = 0; i < pages.length; i++) {
+				PreferencePage page = pages[i];
+				if (!page.isValid()) {
+					isValid = false;
+					break;
+				}
+			}
 			fOkButton.setEnabled(isValid);
 		}
 	}
@@ -442,8 +442,8 @@ public class PreferencePageContainerDialog extends TrayDialog
 	 */
 	protected void handleSave() {
 		// Save now in case tbe workbench does not shutdown cleanly
-	    for (int i = 0; i < pages.length; i++) {
-            PreferencePage page = pages[i];
+		for (int i = 0; i < pages.length; i++) {
+			PreferencePage page = pages[i];
 			IPreferenceStore store = page.getPreferenceStore();
 			if (store != null
 				&& store.needsSaving()
@@ -454,13 +454,13 @@ public class PreferencePageContainerDialog extends TrayDialog
 					Utils.handle(e);
 				}
 			}
-        }
+		}
 	}
 
 
-    @Override
+	@Override
 	public void addPageChangedListener(final IPageChangedListener listener) {
-    	pageChangedListeners.add(listener);
+		pageChangedListeners.add(listener);
 	}
 
 	@Override
@@ -474,17 +474,17 @@ public class PreferencePageContainerDialog extends TrayDialog
 	}
 
 	private void firePageChanged(final PageChangedEvent event) {
-        Object[] listeners = pageChangedListeners.getListeners();
-        for (int i = 0; i < listeners.length; i++) {
-            final IPageChangedListener l = (IPageChangedListener) listeners[i];
-            SafeRunnable.run(new SafeRunnable() {
-                @Override
+		Object[] listeners = pageChangedListeners.getListeners();
+		for (int i = 0; i < listeners.length; i++) {
+			final IPageChangedListener l = (IPageChangedListener) listeners[i];
+			SafeRunnable.run(new SafeRunnable() {
+				@Override
 				public void run() {
-                    l.pageChanged(event);
-                }
-            });
-        }
-    }
+					l.pageChanged(event);
+				}
+			});
+		}
+	}
 
 
 }
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/dialogs/ResourceMappingHierarchyArea.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/dialogs/ResourceMappingHierarchyArea.java
index dc2abf5af..945e99362 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/dialogs/ResourceMappingHierarchyArea.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/dialogs/ResourceMappingHierarchyArea.java
@@ -35,14 +35,14 @@ import org.eclipse.ui.navigator.INavigatorContentServiceListener;
 public class ResourceMappingHierarchyArea extends DialogArea implements INavigatorContentServiceListener {
 	private static final String TEAM_NAVIGATOR_CONTENT = "org.eclipse.team.ui.navigatorViewer"; //$NON-NLS-1$
 	private String description;
-    private CommonViewer viewer;
+	private CommonViewer viewer;
 	private final ISynchronizationScope scope;
 	private final ISynchronizationContext context;
 
 
-    public static ResourceMappingHierarchyArea create(ISynchronizationScope scope, ISynchronizationContext context) {
-        return new ResourceMappingHierarchyArea(scope, context);
-    }
+	public static ResourceMappingHierarchyArea create(ISynchronizationScope scope, ISynchronizationContext context) {
+		return new ResourceMappingHierarchyArea(scope, context);
+	}
 
 	private ResourceMappingHierarchyArea(ISynchronizationScope scope, ISynchronizationContext context) {
 		this.scope = scope;
@@ -51,31 +51,31 @@ public class ResourceMappingHierarchyArea extends DialogArea implements INavigat
 
 	@Override
 	public void createArea(Composite parent) {
-        Composite composite = new Composite(parent, SWT.NULL);
-        GridLayout layout = new GridLayout(1, false);
-        layout.marginHeight = 0;
-        layout.marginWidth = 0;
-        composite.setLayout(layout);
-        composite.setLayoutData(new GridData(GridData.FILL_BOTH));
+		Composite composite = new Composite(parent, SWT.NULL);
+		GridLayout layout = new GridLayout(1, false);
+		layout.marginHeight = 0;
+		layout.marginWidth = 0;
+		composite.setLayout(layout);
+		composite.setLayoutData(new GridData(GridData.FILL_BOTH));
 
-        if (description != null)
-            createWrappingLabel(composite, description, 1);
+		if (description != null)
+			createWrappingLabel(composite, description, 1);
 
-        viewer = new CommonViewer(TEAM_NAVIGATOR_CONTENT, composite, SWT.BORDER);
-        viewer.setSorter(new CommonViewerSorter());
-        viewer.setSorter(new TeamViewerSorter((CommonViewerSorter)viewer.getSorter()));
-        viewer.getNavigatorContentService().bindExtensions(TeamUI.getTeamContentProviderManager().getContentProviderIds(scope), true);
-        viewer.getNavigatorContentService().getActivationService().activateExtensions(TeamUI.getTeamContentProviderManager().getContentProviderIds(scope), true);
-        GridData data = new GridData(GridData.FILL_BOTH);
-        data.heightHint = 100;
-        data.widthHint = 300;
-        viewer.getControl().setLayoutData(data);
-        viewer.getNavigatorContentService().addListener(this);
-        viewer.setInput(getInitialInput());
-        viewer.refresh();
-        Object[] objects = getRootModelObjects();
-        viewer.setSelection(new StructuredSelection(objects), true);
-    }
+		viewer = new CommonViewer(TEAM_NAVIGATOR_CONTENT, composite, SWT.BORDER);
+		viewer.setSorter(new CommonViewerSorter());
+		viewer.setSorter(new TeamViewerSorter((CommonViewerSorter)viewer.getSorter()));
+		viewer.getNavigatorContentService().bindExtensions(TeamUI.getTeamContentProviderManager().getContentProviderIds(scope), true);
+		viewer.getNavigatorContentService().getActivationService().activateExtensions(TeamUI.getTeamContentProviderManager().getContentProviderIds(scope), true);
+		GridData data = new GridData(GridData.FILL_BOTH);
+		data.heightHint = 100;
+		data.widthHint = 300;
+		viewer.getControl().setLayoutData(data);
+		viewer.getNavigatorContentService().addListener(this);
+		viewer.setInput(getInitialInput());
+		viewer.refresh();
+		Object[] objects = getRootModelObjects();
+		viewer.setSelection(new StructuredSelection(objects), true);
+	}
 
 	private Object getInitialInput() {
 		if (context != null)
@@ -96,8 +96,8 @@ public class ResourceMappingHierarchyArea extends DialogArea implements INavigat
 	}
 
 	public void setDescription(String string) {
-        description = string;
-    }
+		description = string;
+	}
 
 	@Override
 	public void onLoad(INavigatorContentExtension anExtension) {
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/dialogs/ResourceMappingResourceDisplayArea.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/dialogs/ResourceMappingResourceDisplayArea.java
index 7ae946eae..c3fdbf671 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/dialogs/ResourceMappingResourceDisplayArea.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/dialogs/ResourceMappingResourceDisplayArea.java
@@ -49,367 +49,367 @@ import org.eclipse.ui.views.navigator.ResourceComparator;
  * Dialog area which displays the resources for a resource mapping
  */
 public class ResourceMappingResourceDisplayArea extends DialogArea {
-    private ResourceMapping mapping;
-    private ResourceMappingContext context = ResourceMappingContext.LOCAL_CONTEXT;
-    private TreeViewer viewer;
-    private Label label;
-    private IResourceMappingResourceFilter filter;
-    private Map<ResourceMapping, Map<IResource, List<IResource>>> cachedFiltering = new HashMap<>();
-    private String message;
-
-    private static IWorkbenchAdapter getWorkbenchAdapter(IAdaptable o) {
-        return o.getAdapter(IWorkbenchAdapter.class);
-    }
-
-    /**
-     * Return the label that should be used for the given mapping
-     * as determined using the IWorkbnchAdaptable for the mapping
-     * or it's model object.
-     * @param mapping the mappings
-     * @return it's label
-     */
-    public static String getLabel(ResourceMapping mapping) {
-    	Object o = mapping;
-        IWorkbenchAdapter workbenchAdapter = getWorkbenchAdapter((IAdaptable)o);
-        if (workbenchAdapter == null) {
-            Object modelObject = mapping.getModelObject();
-            if (modelObject instanceof IAdaptable) {
-                workbenchAdapter = getWorkbenchAdapter((IAdaptable)modelObject);
-                o = modelObject;
-            }
-        }
-        if (workbenchAdapter == null) {
-            return mapping.toString();
-        }
-        return workbenchAdapter.getLabel(o);
-    }
-
-    public class ResourceMappingElement implements IWorkbenchAdapter, IAdaptable {
-        private ResourceMapping mapping;
-        private ResourceMappingContext context;
-
-        public ResourceMappingElement(ResourceMapping mapping, ResourceMappingContext context) {
-            this.mapping = mapping;
-            this.context = context;
-        }
-
-        @Override
+	private ResourceMapping mapping;
+	private ResourceMappingContext context = ResourceMappingContext.LOCAL_CONTEXT;
+	private TreeViewer viewer;
+	private Label label;
+	private IResourceMappingResourceFilter filter;
+	private Map<ResourceMapping, Map<IResource, List<IResource>>> cachedFiltering = new HashMap<>();
+	private String message;
+
+	private static IWorkbenchAdapter getWorkbenchAdapter(IAdaptable o) {
+		return o.getAdapter(IWorkbenchAdapter.class);
+	}
+
+	/**
+	 * Return the label that should be used for the given mapping
+	 * as determined using the IWorkbnchAdaptable for the mapping
+	 * or it's model object.
+	 * @param mapping the mappings
+	 * @return it's label
+	 */
+	public static String getLabel(ResourceMapping mapping) {
+		Object o = mapping;
+		IWorkbenchAdapter workbenchAdapter = getWorkbenchAdapter((IAdaptable)o);
+		if (workbenchAdapter == null) {
+			Object modelObject = mapping.getModelObject();
+			if (modelObject instanceof IAdaptable) {
+				workbenchAdapter = getWorkbenchAdapter((IAdaptable)modelObject);
+				o = modelObject;
+			}
+		}
+		if (workbenchAdapter == null) {
+			return mapping.toString();
+		}
+		return workbenchAdapter.getLabel(o);
+	}
+
+	public class ResourceMappingElement implements IWorkbenchAdapter, IAdaptable {
+		private ResourceMapping mapping;
+		private ResourceMappingContext context;
+
+		public ResourceMappingElement(ResourceMapping mapping, ResourceMappingContext context) {
+			this.mapping = mapping;
+			this.context = context;
+		}
+
+		@Override
 		public Object[] getChildren(Object o) {
-            ResourceTraversal[] traversals = getTraversals();
-            List<ResourceTraversalElement> result = new ArrayList<>();
-            for (int i = 0; i < traversals.length; i++) {
-                ResourceTraversal traversal = traversals[i];
-                IResource[] resources = traversal.getResources();
-                for (int j = 0; j < resources.length; j++) {
-                    IResource resource = resources[j];
-                    if (isIncludedInFilter(resource, traversal))
-                        result.add(new ResourceTraversalElement(this, traversal, resource, context));
-                }
-            }
-            return result.toArray(new Object[result.size()]);
-        }
-
-        private ResourceTraversal[] getTraversals() {
-            return ResourceMappingResourceDisplayArea.getTraversals(mapping, context);
-        }
-
-        @Override
+			ResourceTraversal[] traversals = getTraversals();
+			List<ResourceTraversalElement> result = new ArrayList<>();
+			for (int i = 0; i < traversals.length; i++) {
+				ResourceTraversal traversal = traversals[i];
+				IResource[] resources = traversal.getResources();
+				for (int j = 0; j < resources.length; j++) {
+					IResource resource = resources[j];
+					if (isIncludedInFilter(resource, traversal))
+						result.add(new ResourceTraversalElement(this, traversal, resource, context));
+				}
+			}
+			return result.toArray(new Object[result.size()]);
+		}
+
+		private ResourceTraversal[] getTraversals() {
+			return ResourceMappingResourceDisplayArea.getTraversals(mapping, context);
+		}
+
+		@Override
 		public ImageDescriptor getImageDescriptor(Object o) {
-            o = mapping;
-            IWorkbenchAdapter workbenchAdapter = getWorkbenchAdapter((IAdaptable)o);
-            if (workbenchAdapter == null) {
-                Object modelObject = mapping.getModelObject();
-                if (modelObject instanceof IAdaptable) {
-                    workbenchAdapter = getWorkbenchAdapter((IAdaptable)modelObject);
-                    o = modelObject;
-                }
-            }
-            if (workbenchAdapter == null) {
-                return null;
-            }
-            return workbenchAdapter.getImageDescriptor(o);
-        }
-
-        @Override
+			o = mapping;
+			IWorkbenchAdapter workbenchAdapter = getWorkbenchAdapter((IAdaptable)o);
+			if (workbenchAdapter == null) {
+				Object modelObject = mapping.getModelObject();
+				if (modelObject instanceof IAdaptable) {
+					workbenchAdapter = getWorkbenchAdapter((IAdaptable)modelObject);
+					o = modelObject;
+				}
+			}
+			if (workbenchAdapter == null) {
+				return null;
+			}
+			return workbenchAdapter.getImageDescriptor(o);
+		}
+
+		@Override
 		public String getLabel(Object o) {
-            return ResourceMappingResourceDisplayArea.getLabel(mapping);
-        }
+			return ResourceMappingResourceDisplayArea.getLabel(mapping);
+		}
 
-        @Override
+		@Override
 		public Object getParent(Object o) {
-            return null;
-        }
+			return null;
+		}
 
 		@Override
-        @SuppressWarnings("unchecked")
+		@SuppressWarnings("unchecked")
 		public <T> T getAdapter(Class<T> adapter) {
-            if (adapter == IWorkbenchAdapter.class)
-                return (T) this;
-            return null;
-        }
-    }
-
-    /**
-     * The model element for resources that are obtained from a traversal.
-     */
-    public class ResourceTraversalElement implements IWorkbenchAdapter, IAdaptable {
-        private ResourceTraversal traversal;
-        private ResourceMappingContext context;
-        private IResource resource;
-        private Object parent;
-
-        public ResourceTraversalElement(Object parent, ResourceTraversal traversal, IResource resource, ResourceMappingContext context) {
-            this.parent = parent;
-            this.traversal = traversal;
-            this.resource = resource;
-            this.context = context;
-        }
-
-        @Override
+			if (adapter == IWorkbenchAdapter.class)
+				return (T) this;
+			return null;
+		}
+	}
+
+	/**
+	 * The model element for resources that are obtained from a traversal.
+	 */
+	public class ResourceTraversalElement implements IWorkbenchAdapter, IAdaptable {
+		private ResourceTraversal traversal;
+		private ResourceMappingContext context;
+		private IResource resource;
+		private Object parent;
+
+		public ResourceTraversalElement(Object parent, ResourceTraversal traversal, IResource resource, ResourceMappingContext context) {
+			this.parent = parent;
+			this.traversal = traversal;
+			this.resource = resource;
+			this.context = context;
+		}
+
+		@Override
 		public Object[] getChildren(Object o) {
-            if (traversal.getDepth() == IResource.DEPTH_INFINITE) {
-                return getChildren(true);
-            } else if (traversal.getDepth() == IResource.DEPTH_ONE && isTraversalRoot(resource)) {
-                return getChildren(false);
-            }
-            return new Object[0];
-        }
-
-        private Object[] getChildren(boolean includeFolders) {
-            try {
-                if (resource.getType() != IResource.FILE) {
-                    IResource[] members = members(((IContainer)resource));
-                    List<ResourceTraversalElement> result = new ArrayList<ResourceTraversalElement>();
-                    for (int i = 0; i < members.length; i++) {
-                        IResource child = members[i];
-                        if ((includeFolders || child.getType() == IResource.FILE)
-                                && isIncludedInFilter(child, traversal))
-                            result.add(new ResourceTraversalElement(this, traversal, child, context));
-                    }
-                    return result.toArray(new Object[result.size()]);
-                }
-            } catch (CoreException e) {
-                TeamUIPlugin.log(IStatus.ERROR, "An error occurred fetching the members of " + resource.getFullPath(), e); //$NON-NLS-1$
-            }
-            return new Object[0];
-        }
-
-        private IResource[] members(IContainer container) throws CoreException {
-            if (context instanceof RemoteResourceMappingContext) {
-                RemoteResourceMappingContext remoteContext = (RemoteResourceMappingContext) context;
-                return ResourceMappingResourceDisplayArea.members(container, remoteContext);
-            }
-            return container.members();
-        }
-
-        @Override
+			if (traversal.getDepth() == IResource.DEPTH_INFINITE) {
+				return getChildren(true);
+			} else if (traversal.getDepth() == IResource.DEPTH_ONE && isTraversalRoot(resource)) {
+				return getChildren(false);
+			}
+			return new Object[0];
+		}
+
+		private Object[] getChildren(boolean includeFolders) {
+			try {
+				if (resource.getType() != IResource.FILE) {
+					IResource[] members = members(((IContainer)resource));
+					List<ResourceTraversalElement> result = new ArrayList<ResourceTraversalElement>();
+					for (int i = 0; i < members.length; i++) {
+						IResource child = members[i];
+						if ((includeFolders || child.getType() == IResource.FILE)
+								&& isIncludedInFilter(child, traversal))
+							result.add(new ResourceTraversalElement(this, traversal, child, context));
+					}
+					return result.toArray(new Object[result.size()]);
+				}
+			} catch (CoreException e) {
+				TeamUIPlugin.log(IStatus.ERROR, "An error occurred fetching the members of " + resource.getFullPath(), e); //$NON-NLS-1$
+			}
+			return new Object[0];
+		}
+
+		private IResource[] members(IContainer container) throws CoreException {
+			if (context instanceof RemoteResourceMappingContext) {
+				RemoteResourceMappingContext remoteContext = (RemoteResourceMappingContext) context;
+				return ResourceMappingResourceDisplayArea.members(container, remoteContext);
+			}
+			return container.members();
+		}
+
+		@Override
 		public ImageDescriptor getImageDescriptor(Object object) {
-            IWorkbenchAdapter workbenchAdapter = getWorkbenchAdapter(resource);
-            if (workbenchAdapter == null)
-                return null;
-            return workbenchAdapter.getImageDescriptor(resource);
-        }
+			IWorkbenchAdapter workbenchAdapter = getWorkbenchAdapter(resource);
+			if (workbenchAdapter == null)
+				return null;
+			return workbenchAdapter.getImageDescriptor(resource);
+		}
 
-        @Override
+		@Override
 		public String getLabel(Object o) {
-            if (resource.getType() != IResource.PROJECT && isTraversalRoot(resource))
-                return resource.getFullPath().toString();
-            IWorkbenchAdapter workbenchAdapter = getWorkbenchAdapter(resource);
-            if (workbenchAdapter == null)
-                return resource.getName();
-            return workbenchAdapter.getLabel(resource);
-        }
-
-        private boolean isTraversalRoot(IResource resource) {
-            return ResourceMappingResourceDisplayArea.isTraversalRoot(traversal, resource);
-        }
-
-        @Override
+			if (resource.getType() != IResource.PROJECT && isTraversalRoot(resource))
+				return resource.getFullPath().toString();
+			IWorkbenchAdapter workbenchAdapter = getWorkbenchAdapter(resource);
+			if (workbenchAdapter == null)
+				return resource.getName();
+			return workbenchAdapter.getLabel(resource);
+		}
+
+		private boolean isTraversalRoot(IResource resource) {
+			return ResourceMappingResourceDisplayArea.isTraversalRoot(traversal, resource);
+		}
+
+		@Override
 		public Object getParent(Object o) {
-            return parent;
-        }
+			return parent;
+		}
 
 		@Override
-        @SuppressWarnings("unchecked")
+		@SuppressWarnings("unchecked")
 		public <T> T getAdapter(Class<T> adapter) {
-            if (adapter == IWorkbenchAdapter.class)
-                return (T) this;
-            return null;
-        }
-
-        public IResource getResource() {
-            return resource;
-        }
-    }
-
-    /**
-     * Create a dialog area that will display the resources contained in the
-     * given mapping.
-     *
-     * @param mapping the mapping
-     * @param filter the filter
-     * @param string the message to display
-     */
-    public ResourceMappingResourceDisplayArea(ResourceMapping mapping, String string, IResourceMappingResourceFilter filter) {
-        this.mapping = mapping;
-        this.filter = filter;
-        this.message = string;
-    }
-
-    @Override
+			if (adapter == IWorkbenchAdapter.class)
+				return (T) this;
+			return null;
+		}
+
+		public IResource getResource() {
+			return resource;
+		}
+	}
+
+	/**
+	 * Create a dialog area that will display the resources contained in the
+	 * given mapping.
+	 *
+	 * @param mapping the mapping
+	 * @param filter the filter
+	 * @param string the message to display
+	 */
+	public ResourceMappingResourceDisplayArea(ResourceMapping mapping, String string, IResourceMappingResourceFilter filter) {
+		this.mapping = mapping;
+		this.filter = filter;
+		this.message = string;
+	}
+
+	@Override
 	public void createArea(Composite parent) {
-        Composite composite = createComposite(parent, 1, true);
-
-        label = createWrappingLabel(composite, message, 1);
-        viewer = new TreeViewer(composite);
-        GridData gridData = new GridData(GridData.FILL_BOTH);
-        gridData.heightHint = 100;
-        viewer.getControl().setLayoutData(gridData);
-        viewer.setContentProvider(new WorkbenchContentProvider());
-        viewer.setLabelProvider(new WorkbenchLabelProvider());
-        viewer.setComparator(new ResourceComparator(ResourceComparator.NAME) {
-            @Override
+		Composite composite = createComposite(parent, 1, true);
+
+		label = createWrappingLabel(composite, message, 1);
+		viewer = new TreeViewer(composite);
+		GridData gridData = new GridData(GridData.FILL_BOTH);
+		gridData.heightHint = 100;
+		viewer.getControl().setLayoutData(gridData);
+		viewer.setContentProvider(new WorkbenchContentProvider());
+		viewer.setLabelProvider(new WorkbenchLabelProvider());
+		viewer.setComparator(new ResourceComparator(ResourceComparator.NAME) {
+			@Override
 			public int compare(Viewer viewer, Object o1, Object o2) {
-                if (o1 instanceof ResourceTraversalElement && o2 instanceof ResourceTraversalElement) {
-                    ResourceTraversalElement e1 = (ResourceTraversalElement) o1;
-                    ResourceTraversalElement e2 = (ResourceTraversalElement) o2;
-                    return super.compare(viewer, e1.getResource(), e2.getResource());
-                }
-                return super.compare(viewer, o1, o2);
-            }
-        });
-        setInput(message);
-        Dialog.applyDialogFont(parent);
-    }
-
-    private void setInput(String labelText) {
-        if (viewer != null) {
-            Object o = null;
-            if (mapping != null)
-                o = new ResourceMappingElement(mapping, context);
-            viewer.setInput(o);
-        }
-        if (label != null) {
-            this.message = labelText;
-            label.setText(labelText);
-        }
-    }
-
-    public void setMapping(ResourceMapping mapping, String labelText) {
-        this.mapping = mapping;
-        setInput(labelText);
-    }
-
-    private boolean isIncludedInFilter(IResource resource, ResourceTraversal traversal) {
-        if (filter == null)
-            return true;
-        Map<IResource, List<IResource>> mappingResources = cachedFiltering.get(mapping);
-        if (mappingResources == null) {
-            mappingResources = buildFilteredResourceMap(mapping, context);
-            cachedFiltering.put(mapping, mappingResources);
-        }
-        return mappingResources.containsKey(resource);
-    }
-
-    private Map<IResource, List<IResource>> buildFilteredResourceMap(final ResourceMapping mapping, final ResourceMappingContext context) {
-        final Map<IResource, List<IResource>> result = new HashMap<>();
-        try {
-            PlatformUI.getWorkbench().getProgressService().busyCursorWhile(new IRunnableWithProgress() {
-                @Override
+				if (o1 instanceof ResourceTraversalElement && o2 instanceof ResourceTraversalElement) {
+					ResourceTraversalElement e1 = (ResourceTraversalElement) o1;
+					ResourceTraversalElement e2 = (ResourceTraversalElement) o2;
+					return super.compare(viewer, e1.getResource(), e2.getResource());
+				}
+				return super.compare(viewer, o1, o2);
+			}
+		});
+		setInput(message);
+		Dialog.applyDialogFont(parent);
+	}
+
+	private void setInput(String labelText) {
+		if (viewer != null) {
+			Object o = null;
+			if (mapping != null)
+				o = new ResourceMappingElement(mapping, context);
+			viewer.setInput(o);
+		}
+		if (label != null) {
+			this.message = labelText;
+			label.setText(labelText);
+		}
+	}
+
+	public void setMapping(ResourceMapping mapping, String labelText) {
+		this.mapping = mapping;
+		setInput(labelText);
+	}
+
+	private boolean isIncludedInFilter(IResource resource, ResourceTraversal traversal) {
+		if (filter == null)
+			return true;
+		Map<IResource, List<IResource>> mappingResources = cachedFiltering.get(mapping);
+		if (mappingResources == null) {
+			mappingResources = buildFilteredResourceMap(mapping, context);
+			cachedFiltering.put(mapping, mappingResources);
+		}
+		return mappingResources.containsKey(resource);
+	}
+
+	private Map<IResource, List<IResource>> buildFilteredResourceMap(final ResourceMapping mapping, final ResourceMappingContext context) {
+		final Map<IResource, List<IResource>> result = new HashMap<>();
+		try {
+			PlatformUI.getWorkbench().getProgressService().busyCursorWhile(new IRunnableWithProgress() {
+				@Override
 				public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
-                    try {
-                        monitor.beginTask(null, IProgressMonitor.UNKNOWN);
-                        ResourceTraversal[] traversals = mapping.getTraversals(context, Policy.subMonitorFor(monitor, IProgressMonitor.UNKNOWN));
-                        for (int i = 0; i < traversals.length; i++) {
-                            ResourceTraversal traversal = traversals[i];
-                            buildFilteredResourceMap(mapping, traversal, Policy.subMonitorFor(monitor, IProgressMonitor.UNKNOWN), result);
-                        }
-                    } catch (CoreException e) {
-                        throw new InvocationTargetException(e);
-                    } finally {
-                        monitor.done();
-                    }
-                }
-
-                private void buildFilteredResourceMap(final ResourceMapping mapping,
-                		final ResourceTraversal traversal, IProgressMonitor monitor,
-                		final Map<IResource, List<IResource>> result) throws CoreException {
-                    traversal.accept(resource -> {
-					    if (filter.select(resource, mapping, traversal)) {
-					        // Add the resource to the result
-					        result.put(resource, new ArrayList<>());
-					        // Make sure that there are parent folders for the resource up to the traversal root
-					        IResource child = resource;
-					        while (!isTraversalRoot(traversal, child)) {
-					            IContainer parent = child.getParent();
-					            List<IResource> children = result.get(parent);
-					            if (children == null) {
-					                children = new ArrayList<>();
-					                result.put(parent, children);
-					            }
-					            children.add(child);
-					            child = parent;
-					        }
-					    }
-					    return true;
+					try {
+						monitor.beginTask(null, IProgressMonitor.UNKNOWN);
+						ResourceTraversal[] traversals = mapping.getTraversals(context, Policy.subMonitorFor(monitor, IProgressMonitor.UNKNOWN));
+						for (int i = 0; i < traversals.length; i++) {
+							ResourceTraversal traversal = traversals[i];
+							buildFilteredResourceMap(mapping, traversal, Policy.subMonitorFor(monitor, IProgressMonitor.UNKNOWN), result);
+						}
+					} catch (CoreException e) {
+						throw new InvocationTargetException(e);
+					} finally {
+						monitor.done();
+					}
+				}
+
+				private void buildFilteredResourceMap(final ResourceMapping mapping,
+						final ResourceTraversal traversal, IProgressMonitor monitor,
+						final Map<IResource, List<IResource>> result) throws CoreException {
+					traversal.accept(resource -> {
+						if (filter.select(resource, mapping, traversal)) {
+							// Add the resource to the result
+							result.put(resource, new ArrayList<>());
+							// Make sure that there are parent folders for the resource up to the traversal root
+							IResource child = resource;
+							while (!isTraversalRoot(traversal, child)) {
+								IContainer parent = child.getParent();
+								List<IResource> children = result.get(parent);
+								if (children == null) {
+									children = new ArrayList<>();
+									result.put(parent, children);
+								}
+								children.add(child);
+								child = parent;
+							}
+						}
+						return true;
 					});
 
-                }
-            });
-        } catch (InvocationTargetException e) {
-            TeamUIPlugin.log(IStatus.ERROR, "An error occurred while filtering " + getLabel(mapping), e); //$NON-NLS-1$
-        } catch (InterruptedException e) {
-            // Ignore
-        }
-        return result;
-    }
-
-    /* private */ static ResourceTraversal[] getTraversals(final ResourceMapping mapping, final ResourceMappingContext context) {
-        final List<ResourceTraversal[]> traversals = new ArrayList<>();
-        try {
-            PlatformUI.getWorkbench().getProgressService().busyCursorWhile(monitor -> {
-			    try {
-			        traversals.add(mapping.getTraversals(context, monitor));
-			    } catch (CoreException e) {
-			        throw new InvocationTargetException(e);
-			    }
+				}
+			});
+		} catch (InvocationTargetException e) {
+			TeamUIPlugin.log(IStatus.ERROR, "An error occurred while filtering " + getLabel(mapping), e); //$NON-NLS-1$
+		} catch (InterruptedException e) {
+			// Ignore
+		}
+		return result;
+	}
+
+	/* private */ static ResourceTraversal[] getTraversals(final ResourceMapping mapping, final ResourceMappingContext context) {
+		final List<ResourceTraversal[]> traversals = new ArrayList<>();
+		try {
+			PlatformUI.getWorkbench().getProgressService().busyCursorWhile(monitor -> {
+				try {
+					traversals.add(mapping.getTraversals(context, monitor));
+				} catch (CoreException e) {
+					throw new InvocationTargetException(e);
+				}
 			});
-            return traversals.get(0);
-        } catch (InvocationTargetException e) {
-            TeamUIPlugin.log(IStatus.ERROR, "An error occurred while traversing " + getLabel(mapping), e); //$NON-NLS-1$
-        } catch (InterruptedException e) {
-            // Ignore
-        }
-        return new ResourceTraversal[0];
-    }
-
-    /* private */ static IResource[] members(final IContainer container, final RemoteResourceMappingContext context) {
-        final List<IResource[]> members = new ArrayList<>();
-        try {
-            PlatformUI.getWorkbench().getProgressService().busyCursorWhile(monitor -> {
-			    try {
-			        members.add(context.fetchMembers(container, monitor));
-			    } catch (CoreException e) {
-			        throw new InvocationTargetException(e);
-			    }
+			return traversals.get(0);
+		} catch (InvocationTargetException e) {
+			TeamUIPlugin.log(IStatus.ERROR, "An error occurred while traversing " + getLabel(mapping), e); //$NON-NLS-1$
+		} catch (InterruptedException e) {
+			// Ignore
+		}
+		return new ResourceTraversal[0];
+	}
+
+	/* private */ static IResource[] members(final IContainer container, final RemoteResourceMappingContext context) {
+		final List<IResource[]> members = new ArrayList<>();
+		try {
+			PlatformUI.getWorkbench().getProgressService().busyCursorWhile(monitor -> {
+				try {
+					members.add(context.fetchMembers(container, monitor));
+				} catch (CoreException e) {
+					throw new InvocationTargetException(e);
+				}
 			});
-            return members.get(0);
-        } catch (InvocationTargetException e) {
-            TeamUIPlugin.log(IStatus.ERROR, "An error occurred while fetching the members of" + container.getFullPath(), e); //$NON-NLS-1$
-        } catch (InterruptedException e) {
-            // Ignore
-        }
-        return new IResource[0];
-    }
-
-    /* private */ static boolean isTraversalRoot(ResourceTraversal traversal, IResource resource) {
-        IResource[] resources = traversal.getResources();
-        for (int i = 0; i < resources.length; i++) {
-            IResource root = resources[i];
-            if (root.equals(resource)) {
-                return true;
-            }
-        }
-        return false;
-    }
+			return members.get(0);
+		} catch (InvocationTargetException e) {
+			TeamUIPlugin.log(IStatus.ERROR, "An error occurred while fetching the members of" + container.getFullPath(), e); //$NON-NLS-1$
+		} catch (InterruptedException e) {
+			// Ignore
+		}
+		return new IResource[0];
+	}
+
+	/* private */ static boolean isTraversalRoot(ResourceTraversal traversal, IResource resource) {
+		IResource[] resources = traversal.getResources();
+		for (int i = 0; i < resources.length; i++) {
+			IResource root = resources[i];
+			if (root.equals(resource)) {
+				return true;
+			}
+		}
+		return false;
+	}
 }
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/dialogs/ResourceMappingSelectionArea.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/dialogs/ResourceMappingSelectionArea.java
index 9085ea2c2..7b0f31291 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/dialogs/ResourceMappingSelectionArea.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/dialogs/ResourceMappingSelectionArea.java
@@ -37,64 +37,64 @@ import org.eclipse.ui.model.BaseWorkbenchContentProvider;
 public class ResourceMappingSelectionArea extends DialogArea {
 
 	/**
-     * Property constant used to indicate that the selected mapping has changed.
-     * The object associated with the property is a <code>ResourceMapping</code>.
-     */
-    public static final String SELECTED_MAPPING = "SelectedMapping"; //$NON-NLS-1$
-
-    /**
-     * Property constant used to indicate that the checked mappings have changed.
-     * The object associated with the property is a <code>ResourceMapping[]</code>
-     * (i.e. an array of mappings).
-     */
-    public static final String CHECKED_MAPPINGS = "CheckedMappings"; //$NON-NLS-1$
-
-    private ResourceMapping[] mappings;
-    private TableViewer viewer;
-    private ResourceMapping[] checkedMappings;
-    private ResourceMapping selectedMapping;
-    private String description;
+	 * Property constant used to indicate that the selected mapping has changed.
+	 * The object associated with the property is a <code>ResourceMapping</code>.
+	 */
+	public static final String SELECTED_MAPPING = "SelectedMapping"; //$NON-NLS-1$
+
+	/**
+	 * Property constant used to indicate that the checked mappings have changed.
+	 * The object associated with the property is a <code>ResourceMapping[]</code>
+	 * (i.e. an array of mappings).
+	 */
+	public static final String CHECKED_MAPPINGS = "CheckedMappings"; //$NON-NLS-1$
+
+	private ResourceMapping[] mappings;
+	private TableViewer viewer;
+	private ResourceMapping[] checkedMappings;
+	private ResourceMapping selectedMapping;
+	private String description;
 	private boolean supportsChecking;
 	private boolean supportsSelection;
 
-    public ResourceMappingSelectionArea(ResourceMapping[] mappings, boolean supportSelection, boolean supportChecking) {
-        this.mappings = mappings;
-        this.supportsChecking = supportChecking;
-        this.supportsSelection = supportSelection;
-    }
+	public ResourceMappingSelectionArea(ResourceMapping[] mappings, boolean supportSelection, boolean supportChecking) {
+		this.mappings = mappings;
+		this.supportsChecking = supportChecking;
+		this.supportsSelection = supportSelection;
+	}
 
-    @Override
+	@Override
 	public void createArea(Composite parent) {
-        Composite composite = createComposite(parent, 1, true);
-        GridLayout layout = new GridLayout(1, false);
-        layout.marginHeight = 0;
-        layout.marginWidth = 0;
-        layout.verticalSpacing = 0;
-        layout.horizontalSpacing = 0;
-        composite.setLayout(layout);
-
-        if (description != null)
-            createWrappingLabel(composite, description, 1);
-
-        createViewer(composite);
-        GridData data = new GridData(GridData.FILL_BOTH);
-        data.heightHint = 100;
-        data.widthHint = 300;
-        viewer.getControl().setLayoutData(data);
-        viewer.setContentProvider(new BaseWorkbenchContentProvider());
-        viewer.setLabelProvider(new ResourceMappingLabelProvider());
-        viewer.setInput(new AdaptableList(mappings));
-        if (isSupportsSelection()) {
-	        viewer.addSelectionChangedListener(event -> {
-			    ResourceMapping oldSelection = selectedMapping;
-			    selectedMapping = internalGetSelectedMapping();
-			    if (oldSelection != selectedMapping)
-			        firePropertyChangeChange(SELECTED_MAPPING, oldSelection, selectedMapping);
+		Composite composite = createComposite(parent, 1, true);
+		GridLayout layout = new GridLayout(1, false);
+		layout.marginHeight = 0;
+		layout.marginWidth = 0;
+		layout.verticalSpacing = 0;
+		layout.horizontalSpacing = 0;
+		composite.setLayout(layout);
+
+		if (description != null)
+			createWrappingLabel(composite, description, 1);
+
+		createViewer(composite);
+		GridData data = new GridData(GridData.FILL_BOTH);
+		data.heightHint = 100;
+		data.widthHint = 300;
+		viewer.getControl().setLayoutData(data);
+		viewer.setContentProvider(new BaseWorkbenchContentProvider());
+		viewer.setLabelProvider(new ResourceMappingLabelProvider());
+		viewer.setInput(new AdaptableList(mappings));
+		if (isSupportsSelection()) {
+			viewer.addSelectionChangedListener(event -> {
+				ResourceMapping oldSelection = selectedMapping;
+				selectedMapping = internalGetSelectedMapping();
+				if (oldSelection != selectedMapping)
+					firePropertyChangeChange(SELECTED_MAPPING, oldSelection, selectedMapping);
 			});
-        }
-        if (isSupportsChecking())
-        	initializeCheckboxViewer(composite);
-    }
+		}
+		if (isSupportsChecking())
+			initializeCheckboxViewer(composite);
+	}
 
 	private void initializeCheckboxViewer(Composite composite) {
 		final CheckboxTableViewer checkboxViewer = getCheckboxTableViewer();
@@ -105,29 +105,29 @@ public class ResourceMappingSelectionArea extends DialogArea {
 				firePropertyChangeChange(CHECKED_MAPPINGS, oldMappings, checkedMappings);
 		});
 		checkboxViewer.setCheckedElements(mappings);
-        checkedMappings = mappings;
+		checkedMappings = mappings;
 
-        Composite buttons = createEmbeddedButtonComposite(composite);
+		Composite buttons = createEmbeddedButtonComposite(composite);
 
-        Button selectAll = new Button(buttons, SWT.PUSH);
-        selectAll.setText(TeamUIMessages.ResourceMappingSelectionArea_0);
-        selectAll.setLayoutData(new GridData(GridData.FILL_BOTH));
-        selectAll.addSelectionListener(new SelectionAdapter() {
-            @Override
+		Button selectAll = new Button(buttons, SWT.PUSH);
+		selectAll.setText(TeamUIMessages.ResourceMappingSelectionArea_0);
+		selectAll.setLayoutData(new GridData(GridData.FILL_BOTH));
+		selectAll.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent e) {
-            	checkboxViewer.setAllChecked(true);
-            }
-        });
-
-        Button deselectAll = new Button(buttons, SWT.PUSH);
-        deselectAll.setText(TeamUIMessages.ResourceMappingSelectionArea_1);
-        deselectAll.setLayoutData(new GridData(GridData.FILL_BOTH));
-        deselectAll.addSelectionListener(new SelectionAdapter() {
-            @Override
+				checkboxViewer.setAllChecked(true);
+			}
+		});
+
+		Button deselectAll = new Button(buttons, SWT.PUSH);
+		deselectAll.setText(TeamUIMessages.ResourceMappingSelectionArea_1);
+		deselectAll.setLayoutData(new GridData(GridData.FILL_BOTH));
+		deselectAll.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent e) {
-            	checkboxViewer.setAllChecked(false);
-            }
-        });
+				checkboxViewer.setAllChecked(false);
+			}
+		});
 	}
 
 	private void createViewer(Composite composite) {
@@ -144,54 +144,54 @@ public class ResourceMappingSelectionArea extends DialogArea {
 		return style;
 	}
 
-    /* private */ ResourceMapping[] internalGetCheckedMappings() {
-        Object[] checked = getCheckboxTableViewer().getCheckedElements();
-        ResourceMapping[] mappings = new ResourceMapping[checked.length];
-        for (int i = 0; i < checked.length; i++) {
-            Object object = checked[i];
-            mappings[i] = (ResourceMapping)object;
-        }
-        return mappings;
-    }
-
-    private Composite createEmbeddedButtonComposite(Composite composite) {
-        GridData data;
-        Composite buttons = new Composite(composite, SWT.NONE);
-        GridLayout layout = new GridLayout();
-        layout.numColumns = 2; // this is incremented by createButton
-        layout.makeColumnsEqualWidth = true;
-        layout.marginWidth = 0;
-        buttons.setLayout(layout);
-        data = new GridData(GridData.HORIZONTAL_ALIGN_END
-                | GridData.VERTICAL_ALIGN_CENTER);
-        buttons.setLayoutData(data);
-        return buttons;
-    }
-
-    /* private */ ResourceMapping internalGetSelectedMapping() {
-        ISelection selection = viewer.getSelection();
-        if (selection instanceof IStructuredSelection) {
-            IStructuredSelection ss = (IStructuredSelection) selection;
-            Object firstElement = ss.getFirstElement();
-            if (firstElement instanceof ResourceMapping)
-                return (ResourceMapping)firstElement;
-        }
-        return null;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-    public ResourceMapping[] getCheckedMappings() {
-        return checkedMappings;
-    }
-    public ResourceMapping getSelectedMapping() {
-        return selectedMapping;
-    }
-
-    private CheckboxTableViewer getCheckboxTableViewer() {
-    	return (CheckboxTableViewer)viewer;
-    }
+	/* private */ ResourceMapping[] internalGetCheckedMappings() {
+		Object[] checked = getCheckboxTableViewer().getCheckedElements();
+		ResourceMapping[] mappings = new ResourceMapping[checked.length];
+		for (int i = 0; i < checked.length; i++) {
+			Object object = checked[i];
+			mappings[i] = (ResourceMapping)object;
+		}
+		return mappings;
+	}
+
+	private Composite createEmbeddedButtonComposite(Composite composite) {
+		GridData data;
+		Composite buttons = new Composite(composite, SWT.NONE);
+		GridLayout layout = new GridLayout();
+		layout.numColumns = 2; // this is incremented by createButton
+		layout.makeColumnsEqualWidth = true;
+		layout.marginWidth = 0;
+		buttons.setLayout(layout);
+		data = new GridData(GridData.HORIZONTAL_ALIGN_END
+				| GridData.VERTICAL_ALIGN_CENTER);
+		buttons.setLayoutData(data);
+		return buttons;
+	}
+
+	/* private */ ResourceMapping internalGetSelectedMapping() {
+		ISelection selection = viewer.getSelection();
+		if (selection instanceof IStructuredSelection) {
+			IStructuredSelection ss = (IStructuredSelection) selection;
+			Object firstElement = ss.getFirstElement();
+			if (firstElement instanceof ResourceMapping)
+				return (ResourceMapping)firstElement;
+		}
+		return null;
+	}
+
+	public void setDescription(String description) {
+		this.description = description;
+	}
+	public ResourceMapping[] getCheckedMappings() {
+		return checkedMappings;
+	}
+	public ResourceMapping getSelectedMapping() {
+		return selectedMapping;
+	}
+
+	private CheckboxTableViewer getCheckboxTableViewer() {
+		return (CheckboxTableViewer)viewer;
+	}
 
 	public boolean isSupportsChecking() {
 		return supportsChecking;