/** * Checks whether a FeatureDiff conflicts with this one * * @param featureDiff the featureDiff to check against this one */ public boolean conflicts(FeatureDiff featureDiff) { Map<PropertyDescriptor, AttributeDiff> otherDiffs = featureDiff.diffs; for (PropertyDescriptor pd : otherDiffs.keySet()) { if (diffs.containsKey(pd)) { AttributeDiff ad = diffs.get(pd); AttributeDiff otherAd = otherDiffs.get(pd); if (ad.conflicts(otherAd)) { return true; } } } return false; } }
/** * Checks whether a FeatureDiff conflicts with this one * * @param featureDiff the featureDiff to check against this one */ public boolean conflicts(FeatureDiff featureDiff) { Map<PropertyDescriptor, AttributeDiff> otherDiffs = featureDiff.diffs; for (PropertyDescriptor pd : otherDiffs.keySet()) { if (diffs.containsKey(pd)) { AttributeDiff ad = diffs.get(pd); AttributeDiff otherAd = otherDiffs.get(pd); if (ad.conflicts(otherAd)) { return true; } } } return false; } }