Skip to content

Commit a6e08e0

Browse files
fedejeannefedejeanne
authored
Merge branch 'eclipse-platform:master' into master
2 parents 2d945e7 + b47f9cd commit a6e08e0

File tree

31 files changed

+559
-365
lines changed

31 files changed

+559
-365
lines changed

‎resources/bundles/org.eclipse.core.resources/META-INF/MANIFEST.MF‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
22
Bundle-ManifestVersion: 2
33
Bundle-Name: %pluginName
44
Bundle-SymbolicName: org.eclipse.core.resources; singleton:=true
5-
Bundle-Version: 3.22.300.qualifier
5+
Bundle-Version: 3.23.0.qualifier
66
Bundle-Activator: org.eclipse.core.resources.ResourcesPlugin
77
Bundle-Vendor: %providerName
88
Bundle-Localization: plugin
@@ -25,14 +25,14 @@ Export-Package: org.eclipse.core.internal.dtree;x-internal:=true,
2525
org.eclipse.core.resources.team,
2626
org.eclipse.core.resources.undo.snapshot,
2727
org.eclipse.core.resources.variableresolvers
28-
Require-Bundle: org.eclipse.ant.core;bundle-version="[3.1.0,4.0.0)";resolution:=optional,
28+
Require-Bundle: org.eclipse.ant.core;bundle-version="[3.7.0,4.0.0)";resolution:=optional,
2929
org.eclipse.core.expressions;bundle-version="[3.9.0,4.0.0)",
30-
org.eclipse.core.filesystem;bundle-version="[1.10.0,2.0.0)",
31-
org.eclipse.core.runtime;bundle-version="[3.31.0,4.0.0)"
30+
org.eclipse.core.filesystem;bundle-version="[1.11.0,2.0.0)",
31+
org.eclipse.core.runtime;bundle-version="[3.34.0,4.0.0)"
3232
Bundle-ActivationPolicy: lazy
3333
Service-Component: OSGI-INF/org.eclipse.core.internal.resources.CheckMissingNaturesListener.xml,
3434
OSGI-INF/org.eclipse.core.internal.resources.ResourceChangeListenerRegistrar.xml
3535
Bundle-RequiredExecutionEnvironment: JavaSE-17
3636
Automatic-Module-Name: org.eclipse.core.resources
37-
Import-Package: com.sun.jna;version="[5.14.0,6.0.0)",
38-
org.eclipse.osgi.service.datalocation;version="[1.3.0,2.0.0)"
37+
Import-Package: com.sun.jna;version="[5.17.0,6.0.0)",
38+
org.eclipse.osgi.service.datalocation;version="[1.4.0,2.0.0)"

‎runtime/bundles/org.eclipse.core.runtime/META-INF/MANIFEST.MF‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
Manifest-Version: 1.0
22
Bundle-ManifestVersion: 2
33
Bundle-Name: %pluginName
4-
Bundle-Version: 3.33.200.qualifier
4+
Bundle-Version: 3.34.0.qualifier
55
Bundle-SymbolicName: org.eclipse.core.runtime; singleton:=true
66
Bundle-Vendor: %providerName
77
Bundle-Activator: org.eclipse.core.internal.runtime.PlatformActivator
88
Bundle-Localization: plugin
99
Export-Package: org.eclipse.core.internal.preferences.legacy;x-internal:=true,
1010
org.eclipse.core.internal.runtime;x-internal:=true,
1111
org.eclipse.core.runtime;version="3.7.0"
12-
Require-Bundle: org.eclipse.osgi;bundle-version="[3.18.0,4.0.0)";visibility:=reexport,
12+
Require-Bundle: org.eclipse.osgi;bundle-version="[3.23.0,4.0.0)";visibility:=reexport,
1313
org.eclipse.equinox.common;bundle-version="[3.20.0,4.0.0)";visibility:=reexport,
1414
org.eclipse.core.jobs;bundle-version="[3.15.0,4.0.0)";visibility:=reexport,
1515
org.eclipse.equinox.registry;bundle-version="[3.12.0,4.0.0)";visibility:=reexport,
16-
org.eclipse.equinox.preferences;bundle-version="[3.11.0,4.0.0)";visibility:=reexport,
16+
org.eclipse.equinox.preferences;bundle-version="[3.12.0,4.0.0)";visibility:=reexport,
1717
org.eclipse.core.contenttype;bundle-version="[3.9.0,4.0.0)";visibility:=reexport,
1818
org.eclipse.equinox.app;bundle-version="1.7.0";visibility:=reexport
1919
Bundle-ActivationPolicy: lazy

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,6 @@ Require-Bundle: org.eclipse.core.expressions;bundle-version="[3.9.400,4)",
2121
Bundle-RequiredExecutionEnvironment: JavaSE-17
2222
Bundle-ActivationPolicy: lazy
2323
Bundle-Localization: plugin
24-
Export-Package: org.eclipse.terminal.connector.local.controls;version="1.0.0",
25-
org.eclipse.terminal.connector.local.launcher;version="1.0.0"
24+
Export-Package: org.eclipse.terminal.connector.local.controls;x-internal:=true,
25+
org.eclipse.terminal.connector.local.launcher;x-internal:=true
2626
Automatic-Module-Name: org.eclipse.terminal.connector.local

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

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
import org.eclipse.terminal.view.core.ITerminalService;
1818
import org.eclipse.terminal.view.core.utils.ScopedEclipsePreferences;
1919
import org.eclipse.terminal.view.core.utils.TraceHandler;
20+
import org.eclipse.terminal.view.ui.launcher.ILaunchDelegateManager;
2021
import org.eclipse.ui.plugin.AbstractUIPlugin;
2122
import org.osgi.framework.BundleContext;
2223
import org.osgi.util.tracker.ServiceTracker;
@@ -120,14 +121,25 @@ public static ImageDescriptor getImageDescriptor(String key) {
120121
return getDefault().getImageRegistry().getDescriptor(key);
121122
}
122123

