Search: Don't use AbstractUIPlugin#getDialogSettings
JavaDoc of this method says it should no longer be used. This is one
step further to remove Activators.
Change-Id: I78a0c99591fb27d7175eb490069dd04968e255ac
diff --git a/org.eclipse.search/META-INF/MANIFEST.MF b/org.eclipse.search/META-INF/MANIFEST.MF
index 5f93926..b4af531 100644
--- a/org.eclipse.search/META-INF/MANIFEST.MF
+++ b/org.eclipse.search/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.search; singleton:=true
-Bundle-Version: 3.12.100.qualifier
+Bundle-Version: 3.12.200.qualifier
Bundle-Activator: org.eclipse.search.internal.ui.SearchPlugin
Bundle-ActivationPolicy: lazy
Bundle-Vendor: %providerName
diff --git a/org.eclipse.search/new search/org/eclipse/search/ui/text/AbstractTextSearchViewPage.java b/org.eclipse.search/new search/org/eclipse/search/ui/text/AbstractTextSearchViewPage.java
index dce993d..65ba5c1 100644
--- a/org.eclipse.search/new search/org/eclipse/search/ui/text/AbstractTextSearchViewPage.java
+++ b/org.eclipse.search/new search/org/eclipse/search/ui/text/AbstractTextSearchViewPage.java
@@ -19,6 +19,8 @@
import java.util.HashSet;
import java.util.Set;
+import org.osgi.framework.FrameworkUtil;
+
import org.eclipse.swt.SWT;
import org.eclipse.swt.layout.FillLayout;
import org.eclipse.swt.layout.GridData;
@@ -83,7 +85,6 @@
import org.eclipse.ui.texteditor.IUpdate;
import org.eclipse.search.internal.ui.CopyToClipboardAction;
-import org.eclipse.search.internal.ui.SearchPlugin;
import org.eclipse.search.internal.ui.SearchPluginImages;
import org.eclipse.search.internal.ui.SelectAllAction;
import org.eclipse.search.internal.ui.text.EditorOpener;
@@ -354,7 +355,9 @@
* @see AbstractTextSearchViewPage#getID()
*/
protected IDialogSettings getSettings() {
- IDialogSettings parent = SearchPlugin.getDefault().getDialogSettings();
+ IDialogSettings parent = PlatformUI
+ .getDialogSettingsProvider(FrameworkUtil.getBundle(AbstractTextSearchViewPage.class))
+ .getDialogSettings();
IDialogSettings settings = parent.getSection(getID());
if (settings == null)
settings = parent.addNewSection(getID());
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 b4d0407..bf8e32f 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
@@ -22,6 +22,8 @@
import java.util.Iterator;
import java.util.List;
+import org.osgi.framework.FrameworkUtil;
+
import org.eclipse.swt.SWT;
import org.eclipse.swt.custom.BusyIndicator;
import org.eclipse.swt.custom.CTabFolder;
@@ -153,7 +155,9 @@
private final ISelection fCurrentSelection;
private final String[] fCurrentEnclosingProject;
- private final IDialogSettings fDialogSettings= DialogSettings.getOrCreateSection(SearchPlugin.getDefault().getDialogSettings(), DIALOG_NAME);
+ private final IDialogSettings fDialogSettings = DialogSettings.getOrCreateSection(
+ PlatformUI.getDialogSettingsProvider(FrameworkUtil.getBundle(SearchDialog.class)).getDialogSettings(),
+ DIALOG_NAME);
public SearchDialog(IWorkbenchWindow window, String pageId) {
diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchPageDescriptor.java b/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchPageDescriptor.java
index e9ced17..848df52 100644
--- a/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchPageDescriptor.java
+++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchPageDescriptor.java
@@ -23,6 +23,7 @@
import java.util.StringTokenizer;
import org.osgi.framework.Bundle;
+import org.osgi.framework.FrameworkUtil;
import org.eclipse.swt.SWT;
import org.eclipse.swt.graphics.Point;
@@ -41,6 +42,7 @@
import org.eclipse.jface.resource.StringConverter;
import org.eclipse.ui.IPluginContribution;
+import org.eclipse.ui.PlatformUI;
import org.eclipse.search.internal.ui.util.ExceptionHandler;
import org.eclipse.search.ui.ISearchPage;
@@ -284,7 +286,8 @@
}
private static IDialogSettings getDialogSettings() {
- IDialogSettings settings= SearchPlugin.getDefault().getDialogSettings();
+ IDialogSettings settings = PlatformUI
+ .getDialogSettingsProvider(FrameworkUtil.getBundle(SearchPageDescriptor.class)).getDialogSettings();
IDialogSettings section= settings.getSection(SECTION_ID);
if (section == null)
// create new section
diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/text/ReplaceConfigurationPage.java b/org.eclipse.search/search/org/eclipse/search/internal/ui/text/ReplaceConfigurationPage.java
index 8035774..c2f12c2 100644
--- a/org.eclipse.search/search/org/eclipse/search/internal/ui/text/ReplaceConfigurationPage.java
+++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/text/ReplaceConfigurationPage.java
@@ -16,6 +16,8 @@
import java.util.ArrayList;
import java.util.regex.PatternSyntaxException;
+import org.osgi.framework.FrameworkUtil;
+
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.SelectionAdapter;
import org.eclipse.swt.events.SelectionEvent;
@@ -43,7 +45,6 @@
import org.eclipse.search.internal.ui.ISearchHelpContextIds;
import org.eclipse.search.internal.ui.Messages;
import org.eclipse.search.internal.ui.SearchMessages;
-import org.eclipse.search.internal.ui.SearchPlugin;
import org.eclipse.ltk.core.refactoring.RefactoringStatus;
import org.eclipse.ltk.ui.refactoring.UserInputWizardPage;
@@ -106,7 +107,9 @@
fTextField.setFocus();
fTextField.addModifyListener(e -> updateOKStatus());
- IDialogSettings settings= SearchPlugin.getDefault().getDialogSettings().getSection(SETTINGS_GROUP);
+ IDialogSettings settings = PlatformUI
+ .getDialogSettingsProvider(FrameworkUtil.getBundle(ReplaceConfigurationPage.class)).getDialogSettings()
+ .getSection(SETTINGS_GROUP);
if (settings != null) {
String[] previousReplaceWith= settings.getArray(SETTINGS_REPLACE_WITH);
if (previousReplaceWith != null) {
@@ -201,7 +204,9 @@
history.add(curr);
}
}
- IDialogSettings settings= SearchPlugin.getDefault().getDialogSettings().addNewSection(SETTINGS_GROUP);
+ IDialogSettings settings = PlatformUI
+ .getDialogSettingsProvider(FrameworkUtil.getBundle(ReplaceConfigurationPage.class)).getDialogSettings()
+ .addNewSection(SETTINGS_GROUP);
settings.put(SETTINGS_REPLACE_WITH, history.toArray(new String[history.size()]));
}
