Skip to content

Mark for removal i platform configuration factory #1867

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vogella merged 1 commit into from
May 12, 2025
Merged

Mark for removal i platform configuration factory #1867

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...lipse.update.configurator/src/org/eclipse/update/configurator/IPlatformConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
* @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
@Deprecated(forRemoval = true, since = "2025-06 (removal in 2027-06 or later)")
public interface IPlatformConfiguration {

/**
Expand Down
2 changes: 1 addition & 1 deletion ...pdate.configurator/src/org/eclipse/update/configurator/IPlatformConfigurationFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
* @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
@Deprecated(forRemoval = true, since = "2025-06 (removal in 2027-06 or later)")
public interface IPlatformConfigurationFactory {
/**
* Returns the current platform configuration.
Expand Down
17 changes: 8 additions & 9 deletions ...pdate.configurator/src/org/eclipse/update/internal/configurator/BundleGroupComponent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,6 @@

import org.eclipse.core.runtime.IBundleGroup;
import org.eclipse.core.runtime.IBundleGroupProvider;
import org.eclipse.update.configurator.IPlatformConfiguration;
import org.eclipse.update.configurator.IPlatformConfiguration.IFeatureEntry;
import org.eclipse.update.configurator.IPlatformConfigurationFactory;
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
Expand All @@ -30,26 +27,28 @@
* made available in the service registry before this bundle has started.
*/
@Component(service = IBundleGroupProvider.class)
@SuppressWarnings("deprecation")
@SuppressWarnings("removal")
public class BundleGroupComponent implements IBundleGroupProvider {


private IPlatformConfigurationFactory factory;
private org.eclipse.update.configurator.IPlatformConfigurationFactory factory;

@Activate
public BundleGroupComponent(@Reference IPlatformConfigurationFactory factory) {
public BundleGroupComponent(@Reference org.eclipse.update.configurator.IPlatformConfigurationFactory factory) {
this.factory = factory;
}

@Override
public IBundleGroup[] getBundleGroups() {
IPlatformConfiguration configuration = factory.getCurrentPlatformConfiguration();
org.eclipse.update.configurator.IPlatformConfiguration configuration = factory
.getCurrentPlatformConfiguration();
if (configuration == null) {
return new IBundleGroup[0];
}
IPlatformConfiguration.IFeatureEntry[] features = configuration.getConfiguredFeatureEntries();
org.eclipse.update.configurator.IPlatformConfiguration.IFeatureEntry[] features = configuration
.getConfiguredFeatureEntries();
ArrayList<IBundleGroup> bundleGroups = new ArrayList<>(features.length);
for (IFeatureEntry feature : features) {
for (org.eclipse.update.configurator.IPlatformConfiguration.IFeatureEntry feature : features) {
if (feature instanceof FeatureEntry && ((FeatureEntry) feature).hasBranding())
bundleGroups.add((IBundleGroup) feature);
}
Expand Down
9 changes: 4 additions & 5 deletions ...te.configurator/src/org/eclipse/update/internal/configurator/IConfigurationConstants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@
*******************************************************************************/
package org.eclipse.update.internal.configurator;

import org.eclipse.update.configurator.IPlatformConfiguration.*;

/**
* Constants
*/
Expand Down Expand Up @@ -43,15 +41,16 @@ public interface IConfigurationConstants {
public static final String CFG_FRAGMENT = "fragment"; //$NON-NLS-1$
public static final String CFG_ENABLED = "enabled"; //$NON-NLS-1$
public static final String CFG_SHARED_URL = "shared_ur"; //$NON-NLS-1$


public static final String CFG_VERSION = "version"; //$NON-NLS-1$
public static final String CFG_TRANSIENT = "transient"; //$NON-NLS-1$
public static final String VERSION = "3.0"; //$NON-NLS-1$

public static final int DEFAULT_POLICY_TYPE = ISitePolicy.USER_EXCLUDE;
@SuppressWarnings("removal")
public static final int DEFAULT_POLICY_TYPE = org.eclipse.update.configurator.IPlatformConfiguration.ISitePolicy.USER_EXCLUDE;
public static final String[] DEFAULT_POLICY_LIST = new String[0];

public static final String PLUGINS = "plugins"; //$NON-NLS-1$
public static final String FEATURES = "features"; //$NON-NLS-1$
public static final String PLUGIN_XML = "plugin.xml"; //$NON-NLS-1$
Expand Down
2 changes: 1 addition & 1 deletion ...nfigurator/src/org/eclipse/update/internal/configurator/PlatformConfigurationFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Deactivate;

@SuppressWarnings("deprecation")
@SuppressWarnings("removal")
@Component(service = IPlatformConfigurationFactory.class)
public class PlatformConfigurationFactory implements IPlatformConfigurationFactory {
private Location configLocation;
Expand Down
1 change: 1 addition & 0 deletions ...g.eclipse.update.configurator/src/org/eclipse/update/internal/configurator/SiteEntry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
import org.xml.sax.*;


@SuppressWarnings("removal")
public class SiteEntry implements IPlatformConfiguration.ISiteEntry, IConfigurationConstants{
private static final String MAC_OS_MARKER = ".DS_Store"; //$NON-NLS-1$

Expand Down
11 changes: 6 additions & 5 deletions ....eclipse.update.configurator/src/org/eclipse/update/internal/configurator/SitePolicy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,19 +13,20 @@
*******************************************************************************/
package org.eclipse.update.internal.configurator;

import org.eclipse.update.configurator.*;
import org.eclipse.update.configurator.IPlatformConfiguration.*;


public class SitePolicy implements IPlatformConfiguration.ISitePolicy {
@SuppressWarnings("removal")
public class SitePolicy implements org.eclipse.update.configurator.IPlatformConfiguration.ISitePolicy {

private int type;
private String[] list;

public SitePolicy() {
}

public SitePolicy(int type, String[] list) {
if (type != ISitePolicy.USER_INCLUDE && type != ISitePolicy.USER_EXCLUDE && type != ISitePolicy.MANAGED_ONLY)
if (type != org.eclipse.update.configurator.IPlatformConfiguration.ISitePolicy.USER_INCLUDE
&& type != org.eclipse.update.configurator.IPlatformConfiguration.ISitePolicy.USER_EXCLUDE
&& type != org.eclipse.update.configurator.IPlatformConfiguration.ISitePolicy.MANAGED_ONLY)
throw new IllegalArgumentException();
this.type = type;

Expand Down
2 changes: 0 additions & 2 deletions ...igurator/src/org/eclipse/update/internal/configurator/branding/IBundleGroupConstants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@
*******************************************************************************/
package org.eclipse.update.internal.configurator.branding;

import org.eclipse.update.configurator.IPlatformConfiguration.IFeatureEntry;

/**
* These constants define the set of properties that the UI expects to
* be available via <code>IBundleGroup.getProperty(String)</code>.
Expand Down
Loading