Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSergey Prigogin2016-07-19 18:46:22 -0400
committerSergey Prigogin2016-07-19 19:04:01 -0400
commitd1a02b5588da41cf909755d308bae2f640998ce3 (patch)
tree7d918953121d67a3a7186a4fdce2974419904f5b /tests/org.eclipse.team.tests.core
parent73fd0ef44b36fd04a8268b9600d4f21f91a43381 (diff)
downloadeclipse.platform.team-d1a02b5588da41cf909755d308bae2f640998ce3.tar.gz
eclipse.platform.team-d1a02b5588da41cf909755d308bae2f640998ce3.tar.xz
eclipse.platform.team-d1a02b5588da41cf909755d308bae2f640998ce3.zip
Revert "Bug 213780 - Compare With direction should be configurable"
Diffstat (limited to 'tests/org.eclipse.team.tests.core')
-rw-r--r--tests/org.eclipse.team.tests.core/src/org/eclipse/team/tests/ui/SaveableCompareEditorInputTest.java11
1 files changed, 2 insertions, 9 deletions
diff --git a/tests/org.eclipse.team.tests.core/src/org/eclipse/team/tests/ui/SaveableCompareEditorInputTest.java b/tests/org.eclipse.team.tests.core/src/org/eclipse/team/tests/ui/SaveableCompareEditorInputTest.java
index 3daa4c94b..7591d873a 100644
--- a/tests/org.eclipse.team.tests.core/src/org/eclipse/team/tests/ui/SaveableCompareEditorInputTest.java
+++ b/tests/org.eclipse.team.tests.core/src/org/eclipse/team/tests/ui/SaveableCompareEditorInputTest.java
@@ -16,14 +16,14 @@ import java.lang.reflect.InvocationTargetException;
import java.util.ArrayList;
import java.util.List;
+import junit.framework.Test;
+
import org.eclipse.compare.CompareConfiguration;
import org.eclipse.compare.CompareViewerSwitchingPane;
import org.eclipse.compare.ITypedElement;
import org.eclipse.compare.contentmergeviewer.TextMergeViewer;
import org.eclipse.compare.internal.CompareEditor;
-import org.eclipse.compare.internal.ComparePreferencePage;
import org.eclipse.compare.internal.CompareUIPlugin;
-import org.eclipse.compare.internal.ICompareUIConstants;
import org.eclipse.compare.internal.MergeSourceViewer;
import org.eclipse.compare.structuremergeviewer.Differencer;
import org.eclipse.compare.structuremergeviewer.ICompareInput;
@@ -36,7 +36,6 @@ import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.ILogListener;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.jface.viewers.Viewer;
import org.eclipse.swt.custom.StyledText;
import org.eclipse.swt.graphics.Image;
@@ -49,8 +48,6 @@ import org.eclipse.team.tests.core.TeamTest;
import org.eclipse.team.ui.synchronize.SaveableCompareEditorInput;
import org.eclipse.ui.PlatformUI;
-import junit.framework.Test;
-
public class SaveableCompareEditorInputTest extends TeamTest {
public static Test suite() {
@@ -70,8 +67,6 @@ public class SaveableCompareEditorInputTest extends TeamTest {
protected void setUp() throws Exception {
super.setUp();
- IPreferenceStore store = CompareUIPlugin.getDefault().getPreferenceStore();
- store.setDefault(ComparePreferencePage.LAYOUT, ICompareUIConstants.PREF_VALUE_RIGHT_TO_LEFT);
project = createProject("Project_", new String[] {
"File1.txt", "File2.txt" });
@@ -89,8 +84,6 @@ public class SaveableCompareEditorInputTest extends TeamTest {
protected void tearDown() throws Exception {
// remove log listener
RuntimeLog.removeLogListener(logListener);
- IPreferenceStore store = CompareUIPlugin.getDefault().getPreferenceStore();
- store.setToDefault(ComparePreferencePage.LAYOUT);
super.tearDown();
}

Back to the top