Make connector API provisional and prevent static singleton access

Currently Connector API is public API (what seems unnecessary as one can
query connectors by ID), also there are some static singleton services
that binds consumers to that explicit class and might hinder future
evolution.

This now makes all connector API provisional except for one shared with
another connector but reducing that part as much as possible. Also some
interfaces are extracted and registered as services to allow loose
coupling. In one case the static access can be even avoided completely
now.

Author: laeubi

terminal/bundles/org.eclipse.terminal.connector.local/META-INF/MANIFEST.MF

@@ -21,6 +21,6 @@ Require-Bundle: org.eclipse.core.expressions;bundle-version="[3.9.400,4)",
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Bundle-ActivationPolicy: lazy
 Bundle-Localization: plugin
-Export-Package: org.eclipse.terminal.connector.local.controls;version="1.0.0",
- org.eclipse.terminal.connector.local.launcher;version="1.0.0"
+Export-Package: org.eclipse.terminal.connector.local.controls;x-internal:=true,
+ org.eclipse.terminal.connector.local.launcher;x-internal:=true
 Automatic-Module-Name: org.eclipse.terminal.connector.local

terminal/bundles/org.eclipse.terminal.connector.local/src/org/eclipse/terminal/connector/local/activator/UIPlugin.java

@@ -17,6 +17,7 @@
 import org.eclipse.terminal.view.core.ITerminalService;
 import org.eclipse.terminal.view.core.utils.ScopedEclipsePreferences;
 import org.eclipse.terminal.view.core.utils.TraceHandler;
+import org.eclipse.terminal.view.ui.launcher.ILaunchDelegateManager;
 import org.eclipse.ui.plugin.AbstractUIPlugin;
 import org.osgi.framework.BundleContext;
 import org.osgi.util.tracker.ServiceTracker;
@@ -120,14 +121,25 @@ public static ImageDescriptor getImageDescriptor(String key) {
 		return getDefault().getImageRegistry().getDescriptor(key);
 	}
 
-	private static ServiceTracker<ITerminalService, ITerminalService> serviceTracker;
+	private static ServiceTracker<ITerminalService, ITerminalService> terminalServiceTracker;
 
 	public static synchronized ITerminalService getTerminalService() {
-		if (serviceTracker == null) {
-			serviceTracker = new ServiceTracker<>(getDefault().getBundle().getBundleContext(), ITerminalService.class,
-					null);
-			serviceTracker.open();
+		if (terminalServiceTracker == null) {
+			terminalServiceTracker = new ServiceTracker<>(getDefault().getBundle().getBundleContext(),
+					ITerminalService.class, null);
+			terminalServiceTracker.open();
 		}
-		return serviceTracker.getService();
+		return terminalServiceTracker.getService();
+	}
+
+	private static ServiceTracker<ILaunchDelegateManager, ILaunchDelegateManager> launchDelegateServiceTracker;
+
+	public static synchronized ILaunchDelegateManager getLaunchDelegateManager() {
+		if (launchDelegateServiceTracker == null) {
+			launchDelegateServiceTracker = new ServiceTracker<>(getDefault().getBundle().getBundleContext(),
+					ILaunchDelegateManager.class, null);
+			launchDelegateServiceTracker.open();
+		}
+		return launchDelegateServiceTracker.getService();
 	}
 }

terminal/bundles/org.eclipse.terminal.connector.local/src/org/eclipse/terminal/connector/local/launcher/LocalLauncherHandler.java

@@ -21,9 +21,9 @@
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.terminal.connector.local.activator.UIPlugin;
 import org.eclipse.terminal.view.core.ITerminalsConnectorConstants;
 import org.eclipse.terminal.view.ui.launcher.ILauncherDelegate;
-import org.eclipse.terminal.view.ui.launcher.LauncherDelegateManager;
 import org.eclipse.ui.IEditorInput;
 import org.eclipse.ui.IPathEditorInput;
 import org.eclipse.ui.handlers.HandlerUtil;
@@ -56,7 +56,7 @@ public Object execute(ExecutionEvent event) throws ExecutionException {
 		}
 
 		// Get all applicable launcher delegates for the current selection
