diff options
Diffstat (limited to 'bundles/org.eclipse.team.ui/src/org/eclipse/team/internal')
9 files changed, 16 insertions, 15 deletions
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/ProjectSetImporter.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/ProjectSetImporter.java index bd87b9d44..445898e6d 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/ProjectSetImporter.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/ProjectSetImporter.java @@ -152,7 +152,7 @@ public class ProjectSetImporter { //try working sets IMemento[] sets = xmlMemento.getChildren("workingSets"); //$NON-NLS-1$ - IWorkingSetManager wsManager = TeamUIPlugin.getPlugin().getWorkbench().getWorkingSetManager(); + IWorkingSetManager wsManager = PlatformUI.getWorkbench().getWorkingSetManager(); boolean replaceAll = false; boolean mergeAll = false; boolean skipAll = false; diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/TeamUIPlugin.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/TeamUIPlugin.java index 8848cd264..511bffdea 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/TeamUIPlugin.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/TeamUIPlugin.java @@ -152,7 +152,7 @@ public class TeamUIPlugin extends AbstractUIPlugin { * @return the active workbench page */ public static IWorkbenchPage getActivePage() { - IWorkbenchWindow window = getPlugin().getWorkbench().getActiveWorkbenchWindow(); + IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow(); if (window == null) return null; return window.getActivePage(); } diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/Utils.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/Utils.java index 5fad0c007..2019b9ea2 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/Utils.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/Utils.java @@ -311,7 +311,7 @@ public class Utils { if (!shell.isDisposed()) return shell; } - IWorkbench workbench = TeamUIPlugin.getPlugin().getWorkbench(); + IWorkbench workbench = PlatformUI.getWorkbench(); if (workbench != null) { IWorkbenchWindow window = workbench.getActiveWorkbenchWindow(); if (window != null) { diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/actions/TeamAction.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/actions/TeamAction.java index 6653f89d3..12f99ce0e 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/actions/TeamAction.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/actions/TeamAction.java @@ -63,6 +63,7 @@ import org.eclipse.ui.IWorkbenchPartReference; import org.eclipse.ui.IWorkbenchWindow; import org.eclipse.ui.IWorkbenchWindowActionDelegate; import org.eclipse.ui.PartInitException; +import org.eclipse.ui.PlatformUI; import org.eclipse.ui.handlers.HandlerUtil; import org.eclipse.ui.ide.ResourceUtil; @@ -281,7 +282,7 @@ public abstract class TeamAction extends AbstractHandler implements IObjectActio } else if (window != null) { return window.getShell(); } else { - IWorkbench workbench = TeamUIPlugin.getPlugin().getWorkbench(); + IWorkbench workbench = PlatformUI.getWorkbench(); if (workbench == null) return null; IWorkbenchWindow window = workbench.getActiveWorkbenchWindow(); if (window == null) return null; diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/history/OpenLocalFileAction.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/history/OpenLocalFileAction.java index 60101a8ae..88eea79ec 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/history/OpenLocalFileAction.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/history/OpenLocalFileAction.java @@ -27,6 +27,7 @@ import org.eclipse.ui.IEditorDescriptor; import org.eclipse.ui.IEditorRegistry; import org.eclipse.ui.IWorkbench; import org.eclipse.ui.IWorkbenchPage; +import org.eclipse.ui.PlatformUI; import org.eclipse.ui.actions.BaseSelectionListenerAction; public class OpenLocalFileAction extends BaseSelectionListenerAction { @@ -61,7 +62,7 @@ public class OpenLocalFileAction extends BaseSelectionListenerAction { } /* private */String getEditorID(String fileName, InputStream contents) { - IWorkbench workbench = TeamUIPlugin.getPlugin().getWorkbench(); + IWorkbench workbench = PlatformUI.getWorkbench(); IEditorRegistry registry = workbench.getEditorRegistry(); IContentType type = null; diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizeManager.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizeManager.java index 2a3cd25a1..472bcd309 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizeManager.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizeManager.java @@ -459,7 +459,7 @@ public class SynchronizeManager implements ISynchronizeManager { @Override public ISynchronizeView showSynchronizeViewInActivePage() { - IWorkbench workbench = TeamUIPlugin.getPlugin().getWorkbench(); + IWorkbench workbench = PlatformUI.getWorkbench(); IWorkbenchWindow window = workbench.getActiveWorkbenchWindow(); boolean switchPerspectives = promptForPerspectiveSwitch(); diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/ExportProjectSetMainPage.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/ExportProjectSetMainPage.java index 04c8b274f..0ce623310 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/ExportProjectSetMainPage.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/ExportProjectSetMainPage.java @@ -57,7 +57,6 @@ import org.eclipse.team.core.RepositoryProvider; import org.eclipse.team.internal.ui.IHelpContextIds; import org.eclipse.team.internal.ui.SWTUtils; import org.eclipse.team.internal.ui.TeamUIMessages; -import org.eclipse.team.internal.ui.TeamUIPlugin; import org.eclipse.team.internal.ui.Utils; import org.eclipse.ui.IWorkingSet; import org.eclipse.ui.IWorkingSetManager; @@ -96,7 +95,7 @@ public class ExportProjectSetMainPage extends TeamWizardPage { public TreePath[] getParents(Object element) { if (element instanceof IProject){ ArrayList<IWorkingSet> treePaths = new ArrayList<>(); - IWorkingSet[] workingSets = TeamUIPlugin.getPlugin().getWorkbench().getWorkingSetManager().getWorkingSets(); + IWorkingSet[] workingSets = PlatformUI.getWorkbench().getWorkingSetManager().getWorkingSets(); for (IWorkingSet workingSet : workingSets) { IAdaptable[] elements = workingSet.getElements(); for (IAdaptable d : elements) { @@ -556,7 +555,7 @@ public class ExportProjectSetMainPage extends TeamWizardPage { updateEnablement(); }); - wsTableViewer.setInput(TeamUIPlugin.getPlugin().getWorkbench().getWorkingSetManager()); + wsTableViewer.setInput(PlatformUI.getWorkbench().getWorkingSetManager()); } private void addButtons(Composite projectComposite){ @@ -621,7 +620,7 @@ public class ExportProjectSetMainPage extends TeamWizardPage { newWorkingSet.setLayoutData(data); newWorkingSet.setText(TeamUIMessages.ExportProjectSetMainPage_EditButton); newWorkingSet.addListener(SWT.Selection, event -> { - final IWorkingSetManager workingSetManager = TeamUIPlugin.getPlugin().getWorkbench().getWorkingSetManager(); + final IWorkingSetManager workingSetManager = PlatformUI.getWorkbench().getWorkingSetManager(); IWorkingSetSelectionDialog wsWizard = workingSetManager.createWorkingSetSelectionDialog(getShell(), false); if (wsWizard != null) { IPropertyChangeListener propListener = null; @@ -669,7 +668,7 @@ public class ExportProjectSetMainPage extends TeamWizardPage { } public void refresh(){ - wsTableViewer.setInput(TeamUIPlugin.getPlugin().getWorkbench().getWorkingSetManager()); + wsTableViewer.setInput(PlatformUI.getWorkbench().getWorkingSetManager()); } private void updateEnablement() { diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/ImportProjectSetOperation.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/ImportProjectSetOperation.java index f8d5c95d6..d8e6532b7 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/ImportProjectSetOperation.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/ImportProjectSetOperation.java @@ -21,10 +21,10 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.jface.operation.IRunnableContext; import org.eclipse.team.internal.ui.ProjectSetImporter; import org.eclipse.team.internal.ui.TeamUIMessages; -import org.eclipse.team.internal.ui.TeamUIPlugin; import org.eclipse.team.ui.TeamOperation; import org.eclipse.ui.IWorkingSet; import org.eclipse.ui.IWorkingSetManager; +import org.eclipse.ui.PlatformUI; public class ImportProjectSetOperation extends TeamOperation { @@ -112,7 +112,7 @@ public class ImportProjectSetOperation extends TeamOperation { } private void createWorkingSet(IWorkingSet[] workingSets, IProject[] projects) { - IWorkingSetManager manager = TeamUIPlugin.getPlugin().getWorkbench().getWorkingSetManager(); + IWorkingSetManager manager = PlatformUI.getWorkbench().getWorkingSetManager(); String workingSetName; for (IWorkingSet workingSet : workingSets) { workingSetName = workingSet.getName(); diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/WorkingSetsDialog.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/WorkingSetsDialog.java index 001fed4c1..18369648f 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/WorkingSetsDialog.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/WorkingSetsDialog.java @@ -35,8 +35,8 @@ import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.Text; import org.eclipse.team.internal.ui.TeamUIMessages; -import org.eclipse.team.internal.ui.TeamUIPlugin; import org.eclipse.ui.IWorkingSet; +import org.eclipse.ui.PlatformUI; public class WorkingSetsDialog extends TitleAreaDialog { @@ -90,7 +90,7 @@ public class WorkingSetsDialog extends TitleAreaDialog { wsTableViewer.setContentProvider(new ArrayContentProvider()); wsTableViewer.setLabelProvider(new WorkingSetLabelProvider()); - wsTableViewer.setInput(TeamUIPlugin.getPlugin().getWorkbench().getWorkingSetManager().getWorkingSets()); + wsTableViewer.setInput(PlatformUI.getWorkbench().getWorkingSetManager().getWorkingSets()); setupListeners(); |