Skip to content

Commit 2d945e7

Browse files
fedejeannefedejeanne
authored
Merge branch 'eclipse-platform:master' into master
2 parents 6acfd73 + 8279c21 commit 2d945e7

File tree

136 files changed

+608
-677
lines changed

Some content is hidden

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

136 files changed

+608
-677
lines changed

‎.mvn/extensions.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@
44
<extension>
55
<groupId>org.eclipse.tycho</groupId>
66
<artifactId>tycho-build</artifactId>
7-
<version>4.0.8</version>
7+
<version>4.0.13</version>
88
</extension>
99
</extensions>

‎.mvn/jvm.config‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎debug/org.eclipse.debug.terminal/META-INF/MANIFEST.MF‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,10 @@ Bundle-Name: %pluginName
44
Bundle-SymbolicName: org.eclipse.debug.terminal;singleton:=true
55
Bundle-Vendor: %providerName
66
Bundle-Version: 1.0.0.qualifier
7+
Import-Package: org.eclipse.terminal.connector;version="[1.0.0,2.0.0)",
8+
org.eclipse.terminal.control;version="[1.0.0,2.0.0)"
79
Require-Bundle: org.eclipse.core.runtime,
810
org.eclipse.debug.core;bundle-version="3.23.0",
9-
org.eclipse.terminal.control;bundle-version="5.6.0",
1011
org.eclipse.cdt.core.native;bundle-version="[6.4.0,7.0.0)",
1112
org.eclipse.swt;bundle-version="3.130.0",
1213
org.eclipse.ui;bundle-version="3.207.100",

‎resources/bundles/org.eclipse.core.resources/src/org/eclipse/core/resources/ProjectScope.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@
1313
*******************************************************************************/
1414
package org.eclipse.core.resources;
1515

16-
import org.eclipse.core.internal.preferences.AbstractScope;
1716
import org.eclipse.core.internal.preferences.EclipsePreferences;
1817
import org.eclipse.core.runtime.IPath;
1918
import org.eclipse.core.runtime.Platform;
19+
import org.eclipse.core.runtime.preferences.AbstractScope;
2020
import org.eclipse.core.runtime.preferences.IEclipsePreferences;
2121
import org.eclipse.core.runtime.preferences.IPreferencesService;
2222
import org.osgi.service.prefs.Preferences;

