Skip to content

Commit 84d70a7

Browse files
laeubilaeubi
committed
Update to latest API changes
1 parent b5109eb commit 84d70a7

File tree

6 files changed

+25
-84
lines changed

6 files changed

+25
-84
lines changed

‎terminal/plugins/org.eclipse.tm.terminal.connector.cdtserial/src/org/eclipse/tm/terminal/connector/cdtserial/activator/Activator.java‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,9 @@
1818
import org.eclipse.jface.resource.ImageDescriptor;
1919
import org.eclipse.jface.resource.ImageRegistry;
2020
import org.eclipse.swt.graphics.Image;
21-
import org.eclipse.terminal.view.core.ITerminalService;
2221
import org.eclipse.terminal.view.core.utils.TraceHandler;
2322
import org.eclipse.ui.plugin.AbstractUIPlugin;
2423
import org.osgi.framework.BundleContext;
25-
import org.osgi.util.tracker.ServiceTracker;
2624

2725
/**
2826
* The activator class controls the plug-in life cycle
@@ -121,15 +119,4 @@ public static void log(Exception exception) {
121119
}
122120
}
123121

124-
private static ServiceTracker<ITerminalService, ITerminalService> serviceTracker;
125-
126-
public static synchronized ITerminalService getTerminalService() {
127-
if (serviceTracker == null) {
128-
serviceTracker = new ServiceTracker<>(getDefault().getBundle().getBundleContext(), ITerminalService.class,
129-
null);
130-
serviceTracker.open();
131-
}
132-
return serviceTracker.getService();
133-
}
134-
135122
}

‎terminal/plugins/org.eclipse.tm.terminal.connector.cdtserial/src/org/eclipse/tm/terminal/connector/cdtserial/connector/SerialConnector.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@
2323
import org.eclipse.terminal.connector.ISettingsStore;
2424
import org.eclipse.terminal.connector.ITerminalControl;
2525
import org.eclipse.terminal.connector.TerminalState;
26-
import org.eclipse.terminal.connector.provider.TerminalConnectorImpl;
26+
import org.eclipse.terminal.connector.provider.AbstractTerminalConnector;
2727
import org.eclipse.tm.terminal.connector.cdtserial.activator.Activator;
2828
import org.eclipse.tm.terminal.connector.cdtserial.nls.Messages;
2929

30-
public class SerialConnector extends TerminalConnectorImpl {
30+
public class SerialConnector extends AbstractTerminalConnector {
3131

3232
private SerialSettings settings = new SerialSettings();
3333
SerialPort serialPort;

‎terminal/plugins/org.eclipse.tm.terminal.connector.cdtserial/src/org/eclipse/tm/terminal/connector/cdtserial/launcher/SerialLauncherDelegate.java‎

Lines changed: 10 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -13,22 +13,22 @@
1313
package org.eclipse.tm.terminal.connector.cdtserial.launcher;
1414

1515
import java.util.Map;
16+
import java.util.concurrent.CompletableFuture;
1617

1718
import org.eclipse.cdt.serial.ByteSize;
1819
import org.eclipse.cdt.serial.Parity;
1920
import org.eclipse.cdt.serial.StopBits;
2021
import org.eclipse.core.runtime.Assert;
22+
import org.eclipse.core.runtime.CoreException;
2123
import org.eclipse.terminal.connector.ISettingsStore;
2224
import org.eclipse.terminal.connector.ITerminalConnector;
2325
import org.eclipse.terminal.connector.InMemorySettingsStore;
2426
import org.eclipse.terminal.connector.TerminalConnectorExtension;
2527
import org.eclipse.terminal.view.core.ITerminalService;
26-
import org.eclipse.terminal.view.core.ITerminalService.Done;
2728
import org.eclipse.terminal.view.core.ITerminalsConnectorConstants;
2829
import org.eclipse.terminal.view.ui.launcher.AbstractLauncherDelegate;
2930
import org.eclipse.terminal.view.ui.launcher.IConfigurationPanel;
3031
import org.eclipse.terminal.view.ui.launcher.IConfigurationPanelContainer;
31-
import org.eclipse.tm.terminal.connector.cdtserial.activator.Activator;
3232
import org.eclipse.tm.terminal.connector.cdtserial.connector.SerialSettings;
3333
import org.eclipse.tm.terminal.connector.cdtserial.controls.SerialConfigPanel;
3434

@@ -45,7 +45,7 @@ public IConfigurationPanel getPanel(IConfigurationPanelContainer container) {
4545
}
4646

4747
@Override
48-
public ITerminalConnector createTerminalConnector(Map<String, Object> properties) {
48+
public ITerminalConnector createTerminalConnector(Map<String, Object> properties) throws CoreException {
4949
Assert.isNotNull(properties);
5050

5151
// Check for the terminal connector id
@@ -68,18 +68,15 @@ public ITerminalConnector createTerminalConnector(Map<String, Object> properties
6868

6969
// Construct the terminal connector instance
7070
ITerminalConnector connector = TerminalConnectorExtension.makeTerminalConnector(connectorId);
71-
if (connector != null) {
72-
// Apply default settings
73-
connector.setDefaultSettings();
74-
// And load the real settings
75-
connector.load(store);
76-
}
77-
71+
// Apply default settings
72+
connector.setDefaultSettings();
73+
// And load the real settings
74+
connector.load(store);
7875
return connector;
7976
}
8077

8178
@Override
82-
public void execute(Map<String, Object> properties, Done done) {
79+
public CompletableFuture<?> execute(Map<String, Object> properties) {
8380
Assert.isNotNull(properties);
8481

8582
// Set the terminal tab title
@@ -93,11 +90,8 @@ public void execute(Map<String, Object> properties, Done done) {
9390
}
9491

9592
// Get the terminal service
96-
ITerminalService terminal = Activator.getTerminalService();
97-
// If not available, we cannot fulfill this request
98-
if (terminal != null) {
99-
terminal.openConsole(properties, done);
100-
}
93+
ITerminalService terminal = getTerminalService();
94+
return terminal.openConsole(properties);
10195
}
10296

10397
}

‎terminal/plugins/org.eclipse.tm.terminal.connector.remote/src/org/eclipse/tm/terminal/connector/remote/internal/Activator.java‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,10 @@
1111
import org.eclipse.core.runtime.Plugin;
1212
import org.eclipse.core.runtime.Status;
1313
import org.eclipse.jface.resource.ImageDescriptor;
14-
import org.eclipse.terminal.view.core.ITerminalService;
1514
import org.eclipse.tm.terminal.connector.remote.nls.Messages;
1615
import org.eclipse.ui.plugin.AbstractUIPlugin;
1716
import org.osgi.framework.BundleContext;
1817
import org.osgi.framework.ServiceReference;
19-
import org.osgi.util.tracker.ServiceTracker;
2018

2119
/**
2220
* The activator class controls the plug-in life cycle
@@ -125,14 +123,4 @@ public static <T> T getService(Class<T> service) {
125123
return ref != null ? context.getService(ref) : null;
126124
}
127125

128-
private static ServiceTracker<ITerminalService, ITerminalService> serviceTracker;
129-
130-
public static synchronized ITerminalService getTerminalService() {
131-
if (serviceTracker == null) {
132-
serviceTracker = new ServiceTracker<>(getDefault().getBundle().getBundleContext(), ITerminalService.class,
133-
null);
134-
serviceTracker.open();
135-
}
136-
return serviceTracker.getService();
137-
}
138126
}

‎terminal/plugins/org.eclipse.tm.terminal.connector.remote/src/org/eclipse/tm/terminal/connector/remote/internal/RemoteConnector.java‎

Lines changed: 2 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@
1616
import org.eclipse.terminal.connector.ITerminalControl;
1717
import org.eclipse.terminal.connector.NullSettingsStore;
1818
import org.eclipse.terminal.connector.TerminalState;
19-
import org.eclipse.terminal.connector.provider.TerminalConnectorImpl;
19+
import org.eclipse.terminal.connector.provider.AbstractTerminalConnector;
2020
import org.eclipse.tm.terminal.connector.remote.IRemoteSettings;
2121

2222
@SuppressWarnings("restriction")
23-
public class RemoteConnector extends TerminalConnectorImpl {
23+
public class RemoteConnector extends AbstractTerminalConnector {
2424
private OutputStream fOutputStream;
2525
private InputStream fInputStream;
2626
private RemoteConnectionManager fConnection;
@@ -36,13 +36,6 @@ public RemoteConnector(RemoteSettings settings) {
3636
fSettings = settings;
3737
}
3838

39-
/*
40-
* (non-Javadoc)
41-
*
42-
* @see
43-
* org.eclipse.tm.internal.terminal.provisional.api.provider.TerminalConnectorImpl#connect(org.eclipse.tm.internal.terminal.
44-
* provisional.api.ITerminalControl)
45-
*/
4639
@Override
4740
public void connect(ITerminalControl control) {
4841
super.connect(control);
@@ -51,11 +44,6 @@ public void connect(ITerminalControl control) {
5144
fConnection.schedule();
5245
}
5346

54-
/*
55-
* (non-Javadoc)
56-
*
57-
* @see org.eclipse.tm.internal.terminal.provisional.api.provider.TerminalConnectorImpl#doDisconnect()
58-
*/
5947
@Override
6048
public synchronized void doDisconnect() {
6149
fConnection.cancel();
@@ -65,11 +53,6 @@ public InputStream getInputStream() {
6553
return fInputStream;
6654
}
6755

68-
/*
69-
* (non-Javadoc)
70-
*
71-
* @see org.eclipse.tm.internal.terminal.provisional.api.provider.TerminalConnectorImpl#getSettingsSummary()
72-
*/
7356
@Override
7457
public String getSettingsSummary() {
7558
return fSettings.getSummary();
@@ -84,11 +67,6 @@ public IRemoteSettings getRemoteSettings() {
8467
return fSettings;
8568
}
8669

87-
/*
88-
* (non-Javadoc)
89-
*
90-
* @see org.eclipse.tm.internal.terminal.provisional.api.provider.TerminalConnectorImpl#getTerminalToRemoteStream()
91-
*/
9270
@Override
9371
public OutputStream getTerminalToRemoteStream() {
9472
return fOutputStream;
@@ -117,11 +95,6 @@ public void setOutputStream(OutputStream outputStream) {
11795
fOutputStream = outputStream;
11896
}
11997

120-
/*
121-
* (non-Javadoc)
122-
*
123-
* @see org.eclipse.tm.internal.terminal.provisional.api.provider.TerminalConnectorImpl#setTerminalSize(int, int)
124-
*/
12598
@Override
12699
public void setTerminalSize(int newWidth, int newHeight) {
127100
if (fConnection != null && (newWidth != fWidth || newHeight != fHeight)) {

‎terminal/plugins/org.eclipse.tm.terminal.connector.remote/src/org/eclipse/tm/terminal/connector/remote/launcher/RemoteLauncherDelegate.java‎

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,10 @@
1414
import java.text.DateFormat;
1515
import java.util.Date;
1616
import java.util.Map;
17+
import java.util.concurrent.CompletableFuture;
1718

1819
import org.eclipse.core.runtime.Assert;
20+
import org.eclipse.core.runtime.CoreException;
1921
import org.eclipse.osgi.util.NLS;
2022
import org.eclipse.remote.core.IRemoteConnection;
2123
import org.eclipse.remote.core.IRemoteConnectionType;
@@ -63,7 +65,7 @@ public IConfigurationPanel getPanel(IConfigurationPanelContainer container) {
6365
* @see org.eclipse.tm.terminal.view.ui.interfaces.ILauncherDelegate#execute(java.util.Map, org.eclipse.tm.terminal.view.core.interfaces.ITerminalService.Done)
6466
*/
6567
@Override
66-
public void execute(Map<String, Object> properties, ITerminalService.Done done) {
68+
public CompletableFuture<?> execute(Map<String, Object> properties) {
6769
Assert.isNotNull(properties);
6870

6971
// Set the terminal tab title
@@ -79,11 +81,9 @@ public void execute(Map<String, Object> properties, ITerminalService.Done done)
7981
}
8082

8183
// Get the terminal service
82-
ITerminalService terminal = Activator.getTerminalService();
84+
ITerminalService terminal = getTerminalService();
8385
// If not available, we cannot fulfill this request
84-
if (terminal != null) {
85-
terminal.openConsole(properties, done);
86-
}
86+
return terminal.openConsole(properties);
8787
}
8888

8989
/**
@@ -126,7 +126,7 @@ public Object getAdapter(Class adapter) {
126126
* @see org.eclipse.tm.terminal.view.ui.interfaces.ILauncherDelegate#createTerminalConnector(java.util.Map)
127127
*/
128128
@Override
129-
public ITerminalConnector createTerminalConnector(Map<String, Object> properties) {
129+
public ITerminalConnector createTerminalConnector(Map<String, Object> properties) throws CoreException {
130130
Assert.isNotNull(properties);
131131

132132
// Check for the terminal connector id
@@ -151,12 +151,10 @@ public ITerminalConnector createTerminalConnector(Map<String, Object> properties
151151

152152
// Construct the terminal connector instance
153153
ITerminalConnector connector = TerminalConnectorExtension.makeTerminalConnector(connectorId);
154-
if (connector != null) {
155-
// Apply default settings
156-
connector.setDefaultSettings();
157-
// And load the real settings
158-
connector.load(store);
159-
}
154+
// Apply default settings
155+
connector.setDefaultSettings();
156+
// And load the real settings
157+
connector.load(store);
160158

161159
if (!properties.containsKey(ITerminalsConnectorConstants.PROP_ENCODING)) {
162160
IRemoteServicesManager svcMgr = Activator.getService(IRemoteServicesManager.class);
@@ -175,4 +173,5 @@ public ITerminalConnector createTerminalConnector(Map<String, Object> properties
175173

176174
return connector;
177175
}
176+
178177
}

0 commit comments

Comments
 (0)