Skip to content

Applications list is filtered using the plugins from the product #1935

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Applications list is filtered using the plugins from the product #1935

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1789ba0
Applications list will now be filtered using the plugins of the product.
JZavala210 Aug 19, 2025
8d8b9c3
Fixing test/build issue because productBundleNames is null.
JZavala210 Aug 22, 2025
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
20 changes: 19 additions & 1 deletion ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/TargetPlatformHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
import java.util.Collection;
import java.util.Dictionary;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Hashtable;
import java.util.LinkedHashMap;
import java.util.List;
Expand Down Expand Up @@ -296,27 +297,44 @@ private static boolean containsNotEmptyIULocation(ITargetLocation[] locations) {
}

public static Set<String> getApplicationNameSet() {
return getApplicationNameSet(java.util.Collections.emptySet());
}

public static Set<String> getApplicationNameSet(Set<String> productBundleNames) {
TreeSet<String> result = new TreeSet<>();
IExtension[] extensions = PDECore.getDefault().getExtensionsRegistry()
.findExtensions("org.eclipse.core.runtime.applications", true); //$NON-NLS-1$

final boolean toFilter = !productBundleNames.isEmpty();

for (IExtension extension : extensions) {
String id = extension.getUniqueIdentifier();
IConfigurationElement[] elements = extension.getConfigurationElements();
if (elements.length != 1) {
continue;
}
String contributorId = elements[0].getContributor().getName();

if (toFilter) {
if (!productBundleNames.contains(contributorId)) {
continue;
}
}

String visiblity = elements[0].getAttribute("visible"); //$NON-NLS-1$
boolean visible = visiblity == null || Boolean.parseBoolean(visiblity);
if (id != null && visible) {
result.add(id);
}

}
result.add("org.eclipse.ui.ide.workbench"); //$NON-NLS-1$
return result;
}

public static String[] getApplicationNames() {
Set<String> result = getApplicationNameSet();
Set<String> productBundleNames = new HashSet<>();
Set<String> result = getApplicationNameSet(productBundleNames);
return result.toArray(new String[result.size()]);
}

Expand Down
31 changes: 30 additions & 1 deletion ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/ProductInfoSection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,22 +20,28 @@
import static org.eclipse.pde.internal.core.iproduct.IProduct.ProductType.MIXED;
import static org.eclipse.swt.events.SelectionListener.widgetSelectedAdapter;

import java.util.HashSet;
import java.util.List;
import java.util.Set;

import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IExtension;
import org.eclipse.core.runtime.IExtensionDelta;
import org.eclipse.core.runtime.IRegistryChangeEvent;
import org.eclipse.core.runtime.IRegistryChangeListener;
import org.eclipse.jface.action.IStatusLineManager;
import org.eclipse.jface.window.Window;
import org.eclipse.jface.wizard.WizardDialog;
import org.eclipse.osgi.service.resolver.BundleDescription;
import org.eclipse.osgi.service.resolver.State;
import org.eclipse.osgi.service.resolver.StateDelta;
import org.eclipse.pde.core.IModelChangedEvent;
import org.eclipse.pde.core.plugin.IPluginModelBase;
import org.eclipse.pde.core.plugin.TargetPlatform;
import org.eclipse.pde.internal.build.IPDEBuildConstants;
import org.eclipse.pde.internal.core.IStateDeltaListener;
import org.eclipse.pde.internal.core.PDECore;
import org.eclipse.pde.internal.core.TargetPlatformHelper;
import org.eclipse.pde.internal.core.iproduct.IProduct;
import org.eclipse.pde.internal.core.iproduct.IProduct.ProductType;
import org.eclipse.pde.internal.core.iproduct.IProductModel;
Expand All @@ -44,6 +50,7 @@
import org.eclipse.pde.internal.ui.editor.FormLayoutFactory;
import org.eclipse.pde.internal.ui.editor.PDEFormPage;
import org.eclipse.pde.internal.ui.editor.PDESection;
import org.eclipse.pde.internal.ui.launcher.LaunchAction;
import org.eclipse.pde.internal.ui.parts.ComboPart;
import org.eclipse.pde.internal.ui.wizards.product.ProductDefinitionWizard;
import org.eclipse.swt.SWT;
Expand Down Expand Up @@ -258,12 +265,34 @@ private void createApplicationEntry(Composite client, FormToolkit toolkit) {
label.setToolTipText(PDEUIMessages.ProductInfoSection_appTooltip);
label.setForeground(toolkit.getColors().getColor(IFormColors.TITLE));

IProduct products = getProduct();
Set<IPluginModelBase> models = null;
try {
models = LaunchAction.getLaunchedBundlesForProduct(products);
} catch (CoreException e) {
// TODO Auto-generated catch block
e.printStackTrace();
}

if (models == null) {
models = java.util.Collections.emptySet(); // <-- tiny null guard
}

Set<String> productBundleSymbolicNames = new HashSet<>();
for (IPluginModelBase model : models) {
BundleDescription desc = model.getBundleDescription();
if (desc != null && desc.getSymbolicName() != null) {
String symbolicName = desc.getSymbolicName();
productBundleSymbolicNames.add(symbolicName);
}
}
fAppCombo = new ExtensionIdComboPart();
fAppCombo.createControl(client, toolkit, SWT.READ_ONLY);
GridData gd = new GridData(GridData.FILL_HORIZONTAL);
gd.horizontalSpan = NUM_COLUMNS - 1;
fAppCombo.getControl().setLayoutData(gd);
fAppCombo.setItems(TargetPlatform.getApplications());
Set<String> filteredApps = TargetPlatformHelper.getApplicationNameSet(productBundleSymbolicNames);
fAppCombo.setItems(filteredApps.toArray(new String[0]));
fAppCombo.add(""); //$NON-NLS-1$
fAppCombo.addSelectionListener(
widgetSelectedAdapter(e -> getProduct().setApplication(fAppCombo.getSelection())));
Expand Down
Loading