Merge branch 'eclipse-platform:master' into close_all_editors_e4_contribs

Author: feilimb

README.md

@@ -16,7 +16,11 @@ For more information, refer to the [Eclipse Platform project page](https://proje
 
 Contributions are most welcome. There are many ways to contribute, from entering high quality bug reports, to contributing code or documentation changes.
 
-For a complete guide, see the https://github.com/eclipse-platform/.github/blob/main/CONTRIBUTING.md.
+For a complete guide, see the [CONTRIBUTING](https://github.com/eclipse-platform/.github/blob/main/CONTRIBUTING.md) page.
+
+[![Create Eclipse Development Environment for Eclipse Platform UI](https://download.eclipse.org/oomph/www/setups/svg/Eclipse_Platform_UI.svg)](
+https://www.eclipse.org/setups/installer/?url=https://raw.githubusercontent.com/eclipse-platform/eclipse.platform.ui/master/releng/org.eclipse.ui.releng/platformUIConfiguration.setup&show=true
+"Click to open Eclipse-Installer Auto Launch or drag into your running installer")
 
 
 ## Test Dependencies
@@ -27,10 +31,10 @@ Please install them by installing "Eclipse Test Framework" from the [current rel
 
 ## How to Build on the Command Line
 
-You need Maven 3.8.x installed. After this you can run the build via the following command:
+You need Maven 3.9.x installed. After this you can run the build via the following command:
 
 ```
-mvn clean verify -Pbuild-individual-bundles
+mvn clean verify
 ```
 
 

bundles/org.eclipse.e4.ui.workbench.renderers.swt/src/org/eclipse/e4/ui/workbench/renderers/swt/ContributedPartRenderer.java

@@ -103,8 +103,10 @@ public boolean setFocus() {
 							Object object = part.getObject();
 							if (object != null && isEnabled()) {
 								IPresentationEngine pe = part.getContext().get(IPresentationEngine.class);
-								pe.focusGui(part);
-								return true;
+								if (pe != null) {
+									pe.focusGui(part);
+									return true;
+								}
 							}
 							return super.setFocus();
 						} finally {

bundles/org.eclipse.jface.text/projection/org/eclipse/jface/text/source/projection/ProjectionAnnotationModel.java

@@ -147,6 +147,10 @@ public boolean collapseAll(int offset, int length) {
 	 */
 	protected boolean expandAll(int offset, int length, boolean fireModelChanged) {
 
+		if (offset < 0 || length < 0) {
+			return false;
+		}
+
 		boolean expanding= false;
 
 		Iterator<Annotation> iterator= getAnnotationIterator(offset, length, true, true);

bundles/org.eclipse.jface/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.jface;singleton:=true
-Bundle-Version: 3.35.0.qualifier
+Bundle-Version: 3.35.100.qualifier
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Export-Package: org.eclipse.jface,

bundles/org.eclipse.jface/src/org/eclipse/jface/window/Window.java

@@ -655,8 +655,8 @@ public int getReturnCode() {
 	/**
 	 * Returns this window's shell.
 	 *
-	 * @return this window's shell, or <code>null</code> if this window's
-	 *         shell has not been created yet
+	 * @return this window's shell, or <code>null</code> if this window's shell has
+	 *         not been created yet or if this window has been closed
 	 */
 	@Override
 	public Shell getShell() {

bundles/org.eclipse.search.core/search/org/eclipse/search/internal/core/DirtyFileSearchParticipantServiceTracker.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2023 Red Hat Inc and others.
+ * Copyright (c) 2023, 2024 Red Hat Inc and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -16,57 +16,38 @@
 import java.text.MessageFormat;
 import java.util.Arrays;
 import java.util.Collections;
-import java.util.List;
-import java.util.Map;
+import java.util.Comparator;
+import java.util.Optional;
 
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.InvalidSyntaxException;
 import org.osgi.framework.ServiceReference;
 import org.osgi.util.tracker.ServiceTracker;
 
-import org.eclipse.core.resources.IFile;
-
-import org.eclipse.jface.text.IDocument;
-
 import org.eclipse.search.internal.core.text.DirtyFileProvider;
 
-public class DirtyFileSearchParticipantServiceTracker
-		extends ServiceTracker<DirtyFileProvider, DirtyFileProvider> {
+public class DirtyFileSearchParticipantServiceTracker extends ServiceTracker<DirtyFileProvider, DirtyFileProvider> {
 
 	private static final String PROPERTY_WEIGHT = "weight"; //$NON-NLS-1$
-	public DirtyFileSearchParticipantServiceTracker(BundleContext context)
-			throws InvalidSyntaxException {
+
+	public DirtyFileSearchParticipantServiceTracker(BundleContext context) throws InvalidSyntaxException {
 		super(context, context.createFilter(MessageFormat.format("(&(objectClass={0}))", //$NON-NLS-1$
 				DirtyFileProvider.class.getCanonicalName())), null);
 	}
 
+	private final static Comparator<ServiceReference<DirtyFileProvider>> BY_WEIGHT = Comparator.comparing(
+			o -> o.getProperty(PROPERTY_WEIGHT), //
+			Comparator.nullsFirst(Comparator.comparing(Integer.class::isInstance) // false<true
+					.thenComparing(Integer.class::cast)));
+
 	public DirtyFileProvider checkedGetService() {
 		ServiceReference<DirtyFileProvider>[] allRefs = getServiceReferences();
 		if (allRefs != null && allRefs.length > 0) {
-			List<ServiceReference<DirtyFileProvider>> l = Arrays.asList(allRefs);
-			Collections.sort(l, (o1, o2) -> {
-				Object o1Weight = o1.getProperty(PROPERTY_WEIGHT);
-				Object o2Weight = o2.getProperty(PROPERTY_WEIGHT);
-				int o1Val = o1Weight == null ? 0
-						: o1Weight instanceof Integer ? ((Integer) o1Weight).intValue() : 0;
-				int o2Val = o2Weight == null ? 0
-						: o2Weight instanceof Integer ? ((Integer) o2Weight).intValue() : 0;
-				return o2Val - o1Val;
-			});
-			if (l.size() > 0) {
-				return getService(l.get(0));
+			Optional<ServiceReference<DirtyFileProvider>> reference = Arrays.stream(allRefs).max(BY_WEIGHT);
+			if (reference.isPresent()) {
+				return getService(reference.get());
 			}
 		}
-		return new DirtyFileProvider() {
-			@SuppressWarnings("unchecked")
-			@Override
-			public Map<IFile, IDocument> dirtyFiles() {
-				return Collections.EMPTY_MAP;
-			}
-		};
-	}
-
-	public void dispose() {
-		close();
+		return Collections::emptyMap;
 	}
 }

bundles/org.eclipse.ui.ide.application/src/org/eclipse/ui/internal/ide/application/IDEWorkbenchAdvisor.java

@@ -226,7 +226,7 @@ public void initialize(IWorkbenchConfigurer configurer) {
 			jfaceComparatorIsSet = true;
 		}
 
-		if (!Platform.inDevelopmentMode()) {
+		if (!Platform.inDevelopmentMode() && !JUnitTestUtil.isJunitTestRunning()) {
 			new AutoRegisterSchemeHandlersJob().schedule();
 		}
 	}

bundles/org.eclipse.ui.ide.application/src/org/eclipse/ui/internal/ide/application/JUnitTestUtil.java

@@ -0,0 +1,59 @@
+/*******************************************************************************
+ * Copyright (c) 2024 SAP SE.
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     Matthias Becker / Sebastian Ratz - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.ui.internal.ide.application;
+
+import java.util.Set;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.core.runtime.ServiceCaller;
+import org.eclipse.osgi.service.environment.EnvironmentInfo;
+
+public class JUnitTestUtil {
+	private static Boolean cachedIsJunitTestRunning = null;
+
+	public static boolean isJunitTestRunning() {
+		if (cachedIsJunitTestRunning == null) {
+			try {
+				if (Platform.isRunning()) {
+					AtomicBoolean result = new AtomicBoolean();
+					cachedIsJunitTestRunning = ServiceCaller.callOnce(JUnitTestUtil.class, EnvironmentInfo.class, envInfo -> {
+						String application = envInfo.getProperty("eclipse.application"); //$NON-NLS-1$
+						result.set(application != null && Set.of( //
+								// see org.eclipse.pde.internal.launching.IPDEConstants
+								"org.eclipse.pde.junit.runtime.nonuithreadtestapplication", // //$NON-NLS-1$
+								"org.eclipse.pde.junit.runtime.uitestapplication", // //$NON-NLS-1$
+								"org.eclipse.pde.junit.runtime.coretestapplication", // //$NON-NLS-1$
+								// bundle "org.eclipse.test" (Platform tests)
+								"org.eclipse.test.uitestapplication", //$NON-NLS-1$
+								"org.eclipse.test.coretestapplication", // //$NON-NLS-1$
+								// see org.eclipse.tycho.surefire.AbstractTestMojo
+								"org.eclipse.tycho.surefire.osgibooter.uitest", //$NON-NLS-1$
+								"org.eclipse.tycho.surefire.osgibooter.headlesstest") // //$NON-NLS-1$
+								.contains(application));
+					});
+					cachedIsJunitTestRunning = result.get();
+				} else {
+					cachedIsJunitTestRunning = true; // probably
+				}
+			} catch (Throwable t) {
+				// log
+				cachedIsJunitTestRunning = false;
+			}
+		}
+
+		return cachedIsJunitTestRunning;
+	}
+
+}

bundles/org.eclipse.ui.ide/schema/markerSupport.exsd

@@ -192,6 +192,26 @@ ON_ANY_IN_SAME_CONTAINER: on any item with the same top level container as the s
                </appinfo>
             </annotation>
          </attribute>
+         <attribute name="application">
+            <annotation>
+               <documentation>
+                  The application attribute describes how the reference should be applied.
+                  i.e. Does it refer to type only, type and subtypes or subtypes only.
+                  It is optionally included.
+                  If it is not specified it defaults to typeAndSubTypes.
+               </documentation>
+            </annotation>
+            <simpleType>
+               <restriction base="string">
+                  <enumeration value="subTypesOnly">
+                  </enumeration>
+                  <enumeration value="typeOnly">
+                  </enumeration>
+                  <enumeration value="typeAndSubTypes">
+                  </enumeration>
+               </restriction>
+            </simpleType>
+         </attribute>
       </complexType>
    </element>
 

bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/views/markers/MarkerSupportInternalUtilities.java

@@ -11,6 +11,7 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *     Lars Vogel <[email protected]> - Bug 430694
+ *     Enda O'Brien, Pilz Ireland - PR #144
  ******************************************************************************/
 
 package org.eclipse.ui.internal.views.markers;
@@ -71,6 +72,26 @@ public class MarkerSupportInternalUtilities {
 	 */
 	public static final String ATTRIBUTE_ID = "id"; //$NON-NLS-1$
 
+	/**
+	 * The application attribute from a configuration element.
+	 */
+	public static final String APPLICATION = "application"; //$NON-NLS-1$
+
+	/**
+	 * The sub type only attribute value from the application attribute.
+	 */
+	public static final String SUB_TYPES_ONLY = "subTypesOnly"; //$NON-NLS-1$
+
+	/**
+	 * The type only attribute value from the application attribute.
+	 */
+	public static final String TYPE_ONLY = "typeOnly"; //$NON-NLS-1$
+
+	/**
+	 * The type and subtype attribute value from the application attribute.
+	 */
+	public static final String TYPE_AND_SUBTYPE = "typeAndSubTypes"; //$NON-NLS-1$
+
 	/**
 	 * The name attribute name from a configuration element.
 	 */