Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/org.eclipse.emf.compare.diagram/src/org/eclipse/emf/compare/diagram/internal/factories/extensions/EdgeChangeFactory.java')
-rw-r--r--plugins/org.eclipse.emf.compare.diagram/src/org/eclipse/emf/compare/diagram/internal/factories/extensions/EdgeChangeFactory.java15
1 files changed, 7 insertions, 8 deletions
diff --git a/plugins/org.eclipse.emf.compare.diagram/src/org/eclipse/emf/compare/diagram/internal/factories/extensions/EdgeChangeFactory.java b/plugins/org.eclipse.emf.compare.diagram/src/org/eclipse/emf/compare/diagram/internal/factories/extensions/EdgeChangeFactory.java
index fa730153f..cfbab6e31 100644
--- a/plugins/org.eclipse.emf.compare.diagram/src/org/eclipse/emf/compare/diagram/internal/factories/extensions/EdgeChangeFactory.java
+++ b/plugins/org.eclipse.emf.compare.diagram/src/org/eclipse/emf/compare/diagram/internal/factories/extensions/EdgeChangeFactory.java
@@ -83,9 +83,8 @@ public class EdgeChangeFactory extends NodeChangeFactory {
public void setRefiningChanges(Diff extension, DifferenceKind extensionKind, Diff refiningDiff) {
super.setRefiningChanges(extension, extensionKind, refiningDiff);
if (extensionKind == DifferenceKind.CHANGE) {
- extension.getRefinedBy().addAll(
- Collections2.filter(getAllDifferencesForChange(refiningDiff), EMFComparePredicates
- .fromSide(extension.getSource())));
+ extension.getRefinedBy().addAll(Collections2.filter(getAllDifferencesForChange(refiningDiff),
+ EMFComparePredicates.fromSide(extension.getSource())));
}
}
@@ -99,7 +98,8 @@ public class EdgeChangeFactory extends NodeChangeFactory {
return new Predicate<Diff>() {
public boolean apply(Diff difference) {
return difference instanceof ReferenceChange
- && (isRelatedToAnAddEdge((ReferenceChange)difference) || isRelatedToADeleteEdge((ReferenceChange)difference));
+ && (isRelatedToAnAddEdge((ReferenceChange)difference)
+ || isRelatedToADeleteEdge((ReferenceChange)difference));
}
};
}
@@ -187,10 +187,9 @@ public class EdgeChangeFactory extends NodeChangeFactory {
*/
@Override
protected boolean isRelatedToAnExtensionChange(AttributeChange input) {
- return (input.getAttribute().eContainer().equals(NotationPackage.eINSTANCE.getRelativeBendpoints()) || input
- .getAttribute().equals(NotationPackage.eINSTANCE.getIdentityAnchor_Id()))
- &&
- /* isContainerBasedOnSemanticEdge(input) && */input.getRefines().isEmpty();
+ return (input.getAttribute().eContainer().equals(NotationPackage.eINSTANCE.getRelativeBendpoints())
+ || input.getAttribute().equals(NotationPackage.eINSTANCE.getIdentityAnchor_Id())) &&
+ /* isContainerBasedOnSemanticEdge(input) && */input.getRefines().isEmpty();
}
/**

Back to the top