From 1957cd7b50e60ed39ccc367c604fbcbfabe53390 Mon Sep 17 00:00:00 2001 From: dgelessus <dgelessus@users.noreply.github.com> Date: Wed, 6 Dec 2023 15:26:32 +0100 Subject: [PATCH] Remove unused EventBMatchEngine --- org.eventb.texttools/plugin.xml | 24 ------------------- .../eventb/texttools/PersistenceHelper.java | 12 ---------- .../diffmerge/EventBMatchEngine.java | 13 ---------- 3 files changed, 49 deletions(-) delete mode 100644 org.eventb.texttools/src/org/eventb/texttools/diffmerge/EventBMatchEngine.java diff --git a/org.eventb.texttools/plugin.xml b/org.eventb.texttools/plugin.xml index a7fa97f..c66ffe8 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 a5d3b35..a5b819d 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 3c67b79..0000000 --- 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); - } -} -- GitLab