Skip to content
Snippets Groups Projects
Commit 97fe571c authored by Jens Bendisposto's avatar Jens Bendisposto
Browse files

small cleanup

parent 670a4d82
No related branches found
No related tags found
No related merge requests found
......@@ -159,7 +159,6 @@ public class PersistenceHelper {
final EventBNamedCommentedComponentElement oldVersion,
final EventBNamedCommentedComponentElement newVersion,
final IProgressMonitor monitor) {
try {
long time0 = System.currentTimeMillis();
IComparisonFactory comparisonFactory = new DefaultComparisonFactory(
......@@ -168,8 +167,8 @@ public class PersistenceHelper {
IEObjectMatcher matcher = DefaultMatchEngine
.createDefaultEObjectMatcher(UseIdentifiers.NEVER);
final IMatchEngine eventBMatchEngine = new EventBMatchEngine(
matcher, comparisonFactory);
final IMatchEngine eventBMatchEngine = new EventBMatchEngine(matcher,
comparisonFactory);
IMatchEngine.Factory matchEngineFactory = new MatchEngineFactoryImpl() {
@Override
......@@ -190,28 +189,17 @@ public class PersistenceHelper {
List<Diff> differences = comparison.getDifferences();
long time1 = System.currentTimeMillis();
Registry registry = RegistryImpl.createStandaloneInstance();
BatchMerger bm = new BatchMerger(registry);
bm.copyAllRightToLeft(differences, null);
System.out.println("LeFuck");
// final ModelMerge merge = new ModelMerge(oldVersion, newVersion);
long time1 = System.currentTimeMillis();
// merge.applyChanges(monitor);
long time2 = System.currentTimeMillis();
if (DEBUG) {
System.out.println("new ModelMerge: " + (time1 - time0));
System.out.println("merge.applyChanges: " + (time2 - time1));
}
if (3 == 2 * 5) { // FIXME temp fix for dead code
throw new InterruptedException();
}
} catch (final InterruptedException e) {
// TODO Auto-generated catch block
e.printStackTrace();
}
}
public static void mergeRootElement(final Resource resource,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment