Skip to content

Commit 31d8426

Browse files
laeubiChristoph Läubrich
laeubi
authored and
Christoph Läubrich
committed
Update to the new terminal view bundles provided by platform
1 parent 4733f74 commit 31d8426

File tree

13 files changed

+105
-61
lines changed

13 files changed

+105
-61
lines changed

‎containers/org.eclipse.linuxtools.docker.core/META-INF/MANIFEST.MF‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.28.0",
1616
org.glassfish.jersey.media.jersey-media-json-jackson;bundle-version="3.1.5",
1717
org.glassfish.jersey.core.jersey-common;bundle-version="3.1.5",
1818
org.glassfish.jersey.inject.jersey-hk2;bundle-version="3.1.5",
19-
org.eclipse.tm.terminal.view.core;bundle-version="4.0.0",
2019
org.eclipse.debug.core;bundle-version="3.21.100"
2120
Bundle-RequiredExecutionEnvironment: JavaSE-21
2221
Bundle-ActivationPolicy: lazy
2322
Export-Package: org.eclipse.linuxtools.docker.core,
2423
org.eclipse.linuxtools.internal.docker.core;x-friends:="org.eclipse.linuxtools.docker.ui,org.eclipse.linuxtools.docker.ui.tests,org.eclipse.linuxtools.docker.integration.tests"
2524
Import-Package: com.fasterxml.jackson.annotation;version="2.10.3",
2625
jakarta.ws.rs;version="2.0.1",
27-
jakarta.ws.rs.core;version="2.0.1",
2826
jakarta.ws.rs.client;version="2.0.1",
27+
jakarta.ws.rs.core;version="2.0.1",
28+
org.eclipse.terminal.view.core;version="[1.0.0,2.0.0)",
2929
org.glassfish.jersey.apache.connector
3030
Automatic-Module-Name: org.eclipse.linuxtools.docker.core

‎containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/docker/core/Activator.java‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,9 @@
1818
import org.eclipse.core.runtime.IStatus;
1919
import org.eclipse.core.runtime.Plugin;
2020
import org.eclipse.core.runtime.Status;
21+
import org.eclipse.terminal.view.core.ITerminalService;
2122
import org.osgi.framework.BundleContext;
23+
import org.osgi.util.tracker.ServiceTracker;
2224

2325
public class Activator extends Plugin {
2426

@@ -82,4 +84,16 @@ public static void log(Throwable e) {
8284
log(status);
8385
}
8486

87+
private static ServiceTracker<ITerminalService, ITerminalService> serviceTracker;
88+
89+
public static synchronized ITerminalService getTerminalService() {
90+
if (serviceTracker == null) {
91+
serviceTracker = new ServiceTracker<>(
92+
getDefault().getBundle().getBundleContext(),
93+
ITerminalService.class, null);
94+
serviceTracker.open();
95+
}
96+
return serviceTracker.getService();
97+
}
98+
8599
}

‎containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerConnection.java‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -93,10 +93,9 @@
9393
import org.eclipse.linuxtools.docker.core.Messages;
9494
import org.eclipse.linuxtools.internal.docker.core.DockerImage.DockerImageQualifier;
9595
import org.eclipse.osgi.util.NLS;
96-
import org.eclipse.tm.terminal.view.core.TerminalServiceFactory;
97-
import org.eclipse.tm.terminal.view.core.interfaces.ITerminalService;
98-
import org.eclipse.tm.terminal.view.core.interfaces.ITerminalServiceOutputStreamMonitorListener;
99-
import org.eclipse.tm.terminal.view.core.interfaces.constants.ITerminalsConnectorConstants;
96+
import org.eclipse.terminal.view.core.ITerminalService;
97+
import org.eclipse.terminal.view.core.ITerminalServiceOutputStreamMonitorListener;
98+
import org.eclipse.terminal.view.core.ITerminalsConnectorConstants;
10099
import org.mandas.docker.client.DockerClient;
101100
import org.mandas.docker.client.DockerClient.AttachParameter;
102101
import org.mandas.docker.client.DockerClient.BuildParam;
@@ -2352,13 +2351,13 @@ private void openTerminal(LogStream pty_stream, String name,
23522351

23532352
TerminalOutputMonitorListener monitor = new TerminalOutputMonitorListener(out);
23542353

2355-
// org.eclipse.tm.terminal.connector.ssh.controls.SshWizardConfigurationPanel
2354+
// org.eclipse.terminal.connector.ssh.controls.SshWizardConfigurationPanel
23562355
Map<String, Object> properties = new HashMap<>();
23572356
properties.put(ITerminalsConnectorConstants.PROP_DELEGATE_ID,
2358-
"org.eclipse.tm.terminal.connector.streams.launcher.streams"); //$NON-NLS-1$
2357+
"org.eclipse.terminal.connector.streams.launcher.streams"); //$NON-NLS-1$
23592358
properties.put(
23602359
ITerminalsConnectorConstants.PROP_TERMINAL_CONNECTOR_ID,
2361-
"org.eclipse.tm.terminal.connector.streams.StreamsConnector"); //$NON-NLS-1$
2360+
"org.eclipse.terminal.connector.streams.StreamsConnector"); //$NON-NLS-1$
23622361
properties.put(ITerminalsConnectorConstants.PROP_TITLE, name);
23632362
properties.put(ITerminalsConnectorConstants.PROP_LOCAL_ECHO, false);
23642363
properties.put(ITerminalsConnectorConstants.PROP_FORCE_NEW, true);
@@ -2381,8 +2380,10 @@ private void openTerminal(LogStream pty_stream, String name,
23812380
if (out != null) {
23822381
out.setTerminalProperties(properties);
23832382
}
2384-
ITerminalService service = TerminalServiceFactory.getService();
2385-
service.openConsole(properties, null);
2383+
ITerminalService service = Activator.getTerminalService();
2384+
if (service != null) {
2385+
service.openConsole(properties, null);
2386+
}
23862387
} catch (Exception e) {
23872388
throw new DockerException(e);
23882389
}

‎containers/org.eclipse.linuxtools.docker.integration.tests/launchers/DockerAllBotTest Local.launch‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -93,12 +93,12 @@
9393
<setEntry value="org.eclipse.swtbot.eclipse:default"/>
9494
<setEntry value="org.eclipse.swtbot.forms:default"/>
9595
<setEntry value="org.eclipse.swtbot:default"/>
96-
<setEntry value="org.eclipse.tm.terminal.connector.local.feature:default"/>
97-
<setEntry value="org.eclipse.tm.terminal.connector.ssh.feature:default"/>
98-
<setEntry value="org.eclipse.tm.terminal.connector.telnet.feature:default"/>
99-
<setEntry value="org.eclipse.tm.terminal.control.feature:default"/>
100-
<setEntry value="org.eclipse.tm.terminal.feature:default"/>
101-
<setEntry value="org.eclipse.tm.terminal.view.feature:default"/>
96+
<setEntry value="org.eclipse.terminal.connector.local.feature:default"/>
97+
<setEntry value="org.eclipse.terminal.connector.ssh.feature:default"/>
98+
<setEntry value="org.eclipse.terminal.connector.telnet.feature:default"/>
99+
<setEntry value="org.eclipse.terminal.control.feature:default"/>
100+
<setEntry value="org.eclipse.terminal.feature:default"/>
101+
<setEntry value="org.eclipse.terminal.view.feature:default"/>
102102
<setEntry value="org.eclipse.zest:default"/>
103103
</setAttribute>
104104
<setAttribute key="selected_target_bundles">
@@ -378,14 +378,14 @@
378378
<setEntry value="org.eclipse.team.core@default:default"/>
379379
<setEntry value="org.eclipse.team.ui@default:default"/>
380380
<setEntry value="org.eclipse.text@default:default"/>
381-
<setEntry value="org.eclipse.tm.terminal.connector.local@default:default"/>
382-
<setEntry value="org.eclipse.tm.terminal.connector.process@default:default"/>
383-
<setEntry value="org.eclipse.tm.terminal.connector.serial@default:default"/>
384-
<setEntry value="org.eclipse.tm.terminal.connector.ssh@default:default"/>
385-
<setEntry value="org.eclipse.tm.terminal.connector.telnet@default:default"/>
386-
<setEntry value="org.eclipse.tm.terminal.control@default:default"/>
387-
<setEntry value="org.eclipse.tm.terminal.view.core@default:default"/>
388-
<setEntry value="org.eclipse.tm.terminal.view.ui@default:default"/>
381+
<setEntry value="org.eclipse.terminal.connector.local@default:default"/>
382+
<setEntry value="org.eclipse.terminal.connector.process@default:default"/>
383+
<setEntry value="org.eclipse.terminal.connector.serial@default:default"/>
384+
<setEntry value="org.eclipse.terminal.connector.ssh@default:default"/>
385+
<setEntry value="org.eclipse.terminal.connector.telnet@default:default"/>
386+
<setEntry value="org.eclipse.terminal.control@default:default"/>
387+
<setEntry value="org.eclipse.terminal.view.core@default:default"/>
388+
<setEntry value="org.eclipse.terminal.view.ui@default:default"/>
389389
<setEntry value="org.eclipse.tools.templates.core@default:default"/>
390390
<setEntry value="org.eclipse.tools.templates.ui@default:default"/>
391391
<setEntry value="org.eclipse.ui.browser@default:default"/>

