diff options
author | Thomas Wolf | 2020-03-29 20:59:26 +0000 |
---|---|---|
committer | Thomas Wolf | 2020-03-29 21:00:57 +0000 |
commit | 386be40234b0eca71adffda43b95e97d7a039304 (patch) | |
tree | 7a3f79496f63d9ed29c4128d8e904600416be726 /org.eclipse.egit.ui/src/org/eclipse/egit | |
parent | 331e93eb114f48cf5e2175973ce81ea12fb0f741 (diff) | |
download | egit-386be40234b0eca71adffda43b95e97d7a039304.tar.gz egit-386be40234b0eca71adffda43b95e97d7a039304.tar.xz egit-386be40234b0eca71adffda43b95e97d7a039304.zip |
[cleanup] Remove no longer needed CommonUtils.getService()
Use IServiceLocator.getService() directly; it's generified since
Eclipse 4.5.
Change-Id: I6c86d1b47813c07927ae3bb85e6ca17d28c30125
Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
Diffstat (limited to 'org.eclipse.egit.ui/src/org/eclipse/egit')
24 files changed, 72 insertions, 91 deletions
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/UIUtils.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/UIUtils.java index 9199e619f0..90298cfe45 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/UIUtils.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/UIUtils.java @@ -31,7 +31,6 @@ import org.eclipse.core.expressions.IEvaluationContext; import org.eclipse.core.runtime.Adapters; import org.eclipse.core.runtime.Path; import org.eclipse.egit.core.internal.Utils; -import org.eclipse.egit.ui.internal.CommonUtils; import org.eclipse.egit.ui.internal.RepositorySaveableFilter; import org.eclipse.egit.ui.internal.UIIcons; import org.eclipse.egit.ui.internal.UIText; @@ -990,7 +989,8 @@ public class UIUtils { */ public static void notifySelectionChangedWithCurrentSelection( ISelectionListener selectionListener, IServiceLocator serviceLocator) { - IHandlerService handlerService = CommonUtils.getService(serviceLocator, IHandlerService.class); + IHandlerService handlerService = serviceLocator + .getService(IHandlerService.class); IEvaluationContext state = handlerService.getCurrentState(); // This seems to be the most reliable way to get the active part, it // also returns a part when it is called while creating a view that is diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/ActionUtils.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/ActionUtils.java index 2add80da57..2d2a5c3613 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/ActionUtils.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/ActionUtils.java @@ -286,8 +286,8 @@ public final class ActionUtils { */ public static void setGlobalActions(Control control, Collection<? extends IAction> actions) { - setGlobalActions(control, actions, CommonUtils - .getService(PlatformUI.getWorkbench(), IHandlerService.class)); + setGlobalActions(control, actions, + PlatformUI.getWorkbench().getService(IHandlerService.class)); } /** diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/CommonUtils.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/CommonUtils.java index de7d5fc8fb..2795654250 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/CommonUtils.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/CommonUtils.java @@ -41,7 +41,6 @@ import org.eclipse.ui.ISources; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.commands.ICommandService; import org.eclipse.ui.handlers.IHandlerService; -import org.eclipse.ui.services.IServiceLocator; /** * Class containing all common utils @@ -178,14 +177,14 @@ public class CommonUtils { */ public static boolean runCommand(String commandId, IStructuredSelection selection) { - ICommandService commandService = CommonUtils - .getService(PlatformUI.getWorkbench(), ICommandService.class); + ICommandService commandService = PlatformUI.getWorkbench() + .getService(ICommandService.class); Command cmd = commandService.getCommand(commandId); if (!cmd.isDefined()) return false; - IHandlerService handlerService = CommonUtils - .getService(PlatformUI.getWorkbench(), IHandlerService.class); + IHandlerService handlerService = PlatformUI.getWorkbench() + .getService(IHandlerService.class); EvaluationContext c = null; if (selection != null) { c = new EvaluationContext( @@ -209,25 +208,6 @@ public class CommonUtils { } /** - * Retrieves the service corresponding to the given API. - * <p> - * Workaround for "Unnecessary cast" errors, see bug 441615. Can be removed - * when EGit depends on Eclipse 4.5 or higher. - * - * @param locator - * the service locator, must not be null - * @param api - * the interface the service implements, must not be null - * @return the service, or null if no such service could be found - * @see IServiceLocator#getService(Class) - */ - @SuppressWarnings("unchecked") - public static <T> T getService(IServiceLocator locator, Class<T> api) { - Object service = locator.getService(api); - return (T) service; - } - - /** * Assuming that the string {@code commitMessage} is a commit message, * returns the offset in the string of the footer of the commit message, if * one can be found, or -1 otherwise. diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/PushMenu.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/PushMenu.java index 35f7744cfe..88220c6232 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/PushMenu.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/PushMenu.java @@ -13,7 +13,6 @@ *******************************************************************************/ package org.eclipse.egit.ui.internal.actions; -import org.eclipse.egit.ui.internal.CommonUtils; import org.eclipse.egit.ui.internal.UIText; import org.eclipse.egit.ui.internal.selection.SelectionRepositoryStateCache; import org.eclipse.egit.ui.internal.selection.SelectionUtils; @@ -59,7 +58,7 @@ public class PushMenu extends CompoundContributionItem implements @Override public void initialize(IServiceLocator locator) { this.serviceLocator = locator; - this.handlerService = CommonUtils.getService(locator, IHandlerService.class); + this.handlerService = locator.getService(IHandlerService.class); } @Override diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/ReplaceWithOursTheirsMenu.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/ReplaceWithOursTheirsMenu.java index e8229bf2de..9b11032b8a 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/ReplaceWithOursTheirsMenu.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/ReplaceWithOursTheirsMenu.java @@ -36,7 +36,6 @@ import org.eclipse.egit.core.op.DiscardChangesOperation; import org.eclipse.egit.core.op.DiscardChangesOperation.Stage; import org.eclipse.egit.ui.Activator; import org.eclipse.egit.ui.JobFamilies; -import org.eclipse.egit.ui.internal.CommonUtils; import org.eclipse.egit.ui.internal.UIText; import org.eclipse.egit.ui.internal.selection.SelectionUtils; import org.eclipse.jface.action.Action; @@ -69,8 +68,8 @@ public class ReplaceWithOursTheirsMenu extends CompoundContributionItem protected IContributionItem[] getContributionItems() { List<IContributionItem> items = new ArrayList<>(); - IHandlerService handlerService = CommonUtils.getService(serviceLocator, - IHandlerService.class); + IHandlerService handlerService = serviceLocator + .getService(IHandlerService.class); IStructuredSelection selection = SelectionUtils .getSelection(handlerService.getCurrentState()); IPath[] locations = SelectionUtils.getSelectedLocations(selection); diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/RepositoryAction.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/RepositoryAction.java index 43f7c5b703..c0c3dc3702 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/RepositoryAction.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/RepositoryAction.java @@ -19,7 +19,6 @@ import org.eclipse.core.commands.NotHandledException; import org.eclipse.core.commands.common.NotDefinedException; import org.eclipse.core.expressions.IEvaluationContext; import org.eclipse.egit.ui.Activator; -import org.eclipse.egit.ui.internal.CommonUtils; import org.eclipse.jface.action.IAction; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.IStructuredSelection; @@ -91,8 +90,8 @@ public abstract class RepositoryAction extends AbstractHandler implements */ protected ExecutionEvent createExecutionEvent() { IServiceLocator locator = getServiceLocator(); - ICommandService srv = CommonUtils.getService(locator, ICommandService.class); - IHandlerService hsrv = CommonUtils.getService(locator, IHandlerService.class); + ICommandService srv = locator.getService(ICommandService.class); + IHandlerService hsrv = locator.getService(IHandlerService.class); Command command = srv.getCommand(commandId); ExecutionEvent event = hsrv.createExecutionEvent(command, null); @@ -144,7 +143,8 @@ public abstract class RepositoryAction extends AbstractHandler implements if (!shouldRunAction()) return null; - ICommandService srv = CommonUtils.getService(getServiceLocator(), ICommandService.class); + ICommandService srv = getServiceLocator() + .getService(ICommandService.class); Command command = srv.getCommand(commandId); try { return command.executeWithChecks(event); diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/StashesMenu.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/StashesMenu.java index bb0bafeebf..df4bd3ac02 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/StashesMenu.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/StashesMenu.java @@ -18,7 +18,6 @@ import java.util.List; import org.eclipse.core.expressions.IEvaluationContext; import org.eclipse.egit.ui.Activator; -import org.eclipse.egit.ui.internal.CommonUtils; import org.eclipse.egit.ui.internal.UIIcons; import org.eclipse.egit.ui.internal.UIText; import org.eclipse.egit.ui.internal.commit.CommitEditor; @@ -129,7 +128,8 @@ public class StashesMenu extends CompoundContributionItem implements if (serviceLocator == null) return null; - IHandlerService handlerService = CommonUtils.getService(serviceLocator, IHandlerService.class); + IHandlerService handlerService = serviceLocator + .getService(IHandlerService.class); if (handlerService == null) return null; diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/SwitchToMenu.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/SwitchToMenu.java index f4261578de..4ccb93773c 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/SwitchToMenu.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/SwitchToMenu.java @@ -491,7 +491,7 @@ public class SwitchToMenu extends ContributionItem implements @Override public void initialize(IServiceLocator serviceLocator) { - handlerService = CommonUtils.getService(serviceLocator, IHandlerService.class); + handlerService = serviceLocator.getService(IHandlerService.class); } } diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/SynchronizeWithMenu.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/SynchronizeWithMenu.java index 6e6a350b58..133d9ca399 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/SynchronizeWithMenu.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/SynchronizeWithMenu.java @@ -187,7 +187,7 @@ public class SynchronizeWithMenu extends ContributionItem implements @Override public void initialize(IServiceLocator serviceLocator) { - srv = CommonUtils.getService(serviceLocator, ISelectionService.class); + srv = serviceLocator.getService(ISelectionService.class); } @Override diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/commit/CommitEditor.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/commit/CommitEditor.java index c7df97ef55..72f10eeca9 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/commit/CommitEditor.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/commit/CommitEditor.java @@ -350,7 +350,7 @@ public class CommitEditor extends SharedHeaderFormEditor implements } }; toolbar.add(repositoryLabelControl); - CommonUtils.getService(getSite(), IPartService.class) + getSite().getService(IPartService.class) .addPartListener(activationListener); if (commit.isStash()) { toolbar.add(createActionContributionItem(ActionCommands.STASH_APPLY, @@ -459,7 +459,7 @@ public class CommitEditor extends SharedHeaderFormEditor implements } private void addContributions(IToolBarManager toolBarManager) { - IMenuService menuService = CommonUtils.getService(getSite(), IMenuService.class); + IMenuService menuService = getSite().getService(IMenuService.class); if (menuService != null && toolBarManager instanceof ContributionManager) { ContributionManager contributionManager = (ContributionManager) toolBarManager; @@ -507,7 +507,7 @@ public class CommitEditor extends SharedHeaderFormEditor implements removePageChangedListener(pageListener); pageListener = null; } - CommonUtils.getService(getSite(), IPartService.class) + getSite().getService(IPartService.class) .removePartListener(activationListener); refListenerHandle.remove(); headerFocusTracker.dispose(); diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/SpellcheckableMessageArea.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/SpellcheckableMessageArea.java index 4419f59b93..59c48531ad 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/SpellcheckableMessageArea.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/SpellcheckableMessageArea.java @@ -495,7 +495,7 @@ public class SpellcheckableMessageArea extends Composite { * found. */ protected IHandlerService getHandlerService() { - return CommonUtils.getService(PlatformUI.getWorkbench(), IHandlerService.class); + return PlatformUI.getWorkbench().getService(IHandlerService.class); } private SourceViewerDecorationSupport configureAnnotationPreferences() { diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/CommitGraphTable.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/CommitGraphTable.java index 1be42bfbba..7571c89285 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/CommitGraphTable.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/CommitGraphTable.java @@ -324,8 +324,8 @@ class CommitGraphTable { if (input == null || !input.isSingleFile()) return; - ICommandService srv = CommonUtils.getService(site, ICommandService.class); - IHandlerService hsrv = CommonUtils.getService(site, IHandlerService.class); + ICommandService srv = site.getService(ICommandService.class); + IHandlerService hsrv = site.getService(IHandlerService.class); Command cmd = srv.getCommand(ShowVersionsHandler.COMMAND_ID); Parameterization[] parms; if (Activator.getDefault().getPreferenceStore().getBoolean( diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/operations/GitScopeUtil.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/operations/GitScopeUtil.java index d72302598a..a25de67a0f 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/operations/GitScopeUtil.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/operations/GitScopeUtil.java @@ -29,7 +29,6 @@ import org.eclipse.egit.core.synchronize.GitResourceVariantTreeSubscriber; import org.eclipse.egit.core.synchronize.dto.GitSynchronizeDataSet; import org.eclipse.egit.ui.Activator; import org.eclipse.egit.ui.UIPreferences; -import org.eclipse.egit.ui.internal.CommonUtils; import org.eclipse.egit.ui.internal.UIText; import org.eclipse.jface.operation.IRunnableWithProgress; import org.eclipse.jgit.annotations.Nullable; @@ -158,7 +157,8 @@ public class GitScopeUtil { }; - IProgressService progressService = CommonUtils.getService(part.getSite(), IProgressService.class); + IProgressService progressService = part.getSite() + .getService(IProgressService.class); progressService.run(true, true, runnable); return relatedChanges.toArray(new IResource[0]); diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/rebase/RebaseInteractiveView.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/rebase/RebaseInteractiveView.java index a491592378..12e2c43593 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/rebase/RebaseInteractiveView.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/rebase/RebaseInteractiveView.java @@ -256,7 +256,7 @@ public class RebaseInteractiveView extends ViewPart implements } private void removeListeners() { - ISelectionService srv = CommonUtils.getService(getSite(), ISelectionService.class); + ISelectionService srv = getSite().getService(ISelectionService.class); srv.removePostSelectionListener(RepositoriesView.VIEW_ID, selectionChangedListener); if (currentPlan != null) @@ -538,7 +538,7 @@ public class RebaseInteractiveView extends ViewPart implements } }; - ISelectionService srv = CommonUtils.getService(getSite(), ISelectionService.class); + ISelectionService srv = getSite().getService(ISelectionService.class); srv.addPostSelectionListener(selectionChangedListener); } diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/reflog/ReflogView.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/reflog/ReflogView.java index 84ec572c37..3fe8f4935f 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/reflog/ReflogView.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/reflog/ReflogView.java @@ -29,7 +29,6 @@ import org.eclipse.egit.core.project.RepositoryMapping; import org.eclipse.egit.ui.Activator; import org.eclipse.egit.ui.UIPreferences; import org.eclipse.egit.ui.UIUtils; -import org.eclipse.egit.ui.internal.CommonUtils; import org.eclipse.egit.ui.internal.PreferenceBasedDateFormatter; import org.eclipse.egit.ui.internal.TreeColumnPatternFilter; import org.eclipse.egit.ui.internal.UIIcons; @@ -416,9 +415,9 @@ public class ReflogView extends ViewPart implements RefsChangedListener, IShowIn partListener = new VisibilityListener(); IWorkbenchPartSite site = getSite(); - CommonUtils.getService(site, IPartService.class) + site.getService(IPartService.class) .addPartListener(partListener); - ISelectionService service = CommonUtils.getService(site, ISelectionService.class); + ISelectionService service = site.getService(ISelectionService.class); service.addPostSelectionListener(selectionChangedListener); // Use current selection to populate reflog view @@ -456,7 +455,8 @@ public class ReflogView extends ViewPart implements RefsChangedListener, IShowIn } private void activateContextService() { - IContextService contextService = CommonUtils.getService(getSite(), IContextService.class); + IContextService contextService = getSite() + .getService(IContextService.class); if (contextService != null) contextService.activateContext(VIEW_ID); @@ -467,9 +467,10 @@ public class ReflogView extends ViewPart implements RefsChangedListener, IShowIn InstanceScope.INSTANCE .getNode(org.eclipse.egit.core.Activator.getPluginId()) .removePreferenceChangeListener(prefListener); - CommonUtils.getService(getSite(), IPartService.class) + getSite().getService(IPartService.class) .removePartListener(partListener); - ISelectionService service = CommonUtils.getService(getSite(), ISelectionService.class); + ISelectionService service = getSite() + .getService(ISelectionService.class); service.removePostSelectionListener(selectionChangedListener); if (addRefsChangedListener != null) { addRefsChangedListener.remove(); diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/RepositoriesView.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/RepositoriesView.java index 173d9ecac9..d8631c36c9 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/RepositoriesView.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/RepositoriesView.java @@ -355,7 +355,8 @@ public class RepositoriesView extends CommonNavigator implements IShowInSource, addLink.addHyperlinkListener(new HyperlinkAdapter() { @Override public void linkActivated(HyperlinkEvent e) { - IHandlerService service = CommonUtils.getService(getViewSite(), IHandlerService.class); + IHandlerService service = getViewSite() + .getService(IHandlerService.class); UIUtils.executeCommand(service, "org.eclipse.egit.ui.RepositoriesViewAddRepository"); //$NON-NLS-1$ } @@ -373,7 +374,8 @@ public class RepositoriesView extends CommonNavigator implements IShowInSource, cloneLink.addHyperlinkListener(new HyperlinkAdapter() { @Override public void linkActivated(HyperlinkEvent e) { - IHandlerService service = CommonUtils.getService(getViewSite(), IHandlerService.class); + IHandlerService service = getViewSite() + .getService(IHandlerService.class); UIUtils.executeCommand(service, "org.eclipse.egit.ui.RepositoriesViewClone"); //$NON-NLS-1$ } @@ -392,7 +394,8 @@ public class RepositoriesView extends CommonNavigator implements IShowInSource, createLink.addHyperlinkListener(new HyperlinkAdapter() { @Override public void linkActivated(HyperlinkEvent e) { - IHandlerService service = CommonUtils.getService(getViewSite(), IHandlerService.class); + IHandlerService service = getViewSite() + .getService(IHandlerService.class); UIUtils.executeCommand(service, "org.eclipse.egit.ui.RepositoriesViewCreateRepository"); //$NON-NLS-1$ } @@ -412,14 +415,15 @@ public class RepositoriesView extends CommonNavigator implements IShowInSource, IWorkbenchWindow w = PlatformUI.getWorkbench() .getActiveWorkbenchWindow(); - ICommandService csrv = CommonUtils.getService(w, ICommandService.class); + ICommandService csrv = w.getService(ICommandService.class); reactOnSelection = csrv.getCommand(LINK_WITH_SELECTION_ID) .getState(RegistryToggleState.STATE_ID); reactOnSelection.addListener(reactOnSelectionListener); branchHierarchy = csrv.getCommand(ToggleCommand.BRANCH_HIERARCHY_ID) .getState(RegistryToggleState.STATE_ID); branchHierarchy.addListener(stateChangeListener); - IWorkbenchSiteProgressService service = CommonUtils.getService(getSite(), IWorkbenchSiteProgressService.class); + IWorkbenchSiteProgressService service = getSite() + .getService(IWorkbenchSiteProgressService.class); if (service != null) { service.showBusyForFamily(JobFamilies.REPO_VIEW_REFRESH); service.showBusyForFamily(JobFamilies.CLONE); @@ -506,7 +510,7 @@ public class RepositoriesView extends CommonNavigator implements IShowInSource, executeOpenCommand(element); } }); - ctxSrv = CommonUtils.getService(getSite(), IContextService.class); + ctxSrv = getSite().getService(IContextService.class); viewer.addSelectionChangedListener(event -> { handleSingleRepositoryContext(event.getSelection(), viewer); }); @@ -524,7 +528,7 @@ public class RepositoriesView extends CommonNavigator implements IShowInSource, }); setupInlineEditing(viewer); // react on selection changes - ISelectionService srv = CommonUtils.getService(getSite(), ISelectionService.class); + ISelectionService srv = getSite().getService(ISelectionService.class); srv.addPostSelectionListener(selectionChangedListener); // react on changes in the configured repositories repositoryUtil.getPreferences().addPreferenceChangeListener( @@ -792,7 +796,7 @@ public class RepositoriesView extends CommonNavigator implements IShowInSource, repositoryUtil.getPreferences().removePreferenceChangeListener( configurationListener); - ISelectionService srv = CommonUtils.getService(getSite(), ISelectionService.class); + ISelectionService srv = getSite().getService(ISelectionService.class); srv.removePostSelectionListener(selectionChangedListener); unregisterRepositoryListeners(); diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/RepositoriesViewContentProvider.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/RepositoriesViewContentProvider.java index 3438ba1597..dd2f118edf 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/RepositoriesViewContentProvider.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/RepositoriesViewContentProvider.java @@ -48,7 +48,6 @@ import org.eclipse.core.runtime.Status; import org.eclipse.egit.core.RepositoryCache; import org.eclipse.egit.core.RepositoryUtil; import org.eclipse.egit.ui.Activator; -import org.eclipse.egit.ui.internal.CommonUtils; import org.eclipse.egit.ui.internal.UIText; import org.eclipse.egit.ui.internal.commands.ToggleCommand; import org.eclipse.egit.ui.internal.groups.RepositoryGroup; @@ -131,7 +130,8 @@ public class RepositoriesViewContentProvider implements ITreeContentProvider { public RepositoriesViewContentProvider(boolean showUnbornHead) { super(); this.showUnbornHead = showUnbornHead; - ICommandService srv = CommonUtils.getService(PlatformUI.getWorkbench(), ICommandService.class); + ICommandService srv = PlatformUI.getWorkbench() + .getService(ICommandService.class); branchHierarchy = srv.getCommand(ToggleCommand.BRANCH_HIERARCHY_ID) .getState(RegistryToggleState.STATE_ID); } diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/RepositoryTreeNodeDecorator.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/RepositoryTreeNodeDecorator.java index 1547d9fd2b..3286a49eab 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/RepositoryTreeNodeDecorator.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/RepositoryTreeNodeDecorator.java @@ -28,7 +28,6 @@ import org.eclipse.egit.core.internal.indexdiff.IndexDiffCache; import org.eclipse.egit.core.internal.indexdiff.IndexDiffCacheEntry; import org.eclipse.egit.core.internal.indexdiff.IndexDiffData; import org.eclipse.egit.ui.Activator; -import org.eclipse.egit.ui.internal.CommonUtils; import org.eclipse.egit.ui.internal.UIIcons; import org.eclipse.egit.ui.internal.UIText; import org.eclipse.egit.ui.internal.commands.ToggleCommand; @@ -83,7 +82,8 @@ public class RepositoryTreeNodeDecorator extends GitDecorator * Constructs a repositories view label provider */ public RepositoryTreeNodeDecorator() { - ICommandService srv = CommonUtils.getService(PlatformUI.getWorkbench(), ICommandService.class); + ICommandService srv = PlatformUI.getWorkbench() + .getService(ICommandService.class); verboseBranchModeState = srv .getCommand(ToggleCommand.COMMIT_MESSAGE_DECORATION_ID) .getState(RegistryToggleState.STATE_ID); diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/tree/command/GarbageCollectCommand.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/tree/command/GarbageCollectCommand.java index 15fe7b2eba..15c4db1c2a 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/tree/command/GarbageCollectCommand.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/tree/command/GarbageCollectCommand.java @@ -24,7 +24,6 @@ import org.eclipse.core.runtime.SubMonitor; import org.eclipse.core.runtime.jobs.Job; import org.eclipse.egit.core.op.GarbageCollectOperation; import org.eclipse.egit.ui.Activator; -import org.eclipse.egit.ui.internal.CommonUtils; import org.eclipse.egit.ui.internal.UIText; import org.eclipse.egit.ui.internal.repository.tree.RepositoryNode; import org.eclipse.jgit.lib.Repository; @@ -91,8 +90,8 @@ public class GarbageCollectCommand extends job.setUser(true); IServiceLocator serviceLocator = HandlerUtil.getActiveSite(event); if (serviceLocator != null) { - IWorkbenchSiteProgressService service = CommonUtils.getService( - serviceLocator, IWorkbenchSiteProgressService.class); + IWorkbenchSiteProgressService service = serviceLocator + .getService(IWorkbenchSiteProgressService.class); service.schedule(job); } else { job.schedule(); diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/tree/command/RemoveCommand.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/tree/command/RemoveCommand.java index fc47e17ce2..016372c8e6 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/tree/command/RemoveCommand.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/tree/command/RemoveCommand.java @@ -42,7 +42,6 @@ import org.eclipse.core.runtime.jobs.Job; import org.eclipse.egit.core.RepositoryCache; import org.eclipse.egit.ui.Activator; import org.eclipse.egit.ui.JobFamilies; -import org.eclipse.egit.ui.internal.CommonUtils; import org.eclipse.egit.ui.internal.UIText; import org.eclipse.egit.ui.internal.groups.RepositoryGroups; import org.eclipse.egit.ui.internal.repository.tree.RepositoryNode; @@ -90,8 +89,8 @@ public class RemoveCommand extends IServiceLocator serviceLocator = HandlerUtil.getActiveSite(event); IWorkbenchSiteProgressService service = null; if (serviceLocator != null) { - service = CommonUtils.getService(serviceLocator, - IWorkbenchSiteProgressService.class); + service = serviceLocator + .getService(IWorkbenchSiteProgressService.class); } // get selected nodes diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/revision/GitCompareFileRevisionEditorInput.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/revision/GitCompareFileRevisionEditorInput.java index 8de917451b..0f3e7e2e20 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/revision/GitCompareFileRevisionEditorInput.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/revision/GitCompareFileRevisionEditorInput.java @@ -37,7 +37,6 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.egit.core.Activator; import org.eclipse.egit.core.internal.storage.IndexFileRevision; import org.eclipse.egit.core.internal.storage.OpenWorkspaceVersionEnabled; -import org.eclipse.egit.ui.internal.CommonUtils; import org.eclipse.egit.ui.internal.CompareUtils; import org.eclipse.egit.ui.internal.EgitUiEditorUtils; import org.eclipse.egit.ui.internal.UIText; @@ -626,7 +625,8 @@ public class GitCompareFileRevisionEditorInput extends SaveableCompareEditorInpu ISaveablesLifecycleListener listener = Adapters.adapt(part, ISaveablesLifecycleListener.class); if (listener == null) - listener = CommonUtils.getService(part.getSite(), ISaveablesLifecycleListener.class); + listener = part.getSite() + .getService(ISaveablesLifecycleListener.class); return listener; } diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/selection/SelectionUtils.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/selection/SelectionUtils.java index 6161668e85..f42b66f15c 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/selection/SelectionUtils.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/selection/SelectionUtils.java @@ -529,7 +529,8 @@ public class SelectionUtils { if (activeWorkbenchWindow == null) { return null; } - IHandlerService hsr = CommonUtils.getService(activeWorkbenchWindow, IHandlerService.class); + IHandlerService hsr = activeWorkbenchWindow + .getService(IHandlerService.class); return hsr != null ? hsr.getCurrentState() : null; } diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/staging/StagingView.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/staging/StagingView.java index ba0c91a03e..e0b4d064c7 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/staging/StagingView.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/staging/StagingView.java @@ -1035,7 +1035,7 @@ public class StagingView extends ViewPart } @Override protected IHandlerService getHandlerService() { - return CommonUtils.getService(getSite(), IHandlerService.class); + return getSite().getService(IHandlerService.class); } }; commitMessageText.setData(FormToolkit.KEY_DRAW_BORDER, @@ -1276,11 +1276,9 @@ public class StagingView extends ViewPart selectionChangedListener, site); // react on selection changes - ISelectionService srv = CommonUtils.getService(site, ISelectionService.class); + ISelectionService srv = site.getService(ISelectionService.class); srv.addPostSelectionListener(selectionChangedListener); - CommonUtils.getService(site, IPartService.class).addPartListener( - partListener); - + site.getService(IPartService.class).addPartListener(partListener); site.setSelectionProvider(new RepositorySelectionProvider( new MultiViewerSelectionProvider(unstagedViewer, stagedViewer), @@ -1304,8 +1302,8 @@ public class StagingView extends ViewPart restoreSashFormWeights(); - IWorkbenchSiteProgressService service = CommonUtils.getService( - getSite(), IWorkbenchSiteProgressService.class); + IWorkbenchSiteProgressService service = getSite() + .getService(IWorkbenchSiteProgressService.class); if (service != null && reactOnSelection) // If we are linked, each time IndexDiffUpdateJob starts, indicate // that the view is busy (e.g. reload() will trigger this job in @@ -4333,7 +4331,8 @@ public class StagingView extends ViewPart private void schedule(Job job, boolean useRepositoryRule) { if (useRepositoryRule) job.setRule(RuleUtil.getRule(currentRepository)); - IWorkbenchSiteProgressService service = CommonUtils.getService(getSite(), IWorkbenchSiteProgressService.class); + IWorkbenchSiteProgressService service = getSite() + .getService(IWorkbenchSiteProgressService.class); if (service != null) service.schedule(job, 0, true); else @@ -4370,9 +4369,9 @@ public class StagingView extends ViewPart public void dispose() { super.dispose(); - ISelectionService srv = CommonUtils.getService(getSite(), ISelectionService.class); + ISelectionService srv = getSite().getService(ISelectionService.class); srv.removePostSelectionListener(selectionChangedListener); - CommonUtils.getService(getSite(), IPartService.class) + getSite().getService(IPartService.class) .removePartListener(partListener); if (cacheEntry != null) { diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/synchronize/GitActionContributor.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/synchronize/GitActionContributor.java index 2951dd8299..68be1d46aa 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/synchronize/GitActionContributor.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/synchronize/GitActionContributor.java @@ -19,9 +19,9 @@ import static org.eclipse.egit.ui.internal.UIIcons.PUSH; import static org.eclipse.egit.ui.internal.UIText.GitActionContributor_ExpandAll; import static org.eclipse.egit.ui.internal.actions.ActionCommands.ADD_TO_INDEX; import static org.eclipse.egit.ui.internal.actions.ActionCommands.COMMIT_ACTION; +import static org.eclipse.egit.ui.internal.actions.ActionCommands.CREATE_PATCH; import static org.eclipse.egit.ui.internal.actions.ActionCommands.IGNORE_ACTION; import static org.eclipse.egit.ui.internal.actions.ActionCommands.MERGE_TOOL_ACTION; -import static org.eclipse.egit.ui.internal.actions.ActionCommands.CREATE_PATCH; import static org.eclipse.egit.ui.internal.actions.ActionCommands.PUSH_ACTION; import static org.eclipse.egit.ui.internal.actions.ActionCommands.REMOVE_FROM_INDEX; import static org.eclipse.egit.ui.internal.synchronize.model.SupportedContextActionsHelper.canPush; @@ -35,7 +35,6 @@ import static org.eclipse.ui.menus.CommandContributionItem.STYLE_PUSH; import org.eclipse.core.expressions.IEvaluationContext; import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.IPath; -import org.eclipse.egit.ui.internal.CommonUtils; import org.eclipse.egit.ui.internal.UIText; import org.eclipse.egit.ui.internal.resources.IResourceState; import org.eclipse.egit.ui.internal.resources.ResourceStateFactory; @@ -149,7 +148,8 @@ class GitActionContributor extends SynchronizePageActionGroup { IWorkbenchWindow activeWorkbenchWindow = workbench .getActiveWorkbenchWindow(); - IHandlerService hsr = CommonUtils.getService(activeWorkbenchWindow, IHandlerService.class); + IHandlerService hsr = activeWorkbenchWindow + .getService(IHandlerService.class); IEvaluationContext ctx = hsr.getCurrentState(); ctx.addVariable(ACTIVE_MENU_SELECTION_NAME, getContext().getSelection()); |