| /******************************************************************************* |
| * 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 static com.google.common.collect.Iterables.filter; |
| import static com.google.common.collect.Iterables.isEmpty; |
| import static org.eclipse.emf.compare.ConflictKind.PSEUDO; |
| import static org.eclipse.emf.compare.ConflictKind.REAL; |
| import static org.eclipse.emf.compare.DifferenceKind.ADD; |
| import static org.eclipse.emf.compare.utils.EMFComparePredicates.CONTAINMENT_REFERENCE_CHANGE; |
| import static org.eclipse.emf.compare.utils.EMFComparePredicates.hasConflict; |
| |
| import com.google.common.base.Predicate; |
| |
| import java.util.List; |
| |
| import org.apache.log4j.Logger; |
| import org.eclipse.emf.common.util.Monitor; |
| import org.eclipse.emf.compare.Comparison; |
| import org.eclipse.emf.compare.ComparisonCanceledException; |
| import org.eclipse.emf.compare.Conflict; |
| 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 { |
| |
| /** The logger. */ |
| private static final Logger LOGGER = Logger.getLogger(MatchBasedConflictDetector.class); |
| |
| /** |
| * This can be used to check whether a given conflict involves add containment reference changes. |
| */ |
| private static final Predicate<? super Conflict> IS_REAL_CONTAINMENT_ADD_CONFLICT = new Predicate<Conflict>() { |
| public boolean apply(Conflict input) { |
| boolean isRealAddContainmentConflict = false; |
| if (input != null && input.getKind() == REAL) { |
| Iterable<Diff> containmentRefs = filter(input.getDifferences(), CONTAINMENT_REFERENCE_CHANGE); |
| if (!isEmpty(containmentRefs)) { |
| for (Diff diff : containmentRefs) { |
| if (diff.getKind() != ADD) { |
| return false; |
| } |
| } |
| isRealAddContainmentConflict = true; |
| } |
| } |
| return isRealAddContainmentConflict; |
| } |
| }; |
| |
| /** |
| * {@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) { |
| long start = System.currentTimeMillis(); |
| if (LOGGER.isDebugEnabled()) { |
| LOGGER.debug("detect conflicts - START"); //$NON-NLS-1$ |
| } |
| 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(); |
| } |
| |
| handlePseudoUnderRealAdd(comparison); |
| if (LOGGER.isInfoEnabled()) { |
| LOGGER.info(String.format( |
| "detect conflicts - END - Took %d ms", Long.valueOf(System.currentTimeMillis() - start))); //$NON-NLS-1$ |
| } |
| } |
| |
| /** |
| * If a real add conflict contains pseudo conflicts, these pseudo conflicts must be changed to real |
| * conflicts. |
| * |
| * @param comparison |
| * The originating comparison of those diffs. |
| */ |
| private void handlePseudoUnderRealAdd(Comparison comparison) { |
| for (Conflict realContainmentAdd : filter(comparison.getConflicts(), IS_REAL_CONTAINMENT_ADD_CONFLICT)) { |
| changeKindOfPseudoConflictsUnder(realContainmentAdd); |
| } |
| } |
| |
| /** |
| * Change all pseudo conflicts under the given real conflict to real conflicts. |
| * |
| * @param conflict |
| * the given conflict. |
| */ |
| private void changeKindOfPseudoConflictsUnder(Conflict conflict) { |
| for (Diff diff : conflict.getDifferences()) { |
| final Match realConflictMatch = diff.getMatch(); |
| for (Match subMatch : realConflictMatch.getSubmatches()) { |
| for (Diff conflictDiffUnder : filter(subMatch.getDifferences(), hasConflict(PSEUDO))) { |
| Conflict conflictUnder = conflictDiffUnder.getConflict(); |
| conflictUnder.setKind(REAL); |
| changeKindOfPseudoConflictsUnder(conflictUnder); |
| } |
| } |
| } |
| } |
| } |