‎containers/org.eclipse.linuxtools.docker.integration.tests/launchers/DockerAllBotTest Mockito.launch‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -93,12 +93,12 @@
9393
<setEntry value="org.eclipse.swtbot.eclipse:default"/>
9494
<setEntry value="org.eclipse.swtbot.forms:default"/>
9595
<setEntry value="org.eclipse.swtbot:default"/>
96-
<setEntry value="org.eclipse.tm.terminal.connector.local.feature:default"/>
97-
<setEntry value="org.eclipse.tm.terminal.connector.ssh.feature:default"/>
98-
<setEntry value="org.eclipse.tm.terminal.connector.telnet.feature:default"/>
99-
<setEntry value="org.eclipse.tm.terminal.control.feature:default"/>
100-
<setEntry value="org.eclipse.tm.terminal.feature:default"/>
101-
<setEntry value="org.eclipse.tm.terminal.view.feature:default"/>
96+
<setEntry value="org.eclipse.terminal.connector.local.feature:default"/>
97+
<setEntry value="org.eclipse.terminal.connector.ssh.feature:default"/>
98+
<setEntry value="org.eclipse.terminal.connector.telnet.feature:default"/>
99+
<setEntry value="org.eclipse.terminal.control.feature:default"/>
100+
<setEntry value="org.eclipse.terminal.feature:default"/>
101+
<setEntry value="org.eclipse.terminal.view.feature:default"/>
102102
<setEntry value="org.eclipse.zest:default"/>
103103
</setAttribute>
104104
<setAttribute key="selected_target_bundles">
@@ -378,14 +378,14 @@
378378
<setEntry value="org.eclipse.team.core@default:default"/>
379379
<setEntry value="org.eclipse.team.ui@default:default"/>
380380
<setEntry value="org.eclipse.text@default:default"/>
381-
<setEntry value="org.eclipse.tm.terminal.connector.local@default:default"/>
382-
<setEntry value="org.eclipse.tm.terminal.connector.process@default:default"/>
383-
<setEntry value="org.eclipse.tm.terminal.connector.serial@default:default"/>
384-
<setEntry value="org.eclipse.tm.terminal.connector.ssh@default:default"/>
385-
<setEntry value="org.eclipse.tm.terminal.connector.telnet@default:default"/>
386-
<setEntry value="org.eclipse.tm.terminal.control@default:default"/>
387-
<setEntry value="org.eclipse.tm.terminal.view.core@default:default"/>
388-
<setEntry value="org.eclipse.tm.terminal.view.ui@default:default"/>
381+
<setEntry value="org.eclipse.terminal.connector.local@default:default"/>
382+
<setEntry value="org.eclipse.terminal.connector.process@default:default"/>
383+
<setEntry value="org.eclipse.terminal.connector.serial@default:default"/>
384+
<setEntry value="org.eclipse.terminal.connector.ssh@default:default"/>
385+
<setEntry value="org.eclipse.terminal.connector.telnet@default:default"/>
386+
<setEntry value="org.eclipse.terminal.control@default:default"/>
387+
<setEntry value="org.eclipse.terminal.view.core@default:default"/>
388+
<setEntry value="org.eclipse.terminal.view.ui@default:default"/>
389389
<setEntry value="org.eclipse.tools.templates.core@default:default"/>
390390
<setEntry value="org.eclipse.tools.templates.ui@default:default"/>
391391
<setEntry value="org.eclipse.ui.browser@default:default"/>

