Merge branch 'master' into dnd-tests

Author: aloowood

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

@@ -534,11 +534,8 @@ public void hookControllerLogic(MUIElement me) {
 				@Override
 				public void controlResized(ControlEvent e) {
 					// Don't store the maximized size in the model
-					// But set the maximized tag so that the user can access the current state
 					if (shell.getMaximized()) {
-						me.getTags().add(ShellMaximizedTag);
-					} else {
-						me.getTags().remove(ShellMaximizedTag);
+						return;
 					}
 
 					try {

bundles/org.eclipse.e4.ui.workbench/META-INF/MANIFEST.MF

@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.e4.ui.workbench;singleton:=true
-Bundle-Version: 1.18.0.qualifier
+Bundle-Version: 1.18.100.qualifier
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin

bundles/org.eclipse.e4.ui.workbench/src/org/eclipse/e4/ui/internal/workbench/ModelServiceImpl.java

@@ -615,6 +615,9 @@ public void bringToTop(MUIElement element) {
 		}
 
 		MWindow window = getTopLevelWindowFor(element);
+		if (window == null) {
+			return;
+		}
 		if (window == element) {
 			if (!element.isToBeRendered()) {
 				element.setToBeRendered(true);

bundles/org.eclipse.ui.ide/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Plugin.name
 Bundle-SymbolicName: org.eclipse.ui.ide; singleton:=true
-Bundle-Version: 3.22.700.qualifier
+Bundle-Version: 3.22.800.qualifier
 Bundle-Activator: org.eclipse.ui.internal.ide.IDEWorkbenchPlugin
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: %Plugin.providerName

bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/dialogs/ConfigurationLogUpdateSection.java

@@ -24,12 +24,12 @@
 import org.eclipse.equinox.p2.engine.IProfileRegistry;
 import org.eclipse.equinox.p2.metadata.IInstallableUnit;
 import org.eclipse.equinox.p2.query.QueryUtil;
-import org.eclipse.osgi.service.resolver.BundleDescription;
-import org.eclipse.osgi.service.resolver.PlatformAdmin;
-import org.eclipse.osgi.service.resolver.State;
 import org.eclipse.osgi.util.NLS;
 import org.eclipse.ui.about.ISystemSummarySection;
 import org.eclipse.ui.internal.ide.IDEWorkbenchMessages;
+import org.eclipse.ui.internal.ide.IDEWorkbenchPlugin;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleContext;
 
 /**
  * Writes information about the update configurer into the system summary.
@@ -73,26 +73,24 @@ private void writeInstalledIUs(PrintWriter writer) {
 	 * Query OSGi and print out the list of known bundles.
 	 */
 	private void writeBundles(PrintWriter writer) {
-		ServiceCaller.callOnce(getClass(), PlatformAdmin.class, (admin) -> {
-			State state = admin.getState(false);
-			// Since this code is only called in the Help -> About -> Configuration Details case we
-			// won't worry too much about performance here and we will sort the query results
-			// afterwards, but before printing them out.
-			SortedSet<String> sorted = new TreeSet<>();
-			for (BundleDescription bundle : state.getBundles()) {
-				String name = bundle.getName();
-				if (name == null)
-					name = bundle.getLocation();
-				String message = NLS.bind(IDEWorkbenchMessages.ConfigurationLogUpdateSection_bundle, new Object[] {name, bundle.getVersion(), bundle.getLocation()});
-				sorted.add(message);
-			}
-			if (!sorted.isEmpty()) {
-				writer.println(IDEWorkbenchMessages.ConfigurationLogUpdateSection_bundleHeader);
-				writer.println();
-				for (String string : sorted)
-					writer.println(string);
-			}
-		});
+		BundleContext bundleContext = IDEWorkbenchPlugin.getDefault().getBundle().getBundleContext();
+		// Since this code is only called in the Help -> About -> Configuration Details case we
+		// won't worry too much about performance here and we will sort the query results
+		// afterwards, but before printing them out.
+		SortedSet<String> sorted = new TreeSet<>();
+		for (Bundle bundle : bundleContext.getBundles()) {
+			String name = bundle.getSymbolicName();
+			if (name == null)
+				name = bundle.getLocation();
+			String message = NLS.bind(IDEWorkbenchMessages.ConfigurationLogUpdateSection_bundle, new Object[] {name, bundle.getVersion(), bundle.getLocation()});
+			sorted.add(message);
+		}
+		if (!sorted.isEmpty()) {
+			writer.println(IDEWorkbenchMessages.ConfigurationLogUpdateSection_bundleHeader);
+			writer.println();
+			for (String string : sorted)
+				writer.println(string);
+		}
 	}
 
 	@Override

bundles/org.eclipse.ui.workbench/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.ui.workbench; singleton:=true
-Bundle-Version: 3.136.0.qualifier
+Bundle-Version: 3.136.100.qualifier
 Bundle-Activator: org.eclipse.ui.internal.WorkbenchPlugin
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: %providerName

bundles/org.eclipse.ui.workbench/eclipseui/org/eclipse/ui/part/EditorPart.java

@@ -291,4 +291,12 @@ protected final void checkSite(IWorkbenchPartSite site) {
 		Assert.isTrue(site instanceof IEditorSite, "The site for an editor must be an IEditorSite"); //$NON-NLS-1$
 	}
 
+	@Override
+	public void dispose() {
+		if (compatibilityTitleListener != null) {
+			removePropertyListener(compatibilityTitleListener);
+			compatibilityTitleListener = null;
+		}
+		super.dispose();
+	}
 }

bundles/org.eclipse.ui.workbench/eclipseui/org/eclipse/ui/part/MultiPageEditorPart.java

@@ -153,18 +153,21 @@ public abstract class MultiPageEditorPart extends EditorPart implements IPageCha
 
 	private ListenerList<IPageChangedListener> pageChangeListeners = new ListenerList<>(ListenerList.IDENTITY);
 
+	private org.eclipse.jface.util.IPropertyChangeListener propertyChangeListenerToUpdateContainer;
+
 	/**
 	 * Creates an empty multi-page editor with no pages and registers a
 	 * {@link PropertyChangeListener} to listen for changes to the editor's
 	 * preference..
 	 */
 	protected MultiPageEditorPart() {
 		super();
-		getAPIPreferenceStore().addPropertyChangeListener(event -> {
+		propertyChangeListenerToUpdateContainer = event -> {
 			if (isUpdateRequired(event)) {
 				updateContainer();
 			}
-		});
+		};
+		getAPIPreferenceStore().addPropertyChangeListener(propertyChangeListenerToUpdateContainer);
 	}
 
 	/**
@@ -526,6 +529,11 @@ protected IEditorSite createSite(IEditorPart editor) {
 	 */
 	@Override
 	public void dispose() {
+		IPreferenceStore store = getAPIPreferenceStore();
+		if (propertyChangeListenerToUpdateContainer != null) {
+			store.removePropertyChangeListener(propertyChangeListenerToUpdateContainer);
+			propertyChangeListenerToUpdateContainer = null;
+		}
 		if (getSite() != null) {
 			deactivateSite(true, false);
 		}

examples/pom.xml

@@ -14,7 +14,7 @@
   <parent>
     <groupId>org.eclipse.platform</groupId>
     <artifactId>eclipse.platform.ui</artifactId>
-    <version>4.37.0-SNAPSHOT</version>
+    <version>4.38.0-SNAPSHOT</version>
   </parent>
   <artifactId>eclipse.platform.ui.examples</artifactId>
   <packaging>pom</packaging>

features/org.eclipse.e4.rcp/feature.xml

@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.e4.rcp"
       label="%featureName"
-      version="4.37.0.qualifier"
+      version="4.38.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">