123-
private static ServiceTracker<ITerminalService, ITerminalService> serviceTracker;
124+
private static ServiceTracker<ITerminalService, ITerminalService> terminalServiceTracker;
124125

125126
public static synchronized ITerminalService getTerminalService() {
126-
if (serviceTracker == null) {
127-
serviceTracker = new ServiceTracker<>(getDefault().getBundle().getBundleContext(), ITerminalService.class,
128-
null);
129-
serviceTracker.open();
127+
if (terminalServiceTracker == null) {
128+
terminalServiceTracker = new ServiceTracker<>(getDefault().getBundle().getBundleContext(),
129+
ITerminalService.class, null);
130+
terminalServiceTracker.open();
130131
}
131-
return serviceTracker.getService();
132+
return terminalServiceTracker.getService();
133+
}
134+
135+
private static ServiceTracker<ILaunchDelegateManager, ILaunchDelegateManager> launchDelegateServiceTracker;
136+
137+
public static synchronized ILaunchDelegateManager getLaunchDelegateManager() {
138+
if (launchDelegateServiceTracker == null) {
139+
launchDelegateServiceTracker = new ServiceTracker<>(getDefault().getBundle().getBundleContext(),
140+
ILaunchDelegateManager.class, null);
141+
launchDelegateServiceTracker.open();
142+
}
143+
return launchDelegateServiceTracker.getService();
132144
}
133145
}

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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*******************************************************************************
2-
* Copyright (c) 2014, 2018 Wind River Systems, Inc. and others. All rights reserved.
2+
* Copyright (c) 2014, 2025 Wind River Systems, Inc. and others. All rights reserved.
33
* This program and the accompanying materials are made available under the terms
44
* of the Eclipse Public License 2.0 which accompanies this distribution, and is
55
* available at https://www.eclipse.org/legal/epl-2.0/
@@ -8,10 +8,12 @@
88
*
99
* Contributors:
1010
* Wind River Systems - initial API and implementation
11+
* Alexander Fedorov (ArSysOp) - further evolution
1112
*******************************************************************************/
1213
package org.eclipse.terminal.connector.local.launcher;
1314

1415
import java.util.HashMap;
16+
import java.util.List;
1517
import java.util.Map;
1618

1719
import org.eclipse.core.commands.AbstractHandler;
@@ -21,9 +23,9 @@
2123
import org.eclipse.jface.viewers.ISelection;
2224
import org.eclipse.jface.viewers.IStructuredSelection;
2325
import org.eclipse.jface.viewers.StructuredSelection;
26+
import org.eclipse.terminal.connector.local.activator.UIPlugin;
2427
import org.eclipse.terminal.view.core.ITerminalsConnectorConstants;
2528
import org.eclipse.terminal.view.ui.launcher.ILauncherDelegate;
26-
import org.eclipse.terminal.view.ui.launcher.LauncherDelegateManager;
2729
import org.eclipse.ui.IEditorInput;
2830
import org.eclipse.ui.IPathEditorInput;
2931
import org.eclipse.ui.handlers.HandlerUtil;
@@ -56,7 +58,8 @@ public Object execute(ExecutionEvent event) throws ExecutionException {
5658
}
5759

