blob: f31e26f256e92fd33eeef287ef69540a3a77d45e [file] [log] [blame]
/*******************************************************************************
* Copyright (c) 2016 Obeo and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
*
* Contributors:
* Obeo - initial API and implementation
*******************************************************************************/
package org.eclipse.emf.compare.conflict;
import java.util.List;
import org.eclipse.emf.common.util.Monitor;
import org.eclipse.emf.compare.Comparison;
import org.eclipse.emf.compare.ComparisonCanceledException;
import org.eclipse.emf.compare.Diff;
import org.eclipse.emf.compare.EMFCompareMessages;
import org.eclipse.emf.compare.Match;
import org.eclipse.emf.compare.ReferenceChange;
import org.eclipse.emf.compare.internal.conflict.AbstractConflictSearch;
import org.eclipse.emf.compare.internal.conflict.ConflictSearchFactory;
import org.eclipse.emf.ecore.EObject;
/**
* This conflict detector searches for conflicting {@link Diff}s in the same {@link Match} as the current
* {@link Diff}, as well as among {@link ReferenceChange}s that reference the same {@link EObject} as the
* current {@link Diff}, if it is a {@link ReferenceChange}.
* <p>
* This implementation of {@link IConflictDetector} is a generic as the default one but scales better since it
* is not O(n²) but rather O(n) or O(n log(n)), n being the number of differences in the comparison.
* </p>
*
* @author <a href="mailto:laurent.delaigue@obeo.fr">Laurent Delaigue</a>
* @since 3.3
*/
public class MatchBasedConflictDetector implements IConflictDetector {
/**
* {@inheritDoc}
*
* @see org.eclipse.emf.compare.conflict.IConflictDetector#detect(org.eclipse.emf.compare.Comparison,
* org.eclipse.emf.common.util.Monitor)
*/
public void detect(Comparison comparison, Monitor monitor) {
final List<Diff> differences = comparison.getDifferences();
final int diffCount = differences.size();
ConflictSearchFactory conflictSearchFactory = new ConflictSearchFactory(comparison, monitor);
for (int i = 0; i < diffCount; i++) {
if (i % 100 == 0) {
monitor.subTask(EMFCompareMessages.getString("DefaultConflictDetector.monitor.detect", //$NON-NLS-1$
Integer.valueOf(i + 1), Integer.valueOf(diffCount)));
if (monitor.isCanceled()) {
throw new ComparisonCanceledException();
}
}
final Diff diff = differences.get(i);
AbstractConflictSearch<? extends Diff> search = conflictSearchFactory.doSwitch(diff);
search.detectConflicts();
}
}
}