diff options
author | Matthias Becker | 2021-01-15 13:40:43 +0000 |
---|---|---|
committer | Alexander Kurtakov | 2021-01-21 10:16:38 +0000 |
commit | 06dc0a0e7dd64b092595690dcbf864f5e2153920 (patch) | |
tree | 4b77554c3e6630395b972f1de466c9682022fd84 /org.eclipse.debug.ui | |
parent | f553c30fd94a984cc75d8fc79269b9e0c87cbedc (diff) | |
download | eclipse.platform.debug-06dc0a0e7dd64b092595690dcbf864f5e2153920.tar.gz eclipse.platform.debug-06dc0a0e7dd64b092595690dcbf864f5e2153920.tar.xz eclipse.platform.debug-06dc0a0e7dd64b092595690dcbf864f5e2153920.zip |
Debug UI: Don't use AbstractUIPlugin#getDialogSettingsY20210129-1200Y20210127-0710Y20210126-1200Y20210123-0110I20210131-1800I20210130-1800I20210129-1800I20210128-1800I20210127-1800I20210126-1800I20210125-1800I20210124-1800I20210123-1800I20210123-0020I20210121-2140
JavaDoc of this method says it should no longer be used. This is one
step further to remove Activators.
Change-Id: Iac12e58eb8a75beb36b2c95397dd6298b61ad3a3
Diffstat (limited to 'org.eclipse.debug.ui')
21 files changed, 100 insertions, 43 deletions
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/AbstractDebugSelectionDialog.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/AbstractDebugSelectionDialog.java index d31bf634c..d05207114 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/AbstractDebugSelectionDialog.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/AbstractDebugSelectionDialog.java @@ -30,6 +30,7 @@ import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.dialogs.SelectionDialog; +import org.osgi.framework.FrameworkUtil; /** * This class provides the framework for a general selection dialog class. @@ -202,7 +203,9 @@ public abstract class AbstractDebugSelectionDialog extends SelectionDialog { @Override protected IDialogSettings getDialogBoundsSettings() { - IDialogSettings settings = DebugUIPlugin.getDefault().getDialogSettings(); + IDialogSettings settings = PlatformUI + .getDialogSettingsProvider(FrameworkUtil.getBundle(AbstractDebugSelectionDialog.class)) + .getDialogSettings(); IDialogSettings section = settings.getSection(getDialogSettingsId()); if (section == null) { section = settings.addNewSection(getDialogSettingsId()); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpoints/DeleteWorkingsetsMessageDialog.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpoints/DeleteWorkingsetsMessageDialog.java index 1a98aab32..70321109f 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpoints/DeleteWorkingsetsMessageDialog.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpoints/DeleteWorkingsetsMessageDialog.java @@ -13,7 +13,6 @@ *******************************************************************************/ package org.eclipse.debug.internal.ui.actions.breakpoints; -import org.eclipse.debug.internal.ui.DebugUIPlugin; import org.eclipse.debug.internal.ui.actions.ActionMessages; import org.eclipse.jface.dialogs.IDialogSettings; import org.eclipse.jface.dialogs.MessageDialog; @@ -27,6 +26,8 @@ import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Shell; +import org.eclipse.ui.PlatformUI; +import org.osgi.framework.FrameworkUtil; /** * Allows the user to specify if they want to delete the working set, all the breakpoints in the working @@ -130,8 +131,9 @@ public class DeleteWorkingsetsMessageDialog extends MessageDialog { * @return dialog settings */ protected IDialogSettings getDialogSettings() { - DebugUIPlugin plugin = DebugUIPlugin.getDefault(); - IDialogSettings workbenchSettings = plugin.getDialogSettings(); + IDialogSettings workbenchSettings = PlatformUI + .getDialogSettingsProvider(FrameworkUtil.getBundle(DeleteWorkingsetsMessageDialog.class)) + .getDialogSettings(); IDialogSettings section = workbenchSettings.getSection(DIALOG_SETTINGS); if (section == null) { section = workbenchSettings.addNewSection(DIALOG_SETTINGS); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/variables/ChangeVariableValueInputDialog.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/variables/ChangeVariableValueInputDialog.java index fdd3f2fea..b8895c503 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/variables/ChangeVariableValueInputDialog.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/variables/ChangeVariableValueInputDialog.java @@ -14,7 +14,6 @@ package org.eclipse.debug.internal.ui.actions.variables; import org.eclipse.debug.internal.core.IInternalDebugCoreConstants; -import org.eclipse.debug.internal.ui.DebugUIPlugin; import org.eclipse.debug.ui.IDebugUIConstants; import org.eclipse.jface.dialogs.IDialogConstants; import org.eclipse.jface.dialogs.IDialogSettings; @@ -29,6 +28,8 @@ import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.Text; +import org.eclipse.ui.PlatformUI; +import org.osgi.framework.FrameworkUtil; /** * A simple input dialog for soliciting an input string @@ -260,7 +261,9 @@ public class ChangeVariableValueInputDialog extends TrayDialog { @Override protected IDialogSettings getDialogBoundsSettings() { - IDialogSettings settings = DebugUIPlugin.getDefault().getDialogSettings(); + IDialogSettings settings = PlatformUI + .getDialogSettingsProvider(FrameworkUtil.getBundle(ChangeVariableValueInputDialog.class)) + .getDialogSettings(); IDialogSettings section = settings.getSection(getDialogSettingsSectionName()); if (section == null) { section = settings.addNewSection(getDialogSettingsSectionName()); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/variables/details/DetailPaneMaxLengthDialog.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/variables/details/DetailPaneMaxLengthDialog.java index bcf843595..71009e999 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/variables/details/DetailPaneMaxLengthDialog.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/variables/details/DetailPaneMaxLengthDialog.java @@ -30,6 +30,7 @@ import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.Text; import org.eclipse.ui.PlatformUI; +import org.osgi.framework.FrameworkUtil; /** * Provides a dialog for changing the maximum length allowed in the detail pane @@ -70,7 +71,9 @@ public class DetailPaneMaxLengthDialog extends TrayDialog { @Override protected IDialogSettings getDialogBoundsSettings() { - IDialogSettings settings = DebugUIPlugin.getDefault().getDialogSettings(); + IDialogSettings settings = PlatformUI + .getDialogSettingsProvider(FrameworkUtil.getBundle(DetailPaneMaxLengthDialog.class)) + .getDialogSettings(); IDialogSettings section = settings.getSection(SETTINGS_ID); if (section == null) { section = settings.addNewSection(SETTINGS_ID); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/groups/CommonTabLite.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/groups/CommonTabLite.java index 730c7f8fd..d6ce28a47 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/groups/CommonTabLite.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/groups/CommonTabLite.java @@ -69,6 +69,7 @@ import org.eclipse.swt.widgets.Group; import org.eclipse.swt.widgets.Text; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.dialogs.ContainerSelectionDialog; +import org.osgi.framework.FrameworkUtil; /** * This class was taken from org.eclipse.debug.ui. We expose a Common tab for @@ -243,7 +244,8 @@ class CommonTabLite extends AbstractLaunchConfigurationTab { } private IDialogSettings getDialogBoundsSettings() { - IDialogSettings settings = DebugUIPlugin.getDefault().getDialogSettings(); + IDialogSettings settings = PlatformUI.getDialogSettingsProvider(FrameworkUtil.getBundle(CommonTabLite.class)) + .getDialogSettings(); IDialogSettings section = settings.getSection(SETTINGS_ID); if (section == null) { section = settings.addNewSection(SETTINGS_ID); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/hover/ExpressionInformationControlCreator.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/hover/ExpressionInformationControlCreator.java index 36339085e..0573561ce 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/hover/ExpressionInformationControlCreator.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/hover/ExpressionInformationControlCreator.java @@ -17,7 +17,6 @@ package org.eclipse.debug.internal.ui.hover; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.Platform; import org.eclipse.debug.core.model.IVariable; -import org.eclipse.debug.internal.ui.DebugUIPlugin; import org.eclipse.debug.internal.ui.SWTFactory; import org.eclipse.debug.internal.ui.model.elements.ElementContentProvider; import org.eclipse.debug.internal.ui.viewers.model.provisional.IChildrenUpdate; @@ -57,6 +56,7 @@ import org.eclipse.swt.widgets.TreeItem; import org.eclipse.ui.IWorkbenchPage; import org.eclipse.ui.IWorkbenchPartSite; import org.eclipse.ui.PlatformUI; +import org.osgi.framework.FrameworkUtil; /** * Creates an information control to display an expression in a hover control. @@ -196,7 +196,9 @@ public class ExpressionInformationControlCreator implements IInformationControlC * @param create whether to create the settings */ private IDialogSettings getDialogSettings(boolean create) { - IDialogSettings settings = DebugUIPlugin.getDefault().getDialogSettings(); + IDialogSettings settings = PlatformUI + .getDialogSettingsProvider(FrameworkUtil.getBundle(ExpressionInformationControlCreator.class)) + .getDialogSettings(); IDialogSettings section = settings.getSection(this.getClass().getName()); if (section == null && create) { section = settings.addNewSection(this.getClass().getName()); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/importexport/breakpoints/WizardExportBreakpoints.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/importexport/breakpoints/WizardExportBreakpoints.java index 1c31ff369..62c134127 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/importexport/breakpoints/WizardExportBreakpoints.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/importexport/breakpoints/WizardExportBreakpoints.java @@ -14,12 +14,13 @@ package org.eclipse.debug.internal.ui.importexport.breakpoints; -import org.eclipse.debug.internal.ui.DebugUIPlugin; import org.eclipse.jface.dialogs.IDialogSettings; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.wizard.Wizard; import org.eclipse.ui.IExportWizard; import org.eclipse.ui.IWorkbench; +import org.eclipse.ui.PlatformUI; +import org.osgi.framework.FrameworkUtil; /** * <p> @@ -64,8 +65,8 @@ public class WizardExportBreakpoints extends Wizard implements IExportWizard { */ public WizardExportBreakpoints() { super(); - DebugUIPlugin plugin = DebugUIPlugin.getDefault(); - IDialogSettings workbenchSettings = plugin.getDialogSettings(); + IDialogSettings workbenchSettings = PlatformUI + .getDialogSettingsProvider(FrameworkUtil.getBundle(WizardExportBreakpoints.class)).getDialogSettings(); IDialogSettings section = workbenchSettings.getSection(EXPORT_DIALOG_SETTINGS); if (section == null) { section = workbenchSettings.addNewSection(EXPORT_DIALOG_SETTINGS); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/importexport/breakpoints/WizardImportBreakpoints.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/importexport/breakpoints/WizardImportBreakpoints.java index a13af565b..e05e7b985 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/importexport/breakpoints/WizardImportBreakpoints.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/importexport/breakpoints/WizardImportBreakpoints.java @@ -18,12 +18,13 @@ package org.eclipse.debug.internal.ui.importexport.breakpoints; import java.util.List; import org.eclipse.core.resources.IMarker; -import org.eclipse.debug.internal.ui.DebugUIPlugin; import org.eclipse.jface.dialogs.IDialogSettings; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.wizard.Wizard; import org.eclipse.ui.IImportWizard; import org.eclipse.ui.IWorkbench; +import org.eclipse.ui.PlatformUI; +import org.osgi.framework.FrameworkUtil; /** * <p> @@ -66,8 +67,8 @@ public class WizardImportBreakpoints extends Wizard implements IImportWizard { */ public WizardImportBreakpoints() { super(); - DebugUIPlugin plugin = DebugUIPlugin.getDefault(); - IDialogSettings workbenchSettings = plugin.getDialogSettings(); + IDialogSettings workbenchSettings = PlatformUI + .getDialogSettingsProvider(FrameworkUtil.getBundle(WizardImportBreakpoints.class)).getDialogSettings(); IDialogSettings section = workbenchSettings.getSection(IMPORT_DIALOG_SETTINGS); if (section == null) { section = workbenchSettings.addNewSection(IMPORT_DIALOG_SETTINGS); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/importexport/launchconfigurations/ExportLaunchConfigurationsWizard.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/importexport/launchconfigurations/ExportLaunchConfigurationsWizard.java index 0572de072..37141526c 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/importexport/launchconfigurations/ExportLaunchConfigurationsWizard.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/importexport/launchconfigurations/ExportLaunchConfigurationsWizard.java @@ -14,13 +14,14 @@ *******************************************************************************/ package org.eclipse.debug.internal.ui.importexport.launchconfigurations; -import org.eclipse.debug.internal.ui.DebugUIPlugin; import org.eclipse.jface.dialogs.IDialogSettings; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.wizard.IWizardPage; import org.eclipse.jface.wizard.Wizard; import org.eclipse.ui.IExportWizard; import org.eclipse.ui.IWorkbench; +import org.eclipse.ui.PlatformUI; +import org.osgi.framework.FrameworkUtil; /** * This class provides a wizard for exporting launch configurations to the local @@ -38,8 +39,9 @@ public class ExportLaunchConfigurationsWizard extends Wizard implements IExportW */ public ExportLaunchConfigurationsWizard() { super(); - DebugUIPlugin plugin = DebugUIPlugin.getDefault(); - IDialogSettings workbenchSettings = plugin.getDialogSettings(); + IDialogSettings workbenchSettings = PlatformUI + .getDialogSettingsProvider(FrameworkUtil.getBundle(ExportLaunchConfigurationsWizard.class)) + .getDialogSettings(); IDialogSettings section = workbenchSettings.getSection(EXPORT_DIALOG_SETTINGS); if (section == null) { section = workbenchSettings.addNewSection(EXPORT_DIALOG_SETTINGS); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/importexport/launchconfigurations/ImportLaunchConfigurationsWizard.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/importexport/launchconfigurations/ImportLaunchConfigurationsWizard.java index 932e01fd6..499359618 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/importexport/launchconfigurations/ImportLaunchConfigurationsWizard.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/importexport/launchconfigurations/ImportLaunchConfigurationsWizard.java @@ -13,12 +13,13 @@ *******************************************************************************/ package org.eclipse.debug.internal.ui.importexport.launchconfigurations; -import org.eclipse.debug.internal.ui.DebugUIPlugin; import org.eclipse.jface.dialogs.IDialogSettings; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.wizard.Wizard; import org.eclipse.ui.IImportWizard; import org.eclipse.ui.IWorkbench; +import org.eclipse.ui.PlatformUI; +import org.osgi.framework.FrameworkUtil; /** * This class provides a wizard for importing launch configurations from the local @@ -38,8 +39,9 @@ public class ImportLaunchConfigurationsWizard extends Wizard implements IImportW */ public ImportLaunchConfigurationsWizard() { super(); - DebugUIPlugin plugin = DebugUIPlugin.getDefault(); - IDialogSettings workbenchSettings = plugin.getDialogSettings(); + IDialogSettings workbenchSettings = PlatformUI + .getDialogSettingsProvider(FrameworkUtil.getBundle(ImportLaunchConfigurationsWizard.class)) + .getDialogSettings(); IDialogSettings section = workbenchSettings.getSection(EXPORT_DIALOG_SETTINGS); if (section == null) { section = workbenchSettings.addNewSection(EXPORT_DIALOG_SETTINGS); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/FavoritesDialog.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/FavoritesDialog.java index 5f66d2719..acdacf53b 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/FavoritesDialog.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/FavoritesDialog.java @@ -52,6 +52,7 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.PlatformUI; +import org.osgi.framework.FrameworkUtil; /** * Dialog for organizing favorite launch configurations @@ -442,7 +443,8 @@ public class FavoritesDialog extends TrayDialog { @Override protected IDialogSettings getDialogBoundsSettings() { - IDialogSettings settings = DebugUIPlugin.getDefault().getDialogSettings(); + IDialogSettings settings = PlatformUI.getDialogSettingsProvider(FrameworkUtil.getBundle(FavoritesDialog.class)) + .getDialogSettings(); IDialogSettings section = settings.getSection(getDialogSettingsSectionName()); if (section == null) { section = settings.addNewSection(getDialogSettingsSectionName()); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationsDialog.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationsDialog.java index 58a92a2a4..c6550db2d 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationsDialog.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationsDialog.java @@ -92,6 +92,7 @@ import org.eclipse.swt.widgets.ToolBar; import org.eclipse.swt.widgets.TreeItem; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.progress.WorkbenchJob; +import org.osgi.framework.FrameworkUtil; /** * The dialog used to edit and launch launch configurations. @@ -746,7 +747,9 @@ public class LaunchConfigurationsDialog extends TitleAreaDialog implements ILaun * @return IDialogSettings */ protected IDialogSettings getDialogSettings() { - IDialogSettings settings = DebugUIPlugin.getDefault().getDialogSettings(); + IDialogSettings settings = PlatformUI + .getDialogSettingsProvider(FrameworkUtil.getBundle(LaunchConfigurationDialog.class)) + .getDialogSettings(); IDialogSettings section = settings.getSection(getDialogSettingsSectionName()); if (section == null) { section = settings.addNewSection(getDialogSettingsSectionName()); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/ShowCommandLineDialog.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/ShowCommandLineDialog.java index 981f7839b..053b35bb6 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/ShowCommandLineDialog.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/ShowCommandLineDialog.java @@ -29,7 +29,6 @@ import org.eclipse.debug.core.model.ILaunchConfigurationDelegate2; import org.eclipse.debug.internal.core.DebugCoreMessages; import org.eclipse.debug.internal.core.LaunchConfiguration; import org.eclipse.debug.internal.core.LaunchManager; -import org.eclipse.debug.internal.ui.DebugUIPlugin; import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.dialogs.IDialogConstants; import org.eclipse.jface.dialogs.IDialogSettings; @@ -45,6 +44,8 @@ import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Group; import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.Text; +import org.eclipse.ui.PlatformUI; +import org.osgi.framework.FrameworkUtil; /** * Allows the user to specify to see and copy the command line to be executed @@ -174,7 +175,8 @@ public class ShowCommandLineDialog extends Dialog { @Override protected IDialogSettings getDialogBoundsSettings() { - IDialogSettings settings = DebugUIPlugin.getDefault().getDialogSettings(); + IDialogSettings settings = PlatformUI + .getDialogSettingsProvider(FrameworkUtil.getBundle(ShowCommandLineDialog.class)).getDialogSettings(); IDialogSettings section = settings.getSection(getDialogSettingsSectionName()); if (section == null) { section = settings.addNewSection(getDialogSettingsSectionName()); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/browsers/DirectorySourceContainerDialog.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/browsers/DirectorySourceContainerDialog.java index 2c714d80b..30f44e5ae 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/browsers/DirectorySourceContainerDialog.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/browsers/DirectorySourceContainerDialog.java @@ -18,11 +18,11 @@ import java.io.File; import org.eclipse.debug.internal.core.IInternalDebugCoreConstants; import org.eclipse.debug.internal.ui.DebugPluginImages; -import org.eclipse.debug.internal.ui.DebugUIPlugin; import org.eclipse.debug.internal.ui.IDebugHelpContextIds; import org.eclipse.debug.internal.ui.IInternalDebugUIConstants; import org.eclipse.debug.internal.ui.sourcelookup.SourceLookupUIMessages; import org.eclipse.jface.dialogs.IDialogConstants; +import org.eclipse.jface.dialogs.IDialogSettings; import org.eclipse.jface.dialogs.TitleAreaDialog; import org.eclipse.jface.resource.JFaceResources; import org.eclipse.swt.SWT; @@ -41,6 +41,7 @@ import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.Text; import org.eclipse.ui.PlatformUI; +import org.osgi.framework.FrameworkUtil; /** * The dialog for selecting the external folder for which a source container will be created. @@ -66,7 +67,9 @@ public class DirectorySourceContainerDialog extends TitleAreaDialog { * @param shell shell */ public DirectorySourceContainerDialog(Shell shell) { - this(shell, IInternalDebugCoreConstants.EMPTY_STRING, DebugUIPlugin.getDefault().getDialogSettings().getBoolean(LAST_SUBDIR_SETTING)); + this(shell, IInternalDebugCoreConstants.EMPTY_STRING, + PlatformUI.getDialogSettingsProvider(FrameworkUtil.getBundle(DirectorySourceContainerDialog.class)) + .getDialogSettings().getBoolean(LAST_SUBDIR_SETTING)); fNewContainer = true; } @@ -189,15 +192,21 @@ public class DirectorySourceContainerDialog extends TitleAreaDialog { protected void okPressed() { fDirectory = fDirText.getText().trim(); fSearchSubfolders = fSubfoldersButton.getSelection(); - DebugUIPlugin.getDefault().getDialogSettings().put(LAST_PATH_SETTING, fDirectory); - DebugUIPlugin.getDefault().getDialogSettings().put(LAST_SUBDIR_SETTING, fSearchSubfolders); + IDialogSettings dialogSettings = PlatformUI + .getDialogSettingsProvider(FrameworkUtil.getBundle(DirectorySourceContainerDialog.class)) + .getDialogSettings(); + dialogSettings.put(LAST_PATH_SETTING, fDirectory); + dialogSettings.put(LAST_SUBDIR_SETTING, fSearchSubfolders); super.okPressed(); } private void browse() { String last = fDirText.getText().trim(); if (last.length() == 0) { - last = DebugUIPlugin.getDefault().getDialogSettings().get(LAST_PATH_SETTING); + IDialogSettings dialogSettings = PlatformUI + .getDialogSettingsProvider(FrameworkUtil.getBundle(DirectorySourceContainerDialog.class)) + .getDialogSettings(); + last = dialogSettings.get(LAST_PATH_SETTING); } if (last == null) { last = IInternalDebugCoreConstants.EMPTY_STRING; diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/browsers/ExternalArchiveSourceContainerBrowser.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/browsers/ExternalArchiveSourceContainerBrowser.java index c998d1e37..bdbc9d289 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/browsers/ExternalArchiveSourceContainerBrowser.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/browsers/ExternalArchiveSourceContainerBrowser.java @@ -18,12 +18,14 @@ import org.eclipse.core.runtime.Path; import org.eclipse.debug.core.sourcelookup.ISourceContainer; import org.eclipse.debug.core.sourcelookup.ISourceLookupDirector; import org.eclipse.debug.core.sourcelookup.containers.ExternalArchiveSourceContainer; -import org.eclipse.debug.internal.ui.DebugUIPlugin; import org.eclipse.debug.internal.ui.sourcelookup.SourceLookupUIMessages; import org.eclipse.debug.ui.sourcelookup.AbstractSourceContainerBrowser; +import org.eclipse.jface.dialogs.IDialogSettings; import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.FileDialog; import org.eclipse.swt.widgets.Shell; +import org.eclipse.ui.PlatformUI; +import org.osgi.framework.FrameworkUtil; /** * The browser for adding an external archive. @@ -36,7 +38,10 @@ public class ExternalArchiveSourceContainerBrowser extends AbstractSourceContain @Override public ISourceContainer[] addSourceContainers(Shell shell, ISourceLookupDirector director) { FileDialog dialog = new FileDialog(shell, SWT.OPEN | SWT.MULTI | SWT.SHEET); - String rootDir = DebugUIPlugin.getDefault().getDialogSettings().get(ROOT_DIR); + IDialogSettings dialogSettings = PlatformUI + .getDialogSettingsProvider(FrameworkUtil.getBundle(ExternalArchiveSourceContainerBrowser.class)) + .getDialogSettings(); + String rootDir = dialogSettings.get(ROOT_DIR); dialog.setText(SourceLookupUIMessages.ExternalArchiveSourceContainerBrowser_2); dialog.setFilterExtensions(new String[]{"*.jar;*.zip"}); //$NON-NLS-1$ if (rootDir != null) { @@ -54,7 +59,7 @@ public class ExternalArchiveSourceContainerBrowser extends AbstractSourceContain // TODO: configure auto-detect containers[i]= new ExternalArchiveSourceContainer(path.toOSString(), true); } - DebugUIPlugin.getDefault().getDialogSettings().put(ROOT_DIR, rootDir); + dialogSettings.put(ROOT_DIR, rootDir); return containers; } return new ISourceContainer[0]; diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/browsers/FolderSourceContainerDialog.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/browsers/FolderSourceContainerDialog.java index 4a2b07e79..dd32e7040 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/browsers/FolderSourceContainerDialog.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/browsers/FolderSourceContainerDialog.java @@ -22,6 +22,7 @@ import org.eclipse.debug.internal.core.IInternalDebugCoreConstants; import org.eclipse.debug.internal.ui.DebugUIPlugin; import org.eclipse.debug.internal.ui.IDebugHelpContextIds; import org.eclipse.debug.internal.ui.sourcelookup.SourceLookupUIMessages; +import org.eclipse.jface.dialogs.IDialogSettings; import org.eclipse.jface.viewers.ILabelProvider; import org.eclipse.jface.viewers.ITreeContentProvider; import org.eclipse.jface.viewers.Viewer; @@ -35,6 +36,7 @@ import org.eclipse.ui.PlatformUI; import org.eclipse.ui.dialogs.ElementTreeSelectionDialog; import org.eclipse.ui.dialogs.ISelectionStatusValidator; import org.eclipse.ui.views.navigator.ResourceComparator; +import org.osgi.framework.FrameworkUtil; /** * The dialog for selecting the folder for which a source container will be created. @@ -102,7 +104,10 @@ public class FolderSourceContainerDialog extends ElementTreeSelectionDialog { setAllowMultiple(true); setMessage(SourceLookupUIMessages.folderSelection_label); PlatformUI.getWorkbench().getHelpSystem().setHelp(parent, IDebugHelpContextIds.ADD_FOLDER_CONTAINER_DIALOG); - setSearchSubfolders(DebugUIPlugin.getDefault().getDialogSettings().getBoolean(LAST_SUBDIR_SETTING)); + IDialogSettings dialogSettings = PlatformUI + .getDialogSettingsProvider(FrameworkUtil.getBundle(FolderSourceContainerDialog.class)) + .getDialogSettings(); + setSearchSubfolders(dialogSettings.getBoolean(LAST_SUBDIR_SETTING)); addFilter(new ViewerFilter() { @Override public boolean select(Viewer viewer, Object parentElement, Object element) { @@ -140,7 +145,8 @@ public class FolderSourceContainerDialog extends ElementTreeSelectionDialog { @Override protected void okPressed() { fSearchSubfolders = fSubfoldersButton.getSelection(); - DebugUIPlugin.getDefault().getDialogSettings().put(LAST_SUBDIR_SETTING, fSearchSubfolders); + PlatformUI.getDialogSettingsProvider(FrameworkUtil.getBundle(FolderSourceContainerDialog.class)) + .getDialogSettings().put(LAST_SUBDIR_SETTING, fSearchSubfolders); super.okPressed(); } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/breadcrumb/BreadcrumbItemDropDown.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/breadcrumb/BreadcrumbItemDropDown.java index 8d29b3187..fda0d7398 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/breadcrumb/BreadcrumbItemDropDown.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/breadcrumb/BreadcrumbItemDropDown.java @@ -50,6 +50,8 @@ import org.eclipse.swt.widgets.Listener; import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.ToolBar; import org.eclipse.swt.widgets.Widget; +import org.eclipse.ui.PlatformUI; +import org.osgi.framework.FrameworkUtil; /** @@ -428,7 +430,8 @@ class BreadcrumbItemDropDown implements IBreadcrumbDropDownSite { } private IDialogSettings getDialogSettings() { - IDialogSettings javaSettings= DebugUIPlugin.getDefault().getDialogSettings(); + IDialogSettings javaSettings = PlatformUI + .getDialogSettingsProvider(FrameworkUtil.getBundle(BreadcrumbItemDropDown.class)).getDialogSettings(); IDialogSettings settings= javaSettings.getSection(DIALOG_SETTINGS); if (settings == null) { settings= javaSettings.addNewSection(DIALOG_SETTINGS); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/CommonTab.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/CommonTab.java index 0356a558d..9db7ae525 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/CommonTab.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/CommonTab.java @@ -83,6 +83,7 @@ import org.eclipse.ui.ide.IDEEncoding; import org.eclipse.ui.model.WorkbenchContentProvider; import org.eclipse.ui.model.WorkbenchLabelProvider; import org.eclipse.ui.views.navigator.ResourceComparator; +import org.osgi.framework.FrameworkUtil; /** * Launch configuration tab used to specify the location a launch configuration @@ -183,7 +184,8 @@ public class CommonTab extends AbstractLaunchConfigurationTab { * @since 3.6 */ IDialogSettings getDialogBoundsSettings(String id) { - IDialogSettings settings = DebugUIPlugin.getDefault().getDialogSettings(); + IDialogSettings settings = PlatformUI.getDialogSettingsProvider(FrameworkUtil.getBundle(CommonTab.class)) + .getDialogSettings(); IDialogSettings section = settings.getSection(id); if (section == null) { section = settings.addNewSection(id); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/DebugPopup.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/DebugPopup.java index 2a507ae59..d8afa766d 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/DebugPopup.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/DebugPopup.java @@ -19,7 +19,6 @@ import org.eclipse.core.commands.AbstractHandler; import org.eclipse.core.commands.ExecutionEvent; import org.eclipse.core.commands.ExecutionException; import org.eclipse.core.commands.IHandler; -import org.eclipse.debug.internal.ui.DebugUIPlugin; import org.eclipse.debug.internal.ui.views.DebugUIViewsMessages; import org.eclipse.jface.dialogs.IDialogSettings; import org.eclipse.jface.dialogs.PopupDialog; @@ -33,6 +32,7 @@ import org.eclipse.ui.PlatformUI; import org.eclipse.ui.handlers.IHandlerActivation; import org.eclipse.ui.handlers.IHandlerService; import org.eclipse.ui.keys.IBindingService; +import org.osgi.framework.FrameworkUtil; /** * A <code>PopupDialog</code> that is automatically positioned relative @@ -171,8 +171,7 @@ public abstract class DebugPopup extends PopupDialog { @Override protected IDialogSettings getDialogSettings() { - IDialogSettings settings = DebugUIPlugin.getDefault().getDialogSettings(); - return settings; + return PlatformUI.getDialogSettingsProvider(FrameworkUtil.getBundle(DebugPopup.class)).getDialogSettings(); } @Override diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/StringVariableSelectionDialog.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/StringVariableSelectionDialog.java index 363df67de..e2f8c1dc1 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/StringVariableSelectionDialog.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/StringVariableSelectionDialog.java @@ -49,6 +49,7 @@ import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.Text; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.dialogs.ElementListSelectionDialog; +import org.osgi.framework.FrameworkUtil; /** * A dialog that prompts the user to choose and configure a string @@ -387,7 +388,9 @@ public class StringVariableSelectionDialog extends ElementListSelectionDialog { @Override protected IDialogSettings getDialogBoundsSettings() { - IDialogSettings settings = DebugUIPlugin.getDefault().getDialogSettings(); + IDialogSettings settings = PlatformUI + .getDialogSettingsProvider(FrameworkUtil.getBundle(StringVariableSelectionDialog.class)) + .getDialogSettings(); IDialogSettings section = settings.getSection(getDialogSettingsSectionName()); if (section == null) { section = settings.addNewSection(getDialogSettingsSectionName()); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/sourcelookup/SourceLookupDialog.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/sourcelookup/SourceLookupDialog.java index 92440853b..3aa4351e6 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/sourcelookup/SourceLookupDialog.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/sourcelookup/SourceLookupDialog.java @@ -34,6 +34,7 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.PlatformUI; +import org.osgi.framework.FrameworkUtil; /** * A dialog for editing the source lookup path of a @@ -128,7 +129,8 @@ public class SourceLookupDialog extends TitleAreaDialog { @Override protected IDialogSettings getDialogBoundsSettings() { - IDialogSettings settings = DebugUIPlugin.getDefault().getDialogSettings(); + IDialogSettings settings = PlatformUI + .getDialogSettingsProvider(FrameworkUtil.getBundle(SourceLookupDialog.class)).getDialogSettings(); IDialogSettings section = settings.getSection(getClass().getName()); if (section == null) { section = settings.addNewSection(getClass().getName()); |