diff options
Diffstat (limited to 'bundles/org.eclipse.team.ui')
8 files changed, 16 insertions, 12 deletions
diff --git a/bundles/org.eclipse.team.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.team.ui/META-INF/MANIFEST.MF index f3e1506f9..714e7e386 100644 --- a/bundles/org.eclipse.team.ui/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.team.ui/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.team.ui; singleton:=true -Bundle-Version: 3.8.1100.qualifier +Bundle-Version: 3.8.1200.qualifier Bundle-Activator: org.eclipse.team.internal.ui.TeamUIPlugin Bundle-Vendor: %providerName Bundle-Localization: plugin diff --git a/bundles/org.eclipse.team.ui/pom.xml b/bundles/org.eclipse.team.ui/pom.xml index b6cef9838..63fd937d9 100644 --- a/bundles/org.eclipse.team.ui/pom.xml +++ b/bundles/org.eclipse.team.ui/pom.xml @@ -19,6 +19,6 @@ </parent> <groupId>org.eclipse.team</groupId> <artifactId>org.eclipse.team.ui</artifactId> - <version>3.8.1100-SNAPSHOT</version> + <version>3.8.1200-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project> diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/GlobalRefreshElementSelectionPage.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/GlobalRefreshElementSelectionPage.java index d1ab141d1..9203e1f25 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/GlobalRefreshElementSelectionPage.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/GlobalRefreshElementSelectionPage.java @@ -33,12 +33,12 @@ import org.eclipse.swt.widgets.Text; import org.eclipse.swt.widgets.TreeItem; import org.eclipse.team.internal.ui.IHelpContextIds; import org.eclipse.team.internal.ui.TeamUIMessages; -import org.eclipse.team.internal.ui.TeamUIPlugin; import org.eclipse.ui.IWorkingSet; import org.eclipse.ui.IWorkingSetManager; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.dialogs.ContainerCheckedTreeViewer; import org.eclipse.ui.dialogs.IWorkingSetSelectionDialog; +import org.osgi.framework.FrameworkUtil; public abstract class GlobalRefreshElementSelectionPage extends WizardPage { @@ -69,7 +69,7 @@ public abstract class GlobalRefreshElementSelectionPage extends WizardPage { protected GlobalRefreshElementSelectionPage(String pageName) { super(pageName); - IDialogSettings s = TeamUIPlugin.getPlugin().getDialogSettings(); + IDialogSettings s = PlatformUI.getDialogSettingsProvider(FrameworkUtil.getBundle(GlobalRefreshElementSelectionPage.class)).getDialogSettings(); this.settings = s.getSection(STORE_SECTION); if(settings == null) { settings = s.addNewSection(STORE_SECTION); diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizeView.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizeView.java index 5222e9c3d..e85ebc025 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizeView.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizeView.java @@ -111,6 +111,7 @@ import org.eclipse.ui.part.PageBook; import org.eclipse.ui.part.PageBookView; import org.eclipse.ui.part.ShowInContext; import org.eclipse.ui.progress.IWorkbenchSiteProgressService; +import org.osgi.framework.FrameworkUtil; /** * Implements a Synchronize View that contains multiple synchronize participants. @@ -644,7 +645,7 @@ public class SynchronizeView extends PageBookView implements ISynchronizeView, I * Return the dialog settings for the view */ private IDialogSettings getDialogSettings() { - IDialogSettings workbenchSettings = TeamUIPlugin.getPlugin().getDialogSettings(); + IDialogSettings workbenchSettings = PlatformUI.getDialogSettingsProvider(FrameworkUtil.getBundle(SynchronizeView.class)).getDialogSettings(); IDialogSettings syncViewSettings = workbenchSettings.getSection(KEY_SETTINGS_SECTION); if (syncViewSettings == null) { syncViewSettings = workbenchSettings.addNewSection(KEY_SETTINGS_SECTION); diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/ConfigureProjectWizardMainPage.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/ConfigureProjectWizardMainPage.java index 91a9d2c92..08736cf62 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/ConfigureProjectWizardMainPage.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/ConfigureProjectWizardMainPage.java @@ -51,6 +51,7 @@ import org.eclipse.ui.activities.WorkbenchActivityHelper; import org.eclipse.ui.model.AdaptableList; import org.eclipse.ui.model.WorkbenchContentProvider; import org.eclipse.ui.model.WorkbenchLabelProvider; +import org.osgi.framework.FrameworkUtil; /** * The main page of the configure project wizard. It contains a table @@ -248,7 +249,7 @@ public class ConfigureProjectWizardMainPage extends WizardPage { private void initializeWizardSelection() { String selectedWizardId = null; - IDialogSettings dialogSettings = TeamUIPlugin.getPlugin().getDialogSettings(); + IDialogSettings dialogSettings = PlatformUI.getDialogSettingsProvider(FrameworkUtil.getBundle(ConfigureProjectWizardMainPage.class)).getDialogSettings(); this.settings = dialogSettings.getSection("ConfigureProjectWizard"); //$NON-NLS-1$ if (this.settings == null) { this.settings = dialogSettings.addNewSection("ConfigureProjectWizard"); //$NON-NLS-1$ diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/GlobalSynchronizeWizard.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/GlobalSynchronizeWizard.java index 0764a54ee..b79362f7d 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/GlobalSynchronizeWizard.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/GlobalSynchronizeWizard.java @@ -18,10 +18,11 @@ import org.eclipse.jface.wizard.IWizard; import org.eclipse.jface.wizard.Wizard; import org.eclipse.team.internal.ui.ITeamUIImages; import org.eclipse.team.internal.ui.TeamUIMessages; -import org.eclipse.team.internal.ui.TeamUIPlugin; import org.eclipse.team.ui.TeamImages; import org.eclipse.team.ui.synchronize.ISynchronizeParticipantReference; import org.eclipse.ui.IWorkbench; +import org.eclipse.ui.PlatformUI; +import org.osgi.framework.FrameworkUtil; /** * The wizard for synchronizing a synchronize participant. @@ -42,7 +43,7 @@ public class GlobalSynchronizeWizard extends Wizard { setForcePreviousAndNextButtons(true); setNeedsProgressMonitor(false); - final IDialogSettings pluginSettings= TeamUIPlugin.getPlugin().getDialogSettings(); + final IDialogSettings pluginSettings= PlatformUI.getDialogSettingsProvider(FrameworkUtil.getBundle(GlobalSynchronizeWizard.class)).getDialogSettings(); IDialogSettings wizardSettings= pluginSettings.getSection(DIALOG_SETTINGS_SECTION); if (wizardSettings == null) { pluginSettings.addNewSection(DIALOG_SETTINGS_SECTION); diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/PsfStore.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/PsfStore.java index 226269af8..dabfcc982 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/PsfStore.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/PsfStore.java @@ -16,7 +16,8 @@ package org.eclipse.team.internal.ui.wizards; import java.util.Vector; import org.eclipse.jface.dialogs.IDialogSettings; -import org.eclipse.team.internal.ui.TeamUIPlugin; +import org.eclipse.ui.PlatformUI; +import org.osgi.framework.FrameworkUtil; public abstract class PsfStore { // Most recently used filename is first in the array. @@ -87,7 +88,7 @@ public abstract class PsfStore { if (_section != null) return _section; - IDialogSettings settings = TeamUIPlugin.getPlugin().getDialogSettings(); + IDialogSettings settings = PlatformUI.getDialogSettingsProvider(FrameworkUtil.getBundle(PsfStore.class)).getDialogSettings(); _section = settings.getSection(STORE_SECTION); if (_section != null) return _section; diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/SaveablePartDialog.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/SaveablePartDialog.java index 75c82f340..621fc0690 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/SaveablePartDialog.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/SaveablePartDialog.java @@ -28,8 +28,8 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Shell; import org.eclipse.team.internal.ui.TeamUIMessages; -import org.eclipse.team.internal.ui.TeamUIPlugin; import org.eclipse.ui.PlatformUI; +import org.osgi.framework.FrameworkUtil; /** * A dialog that displays a {@link org.eclipse.team.ui.ISaveableWorkbenchPart} and @@ -108,7 +108,7 @@ public class SaveablePartDialog extends TrayDialog { @Override protected IDialogSettings getDialogBoundsSettings() { - IDialogSettings compareSettings = TeamUIPlugin.getPlugin().getDialogSettings(); + IDialogSettings compareSettings = PlatformUI.getDialogSettingsProvider(FrameworkUtil.getBundle(SaveablePartDialog.class)).getDialogSettings(); String sectionName = this.getClass().getName(); IDialogSettings dialogSettings = compareSettings.getSection(sectionName); if (dialogSettings == null) { |