diff options
author | Lars Vogel | 2020-06-05 16:23:34 +0000 |
---|---|---|
committer | Lars Vogel | 2020-06-09 20:59:12 +0000 |
commit | e425860e08de4c8fa630f1fa1d3fea2c3902c9be (patch) | |
tree | fbef97031999ada54b549deed261627d8c4b730e | |
parent | 0b1d19dc35efaae8fb304ca256ee291281c321c0 (diff) | |
download | eclipse.platform.text-I20200609-1800.tar.gz eclipse.platform.text-I20200609-1800.tar.xz eclipse.platform.text-I20200609-1800.zip |
Bug 564063 - Using ArrayContentProvider.getInstance() instead of newI20200612-0400I20200611-1800I20200610-1800I20200609-1800
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>
7 files changed, 8 insertions, 7 deletions
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 c2dc9a247ee..382d986a3c0 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 @@ public class MatchFilterSelectionDialog extends StatusDialog { 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 de272c5d706..b27f4736605 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 @@ public class SearchHistorySelectionDialog extends SelectionDialog { 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 4e388408d78..a9bccded9f1 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 @@ public class SearchDialog extends ExtendedDialogWindow implements ISearchPageCon 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 490996747ec..6d8c7960efd 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 @@ public class SearchResultViewer extends TableViewer { 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 9343be8a449..16889b7bc88 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 @@ class ShowSearchesAction extends Action { 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 3d6f8717344..cd43988586a 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 @@ class AnnotationsConfigurationBlock implements IPreferenceConfigurationBlock { 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 1bdba46b0eb..2d8255effee 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 @@ class LinkedModeConfigurationBlock implements IPreferenceConfigurationBlock { 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())); |