Attachment #126973 for bug #201116

Lines 1-5 Link Here

(-)compare/org/eclipse/compare/internal/CompareMessages.java (-1 / +3 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2000, 2008 IBM Corporation and others.	2	* Copyright (c) 2000, 2009 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 129-134 Link Here
129	public static String CompareWithOtherResourceDialog_externalFolderRadioButton;	129	public static String CompareWithOtherResourceDialog_externalFolderRadioButton;
130	public static String CompareWithOtherResourceDialog_workspaceMainButton;	130	public static String CompareWithOtherResourceDialog_workspaceMainButton;
131	public static String CompareWithOtherResourceDialog_workspaceRadioButton;	131	public static String CompareWithOtherResourceDialog_workspaceRadioButton;
		132	public static String CompareContentViewerSwitchingPane_defaultViewer;
		133	public static String CompareContentViewerSwitchingPane_switchButtonTooltip;
132		134
133	static {	135	static {
134	NLS.initializeMessages(BUNDLE_NAME, CompareMessages.class);	136	NLS.initializeMessages(BUNDLE_NAME, CompareMessages.class);




/*******************************************************************************
 * 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

 *******************************************************************************/
package org.eclipse.compare.internal;

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>.


	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;

	public String getExtension() {
		return fConfiguration.getAttribute(EXTENSIONS_ATTRIBUTE);
	}

	String getLabel() {
		return fConfiguration.getAttribute(LABEL_ATTRIBUTE);
	}
}

Lines 1-5 Link Here

(-)compare/org/eclipse/compare/internal/CompareMessages.properties (-1 / +4 lines)
1	###############################################################################	1	###############################################################################
2	# Copyright (c) 2000, 2008 IBM Corporation and others.	2	# Copyright (c) 2000, 2009 IBM Corporation and others.
3	# All rights reserved. This program and the accompanying materials	3	# All rights reserved. This program and the accompanying materials
4	# are made available under the terms of the Eclipse Public License v1.0	4	# are made available under the terms of the Eclipse Public License v1.0
5	# which accompanies this distribution, and is available at	5	# which accompanies this distribution, and is available at
Lines 141-143 Link Here
141	CompareWithOtherResourceDialog_externalFolderRadioButton=External folder	141	CompareWithOtherResourceDialog_externalFolderRadioButton=External folder
142	CompareWithOtherResourceDialog_workspaceMainButton=Browse...	142	CompareWithOtherResourceDialog_workspaceMainButton=Browse...
143	CompareWithOtherResourceDialog_workspaceRadioButton=Workspace	143	CompareWithOtherResourceDialog_workspaceRadioButton=Workspace
		144
		145	CompareContentViewerSwitchingPane_defaultViewer=Default
		146	CompareContentViewerSwitchingPane_switchButtonTooltip=Switch




/*******************************************************************************
 * 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

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;

    
    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;	// 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;
		}
	    	
		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 */

	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 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 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 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_VIEWER_EXTENSION_POINT= "contentViewers"; //$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$


	private Map fStructureViewerAliases;
	private CompareFilter fFilter;
	private IPropertyChangeListener fPropertyChangeListener;

	/**
	 * Creates the <code>CompareUIPlugin</code> object and registers all
	 * structure creators, content merge viewers, and structure merge viewers

		return null;
	}
	
	public Set/*<ViewerDescriptor>*/ findContentViewerDescriptor(Viewer oldViewer, Object in, CompareConfiguration cc) {
		Set result = new LinkedHashSet();
	 * If the old viewer is suitable for showing the input the old viewer
	 * is returned. Otherwise the input's type is used to find a viewer descriptor in the registry
	 * which in turn is used to create a content compare viewer under the given parent composite.
	 * If no viewer descriptor can be found <code>null</code> is returned.
	 *
	 * @param oldViewer a new viewer is only created if this old viewer cannot show the given input
	 * @param in the input object for which to find a content viewer
	 * @param parent the SWT parent composite under which the new viewer is created
	 * @param cc a configuration which is passed to a newly created viewer
	 * @return the compare viewer which is suitable for the given input object or <code>null</code>
	 */
	public Viewer findContentViewer(Viewer oldViewer, Object in, Composite parent, CompareConfiguration cc) {
		
		if (in instanceof IStreamContentAccessor) {
			String type= ITypedElement.TEXT_TYPE;
			

			    IContentType ct= getContentType(tin);
				if (ct != null) {
					initializeRegistries();
					List list = fContentViewers.searchAll(ct);
					if (list != null)
						result.addAll(list);
				}
			    
				String ty= tin.getType();

			}
			
			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;

		ICompareInput input= (ICompareInput) in;
		
		IContentType ctype= getCommonType(input);
		if (isCompareAsText(input, cc)) {

		}
		if (ctype != null) {
			initializeRegistries();
			List list = fContentMergeViewers.searchAll(ctype);
			if (list != null)
				result.addAll(list);
		}
		
		String[] types= getTypes(input);

		
		if (type != null) {
			initializeRegistries();
			List list = fContentMergeViewers.searchAll(type);
			if (list != null)
				result.addAll(list);
		}

		// fallback

				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
	 * is returned. Otherwise the input's type is used to find a viewer descriptor in the registry
	 * which in turn is used to create a content compare viewer under the given parent composite.
	 * If no viewer descriptor can be found <code>null</code> is returned.
	 *
	 * @param oldViewer a new viewer is only created if this old viewer cannot show the given input
	 * @param in the input object for which to find a content viewer
	 * @param parent the SWT parent composite under which the new viewer is created
	 * @param cc a configuration which is passed to a newly created viewer
	 * @return the compare viewer which is suitable for the given input object or <code>null</code>
	 */
	public Viewer findContentViewer(Viewer oldViewer, Object in, Composite parent, CompareConfiguration cc) {
		return getViewer(findContentViewerDescriptor(oldViewer, in, cc).toArray()[0], oldViewer, parent, cc);
	}
	
	private boolean isCompareAsText(ICompareInput input, CompareConfiguration cc) {
		Set set = (Set)cc.getProperty(ICompareAsText.PROP_TEXT_INPUTS);
		if (set == null)




					return true;
		return false;
	}
	
	/**
	 * @param input the input
	 * @return true, if the input is considered as changed
	 * @noreference This method is not intended to be referenced by clients.
	 * @nooverride This method is not intended to be re-implemented or extended
	 *             by clients.
	 */
	protected boolean inputChanged(Object input) {
		return getInput() != input;
	}
		
	/**
	 * Sets the input object of this pane. 

	 */ 
	public void setInput(Object input) {

		if (!inputChanged(input))
			return;

		boolean hadFocus = hasFocus2();
		
		super.setInput(input);





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;

import org.eclipse.compare.internal.ICompareUIConstants;
import org.eclipse.compare.internal.OutlineViewerCreator;
import org.eclipse.compare.internal.Utilities;
import org.eclipse.compare.internal.ViewerDescriptor;
import org.eclipse.compare.structuremergeviewer.DiffTreeViewer;
import org.eclipse.compare.structuremergeviewer.ICompareInput;
import org.eclipse.compare.structuremergeviewer.ICompareInputChangeListener;

public abstract class CompareEditorInput implements IEditorInput, IPropertyChangeNotifier, IRunnableWithProgress, ICompareContainer {

	private static final boolean DEBUG= false;
	
	/**
	 * The name of the "dirty" property (value <code>"DIRTY_STATE"</code>).
	 */

	private String fHelpContextId;
	private InternalOutlineViewerCreator fOutlineView;
	private ICompareAsText fCompareAsText;
	private ViewerDescriptor vd;
	
	private class InternalOutlineViewerCreator extends OutlineViewerCreator {
		private OutlineViewerCreator getWrappedCreator() {

				
		Control outline= createOutlineContents(fComposite, SWT.HORIZONTAL);
					
		fContentInputPane= new CompareContentViewerSwitchingPane(fComposite, SWT.BORDER | SWT.FLAT, this);

				if (input instanceof ICompareInput)
					return findContentViewer(oldViewer, (ICompareInput)input, this);
				return null;
			}
		};
		if (fFocusPane == null)
			fFocusPane= fContentInputPane;
		if (outline != null)

	 */
	public Viewer findContentViewer(Viewer oldViewer, ICompareInput input, Composite parent) {

		Viewer newViewer = vd != null ? vd.createViewer(oldViewer, parent,
				fCompareConfiguration) : CompareUI.findContentViewer(oldViewer,
				input, parent, fCompareConfiguration);
			
		boolean isNewViewer= newViewer != oldViewer;
		if (DEBUG) System.out.println("CompareEditorInput.findContentViewer: " + isNewViewer); //$NON-NLS-1$
		

	}
	
	/**
	 * @param vd
	 *            the viewer descriptor
	 * @noreference This method is not intended to be referenced by clients.
	 * @nooverride This method is not intended to be re-implemented or extended
	 *             by clients.
	 */
	public void setViewerDescriptor(ViewerDescriptor vd) {
		this.vd = vd;
	}

	/**
	 * @return the viewer descriptor set for the input
	 * @noreference This method is not intended to be referenced by clients.
	 * @nooverride This method is not intended to be re-implemented or extended
	 *             by clients.
	 */
	public ViewerDescriptor getViewerDescriptor() {
		return this.vd;
	}
	
	/**
	 * Returns <code>true</code> if there are unsaved changes.
	 * The value returned is the value of the <code>DIRTY_STATE</code> property of this input object.
	 

Lines 1-5 Link Here

(-)compare/org/eclipse/compare/CompareViewerPane.java (-13 / +44 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2000, 2007 IBM Corporation and others.	2	* Copyright (c) 2000, 2009 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 10-26 Link Here
10	*******************************************************************************/	10	*******************************************************************************/
11	package org.eclipse.compare;	11	package org.eclipse.compare;
12		12
13	import org.eclipse.core.runtime.*;	13	import org.eclipse.core.runtime.IAdaptable;
		14	import org.eclipse.core.runtime.ListenerList;
		15	import org.eclipse.core.runtime.Platform;
14	import org.eclipse.jface.action.ToolBarManager;	16	import org.eclipse.jface.action.ToolBarManager;
15	import org.eclipse.jface.viewers.*;	17	import org.eclipse.jface.viewers.DoubleClickEvent;
		18	import org.eclipse.jface.viewers.IDoubleClickListener;
		19	import org.eclipse.jface.viewers.IOpenListener;
		20	import org.eclipse.jface.viewers.ISelection;
		21	import org.eclipse.jface.viewers.ISelectionChangedListener;
		22	import org.eclipse.jface.viewers.ISelectionProvider;
		23	import org.eclipse.jface.viewers.OpenEvent;
		24	import org.eclipse.jface.viewers.SelectionChangedEvent;
16	import org.eclipse.swt.SWT;	25	import org.eclipse.swt.SWT;
17	import org.eclipse.swt.accessibility.*;	26	import org.eclipse.swt.accessibility.ACC;
		27	import org.eclipse.swt.accessibility.AccessibleAdapter;
		28	import org.eclipse.swt.accessibility.AccessibleEvent;
18	import org.eclipse.swt.custom.CLabel;	29	import org.eclipse.swt.custom.CLabel;
19	import org.eclipse.swt.custom.ViewForm;	30	import org.eclipse.swt.custom.ViewForm;
20	import org.eclipse.swt.events.*;	31	import org.eclipse.swt.events.DisposeEvent;
		32	import org.eclipse.swt.events.DisposeListener;
		33	import org.eclipse.swt.events.MouseAdapter;
		34	import org.eclipse.swt.events.MouseEvent;
21	import org.eclipse.swt.graphics.Image;	35	import org.eclipse.swt.graphics.Image;
22	import org.eclipse.swt.graphics.Point;	36	import org.eclipse.swt.graphics.Point;
23	import org.eclipse.swt.widgets.*;	37	import org.eclipse.swt.widgets.Composite;
		38	import org.eclipse.swt.widgets.Control;
		39	import org.eclipse.swt.widgets.ToolBar;
		40	import org.eclipse.swt.widgets.ToolItem;
24		41
25	/**	42	/**
26	* A <code>CompareViewerPane</code> is a convenience class which installs a	43	* A <code>CompareViewerPane</code> is a convenience class which installs a
Lines 63-74 Link Here
63	marginWidth= 0;	80	marginWidth= 0;
64	marginHeight= 0;	81	marginHeight= 0;
65		82
66	CLabel label= new CLabel(this, SWT.NONE) {	83	Control topLeft = createTopLeft(this);
67	public Point computeSize(int wHint, int hHint, boolean changed) {	84	setTopLeft(topLeft);
68	return super.computeSize(wHint, Math.max(24, hHint), changed);
69	}
70	};
71	setTopLeft(label);
72		85
73	MouseAdapter ml= new MouseAdapter() {	86	MouseAdapter ml= new MouseAdapter() {
74	public void mouseDoubleClick(MouseEvent e) {	87	public void mouseDoubleClick(MouseEvent e) {
Lines 82-88 Link Here
82	};	95	};
83		96
84	addMouseListener(ml);	97	addMouseListener(ml);
85	label.addMouseListener(ml);	98	getTopLeft().addMouseListener(ml);
86		99
87	addDisposeListener(new DisposeListener() {	100	addDisposeListener(new DisposeListener() {
88	public void widgetDisposed(DisposeEvent e) {	101	public void widgetDisposed(DisposeEvent e) {
Lines 98-103 Link Here
98	}	111	}
99		112
100	/**	113	/**
		114	* @param parent
		115	* a widget which will be the parent of the control (cannot be
		116	* null)
		117	* @return the control to be placed in the top left corner of the pane
		118	* @noreference This method is not intended to be referenced by clients.
		119	* @nooverride This method is not intended to be re-implemented or extended
		120	* by clients.
		121	*/
		122	protected Control createTopLeft(Composite parent) {
		123	CLabel label = new CLabel(this, SWT.NONE) {
		124	public Point computeSize(int wHint, int hHint, boolean changed) {
		125	return super.computeSize(wHint, Math.max(24, hHint), changed);
		126	}
		127	};
		128	return label;
		129	}
		130
		131	/**
101	* Set the pane's title text.	132	* Set the pane's title text.
102	* The value <code>null</code> clears it.	133	* The value <code>null</code> clears it.
103	*	134	*




<!-- Schema file written by PDE -->
<schema targetNamespace="org.eclipse.compare" xmlns="http://www.w3.org/2001/XMLSchema">
<annotation>
      <appInfo>
         <meta.schema plugin="org.eclipse.compare" id="contentMergeViewers" name="ContentMerge Viewers"/>
      </appInfo>
      <documentation>
         This extension point allows a plug-in to register compare/merge 
viewers for specific content types. The viewer is expected to 


   <element name="extension">
      <annotation>
         <appInfo>
            <meta.element />
         </appInfo>
      </annotation>
      <complexType>
         <sequence>

               <documentation>
                  an optional name of the extension instance
               </documentation>
               <appInfo>
                  <meta.attribute translatable="true"/>
               </appInfo>
            </annotation>
         </attribute>
      </complexType>

                  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>
                  <meta.attribute kind="java" basedOn=":org.eclipse.compare.IViewerCreator"/>
               </appInfo>
            </annotation>
         </attribute>
         <attribute name="extensions" type="string">

               </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>


               <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>
                  <meta.attribute kind="identifier" basedOn="org.eclipse.core.contenttype.contentTypes/content-type/@id"/>
               </appInfo>
            </annotation>
         </attribute>
         <attribute name="contentMergeViewerId" type="string" use="required">

               <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>
                  <meta.attribute kind="identifier" basedOn="org.eclipse.compare.contentMergeViewers/viewer/@id"/>
               </appInfo>
            </annotation>
         </attribute>
      </complexType>
   </element>

   <annotation>
      <appInfo>
         <meta.section type="examples"/>
      </appInfo>
      <documentation>
         The following is an example of a compare/merge viewer 
for text files (extension &quot;txt&quot;):

   </annotation>

   <annotation>
      <appInfo>
         <meta.section type="apiInfo"/>
      </appInfo>
      <documentation>
         The contributed class must implement &lt;code&gt;org.eclipse.compare.IViewerCreator&lt;/code&gt;
      </documentation>



   <annotation>
      <appInfo>
         <meta.section type="implementation"/>
      </appInfo>
      <documentation>
         The Compare UI plugin defines content viewers for text, binary contents, and images.
      </documentation>
   </annotation>

   <annotation>
      <appInfo>
         <meta.section type="copyright"/>
      </appInfo>
      <documentation>
         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>

Lines 307-325 Link Here

(-)plugin.xml (-6 / +9 lines)
307	<extension	307	<extension
308	point="org.eclipse.compare.contentMergeViewers">	308	point="org.eclipse.compare.contentMergeViewers">
309	<viewer	309	<viewer
310	extensions="class,exe,dll,binary,zip,jar"
311	class="org.eclipse.compare.internal.BinaryCompareViewerCreator"	310	class="org.eclipse.compare.internal.BinaryCompareViewerCreator"
312	id="org.eclipse.compare.BinaryCompareViewerCreator">	311	extensions="class,exe,dll,binary,zip,jar"
		312	id="org.eclipse.compare.BinaryCompareViewerCreator"
		313	label="%BinaryCompare.label">
313	</viewer>	314	</viewer>
314	<viewer	315	<viewer
315	extensions="txt"
316	class="org.eclipse.compare.internal.TextMergeViewerCreator"	316	class="org.eclipse.compare.internal.TextMergeViewerCreator"
317	id="org.eclipse.compare.TextMergeViewerCreator">	317	extensions="txt"
		318	id="org.eclipse.compare.TextMergeViewerCreator"
		319	label="%TextCompare.label">
318	</viewer>	320	</viewer>
319	<viewer	321	<viewer
320	extensions="gif,jpg,jpeg,png,bmp,ico,tif,tiff"
321	class="org.eclipse.compare.internal.ImageMergeViewerCreator"	322	class="org.eclipse.compare.internal.ImageMergeViewerCreator"
322	id="org.eclipse.compare.ImageMergeViewerCreator">	323	extensions="gif,jpg,jpeg,png,bmp,ico,tif,tiff"
		324	id="org.eclipse.compare.ImageMergeViewerCreator"
		325	label="%ImageCompare.label">
323	</viewer>	326	</viewer>
324	<contentTypeBinding	327	<contentTypeBinding
325	contentTypeId="org.eclipse.core.runtime.text"	328	contentTypeId="org.eclipse.core.runtime.text"

Lines 1-5 Link Here

(-)plugin.properties (-1 / +5 lines)
1	###############################################################################	1	###############################################################################
2	# Copyright (c) 2000, 2008 IBM Corporation and others.	2	# Copyright (c) 2000, 2009 IBM Corporation and others.
3	# All rights reserved. This program and the accompanying materials	3	# All rights reserved. This program and the accompanying materials
4	# are made available under the terms of the Eclipse Public License v1.0	4	# are made available under the terms of the Eclipse Public License v1.0
5	# which accompanies this distribution, and is available at	5	# which accompanies this distribution, and is available at
Lines 224-226 Link Here
224		224
225	context.description = Comparing in an Editor	225	context.description = Comparing in an Editor
226	context.name = Comparing in an Editor	226	context.name = Comparing in an Editor
		227
		228	BinaryCompare.label=Binary Compare
		229	TextCompare.label=Text Compare
		230	ImageCompare.label=Image Compare




/*******************************************************************************
 * 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.jface.viewers.Viewer;
import org.eclipse.swt.SWT;
import org.eclipse.swt.custom.CLabel;
import org.eclipse.swt.events.MouseListener;
import org.eclipse.swt.events.SelectionAdapter;
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.Menu;
import org.eclipse.swt.widgets.MenuItem;
import org.eclipse.swt.widgets.ToolBar;
import org.eclipse.swt.widgets.ToolItem;
import org.eclipse.ui.PlatformUI;

public class CompareContentViewerSwitchingPane extends
		CompareViewerSwitchingPane {

	private CompareEditorInput fCompareEditorInput;

	private ViewerDescriptor fSelectedViewerDescriptor;

	private ToolBar toolBar;

	private Menu menu;

	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 (fSelectedViewerDescriptor != null) {
			Set viewers = CompareUIPlugin.getDefault().findContentViewerDescriptor(
					oldViewer, input, getCompareConfiguration());
			if (viewers.contains(fSelectedViewerDescriptor)) {
				// use selected viewer only when appropriate for the new input
				fCompareEditorInput
						.setViewerDescriptor(fSelectedViewerDescriptor);
				Viewer viewer = fCompareEditorInput.findContentViewer(
						oldViewer, (ICompareInput) input, this);
				return viewer;
			}
		}
		if (input instanceof ICompareInput) {
			fCompareEditorInput.setViewerDescriptor(null);
			Viewer viewer = fCompareEditorInput.findContentViewer(oldViewer,
					(ICompareInput) input, this);
			fCompareEditorInput.setViewerDescriptor(fSelectedViewerDescriptor);
			return viewer;
		}
		return null;
	}

	protected Control createTopLeft(Composite p) {
		final 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;
		composite.setLayout(layout);

		CLabel cl = new CLabel(composite, SWT.NONE);
		cl.setText(null);

		toolBar = new ToolBar(composite, SWT.FLAT);
		toolBar.setVisible(false); // hide by default
		final ToolItem toolItem = new ToolItem(toolBar, SWT.PUSH, 0);
		toolItem.setImage(PlatformUI.getWorkbench().getSharedImages().getImage(
				/* IWorkbenchGraphicConstants */"IMG_LCL_VIEW_MENU")); //$NON-NLS-1$
		toolItem
				.setToolTipText(CompareMessages.CompareContentViewerSwitchingPane_switchButtonTooltip);
		toolItem.addSelectionListener(new SelectionAdapter() {
			public void widgetSelected(SelectionEvent e) {
				Rectangle bounds = toolItem.getBounds();
				Point topLeft = new Point(bounds.x, bounds.y + bounds.height);
				topLeft = toolBar.toDisplay(topLeft);
				menu.setLocation(topLeft.x, topLeft.y);
				menu.setVisible(true);
			}
		});
		return composite;
	}
	
	protected boolean inputChanged(Object input) {
		return getInput() != input
				|| fCompareEditorInput.getViewerDescriptor() != fSelectedViewerDescriptor;
	}

	public void setInput(Object input) {
		super.setInput(input);
		Set/* <ViewerDescriptor> */data = CompareUIPlugin.getDefault()
				.findContentViewerDescriptor(getViewer(), input,
						getCompareConfiguration());
		updateMenu(data);
	}

	private void updateMenu(Set data) {
		if (data != null && data.size() > 1) {
			ViewerDescriptor[] fViewerDescriptors = (ViewerDescriptor[]) data
					.toArray(new ViewerDescriptor[0]);

			// dispose the old menu, if exists
			if (menu != null)
				menu.dispose();

			menu = new Menu(getShell(), SWT.POP_UP);

			// add default
			String label = fViewerDescriptors[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(fViewerDescriptors[0]));
			menu.setDefaultItem(defaultItem);
			defaultItem.setSelection(fViewerDescriptors[0] == fSelectedViewerDescriptor);

			// add others
			for (int j = 1; j < fViewerDescriptors.length; j++) {
				final ViewerDescriptor vdi = fViewerDescriptors[j];
				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));
					item
							.setSelection(fViewerDescriptors[j] == fSelectedViewerDescriptor);
				}
			}
			toolBar.setVisible(true);
		} else {
			toolBar.setVisible(false);
		}
	}

	private SelectionListener createSelectionListener(final ViewerDescriptor vd) {
		return new SelectionListener() {
			public void widgetSelected(SelectionEvent e) {
				MenuItem mi = (MenuItem) e.widget;
				if (mi.getSelection()) {
					Viewer oldViewer = getViewer();
					fSelectedViewerDescriptor = vd;
					CompareContentViewerSwitchingPane.this.setInput(oldViewer
							.getInput());
				}
			}

			public void widgetDefaultSelected(SelectionEvent e) {
				// nothing to do
			}
		};
	}

	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 CLabel) {
				CLabel cl = (CLabel) children[i];
				if (cl != null && !cl.isDisposed()) {
					cl.setText(label);
					c.layout();
				}
				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;
			}
		}
	}
	
	public void addMouseListener(MouseListener listener) {
		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];
				cl.addMouseListener(listener);
			}
		}
	}
}

