| commit | 1fc05687bf21f7e028d8365d73d9b50cfd4022b5 | [log] [tgz] |
|---|---|---|
| author | atikhomirov <atikhomirov> | Fri Sep 26 15:46:59 2008 +0000 |
| committer | atikhomirov <atikhomirov> | Fri Sep 26 15:46:59 2008 +0000 |
| tree | 929fbe15555166a8001013b059f58e00e9805a2a | |
| parent | b1ca5e0faa8d34c77e4f4aff61d3e9be3aca8556 [diff] |
[248327] Reconcile should respect cross-references, do not respect non-changeable references, though
diff --git a/plugins/org.eclipse.gmf.common/src/org/eclipse/gmf/internal/common/reconcile/Reconciler.java b/plugins/org.eclipse.gmf.common/src/org/eclipse/gmf/internal/common/reconcile/Reconciler.java index cf726ff..06c22c3 100644 --- a/plugins/org.eclipse.gmf.common/src/org/eclipse/gmf/internal/common/reconcile/Reconciler.java +++ b/plugins/org.eclipse.gmf.common/src/org/eclipse/gmf/internal/common/reconcile/Reconciler.java
@@ -143,7 +143,11 @@ entries = new LinkedList<Setting>(); myCrossRefsToFix.put(e.getKey(), entries); } - entries.addAll(e.getValue()); + for (Setting s : e.getValue()) { + if (s.getEStructuralFeature().isChangeable()) { + entries.add(s); + } + } } }