diff --git a/org.eventb.texttools/plugin.xml b/org.eventb.texttools/plugin.xml index a7fa97f2abdabca55775beb79ec3bf95c8209dc6..c66ffe823f8579d0ed3443a06befbd596deff0bd 100644 --- a/org.eventb.texttools/plugin.xml +++ b/org.eventb.texttools/plugin.xml @@ -46,28 +46,4 @@ </attributeType> </relationship> </extension> -<!-- <extension - point="org.eclipse.emf.compare.match.engine"> - <matchengine - label="EventB Match Engine" - engineClass="org.eventb.texttools.merge.EventBMatchEngine" - fileExtension="bum,buc"> - </matchengine> - </extension> - <extension - point="org.eclipse.emf.compare.diff.mergerprovider"> - <mergerprovider - fileExtension="bum,buc" - mergerProviderClass="org.eventb.texttools.merge.MergerProvider" - priority="highest"> - </mergerprovider> - </extension> - <extension - point="org.eclipse.emf.compare.diff.engine"> - <diffengine - engineClass="org.eventb.texttools.diff.EventBDiffEngine" - label="Event-B Difference Engine" - priority="highest"> - </diffengine> - </extension> --> </plugin> diff --git a/org.eventb.texttools/src/org/eventb/texttools/PersistenceHelper.java b/org.eventb.texttools/src/org/eventb/texttools/PersistenceHelper.java index a5d3b3520b12cbd194c41f10aff414e60ce1d78e..a5b819d3407ec5a394441ec114c098c803f0edb8 100644 --- a/org.eventb.texttools/src/org/eventb/texttools/PersistenceHelper.java +++ b/org.eventb.texttools/src/org/eventb/texttools/PersistenceHelper.java @@ -183,18 +183,6 @@ public class PersistenceHelper { IEObjectMatcher matcher = new EventBEObjectMatcher(); - // IMatchEngine matchEngine = new DefaultMatchEngine(matcher, - // comparisonFactory); - // final IMatchEngine eventBMatchEngine = new EventBMatchEngine(matcher, - // comparisonFactory); - - // IMatchEngine.Factory matchEngineFactory = new - // MatchEngineFactoryImpl() { - // @Override - // public IMatchEngine getMatchEngine() { - // return eventBMatchEngine; - // } - // }; IMatchEngine.Factory matchEngineFactory = new MatchEngineFactoryImpl( matcher, comparisonFactory); matchEngineFactory.setRanking(20); diff --git a/org.eventb.texttools/src/org/eventb/texttools/diffmerge/EventBMatchEngine.java b/org.eventb.texttools/src/org/eventb/texttools/diffmerge/EventBMatchEngine.java deleted file mode 100644 index 3c67b799b4182f9e760bdd62c28c9cd7324f79fa..0000000000000000000000000000000000000000 --- a/org.eventb.texttools/src/org/eventb/texttools/diffmerge/EventBMatchEngine.java +++ /dev/null @@ -1,13 +0,0 @@ -package org.eventb.texttools.diffmerge; - -import org.eclipse.emf.compare.match.DefaultMatchEngine; -import org.eclipse.emf.compare.match.IComparisonFactory; -import org.eclipse.emf.compare.match.eobject.IEObjectMatcher; - -public class EventBMatchEngine extends DefaultMatchEngine { - - public EventBMatchEngine(IEObjectMatcher matcher, - IComparisonFactory comparisonFactory) { - super(matcher, comparisonFactory); - } -}