‎containers/org.eclipse.linuxtools.docker.ui/META-INF/MANIFEST.MF‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,6 @@ Require-Bundle: org.eclipse.ui,
2626
org.mandas.docker-client;bundle-version="7.0.7",
2727
org.eclipse.e4.ui.workbench;bundle-version="1.4.0",
2828
org.eclipse.e4.ui.model.workbench;bundle-version="1.2.0",
29-
org.eclipse.tm.terminal.view.ui;bundle-version="4.1.0",
30-
org.eclipse.tm.terminal.view.core;bundle-version="4.0.0",
3129
org.apache.commons.commons-compress;bundle-version="1.23.0"
3230
Bundle-RequiredExecutionEnvironment: JavaSE-21
3331
Bundle-ActivationPolicy: lazy
@@ -43,3 +41,4 @@ Export-Package: org.eclipse.linuxtools.docker.ui,
4341
org.eclipse.linuxtools.internal.docker.ui.views;x-friends:="org.eclipse.linuxtools.docker.ui.tests",
4442
org.eclipse.linuxtools.internal.docker.ui.wizards;x-friends:="org.eclipse.linuxtools.docker.ui.tests"
4543
Automatic-Module-Name: org.eclipse.linuxtools.docker.ui
44+
Import-Package: org.eclipse.terminal.view.core;version="[1.0.0,2.0.0)"

‎containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/docker/ui/Activator.java‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,12 @@
1818
import org.eclipse.core.runtime.IStatus;
1919
import org.eclipse.core.runtime.Status;
2020
import org.eclipse.swt.widgets.Shell;
21+
import org.eclipse.terminal.view.core.ITerminalService;
2122
import org.eclipse.ui.IWorkbenchWindow;
2223
import org.eclipse.ui.PlatformUI;
2324
import org.eclipse.ui.plugin.AbstractUIPlugin;
2425
import org.osgi.framework.BundleContext;
26+
import org.osgi.util.tracker.ServiceTracker;
2527

