Bug 30314 - [Viewers] Check for possible uses of ArrayContentProvider

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

4 files changed, 11 insertions, 80 deletions

diff --git a/bundles/org.eclipse.jface/src/org/eclipse/jface/util/SafeRunnableDialog.java b/bundles/org.eclipse.jface/src/org/eclipse/jface/util/SafeRunnableDialog.java
index c712fe4b048..bef65e4bb70 100644
--- a/bundles/org.eclipse.jface/src/org/eclipse/jface/util/SafeRunnableDialog.java
+++ b/bundles/org.eclipse.jface/src/org/eclipse/jface/util/SafeRunnableDialog.java
@@ -21,8 +21,8 @@ import org.eclipse.core.runtime.IStatus;
 import org.eclipse.jface.dialogs.ErrorDialog;
 import org.eclipse.jface.dialogs.IDialogConstants;
 import org.eclipse.jface.resource.JFaceResources;
+import org.eclipse.jface.viewers.ArrayContentProvider;
 import org.eclipse.jface.viewers.CellLabelProvider;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.jface.viewers.Viewer;
@@ -162,12 +162,12 @@ class SafeRunnableDialog extends ErrorDialog {
 		data.heightHint = convertHeightInCharsToPixels(10);
 		data.horizontalSpan = 2;
 		control.setLayoutData(data);
-		statusListViewer.setContentProvider(getStatusContentProvider());
+		statusListViewer.setContentProvider(ArrayContentProvider.getInstance());
 		statusListViewer.setLabelProvider(getStatusListLabelProvider());
 		statusListViewer
 				.addSelectionChangedListener(event -> handleSelectionChange());
 		applyDialogFont(parent);
-		statusListViewer.setInput(this);
+		statusListViewer.setInput(statuses);
 	}
 
 	/**
@@ -185,31 +185,6 @@ class SafeRunnableDialog extends ErrorDialog {
 		};
 	}
 
-	/**
-	 * Return the content provider for the statuses.
-	 *
-	 * @return IStructuredContentProvider
-	 */
-	private IStructuredContentProvider getStatusContentProvider() {
-		return new IStructuredContentProvider() {
-			@Override
-			public Object[] getElements(Object inputElement) {
-				return statuses.toArray();
-			}
-
-			@Override
-			public void dispose() {
-
-			}
-
-			@Override
-			public void inputChanged(Viewer viewer, Object oldInput,
-					Object newInput) {
-
-			}
-		};
-	}
-
 	/*
 	 * Return whether there are multiple errors to be displayed
 	 */
diff --git a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/dialogs/FileSystemSelectionArea.java b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/dialogs/FileSystemSelectionArea.java
index 6edd53d24ae..e54bc050adb 100644
--- a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/dialogs/FileSystemSelectionArea.java
+++ b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/dialogs/FileSystemSelectionArea.java
@@ -14,9 +14,9 @@
 
 package org.eclipse.ui.internal.ide.dialogs;
 
+import org.eclipse.jface.viewers.ArrayContentProvider;
 import org.eclipse.jface.viewers.ComboViewer;
 import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.LabelProvider;
 import org.eclipse.jface.viewers.StructuredSelection;
@@ -65,28 +65,10 @@ public class FileSystemSelectionArea {
 			}
 		});
 
-		fileSystems.setContentProvider(new IStructuredContentProvider() {
+		fileSystems.setContentProvider(ArrayContentProvider.getInstance());
 
-			@Override
-			public void dispose() {
-				// Nothing to do
-			}
-
-			@Override
-			public Object[] getElements(Object inputElement) {
-				return FileSystemSupportRegistry.getInstance()
-						.getConfigurations();
-			}
-
-			@Override
-			public void inputChanged(org.eclipse.jface.viewers.Viewer viewer,
-					Object oldInput, Object newInput) {
-				// Nothing to do
-			}
-
-		});
-
-		fileSystems.setInput(this);
+		fileSystems.setInput(FileSystemSupportRegistry.getInstance()
+				.getConfigurations());
 		fileSystems.setSelection(new StructuredSelection(
 				FileSystemSupportRegistry.getInstance()
 						.getDefaultConfiguration()));
