Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorvlorenzo2013-02-01 15:20:13 +0000
committervlorenzo2013-02-01 15:20:13 +0000
commit281b8ec35d2fbfa5cde5773c04cb525d93638a81 (patch)
tree18c50bf5ba10e82781100d72ac83fa377797ae3c /extraplugins/uml
parentfa4d60e2b89f96e0e226ccdb67ce474b02cc31cd (diff)
downloadorg.eclipse.papyrus-281b8ec35d2fbfa5cde5773c04cb525d93638a81.tar.gz
org.eclipse.papyrus-281b8ec35d2fbfa5cde5773c04cb525d93638a81.tar.xz
org.eclipse.papyrus-281b8ec35d2fbfa5cde5773c04cb525d93638a81.zip
399714: [EMF-Compare] Papyrus must provide an editor to compare 2 elements of 2 opened models
https://bugs.eclipse.org/bugs/show_bug.cgi?id=399714 Minor changes
Diffstat (limited to 'extraplugins/uml')
-rw-r--r--extraplugins/uml/compare/org.eclipse.papyrus.infra.emf.compare.diff/src/org/eclipse/papyrus/infra/emf/compare/diff/internal/util/PapyrusCompareEObjectCopier.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/extraplugins/uml/compare/org.eclipse.papyrus.infra.emf.compare.diff/src/org/eclipse/papyrus/infra/emf/compare/diff/internal/util/PapyrusCompareEObjectCopier.java b/extraplugins/uml/compare/org.eclipse.papyrus.infra.emf.compare.diff/src/org/eclipse/papyrus/infra/emf/compare/diff/internal/util/PapyrusCompareEObjectCopier.java
index d72c9298440..3105d2fd810 100644
--- a/extraplugins/uml/compare/org.eclipse.papyrus.infra.emf.compare.diff/src/org/eclipse/papyrus/infra/emf/compare/diff/internal/util/PapyrusCompareEObjectCopier.java
+++ b/extraplugins/uml/compare/org.eclipse.papyrus.infra.emf.compare.diff/src/org/eclipse/papyrus/infra/emf/compare/diff/internal/util/PapyrusCompareEObjectCopier.java
@@ -136,7 +136,7 @@ public class PapyrusCompareEObjectCopier extends EMFCompareEObjectCopier {
copyResource.setID(copy, originResource.getID(original));
final TreeIterator<EObject> originalIterator = original.eAllContents();
final TreeIterator<EObject> copyIterator = copy.eAllContents();
- while(originalIterator.hasNext()) {
+ while(originalIterator.hasNext() && copyIterator.hasNext()) {
final EObject nextOriginalChild = originalIterator.next();
final EObject nextCopyChild = copyIterator.next();
if(nextOriginalChild.eResource() == nextCopyChild.eResource()) {

Back to the top