‎runtime/bundles/org.eclipse.core.jobs/src/org/eclipse/core/internal/jobs/JobManager.java‎

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,19 @@
7878
*/
7979
public class JobManager implements IJobManager, DebugOptionsListener {
8080

81+
82+
private static final int CORES = Runtime.getRuntime().availableProcessors();
83+
84+
private static final long DELAY_PRIORITY_INTERACTIVE = 0;
85+
86+
private static final long DELAY_PRIORITY_DECORATE = 1000 / CORES;
87+
88+
private static final long DELAY_PRIORITY_BUILD = 500 / CORES;
89+
90+
private static final long DELAY_PRIORITY_LONG = 100 / CORES;
91+
92+
private static final long DELAY_PRIORITY_SHORT = 50 / CORES;
93+
8194
private static final int NANOS_IN_MS = 1_000_000;
8295

8396
/**
@@ -618,18 +631,17 @@ public ISchedulingRule currentRule() {
618631
* tolerate waiting.
619632
*/
620633
private long delayFor(int priority) {
621-
//these values may need to be tweaked based on machine speed
622634
switch (priority) {
623635
case Job.INTERACTIVE :
624-
return 0L;
636+
return DELAY_PRIORITY_INTERACTIVE;
625637
case Job.SHORT :
626-
return 50L;
638+
return DELAY_PRIORITY_SHORT;
627639
case Job.LONG :
628-
return 100L;
640+
return DELAY_PRIORITY_LONG;
629641
case Job.BUILD :
630-
return 500L;
642+
return DELAY_PRIORITY_BUILD;
631643
case Job.DECORATE :
632-
return 1000L;
644+
return DELAY_PRIORITY_DECORATE;
633645
default :
634646
Assert.isTrue(false, "Job has invalid priority: " + priority); //$NON-NLS-1$
635647
return 0;

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

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,25 @@ Manifest-Version: 1.0
22
Bundle-ManifestVersion: 2
33
Bundle-Name: %pluginName
44
Bundle-SymbolicName: org.eclipse.terminal.connector.local;singleton:=true
5-
Bundle-Version: 4.9.0.qualifier
5+
Bundle-Version: 1.0.0.qualifier
66
Bundle-Activator: org.eclipse.terminal.connector.local.activator.UIPlugin
77
Bundle-Vendor: %providerName
8-
Import-Package: org.eclipse.cdt.utils.pty;mandatory:=native
8+
Import-Package: org.eclipse.cdt.utils.pty;mandatory:=native,
9+
org.eclipse.terminal.connector;version="[1.0.0,2.0.0)",
10+
org.eclipse.terminal.connector.process;version="[1.0.0,2.0.0)",
11+
org.eclipse.terminal.view.core;version="[1.0.0,2.0.0)",
12+
org.eclipse.terminal.view.core.utils;version="[1.0.0,2.0.0)",
13+
org.eclipse.terminal.view.ui;version="[1.0.0,2.0.0)",
14+
org.eclipse.terminal.view.ui.launcher;version="[1.0.0,2.0.0)"
915
Require-Bundle: org.eclipse.core.expressions;bundle-version="[3.9.400,4)",
1016
org.eclipse.core.resources;bundle-version="[3.22.200,4)",
1117
org.eclipse.core.runtime;bundle-version="[3.33.0,4)",
1218
org.eclipse.core.variables;bundle-version="[3.6.500,4)",
1319
org.eclipse.debug.ui;bundle-version="[3.18.800,4)",
14-
org.eclipse.terminal.view.core;bundle-version="[4.10.400,5)",
15-
org.eclipse.terminal.view.ui;bundle-version="[4.11.600,5)",
16-
org.eclipse.terminal.connector.process;bundle-version="[4.9.200,5)",
17-
org.eclipse.terminal.control;bundle-version="[5.6.0,6.0.0)",
1820
org.eclipse.ui;bundle-version="[3.207.200,4)"
1921
Bundle-RequiredExecutionEnvironment: JavaSE-17
2022
Bundle-ActivationPolicy: lazy
2123
Bundle-Localization: plugin
22-
Export-Package: org.eclipse.terminal.connector.local.activator;x-internal:=true,
23-
org.eclipse.terminal.connector.local.controls,
24-
org.eclipse.terminal.connector.local.launcher
24+
Export-Package: org.eclipse.terminal.connector.local.controls;version="1.0.0",
25+
org.eclipse.terminal.connector.local.launcher;version="1.0.0"
2526
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: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,12 @@
1414
import org.eclipse.jface.resource.ImageDescriptor;
1515
import org.eclipse.jface.resource.ImageRegistry;
1616
import org.eclipse.swt.graphics.Image;
17-
import org.eclipse.terminal.view.core.preferences.ScopedEclipsePreferences;
18-
import org.eclipse.terminal.view.core.tracing.TraceHandler;
17+
import org.eclipse.terminal.view.core.ITerminalService;
18+
import org.eclipse.terminal.view.core.utils.ScopedEclipsePreferences;
19+
import org.eclipse.terminal.view.core.utils.TraceHandler;
1920
import org.eclipse.ui.plugin.AbstractUIPlugin;
2021
import org.osgi.framework.BundleContext;
22+
import org.osgi.util.tracker.ServiceTracker;
2123

2224
/**
2325
* The activator class controls the plug-in life cycle
@@ -117,4 +119,15 @@ public static Image getImage(String key) {
117119
public static ImageDescriptor getImageDescriptor(String key) {
118120
return getDefault().getImageRegistry().getDescriptor(key);
119121
}
122+
123+
private static ServiceTracker<ITerminalService, ITerminalService> serviceTracker;
124+
125+
public static synchronized ITerminalService getTerminalService() {
126+
if (serviceTracker == null) {
127+
serviceTracker = new ServiceTracker<>(getDefault().getBundle().getBundleContext(), ITerminalService.class,
128+
null);
129+
serviceTracker.open();
130+
}
131+
return serviceTracker.getService();
132+
}
120133
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@
2727
import org.eclipse.swt.layout.GridLayout;
2828
import org.eclipse.swt.widgets.Composite;
2929
import org.eclipse.swt.widgets.Label;
30-
import org.eclipse.terminal.view.core.interfaces.constants.ITerminalsConnectorConstants;
31-
import org.eclipse.terminal.view.ui.interfaces.IConfigurationPanelContainer;
32-
import org.eclipse.terminal.view.ui.panels.AbstractExtendedConfigurationPanel;
30+
import org.eclipse.terminal.view.core.ITerminalsConnectorConstants;
31+
import org.eclipse.terminal.view.ui.launcher.AbstractExtendedConfigurationPanel;
32+
import org.eclipse.terminal.view.ui.launcher.IConfigurationPanelContainer;
3333
import org.eclipse.ui.ISelectionService;
3434
import org.eclipse.ui.PlatformUI;
3535
import org.eclipse.ui.WorkbenchEncoding;

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

Lines changed: 15 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -37,21 +37,20 @@
3737
import org.eclipse.jface.viewers.IStructuredSelection;
3838
import org.eclipse.terminal.connector.ISettingsStore;
3939
import org.eclipse.terminal.connector.ITerminalConnector;
40+
import org.eclipse.terminal.connector.InMemorySettingsStore;
4041
import org.eclipse.terminal.connector.TerminalConnectorExtension;
4142
import org.eclipse.terminal.connector.local.activator.UIPlugin;
4243
import org.eclipse.terminal.connector.local.controls.LocalWizardConfigurationPanel;
4344
import org.eclipse.terminal.connector.process.ProcessSettings;
44-
import org.eclipse.terminal.view.core.TerminalServiceFactory;
45-
import org.eclipse.terminal.view.core.interfaces.ITerminalService;
46-
import org.eclipse.terminal.view.core.interfaces.ITerminalServiceOutputStreamMonitorListener;
47-
import org.eclipse.terminal.view.core.interfaces.constants.ILineSeparatorConstants;
48-
import org.eclipse.terminal.view.core.interfaces.constants.ITerminalsConnectorConstants;
49-
import org.eclipse.terminal.view.ui.interfaces.IConfigurationPanel;
50-
import org.eclipse.terminal.view.ui.interfaces.IConfigurationPanelContainer;
51-
import org.eclipse.terminal.view.ui.interfaces.IMementoHandler;
52-
import org.eclipse.terminal.view.ui.interfaces.IPreferenceKeys;
53-
import org.eclipse.terminal.view.ui.internal.SettingsStore;
45+
import org.eclipse.terminal.view.core.ILineSeparatorConstants;
46+
import org.eclipse.terminal.view.core.ITerminalService;
47+
import org.eclipse.terminal.view.core.ITerminalServiceOutputStreamMonitorListener;
48+
import org.eclipse.terminal.view.core.ITerminalsConnectorConstants;
49+
import org.eclipse.terminal.view.ui.IMementoHandler;
50+
import org.eclipse.terminal.view.ui.IPreferenceKeys;
5451
import org.eclipse.terminal.view.ui.launcher.AbstractLauncherDelegate;
52+
import org.eclipse.terminal.view.ui.launcher.IConfigurationPanel;
53+
import org.eclipse.terminal.view.ui.launcher.IConfigurationPanelContainer;
5554
import org.eclipse.ui.ISelectionService;
5655
import org.eclipse.ui.PlatformUI;
5756
import org.eclipse.ui.WorkbenchEncoding;
@@ -60,7 +59,6 @@
6059
/**
6160
* Serial launcher delegate implementation.
6261
*/
63-
@SuppressWarnings("restriction")
6462
public class LocalLauncherDelegate extends AbstractLauncherDelegate {
6563

6664
private final IMementoHandler mementoHandler = new LocalMementoHandler();
@@ -109,7 +107,7 @@ public void execute(Map<String, Object> properties, ITerminalService.Done done)
109107
// Initialize the local terminal working directory.
110108
if (!properties.containsKey(ITerminalsConnectorConstants.PROP_PROCESS_WORKING_DIR)) {
111109
// By default, start the local terminal in the users home directory
112-
String initialCwd = org.eclipse.terminal.view.ui.activator.UIPlugin.getScopedPreferences()
110+
String initialCwd = IPreferenceKeys.getPreferences()
113111
.getString(IPreferenceKeys.PREF_LOCAL_TERMINAL_INITIAL_CWD);
114112
String cwd = null;
115113
if (initialCwd == null || IPreferenceKeys.PREF_INITIAL_CWD_USER_HOME.equals(initialCwd)
@@ -224,7 +222,7 @@ public void execute(Map<String, Object> properties, ITerminalService.Done done)
224222
}
225223

226224
// Get the terminal service
227-
ITerminalService terminal = TerminalServiceFactory.getService();
225+
ITerminalService terminal = UIPlugin.getTerminalService();
228226
// If not available, we cannot fulfill this request
229227
if (terminal != null) {
230228
terminal.openConsole(properties, done);
@@ -280,8 +278,7 @@ private final File defaultShell() {
280278
}
281279
}
282280
if (shell == null) {
283-
shell = org.eclipse.terminal.view.ui.activator.UIPlugin.getScopedPreferences()
284-
.getString(IPreferenceKeys.PREF_LOCAL_TERMINAL_DEFAULT_SHELL_UNIX);
281+
shell = IPreferenceKeys.getPreferences().getString(IPreferenceKeys.PREF_LOCAL_TERMINAL_DEFAULT_SHELL_UNIX);
285282
if (shell == null || "".equals(shell)) { //$NON-NLS-1$
286283
if (System.getenv("SHELL") != null && !"".equals(System.getenv("SHELL").trim())) { //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
287284
shell = System.getenv("SHELL").trim(); //$NON-NLS-1$
@@ -316,7 +313,7 @@ public ITerminalConnector createTerminalConnector(Map<String, Object> properties
316313

317314
String arguments = (String) properties.get(ITerminalsConnectorConstants.PROP_PROCESS_ARGS);
318315
if (arguments == null && !Platform.OS_WIN32.equals(Platform.getOS())) {
319-
arguments = org.eclipse.terminal.view.ui.activator.UIPlugin.getScopedPreferences()
316+
arguments = IPreferenceKeys.getPreferences()
320317
.getString(IPreferenceKeys.PREF_LOCAL_TERMINAL_DEFAULT_SHELL_UNIX_ARGS);
321318
}
322319

@@ -397,7 +394,7 @@ public ITerminalConnector createTerminalConnector(Map<String, Object> properties
397394
Assert.isTrue(image != null || process != null);
398395

399396
// Construct the terminal settings store
400-
ISettingsStore store = new SettingsStore();
397+
ISettingsStore store = new InMemorySettingsStore();
401398

402399
// Construct the process settings
403400
ProcessSettings processSettings = new ProcessSettings();
@@ -414,8 +411,7 @@ public ITerminalConnector createTerminalConnector(Map<String, Object> properties
414411

415412
if (properties.containsKey(ITerminalsConnectorConstants.PROP_PROCESS_MERGE_ENVIRONMENT)) {
416413
Object value = properties.get(ITerminalsConnectorConstants.PROP_PROCESS_MERGE_ENVIRONMENT);
417-
processSettings
418-
.setMergeWithNativeEnvironment(value instanceof Boolean b ? b.booleanValue() : false);
414+
processSettings.setMergeWithNativeEnvironment(value instanceof Boolean b ? b.booleanValue() : false);
419415
}
420416

421417
// 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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
import org.eclipse.jface.viewers.ISelection;
2222
import org.eclipse.jface.viewers.IStructuredSelection;
2323
import org.eclipse.jface.viewers.StructuredSelection;
24-
import org.eclipse.terminal.view.core.interfaces.constants.ITerminalsConnectorConstants;
25-
import org.eclipse.terminal.view.ui.interfaces.ILauncherDelegate;
24+
import org.eclipse.terminal.view.core.ITerminalsConnectorConstants;
25+
import org.eclipse.terminal.view.ui.launcher.ILauncherDelegate;
2626
import org.eclipse.terminal.view.ui.launcher.LauncherDelegateManager;
2727
import org.eclipse.ui.IEditorInput;
2828
import org.eclipse.ui.IPathEditorInput;

0 commit comments

Comments
 (0)