Skip to content

Commit b19e34a

Browse files
authored
PDE required-by query must check that import-type corresponds to model type (#80)
1 parent 14b4fa0 commit b19e34a

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

ca.ubc.cs.ferret.pde/src/ca/ubc/cs/ferret/pde/PdeModelHelper.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -372,14 +372,16 @@ public Collection<IFeatureModel> getFeaturesRequiring(IModel source) {
372372
verifyModelCaches();
373373
String sourceId = getId(source);
374374
if(sourceId == null) { return Collections.emptyList(); }
375+
boolean sourceIsFeature = source instanceof IFeatureModel;
375376
Collection<IFeatureModel> results = new ArrayList<IFeatureModel>();
376377
for(IFeatureModel featureModel : features.values()) {
377378
if(!featureModel.isValid()) {
378379
continue;
379380
}
380381
IFeature feature = featureModel.getFeature();
381382
for(IFeatureImport p : feature.getImports()) {
382-
if(sourceId.equals(p.getId())) {
383+
boolean importIsFeature = p.getType() == IFeatureImport.FEATURE;
384+
if (sourceId.equals(p.getId()) && importIsFeature == sourceIsFeature) {
383385
results.add(featureModel);
384386
break;
385387
}

0 commit comments

Comments
 (0)