Return to bug 201116

Lines 216-221 Link Here

(-)compare/org/eclipse/compare/CompareViewerSwitchingPane.java (-3 / +14 lines)
216	return true;	216	return true;
217	return false;	217	return false;
218	}	218	}
		219
		220	/**
		221	* @param input the input
		222	* @return true, if the input is considered as changed
		223	* @noreference This method is not intended to be referenced by clients.
		224	* @nooverride This method is not intended to be re-implemented or extended
		225	* by clients.
		226	*/
		227	protected boolean inputChanged(Object input) {
		228	return getInput() != input;
		229	}
219		230
220	/**	231	/**
221	* Sets the input object of this pane.	232	* Sets the input object of this pane.
Lines 233-242 Link Here
233	*/	244	*/
234	public void setInput(Object input) {	245	public void setInput(Object input) {
235		246
236	if (getInput() == input)	247	if (!inputChanged(input))
237	return;	248	return;
238		249
239	boolean hadFocus= hasFocus2();	250	boolean hadFocus = hasFocus2();
240		251
241	super.setInput(input);	252	super.setInput(input);
242		253

Lines 19-24 Link Here

(-)compare/org/eclipse/compare/CompareEditorInput.java (-10 / +31 lines)
19	import org.eclipse.compare.contentmergeviewer.IFlushable;	19	import org.eclipse.compare.contentmergeviewer.IFlushable;
20	import org.eclipse.compare.internal.BinaryCompareViewer;	20	import org.eclipse.compare.internal.BinaryCompareViewer;
21	import org.eclipse.compare.internal.ChangePropertyAction;	21	import org.eclipse.compare.internal.ChangePropertyAction;
		22	import org.eclipse.compare.internal.CompareContentViewerSwitchingPane;
22	import org.eclipse.compare.internal.CompareEditorInputNavigator;	23	import org.eclipse.compare.internal.CompareEditorInputNavigator;
23	import org.eclipse.compare.internal.CompareMessages;	24	import org.eclipse.compare.internal.CompareMessages;
24	import org.eclipse.compare.internal.ComparePreferencePage;	25	import org.eclipse.compare.internal.ComparePreferencePage;
Lines 27-32 Link Here
27	import org.eclipse.compare.internal.ICompareUIConstants;	28	import org.eclipse.compare.internal.ICompareUIConstants;
28	import org.eclipse.compare.internal.OutlineViewerCreator;	29	import org.eclipse.compare.internal.OutlineViewerCreator;
29	import org.eclipse.compare.internal.Utilities;	30	import org.eclipse.compare.internal.Utilities;
		31	import org.eclipse.compare.internal.ViewerDescriptor;
30	import org.eclipse.compare.structuremergeviewer.DiffTreeViewer;	32	import org.eclipse.compare.structuremergeviewer.DiffTreeViewer;
31	import org.eclipse.compare.structuremergeviewer.ICompareInput;	33	import org.eclipse.compare.structuremergeviewer.ICompareInput;
32	import org.eclipse.compare.structuremergeviewer.ICompareInputChangeListener;	34	import org.eclipse.compare.structuremergeviewer.ICompareInputChangeListener;
Lines 144-150 Link Here
144	public abstract class CompareEditorInput implements IEditorInput, IPropertyChangeNotifier, IRunnableWithProgress, ICompareContainer {	146	public abstract class CompareEditorInput implements IEditorInput, IPropertyChangeNotifier, IRunnableWithProgress, ICompareContainer {
145		147
146	private static final boolean DEBUG= false;	148	private static final boolean DEBUG= false;
147		149
148	/**	150	/**
149	* The name of the "dirty" property (value <code>"DIRTY_STATE"</code>).	151	* The name of the "dirty" property (value <code>"DIRTY_STATE"</code>).
150	*/	152	*/
Lines 203-208 Link Here
203	private String fHelpContextId;	205	private String fHelpContextId;
204	private InternalOutlineViewerCreator fOutlineView;	206	private InternalOutlineViewerCreator fOutlineView;
205	private ICompareAsText fCompareAsText;	207	private ICompareAsText fCompareAsText;
		208	private ViewerDescriptor vd;
206		209
207	private class InternalOutlineViewerCreator extends OutlineViewerCreator {	210	private class InternalOutlineViewerCreator extends OutlineViewerCreator {
208	private OutlineViewerCreator getWrappedCreator() {	211	private OutlineViewerCreator getWrappedCreator() {
Lines 552-564 Link Here
552		555
553	Control outline= createOutlineContents(fComposite, SWT.HORIZONTAL);	556	Control outline= createOutlineContents(fComposite, SWT.HORIZONTAL);
554		557
555	fContentInputPane= new CompareViewerSwitchingPane(fComposite, SWT.BORDER \| SWT.FLAT) {	558	fContentInputPane= new CompareContentViewerSwitchingPane(fComposite, SWT.BORDER \| SWT.FLAT, this);
556	protected Viewer getViewer(Viewer oldViewer, Object input) {	559
557	if (input instanceof ICompareInput)
558	return findContentViewer(oldViewer, (ICompareInput)input, this);
559	return null;
560	}
561	};
562	if (fFocusPane == null)	560	if (fFocusPane == null)
563	fFocusPane= fContentInputPane;	561	fFocusPane= fContentInputPane;
564	if (outline != null)	562	if (outline != null)
Lines 926-933 Link Here
926	*/	924	*/
927	public Viewer findContentViewer(Viewer oldViewer, ICompareInput input, Composite parent) {	925	public Viewer findContentViewer(Viewer oldViewer, ICompareInput input, Composite parent) {
928		926
929	Viewer newViewer= CompareUI.findContentViewer(oldViewer, input, parent, fCompareConfiguration);	927	Viewer newViewer = vd != null ? vd.createViewer(oldViewer, parent,
930		928	fCompareConfiguration) : CompareUI.findContentViewer(oldViewer,
		929	input, parent, fCompareConfiguration);
		930
931	boolean isNewViewer= newViewer != oldViewer;	931	boolean isNewViewer= newViewer != oldViewer;
932	if (DEBUG) System.out.println("CompareEditorInput.findContentViewer: " + isNewViewer); //$NON-NLS-1$	932	if (DEBUG) System.out.println("CompareEditorInput.findContentViewer: " + isNewViewer); //$NON-NLS-1$
933		933
Lines 949-954 Link Here
949	}	949	}
950		950
951	/**	951	/**
		952	* @param vd
		953	* the viewer descriptor
		954	* @noreference This method is not intended to be referenced by clients.
		955	* @nooverride This method is not intended to be re-implemented or extended
		956	* by clients.
		957	*/
		958	public void setViewerDescriptor(ViewerDescriptor vd) {
		959	this.vd = vd;
		960	}
		961
		962	/**
		963	* @return the viewer descriptor set for the input
		964	* @noreference This method is not intended to be referenced by clients.
		965	* @nooverride This method is not intended to be re-implemented or extended
		966	* by clients.
		967	*/
		968	public ViewerDescriptor getViewerDescriptor() {
		969	return this.vd;
		970	}
		971
		972	/**
952	* Returns <code>true</code> if there are unsaved changes.	973	* Returns <code>true</code> if there are unsaved changes.
953	* The value returned is the value of the <code>DIRTY_STATE</code> property of this input object.	974	* The value returned is the value of the <code>DIRTY_STATE</code> property of this input object.
954		975

Lines 2-10 Link Here

(-)schema/contentMergeViewers.exsd (-21 / +31 lines)
2	<!-- Schema file written by PDE -->	2	<!-- Schema file written by PDE -->
3	<schema targetNamespace="org.eclipse.compare" xmlns="http://www.w3.org/2001/XMLSchema">	3	<schema targetNamespace="org.eclipse.compare" xmlns="http://www.w3.org/2001/XMLSchema">
4	<annotation>	4	<annotation>
5	<appinfo>	5	<appInfo>
6	<meta.schema plugin="org.eclipse.compare" id="contentMergeViewers" name="ContentMerge Viewers"/>	6	<meta.schema plugin="org.eclipse.compare" id="contentMergeViewers" name="ContentMerge Viewers"/>
7	</appinfo>	7	</appInfo>
8	<documentation>	8	<documentation>
9	This extension point allows a plug-in to register compare/merge	9	This extension point allows a plug-in to register compare/merge
10	viewers for specific content types. The viewer is expected to	10	viewers for specific content types. The viewer is expected to
Lines 17-25 Link Here
17		17
18	<element name="extension">	18	<element name="extension">
19	<annotation>	19	<annotation>
20	<appinfo>	20	<appInfo>
21	<meta.element />	21	<meta.element />
22	</appinfo>	22	</appInfo>
23	</annotation>	23	</annotation>
24	<complexType>	24	<complexType>
25	<sequence>	25	<sequence>
Lines 45-53 Link Here
45	<documentation>	45	<documentation>
46	an optional name of the extension instance	46	an optional name of the extension instance
47	</documentation>	47	</documentation>
48	<appinfo>	48	<appInfo>
49	<meta.attribute translatable="true"/>	49	<meta.attribute translatable="true"/>
50	</appinfo>	50	</appInfo>
51	</annotation>	51	</annotation>
52	</attribute>	52	</attribute>
53	</complexType>	53	</complexType>
Lines 68-76 Link Here
68	a fully qualified name of a class that implements a factory for the	68	a fully qualified name of a class that implements a factory for the
69	content merge viewer and implements <samp>org.eclipse.compare.IViewerCreator</samp>	69	content merge viewer and implements <samp>org.eclipse.compare.IViewerCreator</samp>
70	</documentation>	70	</documentation>
71	<appinfo>	71	<appInfo>
72	<meta.attribute kind="java" basedOn=":org.eclipse.compare.IViewerCreator"/>	72	<meta.attribute kind="java" basedOn=":org.eclipse.compare.IViewerCreator"/>
73	</appinfo>	73	</appInfo>
74	</annotation>	74	</annotation>
75	</attribute>	75	</attribute>
76	<attribute name="extensions" type="string">	76	<attribute name="extensions" type="string">
Lines 80-85 Link Here
80	</documentation>	80	</documentation>
81	</annotation>	81	</annotation>
82	</attribute>	82	</attribute>
		83	<attribute name="label" type="string">
		84	<annotation>
		85	<documentation>
		86	a translatable label that will be used in the UI for this viewer
		87	</documentation>
		88	<appInfo>
		89	<meta.attribute translatable="true"/>
		90	</appInfo>
		91	</annotation>
		92	</attribute>
83	</complexType>	93	</complexType>
84	</element>	94	</element>
85		95
Lines 95-103 Link Here
95	<documentation>	105	<documentation>
96	The id of a content type defined using the <code>org.eclipse.core.contenttype.contentTypes</code> extension point.	106	The id of a content type defined using the <code>org.eclipse.core.contenttype.contentTypes</code> extension point.
97	</documentation>	107	</documentation>
98	<appinfo>	108	<appInfo>
99	<meta.attribute kind="identifier" basedOn="org.eclipse.core.contenttype.contentTypes/content-type/@id"/>	109	<meta.attribute kind="identifier" basedOn="org.eclipse.core.contenttype.contentTypes/content-type/@id"/>
100	</appinfo>	110	</appInfo>
101	</annotation>	111	</annotation>
102	</attribute>	112	</attribute>
103	<attribute name="contentMergeViewerId" type="string" use="required">	113	<attribute name="contentMergeViewerId" type="string" use="required">
Lines 105-122 Link Here
105	<documentation>	115	<documentation>
106	The id of a merge viewer defined using the <code>viewer</code> element of this extension point (i.e. <code>org.eclipse.compare.contentMergeViewers</code>)	116	The id of a merge viewer defined using the <code>viewer</code> element of this extension point (i.e. <code>org.eclipse.compare.contentMergeViewers</code>)
107	</documentation>	117	</documentation>
108	<appinfo>	118	<appInfo>
109	<meta.attribute kind="identifier" basedOn="org.eclipse.compare.contentMergeViewers/viewer/@id"/>	119	<meta.attribute kind="identifier" basedOn="org.eclipse.compare.contentMergeViewers/viewer/@id"/>
110	</appinfo>	120	</appInfo>
111	</annotation>	121	</annotation>
112	</attribute>	122	</attribute>
113	</complexType>	123	</complexType>
114	</element>	124	</element>
115		125
116	<annotation>	126	<annotation>
117	<appinfo>	127	<appInfo>
118	<meta.section type="examples"/>	128	<meta.section type="examples"/>
119	</appinfo>	129	</appInfo>
120	<documentation>	130	<documentation>
121	The following is an example of a compare/merge viewer	131	The following is an example of a compare/merge viewer
122	for text files (extension "txt"):	132	for text files (extension "txt"):
Lines 135-143 Link Here
135	</annotation>	145	</annotation>
136		146
137	<annotation>	147	<annotation>
138	<appinfo>	148	<appInfo>
139	<meta.section type="apiInfo"/>	149	<meta.section type="apiInfo"/>
140	</appinfo>	150	</appInfo>
141	<documentation>	151	<documentation>
142	The contributed class must implement <code>org.eclipse.compare.IViewerCreator</code>	152	The contributed class must implement <code>org.eclipse.compare.IViewerCreator</code>
143	</documentation>	153	</documentation>
Lines 145-164 Link Here
145		155
146		156
147	<annotation>	157	<annotation>
148	<appinfo>	158	<appInfo>
149	<meta.section type="implementation"/>	159	<meta.section type="implementation"/>
150	</appinfo>	160	</appInfo>
151	<documentation>	161	<documentation>
152	The Compare UI plugin defines content viewers for text, binary contents, and images.	162	The Compare UI plugin defines content viewers for text, binary contents, and images.
153	</documentation>	163	</documentation>
154	</annotation>	164	</annotation>
155		165
156	<annotation>	166	<annotation>
157	<appinfo>	167	<appInfo>
158	<meta.section type="copyright"/>	168	<meta.section type="copyright"/>
159	</appinfo>	169	</appInfo>
160	<documentation>	170	<documentation>
161	Copyright (c) 2000, 2008 IBM Corporation and others.<br>	171	Copyright (c) 2000, 2009 IBM Corporation and others.<br>
162	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 <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>	172	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 <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
163	</documentation>	173	</documentation>
164	</annotation>	174	</annotation>

Added Link Here

(-)compare/org/eclipse/compare/internal/CompareContentViewerSwitchingPane.java (+226 lines)
1	/*******************************************************************************
2	* Copyright (c) 2009 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at
6	* http://www.eclipse.org/legal/epl-v10.html
7	*
8	* Contributors:
9	* IBM Corporation - initial API and implementation
10	*******************************************************************************/
11	package org.eclipse.compare.internal;
12
13	import java.util.Set;
14
15	import org.eclipse.compare.CompareConfiguration;
16	import org.eclipse.compare.CompareEditorInput;
17	import org.eclipse.compare.CompareViewerSwitchingPane;
18	import org.eclipse.compare.Splitter;
19	import org.eclipse.compare.structuremergeviewer.ICompareInput;
20	import org.eclipse.jface.viewers.Viewer;
21	import org.eclipse.swt.SWT;
22	import org.eclipse.swt.custom.CLabel;
23	import org.eclipse.swt.events.MouseListener;
24	import org.eclipse.swt.events.SelectionAdapter;
25	import org.eclipse.swt.events.SelectionEvent;
26	import org.eclipse.swt.events.SelectionListener;
27	import org.eclipse.swt.graphics.Image;
28	import org.eclipse.swt.graphics.Point;
29	import org.eclipse.swt.graphics.Rectangle;
30	import org.eclipse.swt.layout.RowLayout;
31	import org.eclipse.swt.widgets.Composite;
32	import org.eclipse.swt.widgets.Control;
33	import org.eclipse.swt.widgets.Menu;
34	import org.eclipse.swt.widgets.MenuItem;
35	import org.eclipse.swt.widgets.ToolBar;
36	import org.eclipse.swt.widgets.ToolItem;
37	import org.eclipse.ui.PlatformUI;
38
39	public class CompareContentViewerSwitchingPane extends
40	CompareViewerSwitchingPane {
41
42	private CompareEditorInput fCompareEditorInput;
43
44	private ViewerDescriptor fSelectedViewerDescriptor;
45
46	private ToolBar toolBar;
47
48	private Menu menu;
49
50	public CompareContentViewerSwitchingPane(Splitter parent, int style,
51	CompareEditorInput cei) {
52	super(parent, style);
53	fCompareEditorInput = cei;
54	}
55
56	private CompareConfiguration getCompareConfiguration() {
57	return fCompareEditorInput.getCompareConfiguration();
58	}
59
60	protected Viewer getViewer(Viewer oldViewer, Object input) {
61	if (fSelectedViewerDescriptor != null) {
62	Set viewers = CompareUIPlugin.getDefault().findContentViewerDescriptor(
63	oldViewer, input, getCompareConfiguration());
64	if (viewers.contains(fSelectedViewerDescriptor)) {
65	// use selected viewer only when appropriate for the new input
66	fCompareEditorInput
67	.setViewerDescriptor(fSelectedViewerDescriptor);
68	Viewer viewer = fCompareEditorInput.findContentViewer(
69	oldViewer, (ICompareInput) input, this);
70	return viewer;
71	}
72	}
73	if (input instanceof ICompareInput) {
74	fCompareEditorInput.setViewerDescriptor(null);
75	Viewer viewer = fCompareEditorInput.findContentViewer(oldViewer,
76	(ICompareInput) input, this);
77	fCompareEditorInput.setViewerDescriptor(fSelectedViewerDescriptor);
78	return viewer;
79	}
80	return null;
81	}
82
83	protected Control createTopLeft(Composite p) {
84	final Composite composite = new Composite(p, SWT.NONE) {
85	public Point computeSize(int wHint, int hHint, boolean changed) {
86	return super.computeSize(wHint, Math.max(24, hHint), changed);
87	}
88	};
89
90	RowLayout layout = new RowLayout();
91	layout.marginTop = 0;
92	composite.setLayout(layout);
93
94	CLabel cl = new CLabel(composite, SWT.NONE);
95	cl.setText(null);
96
97	toolBar = new ToolBar(composite, SWT.FLAT);
98	toolBar.setVisible(false); // hide by default
99	final ToolItem toolItem = new ToolItem(toolBar, SWT.PUSH, 0);
100	toolItem.setImage(PlatformUI.getWorkbench().getSharedImages().getImage(
101	/* IWorkbenchGraphicConstants */"IMG_LCL_VIEW_MENU")); //$NON-NLS-1$
102	toolItem
103	.setToolTipText(CompareMessages.CompareContentViewerSwitchingPane_switchButtonTooltip);
104	toolItem.addSelectionListener(new SelectionAdapter() {
105	public void widgetSelected(SelectionEvent e) {
106	Rectangle bounds = toolItem.getBounds();
107	Point topLeft = new Point(bounds.x, bounds.y + bounds.height);
108	topLeft = toolBar.toDisplay(topLeft);
109	menu.setLocation(topLeft.x, topLeft.y);
110	menu.setVisible(true);
111	}
112	});
113	return composite;
114	}
115
116	protected boolean inputChanged(Object input) {
117	return getInput() != input
118	\|\| fCompareEditorInput.getViewerDescriptor() != fSelectedViewerDescriptor;
119	}
120
121	public void setInput(Object input) {
122	super.setInput(input);
123	Set/* <ViewerDescriptor> */data = CompareUIPlugin.getDefault()
124	.findContentViewerDescriptor(getViewer(), input,
125	getCompareConfiguration());
126	updateMenu(data);
127	}
128
129	private void updateMenu(Set data) {
130	if (data != null && data.size() > 1) {
131	ViewerDescriptor[] fViewerDescriptors = (ViewerDescriptor[]) data
132	.toArray(new ViewerDescriptor[0]);
133
134	// dispose the old menu, if exists
135	if (menu != null)
136	menu.dispose();
137
138	menu = new Menu(getShell(), SWT.POP_UP);
139
140	// add default
141	String label = fViewerDescriptors[0].getLabel();
142	if (label == null \|\| label.equals("")) { //$NON-NLS-1$
143	label = CompareMessages.CompareContentViewerSwitchingPane_defaultViewer;
144	}
145	MenuItem defaultItem = new MenuItem(menu, SWT.RADIO);
146	defaultItem.setText(label);
147	defaultItem
148	.addSelectionListener(createSelectionListener(fViewerDescriptors[0]));
149	menu.setDefaultItem(defaultItem);
150	defaultItem.setSelection(fViewerDescriptors[0] == fSelectedViewerDescriptor);
151
152	// add others
153	for (int j = 1; j < fViewerDescriptors.length; j++) {
154	final ViewerDescriptor vdi = fViewerDescriptors[j];
155	label = vdi.getLabel();
156	if (label != null && !label.equals("")) { //$NON-NLS-1$
157	MenuItem item = new MenuItem(menu, SWT.RADIO);
158	item.setText(label);
159	item.addSelectionListener(createSelectionListener(vdi));
160	item
161	.setSelection(fViewerDescriptors[j] == fSelectedViewerDescriptor);
162	}
163	}
164	toolBar.setVisible(true);
165	} else {
166	toolBar.setVisible(false);
167	}
168	}
169
170	private SelectionListener createSelectionListener(final ViewerDescriptor vd) {
171	return new SelectionListener() {
172	public void widgetSelected(SelectionEvent e) {
173	MenuItem mi = (MenuItem) e.widget;
174	if (mi.getSelection()) {
175	Viewer oldViewer = getViewer();
176	fSelectedViewerDescriptor = vd;
177	CompareContentViewerSwitchingPane.this.setInput(oldViewer
178	.getInput());
179	}
180	}
181
182	public void widgetDefaultSelected(SelectionEvent e) {
183	// nothing to do
184	}
185	};
186	}
187
188	public void setText(String label) {
189	Composite c = (Composite) getTopLeft();
190	Control[] children = c.getChildren();
191	for (int i = 0; i < children.length; i++) {
192	if (children[i] instanceof CLabel) {
193	CLabel cl = (CLabel) children[i];
194	if (cl != null && !cl.isDisposed()) {
195	cl.setText(label);
196	c.layout();
197	}
198	return;
199	}
200	}
201	}
202
203	public void setImage(Image image) {
204	Composite c = (Composite) getTopLeft();
205	Control[] children = c.getChildren();
206	for (int i = 0; i < children.length; i++) {
207	if (children[i] instanceof CLabel) {
208	CLabel cl = (CLabel) children[i];
209	if (cl != null && !cl.isDisposed())
210	cl.setImage(image);
211	return;
212	}
213	}
214	}
215
216	public void addMouseListener(MouseListener listener) {
217	Composite c = (Composite) getTopLeft();
218	Control[] children = c.getChildren();
219	for (int i = 0; i < children.length; i++) {
220	if (children[i] instanceof CLabel) {
221	CLabel cl = (CLabel) children[i];
222	cl.addMouseListener(listener);
223	}
224	}
225	}
226	}