Bug 564063 - Using ArrayContentProvider.getInstance() instead of new

instance

ArrayContentProvider does not hold any data, hence it can be shared
across instances.

Change-Id: I6413be601f11228c08f2497d934ee7dc33da330e
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>

24 files changed, 27 insertions, 27 deletions

diff --git a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/ExtendedFileEditorsPreferencePage.java b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/ExtendedFileEditorsPreferencePage.java
index 190580807fb..557e33fe11e 100644
--- a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/ExtendedFileEditorsPreferencePage.java
+++ b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/ExtendedFileEditorsPreferencePage.java
@@ -79,7 +79,7 @@ public class ExtendedFileEditorsPreferencePage extends FileEditorsPreferencePage
 				return NLS.bind(IDEWorkbenchMessages.ExtendedFileEditorsPreferencePage_labelNotResolved, id);
 			}
 		});
-		viewer.setContentProvider(new ArrayContentProvider());
+		viewer.setContentProvider(ArrayContentProvider.getInstance());
 		viewer.setInput(registry.retrieveAllStrategies());
 		this.idePreferenceStore = IDEWorkbenchPlugin.getDefault().getPreferenceStore();
 		viewer.setSelection(
diff --git a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/dialogs/ProjectNaturesPage.java b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/dialogs/ProjectNaturesPage.java
index 213cade3df6..e65b82c00ba 100644
--- a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/dialogs/ProjectNaturesPage.java
+++ b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/dialogs/ProjectNaturesPage.java
@@ -123,7 +123,7 @@ public class ProjectNaturesPage extends PropertyPage {
 		this.activeNaturesList.getControl().setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
 
 		this.activeNaturesList.setLabelProvider(new NatureLabelProvider(this.project.getWorkspace()));
-		this.activeNaturesList.setContentProvider(new ArrayContentProvider());
+		this.activeNaturesList.setContentProvider(ArrayContentProvider.getInstance());
 		try {
 			this.naturesIdsWorkingCopy = new ArrayList<>();
 			this.naturesIdsWorkingCopy.addAll(Arrays.asList(project.getDescription().getNatureIds()));
diff --git a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/filters/UserFiltersTab.java b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/filters/UserFiltersTab.java
index a00684a2153..11552cdf095 100644
--- a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/filters/UserFiltersTab.java
+++ b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/filters/UserFiltersTab.java
@@ -111,7 +111,7 @@ public class UserFiltersTab extends CustomizationTab {
 		TableLayout tableLayout = new TableLayout();
 		tableLayout.addColumnData(new ColumnWeightData(200));
 		filtersViewer.getTable().setLayout(tableLayout);
-		filtersViewer.setContentProvider(new ArrayContentProvider());
+		filtersViewer.setContentProvider(ArrayContentProvider.getInstance());
 		TableViewerColumn column = new TableViewerColumn(filtersViewer, SWT.FULL_SELECTION, 0);
 		column.setLabelProvider(new ColumnLabelProvider() {
 			@Override
diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/about/AboutPluginsPage.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/about/AboutPluginsPage.java
index d27c9bfd23b..efe040d33f6 100644
--- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/about/AboutPluginsPage.java
+++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/about/AboutPluginsPage.java
@@ -382,7 +382,7 @@ public class AboutPluginsPage extends ProductInfoPage {
 			column.addSelectionListener(widgetSelectedAdapter(e -> updateTableSorting(columnIndex)));
 		}
 
-		vendorInfo.setContentProvider(new ArrayContentProvider());
+		vendorInfo.setContentProvider(ArrayContentProvider.getInstance());
 		vendorInfo.setLabelProvider(new BundleTableLabelProvider());
 
 		final BundlePatternFilter searchFilter = new BundlePatternFilter();
diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/SimpleWorkingSetSelectionDialog.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/SimpleWorkingSetSelectionDialog.java
index b3cf4dba394..affda3734ce 100644
--- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/SimpleWorkingSetSelectionDialog.java
+++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/SimpleWorkingSetSelectionDialog.java
@@ -120,7 +120,7 @@ public class SimpleWorkingSetSelectionDialog extends AbstractWorkingSetDialog {
 		viewer = CheckboxTableViewer.newCheckList(viewerComposite, SWT.BORDER);
 		viewer.getControl().setLayoutData(new GridData(GridData.FILL_BOTH));
 		viewer.setLabelProvider(new WorkingSetLabelProvider());
-		viewer.setContentProvider(new ArrayContentProvider());
+		viewer.setContentProvider(ArrayContentProvider.getInstance());
 		viewer.addFilter(new WorkingSetFilter(null));
 		IWorkingSet[] workingSets = PlatformUI.getWorkbench().getWorkingSetManager().getWorkingSets();
 		viewer.setInput(workingSets);
diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/ViewsPreferencePage.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/ViewsPreferencePage.java
index 7c60019e4d6..c9498b970e5 100644
--- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/ViewsPreferencePage.java
+++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/ViewsPreferencePage.java
@@ -128,7 +128,7 @@ public class ViewsPreferencePage extends PreferencePage implements IWorkbenchPre
 
 		themeIdCombo = new ComboViewer(comp, SWT.READ_ONLY);
 		themeIdCombo.setLabelProvider(createTextProvider(element -> ((ITheme) element).getLabel()));
-		themeIdCombo.setContentProvider(new ArrayContentProvider());
+		themeIdCombo.setContentProvider(ArrayContentProvider.getInstance());
 		themeIdCombo.setInput(getCSSThemes(highContrastMode));
 		themeIdCombo.getCombo().setEnabled(!highContrastMode);
 		themeIdCombo.getControl().setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
@@ -371,7 +371,7 @@ public class ViewsPreferencePage extends PreferencePage implements IWorkbenchPre
 			}
 		});
 		colorFontsDecorator = new ControlDecoration(colorsAndFontsThemeCombo.getCombo(), SWT.TOP | SWT.LEFT);
-		colorsAndFontsThemeCombo.setContentProvider(new ArrayContentProvider());
+		colorsAndFontsThemeCombo.setContentProvider(ArrayContentProvider.getInstance());
 		colorsAndFontsThemeCombo.setInput(getColorsAndFontsThemes());
 		colorsAndFontsThemeCombo.getControl().setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 		colorsAndFontsThemeCombo.addSelectionChangedListener(event -> {
diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/WorkingSetTypePage.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/WorkingSetTypePage.java
index 1b0a892e24e..2a5e9829f6f 100644
--- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/WorkingSetTypePage.java
+++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/WorkingSetTypePage.java
@@ -109,7 +109,7 @@ public class WorkingSetTypePage extends WizardPage {
 		typesListViewer.getTable().setFont(font);
 		typesListViewer.addSelectionChangedListener(event -> handleSelectionChanged());
 		typesListViewer.addDoubleClickListener(event -> handleDoubleClick());
-		typesListViewer.setContentProvider(new ArrayContentProvider());
+		typesListViewer.setContentProvider(ArrayContentProvider.getInstance());
 		typesListViewer.setLabelProvider(new LabelProvider() {
 			private ResourceManager images = new LocalResourceManager(JFaceResources.getResources());
 
diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/cpd/CustomizePerspectiveDialog.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/cpd/CustomizePerspectiveDialog.java
index a6be9176aee..79d57aa9173 100644
--- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/cpd/CustomizePerspectiveDialog.java
+++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/cpd/CustomizePerspectiveDialog.java
@@ -773,7 +773,7 @@ public class CustomizePerspectiveDialog extends TrayDialog {
 				SWT.BORDER | SWT.H_SCROLL | SWT.V_SCROLL);
 		actionSetAvailabilityTable = actionSetsViewer;
 		actionSetsViewer.getTable().setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
-		actionSetsViewer.setContentProvider(new ArrayContentProvider());
+		actionSetsViewer.setContentProvider(ArrayContentProvider.getInstance());
 		actionSetsViewer.setComparator(new WorkbenchViewerComparator());
 		actionSetsViewer.setCheckStateProvider(new ICheckStateProvider() {
 			@Override
@@ -1165,7 +1165,7 @@ public class CustomizePerspectiveDialog extends TrayDialog {
 		actionSetViewer.getTable().setLayoutData(new GridData(GridData.FILL_BOTH));
 		actionSetViewer.setLabelProvider(new GrayOutUnavailableLabelProvider(null));
 		actionSetViewer.setComparator(new WorkbenchViewerComparator());
-		actionSetViewer.setContentProvider(new ArrayContentProvider());
+		actionSetViewer.setContentProvider(ArrayContentProvider.getInstance());
 
 		// Tooltip on tree items
 		Table table = actionSetViewer.getTable();
diff --git a/examples/org.eclipse.jface.examples.databinding/src/org/eclipse/jface/examples/databinding/snippets/Snippet001NestedSelectionWithCombo.java b/examples/org.eclipse.jface.examples.databinding/src/org/eclipse/jface/examples/databinding/snippets/Snippet001NestedSelectionWithCombo.java
index 2fcd1bfdb8e..114e337a68f 100644
--- a/examples/org.eclipse.jface.examples.databinding/src/org/eclipse/jface/examples/databinding/snippets/Snippet001NestedSelectionWithCombo.java
+++ b/examples/org.eclipse.jface.examples.databinding/src/org/eclipse/jface/examples/databinding/snippets/Snippet001NestedSelectionWithCombo.java
@@ -166,7 +166,7 @@ public class Snippet001NestedSelectionWithCombo {
 			IObservableMap<Person, String> attributeMap = BeanProperties.value(Person.class, "name", String.class)
 					.observeDetail(Observables.staticObservableSet(new HashSet<>(people)));
 			peopleListViewer.setLabelProvider(new ObservableMapLabelProvider(attributeMap));
-			peopleListViewer.setContentProvider(new ArrayContentProvider());
+			peopleListViewer.setContentProvider(ArrayContentProvider.getInstance());
 			peopleListViewer.setInput(people);
 
 			DataBindingContext bindingContext = new DataBindingContext();
@@ -176,7 +176,7 @@ public class Snippet001NestedSelectionWithCombo {
 					BeanProperties.value(Person.class, "name", String.class).observeDetail(selectedPerson));
 
 			ComboViewer cityViewer = new ComboViewer(city);
-			cityViewer.setContentProvider(new ArrayContentProvider());
+			cityViewer.setContentProvider(ArrayContentProvider.getInstance());
 			cityViewer.setInput(cities);
 
 			IObservableValue<String> citySelection = ViewerProperties.singleSelection(String.class).observe(cityViewer);
diff --git a/examples/org.eclipse.jface.examples.databinding/src/org/eclipse/jface/examples/databinding/snippets/Snippet024SelectObservableValue.java b/examples/org.eclipse.jface.examples.databinding/src/org/eclipse/jface/examples/databinding/snippets/Snippet024SelectObservableValue.java
index c3a8d7274c4..3b7c0794e07 100644
--- a/examples/org.eclipse.jface.examples.databinding/src/org/eclipse/jface/examples/databinding/snippets/Snippet024SelectObservableValue.java
+++ b/examples/org.eclipse.jface.examples.databinding/src/org/eclipse/jface/examples/databinding/snippets/Snippet024SelectObservableValue.java
@@ -60,7 +60,7 @@ public class Snippet024SelectObservableValue {
 		shell.setText("Snippet024SelectObservableValue");
 
 		final ListViewer listViewer = new ListViewer(shell, SWT.BORDER);
-		listViewer.setContentProvider(new ArrayContentProvider());
+		listViewer.setContentProvider(ArrayContentProvider.getInstance());
 		listViewer.getList().setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
 
 		final Group group = new Group(shell, SWT.NONE);
diff --git a/examples/org.eclipse.jface.examples.databinding/src/org/eclipse/jface/examples/databinding/snippets/Snippet026AnonymousBeanProperties.java b/examples/org.eclipse.jface.examples.databinding/src/org/eclipse/jface/examples/databinding/snippets/Snippet026AnonymousBeanProperties.java
index cfffbc57dbf..b6dc0c01377 100644
--- a/examples/org.eclipse.jface.examples.databinding/src/org/eclipse/jface/examples/databinding/snippets/Snippet026AnonymousBeanProperties.java
+++ b/examples/org.eclipse.jface.examples.databinding/src/org/eclipse/jface/examples/databinding/snippets/Snippet026AnonymousBeanProperties.java
@@ -359,7 +359,7 @@ public class Snippet026AnonymousBeanProperties {
 		bindingContext.bindValue(WidgetProperties.text(SWT.Modify).observe(nameText),
 				BeanProperties.value("name").observeDetail(selection));
 
-		statusViewer.setContentProvider(new ArrayContentProvider());
+		statusViewer.setContentProvider(ArrayContentProvider.getInstance());
 		statusViewer.setInput(STATUSES);
 
 		bindingContext.bindValue(ViewerProperties.singleSelection().observe(statusViewer),
diff --git a/examples/org.eclipse.jface.examples.databinding/src/org/eclipse/jface/examples/databinding/snippets/Snippet035PostSelectionProvider.java b/examples/org.eclipse.jface.examples.databinding/src/org/eclipse/jface/examples/databinding/snippets/Snippet035PostSelectionProvider.java
index c870b019301..69eda614874 100644
--- a/examples/org.eclipse.jface.examples.databinding/src/org/eclipse/jface/examples/databinding/snippets/Snippet035PostSelectionProvider.java
+++ b/examples/org.eclipse.jface.examples.databinding/src/org/eclipse/jface/examples/databinding/snippets/Snippet035PostSelectionProvider.java
@@ -85,7 +85,7 @@ public class Snippet035PostSelectionProvider {
 		listViewer = new ListViewer(section, SWT.SINGLE | SWT.BORDER);
 		GridDataFactory.fillDefaults().grab(true, true).hint(250, 250).applyTo(listViewer.getList());
 
-		listViewer.setContentProvider(new ArrayContentProvider());
+		listViewer.setContentProvider(ArrayContentProvider.getInstance());
 		listViewer.setLabelProvider(new LabelProvider());
 
 		String[] names = new String[] { "John Doe", "Steve Northover", "Grant Gayed", "Veronika Irvine", "Mike Wilson",
diff --git a/examples/org.eclipse.jface.snippets/Eclipse JFace Snippets/org/eclipse/jface/snippets/viewers/Snippet031TableViewerCustomTooltipsMultiSelection.java b/examples/org.eclipse.jface.snippets/Eclipse JFace Snippets/org/eclipse/jface/snippets/viewers/Snippet031TableViewerCustomTooltipsMultiSelection.java
index c5f0c1b9d50..2e174b325dd 100644
--- a/examples/org.eclipse.jface.snippets/Eclipse JFace Snippets/org/eclipse/jface/snippets/viewers/Snippet031TableViewerCustomTooltipsMultiSelection.java
+++ b/examples/org.eclipse.jface.snippets/Eclipse JFace Snippets/org/eclipse/jface/snippets/viewers/Snippet031TableViewerCustomTooltipsMultiSelection.java
@@ -123,7 +123,7 @@ public class Snippet031TableViewerCustomTooltipsMultiSelection {
 
 		v.setColumnProperties(new String[] { column1, column2 });
 		v.setLabelProvider(new MyLableProvider());
-		v.setContentProvider(new ArrayContentProvider());
+		v.setContentProvider(ArrayContentProvider.getInstance());
 		v.setInput(createModel());
 
 		/**
diff --git a/examples/org.eclipse.jface.snippets/Eclipse JFace Snippets/org/eclipse/jface/snippets/viewers/Snippet060TextCellEditorWithContentProposal.java b/examples/org.eclipse.jface.snippets/Eclipse JFace Snippets/org/eclipse/jface/snippets/viewers/Snippet060TextCellEditorWithContentProposal.java
index 1d6bc9878fa..11a4875bf3b 100644
--- a/examples/org.eclipse.jface.snippets/Eclipse JFace Snippets/org/eclipse/jface/snippets/viewers/Snippet060TextCellEditorWithContentProposal.java
+++ b/examples/org.eclipse.jface.snippets/Eclipse JFace Snippets/org/eclipse/jface/snippets/viewers/Snippet060TextCellEditorWithContentProposal.java
@@ -180,7 +180,7 @@ public class Snippet060TextCellEditorWithContentProposal {
 		colorColumn.setLabelProvider(new ColumnLabelProvider());
 		colorColumn.setEditingSupport(new ColorNameEditingSupport(viewer));
 
-		viewer.setContentProvider(new ArrayContentProvider());
+		viewer.setContentProvider(ArrayContentProvider.getInstance());
 
 		ColumnViewerEditorActivationStrategy activationSupport = new ColumnViewerEditorActivationStrategy(viewer) {
 			@Override
diff --git a/examples/org.eclipse.jface.snippets/Eclipse JFace Snippets/org/eclipse/jface/snippets/wizard/Snippet047WizardWithLongRunningOperation.java b/examples/org.eclipse.jface.snippets/Eclipse JFace Snippets/org/eclipse/jface/snippets/wizard/Snippet047WizardWithLongRunningOperation.java
index 30514a923e0..146d2c87b36 100644
--- a/examples/org.eclipse.jface.snippets/Eclipse JFace Snippets/org/eclipse/jface/snippets/wizard/Snippet047WizardWithLongRunningOperation.java
+++ b/examples/org.eclipse.jface.snippets/Eclipse JFace Snippets/org/eclipse/jface/snippets/wizard/Snippet047WizardWithLongRunningOperation.java
@@ -108,7 +108,7 @@ public class Snippet047WizardWithLongRunningOperation {
 			comp.setLayout(new GridLayout(1, false));
 
 			v = new TableViewer(comp, SWT.FULL_SELECTION);
-			v.setContentProvider(new ArrayContentProvider());
+			v.setContentProvider(ArrayContentProvider.getInstance());
 			v.getTable().setLayoutData(new GridData(GridData.FILL_BOTH));
 			v.addSelectionChangedListener(event -> getWizard().getContainer().updateButtons());
 
diff --git a/examples/org.eclipse.ui.examples.views.properties.tabbed.article/src/org/eclipse/ui/examples/views/properties/tabbed/article/views/SampleView.java b/examples/org.eclipse.ui.examples.views.properties.tabbed.article/src/org/eclipse/ui/examples/views/properties/tabbed/article/views/SampleView.java
index 6258fc39d01..cb6112d3db0 100644
--- a/examples/org.eclipse.ui.examples.views.properties.tabbed.article/src/org/eclipse/ui/examples/views/properties/tabbed/article/views/SampleView.java
+++ b/examples/org.eclipse.ui.examples.views.properties.tabbed.article/src/org/eclipse/ui/examples/views/properties/tabbed/article/views/SampleView.java
@@ -72,7 +72,7 @@ public class SampleView
 		ButtonElement btnEl = new ButtonElement(btn, "Button");//$NON-NLS-1$
 		ctlList.add(btnEl);
 
-		viewer.setContentProvider(new ArrayContentProvider());
+		viewer.setContentProvider(ArrayContentProvider.getInstance());
 		viewer.setLabelProvider(new WorkbenchLabelProvider());
 		viewer.setInput(ctlList);
 		getSite().setSelectionProvider(viewer);
diff --git a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/internal/databinding/viewers/SelectionProviderMultiSelectionObservableListTest.java b/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/internal/databinding/viewers/SelectionProviderMultiSelectionObservableListTest.java
index 61b6eb21c40..f4f6597f0fb 100644
--- a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/internal/databinding/viewers/SelectionProviderMultiSelectionObservableListTest.java
+++ b/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/internal/databinding/viewers/SelectionProviderMultiSelectionObservableListTest.java
@@ -56,7 +56,7 @@ public class SelectionProviderMultiSelectionObservableListTest {
 	public void setUp() throws Exception {
 		Shell shell = new Shell();
 		viewer = new TableViewer(shell, SWT.MULTI);
-		viewer.setContentProvider(new ArrayContentProvider());
+		viewer.setContentProvider(ArrayContentProvider.getInstance());
 		viewer.setInput(model);
 		selectionProvider = viewer;
 	}
diff --git a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/internal/databinding/viewers/SelectionProviderSingleSelectionObservableValueTest.java b/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/internal/databinding/viewers/SelectionProviderSingleSelectionObservableValueTest.java
index 64ee6861944..280467f0f6b 100644
--- a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/internal/databinding/viewers/SelectionProviderSingleSelectionObservableValueTest.java
+++ b/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/internal/databinding/viewers/SelectionProviderSingleSelectionObservableValueTest.java
@@ -53,7 +53,7 @@ public class SelectionProviderSingleSelectionObservableValueTest extends
 	public void setUp() throws Exception {
 		Shell shell = new Shell();
 		viewer = new TableViewer(shell, SWT.NONE);
-		viewer.setContentProvider(new ArrayContentProvider());
+		viewer.setContentProvider(ArrayContentProvider.getInstance());
 		viewer.setInput(model);
 		selectionProvider = viewer;
 	}
diff --git a/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/Bug180504TableViewerTest.java b/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/Bug180504TableViewerTest.java
index 9f3c77d4c83..be2e672fd6c 100644
--- a/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/Bug180504TableViewerTest.java
+++ b/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/Bug180504TableViewerTest.java
@@ -42,7 +42,7 @@ public class Bug180504TableViewerTest extends ViewerTestCase {
 	@Override
 	protected StructuredViewer createViewer(Composite parent) {
 		final TableViewer tableViewer = new TableViewer(parent, SWT.FULL_SELECTION);
-		tableViewer.setContentProvider(new ArrayContentProvider());
+		tableViewer.setContentProvider(ArrayContentProvider.getInstance());
 		tableViewer.setCellEditors(new CellEditor[] { new TextCellEditor(
 				tableViewer.getTable()) });
 		tableViewer.setColumnProperties(new String[] { "0" });
diff --git a/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/Bug200337TableViewerTest.java b/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/Bug200337TableViewerTest.java
index 90db864cd9d..1f39cb1d116 100644
--- a/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/Bug200337TableViewerTest.java
+++ b/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/Bug200337TableViewerTest.java
@@ -41,7 +41,7 @@ public class Bug200337TableViewerTest extends ViewerTestCase {
 	@Override
 	protected StructuredViewer createViewer(Composite parent) {
 		final TableViewer tableViewer = new TableViewer(parent, SWT.FULL_SELECTION);
-		tableViewer.setContentProvider(new ArrayContentProvider());
+		tableViewer.setContentProvider(ArrayContentProvider.getInstance());
 		tableViewer.setCellEditors(new CellEditor[] { new TextCellEditor(
 				tableViewer.getTable()) });
 		tableViewer.setColumnProperties(new String[] { "0" });
diff --git a/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/Bug201002TableViewerTest.java b/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/Bug201002TableViewerTest.java
index bb3cbdcd60c..86c33d2032a 100644
--- a/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/Bug201002TableViewerTest.java
+++ b/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/Bug201002TableViewerTest.java
@@ -44,7 +44,7 @@ public class Bug201002TableViewerTest extends ViewerTestCase {
 	@Override
 	protected StructuredViewer createViewer(Composite parent) {
 		final TableViewer tableViewer = new TableViewer(parent, SWT.FULL_SELECTION);
-		tableViewer.setContentProvider(new ArrayContentProvider());
+		tableViewer.setContentProvider(ArrayContentProvider.getInstance());
 		tableViewer.setCellEditors(new CellEditor[] { new TextCellEditor(
 				tableViewer.getTable()) });
 		tableViewer.setColumnProperties(new String[] { "0" });
diff --git a/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/Bug203657TableViewerTest.java b/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/Bug203657TableViewerTest.java
index e7ea734c47e..6e656a04371 100644
--- a/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/Bug203657TableViewerTest.java
+++ b/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/Bug203657TableViewerTest.java
@@ -45,7 +45,7 @@ public class Bug203657TableViewerTest extends ViewerTestCase {
 	@Override
 	protected StructuredViewer createViewer(Composite parent) {
 		final TableViewer tableViewer = new TableViewer(parent, SWT.FULL_SELECTION);
-		tableViewer.setContentProvider(new ArrayContentProvider());
+		tableViewer.setContentProvider(ArrayContentProvider.getInstance());
 		tableViewer.setCellEditors(new CellEditor[] { new TextCellEditor(
 				tableViewer.getTable()) });
 		tableViewer.setColumnProperties(new String[] { "0" });
diff --git a/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/ComboViewerComparerTest.java b/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/ComboViewerComparerTest.java
index 74d73b7c8e5..526f5be2497 100644
--- a/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/ComboViewerComparerTest.java
+++ b/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/ComboViewerComparerTest.java
@@ -54,7 +54,7 @@ public class ComboViewerComparerTest extends TestCase {
 	}
 
 	public void testSetSelection() {
-		viewer.setContentProvider(new ArrayContentProvider());
+		viewer.setContentProvider(ArrayContentProvider.getInstance());
 		viewer.setComparer(new IElementComparer() {
 			@Override
 			public boolean equals(final Object element1, final Object element2) {
diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/filteredtree/PatternFilterTest.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/filteredtree/PatternFilterTest.java
index 608f148ee8b..49281540e0a 100644
--- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/filteredtree/PatternFilterTest.java
+++ b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/filteredtree/PatternFilterTest.java
@@ -83,7 +83,7 @@ public class PatternFilterTest {
 	@Before
 	public void setup() {
 		viewer = new MockViewer();
-		viewer.setContentProvider(new ArrayContentProvider());
+		viewer.setContentProvider(ArrayContentProvider.getInstance());
 		viewer.setInput(new String[] {});
 	}