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

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

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

20 files changed, 26 insertions, 26 deletions

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/E4PickList.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/E4PickList.java
index cdf5173f..8b750594 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/E4PickList.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/E4PickList.java
@@ -97,7 +97,7 @@ public class E4PickList extends AbstractPickList {
 		this.componentEditor = componentEditor;
 		this.feature = feature;
 
-		picker.setContentProvider(new ArrayContentProvider());
+		picker.setContentProvider(ArrayContentProvider.getInstance());
 		picker.setLabelProvider(new LabelProvider() {
 			@Override
 			public String getText(Object element) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
index 1fefd724..3e8b9131 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java
@@ -448,7 +448,7 @@ public class ApplicationEditor extends AbstractComponentEditor<MApplication> {
 						.setStyle(SWT.ITALIC);
 				bindtableViewer.setLabelProvider(new DelegatingStyledCellLabelProvider(
 						new ComponentLabelProvider(getEditor(), Messages, italicFontDescriptor)));
-				bindtableViewer.setContentProvider(new ArrayContentProvider());
+				bindtableViewer.setContentProvider(ArrayContentProvider.getInstance());
 				bindtableViewer.setInput(application.getBindingTables());
 				bindtableViewer.addSelectionChangedListener(event -> setPageComplete(isPageComplete()));
 				bindtableViewer.setSelection(new StructuredSelection(application.getBindingTables().get(0)));
@@ -512,7 +512,7 @@ public class ApplicationEditor extends AbstractComponentEditor<MApplication> {
 				l.setText(Messages.ApplicationEditor_Type);
 
 				typeViewer = new ComboViewer(group, SWT.READ_ONLY);
-				typeViewer.setContentProvider(new ArrayContentProvider());
+				typeViewer.setContentProvider(ArrayContentProvider.getInstance());
 				typeViewer.setInput(ItemType.values());
 				typeViewer.setSelection(new StructuredSelection(ItemType.PUSH));
 			}
@@ -524,7 +524,7 @@ public class ApplicationEditor extends AbstractComponentEditor<MApplication> {
 
 				menuViewer = new TableViewer(group);
 				menuViewer.setLabelProvider(new HiearchyLabelProvider());
-				menuViewer.setContentProvider(new ArrayContentProvider());
+				menuViewer.setContentProvider(ArrayContentProvider.getInstance());
 
 				final List<MMenu> menuList = new ArrayList<>();
 				final Iterator<EObject> it = EcoreUtil.getAllContents(Collections.singleton(application));
@@ -597,7 +597,7 @@ public class ApplicationEditor extends AbstractComponentEditor<MApplication> {
 
 				typeViewer = new ComboViewer(group, SWT.READ_ONLY);
 				// viewer.setLabelProvider(labelProvider)
-				typeViewer.setContentProvider(new ArrayContentProvider());
+				typeViewer.setContentProvider(ArrayContentProvider.getInstance());
 				typeViewer.setInput(ItemType.values());
 			}
 
@@ -608,7 +608,7 @@ public class ApplicationEditor extends AbstractComponentEditor<MApplication> {
 
 				toolbarViewer = new TableViewer(group);
 				toolbarViewer.setLabelProvider(new HiearchyLabelProvider());
-				toolbarViewer.setContentProvider(new ArrayContentProvider());
+				toolbarViewer.setContentProvider(ArrayContentProvider.getInstance());
 
 				final List<MToolBar> toolbarList = new ArrayList<>();
 				final Iterator<EObject> it = EcoreUtil.getAllContents(Collections.singleton(application));
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AreaEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AreaEditor.java
index 5b1ec8e9..46a7dc6e 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AreaEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/AreaEditor.java
@@ -252,7 +252,7 @@ public class AreaEditor extends AbstractComponentEditor<MArea> {
 			final GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			gd.horizontalSpan = 2;
 			viewer.getControl().setLayoutData(gd);
-			viewer.setContentProvider(new ArrayContentProvider());
+			viewer.setContentProvider(ArrayContentProvider.getInstance());
 			viewer.setLabelProvider(new LabelProvider() {
 				@Override
 				public String getText(Object element) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CompositePartEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CompositePartEditor.java
index bf583e3a..2f3938f4 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CompositePartEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CompositePartEditor.java
@@ -174,7 +174,7 @@ public class CompositePartEditor extends AbstractPartEditor<MCompositePart> {
 			final GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			gd.horizontalSpan = 2;
 			viewer.getControl().setLayoutData(gd);
-			viewer.setContentProvider(new ArrayContentProvider());
+			viewer.setContentProvider(ArrayContentProvider.getInstance());
 			viewer.setLabelProvider(new LabelProvider() {
 				@Override
 				public String getText(Object element) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
index 13702306..10227774 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
@@ -296,7 +296,7 @@ public class MenuEditor extends AbstractComponentEditor<MMenu> {
 
 			final ComboViewer combo = new ComboViewer(parent);
 			combo.getControl().setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
-			combo.setContentProvider(new ArrayContentProvider());
+			combo.setContentProvider(ArrayContentProvider.getInstance());
 			combo.setLabelProvider(new LabelProvider() {
 				@Override
 				public String getText(Object element) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
index de0aeecf..be57ad2c 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
@@ -188,7 +188,7 @@ public abstract class MenuItemEditor<M extends MMenuItem> extends AbstractCompon
 				l.setLayoutData(new GridData());
 
 				final ComboViewer viewer = new ComboViewer(parent);
-				viewer.setContentProvider(new ArrayContentProvider());
+				viewer.setContentProvider(ArrayContentProvider.getInstance());
 				viewer.setInput(new ItemType[] { ItemType.CHECK, ItemType.PUSH, ItemType.RADIO });
 				final GridData gd = new GridData();
 				gd.horizontalSpan = 2;
@@ -283,7 +283,7 @@ public abstract class MenuItemEditor<M extends MMenuItem> extends AbstractCompon
 
 			final ComboViewer combo = new ComboViewer(parent);
 			combo.getControl().setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
-			combo.setContentProvider(new ArrayContentProvider());
+			combo.setContentProvider(ArrayContentProvider.getInstance());
 			combo.setLabelProvider(new LabelProvider() {
 				@Override
 				public String getText(Object element) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
index 093a083a..4843ef61 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PartSashContainerEditor.java
@@ -248,7 +248,7 @@ public class PartSashContainerEditor extends AbstractComponentEditor<MPartSashCo
 			final GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			gd.horizontalSpan = 2;
 			viewer.getControl().setLayoutData(gd);
-			viewer.setContentProvider(new ArrayContentProvider());
+			viewer.setContentProvider(ArrayContentProvider.getInstance());
 			viewer.setLabelProvider(new LabelProvider() {
 				@Override
 				public String getText(Object element) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
index 8890830e..fcbbba7c 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
@@ -195,7 +195,7 @@ public abstract class ToolItemEditor<M extends MToolItem> extends AbstractCompon
 			l.setLayoutData(new GridData());
 
 			final ComboViewer viewer = new ComboViewer(parent);
-			viewer.setContentProvider(new ArrayContentProvider());
+			viewer.setContentProvider(ArrayContentProvider.getInstance());
 			viewer.setInput(new ItemType[] { ItemType.CHECK, ItemType.PUSH, ItemType.RADIO });
 			final GridData gd = new GridData();
 			gd.horizontalSpan = 2;
@@ -303,7 +303,7 @@ public abstract class ToolItemEditor<M extends MToolItem> extends AbstractCompon
 
 			final ComboViewer combo = new ComboViewer(parent);
 			combo.getControl().setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
-			combo.setContentProvider(new ArrayContentProvider());
+			combo.setContentProvider(ArrayContentProvider.getInstance());
 			combo.setLabelProvider(new LabelProvider() {
 				@Override
 				public String getText(Object element) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java
index 0ab5d0b3..8efaaf82 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimBarEditor.java
@@ -194,7 +194,7 @@ public class TrimBarEditor extends AbstractComponentEditor<MTrimBar> {
 			l.setLayoutData(new GridData());
 
 			final ComboViewer viewer = new ComboViewer(parent);
-			viewer.setContentProvider(new ArrayContentProvider());
+			viewer.setContentProvider(ArrayContentProvider.getInstance());
 			viewer.setInput(SideValue.values());
 			final GridData gd = new GridData();
 			gd.horizontalSpan = 2;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java
index 205741b3..eeeabfbc 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java
@@ -243,7 +243,7 @@ public class TrimContributionEditor extends AbstractComponentEditor<MTrimContrib
 			viewer.setContentProvider(new ObservableListContentProvider<>());
 			viewer.setInput(E4Properties.<MTrimElement>children().observeDetail(getMaster()));
 
-			pickList.setContentProvider(new ArrayContentProvider());
+			pickList.setContentProvider(ArrayContentProvider.getInstance());
 			pickList.setLabelProvider(new LabelProvider() {
 				@Override
 				public String getText(Object element) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractCommandSelectionDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractCommandSelectionDialog.java
index f7e17c9c..09dc03c1 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractCommandSelectionDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractCommandSelectionDialog.java
@@ -88,7 +88,7 @@ public abstract class AbstractCommandSelectionDialog extends SaveDialogBoundsSet
 
 		new Label(container, SWT.NONE);
 		viewer = new TableViewer(container);
-		viewer.setContentProvider(new ArrayContentProvider());
+		viewer.setContentProvider(ArrayContentProvider.getInstance());
 		viewer.setLabelProvider(new LabelProviderImpl());
 		viewer.getControl().setLayoutData(new GridData(GridData.FILL_BOTH));
 		viewer.addDoubleClickListener(event -> okPressed());
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIdDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIdDialog.java
index 9b768d0a..09227a36 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIdDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIdDialog.java
@@ -113,7 +113,7 @@ SaveDialogBoundsSettingsDialog {
 		l = new Label(container, SWT.NONE);
 		viewer = new TableViewer(container);
 		viewer.getControl().setLayoutData(new GridData(GridData.FILL_BOTH));
-		viewer.setContentProvider(new ArrayContentProvider());
+		viewer.setContentProvider(ArrayContentProvider.getInstance());
 		viewer.setLabelProvider(getLabelProvider());
 		viewer.addFilter(filter);
 		viewer.addDoubleClickListener(event -> okPressed());
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/BindingContextSelectionDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/BindingContextSelectionDialog.java
index c5b45944..db019361 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/BindingContextSelectionDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/BindingContextSelectionDialog.java
@@ -85,7 +85,7 @@ public class BindingContextSelectionDialog extends SaveDialogBoundsSettingsDialo
 
 		new Label(container, SWT.NONE);
 		viewer = new TableViewer(container);
-		viewer.setContentProvider(new ArrayContentProvider());
+		viewer.setContentProvider(ArrayContentProvider.getInstance());
 		viewer.setLabelProvider(new LabelProviderImpl());
 		viewer.getControl().setLayoutData(new GridData(GridData.FILL_BOTH));
 		viewer.addDoubleClickListener(event -> okPressed());
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/CommandCategorySelectionDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/CommandCategorySelectionDialog.java
index 2101df85..a2fee8cc 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/CommandCategorySelectionDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/CommandCategorySelectionDialog.java
@@ -86,7 +86,7 @@ public class CommandCategorySelectionDialog extends SaveDialogBoundsSettingsDial
 
 		new Label(container, SWT.NONE);
 		viewer = new TableViewer(container);
-		viewer.setContentProvider(new ArrayContentProvider());
+		viewer.setContentProvider(ArrayContentProvider.getInstance());
 		viewer.setLabelProvider(new LabelProviderImpl());
 		viewer.getControl().setLayoutData(new GridData(GridData.FILL_BOTH));
 		viewer.addDoubleClickListener(event -> okPressed());
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ExpressionIdDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ExpressionIdDialog.java
index 03b714e9..12ea87da 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ExpressionIdDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ExpressionIdDialog.java
@@ -91,7 +91,7 @@ public class ExpressionIdDialog extends SaveDialogBoundsSettingsDialog {
 		l = new Label(container, SWT.NONE);
 		viewer = new TableViewer(container);
 		viewer.getControl().setLayoutData(new GridData(GridData.FILL_BOTH));
-		viewer.setContentProvider(new ArrayContentProvider());
+		viewer.setContentProvider(ArrayContentProvider.getInstance());
 		viewer.setLabelProvider(new LabelProviderImpl());
 		viewer.addFilter(filter);
 		viewer.setInput(getElements(lookup));
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindParentReferenceElementDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindParentReferenceElementDialog.java
index a261b174..79dd02d5 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindParentReferenceElementDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FindParentReferenceElementDialog.java
@@ -140,7 +140,7 @@ public class FindParentReferenceElementDialog extends SaveDialogBoundsSettingsDi
 		combo.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false));
 		eClassViewer.setLabelProvider(LabelProvider.createTextProvider(element -> ((EClass) element).getName()));
 
-		eClassViewer.setContentProvider(new ArrayContentProvider());
+		eClassViewer.setContentProvider(ArrayContentProvider.getInstance());
 		final List<EClass> eClassList = getExtendableClasses();
 		eClassViewer.setComparator(new ViewerComparator() {
 			@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/SharedElementsDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/SharedElementsDialog.java
index 71b8e673..0d29ea0b 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/SharedElementsDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/SharedElementsDialog.java
@@ -97,7 +97,7 @@ public class SharedElementsDialog extends SaveDialogBoundsSettingsDialog {
 		l = new Label(container, SWT.NONE);
 
 		viewer = new TableViewer(container);
-		viewer.setContentProvider(new ArrayContentProvider());
+		viewer.setContentProvider(ArrayContentProvider.getInstance());
 		viewer.setLabelProvider(new LabelProviderImpl());
 		viewer.getControl().setLayoutData(new GridData(GridData.FILL_BOTH));
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPerspectiveControlEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPerspectiveControlEditor.java
index b366bf9c..404399fe 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPerspectiveControlEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/virtual/VPerspectiveControlEditor.java
@@ -150,7 +150,7 @@ public class VPerspectiveControlEditor extends AbstractComponentEditor<MElementC
 			pickList.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 3, 1));
 			viewer = pickList.getList();
 
-			pickList.setContentProvider(new ArrayContentProvider());
+			pickList.setContentProvider(ArrayContentProvider.getInstance());
 			pickList.setLabelProvider(new EClassLabelProvider(getEditor()));
 			pickList.setInput(new EClass[] { BasicPackageImpl.Literals.PART_SASH_CONTAINER,
 					BasicPackageImpl.Literals.PART_STACK, BasicPackageImpl.Literals.PART,
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ExportIdsHandler.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ExportIdsHandler.java
index 7dc09a43..a5b57303 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ExportIdsHandler.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ExportIdsHandler.java
@@ -232,7 +232,7 @@ public class ExportIdsHandler {
 
 			entries.sort(null);
 
-			viewer.setContentProvider(new ArrayContentProvider());
+			viewer.setContentProvider(ArrayContentProvider.getInstance());
 			viewer.setInput(entries);
 			viewer.setAllChecked(true);
 
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ExternalizeStringHandler.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ExternalizeStringHandler.java
index d07628cd..32116da6 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ExternalizeStringHandler.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/properties/ExternalizeStringHandler.java
@@ -201,7 +201,7 @@ public class ExternalizeStringHandler {
 					}
 				}
 			}
-			viewer.setContentProvider(new ArrayContentProvider());
+			viewer.setContentProvider(ArrayContentProvider.getInstance());
 			viewer.setInput(entries);
 			viewer.setAllChecked(true);