e4 x-friends to reduce "Discouraged access" warnings

Author: EcljpseB0T

bundles/org.eclipse.e4.core.commands/META-INF/MANIFEST.MF

@@ -14,7 +14,11 @@ Import-Package: jakarta.annotation;version="[2.1.0,3.0.0)",
  org.eclipse.e4.core.contexts,
  org.eclipse.e4.core.services.log
 Export-Package: org.eclipse.e4.core.commands,
- org.eclipse.e4.core.commands.internal;x-friends:="org.eclipse.e4.ui.bindings,org.eclipse.ui.workbench"
+ org.eclipse.e4.core.commands.internal;x-friends:=
+ "org.eclipse.e4.ui.bindings,
+ org.eclipse.ui.workbench,
+ org.eclipse.e4.ui.workbench,
+ org.eclipse.e4.ui.workbench.renderers.swt"
 Require-Bundle: org.eclipse.equinox.common;bundle-version="[3.6.0,4.0.0)",
  org.eclipse.e4.core.di;bundle-version="0.9.0"
 Automatic-Module-Name: org.eclipse.e4.core.commands

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

@@ -16,7 +16,10 @@ Export-Package: org.eclipse.e4.ui.css.swt;x-friends:="org.eclipse.ui.workbench",
  org.eclipse.e4.ui.css.swt.dom.html;x-internal:=true,
  org.eclipse.e4.ui.css.swt.dom.preference;x-internal:=true,
  org.eclipse.e4.ui.css.swt.engine;x-friends:="org.eclipse.e4.ui.css.swt.theme,org.eclipse.e4.ui.workbench.swt",
- org.eclipse.e4.ui.css.swt.helpers;x-friends:="org.eclipse.ui.views.properties.tabbed,org.eclipse.e4.ui.css.swt.theme",
+ org.eclipse.e4.ui.css.swt.helpers;x-friends:="
+  org.eclipse.ui.views.properties.tabbed,
+  org.eclipse.e4.ui.workbench.swt,
+  org.eclipse.e4.ui.css.swt.theme",
  org.eclipse.e4.ui.css.swt.properties;x-friends:="org.eclipse.ui.workbench,org.eclipse.ui.views.properties.tabbed,org.eclipse.ui.forms",
  org.eclipse.e4.ui.css.swt.properties.converters;x-internal:=true,
  org.eclipse.e4.ui.css.swt.properties.css2;x-internal:=true,

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

@@ -24,6 +24,7 @@ Export-Package: org.eclipse.e4.ui.model;x-friends:="org.eclipse.e4.ui.workbench,
    org.eclipse.e4.ui.workbench,
    org.eclipse.e4.ui.workbench.swt,
    org.eclipse.e4.ui.workbench.addons.swt,
+   org.eclipse.e4.tools.persistence,
    org.eclipse.e4.emf.xpath.test",
  org.eclipse.e4.ui.model.application.ui,
  org.eclipse.e4.ui.model.application.ui.advanced,
@@ -32,6 +33,7 @@ Export-Package: org.eclipse.e4.ui.model;x-friends:="org.eclipse.e4.ui.workbench,
    org.eclipse.e4.ui.workbench.addons.swt,
    org.eclipse.e4.ui.workbench.swt,
    org.eclipse.ui.workbench,
+   org.eclipse.e4.tools.persistence,
    org.eclipse.e4.emf.xpath.test",
  org.eclipse.e4.ui.model.application.ui.advanced.util;x-internal:=true,
  org.eclipse.e4.ui.model.application.ui.basic,
@@ -41,6 +43,7 @@ Export-Package: org.eclipse.e4.ui.model;x-friends:="org.eclipse.e4.ui.workbench,
    org.eclipse.e4.ui.workbench.addons.swt,
    org.eclipse.e4.ui.workbench.swt,
    org.eclipse.ui.workbench,
+   org.eclipse.e4.tools.persistence,
    org.eclipse.e4.emf.xpath.test",
  org.eclipse.e4.ui.model.application.ui.basic.util;x-internal:=true,
  org.eclipse.e4.ui.model.application.ui.impl;
@@ -65,7 +68,9 @@ Export-Package: org.eclipse.e4.ui.model;x-friends:="org.eclipse.e4.ui.workbench,
  org.eclipse.e4.ui.model.fragment,
  org.eclipse.e4.ui.model.fragment.impl;x-friends:="org.eclipse.e4.ui.workbench",
  org.eclipse.e4.ui.model.fragment.util;x-internal:=true,
- org.eclipse.e4.ui.model.internal;x-friends:="org.eclipse.e4.ui.workbench"
+ org.eclipse.e4.ui.model.internal;x-friends:=
+  "org.eclipse.e4.ui.workbench,
+  org.eclipse.ui.workbench"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.29.0,4.0.0)",
  org.eclipse.e4.core.services;bundle-version="0.9.0",
  org.eclipse.e4.core.contexts;bundle-version="1.0.0",

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

