Merge branch 'eclipse-platform:master' into master

Author: ShahzaibIbrahim

Jenkinsfile

@@ -18,6 +18,7 @@ pipeline {
 					sh """
 					mvn clean verify --batch-mode --fail-at-end -Dmaven.repo.local=$WORKSPACE/.m2/repository \
 						-Pbree-libs -Papi-check -Pjavadoc \
+      						-Dmaven.test.failure.ignore=true \
 						-Dcompare-version-with-baselines.skip=false \
 						-Dmaven.compiler.failOnWarning=false \
 						-Dorg.slf4j.simpleLogger.showDateTime=true -Dorg.slf4j.simpleLogger.dateTimeFormat=HH:mm:ss.SSS \
@@ -30,8 +31,8 @@ pipeline {
 					archiveArtifacts artifacts: '.*log,*/target/work/data/.metadata/.*log,*/tests/target/work/data/.metadata/.*log,apiAnalyzer-workspace/.metadata/.*log', allowEmptyArchive: true
 					junit '**/target/surefire-reports/TEST-*.xml'
 					discoverGitReferenceBuild referenceJob: 'eclipse.platform/master'
-					recordIssues tools: [eclipse(pattern: '**/target/compilelogs/*.xml'), javaDoc()], qualityGates: [[threshold: 1, type: 'DELTA', unstable: true]]
-					recordIssues tool: mavenConsole(), qualityGates: [[threshold: 1, type: 'DELTA_ERROR', unstable: true]]
+					recordIssues publishAllIssues:false, ignoreQualityGate:true, tool: eclipse(name: 'Compiler and API Tools', pattern: '**/target/compilelogs/*.xml'), qualityGates: [[threshold: 1, type: 'DELTA', unstable: true]]
+					recordIssues publishAllIssues:false, tools: [mavenConsole(), javaDoc()]
 				}
 			}
 		}

debug/org.eclipse.debug.core/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.debug.core; singleton:=true
-Bundle-Version: 3.21.300.qualifier
+Bundle-Version: 3.21.400.qualifier
 Bundle-Activator: org.eclipse.debug.core.DebugPlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin

debug/org.eclipse.debug.core/core/org/eclipse/debug/core/Launch.java

@@ -17,8 +17,10 @@
 
 
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReadWriteLock;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
@@ -66,7 +68,7 @@ public class Launch extends PlatformObject implements ILaunch, IDisconnect, ILau
 	/**
 	 * The configuration that was launched, or null.
 	 */
-	private ILaunchConfiguration fConfiguration= null;
+	private volatile ILaunchConfiguration fConfiguration = null;
 
 	/**
 	 * The system processes associated with
@@ -78,7 +80,7 @@ public class Launch extends PlatformObject implements ILaunch, IDisconnect, ILau
 	 * The source locator to use in the debug session
 	 * or <code>null</code> if not supported.
 	 */
-	private ISourceLocator fLocator= null;
+	private volatile ISourceLocator fLocator = null;
 
 	/**
 	 * The mode this launch was launched in.
@@ -88,7 +90,7 @@ public class Launch extends PlatformObject implements ILaunch, IDisconnect, ILau
 	/**
 	 * Table of client defined attributes
 	 */
-	private HashMap<String, String> fAttributes;
+	private final Map<String, String> fAttributes = new ConcurrentHashMap<>();
 
 	/**
 	 * Flag indicating that change notification should
@@ -319,20 +321,20 @@ public ILaunchConfiguration getLaunchConfiguration() {
 	 */
 	@Override
 	public void setAttribute(String key, String value) {
-		if (fAttributes == null) {
-			fAttributes = new HashMap<>(5);
+		Objects.requireNonNull(key);
+		if (value == null) {
+			// ConcurrentHashMap does not allow null values
+			fAttributes.remove(key);
+		} else {
+			fAttributes.put(key, value);
 		}
-		fAttributes.put(key, value);
 	}
 
 	/**
 	 * @see ILaunch#getAttribute(String)
 	 */
 	@Override
 	public String getAttribute(String key) {
-		if (fAttributes == null) {
-			return null;
-		}
 		return fAttributes.get(key);
 	}
 
@@ -343,7 +345,7 @@ public String getAttribute(String key) {
 	public IDebugTarget[] getDebugTargets() {
 		readLock.lock();
 		try {
-			return fTargets.toArray(new IDebugTarget[fTargets.size()]);
+			return fTargets.toArray(IDebugTarget[]::new);
 		} finally {
 			readLock.unlock();
 		}

debug/org.eclipse.debug.core/core/org/eclipse/debug/core/model/IProcess.java

@@ -20,16 +20,29 @@
 import org.eclipse.debug.core.ILaunch;
 
 /**
- * A process represents a program running in normal (non-debug) mode.
- * Processes support setting and getting of client defined attributes.
- * This way, clients can annotate a process with any extra information
- * important to them. For example, classpath annotations, or command
- * line arguments used to launch the process may be important to a client.
+ * A process represents a program running in normal (non-debug) mode. Processes
+ * support setting and getting of client defined attributes. This way, clients
+ * can annotate a process with any extra information important to them. For
+ * example, classpath annotations, or command line arguments used to launch the
+ * process may be important to a client.
  * <p>
- * Clients may implement this interface, however, the debug plug-in
- * provides an implementation of this interface for a
- * <code>java.lang.Process</code>.
+ * Clients may implement this interface, however, the debug plug-in provides an
+ * implementation of this interface for a <code>java.lang.Process</code>.
  * </p>
+ *
+ * If implementing custom launches it is important to fire event whenever the
+ * process state changes in the following way:
+ *
+ * <pre>
+ * DebugPlugin manager = DebugPlugin.getDefault();
+ * if (manager != null) {
+ * 	manager.fireDebugEventSet(new DebugEvent[] {
+ * 			new DebugEvent(this, DebugEvent.CREATE) });
+ * }
+ * </pre>
+ *
+ * otherwise the UI will probably show faulty state for your process and launch.
+ *
  * @see org.eclipse.debug.core.DebugPlugin#newProcess(ILaunch, Process, String)
  */
 public interface IProcess extends IAdaptable, ITerminate {

debug/org.eclipse.debug.core/core/org/eclipse/debug/core/model/RuntimeProcess.java

@@ -17,9 +17,10 @@
 import java.nio.charset.IllegalCharsetNameException;
 import java.nio.charset.UnsupportedCharsetException;
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
@@ -68,7 +69,9 @@ public class RuntimeProcess extends PlatformObject implements IProcess {
 	private Process fProcess;
 
 	/**
-	 * This process's exit value
+	 * This process's exit value.
+	 *
+	 * synchronized by this
 	 */
 	private int fExitValue;
 
@@ -96,17 +99,17 @@ public class RuntimeProcess extends PlatformObject implements IProcess {
 	/**
 	 * Table of client defined attributes
 	 */
-	private Map<String, String> fAttributes;
+	private final Map<String, String> fAttributes = new ConcurrentHashMap<>();
 
 	/**
 	 * Whether output from the process should be captured or swallowed
 	 */
-	private boolean fCaptureOutput = true;
+	private final boolean fCaptureOutput;
 
 	/**
 	 * Whether the descendants of this process should be terminated too
 	 */
-	private boolean fTerminateDescendants = true;
+	private final boolean fTerminateDescendants;
 
 	private final String fThreadNameSuffix;
 
@@ -141,14 +144,16 @@ public RuntimeProcess(ILaunch launch, Process process, String name, Map<String,
 		String captureOutput = launch.getAttribute(DebugPlugin.ATTR_CAPTURE_OUTPUT);
 		fCaptureOutput = !("false".equals(captureOutput)); //$NON-NLS-1$
 
+		boolean terminateDescendants = true;
 		try {
 			ILaunchConfiguration launchConfiguration = launch.getLaunchConfiguration();
 			if (launchConfiguration != null) {
-				fTerminateDescendants = launchConfiguration.getAttribute(DebugPlugin.ATTR_TERMINATE_DESCENDANTS, true);
+				terminateDescendants = launchConfiguration.getAttribute(DebugPlugin.ATTR_TERMINATE_DESCENDANTS, true);
 			}
 		} catch (CoreException e) {
 			DebugPlugin.log(e);
 		}
+		fTerminateDescendants = terminateDescendants;
 		fThreadNameSuffix = getPidInfo(process, launch);
 
 		fStreamsProxy = createStreamsProxy();
@@ -264,7 +269,9 @@ public void terminate() throws DebugException {
 				try { // (in total don't wait longer than TERMINATION_TIMEOUT)
 					long waitStart = System.currentTimeMillis();
 					if (process.waitFor(TERMINATION_TIMEOUT, TimeUnit.MILLISECONDS)) {
-						fExitValue = process.exitValue();
+						synchronized (this) {
+							fExitValue = process.exitValue();
+						}
 						if (waitFor(descendants, waitStart)) {
 							return;
 						}
@@ -419,26 +426,25 @@ protected void fireChangeEvent() {
 	 */
 	@Override
 	public void setAttribute(String key, String value) {
-		if (fAttributes == null) {
-			fAttributes = new HashMap<>(5);
-		}
-		Object origVal = fAttributes.get(key);
-		if (origVal != null && origVal.equals(value)) {
-			return; //nothing changed.
+		Objects.requireNonNull(key);
+		if (value == null) {
+			// ConcurrentHashMap does not allow null values
+			if (fAttributes.remove(key) != null) {
+				fireChangeEvent();
+			}
+		} else {
+			String origVal = fAttributes.put(key, value);
+			if (!Objects.equals(origVal, value)) {
+				fireChangeEvent();
+			}
 		}
-
-		fAttributes.put(key, value);
-		fireChangeEvent();
 	}
 
 	/**
 	 * @see IProcess#getAttribute(String)
 	 */
 	@Override
 	public String getAttribute(String key) {
-		if (fAttributes == null) {
-			return null;
-		}
 		return fAttributes.get(key);
 	}
 

debug/org.eclipse.debug.examples.core/forceQualifierUpdate.txt

@@ -1,4 +1,5 @@
 Bug 534597 - Unanticipated comparator errors in I20180511-2000
 https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/issues/1184
 https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/issues/1659
-https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/issues/1744
+https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/issues/1744
+https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/issues/1781

debug/org.eclipse.debug.tests/build.properties

@@ -24,7 +24,6 @@ bin.includes = META-INF/,\
 src.includes = icons/
 
 # Maven/Tycho pom model adjustments
-pom.model.property.code.ignoredWarnings = ${tests.ignoredWarnings}
 pom.model.property.testClass = org.eclipse.debug.tests.AutomatedSuite
 pom.model.property.tycho.surefire.useUIHarness = true
 pom.model.property.tycho.surefire.useUIThread = true

debug/org.eclipse.debug.ui/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.debug.ui; singleton:=true
-Bundle-Version: 3.18.300.qualifier
+Bundle-Version: 3.18.400.qualifier
 Bundle-Activator: org.eclipse.debug.internal.ui.DebugUIPlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin

debug/org.eclipse.debug.ui/forceQualifierUpdate.txt

@@ -4,4 +4,5 @@ Bug 534597 - Unanticipated comparator errors in I20180511-2000
 Bug 566471 - I20200828-0150 - Comparator Errors Found
 https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/issues/1184
 https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/issues/1378
-https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/issues/1659
+https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/issues/1659
+https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/issues/1781

debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DebugUIMessages.java

@@ -303,8 +303,6 @@ public class DebugUIMessages extends NLS {
 
 	public static String LaunchShortcutAction_combineLaunchShortcutName;
 
-	public static String ContextualLaunchAction_0;
-
 	static {
 		// load message values from bundle file
 		NLS.initializeMessages(BUNDLE_NAME, DebugUIMessages.class);

debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DebugUIMessages.properties

@@ -162,7 +162,6 @@ CodePagesPrefDialog_7=ASCII codepage entered is invalid.
 CodePagesPrefDialog_8=Invalid codepage
 CodePagesPrefDialog_9=EBCDIC codepage entered is invalid.
 CodePagesPrefDialog_0=The codepage is not supported.
-ContextualLaunchAction_0=Loading...
 
 ##############################################################
 # View Tab

debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/TerminateAllAction.java

@@ -13,6 +13,11 @@
  *******************************************************************************/
 package org.eclipse.debug.internal.ui.commands.actions;
 
+import java.util.Arrays;
+
+import org.eclipse.core.runtime.ILog;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.debug.core.DebugException;
 import org.eclipse.debug.core.DebugPlugin;
 import org.eclipse.debug.core.ILaunch;
 import org.eclipse.debug.core.ILaunchManager;
@@ -22,9 +27,11 @@
 import org.eclipse.debug.internal.ui.IInternalDebugUIConstants;
 import org.eclipse.debug.internal.ui.actions.ActionMessages;
 import org.eclipse.debug.ui.actions.DebugCommandAction;
+import org.eclipse.debug.ui.contexts.DebugContextEvent;
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.swt.widgets.Event;
 import org.eclipse.ui.IWorkbenchPart;
 import org.eclipse.ui.IWorkbenchWindow;
 
@@ -49,9 +56,7 @@ public void dispose() {
 	private void attachSelfToLaunchManager() {
 		ILaunchManager launchManager = getLaunchManager();
 		launchManager.addLaunchListener(this);
-		// heuristic... rather than updating all the time, just assume there's
-		// something that's not terminated.
-		setEnabled(launchManager.getLaunches().length > 0);
+		setEnabled(canTerminate());
 	}
 
 	private ILaunchManager getLaunchManager() {
@@ -103,12 +108,12 @@ protected Class<ITerminateHandler> getCommandType() {
 
 	@Override
 	public void launchesTerminated(ILaunch[] launches) {
-		setEnabled(getLaunchManager().getLaunches().length > 0);
+		setEnabled(canTerminate());
 	}
 
 	@Override
 	public void launchesAdded(ILaunch[] launches) {
-		setEnabled(true);
+		setEnabled(canTerminate());
 	}
 
 	@Override
@@ -117,7 +122,7 @@ public void launchesChanged(ILaunch[] launches) {
 
 	@Override
 	public void launchesRemoved(ILaunch[] launches) {
-		setEnabled(getLaunchManager().getLaunches().length > 0);
+		setEnabled(canTerminate());
 	}
 
 	@Override
@@ -136,4 +141,32 @@ public void init(IWorkbenchWindow window) {
 		super.init(window);
 		attachSelfToLaunchManager();
 	}
+
+	@Override
+	protected boolean getInitialEnablement() {
+		return canTerminate();
+	}
+
+	private boolean canTerminate() {
+		return Arrays.stream(getLaunchManager().getLaunches()).anyMatch(ILaunch::canTerminate);
+	}
+
+	@Override
+	public void runWithEvent(Event event) {
+		for (ILaunch l : getLaunchManager().getLaunches()) {
+			try {
+				if (l.canTerminate()) {
+					l.terminate();
+				}
+			} catch (DebugException e) {
+				ILog.get().log(Status.warning("Unable to terminate launch: " + e.getMessage(), e)); //$NON-NLS-1$
+			}
+		}
+		setEnabled(canTerminate());
+	}
+
+	@Override
+	public void debugContextChanged(DebugContextEvent event) {
+		setEnabled(canTerminate());
+	}
 }