-		ILauncherDelegate[] delegates = LauncherDelegateManager.getInstance().getApplicableLauncherDelegates(selection);
+		ILauncherDelegate[] delegates = UIPlugin.getLaunchDelegateManager().getApplicableLauncherDelegates(selection);
 		// Find the local terminal launcher delegate
 		ILauncherDelegate delegate = null;
 		for (ILauncherDelegate candidate : delegates) {

terminal/bundles/org.eclipse.terminal.connector.process/META-INF/MANIFEST.MF

@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.terminal.connector.process;singleton:=true
 Bundle-Version: 1.0.0.qualifier
-Bundle-Activator: org.eclipse.terminal.connector.process.activator.UIPlugin
+Bundle-Activator: org.eclipse.terminal.connector.process.internal.UIPlugin
 Bundle-Vendor: %providerName
 Import-Package: org.eclipse.cdt.utils.pty;mandatory:=native,
  org.eclipse.cdt.utils.spawner;mandatory:=native,
@@ -22,5 +22,5 @@ Bundle-RequiredExecutionEnvironment: JavaSE-17
 Bundle-ActivationPolicy: lazy
 Bundle-Localization: plugin
 Export-Package: org.eclipse.terminal.connector.process;version="1.0.0",
- org.eclipse.terminal.connector.process.help;version="1.0.0"
+ org.eclipse.terminal.connector.process.internal;x-internal:=true
 Automatic-Module-Name: org.eclipse.terminal.connector.process

terminal/bundles/org.eclipse.terminal.connector.process/plugin.xml

@@ -24,7 +24,7 @@
 <!-- Terminal launcher delegate contributions -->
    <extension point="org.eclipse.terminal.view.ui.launcherDelegates">
       <delegate
-            class="org.eclipse.terminal.connector.process.ProcessLauncherDelegate"
+            class="org.eclipse.terminal.connector.process.internal.ProcessLauncherDelegate"
             hidden="true"
             id="org.eclipse.terminal.connector.process.launcher.process"
             label="%ProcessLauncherDelegate.label">

terminal/bundles/org.eclipse.terminal.connector.process/src/org/eclipse/terminal/connector/process/ProcessConnector.java

@@ -29,17 +29,17 @@
 import org.eclipse.core.runtime.Platform;
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.osgi.util.NLS;
-import org.eclipse.swt.custom.CTabItem;
 import org.eclipse.swt.widgets.Shell;
+import org.eclipse.swt.widgets.Widget;
 import org.eclipse.terminal.connector.ISettingsStore;
 import org.eclipse.terminal.connector.ITerminalControl;
 import org.eclipse.terminal.connector.NullSettingsStore;
 import org.eclipse.terminal.connector.TerminalState;
-import org.eclipse.terminal.connector.process.activator.UIPlugin;
-import org.eclipse.terminal.connector.process.nls.Messages;
+import org.eclipse.terminal.connector.process.internal.Messages;
+import org.eclipse.terminal.connector.process.internal.ProcessMonitor;
+import org.eclipse.terminal.connector.process.internal.UIPlugin;
 import org.eclipse.terminal.view.core.ILineSeparatorConstants;
 import org.eclipse.terminal.view.core.utils.Env;
-import org.eclipse.terminal.view.ui.launcher.ConsoleManager;
 import org.eclipse.terminal.view.ui.streams.AbstractStreamsConnector;
 
 /**
@@ -209,10 +209,7 @@ public void connect(ITerminalControl control) {
 			// Save the shell so the error message can have somewhere to display
 			Shell shell = control.getShell();
 			// Lookup the tab item
-			CTabItem item = ConsoleManager.getInstance().findConsole(control);
-			if (item != null) {
-				item.dispose();
-			}
+			UIPlugin.getConsoleManager().findConsole(control).ifPresent(Widget::dispose);
 			// Get the error message from the exception
 			String msg = e.getLocalizedMessage() != null ? e.getLocalizedMessage() : ""; //$NON-NLS-1$
 			Assert.isNotNull(msg);

terminal/bundles/org.eclipse.terminal.connector.process/src/org/eclipse/terminal/connector/process/help/IContextHelpIds.java renamed to terminal/bundles/org.eclipse.terminal.connector.process/src/org/eclipse/terminal/connector/process/internal/IContextHelpIds.java

@@ -9,9 +9,7 @@
  * Contributors:
  * Wind River Systems - initial API and implementation
  *******************************************************************************/
-package org.eclipse.terminal.connector.process.help;
-
-import org.eclipse.terminal.connector.process.activator.UIPlugin;
+package org.eclipse.terminal.connector.process.internal;
 
 /**
  * Context help id definitions.

terminal/bundles/org.eclipse.terminal.connector.process/src/org/eclipse/terminal/connector/process/nls/Messages.java renamed to terminal/bundles/org.eclipse.terminal.connector.process/src/org/eclipse/terminal/connector/process/internal/Messages.java

@@ -9,7 +9,7 @@
  * Contributors:
  * Wind River Systems - initial API and implementation
  *******************************************************************************/
-package org.eclipse.terminal.connector.process.nls;
+package org.eclipse.terminal.connector.process.internal;
 
 import org.eclipse.osgi.util.NLS;
 
@@ -18,15 +18,9 @@
  */
 public class Messages extends NLS {
 
-	// The plug-in resource bundle name
-	private static final String BUNDLE_NAME = "org.eclipse.terminal.connector.process.nls.Messages"; //$NON-NLS-1$
-
-	/**
-	 * Static constructor.
-	 */
 	static {
 		// Load message values from bundle file
-		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
+		NLS.initializeMessages(Messages.class.getName(), Messages.class);
 	}
 
 	// **** Declare externalized string id's down here *****

terminal/bundles/org.eclipse.terminal.connector.process/src/org/eclipse/terminal/connector/process/nls/Messages.properties renamed to terminal/bundles/org.eclipse.terminal.connector.process/src/org/eclipse/terminal/connector/process/internal/Messages.properties

@@ -9,7 +9,7 @@
  * Contributors:
  * Wind River Systems - initial API and implementation
  *******************************************************************************/
-package org.eclipse.terminal.connector.process;
+package org.eclipse.terminal.connector.process.internal;
 
 import java.util.Map;
 
@@ -19,7 +19,7 @@
 import org.eclipse.terminal.connector.ITerminalConnector;
 import org.eclipse.terminal.connector.InMemorySettingsStore;
 import org.eclipse.terminal.connector.TerminalConnectorExtension;
-import org.eclipse.terminal.connector.process.activator.UIPlugin;
+import org.eclipse.terminal.connector.process.ProcessSettings;
 import org.eclipse.terminal.view.core.ITerminalService;
 import org.eclipse.terminal.view.core.ITerminalServiceOutputStreamMonitorListener;
 import org.eclipse.terminal.view.core.ITerminalsConnectorConstants;