Bug 564063 - Using ArrayContentProvider.getInstance() instead of new
instance
ArrayContentProvider does not hold any data, hence it can be shared
across instances.
Change-Id: I2defc10db7bdb8f3a2083e59f335743915d92f88
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
diff --git a/org.eclipse.search/new search/org/eclipse/search2/internal/ui/MatchFilterSelectionDialog.java b/org.eclipse.search/new search/org/eclipse/search2/internal/ui/MatchFilterSelectionDialog.java
index c2dc9a2..382d986 100644
--- a/org.eclipse.search/new search/org/eclipse/search2/internal/ui/MatchFilterSelectionDialog.java
+++ b/org.eclipse.search/new search/org/eclipse/search2/internal/ui/MatchFilterSelectionDialog.java
@@ -172,7 +172,7 @@
ListenerAndLabelProvider listenerAndLP= new ListenerAndLabelProvider();
fListViewer.setLabelProvider(listenerAndLP);
- fListViewer.setContentProvider(new ArrayContentProvider());
+ fListViewer.setContentProvider(ArrayContentProvider.getInstance());
fListViewer.addSelectionChangedListener(listenerAndLP);
fListViewer.addCheckStateListener(listenerAndLP);
fListViewer.setInput(fAllFilters);
diff --git a/org.eclipse.search/new search/org/eclipse/search2/internal/ui/SearchHistorySelectionDialog.java b/org.eclipse.search/new search/org/eclipse/search2/internal/ui/SearchHistorySelectionDialog.java
index de272c5..b27f473 100644
--- a/org.eclipse.search/new search/org/eclipse/search2/internal/ui/SearchHistorySelectionDialog.java
+++ b/org.eclipse.search/new search/org/eclipse/search2/internal/ui/SearchHistorySelectionDialog.java
@@ -295,7 +295,7 @@
parent.setLayoutData(new GridData(GridData.FILL_BOTH));
fViewer= new TableViewer(parent, SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL | SWT.BORDER | SWT.FULL_SELECTION);
- fViewer.setContentProvider(new ArrayContentProvider());
+ fViewer.setContentProvider(ArrayContentProvider.getInstance());
final Table table= fViewer.getTable();
table.addMouseListener(new MouseAdapter() {
diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchDialog.java b/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchDialog.java
index 4e38840..a9bccde 100644
--- a/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchDialog.java
+++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchDialog.java
@@ -333,7 +333,8 @@
String message= SearchMessages.SearchPageSelectionDialog_message;
- ListSelectionDialog dialog= new ListSelectionDialog(getShell(), input, new ArrayContentProvider(), labelProvider, message) {
+ ListSelectionDialog dialog = new ListSelectionDialog(getShell(), input, ArrayContentProvider.getInstance(),
+ labelProvider, message) {
Button fLastUsedPageButton;
@Override
diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchResultViewer.java b/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchResultViewer.java
index 4909967..6d8c796 100644
--- a/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchResultViewer.java
+++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchResultViewer.java
@@ -114,7 +114,7 @@
fPotentialMatchFgColor= new Color(SearchPlugin.getActiveWorkbenchShell().getDisplay(), SearchPreferencePage.getPotentialMatchForegroundColor());
setUseHashlookup(true);
- setContentProvider(new ArrayContentProvider());
+ setContentProvider(ArrayContentProvider.getInstance());
ILabelProvider labelProvider= new SearchResultLabelProvider(new FileLabelProvider(FileLabelProvider.SHOW_LABEL));
setLabelProvider(labelProvider);
diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/ShowSearchesAction.java b/org.eclipse.search/search/org/eclipse/search/internal/ui/ShowSearchesAction.java
index 9343be8..16889b7 100644
--- a/org.eclipse.search/search/org/eclipse/search/internal/ui/ShowSearchesAction.java
+++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/ShowSearchesAction.java
@@ -126,7 +126,7 @@
ListDialog dlg= new ListDialog(SearchPlugin.getActiveWorkbenchShell());
dlg.setInput(input);
dlg.setTitle(title);
- dlg.setContentProvider(new ArrayContentProvider());
+ dlg.setContentProvider(ArrayContentProvider.getInstance());
dlg.setLabelProvider(labelProvider);
dlg.setMessage(message);
if (selectedAction != null) {
diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/AnnotationsConfigurationBlock.java b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/AnnotationsConfigurationBlock.java
index 3d6f871..cd43988 100644
--- a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/AnnotationsConfigurationBlock.java
+++ b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/AnnotationsConfigurationBlock.java
@@ -260,7 +260,7 @@
fDecorationViewer= new ComboViewer(optionsComposite, SWT.READ_ONLY);
- fDecorationViewer.setContentProvider(new ArrayContentProvider());
+ fDecorationViewer.setContentProvider(ArrayContentProvider.getInstance());
fDecorationViewer.setLabelProvider(new ArrayLabelProvider());
fDecorationViewer.setComparator(new ViewerComparator(Collator.getInstance()));
diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/LinkedModeConfigurationBlock.java b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/LinkedModeConfigurationBlock.java
index 1bdba46..2d8255e 100755
--- a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/LinkedModeConfigurationBlock.java
+++ b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/LinkedModeConfigurationBlock.java
@@ -272,7 +272,7 @@
fShowInTextCheckBox.setLayoutData(gd);
fDecorationViewer= new ComboViewer(optionsComposite, SWT.READ_ONLY);
- fDecorationViewer.setContentProvider(new ArrayContentProvider());
+ fDecorationViewer.setContentProvider(ArrayContentProvider.getInstance());
fDecorationViewer.setLabelProvider(new ArrayLabelProvider());
fDecorationViewer.setComparator(new ViewerComparator(Collator.getInstance()));
