Skip to content

Commit d00f44a

Browse files
fedejeannefedejeanne
authored
Merge branch 'eclipse-platform:master' into master
2 parents de86cf1 + e8966dc commit d00f44a

File tree

122 files changed

+673
-581
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

122 files changed

+673
-581
lines changed

‎debug/org.eclipse.debug.terminal/src/org/eclipse/debug/terminal/ui/ConsoleConnector.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@
1717

1818
import org.eclipse.cdt.utils.pty.PTY;
1919
import org.eclipse.cdt.utils.spawner.Spawner;
20-
import org.eclipse.terminal.internal.provisional.api.ISettingsStore;
21-
import org.eclipse.terminal.internal.provisional.api.ITerminalConnector;
22-
import org.eclipse.terminal.internal.provisional.api.ITerminalControl;
23-
import org.eclipse.terminal.internal.provisional.api.TerminalState;
20+
import org.eclipse.terminal.connector.ISettingsStore;
21+
import org.eclipse.terminal.connector.ITerminalConnector;
22+
import org.eclipse.terminal.connector.ITerminalControl;
23+
import org.eclipse.terminal.connector.TerminalState;
2424

2525
class ConsoleConnector implements ITerminalConnector {
2626

‎debug/org.eclipse.debug.terminal/src/org/eclipse/debug/terminal/ui/ConsoleTerminalListener.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,9 @@
1313
*******************************************************************************/
1414
package org.eclipse.debug.terminal.ui;
1515

16-
import org.eclipse.terminal.internal.control.ITerminalListener;
17-
import org.eclipse.terminal.internal.provisional.api.TerminalState;
16+
import org.eclipse.terminal.connector.TerminalState;
17+
import org.eclipse.terminal.control.ITerminalListener;
18+
import org.eclipse.terminal.control.TerminalTitleRequestor;
1819

1920
class ConsoleTerminalListener implements ITerminalListener {
2021

‎debug/org.eclipse.debug.terminal/src/org/eclipse/debug/terminal/ui/TerminalConsole.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
*******************************************************************************/
1414
package org.eclipse.debug.terminal.ui;
1515

16-
import org.eclipse.terminal.internal.provisional.api.ITerminalConnector;
16+
import org.eclipse.terminal.connector.ITerminalConnector;
1717
import org.eclipse.ui.console.AbstractConsole;
1818
import org.eclipse.ui.console.IConsoleView;
1919
import org.eclipse.ui.part.IPageBookViewPage;

‎debug/org.eclipse.debug.terminal/src/org/eclipse/debug/terminal/ui/TerminalConsoleFactory.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
import org.eclipse.core.commands.Command;
1919
import org.eclipse.core.commands.ParameterizedCommand;
2020
import org.eclipse.core.runtime.ILog;
21-
import org.eclipse.terminal.internal.provisional.api.ITerminalConnector;
21+
import org.eclipse.terminal.connector.ITerminalConnector;
2222
import org.eclipse.ui.PlatformUI;
2323
import org.eclipse.ui.commands.ICommandService;
2424
import org.eclipse.ui.console.ConsolePlugin;

‎debug/org.eclipse.debug.terminal/src/org/eclipse/debug/terminal/ui/TerminalConsolePage.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@
2121
import org.eclipse.swt.layout.FillLayout;
2222
import org.eclipse.swt.widgets.Composite;
2323
import org.eclipse.swt.widgets.Control;
24-
import org.eclipse.terminal.internal.control.ITerminalViewControl;
25-
import org.eclipse.terminal.internal.control.TerminalViewControlFactory;
26-
import org.eclipse.terminal.internal.provisional.api.ITerminalConnector;
27-
import org.eclipse.terminal.internal.provisional.api.ITerminalControl;
24+
import org.eclipse.terminal.connector.ITerminalConnector;
25+
import org.eclipse.terminal.connector.ITerminalControl;
26+
import org.eclipse.terminal.control.ITerminalViewControl;
27+
import org.eclipse.terminal.control.TerminalViewControlFactory;
2828
import org.eclipse.ui.IActionBars;
2929
import org.eclipse.ui.PartInitException;
3030
import org.eclipse.ui.part.IPageBookViewPage;

‎terminal/bundles/org.eclipse.terminal.connector.local/src/org/eclipse/terminal/connector/local/controls/LocalWizardConfigurationPanel.java‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,9 @@ public void setupPanel(Composite parent) {
6666
setEncoding("UTF-8"); //$NON-NLS-1$
6767
} else {
6868
String encoding = WorkbenchEncoding.getWorkbenchDefaultEncoding();
69-
if (encoding != null && !"".equals(encoding)) //$NON-NLS-1$
69+
if (encoding != null && !"".equals(encoding)) { //$NON-NLS-1$
7070
setEncoding(encoding);
71+
}
7172
}
7273

7374
// Fill the rest of the panel with a label to be able to
@@ -102,12 +103,14 @@ protected void decorateEncoding(ControlDecoration encodingComboDecorator, String
102103

103104
@Override
104105
public void setupData(Map<String, Object> data) {
105-
if (data == null)
106+
if (data == null) {
106107
return;
108+
}
107109

108110
String value = (String) data.get(ITerminalsConnectorConstants.PROP_ENCODING);
109-
if (value != null)
111+
if (value != null) {
110112
setEncoding(value);
113+
}
111114
}
112115

113116
@Override

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

Lines changed: 25 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,12 @@
3535
import org.eclipse.core.variables.VariablesPlugin;
3636
import org.eclipse.jface.viewers.ISelection;
3737
import org.eclipse.jface.viewers.IStructuredSelection;
38+
import org.eclipse.terminal.connector.ISettingsStore;
39+
import org.eclipse.terminal.connector.ITerminalConnector;
40+
import org.eclipse.terminal.connector.TerminalConnectorExtension;
3841
import org.eclipse.terminal.connector.local.activator.UIPlugin;
3942
import org.eclipse.terminal.connector.local.controls.LocalWizardConfigurationPanel;
4043
import org.eclipse.terminal.connector.process.ProcessSettings;
41-
import org.eclipse.terminal.internal.provisional.api.ISettingsStore;
42-
import org.eclipse.terminal.internal.provisional.api.ITerminalConnector;
43-
import org.eclipse.terminal.internal.provisional.api.TerminalConnectorExtension;
4444
import org.eclipse.terminal.view.core.TerminalServiceFactory;
4545
import org.eclipse.terminal.view.core.interfaces.ITerminalService;
4646
import org.eclipse.terminal.view.core.interfaces.ITerminalServiceOutputStreamMonitorListener;
@@ -95,8 +95,9 @@ public void execute(Map<String, Object> properties, ITerminalService.Done done)
9595
} else {
9696
encoding = WorkbenchEncoding.getWorkbenchDefaultEncoding();
9797
}
98-
if (encoding != null && !"".equals(encoding)) //$NON-NLS-1$
98+
if (encoding != null && !"".equals(encoding)) { //$NON-NLS-1$
9999
properties.put(ITerminalsConnectorConstants.PROP_ENCODING, encoding);
100+
}
100101
}
101102

102103
// For local terminals, force a new terminal tab each time it is launched,
@@ -163,8 +164,9 @@ public void execute(Map<String, Object> properties, ITerminalService.Done done)
163164
if ((service != null && service.getSelection() != null)
164165
|| properties.containsKey(ITerminalsConnectorConstants.PROP_SELECTION)) {
165166
ISelection selection = (ISelection) properties.get(ITerminalsConnectorConstants.PROP_SELECTION);
166-
if (selection == null && service != null)
167+
if (selection == null && service != null) {
167168
selection = service.getSelection();
169+
}
168170
if (selection instanceof IStructuredSelection && !selection.isEmpty()) {
169171
String dir = null;
170172
Iterator<?> iter = ((IStructuredSelection) selection).iterator();
@@ -176,31 +178,35 @@ public void execute(Map<String, Object> properties, ITerminalService.Done done)
176178
&& bundle.getState() != Bundle.STOPPING) {
177179
// If the element is not an IResource, try to adapt to IResource
178180
if (!(element instanceof org.eclipse.core.resources.IResource)) {
179-
Object adapted = element instanceof IAdaptable
180-
? ((IAdaptable) element).getAdapter(org.eclipse.core.resources.IResource.class)
181+
Object adapted = element instanceof IAdaptable i
182+
? i.getAdapter(org.eclipse.core.resources.IResource.class)
181183
: null;
182-
if (adapted == null)
184+
if (adapted == null) {
183185
adapted = Platform.getAdapterManager().getAdapter(element,
184186
org.eclipse.core.resources.IResource.class);
185-
if (adapted != null)
187+
}
188+
if (adapted != null) {
186189
element = adapted;
190+
}
187191
}
188192

189193
if (element instanceof org.eclipse.core.resources.IResource
190194
&& ((org.eclipse.core.resources.IResource) element).exists()) {
191195
IPath location = ((org.eclipse.core.resources.IResource) element).getLocation();
192-
if (location == null)
196+
if (location == null) {
193197
continue;
194-
if (location.toFile().isFile())
198+
}
199+
if (location.toFile().isFile()) {
195200
location = location.removeLastSegments(1);
201+
}
196202
if (location.toFile().isDirectory() && location.toFile().canRead()) {
197203
dir = location.toFile().getAbsolutePath();
198204
break;
199205
}
200206
}
201207

202208
if (element instanceof IPath || element instanceof File) {
203-
File f = element instanceof IPath ? ((IPath) element).toFile() : (File) element;
209+
File f = element instanceof IPath i ? i.toFile() : (File) element;
204210
if (f.isDirectory() && f.canRead()) {
205211
dir = f.getAbsolutePath();
206212
break;
@@ -235,8 +241,9 @@ public void execute(Map<String, Object> properties, ITerminalService.Done done)
235241
private String getTerminalTitle(Map<String, Object> properties) {
236242
// Try to see if the user set a title explicitly via the properties map.
237243
String title = getDefaultTerminalTitle(properties);
238-
if (title != null)
244+
if (title != null) {
239245
return title;
246+
}
240247

241248
try {
242249
String hostname = InetAddress.getLocalHost().getHostName();
@@ -293,8 +300,9 @@ public ITerminalConnector createTerminalConnector(Map<String, Object> properties
293300

294301
// Check for the terminal connector id
295302
String connectorId = (String) properties.get(ITerminalsConnectorConstants.PROP_TERMINAL_CONNECTOR_ID);
296-
if (connectorId == null)
303+
if (connectorId == null) {
297304
connectorId = "org.eclipse.terminal.connector.local.LocalConnector"; //$NON-NLS-1$
305+
}
298306

299307
// Extract the process properties using defaults
300308
String image;
@@ -357,8 +365,9 @@ public ITerminalConnector createTerminalConnector(Map<String, Object> properties
357365

358366
// Set the ECLIPSE_HOME and ECLIPSE_WORKSPACE environment variables
359367
List<String> envpList = new ArrayList<>();
360-
if (envp != null)
368+
if (envp != null) {
361369
envpList.addAll(Arrays.asList(envp));
370+
}
362371

363372
// ECLIPSE_HOME
364373
String eclipseHomeLocation = System.getProperty("eclipse.home.location"); //$NON-NLS-1$
@@ -406,7 +415,7 @@ public ITerminalConnector createTerminalConnector(Map<String, Object> properties
406415
if (properties.containsKey(ITerminalsConnectorConstants.PROP_PROCESS_MERGE_ENVIRONMENT)) {
407416
Object value = properties.get(ITerminalsConnectorConstants.PROP_PROCESS_MERGE_ENVIRONMENT);
408417
processSettings
409-
.setMergeWithNativeEnvironment(value instanceof Boolean ? ((Boolean) value).booleanValue() : false);
418+
.setMergeWithNativeEnvironment(value instanceof Boolean b ? b.booleanValue() : false);
410419
}
411420

412421
// And save the settings to the store

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,12 @@ public Object execute(ExecutionEvent event) throws ExecutionException {
4545
if (input instanceof IPathEditorInput) {
4646
IPath path = ((IPathEditorInput) input).getPath();
4747
if (path != null) {
48-
if (path.toFile().isFile())
48+
if (path.toFile().isFile()) {
4949
path = path.removeLastSegments(1);
50-
if (path.toFile().isDirectory() && path.toFile().canRead())
50+
}
51+
if (path.toFile().isDirectory() && path.toFile().canRead()) {
5152
selection = new StructuredSelection(path);
53+
}
5254
}
5355
}
5456
}

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,14 @@
3131
import org.eclipse.osgi.util.NLS;
3232
import org.eclipse.swt.custom.CTabItem;
3333
import org.eclipse.swt.widgets.Shell;
34+
import org.eclipse.terminal.connector.ISettingsStore;
35+
import org.eclipse.terminal.connector.ITerminalControl;
36+
import org.eclipse.terminal.connector.NullSettingsStore;
37+
import org.eclipse.terminal.connector.TerminalState;
3438
import org.eclipse.terminal.connector.process.activator.UIPlugin;
3539
import org.eclipse.terminal.connector.process.nls.Messages;
3640
import org.eclipse.terminal.internal.emulator.VT100Emulator;
3741
import org.eclipse.terminal.internal.emulator.VT100TerminalControl;
38-
import org.eclipse.terminal.internal.provisional.api.ISettingsStore;
39-
import org.eclipse.terminal.internal.provisional.api.ITerminalControl;
40-
import org.eclipse.terminal.internal.provisional.api.NullSettingsStore;
41-
import org.eclipse.terminal.internal.provisional.api.TerminalState;
4242
import org.eclipse.terminal.view.core.interfaces.constants.ILineSeparatorConstants;
4343
import org.eclipse.terminal.view.core.utils.Env;
4444
import org.eclipse.terminal.view.ui.manager.ConsoleManager;

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515

1616
import org.eclipse.cdt.utils.pty.PTY;
1717
import org.eclipse.core.runtime.Assert;
18-
import org.eclipse.terminal.internal.provisional.api.ISettingsStore;
19-
import org.eclipse.terminal.internal.provisional.api.ITerminalConnector;
20-
import org.eclipse.terminal.internal.provisional.api.TerminalConnectorExtension;
18+
import org.eclipse.terminal.connector.ISettingsStore;
19+
import org.eclipse.terminal.connector.ITerminalConnector;
20+
import org.eclipse.terminal.connector.TerminalConnectorExtension;
2121
import org.eclipse.terminal.view.core.TerminalServiceFactory;
2222
import org.eclipse.terminal.view.core.interfaces.ITerminalService;
2323
import org.eclipse.terminal.view.core.interfaces.ITerminalServiceOutputStreamMonitorListener;

0 commit comments

Comments
 (0)