Attachment 125139 Details for Bug 201116 – Patch v02

[patch] Patch v02

clipboard.txt (text/plain), 45.81 KB, created by Tomasz Zarna

on 2009-02-09 10:24:30 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Tomasz Zarna

Created: 2009-02-09 10:24:30 EST

Size: 45.81 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.compare
>Index: compare/org/eclipse/compare/internal/CompareMessages.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareMessages.java,v
>retrieving revision 1.20
>diff -u -r1.20 CompareMessages.java
>--- compare/org/eclipse/compare/internal/CompareMessages.java	10 Oct 2008 14:55:31 -0000	1.20
>+++ compare/org/eclipse/compare/internal/CompareMessages.java	9 Feb 2009 14:45:22 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2000, 2008 IBM Corporation and others.
>+ * Copyright (c) 2000, 2009 IBM Corporation 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
>@@ -129,6 +129,7 @@
> 	public static String CompareWithOtherResourceDialog_externalFolderRadioButton;
> 	public static String CompareWithOtherResourceDialog_workspaceMainButton;
> 	public static String CompareWithOtherResourceDialog_workspaceRadioButton;
>+	public static String CompareContentViewerSwitchingPane_defaultViewer;
> 
> 	static {
> 		NLS.initializeMessages(BUNDLE_NAME, CompareMessages.class);
>Index: compare/org/eclipse/compare/internal/CompareMessages.properties
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareMessages.properties,v
>retrieving revision 1.31
>diff -u -r1.31 CompareMessages.properties
>--- compare/org/eclipse/compare/internal/CompareMessages.properties	10 Oct 2008 14:55:31 -0000	1.31
>+++ compare/org/eclipse/compare/internal/CompareMessages.properties	9 Feb 2009 14:45:22 -0000
>@@ -1,5 +1,5 @@
> ###############################################################################
>-# Copyright (c) 2000, 2008 IBM Corporation and others.
>+# Copyright (c) 2000, 2009 IBM Corporation 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
>@@ -141,3 +141,5 @@
> CompareWithOtherResourceDialog_externalFolderRadioButton=External folder
> CompareWithOtherResourceDialog_workspaceMainButton=Browse...
> CompareWithOtherResourceDialog_workspaceRadioButton=Workspace
>+
>+CompareContentViewerSwitchingPane_defaultViewer=Default
>Index: compare/org/eclipse/compare/internal/ViewerDescriptor.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/ViewerDescriptor.java,v
>retrieving revision 1.14
>diff -u -r1.14 ViewerDescriptor.java
>--- compare/org/eclipse/compare/internal/ViewerDescriptor.java	22 May 2007 20:19:52 -0000	1.14
>+++ compare/org/eclipse/compare/internal/ViewerDescriptor.java	9 Feb 2009 14:45:23 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2000, 2007 IBM Corporation and others.
>+ * Copyright (c) 2000, 2009 IBM Corporation 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
>@@ -10,13 +10,12 @@
>  *******************************************************************************/
> package org.eclipse.compare.internal;
> 
>-import org.eclipse.swt.widgets.Composite;
>-
>+import org.eclipse.compare.CompareConfiguration;
>+import org.eclipse.compare.IViewerCreator;
> import org.eclipse.core.runtime.CoreException;
> import org.eclipse.core.runtime.IConfigurationElement;
>-import org.eclipse.compare.*;
>-
> import org.eclipse.jface.viewers.Viewer;
>+import org.eclipse.swt.widgets.Composite;
> 
> /**
>  * Creates <code>Viewer</code>s from an <code>IConfigurationElement</code>.
>@@ -25,6 +24,7 @@
> 
> 	private final static String CLASS_ATTRIBUTE= "class"; //$NON-NLS-1$
> 	private final static String EXTENSIONS_ATTRIBUTE= "extensions"; //$NON-NLS-1$
>+	private final static String LABEL_ATTRIBUTE = "label"; //$NON-NLS-1$
> 
> 	private IConfigurationElement fConfiguration;
> 	private IViewerCreator fViewerCreator;
>@@ -53,9 +53,12 @@
> 			// If we are going to return a new viewer, we want to preemptively deregister
> 			// any handlers to avoid the logging of conflict warnings
> 			if (currentViewer != null) {
>-				CompareHandlerService compareHandlerService = (CompareHandlerService)Utilities.getAdapter(currentViewer, CompareHandlerService.class);
>-				if (compareHandlerService != null)
>-					compareHandlerService.dispose();
>+				CompareHandlerService[] compareHandlerService = (CompareHandlerService[])Utilities.getAdapter(currentViewer, CompareHandlerService[].class);
>+				if (compareHandlerService != null) {
>+					for (int i = 0; i < compareHandlerService.length; i++) {
>+						compareHandlerService[i].dispose();
>+					}
>+				}
> 			}
> 			Viewer viewer= fViewerCreator.createViewer(parent, mp);
> 			if (viewer != null)
>@@ -69,4 +72,8 @@
> 	public String getExtension() {
> 		return fConfiguration.getAttribute(EXTENSIONS_ATTRIBUTE);
> 	}
>+	
>+	String getLabel() {
>+		return fConfiguration.getAttribute(LABEL_ATTRIBUTE);
>+	}
> }
>Index: compare/org/eclipse/compare/internal/CompareUIPlugin.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareUIPlugin.java,v
>retrieving revision 1.73
>diff -u -r1.73 CompareUIPlugin.java
>--- compare/org/eclipse/compare/internal/CompareUIPlugin.java	10 Oct 2008 09:44:04 -0000	1.73
>+++ compare/org/eclipse/compare/internal/CompareUIPlugin.java	9 Feb 2009 14:45:23 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2000, 2008 IBM Corporation and others.
>+ * Copyright (c) 2000, 2009 IBM Corporation 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
>@@ -20,6 +20,7 @@
> import java.util.HashSet;
> import java.util.Hashtable;
> import java.util.Iterator;
>+import java.util.LinkedHashSet;
> import java.util.List;
> import java.util.Map;
> import java.util.ResourceBundle;
>@@ -92,73 +93,89 @@
>     
>     static class CompareRegistry {
>         
>-    		private final static String ID_ATTRIBUTE= "id"; //$NON-NLS-1$
>-    		private final static String EXTENSIONS_ATTRIBUTE= "extensions"; //$NON-NLS-1$
>-    		private final static String CONTENT_TYPE_ID_ATTRIBUTE= "contentTypeId"; //$NON-NLS-1$
>- 
>-    		private HashMap fIdMap;					// maps ids to data
>-    		private HashMap fExtensionMap;			// maps extensions to data
>-    		private HashMap fContentTypeBindings;		// maps content type bindings to data
>-        
>- 
>-	    	void register(IConfigurationElement element, Object data) {
>-	    	    String id= element.getAttribute(ID_ATTRIBUTE);
>-	    	    if (id != null) {      
>-	    	        if (fIdMap == null)
>-	    	            fIdMap= new HashMap();
>-	    	        fIdMap.put(id, data);
>-	    	    }
>-	    	    
>-	    	    String types= element.getAttribute(EXTENSIONS_ATTRIBUTE);
>-	    	    if (types != null) {
>-	    	        if (fExtensionMap == null)
>-	    	            fExtensionMap= new HashMap();
>-		    		StringTokenizer tokenizer= new StringTokenizer(types, ","); //$NON-NLS-1$
>-		    		while (tokenizer.hasMoreElements()) {
>-		    			String extension= tokenizer.nextToken().trim();
>-		    			fExtensionMap.put(normalizeCase(extension), data);
>-		    		}
>-	    	    }
>-	    	}
>-
>-	    	void createBinding(IConfigurationElement element, String idAttributeName) {
>-            String type= element.getAttribute(CONTENT_TYPE_ID_ATTRIBUTE);
>-            String id= element.getAttribute(idAttributeName);
>-            if (id == null)
>-                logErrorMessage(Utilities.getFormattedString("CompareUIPlugin.targetIdAttributeMissing", idAttributeName)); //$NON-NLS-1$
>-            if (type != null && id != null && fIdMap != null) {
>-                Object o= fIdMap.get(id);
>-                if (o != null) {
>-                    IContentType ct= fgContentTypeManager.getContentType(type);
>-                    if (ct != null) {
>-                        if (fContentTypeBindings == null)
>-                            fContentTypeBindings= new HashMap();
>-                        fContentTypeBindings.put(ct, o);
>-                    } else {
>-                        logErrorMessage(Utilities.getFormattedString("CompareUIPlugin.contentTypeNotFound", type)); //$NON-NLS-1$
>-                    }
>-                } else {
>-                    logErrorMessage(Utilities.getFormattedString("CompareUIPlugin.targetNotFound", id)); //$NON-NLS-1$
>-                }
>-            }
>-	    	}
>-
>-	    	Object search(IContentType type) {
>-	    	    if (fContentTypeBindings != null) {
>-	    	    		for (; type != null; type= type.getBaseType()) {
>-	    	    			Object data= fContentTypeBindings.get(type);
>-	    	    			if (data != null)
>-	    	    				return data;
>-	    	    		}
>-	    	    }
>-	    	    return null;
>-	    	}
>+    	private final static String ID_ATTRIBUTE= "id"; //$NON-NLS-1$
>+    	private final static String EXTENSIONS_ATTRIBUTE= "extensions"; //$NON-NLS-1$
>+    	private final static String CONTENT_TYPE_ID_ATTRIBUTE= "contentTypeId"; //$NON-NLS-1$
>+
>+    	private HashMap fIdMap;	// maps ids to data
>+    	private HashMap fExtensionMap;	// multimap: maps extensions to list of data
>+    	private HashMap fContentTypeBindings; // multimap: maps content type bindings to list of data
>+
>+
>+    	void register(IConfigurationElement element, Object data) {
>+    		String id= element.getAttribute(ID_ATTRIBUTE);
>+    		if (id != null) {      
>+    			if (fIdMap == null)
>+    				fIdMap= new HashMap();
>+    			fIdMap.put(id, data);
>+    		}
>+
>+    		String types= element.getAttribute(EXTENSIONS_ATTRIBUTE);
>+    		if (types != null) {
>+    			if (fExtensionMap == null)
>+    				fExtensionMap= new HashMap();
>+    			StringTokenizer tokenizer= new StringTokenizer(types, ","); //$NON-NLS-1$
>+    			while (tokenizer.hasMoreElements()) {
>+    				String extension= tokenizer.nextToken().trim();
>+    				List l = (List) fExtensionMap.get(normalizeCase(extension));
>+					if (l == null)
>+						fExtensionMap.put(normalizeCase(extension), l=new ArrayList());
>+					l.add(data);
>+    			}
>+    		}
>+    	}
>+
>+    	void createBinding(IConfigurationElement element, String idAttributeName) {
>+    		String type= element.getAttribute(CONTENT_TYPE_ID_ATTRIBUTE);
>+    		String id= element.getAttribute(idAttributeName);
>+    		if (id == null)
>+    			logErrorMessage(Utilities.getFormattedString("CompareUIPlugin.targetIdAttributeMissing", idAttributeName)); //$NON-NLS-1$
>+    		if (type != null && id != null && fIdMap != null) {
>+    			Object o= fIdMap.get(id);
>+    			if (o != null) {
>+    				IContentType ct= fgContentTypeManager.getContentType(type);
>+    				if (ct != null) {
>+    					if (fContentTypeBindings == null)
>+    						fContentTypeBindings= new HashMap();
>+    					List l = (List) fContentTypeBindings.get(ct);
>+    					if (l == null)
>+    						fContentTypeBindings.put(ct, l=new ArrayList());
>+    					l.add(o);
>+    				} else {
>+    					logErrorMessage(Utilities.getFormattedString("CompareUIPlugin.contentTypeNotFound", type)); //$NON-NLS-1$
>+    				}
>+    			} else {
>+    				logErrorMessage(Utilities.getFormattedString("CompareUIPlugin.targetNotFound", id)); //$NON-NLS-1$
>+    			}
>+    		}
>+    	}
>+
>+		Object search(IContentType type) {
>+			List list = searchAll(type);
>+			return list != null ? list.get(0) : null;
>+		}
> 	    	
>-	    	Object search(String extension) {
>-	    	    if (fExtensionMap != null)
>-	    	        return fExtensionMap.get(normalizeCase(extension));
>-	    	    return null;
>-	    	}
>+		List searchAll(IContentType type) {
>+			if (fContentTypeBindings != null) {
>+				for (; type != null; type= type.getBaseType()) {
>+					List data= (List) fContentTypeBindings.get(type);
>+					if (data != null)
>+						return data;
>+				}
>+			}
>+			return null;
>+		}
>+
>+		Object search(String extension) {
>+			List list = searchAll(extension);
>+			return list != null ? list.get(0) : null;
>+		}
>+		
>+		List searchAll(String extension) {
>+			if (fExtensionMap != null)
>+				return (List) fExtensionMap.get(normalizeCase(extension));
>+			return null;
>+		}
>     }
> 	
> 	/** Status code describing an internal error */
>@@ -171,19 +188,19 @@
> 	private static final String BINARY_TYPE= "binary"; //$NON-NLS-1$
> 
> 	private static final String STREAM_MERGER_EXTENSION_POINT= "streamMergers"; //$NON-NLS-1$
>-		private static final String STREAM_MERGER= "streamMerger"; //$NON-NLS-1$
>-		private static final String STREAM_MERGER_ID_ATTRIBUTE= "streamMergerId"; //$NON-NLS-1$
>+	private static final String STREAM_MERGER= "streamMerger"; //$NON-NLS-1$
>+	private static final String STREAM_MERGER_ID_ATTRIBUTE= "streamMergerId"; //$NON-NLS-1$
> 	private static final String STRUCTURE_CREATOR_EXTENSION_POINT= "structureCreators"; //$NON-NLS-1$
>-		private static final String STRUCTURE_CREATOR= "structureCreator"; //$NON-NLS-1$
>-		private static final String STRUCTURE_CREATOR_ID_ATTRIBUTE= "structureCreatorId"; //$NON-NLS-1$
>-		
>+	private static final String STRUCTURE_CREATOR= "structureCreator"; //$NON-NLS-1$
>+	private static final String STRUCTURE_CREATOR_ID_ATTRIBUTE= "structureCreatorId"; //$NON-NLS-1$
>+
> 	private static final String VIEWER_TAG= "viewer"; //$NON-NLS-1$
> 	private static final String STRUCTURE_MERGE_VIEWER_EXTENSION_POINT= "structureMergeViewers"; //$NON-NLS-1$
>-		private static final String STRUCTURE_MERGE_VIEWER_ID_ATTRIBUTE= "structureMergeViewerId"; //$NON-NLS-1$
>+	private static final String STRUCTURE_MERGE_VIEWER_ID_ATTRIBUTE= "structureMergeViewerId"; //$NON-NLS-1$
> 	private static final String CONTENT_MERGE_VIEWER_EXTENSION_POINT= "contentMergeViewers"; //$NON-NLS-1$
>-		private static final String CONTENT_MERGE_VIEWER_ID_ATTRIBUTE= "contentMergeViewerId"; //$NON-NLS-1$
>+	private static final String CONTENT_MERGE_VIEWER_ID_ATTRIBUTE= "contentMergeViewerId"; //$NON-NLS-1$
> 	private static final String CONTENT_VIEWER_EXTENSION_POINT= "contentViewers"; //$NON-NLS-1$
>-		private static final String CONTENT_VIEWER_ID_ATTRIBUTE= "contentViewerId"; //$NON-NLS-1$
>+	private static final String CONTENT_VIEWER_ID_ATTRIBUTE= "contentViewerId"; //$NON-NLS-1$
> 
> 	private static final String CONTENT_TYPE_BINDING= "contentTypeBinding"; //$NON-NLS-1$
> 
>@@ -223,6 +240,8 @@
> 	private Map fStructureViewerAliases;
> 	private CompareFilter fFilter;
> 	private IPropertyChangeListener fPropertyChangeListener;
>+
>+	private Map fContentViewerBinding; // maps input to (ContentMerge)ViewerDesriptor
> 	
> 	/**
> 	 * Creates the <code>CompareUIPlugin</code> object and registers all
>@@ -807,6 +826,102 @@
> 		return null;
> 	}
> 	
>+	public Set/*<ViewerDescriptor>*/ getContentViewersData(Viewer oldViewer, Object in, CompareConfiguration cc) {
>+		Set result = new LinkedHashSet();
>+		if (in instanceof IStreamContentAccessor) {
>+			String type= ITypedElement.TEXT_TYPE;
>+			
>+			if (in instanceof ITypedElement) {
>+				ITypedElement tin= (ITypedElement) in;
>+			    		    
>+			    IContentType ct= getContentType(tin);
>+				if (ct != null) {
>+					initializeRegistries();
>+					List list = fContentViewers.searchAll(ct);
>+					if (list != null)
>+						result.addAll(list);
>+				}
>+			    
>+				String ty= tin.getType();
>+				if (ty != null)
>+					type= ty;
>+			}
>+			
>+			initializeRegistries();
>+			List list = fContentViewers.searchAll(type);
>+			if (list != null)
>+				result.addAll(list);
>+			
>+			// fallback
>+			result.add(fContentViewers.search(Platform.getContentTypeManager().getContentType(IContentTypeManager.CT_TEXT)));
>+			return result;
>+		}
>+
>+		if (!(in instanceof ICompareInput))
>+			return null;
>+
>+		ICompareInput input= (ICompareInput) in;
>+		
>+		IContentType ctype= getCommonType(input);
>+		if (isCompareAsText(input, cc)) {
>+			ctype = Platform.getContentTypeManager().getContentType(IContentTypeManager.CT_TEXT);
>+		}
>+		if (ctype != null) {
>+			initializeRegistries();
>+			List list = fContentMergeViewers.searchAll(ctype);
>+			if (list != null)
>+				result.addAll(list);
>+		}
>+		
>+		String[] types= getTypes(input);
>+		String type= null;
>+		if (isHomogenous(types))
>+			type= types[0];
>+		
>+		if (ITypedElement.FOLDER_TYPE.equals(type))
>+			return null;
>+			
>+		if (type == null) {
>+			int n= 0;
>+			for (int i= 0; i < types.length; i++)
>+				if (!ITypedElement.UNKNOWN_TYPE.equals(types[i])) {
>+					n++;
>+					if (type == null)
>+						type= types[i];	// remember the first known type
>+				}
>+			if (n > 1)	// don't use the type if there were more than one
>+				type= null;
>+		}
>+		
>+		if (type != null) {
>+			initializeRegistries();
>+			List list = fContentMergeViewers.searchAll(type);
>+			if (list != null)
>+				result.addAll(list);
>+		}
>+
>+		// fallback
>+		String leftType= guessType(input.getLeft());
>+		String rightType= guessType(input.getRight());
>+			
>+		if (leftType != null || rightType != null) {
>+			boolean right_text= rightType != null && ITypedElement.TEXT_TYPE.equals(rightType);
>+			boolean left_text= leftType != null && ITypedElement.TEXT_TYPE.equals(leftType);
>+			if ((leftType == null && right_text) || (left_text && rightType == null) || (left_text && right_text))
>+				type= ITypedElement.TEXT_TYPE;
>+			else
>+				type= BINARY_TYPE;
>+			
>+			initializeRegistries();
>+			List list = fContentMergeViewers.searchAll(type);
>+			if (list != null)
>+				result.addAll(list);
>+			
>+			return result;
>+		}
>+		return null;
>+	}
>+	
> 	/**
> 	 * Returns a content compare viewer based on an old viewer and an input object.
> 	 * If the old viewer is suitable for showing the input the old viewer
>@@ -822,6 +937,14 @@
> 	 */
> 	public Viewer findContentViewer(Viewer oldViewer, Object in, Composite parent, CompareConfiguration cc) {
> 		
>+		if (fContentViewerBinding != null) {
>+			if (fContentViewerBinding.containsKey(in)) {
>+				Viewer viewer= getViewer(fContentViewerBinding.get(in), oldViewer, parent, cc);
>+				if (viewer != null)
>+					return viewer;
>+			}
>+		}
>+		
> 		if (in instanceof IStreamContentAccessor) {
> 			String type= ITypedElement.TEXT_TYPE;
> 			
>@@ -920,7 +1043,7 @@
> 		return set.contains(input);
> 	}
> 
>-	private static Viewer getViewer(Object descriptor, Viewer oldViewer, Composite parent, CompareConfiguration cc) {    
>+	static Viewer getViewer(Object descriptor, Viewer oldViewer, Composite parent, CompareConfiguration cc) {    
> 	    if (descriptor instanceof IViewerDescriptor)
> 			return ((IViewerDescriptor)descriptor).createViewer(oldViewer, parent, cc);
> 	    return null;
>@@ -1272,4 +1395,17 @@
> 	public static void log(IStatus status) {
> 		getDefault().getLog().log(status);
> 	}
>+
>+	void addContentViewerBinding(Object input, ViewerDescriptor vd) {
>+		if (fContentViewerBinding == null) {
>+			fContentViewerBinding = new HashMap();
>+		}
>+		fContentViewerBinding.put(input, vd);
>+	}
>+	
>+	ViewerDescriptor getViewerDescriptor(Object input) {
>+		if (fContentViewerBinding != null)
>+			return (ViewerDescriptor) fContentViewerBinding.get(input);
>+		return null;
>+	}
> }
>Index: compare/org/eclipse/compare/contentmergeviewer/ContentMergeViewer.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/ContentMergeViewer.java,v
>retrieving revision 1.75
>diff -u -r1.75 ContentMergeViewer.java
>--- compare/org/eclipse/compare/contentmergeviewer/ContentMergeViewer.java	20 Jan 2009 10:56:12 -0000	1.75
>+++ compare/org/eclipse/compare/contentmergeviewer/ContentMergeViewer.java	9 Feb 2009 14:45:19 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2000, 2008 IBM Corporation and others.
>+ * Copyright (c) 2000, 2009 IBM Corporation 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
>@@ -1260,4 +1260,8 @@
> 		}
> 		refresh();
> 	}
>+
>+	CompareHandlerService getCompareHandlerService() {
>+		return fHandlerService;
>+	}
> }
>Index: compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java,v
>retrieving revision 1.250
>diff -u -r1.250 TextMergeViewer.java
>--- compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java	28 Jan 2009 10:43:07 -0000	1.250
>+++ compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java	9 Feb 2009 14:45:22 -0000
>@@ -4899,6 +4899,10 @@
> 			return getFindReplaceTarget();
> 		if (adapter == CompareHandlerService.class)
> 			return fHandlerService;
>+		if (adapter == CompareHandlerService[].class) {
>+			return new CompareHandlerService[] { fHandlerService,
>+					super.getCompareHandlerService() };
>+		}
> 		if (adapter == IEditorInput.class) {
> 			// return active editor input
> 			if (fLeft != null && fLeft == fFocusPart)
>Index: compare/org/eclipse/compare/CompareViewerSwitchingPane.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/CompareViewerSwitchingPane.java,v
>retrieving revision 1.32
>diff -u -r1.32 CompareViewerSwitchingPane.java
>--- compare/org/eclipse/compare/CompareViewerSwitchingPane.java	4 Feb 2009 10:47:50 -0000	1.32
>+++ compare/org/eclipse/compare/CompareViewerSwitchingPane.java	9 Feb 2009 14:45:19 -0000
>@@ -232,8 +232,23 @@
> 	 * @param input the new input object or <code>null</code>
> 	 */ 
> 	public void setInput(Object input) {
>+		setInput(input, false);
>+	}
>+
>+	/**
>+	 * @param input
>+	 *            input the new input object or <code>null</code>
>+	 * @param force
>+	 *            forces to set the given input even if it is the same as the
>+	 *            current one. The input stays the same but a more suitable
>+	 *            viewer is determined.
>+	 *            
>+	 * @see #setInput(Object)           
>+	 * @noreference This method is not intended to be referenced by clients.
>+	 */
>+	public void setInput(Object input, boolean force) {
> 
>-		if (getInput() == input)
>+		if (!force && getInput() == input)
> 			return;
> 			
> 		boolean hadFocus= hasFocus2();
>Index: compare/org/eclipse/compare/CompareEditorInput.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/CompareEditorInput.java,v
>retrieving revision 1.105
>diff -u -r1.105 CompareEditorInput.java
>--- compare/org/eclipse/compare/CompareEditorInput.java	23 Jan 2009 15:58:06 -0000	1.105
>+++ compare/org/eclipse/compare/CompareEditorInput.java	9 Feb 2009 14:45:18 -0000
>@@ -19,6 +19,7 @@
> import org.eclipse.compare.contentmergeviewer.IFlushable;
> import org.eclipse.compare.internal.BinaryCompareViewer;
> import org.eclipse.compare.internal.ChangePropertyAction;
>+import org.eclipse.compare.internal.CompareContentViewerSwitchingPane;
> import org.eclipse.compare.internal.CompareEditorInputNavigator;
> import org.eclipse.compare.internal.CompareMessages;
> import org.eclipse.compare.internal.ComparePreferencePage;
>@@ -552,13 +553,8 @@
> 				
> 		Control outline= createOutlineContents(fComposite, SWT.HORIZONTAL);
> 					
>-		fContentInputPane= new CompareViewerSwitchingPane(fComposite, SWT.BORDER | SWT.FLAT) {
>-			protected Viewer getViewer(Viewer oldViewer, Object input) {
>-				if (input instanceof ICompareInput)
>-					return findContentViewer(oldViewer, (ICompareInput)input, this);
>-				return null;
>-			}
>-		};
>+		fContentInputPane= new CompareContentViewerSwitchingPane(fComposite, SWT.BORDER | SWT.FLAT, this);
>+
> 		if (fFocusPane == null)
> 			fFocusPane= fContentInputPane;
> 		if (outline != null)
>Index: compare/org/eclipse/compare/CompareViewerPane.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/CompareViewerPane.java,v
>retrieving revision 1.25
>diff -u -r1.25 CompareViewerPane.java
>--- compare/org/eclipse/compare/CompareViewerPane.java	5 Apr 2007 14:48:38 -0000	1.25
>+++ compare/org/eclipse/compare/CompareViewerPane.java	9 Feb 2009 14:45:19 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2000, 2007 IBM Corporation and others.
>+ * Copyright (c) 2000, 2009 IBM Corporation 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
>@@ -10,17 +10,34 @@
>  *******************************************************************************/
> package org.eclipse.compare;
> 
>-import org.eclipse.core.runtime.*;
>+import org.eclipse.core.runtime.IAdaptable;
>+import org.eclipse.core.runtime.ListenerList;
>+import org.eclipse.core.runtime.Platform;
> import org.eclipse.jface.action.ToolBarManager;
>-import org.eclipse.jface.viewers.*;
>+import org.eclipse.jface.viewers.DoubleClickEvent;
>+import org.eclipse.jface.viewers.IDoubleClickListener;
>+import org.eclipse.jface.viewers.IOpenListener;
>+import org.eclipse.jface.viewers.ISelection;
>+import org.eclipse.jface.viewers.ISelectionChangedListener;
>+import org.eclipse.jface.viewers.ISelectionProvider;
>+import org.eclipse.jface.viewers.OpenEvent;
>+import org.eclipse.jface.viewers.SelectionChangedEvent;
> import org.eclipse.swt.SWT;
>-import org.eclipse.swt.accessibility.*;
>+import org.eclipse.swt.accessibility.ACC;
>+import org.eclipse.swt.accessibility.AccessibleAdapter;
>+import org.eclipse.swt.accessibility.AccessibleEvent;
> import org.eclipse.swt.custom.CLabel;
> import org.eclipse.swt.custom.ViewForm;
>-import org.eclipse.swt.events.*;
>+import org.eclipse.swt.events.DisposeEvent;
>+import org.eclipse.swt.events.DisposeListener;
>+import org.eclipse.swt.events.MouseAdapter;
>+import org.eclipse.swt.events.MouseEvent;
> import org.eclipse.swt.graphics.Image;
> import org.eclipse.swt.graphics.Point;
>-import org.eclipse.swt.widgets.*;
>+import org.eclipse.swt.widgets.Composite;
>+import org.eclipse.swt.widgets.Control;
>+import org.eclipse.swt.widgets.ToolBar;
>+import org.eclipse.swt.widgets.ToolItem;
> 
> /**
>  * A <code>CompareViewerPane</code> is a convenience class which installs a
>@@ -63,12 +80,9 @@
> 		marginWidth= 0;
> 		marginHeight= 0;
> 		
>-		CLabel label= new CLabel(this, SWT.NONE) {
>-			public Point computeSize(int wHint, int hHint, boolean changed) {
>-				return super.computeSize(wHint, Math.max(24, hHint), changed);
>-			}
>-		};
>-		setTopLeft(label);
>+		Control topLeft = createTopLeft(this);
>+
>+		setTopLeft(topLeft);
> 		
> 		MouseAdapter ml= new MouseAdapter() {
> 			public void mouseDoubleClick(MouseEvent e) {
>@@ -82,7 +96,7 @@
> 		};	
> 				
> 		addMouseListener(ml);
>-		label.addMouseListener(ml);
>+		getTopLeft().addMouseListener(ml);
> 		
> 		addDisposeListener(new DisposeListener() {
> 			public void widgetDisposed(DisposeEvent e) {
>@@ -98,6 +112,20 @@
> 	}
> 	
> 	/**
>+	 * @param parent a widget which will be the parent of the control (cannot be null)
>+	 * @return the control to be placed in the top left corner of the pane
>+	 * @noreference This method is not intended to be referenced by clients.
>+	 */
>+	protected Control createTopLeft(Composite parent) {
>+		CLabel label= new CLabel(this, SWT.NONE) {
>+			public Point computeSize(int wHint, int hHint, boolean changed) {
>+				return super.computeSize(wHint, Math.max(24, hHint), changed);
>+			}
>+		};
>+		return label;
>+	}
>+	
>+	/**
> 	 * Set the pane's title text.
> 	 * The value <code>null</code> clears it.
> 	 * 
>Index: schema/contentMergeViewers.exsd
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.compare/plugins/org.eclipse.compare/schema/contentMergeViewers.exsd,v
>retrieving revision 1.18
>diff -u -r1.18 contentMergeViewers.exsd
>--- schema/contentMergeViewers.exsd	24 Sep 2008 17:14:44 -0000	1.18
>+++ schema/contentMergeViewers.exsd	9 Feb 2009 14:45:23 -0000
>@@ -2,9 +2,9 @@
> 
> <schema targetNamespace="org.eclipse.compare" xmlns="http://www.w3.org/2001/XMLSchema">
> <annotation>
>-      <appinfo>
>+      <appInfo>
>          <meta.schema plugin="org.eclipse.compare" id="contentMergeViewers" name="ContentMerge Viewers"/>
>-      </appinfo>
>+      </appInfo>
>       <documentation>
>          This extension point allows a plug-in to register compare/merge 
> viewers for specific content types. The viewer is expected to 
>@@ -17,9 +17,9 @@
> 
>    <element name="extension">
>       <annotation>
>-         <appinfo>
>+         <appInfo>
>             <meta.element />
>-         </appinfo>
>+         </appInfo>
>       </annotation>
>       <complexType>
>          <sequence>
>@@ -45,9 +45,9 @@
>                <documentation>
>                   an optional name of the extension instance
>                </documentation>
>-               <appinfo>
>+               <appInfo>
>                   <meta.attribute translatable="true"/>
>-               </appinfo>
>+               </appInfo>
>             </annotation>
>          </attribute>
>       </complexType>
>@@ -68,9 +68,9 @@
>                   a fully qualified name of a class that implements a factory for the 
> content merge viewer and implements &lt;samp&gt;org.eclipse.compare.IViewerCreator&lt;/samp&gt;
>                </documentation>
>-               <appinfo>
>+               <appInfo>
>                   <meta.attribute kind="java" basedOn=":org.eclipse.compare.IViewerCreator"/>
>-               </appinfo>
>+               </appInfo>
>             </annotation>
>          </attribute>
>          <attribute name="extensions" type="string">
>@@ -80,6 +80,16 @@
>                </documentation>
>             </annotation>
>          </attribute>
>+         <attribute name="label" type="string">
>+            <annotation>
>+               <documentation>
>+                  a translatable label that will be used in the UI for this viewer
>+               </documentation>
>+               <appInfo>
>+                  <meta.attribute translatable="true"/>
>+               </appInfo>
>+            </annotation>
>+         </attribute>
>       </complexType>
>    </element>
> 
>@@ -95,9 +105,9 @@
>                <documentation>
>                   The id of a content type defined using the &lt;code&gt;org.eclipse.core.contenttype.contentTypes&lt;/code&gt; extension point.
>                </documentation>
>-               <appinfo>
>+               <appInfo>
>                   <meta.attribute kind="identifier" basedOn="org.eclipse.core.contenttype.contentTypes/content-type/@id"/>
>-               </appinfo>
>+               </appInfo>
>             </annotation>
>          </attribute>
>          <attribute name="contentMergeViewerId" type="string" use="required">
>@@ -105,18 +115,18 @@
>                <documentation>
>                   The id of a merge viewer defined using the &lt;code&gt;viewer&lt;/code&gt; element of this extension point (i.e. &lt;code&gt;org.eclipse.compare.contentMergeViewers&lt;/code&gt;)
>                </documentation>
>-               <appinfo>
>+               <appInfo>
>                   <meta.attribute kind="identifier" basedOn="org.eclipse.compare.contentMergeViewers/viewer/@id"/>
>-               </appinfo>
>+               </appInfo>
>             </annotation>
>          </attribute>
>       </complexType>
>    </element>
> 
>    <annotation>
>-      <appinfo>
>+      <appInfo>
>          <meta.section type="examples"/>
>-      </appinfo>
>+      </appInfo>
>       <documentation>
>          The following is an example of a compare/merge viewer 
> for text files (extension &quot;txt&quot;):
>@@ -135,9 +145,9 @@
>    </annotation>
> 
>    <annotation>
>-      <appinfo>
>+      <appInfo>
>          <meta.section type="apiInfo"/>
>-      </appinfo>
>+      </appInfo>
>       <documentation>
>          The contributed class must implement &lt;code&gt;org.eclipse.compare.IViewerCreator&lt;/code&gt;
>       </documentation>
>@@ -145,20 +155,20 @@
> 
> 
>    <annotation>
>-      <appinfo>
>+      <appInfo>
>          <meta.section type="implementation"/>
>-      </appinfo>
>+      </appInfo>
>       <documentation>
>          The Compare UI plugin defines content viewers for text, binary contents, and images.
>       </documentation>
>    </annotation>
> 
>    <annotation>
>-      <appinfo>
>+      <appInfo>
>          <meta.section type="copyright"/>
>-      </appinfo>
>+      </appInfo>
>       <documentation>
>-         Copyright (c) 2000, 2008 IBM Corporation and others.&lt;br&gt;
>+         Copyright (c) 2000, 2009 IBM Corporation and others.&lt;br&gt;
> 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 &lt;a href=&quot;http://www.eclipse.org/legal/epl-v10.html&quot;&gt;http://www.eclipse.org/legal/epl-v10.html&lt;/a&gt;
>       </documentation>
>    </annotation>
>Index: plugin.xml
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.compare/plugins/org.eclipse.compare/plugin.xml,v
>retrieving revision 1.68
>diff -u -r1.68 plugin.xml
>--- plugin.xml	25 Aug 2008 12:35:11 -0000	1.68
>+++ plugin.xml	9 Feb 2009 14:45:18 -0000
>@@ -307,19 +307,22 @@
>    <extension
>          point="org.eclipse.compare.contentMergeViewers">
>       <viewer
>-            extensions="class,exe,dll,binary,zip,jar"
>             class="org.eclipse.compare.internal.BinaryCompareViewerCreator"
>-            id="org.eclipse.compare.BinaryCompareViewerCreator">
>+            extensions="class,exe,dll,binary,zip,jar"
>+            id="org.eclipse.compare.BinaryCompareViewerCreator"
>+            label="Binary Compare">
>       </viewer>
>       <viewer
>-            extensions="txt"
>             class="org.eclipse.compare.internal.TextMergeViewerCreator"
>-            id="org.eclipse.compare.TextMergeViewerCreator">
>+            extensions="txt"
>+            id="org.eclipse.compare.TextMergeViewerCreator"
>+            label="Text Compare">
>       </viewer>
>       <viewer
>-            extensions="gif,jpg,jpeg,png,bmp,ico,tif,tiff"
>             class="org.eclipse.compare.internal.ImageMergeViewerCreator"
>-            id="org.eclipse.compare.ImageMergeViewerCreator">
>+            extensions="gif,jpg,jpeg,png,bmp,ico,tif,tiff"
>+            id="org.eclipse.compare.ImageMergeViewerCreator"
>+            label="Image Compare">
>       </viewer>
>       <contentTypeBinding
> 			contentTypeId="org.eclipse.core.runtime.text"
>Index: compare/org/eclipse/compare/internal/CompareContentViewerSwitchingPane.java
>===================================================================
>RCS file: compare/org/eclipse/compare/internal/CompareContentViewerSwitchingPane.java
>diff -N compare/org/eclipse/compare/internal/CompareContentViewerSwitchingPane.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ compare/org/eclipse/compare/internal/CompareContentViewerSwitchingPane.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,241 @@
>+/*******************************************************************************
>+ * Copyright (c) 2009 IBM Corporation 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
>+ * http://www.eclipse.org/legal/epl-v10.html
>+ *
>+ * Contributors:
>+ *     IBM Corporation - initial API and implementation
>+ *******************************************************************************/
>+package org.eclipse.compare.internal;
>+
>+import java.util.Set;
>+
>+import org.eclipse.compare.CompareConfiguration;
>+import org.eclipse.compare.CompareEditorInput;
>+import org.eclipse.compare.CompareViewerSwitchingPane;
>+import org.eclipse.compare.Splitter;
>+import org.eclipse.compare.structuremergeviewer.ICompareInput;
>+import org.eclipse.core.runtime.Assert;
>+import org.eclipse.jface.viewers.Viewer;
>+import org.eclipse.swt.SWT;
>+import org.eclipse.swt.custom.CLabel;
>+import org.eclipse.swt.events.SelectionEvent;
>+import org.eclipse.swt.events.SelectionListener;
>+import org.eclipse.swt.graphics.Image;
>+import org.eclipse.swt.graphics.Point;
>+import org.eclipse.swt.graphics.Rectangle;
>+import org.eclipse.swt.layout.RowLayout;
>+import org.eclipse.swt.widgets.Composite;
>+import org.eclipse.swt.widgets.Control;
>+import org.eclipse.swt.widgets.Event;
>+import org.eclipse.swt.widgets.Listener;
>+import org.eclipse.swt.widgets.Menu;
>+import org.eclipse.swt.widgets.MenuItem;
>+import org.eclipse.swt.widgets.Shell;
>+import org.eclipse.swt.widgets.ToolBar;
>+import org.eclipse.swt.widgets.ToolItem;
>+
>+public class CompareContentViewerSwitchingPane extends
>+		CompareViewerSwitchingPane {
>+
>+	private CompareEditorInput fCompareEditorInput;
>+	private ViewerDescriptor[] fViewerDescriptor;
>+	
>+	public CompareContentViewerSwitchingPane(Splitter parent, int style, CompareEditorInput cei) {
>+		super(parent, style);
>+		fCompareEditorInput = cei;
>+	}
>+	
>+	private CompareConfiguration getCompareConfiguration() {
>+		return fCompareEditorInput.getCompareConfiguration();
>+	}
>+	
>+	protected Viewer getViewer(Viewer oldViewer, Object input) {
>+		if (input instanceof ICompareInput) {
>+			return fCompareEditorInput.findContentViewer(oldViewer, (ICompareInput)input, this);
>+		}
>+		return null;
>+	}
>+	
>+	public void setInput(Object input) {
>+		
>+		super.setInput(input);
>+		
>+		if (fViewerDescriptor == null) {
>+			// when ran for the first time, create menu
>+			Set/*<ViewerDescriptor>*/ data = CompareUIPlugin.getDefault().getContentViewersData(getViewer(), getViewer().getInput(), getCompareConfiguration());
>+			fViewerDescriptor = (ViewerDescriptor[]) data.toArray(new ViewerDescriptor[0]);
>+			if (fViewerDescriptor.length > 1)
>+				setMenu();
>+			else
>+				disableMenu();
>+		}
>+		updateMenuSelection();
>+	}
>+	
>+	protected Control createTopLeft(Composite p) {
>+		
>+		Composite composite = new Composite(p, SWT.NONE){
>+			public Point computeSize(int wHint, int hHint, boolean changed) {
>+				return super.computeSize(wHint, Math.max(24, hHint), changed);
>+			}
>+		};
>+		RowLayout layout = new RowLayout();
>+		layout.marginTop = 0;
>+		layout.marginBottom = 0;
>+		composite.setLayout(layout);
>+		
>+		CLabel cl = new CLabel(composite, SWT.NONE);
>+		cl.setText(null);
>+		
>+		final ToolBar tb = new ToolBar(composite, SWT.FLAT);
>+		new ToolItem (tb, SWT.DROP_DOWN);
>+		tb.pack();
>+		
>+		return composite;
>+	}
>+
>+	public void setText(String label) {
>+		Composite c = (Composite) getTopLeft();
>+		Control[] children = c.getChildren();
>+		for (int i = 0; i < children.length; i++) {
>+			if (children[i] instanceof ToolBar) {
>+				final ToolBar tb = (ToolBar) children[i];
>+				if (tb != null && !tb.isDisposed()) {
>+					tb.getItem(0).setText(label);
>+				}
>+				return;
>+			}
>+		}
>+	}
>+	
>+	public void setImage(Image image) {
>+		Composite c = (Composite) getTopLeft();
>+		Control[] children = c.getChildren();
>+		for (int i = 0; i < children.length; i++) {
>+			if (children[i] instanceof CLabel) {
>+				CLabel cl = (CLabel) children[i];
>+				if (cl != null && !cl.isDisposed())
>+					cl.setImage(image);
>+				return;
>+			}
>+		}
>+	}
>+	
>+	private void setMenu() {
>+		Composite c = (Composite) getTopLeft();
>+		Control[] children = c.getChildren();
>+		for (int i = 0; i < children.length; i++) {
>+			if (children[i] instanceof ToolBar) {
>+				final ToolBar tb = (ToolBar) children[i];
>+				if (tb != null && !tb.isDisposed()) {
>+					final ToolItem ti = tb.getItem(0);
>+					final Menu menu = createMenu(c.getShell());
>+					tb.setData(menu);
>+
>+					ti.addListener(SWT.Selection, new Listener() {
>+						public void handleEvent(Event event) {
>+							if (event.detail == SWT.ARROW) {
>+								Rectangle rect = ti.getBounds();
>+								Point pt = new Point (rect.x, rect.y + rect.height);
>+								pt = tb.toDisplay(pt);
>+								menu.setLocation(pt.x, pt.y);
>+								menu.setVisible(true);
>+							}
>+						}
>+					});
>+				}
>+			}
>+		}
>+	}
>+	
>+	private Menu createMenu(Shell shell) {
>+		final Menu menu = new Menu (shell, SWT.POP_UP);
>+		
>+		// add default
>+		String label = fViewerDescriptor[0].getLabel();
>+		if (label == null || label.equals("")) { //$NON-NLS-1$
>+			label = CompareMessages.CompareContentViewerSwitchingPane_defaultViewer;
>+		}
>+		MenuItem defaultItem = new MenuItem (menu, SWT.RADIO);
>+		defaultItem.setText(label);
>+		defaultItem.addSelectionListener(createSelectionListener(fViewerDescriptor[0]));
>+		
>+		// add others
>+		for (int i = 1; i < fViewerDescriptor.length; i++) {
>+			final ViewerDescriptor vdi = fViewerDescriptor[i];
>+			label = vdi.getLabel();
>+			if (label != null && !label.equals("")) { //$NON-NLS-1$
>+				MenuItem item = new MenuItem (menu, SWT.RADIO);
>+				item.setText(label);
>+				item.addSelectionListener(createSelectionListener(vdi));
>+			}
>+		}
>+		return menu;
>+	}
>+	
>+	private void disableMenu() {
>+		Composite c = (Composite) getTopLeft();
>+		Control[] children = c.getChildren();
>+		String label = null;
>+		for (int i = children.length - 1; i >= 0; i--) {
>+			if (children[i] instanceof ToolBar) {
>+				final ToolBar tb = (ToolBar) children[i];
>+				label = tb.getItem(0).getText();
>+				tb.setVisible(false);
>+			} else if (children[i] instanceof CLabel) {
>+				CLabel cl = (CLabel) children[i];
>+				if (cl != null && !cl.isDisposed()) {
>+					Assert.isNotNull(label);
>+					cl.setText(label);
>+				}
>+			}
>+		}
>+	}
>+	
>+	private void updateMenuSelection() {
>+		Composite c = (Composite) getTopLeft();
>+		Control[] children = c.getChildren();
>+		for (int i = 0; i < children.length; i++) {
>+			if (children[i] instanceof ToolBar) {
>+				final ToolBar tb = (ToolBar) children[i];
>+				// don't bother when not visible
>+				if (tb != null && !tb.isDisposed() && tb.isVisible()) {
>+					Menu m = (Menu) tb.getData();
>+					if (m != null) {
>+						MenuItem[] items = m.getItems();
>+						// each item represents a viewer descriptor
>+						if (items.length != fViewerDescriptor.length)
>+							return;
>+						boolean selected = false;
>+						for (int j = 0; j < items.length; j++) {
>+							items[j].setSelection(fViewerDescriptor[j].equals(CompareUIPlugin.getDefault().getViewerDescriptor(getInput())));
>+							selected = items[j].getSelection() ? true : selected;
>+						}
>+						// select default when none has been pre-selected
>+						if (!selected)
>+							items[0].setSelection(true);
>+					}
>+				}
>+			}
>+		}
>+	}
>+	
>+	private SelectionListener createSelectionListener(final ViewerDescriptor vd) {
>+		return new SelectionListener() {
>+			public void widgetSelected(SelectionEvent e) {
>+				MenuItem mi = (MenuItem) e.widget;
>+				if (mi.getSelection()) {
>+					Object input = getViewer().getInput();
>+					CompareUIPlugin.getDefault().addContentViewerBinding(input, vd);
>+					CompareContentViewerSwitchingPane.this.setInput(input, true /*force*/);
>+				}
>+			}
>+			public void widgetDefaultSelected(SelectionEvent e) {
>+				// nothing to do
>+			}};
>+	}
>+
>+}
>#P org.eclipse.team.ui
>Index: src/org/eclipse/team/internal/ui/mapping/AbstractCompareInput.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/AbstractCompareInput.java,v
>retrieving revision 1.1
>diff -u -r1.1 AbstractCompareInput.java
>--- src/org/eclipse/team/internal/ui/mapping/AbstractCompareInput.java	7 Dec 2006 21:16:19 -0000	1.1
>+++ src/org/eclipse/team/internal/ui/mapping/AbstractCompareInput.java	9 Feb 2009 14:45:25 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2006 IBM Corporation and others.
>+ * Copyright (c) 2006, 2009 IBM Corporation 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
>@@ -208,5 +208,39 @@
> 	 */
> 	public abstract boolean needsUpdate();
> 
>-
>+	public int hashCode() {
>+		final int prime = 31;
>+		int result = 1;
>+		result = prime * result
>+		+ ((getAncestor() == null) ? 0 : getAncestor().hashCode());
>+		result = prime * result + ((getLeft() == null) ? 0 : getLeft().hashCode());
>+		result = prime * result + ((getRight() == null) ? 0 : getRight().hashCode());
>+		return result;
>+	}
>+	
>+	public boolean equals(Object obj) {
>+		if (this == obj)
>+			return true;
>+		if (obj == null)
>+			return false;
>+		if (getClass() != obj.getClass())
>+			return false;
>+		ICompareInput other = (ICompareInput) obj;
>+		if (ancestor == null) {
>+			if (other.getAncestor() != null)
>+				return false;
>+		} else if (ancestor.equals(other.getAncestor()))
>+			return true;
>+		if (left == null) {
>+			if (other.getLeft() != null)
>+				return false;
>+		} else if (left.equals(other.getLeft()))
>+			return true;
>+		if (right == null) {
>+			if (other.getRight() != null)
>+				return false;
>+		} else if (right.equals(other.getRight()))
>+			return true;
>+		return false;
>+	}
> }

Actions: View | Diff

Attachments on bug 201116: 77774 | 77776 | 77777 | 125139 | 125140 | 126971 | 126973