Convert usage of org.eclipse.ui.commands.ICommand to

org.eclipse.core.commands.Command

Author: nitind

core/bundles/org.eclipse.wst.sse.ui/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.wst.sse.ui; singleton:=true
-Bundle-Version: 1.7.800.qualifier
+Bundle-Version: 1.7.900.qualifier
 Bundle-Activator: org.eclipse.wst.sse.ui.internal.SSEUIPlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -50,21 +50,21 @@ Export-Package: org.eclipse.wst.sse.ui,
  org.eclipse.wst.sse.ui.typing,
  org.eclipse.wst.sse.ui.views.contentoutline,
  org.eclipse.wst.sse.ui.views.properties
-Require-Bundle: org.eclipse.ui.ide;bundle-version="[3.21.0,4.0.0)",
+Require-Bundle: org.eclipse.ui.ide;bundle-version="[3.22.0,4.0.0)",
  org.eclipse.jface.text;bundle-version="[3.13.0,4.0.0)",
  org.eclipse.debug.ui;bundle-version="[3.13.0,4.0.0)",
  org.eclipse.debug.core;bundle-version="[3.11.0,4.0.0)",
  org.eclipse.ui.editors;bundle-version="[3.16.0,4.0.0)";visibility:=reexport,
  org.eclipse.search;bundle-version="[3.11.0,4.0.0)",
  org.eclipse.ui;bundle-version="[3.109.0,4.0.0)",
  org.eclipse.ui.workbench.texteditor;bundle-version="[3.10.0,4.0.0)",
- org.eclipse.ui.workbench;bundle-version="[3.117.0,4.0.0)",
+ org.eclipse.ui.workbench;bundle-version="[3.131.0,4.0.0)",
  org.eclipse.ui.forms;bundle-version="[3.7.0,4.0.0)",
  org.eclipse.ui.views;bundle-version="[3.9.0,4.0.0)",
  org.eclipse.wst.sse.core;bundle-version="[1.2.0,2.0.0)",
  org.eclipse.core.runtime;bundle-version="[3.27.0,4.0.0)",
  org.eclipse.core.resources;bundle-version="[3.13.0,4.0.0)",
- org.eclipse.core.commands;bundle-version="[3.9.0,4.0.0)",
+ org.eclipse.core.commands;bundle-version="[3.11.0,4.0.0)",
  org.eclipse.wst.validation;bundle-version="[1.3.0,2.0.0)",
  org.eclipse.emf.common;bundle-version="[2.14.0,3.0.0)",
  org.eclipse.core.expressions;bundle-version="[3.8.0,4.0.0)",

core/bundles/org.eclipse.wst.sse.ui/pom.xml

@@ -21,7 +21,7 @@
 
   <groupId>org.eclipse.webtools.sourceediting</groupId>
   <artifactId>org.eclipse.wst.sse.ui</artifactId>
-  <version>1.7.800-SNAPSHOT</version>
+  <version>1.7.900-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
   <build> 

core/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/quickoutline/QuickOutlinePopupDialog.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2019 IBM Corporation and others.
+ * Copyright (c) 2010, 2024 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
@@ -12,6 +12,7 @@
  *******************************************************************************/
 package org.eclipse.wst.sse.ui.internal.quickoutline;
 
+import org.eclipse.core.commands.Command;
 import org.eclipse.jface.action.IMenuManager;
 import org.eclipse.jface.bindings.TriggerSequence;
 import org.eclipse.jface.bindings.keys.KeySequence;
@@ -62,7 +63,7 @@
 import org.eclipse.ui.IWorkbenchPage;
 import org.eclipse.ui.IWorkbenchWindow;
 import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.commands.ICommand;
+import org.eclipse.ui.commands.ICommandService;
 import org.eclipse.ui.keys.IBindingService;
 import org.eclipse.ui.texteditor.ITextEditor;
 import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
@@ -109,7 +110,7 @@ public class QuickOutlinePopupDialog extends PopupDialog implements IInformation
 	 * {@link org.eclipse.jdt.internal.ui.text.JavaOutlineInformationControl}
 	 */
 	private KeyAdapter fKeyAdapter;
-	private ICommand fInvokingCommand;
+	private Command fInvokingCommand;
 	private TriggerSequence[] fInvokingCommandKeySequences;
 	private AbstractQuickOutlineConfiguration fFirstConfiguration;
 	private AbstractQuickOutlineConfiguration fConfiguration;
@@ -123,7 +124,7 @@ public QuickOutlinePopupDialog(Shell parent, int shellStyle, IStructuredModel mo
 		fFilter = configuration.getFilter();
 		fModel = model;
 
-		fInvokingCommand = PlatformUI.getWorkbench().getCommandSupport().getCommandManager().getCommand(DIALOG_SECTION);
+		fInvokingCommand = PlatformUI.getWorkbench().getService(ICommandService.class).getCommand(DIALOG_SECTION);
 
 		updateStatusText();
 
@@ -298,14 +299,14 @@ private ITextEditor getActiveTextEditor() {
 		return editor;
 	}
 
-	final protected ICommand getInvokingCommand() {
+	final protected Command getInvokingCommand() {
 		return fInvokingCommand;
 	}
 
 	final protected TriggerSequence[] getInvokingCommandKeySequences() {
 		if (fInvokingCommandKeySequences == null) {
 			if (getInvokingCommand() != null) {
-				IBindingService bindingService = PlatformUI.getWorkbench().getAdapter(IBindingService.class);
+				IBindingService bindingService = PlatformUI.getWorkbench().getService(IBindingService.class);
 				fInvokingCommandKeySequences = bindingService.getActiveBindingsFor(getInvokingCommand().getId());
 				return fInvokingCommandKeySequences;
 			}