diff --git a/org.eventb.texttools/src/org/eventb/texttools/PersistenceHelper.java b/org.eventb.texttools/src/org/eventb/texttools/PersistenceHelper.java index c88021bb81e988486187dbdd7d19c76bf66ac593..4de30f5c9ab2240538b3f4b1098982954d7bb0e1 100644 --- a/org.eventb.texttools/src/org/eventb/texttools/PersistenceHelper.java +++ b/org.eventb.texttools/src/org/eventb/texttools/PersistenceHelper.java @@ -195,11 +195,13 @@ public class PersistenceHelper { long time1 = System.currentTimeMillis(); Registry registry = RegistryImpl.createStandaloneInstance(); + IMerger evbMerger = new EventBMerger(); + evbMerger.setRanking(100); + registry.add(evbMerger); BatchMerger bm = new BatchMerger(registry); bm.copyAllRightToLeft(differences, null); - long time2 = System.currentTimeMillis(); if (DEBUG) { System.out.println("new ModelMerge: " + (time1 - time0)); diff --git a/org.eventb.texttools/src/org/eventb/texttools/diffmerge/EventBMerger.java b/org.eventb.texttools/src/org/eventb/texttools/diffmerge/EventBMerger.java new file mode 100644 index 0000000000000000000000000000000000000000..5b40cc436520255545bf09999814c0b688ecd90c --- /dev/null +++ b/org.eventb.texttools/src/org/eventb/texttools/diffmerge/EventBMerger.java @@ -0,0 +1,26 @@ +package org.eventb.texttools.diffmerge; + +import org.eclipse.emf.compare.Diff; +import org.eclipse.emf.compare.merge.AbstractMerger; + +public class EventBMerger extends AbstractMerger { + + @Override + public boolean isMergerFor(Diff target) { + return false; // currently disabled + } + + @Override + protected void accept(final Diff diff, boolean rightToLeft) { + // Maybe we do not need this method for Camille? + throw new UnsupportedOperationException(); + } + + @Override + protected void reject(final Diff diff, boolean rightToLeft) { + // do we always merge right to left in Camille? + assert (rightToLeft); + // FIXME: ?? + diff.copyRightToLeft(); + } +}