Workaround for color coding inconsistency

5 files changed, 28 insertions, 8 deletions

diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/CompareConfiguration.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/CompareConfiguration.java
index 8827cd53d..303133a15 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/CompareConfiguration.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/CompareConfiguration.java
@@ -13,7 +13,6 @@ import org.eclipse.jface.util.*;
 import org.eclipse.jface.preference.IPreferenceStore;

 

 import org.eclipse.compare.internal.*;

-//import org.eclipse.compare.structuremergeviewer.DiffTreeViewer;

 import org.eclipse.compare.structuremergeviewer.Differencer;

 

 /**

@@ -47,16 +46,14 @@ public class CompareConfiguration {
 

 

 	private static final int WIDTH= 22;

-

-	private static boolean fgLeftIsLocal= false;

 	

 	private static ImageDescriptor[] fgImages= new ImageDescriptor[16];

 	private static Object fgDummy= new Object();

 	private static HashMap fgMap= new HashMap(20);

 

 	static {

-		int INCOMING= fgLeftIsLocal ? Differencer.RIGHT : Differencer.LEFT;

-		int OUTGOING= fgLeftIsLocal ? Differencer.LEFT : Differencer.RIGHT;

+		int INCOMING= Differencer.LEFT;

+		int OUTGOING= Differencer.RIGHT;

 		

 		fgImages[Differencer.ADDITION]= CompareUIPlugin.getImageDescriptor("ovr16/add_ov.gif");

 		fgImages[INCOMING + Differencer.ADDITION]= CompareUIPlugin.getImageDescriptor("ovr16/inadd_ov.gif");

@@ -91,6 +88,8 @@ public class CompareConfiguration {
 	 */

 	public CompareConfiguration() {

 		

+		setProperty("LEFT_IS_LOCAL", new Boolean(true));

+

 		IPreferenceStore ps= CompareUIPlugin.getDefault().getPreferenceStore();

 		if (ps != null) {

 			boolean b= ps.getBoolean(ComparePreferencePage.INITIALLY_SHOW_ANCESTOR_PANE);

diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/ContentMergeViewer.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/ContentMergeViewer.java
index 37ac91826..119f0dd47 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/ContentMergeViewer.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/ContentMergeViewer.java
@@ -638,8 +638,8 @@ public abstract class ContentMergeViewer extends ContentViewer implements IPrope
 			tbm.removeAll();

 			

 			// define groups

-			tbm.add(new Separator("merge"));			

 			tbm.add(new Separator("modes"));

+			tbm.add(new Separator("merge"));			

 			tbm.add(new Separator("navigation"));

 			

 			CompareConfiguration cc= getCompareConfiguration();

diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java
index a46976e41..c1947b041 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java
@@ -150,7 +150,7 @@ public class TextMergeViewer extends ContentMergeViewer  {
 	private static final boolean IS_MOTIF= false;

 	

 	// determines whether a change between left and right is considered incoming or outgoing

-	private boolean fLeftIsLocal= true;

+	private boolean fLeftIsLocal;

 	

 	// Colors to use

 	private static final RGB INCOMING= new RGB(100, 100, 200);

@@ -366,6 +366,8 @@ public class TextMergeViewer extends ContentMergeViewer  {
 	public TextMergeViewer(Composite parent, int style, CompareConfiguration configuration) {

 		super(style, ResourceBundle.getBundle(BUNDLE_NAME), configuration);

 		

+		fLeftIsLocal= Utilities.getBoolean(configuration, "LEFT_IS_LOCAL", false);

+		

 		IPreferenceStore ps= CompareUIPlugin.getDefault().getPreferenceStore();

 		if (ps != null) {

 			fPreferenceChangeListener= new IPropertyChangeListener() {

diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DiffTreeViewer.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DiffTreeViewer.java
index 3b7e3945e..751ef7105 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DiffTreeViewer.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DiffTreeViewer.java
@@ -98,7 +98,20 @@ public class DiffTreeViewer extends TreeViewer {
 		public Image getImage(Object element) {

 			if (element instanceof IDiffElement) {

 				IDiffElement input= (IDiffElement) element;

-				return fCompareConfiguration.getImage(input.getImage(), input.getKind());

+				

+				int kind= input.getKind();

+				if (!fIgnoreLeftIsLocal && fLeftIsLocal) {

+					switch (kind & Differencer.DIRECTION_MASK) {

+					case Differencer.LEFT:

+						kind= (kind &~ Differencer.LEFT) | Differencer.RIGHT;

+						break;

+					case Differencer.RIGHT:

+						kind= (kind &~ Differencer.RIGHT) | Differencer.LEFT;

+						break;

+					}

+				}

+				

+				return fCompareConfiguration.getImage(input.getImage(), kind);

 			}

 			return null;

 		}

@@ -117,6 +130,8 @@ public class DiffTreeViewer extends TreeViewer {
 

 	private ResourceBundle fBundle;

 	private CompareConfiguration fCompareConfiguration;

+	boolean fIgnoreLeftIsLocal= true;

+	private boolean fLeftIsLocal;

 	private ViewerFilter fViewerFilter;

 	private IPropertyChangeListener fPropertyChangeListener;

 	private IPropertyChangeListener fPreferenceChangeListener;

@@ -150,6 +165,8 @@ public class DiffTreeViewer extends TreeViewer {
 	

 	private void initialize(CompareConfiguration configuration) {

 		

+		fLeftIsLocal= Utilities.getBoolean(configuration, "LEFT_IS_LOCAL", false);

+

 		Control tree= getControl();

 		

 		tree.setData(CompareUI.COMPARE_VIEWER_TITLE, getTitle());

diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/StructureDiffViewer.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/StructureDiffViewer.java
index 223730ee9..519ee7e9f 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/StructureDiffViewer.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/StructureDiffViewer.java
@@ -76,6 +76,8 @@ public class StructureDiffViewer extends DiffTreeViewer {
 	

 	private void initialize() {

 		

+		fIgnoreLeftIsLocal= false;

+		

 		setAutoExpandLevel(3);

 		

 		fContentChangedListener= new IContentChangeListener() {