diff options
| author | Christian W. Damus | 2019-07-22 16:43:02 +0000 |
|---|---|---|
| committer | Christian W. Damus | 2019-07-22 16:43:02 +0000 |
| commit | a484b7e7f56a96e49cb8f6beec2d55936088a20a (patch) | |
| tree | 0ee4ee28c63c15b82fae948aae315fd6272133c2 | |
| parent | 22c21612be43f38771b64e81a328ec215d470864 (diff) | |
| download | org.eclipse.emf.compare-a484b7e7f56a96e49cb8f6beec2d55936088a20a.tar.gz org.eclipse.emf.compare-a484b7e7f56a96e49cb8f6beec2d55936088a20a.tar.xz org.eclipse.emf.compare-a484b7e7f56a96e49cb8f6beec2d55936088a20a.zip | |
[549463] Save fails when content merge viewer swapped
Don't redundantly mirror when saving the merge result.
Change-Id: I0b862bf928a6e3266041df0a9c98355ae24f9be8
Signed-off-by: Christian W. Damus <give.a.damus@gmail.com>
| -rw-r--r-- | plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/MirrorManager.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/MirrorManager.java b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/MirrorManager.java index 72dddd4ae..978b0b009 100644 --- a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/MirrorManager.java +++ b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/MirrorManager.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2018 EclipseSource and others. + * Copyright (c) 2018, 2019 EclipseSource, Christian W. Damus, 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 @@ -7,6 +7,7 @@ * * Contributors: * Philip Langer - initial API and implementation + * Christian W. Damus - bug 549463 *******************************************************************************/ package org.eclipse.emf.compare.ide.ui.internal.contentmergeviewer; @@ -136,12 +137,12 @@ public class MirrorManager { @Override public void saveRightContent(Object input, byte[] bytes) { - delegate.saveLeftContent(input, bytes); + delegate.saveRightContent(input, bytes); } @Override public void saveLeftContent(Object input, byte[] bytes) { - delegate.saveRightContent(input, bytes); + delegate.saveLeftContent(input, bytes); } @Override |