@@ -27,7 +27,7 @@ Import-Package: jakarta.annotation;version="[2.1.0,3.0.0)",
  org.osgi.service.event;version="[1.3.0,2.0.0)"
 Export-Package: org.eclipse.e4.ui.workbench.addons.cleanupaddon;x-internal:=true,
  org.eclipse.e4.ui.workbench.addons.dndaddon;x-internal:=true,
- org.eclipse.e4.ui.workbench.addons.minmax;x-internal:=true,
+ org.eclipse.e4.ui.workbench.addons.minmax;x-friends:="org.eclipse.ui.workbench",
  org.eclipse.e4.ui.workbench.addons.splitteraddon;x-friends:="org.eclipse.ui.workbench",
  org.eclipse.e4.ui.workbench.addons.swt;x-internal:=true
 Automatic-Module-Name: org.eclipse.e4.ui.workbench.addons.swt

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

@@ -28,7 +28,7 @@ Export-Package: org.eclipse.e4.ui.internal.workbench;
    org.eclipse.ui.ide.application,
    org.eclipse.ui.ide,
    org.eclipse.e4.emf.xpath.test",
- org.eclipse.e4.ui.internal.workbench.addons;x-internal:=true,
+ org.eclipse.e4.ui.internal.workbench.addons;x-friends:="org.eclipse.ui.workbench",
  org.eclipse.e4.ui.internal.workbench.handlers;x-internal:=true,
  org.eclipse.e4.ui.workbench,
  org.eclipse.e4.ui.workbench.lifecycle,

bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchPage.java

@@ -92,6 +92,7 @@
 import org.eclipse.e4.ui.workbench.IPresentationEngine;
 import org.eclipse.e4.ui.workbench.UIEvents;
 import org.eclipse.e4.ui.workbench.UIEvents.EventTags;
+import org.eclipse.e4.ui.workbench.addons.minmax.TrimStack;
 import org.eclipse.e4.ui.workbench.modeling.EModelService;
 import org.eclipse.e4.ui.workbench.modeling.EPartService;
 import org.eclipse.e4.ui.workbench.modeling.EPartService.PartState;
@@ -873,13 +874,10 @@ private void handleMinimizedStacks(@UIEventTopic(UIEvents.ApplicationElement.TOP
 
 		final MToolControl minimizedStack = (MToolControl) changedObj;
 
-		// Note: The non-API type TrimStack is not imported to avoid
-		// https://bugs.eclipse.org/435521
-		if (!(minimizedStack.getObject() instanceof org.eclipse.e4.ui.workbench.addons.minmax.TrimStack))
+		if (!(minimizedStack.getObject() instanceof TrimStack))
 			return;
 
-		org.eclipse.e4.ui.workbench.addons.minmax.TrimStack ts = (org.eclipse.e4.ui.workbench.addons.minmax.TrimStack) minimizedStack
-				.getObject();
+		TrimStack ts = (TrimStack) minimizedStack.getObject();
 		if (!(ts.getMinimizedElement() instanceof MPartStack))
 			return;
 
@@ -926,7 +924,7 @@ private void handleMinimizedStacks(@UIEventTopic(UIEvents.ApplicationElement.TOP
 	 * @param w     the parent window
 	 * @param input the page input
 	 */
-	public WorkbenchPage(WorkbenchWindow w, IAdaptable input) throws WorkbenchException {
+	public WorkbenchPage(WorkbenchWindow w, IAdaptable input) {
 		super();
 		init(w, input);
 	}

bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchWindow.java

@@ -815,11 +815,7 @@ public boolean saveParts(Collection<MPart> dirtyParts, boolean confirm) {
 			fireWindowOpening();
 			configureShell(getShell(), windowContext);
 
-			try {
-				page = new WorkbenchPage(this, input);
-			} catch (WorkbenchException e) {
-				WorkbenchPlugin.log(e);
-			}
+			page = new WorkbenchPage(this, input);
 			menuOverride = new MenuOverrides(page);
 			toolbarOverride = new ToolbarOverrides(page);
 

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

@@ -30,6 +30,7 @@ Export-Package: org.eclipse.e4.ui.workbench.addons.perspectiveswitcher;x-interna
    org.eclipse.ui.ide.application,
    org.eclipse.ui.views,
    org.eclipse.ui.navigator.resources,
+   org.eclipse.ui.tests.browser,
    org.eclipse.debug.ui",
  org.eclipse.ui.internal.about;x-friends:="org.eclipse.ui,org.eclipse.equinox.p2.ui",
  org.eclipse.ui.internal.actions;x-friends:="org.eclipse.ui.ide",