diff options
Diffstat (limited to 'plugins/org.eclipse.emf.compare.diff/src/org/eclipse/emf/compare/diff/internal/merge/impl/DiffGroupMerger.java')
-rw-r--r-- | plugins/org.eclipse.emf.compare.diff/src/org/eclipse/emf/compare/diff/internal/merge/impl/DiffGroupMerger.java | 49 |
1 files changed, 0 insertions, 49 deletions
diff --git a/plugins/org.eclipse.emf.compare.diff/src/org/eclipse/emf/compare/diff/internal/merge/impl/DiffGroupMerger.java b/plugins/org.eclipse.emf.compare.diff/src/org/eclipse/emf/compare/diff/internal/merge/impl/DiffGroupMerger.java deleted file mode 100644 index eba9467b0..000000000 --- a/plugins/org.eclipse.emf.compare.diff/src/org/eclipse/emf/compare/diff/internal/merge/impl/DiffGroupMerger.java +++ /dev/null @@ -1,49 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006, 2012 Obeo. - * 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.diff.internal.merge.impl; - -import java.util.ArrayList; -import java.util.List; - -import org.eclipse.emf.compare.diff.merge.DefaultMerger; -import org.eclipse.emf.compare.diff.merge.service.MergeService; -import org.eclipse.emf.compare.diff.metamodel.DiffElement; - -/** - * This merger will handle DiffGroup merging by recursively create mergers on each of its contents. - * - * @author <a href="mailto:laurent.goubet@obeo.fr">Laurent Goubet</a> - */ -public class DiffGroupMerger extends DefaultMerger { - /** - * {@inheritDoc} - * - * @see org.eclipse.emf.compare.diff.merge.DefaultMerger#applyInOrigin() - */ - @Override - public void applyInOrigin() { - // Creates a temporary list to avoid ConcurentModificationExceptions - final List<DiffElement> subDiffs = new ArrayList<DiffElement>(diff.getSubDiffElements()); - MergeService.merge(subDiffs, false); - } - - /** - * {@inheritDoc} - * - * @see org.eclipse.emf.compare.diff.merge.DefaultMerger#undoInTarget() - */ - @Override - public void undoInTarget() { - // Creates a temporary list to avoid ConcurentModificationExceptions - final List<DiffElement> subDiffs = new ArrayList<DiffElement>(diff.getSubDiffElements()); - MergeService.merge(subDiffs, true); - } -} |