diff --git a/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/DebugUITools.java b/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/DebugUITools.java index 61b1da6950d..fe8f26d4c68 100644 --- a/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/DebugUITools.java +++ b/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/DebugUITools.java @@ -715,36 +715,6 @@ public static int openLaunchConfigurationDialog(Shell shell, ILaunchConfiguratio return Window.CANCEL; } - /** - * Saves all dirty editors and builds the workspace according to current - * preference settings, and returns whether a launch should proceed. - *

- * The following preferences affect whether dirty editors are saved, and/or if - * the user is prompted to save dirty editors: - *

- * - * The following preference affects whether a build is performed before - * launching (if required): - * - * - * @return whether a launch should proceed - * @since 2.0 - * @deprecated Saving has been moved to the launch delegate - * LaunchConfigurationDelegate to allow for scoped - * saving of resources that are only involved in the current launch, - * no longer the entire workspace - */ - @Deprecated(forRemoval = true, since = "2023-12") - public static boolean saveAndBuildBeforeLaunch() { - return DebugUIPlugin.saveAndBuild(); - } - /** * Saves all dirty editors according to current preference settings, and returns * whether a launch should proceed. diff --git a/runtime/bundles/org.eclipse.core.runtime/src/org/eclipse/core/runtime/Platform.java b/runtime/bundles/org.eclipse.core.runtime/src/org/eclipse/core/runtime/Platform.java index 5cadd28ba70..0c918900ade 100644 --- a/runtime/bundles/org.eclipse.core.runtime/src/org/eclipse/core/runtime/Platform.java +++ b/runtime/bundles/org.eclipse.core.runtime/src/org/eclipse/core/runtime/Platform.java @@ -24,7 +24,6 @@ import java.util.MissingResourceException; import java.util.Objects; import java.util.ResourceBundle; -import org.eclipse.core.internal.runtime.AuthorizationHandler; import org.eclipse.core.internal.runtime.InternalPlatform; import org.eclipse.core.internal.runtime.Messages; import org.eclipse.core.internal.runtime.MetaDataKeeper; @@ -624,33 +623,6 @@ public static void addLogListener(ILogListener listener) { InternalPlatform.getDefault().addLogListener(listener); } - /** - * Adds the specified resource to the protection space specified by the - * given realm. All targets at or deeper than the depth of the last - * symbolic element in the path of the given resource URL are assumed to - * be in the same protection space. - * - * @param resourceUrl the URL identifying the resources to be added to - * the specified protection space. For example, - * "http://www.example.com/folder/". - * @param realm the name of the protection space. For example, - * "realm1@example.com" - * @exception CoreException if there are problems setting the - * authorization information. Reasons include: - * - * @deprecated Authorization database is superseded by the Equinox secure storage. - * Use org.eclipse.equinox.security.storage.SecurePreferencesFactory - * to obtain secure preferences and org.eclipse.equinox.security.storage.ISecurePreferences - * for data access and modifications. - * This API will be deleted in a future release. See bug 370248 for details. - */ - @Deprecated(forRemoval = true, since = "2024-03") - public static void addProtectionSpace(URL resourceUrl, String realm) throws CoreException { - AuthorizationHandler.addProtectionSpace(resourceUrl, realm); - } - /** * Returns a URL that is the local equivalent of the * supplied URL. This method is expected to be used with the @@ -1200,31 +1172,6 @@ public static String[] getApplicationArgs() { return InternalPlatform.getDefault().getApplicationArgs(); } - /** - * Returns the platform administrator for this running Eclipse. - *

- * Note: This is an internal method and must not be used by clients - * which are not part of the Eclipse Platform. This method allows access to - * classes which are not Eclipse Platform API but are part of the OSGi runtime - * that the Eclipse Platform is built on. Even as the Eclipse Platform evolves - * in compatible ways from release to release, the details of the OSGi - * implementation might not. - *

- *

- * Clients can also acquire the {@link PlatformAdmin} service to retrieve this - * object. - *

- * - * @return the platform admin for this instance of Eclipse - * @deprecated only consumer is PDE and this should never be used by other - * clients, see javadoc for details. - * @since 3.0 - */ - @Deprecated(forRemoval = true, since = "2024-03") // 2024-03 was added later for information purposes - public static PlatformAdmin getPlatformAdmin() { - return InternalPlatform.getDefault().getPlatformAdmin(); - } - /** * Returns the location of the platform's working directory (also known as the instance data area). * null is returned if the platform is running without an instance location. diff --git a/update/org.eclipse.update.configurator/META-INF/MANIFEST.MF b/update/org.eclipse.update.configurator/META-INF/MANIFEST.MF index cf14f2bbe2a..9e92d1fd8ce 100644 --- a/update/org.eclipse.update.configurator/META-INF/MANIFEST.MF +++ b/update/org.eclipse.update.configurator/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.update.configurator; singleton:=true -Bundle-Version: 3.5.1000.qualifier +Bundle-Version: 3.5.1100.qualifier Bundle-Activator: org.eclipse.update.internal.configurator.ConfigurationActivator Bundle-Vendor: %providerName Bundle-Localization: plugin diff --git a/update/org.eclipse.update.configurator/src/org/eclipse/update/configurator/ConfiguratorUtils.java b/update/org.eclipse.update.configurator/src/org/eclipse/update/configurator/ConfiguratorUtils.java deleted file mode 100644 index bb23f728d48..00000000000 --- a/update/org.eclipse.update.configurator/src/org/eclipse/update/configurator/ConfiguratorUtils.java +++ /dev/null @@ -1,125 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2003, 2017 IBM Corporation and others. - * - * 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: - * IBM Corporation - initial API and implementation - *******************************************************************************/ - -package org.eclipse.update.configurator; - -import java.io.IOException; -import java.net.URL; - -import org.eclipse.update.internal.configurator.ConfigurationActivator; -import org.eclipse.update.internal.configurator.Utils; -import org.osgi.framework.BundleContext; -import org.osgi.framework.ServiceReference; - -/** - * Helper class to get platform configuration data without having to - * use BootLoader methods from the compatibility layer. - *

