diff --git a/bundles/org.eclipse.ui.workbench/.settings/.api_filters b/bundles/org.eclipse.ui.workbench/.settings/.api_filters index 041e6f356c52..0ae72c8a9704 100644 --- a/bundles/org.eclipse.ui.workbench/.settings/.api_filters +++ b/bundles/org.eclipse.ui.workbench/.settings/.api_filters @@ -88,6 +88,20 @@ + + + + + + + + + + + + + + diff --git a/bundles/org.eclipse.ui.workbench/eclipseui/org/eclipse/ui/IPageLayout.java b/bundles/org.eclipse.ui.workbench/eclipseui/org/eclipse/ui/IPageLayout.java index 9da34b465e49..376e550cd761 100644 --- a/bundles/org.eclipse.ui.workbench/eclipseui/org/eclipse/ui/IPageLayout.java +++ b/bundles/org.eclipse.ui.workbench/eclipseui/org/eclipse/ui/IPageLayout.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2019 IBM Corporation and others. + * Copyright (c) 2000, 2025 IBM Corporation and others. * * This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -215,34 +215,6 @@ public interface IPageLayout { */ void addActionSet(String actionSetId); - /** - * Adds the view with the given compound id to the page layout as a fast view. - * See the {@link IPageLayout} type documentation for more details about - * compound ids. The primary id must name a view contributed to the workbench's - * view extension point (named "org.eclipse.ui.views"). - * - * @param viewId the compound id of the view to be added - * @since 2.0 - * @deprecated discontinued support for fast views - */ - @Deprecated(forRemoval = true, since = "2023-12") - void addFastView(String viewId); - - /** - * Adds the view with the given compound id to the page layout as a fast view - * with the given width ratio. See the {@link IPageLayout} type documentation - * for more details about compound ids. The primary id must name a view - * contributed to the workbench's view extension point (named - * "org.eclipse.ui.views"). - * - * @param viewId the compound id of the view to be added - * @param ratio the percentage of the workbench the fast view will cover - * @since 2.0 - * @deprecated discontinued support for fast views - */ - @Deprecated(forRemoval = true, since = "2023-12") - void addFastView(String viewId, float ratio); - /** * Adds a new wizard shortcut to the page layout. These are typically shown in * the UI to allow rapid navigation to appropriate new wizards. For example, in diff --git a/bundles/org.eclipse.ui.workbench/eclipseui/org/eclipse/ui/internal/PerspectiveExtensionReader.java b/bundles/org.eclipse.ui.workbench/eclipseui/org/eclipse/ui/internal/PerspectiveExtensionReader.java index 321341daf28e..87136e73c769 100644 --- a/bundles/org.eclipse.ui.workbench/eclipseui/org/eclipse/ui/internal/PerspectiveExtensionReader.java +++ b/bundles/org.eclipse.ui.workbench/eclipseui/org/eclipse/ui/internal/PerspectiveExtensionReader.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2013, 2018 IBM Corporation and others. + * Copyright (c) 2013, 2025 IBM Corporation and others. * * This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -52,8 +52,6 @@ public class PerspectiveExtensionReader extends RegistryReader { private static final String VAL_STACK = "stack";//$NON-NLS-1$ - private static final String VAL_FAST = "fast";//$NON-NLS-1$ - private static final String VAL_TRUE = "true";//$NON-NLS-1$ // VAL_FALSE added by dan_rubel@instantiations.com @@ -252,7 +250,7 @@ private boolean processView(IConfigurationElement element) { logMissingAttribute(element, IWorkbenchRegistryConstants.ATT_RELATIONSHIP); return false; } - if (!VAL_FAST.equals(relationship) && relative == null) { + if (relative == null) { logError(element, "Attribute '" + IWorkbenchRegistryConstants.ATT_RELATIVE //$NON-NLS-1$ + "' not defined. This attribute is required when " //$NON-NLS-1$ + IWorkbenchRegistryConstants.ATT_RELATIONSHIP + "=\"" + relationship + "\"."); //$NON-NLS-1$ //$NON-NLS-2$ @@ -277,7 +275,6 @@ private boolean processView(IConfigurationElement element) { // Get relationship details. boolean stack = false; int intRelation = 0; - boolean fast = false; switch (relationship) { case VAL_LEFT: intRelation = IPageLayout.LEFT; @@ -294,9 +291,6 @@ private boolean processView(IConfigurationElement element) { case VAL_STACK: stack = true; break; - case VAL_FAST: - fast = true; - break; default: return false; } @@ -315,15 +309,6 @@ private boolean processView(IConfigurationElement element) { } else { pageLayout.stackView(id, relative, false); } - } - // If the view is a fast view... - else if (fast) { - if (ratio == IPageLayout.NULL_RATIO) { - // The ratio has not been specified. - pageLayout.addFastView(id); - } else { - pageLayout.addFastView(id, ratio); - } } else { // The view is a regular view. diff --git a/bundles/org.eclipse.ui.workbench/eclipseui/org/eclipse/ui/internal/e4/compatibility/ModeledPageLayout.java b/bundles/org.eclipse.ui.workbench/eclipseui/org/eclipse/ui/internal/e4/compatibility/ModeledPageLayout.java index 9d717260f8d3..6d9623903334 100644 --- a/bundles/org.eclipse.ui.workbench/eclipseui/org/eclipse/ui/internal/e4/compatibility/ModeledPageLayout.java +++ b/bundles/org.eclipse.ui.workbench/eclipseui/org/eclipse/ui/internal/e4/compatibility/ModeledPageLayout.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2016 IBM Corporation and others. + * Copyright (c) 2009, 2025 IBM Corporation and others. * * This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -23,7 +23,6 @@ import java.util.Optional; import java.util.function.Function; import java.util.function.Predicate; -import org.eclipse.core.runtime.IStatus; import org.eclipse.e4.core.services.contributions.IContributionFactory; import org.eclipse.e4.ui.internal.workbench.PartStackUtil; import org.eclipse.e4.ui.model.application.MApplication; @@ -62,7 +61,6 @@ import org.eclipse.ui.internal.WorkbenchMessages; import org.eclipse.ui.internal.WorkbenchPage; import org.eclipse.ui.internal.WorkbenchPlugin; -import org.eclipse.ui.internal.misc.StatusUtil; import org.eclipse.ui.internal.registry.ActionSetRegistry; import org.eclipse.ui.internal.registry.IActionSetDescriptor; import org.eclipse.ui.views.IViewDescriptor; @@ -205,23 +203,6 @@ public void addActionSet(String actionSetId) { perspModel.getTags().add(ACTION_SET_TAG + actionSetId); } - @Override - public void addFastView(String viewId) { - E4Util.unsupported("addFastView: " + viewId); //$NON-NLS-1$ - logDeprecatedWarning(viewId); - } - - @Override - public void addFastView(String viewId, float ratio) { - E4Util.unsupported("addFastView: " + viewId); //$NON-NLS-1$ - logDeprecatedWarning(viewId); - } - - private void logDeprecatedWarning(String viewId) { - String message = viewId + ": Deprecated relationship \"fast\" should be converted to \"stack\"."; //$NON-NLS-1$ - WorkbenchPlugin.log(message, StatusUtil.newStatus(IStatus.WARNING, message, null)); - } - @Override public void addNewWizardShortcut(String id) { perspModel.getTags().add(NEW_WIZARD_TAG + id);