5860
// Get all applicable launcher delegates for the current selection
59-
ILauncherDelegate[] delegates = LauncherDelegateManager.getInstance().getApplicableLauncherDelegates(selection);
61+
List<ILauncherDelegate> delegates = UIPlugin.getLaunchDelegateManager()
62+
.getApplicableLauncherDelegates(selection);
6063
// Find the local terminal launcher delegate
6164
ILauncherDelegate delegate = null;
6265
for (ILauncherDelegate candidate : delegates) {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
33
Bundle-Name: %pluginName
44
Bundle-SymbolicName: org.eclipse.terminal.connector.process;singleton:=true
55
Bundle-Version: 1.0.0.qualifier
6-
Bundle-Activator: org.eclipse.terminal.connector.process.activator.UIPlugin
6+
Bundle-Activator: org.eclipse.terminal.connector.process.internal.UIPlugin
77
Bundle-Vendor: %providerName
88
Import-Package: org.eclipse.cdt.utils.pty;mandatory:=native,
99
org.eclipse.cdt.utils.spawner;mandatory:=native,
@@ -22,5 +22,5 @@ Bundle-RequiredExecutionEnvironment: JavaSE-17
2222
Bundle-ActivationPolicy: lazy
2323
Bundle-Localization: plugin
2424
Export-Package: org.eclipse.terminal.connector.process;version="1.0.0",
25-
org.eclipse.terminal.connector.process.help;version="1.0.0"
25+
org.eclipse.terminal.connector.process.internal;x-internal:=true
2626
Automatic-Module-Name: org.eclipse.terminal.connector.process

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<!-- Terminal launcher delegate contributions -->
2525
<extension point="org.eclipse.terminal.view.ui.launcherDelegates">
2626
<delegate
27-
class="org.eclipse.terminal.connector.process.ProcessLauncherDelegate"
27+
class="org.eclipse.terminal.connector.process.internal.ProcessLauncherDelegate"
2828
hidden="true"
2929
id="org.eclipse.terminal.connector.process.launcher.process"
3030
label="%ProcessLauncherDelegate.label">

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

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,17 +29,17 @@
2929
import org.eclipse.core.runtime.Platform;
3030
import org.eclipse.jface.dialogs.MessageDialog;
3131
import org.eclipse.osgi.util.NLS;
32-
import org.eclipse.swt.custom.CTabItem;
3332
import org.eclipse.swt.widgets.Shell;
33+
import org.eclipse.swt.widgets.Widget;
3434
import org.eclipse.terminal.connector.ISettingsStore;
3535
import org.eclipse.terminal.connector.ITerminalControl;
3636
import org.eclipse.terminal.connector.NullSettingsStore;
3737
import org.eclipse.terminal.connector.TerminalState;
38-
import org.eclipse.terminal.connector.process.activator.UIPlugin;
39-
import org.eclipse.terminal.connector.process.nls.Messages;
38+
import org.eclipse.terminal.connector.process.internal.Messages;
39+
import org.eclipse.terminal.connector.process.internal.ProcessMonitor;
40+
import org.eclipse.terminal.connector.process.internal.UIPlugin;
4041
import org.eclipse.terminal.view.core.ILineSeparatorConstants;
4142
import org.eclipse.terminal.view.core.utils.Env;
42-
import org.eclipse.terminal.view.ui.launcher.ConsoleManager;
4343
import org.eclipse.terminal.view.ui.streams.AbstractStreamsConnector;
4444

4545
/**
@@ -209,10 +209,7 @@ public void connect(ITerminalControl control) {
209209
// Save the shell so the error message can have somewhere to display
210210
Shell shell = control.getShell();
211211
// Lookup the tab item
212-
CTabItem item = ConsoleManager.getInstance().findConsole(control);
213-
if (item != null) {
214-
item.dispose();
215-
}
212+
UIPlugin.getConsoleManager().findConsole(control).ifPresent(Widget::dispose);
216213
// Get the error message from the exception
217214
String msg = e.getLocalizedMessage() != null ? e.getLocalizedMessage() : ""; //$NON-NLS-1$
218215
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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,7 @@
99
* Contributors:
1010
* Wind River Systems - initial API and implementation
1111
*******************************************************************************/
12-
package org.eclipse.terminal.connector.process.help;
13-
14-
import org.eclipse.terminal.connector.process.activator.UIPlugin;
12+
package org.eclipse.terminal.connector.process.internal;
1513

1614
/**
1715
* 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

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
* Contributors:
1010
* Wind River Systems - initial API and implementation
1111
*******************************************************************************/
12-
package org.eclipse.terminal.connector.process.nls;
12+
package org.eclipse.terminal.connector.process.internal;
1313

1414
import org.eclipse.osgi.util.NLS;
1515

@@ -18,15 +18,9 @@
1818
*/
1919
public class Messages extends NLS {
2020

21-
// The plug-in resource bundle name
22-
private static final String BUNDLE_NAME = "org.eclipse.terminal.connector.process.nls.Messages"; //$NON-NLS-1$
23-
24-
/**
25-
* Static constructor.
26-
*/
2721
static {
2822
// Load message values from bundle file
29-
NLS.initializeMessages(BUNDLE_NAME, Messages.class);
23+
NLS.initializeMessages(Messages.class.getName(), Messages.class);
3024
}
3125

3226
// **** Declare externalized string id's down here *****

0 commit comments

Comments
 (0)