- * Note: This class/interface is part of an interim API that is still under development and expected to - * change significantly before reaching stability. It is being made available at this early stage to solicit feedback - * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken - * (repeatedly) as the API evolves. - *

- * @since 3.0 - * @deprecated The org.eclipse.update component has been replaced by Equinox p2. - * This API will be deleted in a future release. See bug 311590 for details. - */ -@Deprecated(forRemoval = true, since = "2024-03") -public class ConfiguratorUtils { - /** - * Returns the current platform configuration. This method replaces the one we used - * to call on BootLoader. - * - * @return platform configuration used in current instance of platform - * @since 3.0 - */ - @Deprecated - public static IPlatformConfiguration getCurrentPlatformConfiguration() { - // acquire factory service first - BundleContext context = ConfigurationActivator.getBundleContext(); - ServiceReference configFactorySR = context.getServiceReference(IPlatformConfigurationFactory.class); - if (configFactorySR == null) { - throw new IllegalStateException(); - } - IPlatformConfigurationFactory configFactory = context.getService(configFactorySR); - if (configFactory == null) { - throw new IllegalStateException(); - } - // get the configuration using the factory - IPlatformConfiguration currentConfig = configFactory.getCurrentPlatformConfiguration(); - context.ungetService(configFactorySR); - return currentConfig; - } - - /** - * Returns a platform configuration object, optionally initialized with previously saved - * configuration information. We will use this method instead of the old one in BootLoader. - * - * @param url location of previously save configuration information. If null - * is specified, an empty configuration object is returned - * @return platform configuration used in current instance of platform - */ - @Deprecated - public static IPlatformConfiguration getPlatformConfiguration(URL url) throws IOException { - // acquire factory service first - BundleContext context = ConfigurationActivator.getBundleContext(); - ServiceReference configFactorySR = context.getServiceReference(IPlatformConfigurationFactory.class); - if (configFactorySR == null) { - throw new IllegalStateException(); - } - IPlatformConfigurationFactory configFactory = context.getService(configFactorySR); - if (configFactory == null) { - throw new IllegalStateException(); - } - // get the configuration using the factory - IPlatformConfiguration config = configFactory.getPlatformConfiguration(url); - context.ungetService(configFactorySR); - return config; - } - - /** - * Returns a platform configuration object, optionally initialized with previously saved - * configuration information. We will use this method instead of the old one in BootLoader. - * - * @param url location of previously save configuration information. If null - * is specified, an empty configuration object is returned - * @param loc location of the platform installation. Used to resolve entries in the save location - * @return platform configuration used in current instance of platform - */ - @Deprecated - public static IPlatformConfiguration getPlatformConfiguration(URL url, URL loc) throws IOException { - // acquire factory service first - BundleContext context = ConfigurationActivator.getBundleContext(); - ServiceReference configFactorySR = context.getServiceReference(IPlatformConfigurationFactory.class); - if (configFactorySR == null) { - throw new IllegalStateException(); - } - IPlatformConfigurationFactory configFactory = context.getService(configFactorySR); - if (configFactory == null) { - throw new IllegalStateException(); - } - // get the configuration using the factory - IPlatformConfiguration config = configFactory.getPlatformConfiguration(url, loc); - context.ungetService(configFactorySR); - return config; - } - - /** - * @return the URL of this eclipse installation - */ - @Deprecated - public static URL getInstallURL() { - return Utils.getInstallURL(); - } -}