2628
/**
2729
* The activator class controls the plug-in life cycle
@@ -88,5 +90,16 @@ public static Shell getActiveWorkbenchShell() {
8890
return null;
8991
}
9092

93+
private static ServiceTracker<ITerminalService, ITerminalService> serviceTracker;
94+
95+
public static synchronized ITerminalService getTerminalService() {
96+
if (serviceTracker == null) {
97+
serviceTracker = new ServiceTracker<>(getDefault().getBundle().getBundleContext(), ITerminalService.class,
98+
null);
99+
serviceTracker.open();
100+
}
101+
return serviceTracker.getService();
102+
}
103+
91104

92105
}

‎containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/docker/ui/launch/ContainerLauncher.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -688,7 +688,7 @@ public void launch(String id, IContainerLaunchListener listener,
688688
IWorkbenchPage page = PlatformUI.getWorkbench()
689689
.getActiveWorkbenchWindow().getActivePage();
690690
IViewPart terminalView = page.findView(
691-
"org.eclipse.tm.terminal.view.ui.TerminalsView");
691+
"org.eclipse.terminal.view.ui.TerminalsView");
692692
CTabFolder ctabfolder = terminalView
693693
.getAdapter(CTabFolder.class);
694694
if (ctabfolder != null) {

‎containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/commands/RemoveContainerLogCommandHandler.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*******************************************************************************
22
* Copyright (c) 2015, 2018 Red Hat.
3-
*
3+
*
44
* This program and the accompanying materials are made
55
* available under the terms of the Eclipse Public License 2.0
66
* which is available at https://www.eclipse.org/legal/epl-2.0/
@@ -21,11 +21,11 @@
2121
import org.eclipse.linuxtools.docker.core.IDockerConnection;
2222
import org.eclipse.linuxtools.docker.core.IDockerContainer;
2323
import org.eclipse.linuxtools.docker.core.IDockerContainerInfo;
24+
import org.eclipse.linuxtools.docker.ui.Activator;
2425
import org.eclipse.linuxtools.internal.docker.ui.consoles.RunConsole;
2526
import org.eclipse.linuxtools.internal.docker.ui.views.DockerContainersView;
26-
import org.eclipse.tm.terminal.view.core.TerminalServiceFactory;
27-
import org.eclipse.tm.terminal.view.core.interfaces.ITerminalService;
28-
import org.eclipse.tm.terminal.view.core.interfaces.constants.ITerminalsConnectorConstants;
27+
import org.eclipse.terminal.view.core.ITerminalService;
28+
import org.eclipse.terminal.view.core.ITerminalsConnectorConstants;
2929
import org.eclipse.ui.IWorkbenchPart;
3030
import org.eclipse.ui.handlers.HandlerUtil;
3131

@@ -49,13 +49,13 @@ public Object execute(final ExecutionEvent event) {
4949
if (info.config().tty()) {
5050
Map<String, Object> properties = new HashMap<>();
5151
properties.put(ITerminalsConnectorConstants.PROP_DELEGATE_ID,
52-
"org.eclipse.tm.terminal.connector.streams.launcher.streams");
52+
"org.eclipse.terminal.connector.streams.launcher.streams");
5353
properties.put(
5454
ITerminalsConnectorConstants.PROP_TERMINAL_CONNECTOR_ID,
55-
"org.eclipse.tm.terminal.connector.streams.StreamsConnector");
55+
"org.eclipse.terminal.connector.streams.StreamsConnector");
5656
properties.put(ITerminalsConnectorConstants.PROP_TITLE,
5757
info.name());
58-
ITerminalService service = TerminalServiceFactory.getService();
58+
ITerminalService service = Activator.getTerminalService();
5959
service.closeConsole(properties, null);
6060
return null;
6161
}

‎releng/org.eclipse.linuxtools.target/linuxtools-latest.target‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
<unit id="jakarta.inject.jakarta.inject-api" version="2.0.1"/>
3737
<unit id="bcprov" version="0.0.0"/>
3838
<unit id="bcutil" version="0.0.0"/>
39+
<unit id="org.eclipse.terminal.feature.feature.group" version="0.0.0"/>
3940
<repository location="https://download.eclipse.org/eclipse/updates/I-builds/"/>
4041
</location>
4142
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
@@ -47,7 +48,6 @@
4748
<repository location="https://download.eclipse.org/wildwebdeveloper/snapshots/"/>
4849
</location>
4950
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
50-
<unit id="org.eclipse.tm.terminal.feature.feature.group" version="0.0.0"/>
5151
<unit id="org.eclipse.cdt.autotools.feature.group" version="0.0.0"/>
5252
<unit id="org.eclipse.cdt.feature.group" version="0.0.0"/>
5353
<unit id="org.eclipse.launchbar.feature.group" version="0.0.0"/>

0 commit comments

Comments
 (0)