View | Details | Raw Unified | Return to bug 365799 | Differences between
and this patch

Collapse All | Expand All

(-)a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/FeatureModelManager.java (-1 / +1 lines)
Lines 140-151 public class FeatureModelManager { Link Here
140
	 */
140
	 */
141
	public IFeatureModel findFeatureModel(String id, String version) {
141
	public IFeatureModel findFeatureModel(String id, String version) {
142
		init();
142
		init();
143
		IFeatureModel[] models = fActiveModels.get(id, version);
144
143
145
		if (VersionUtil.isEmptyVersion(version)) {
144
		if (VersionUtil.isEmptyVersion(version)) {
146
			return findFeatureModel(id);
145
			return findFeatureModel(id);
147
		}
146
		}
148
147
148
		IFeatureModel[] models = fActiveModels.get(id, version);
149
		for (int i = 0; i < models.length; i++) {
149
		for (int i = 0; i < models.length; i++) {
150
			if (models[i].isValid()) {
150
			if (models[i].isValid()) {
151
				return models[i];
151
				return models[i];
(-)a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/LaunchAction.java (+7 lines)
Lines 214-219 public class LaunchAction extends Action { Link Here
214
		for (int i = 0; i < children.length; i++) {
214
		for (int i = 0; i < children.length; i++) {
215
			addFeatureAndChildren(children[i].getId(), children[i].getVersion(), list);
215
			addFeatureAndChildren(children[i].getId(), children[i].getVersion(), list);
216
		}
216
		}
217
		IFeatureImport[] imports = model.getFeature().getImports();
218
		for (int i = 0; i < imports.length; i++) {
219
			IFeature resolved = imports[i].getFeature();
220
			if (resolved != null) {
221
				addFeatureAndChildren(resolved.getId(), resolved.getVersion(), list);
222
			}
223
		}
217
	}
224
	}
218
225
219
	private void addFeaturePlugins(IFeature feature, HashMap map) {
226
	private void addFeaturePlugins(IFeature feature, HashMap map) {

Return to bug 365799