diff --git a/tests/org.eclipse.e4.ui.tests.css.swt/tkuiTestsToRefactor/swt/test/org/akrogen/tkui/css/swt/engine/table/CSSSWTTableViewerEngineTest.java b/tests/org.eclipse.e4.ui.tests.css.swt/tkuiTestsToRefactor/swt/test/org/akrogen/tkui/css/swt/engine/table/CSSSWTTableViewerEngineTest.java
index 9a68167702a..52e474df96d 100644
--- a/tests/org.eclipse.e4.ui.tests.css.swt/tkuiTestsToRefactor/swt/test/org/akrogen/tkui/css/swt/engine/table/CSSSWTTableViewerEngineTest.java
+++ b/tests/org.eclipse.e4.ui.tests.css.swt/tkuiTestsToRefactor/swt/test/org/akrogen/tkui/css/swt/engine/table/CSSSWTTableViewerEngineTest.java
@@ -20,6 +20,7 @@ import java.util.List;
 import org.akrogen.tkui.css.core.engine.CSSEngine;
 import org.akrogen.tkui.css.swt.engine.CSSSWTEngineImpl;
 import org.akrogen.tkui.css.swt.engine.table.viewers.MyCSSLabelProvider;
+import org.eclipse.jface.viewers.ArrayContentProvider;
 import org.eclipse.jface.viewers.IStructuredContentProvider;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.jface.viewers.Viewer;
@@ -56,21 +57,7 @@ public class CSSSWTTableViewerEngineTest {
 			}
 
 			final TableViewer tableViewer = new TableViewer(panel1);
-			tableViewer.setContentProvider(new IStructuredContentProvider() {
-				public void dispose() {
-					// TODO Auto-generated method stub
-
-				}
-
-				public Object[] getElements(Object inputElement) {
-					return datas.toArray();
-				}
-
-				public void inputChanged(Viewer viewer, Object oldInput,
-						Object newInput) {
-
-				}
-			});
+			tableViewer.setContentProvider(ArrayContentProvider.getInstance());
 			tableViewer.setLabelProvider(new MyCSSLabelProvider(engine,
 					tableViewer));
 
diff --git a/tests/org.eclipse.e4.ui.tests.css.swt/tkuiTestsToRefactor/swt/test/org/akrogen/tkui/css/swt/engine/table/CSSSWTTableViewerEngineTest2.java b/tests/org.eclipse.e4.ui.tests.css.swt/tkuiTestsToRefactor/swt/test/org/akrogen/tkui/css/swt/engine/table/CSSSWTTableViewerEngineTest2.java
index 0e63b3601ab..090a8546cc6 100644
--- a/tests/org.eclipse.e4.ui.tests.css.swt/tkuiTestsToRefactor/swt/test/org/akrogen/tkui/css/swt/engine/table/CSSSWTTableViewerEngineTest2.java
+++ b/tests/org.eclipse.e4.ui.tests.css.swt/tkuiTestsToRefactor/swt/test/org/akrogen/tkui/css/swt/engine/table/CSSSWTTableViewerEngineTest2.java
@@ -20,6 +20,7 @@ import java.util.List;
 import org.akrogen.tkui.css.core.engine.CSSEngine;
 import org.akrogen.tkui.css.swt.engine.CSSSWTEngineImpl;
 import org.akrogen.tkui.css.swt.engine.table.viewers.MyCSSTableLabelProvider;
+import org.eclipse.jface.viewers.ArrayContentProvider;
 import org.eclipse.jface.viewers.IStructuredContentProvider;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.jface.viewers.Viewer;
@@ -57,21 +58,7 @@ public class CSSSWTTableViewerEngineTest2 {
 			}
 
 			final TableViewer tableViewer = new TableViewer(panel1);
-			tableViewer.setContentProvider(new IStructuredContentProvider() {
-				public void dispose() {
-					// TODO Auto-generated method stub
-
-				}
-
-				public Object[] getElements(Object inputElement) {
-					return datas.toArray();
-				}
-
-				public void inputChanged(Viewer viewer, Object oldInput,
-						Object newInput) {
-
-				}
-			});
+			tableViewer.setContentProvider(ArrayContentProvider.getInstance());
 			tableViewer.setLabelProvider(new MyCSSTableLabelProvider(engine,
 					tableViewer));