Revert "Bug 213780 - Compare With direction should be configurable"

This reverts commits ec30f62a24da6e8e47dbb3a566049c628bb74f05 and
73fd0ef44b36fd04a8268b9600d4f21f91a43381.

Change-Id: Idc485d2801533a72eb4a38803eb863f791ab239f

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();

 	}