### Eclipse Workspace Patch 1.0
#P org.eclipse.compare
Index: compare/org/eclipse/compare/internal/CompareAction.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareAction.java,v
retrieving revision 1.20
diff -u -r1.20 CompareAction.java
--- compare/org/eclipse/compare/internal/CompareAction.java	16 Mar 2007 19:53:09 -0000	1.20
+++ compare/org/eclipse/compare/internal/CompareAction.java	8 Jul 2008 12:07:55 -0000
@@ -19,6 +19,7 @@
 import org.eclipse.ui.IWorkbenchPart;
 import org.eclipse.compare.CompareConfiguration;
 import org.eclipse.compare.CompareUI;
+import org.eclipse.core.resources.IResource;
 
 
 /*
@@ -26,17 +27,31 @@
  */
 public class CompareAction extends BaseCompareAction implements IObjectActionDelegate {
 
-	private ResourceCompareInput fInput;
-	private IWorkbenchPage fWorkbenchPage;
-
+	private static ResourceCompareInput fInput;
+	private static IWorkbenchPage fWorkbenchPage;
 
 	public void run(ISelection selection) {
 		if (fInput != null) {
 			// Pass the shell so setSelection can prompt the user for which
 			// resource should be the ancestor
-			boolean ok = fInput.setSelection(selection,
-				fWorkbenchPage.getWorkbenchWindow().getShell());
-			if (!ok) return;
+			boolean ok = fInput.setSelection(selection, fWorkbenchPage
+					.getWorkbenchWindow().getShell());
+			if (!ok)
+				return;
+			fInput.initializeCompareConfiguration();
+			CompareUI.openCompareEditorOnPage(fInput, fWorkbenchPage);
+			fInput = null; // don't reuse this input!
+		}
+	}
+
+	public static void run(IResource[] resources) {
+		fWorkbenchPage = CompareUIPlugin.getActiveWorkbench()
+				.getActiveWorkbenchWindow().getActivePage();
+		if (fInput != null) {
+			boolean ok = fInput.setSelection(resources, fWorkbenchPage
+					.getWorkbenchWindow().getShell());
+			if (!ok)
+				return;
 			fInput.initializeCompareConfiguration();
 			CompareUI.openCompareEditorOnPage(fInput, fWorkbenchPage);
 			fInput= null;	// don't reuse this input!
@@ -58,6 +73,16 @@
 		return fInput.isEnabled(selection);
 	}
 
+	public static boolean isEnabled(IResource[] resources) {
+		if (fInput == null) {
+			CompareConfiguration cc = new CompareConfiguration();
+			cc.setProperty(CompareEditor.CONFIRM_SAVE_PROPERTY, new Boolean(
+					false));
+			fInput = new ResourceCompareInput(cc);
+		}
+		return fInput.isEnabled(resources);
+	}
+
 	public void setActivePart(IAction action, IWorkbenchPart targetPart) {
 		fWorkbenchPage= targetPart.getSite().getPage();
 	}
Index: compare/org/eclipse/compare/internal/Messages.java
===================================================================
RCS file: compare/org/eclipse/compare/internal/Messages.java
diff -N compare/org/eclipse/compare/internal/Messages.java
--- compare/org/eclipse/compare/internal/Messages.java	16 Mar 2007 19:53:09 -0000	1.3
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 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 com.ibm.icu.text.MessageFormat;
-
-/**
- * Helper class to format message strings.
- * 
- * @since 3.1
- */
-public class Messages {
-
-	public static String format(String message, Object object) {
-		return MessageFormat.format(message, new Object[] { object});
-	}
-
-	public static String format(String message, Object[] objects) {
-		return MessageFormat.format(message, objects);
-	}
-
-	private Messages() {
-		// Not for instantiation
-	}
-}
Index: compare/org/eclipse/compare/internal/ResourceCompareInput.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.compare/compare/org/eclipse/compare/internal/ResourceCompareInput.java,v
retrieving revision 1.38
diff -u -r1.38 ResourceCompareInput.java
--- compare/org/eclipse/compare/internal/ResourceCompareInput.java	16 Mar 2007 19:53:09 -0000	1.38
+++ compare/org/eclipse/compare/internal/ResourceCompareInput.java	8 Jul 2008 12:07:56 -0000
@@ -201,11 +201,14 @@
 	// to use as the ancestor.  Returns false if the user cancels the prompt,
 	// true otherwise.
 	boolean setSelection(ISelection s, Shell shell) {
-		
-		IResource[] selection= Utilities.getResources(s);
+		IResource[] selection = Utilities.getResources(s);
+		return setSelection(selection, shell);
+	}
+
+	boolean setSelection(IResource[] selection, Shell shell) {
+
+		fThreeWay = selection.length == 3;
 
-		fThreeWay= selection.length == 3;
-		
 		if (fThreeWay) {
 			SelectAncestorDialog dialog =
 				new SelectAncestorDialog(shell, selection);
@@ -233,21 +236,26 @@
 	 * Returns true if compare can be executed for the given selection.
 	 */
 	public boolean isEnabled(ISelection s) {
-		
-		IResource[] selection= Utilities.getResources(s);
-		if (selection.length < 2 || selection.length > 3)
+
+		IResource[] selection = Utilities.getResources(s);
+		return isEnabled(selection);
+	}
+
+	public boolean isEnabled(IResource[] resources) {
+		if (resources.length < 2 || resources.length > 3)
 			return false;
 
-		boolean threeWay= selection.length == 3;
+		boolean threeWay= resources.length == 3;
 		
-		if (threeWay)
+		if (threeWay) {
 			// It only makes sense if they're all mutually comparable.
 			// If not, the user should compare two of them.
-			return comparable(selection[0], selection[1])
-				&& comparable(selection[0], selection[2])
-				&& comparable(selection[1], selection[2]);
-		
-		return comparable(selection[0], selection[1]);
+			return comparable(resources[0], resources[1])
+					&& comparable(resources[0], resources[2])
+					&& comparable(resources[1], resources[2]);
+		}
+
+		return comparable(resources[0], resources[1]);
 	}
 	
 	/**
Index: plugin.properties
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.compare/plugin.properties,v
retrieving revision 1.91
diff -u -r1.91 plugin.properties
--- plugin.properties	22 Apr 2008 10:27:12 -0000	1.91
+++ plugin.properties	8 Jul 2008 12:07:55 -0000
@@ -83,6 +83,9 @@
 CompareWithEachOtherAction.label= &Each Other
 CompareWithEachOtherAction.tooltip= Compare the Selected Resources
 
+CompareWithOtherResource.label= &Other Resource
+CompareWithOtherResource.tooltip= Open the 'Compare With' Dialog
+
 CompareWithHistoryAction.label= &Local History...
 CompareWithHistoryAction.tooltip= Compare the Selected Resource with Local History
 
Index: plugin.xml
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.compare/plugin.xml,v
retrieving revision 1.65
diff -u -r1.65 plugin.xml
--- plugin.xml	11 Jul 2007 14:59:33 -0000	1.65
+++ plugin.xml	8 Jul 2008 12:07:55 -0000
@@ -201,6 +201,14 @@
                enablesFor="2+"
                id="compareWithEachOther">
          </action>
+         <action
+               class="org.eclipse.compare.CompareWithOtherResourceAction"
+               enablesFor="+"
+               id="compareWithOtherResource"
+               label="%CompareWithOtherResource.label"
+               menubarPath="compareWithMenu/compareWithGroup"
+               tooltip="%CompareWithOtherResourceAction.tooltip">
+         </action>
       </objectContribution>
       <objectContribution
             objectClass="org.eclipse.core.resources.IFile"
Index: compare/org/eclipse/compare/CompareWithOtherResourceAction.java
===================================================================
RCS file: compare/org/eclipse/compare/CompareWithOtherResourceAction.java
diff -N compare/org/eclipse/compare/CompareWithOtherResourceAction.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ compare/org/eclipse/compare/CompareWithOtherResourceAction.java	1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,50 @@
+/*******************************************************************************
+ * Copyright (c) 2008 Aleksandra Wozniak <aleksandra.k.wozniak@gmail.com
+ * 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:
+ *     Aleksandra Wozniak - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.compare;
+
+import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.IObjectActionDelegate;
+import org.eclipse.ui.IWorkbenchPart;
+import org.eclipse.ui.PlatformUI;
+
+public class CompareWithOtherResourceAction implements IObjectActionDelegate {
+
+	Shell shell;
+	CompareWithOtherResourceDialog dialog;
+	private ISelection fselection;
+	
+	public CompareWithOtherResourceAction() {
+		shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell();
+	}
+
+	public void setActivePart(IAction action, IWorkbenchPart targetPart) {
+		// TODO Auto-generated method stub
+
+	}
+
+	public void run(IAction action) {
+		try {
+			dialog = new CompareWithOtherResourceDialog(shell, fselection);
+			dialog.open();
+			//dialog.setSelection(fselection);
+		} catch (Exception e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+	}
+
+	public void selectionChanged(IAction action, ISelection selection) {
+		fselection = selection;
+	}
+
+}
Index: compare/org/eclipse/compare/CompareWithOtherResourceDialog.java
===================================================================
RCS file: compare/org/eclipse/compare/CompareWithOtherResourceDialog.java
diff -N compare/org/eclipse/compare/CompareWithOtherResourceDialog.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ compare/org/eclipse/compare/CompareWithOtherResourceDialog.java	1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,324 @@
+/*******************************************************************************
+ * Copyright (c) 2008 Aleksandra Wozniak <aleksandra.k.wozniak@gmail.com
+ * 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:
+ *     Aleksandra Wozniak - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.compare;
+
+import org.eclipse.compare.internal.CompareAction;
+import org.eclipse.compare.internal.Utilities;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.IWorkspaceRoot;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.jface.dialogs.Dialog;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.dnd.DND;
+import org.eclipse.swt.dnd.DragSource;
+import org.eclipse.swt.dnd.DragSourceEvent;
+import org.eclipse.swt.dnd.DragSourceListener;
+import org.eclipse.swt.dnd.DropTarget;
+import org.eclipse.swt.dnd.DropTargetEvent;
+import org.eclipse.swt.dnd.DropTargetListener;
+import org.eclipse.swt.dnd.TextTransfer;
+import org.eclipse.swt.dnd.Transfer;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.events.SelectionListener;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Group;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.swt.widgets.Text;
+import org.eclipse.ui.part.ResourceTransfer;
+
+public class CompareWithOtherResourceDialog extends Dialog {
+
+	private class InternalGroup {
+
+		Group group;
+		private Text fileText;
+		IResource resource;
+		IResource[] files;
+		String fileString = null;
+
+		public InternalGroup(Composite parent) {
+			createContents(parent);
+		}
+
+		public void createContents(Composite parent) {
+
+			GridLayout layout = new GridLayout();
+			layout.numColumns = 3;
+			group = new Group(parent, SWT.NONE);
+			group.setLayout(layout);
+			GridData gridData = new GridData();
+			gridData.grabExcessHorizontalSpace = true;
+			gridData.grabExcessVerticalSpace = true;
+			group.setLayoutData(gridData);
+
+			final Label fileLabel = new Label(group, SWT.NONE);
+			fileLabel
+					.setText(Messages.getString("CompareWithOther.label_file")); //$NON-NLS-1$
+
+			fileText = new Text(group, SWT.SINGLE | SWT.BORDER);
+			fileText.addModifyListener(new ModifyListener() {
+
+				public void modifyText(ModifyEvent e) {
+					if (files != null)
+						resource = files[0];
+					fileString = fileText.getText();
+					if (fileString == "") //$NON-NLS-1$
+						resource = null;
+				}
+
+			});
+			initDrag();
+			initDrop();
+			GridData textData = new GridData();
+			textData.grabExcessHorizontalSpace = true;
+			textData.horizontalAlignment = SWT.FILL;
+			fileText.setLayoutData(textData);
+		}
+
+		public void setText(String text) {
+			group.setText(text);
+		}
+
+		public void setLayoutData(GridData layoutData) {
+			group.setLayoutData(layoutData);
+		}
+
+		public IResource getResource() {
+			if (resource == null) {
+				if (fileString != null) { //$NON-NLS-1$
+					IWorkspaceRoot root = ResourcesPlugin.getWorkspace()
+							.getRoot();
+					resource = root.findMember(fileString);
+					return resource;
+				}
+			}
+			return resource;
+		}
+
+		private void initDrag() {
+			DragSource source = new DragSource(fileText, DND.DROP_MOVE
+					| DND.DROP_COPY);
+			Transfer[] types = new Transfer[] { TextTransfer.getInstance(),
+					ResourceTransfer.getInstance() };
+			source.setTransfer(types);
+			source.addDragListener(new DragSourceListener() {
+
+				public void dragFinished(DragSourceEvent event) {
+					fileText.setText("");
+				}
+
+				public void dragSetData(DragSourceEvent event) {
+					if (TextTransfer.getInstance().isSupportedType(
+							event.dataType))
+						event.data = fileText.getText();
+				}
+
+				public void dragStart(DragSourceEvent event) {
+					if (fileText.getText() == null)
+						event.doit = false;
+				}
+
+			});
+		}
+
+		private void initDrop() {
+			DropTarget target = new DropTarget(fileText, DND.DROP_MOVE
+					| DND.DROP_COPY | DND.DROP_DEFAULT);
+			final TextTransfer textTransfer = TextTransfer.getInstance();
+			final ResourceTransfer resourceTransfer = ResourceTransfer
+					.getInstance();
+			Transfer[] types = new Transfer[] { textTransfer, resourceTransfer };
+			target.setTransfer(types);
+			target.addDropListener(new DropTargetListener() {
+
+				// the cursor has entered the drop target
+				public void dragEnter(DropTargetEvent event) {
+					if (event.detail == DND.DROP_DEFAULT) {
+						if ((event.operations & DND.DROP_COPY) != 0)
+							event.detail = DND.DROP_COPY;
+						else
+							event.detail = DND.DROP_NONE;
+					}
+					for (int i = 0; i < event.dataTypes.length; i++) {
+						if (resourceTransfer
+								.isSupportedType(event.dataTypes[i])) {
+							event.currentDataType = event.dataTypes[i];
+							if (event.detail != DND.DROP_COPY)
+								event.detail = DND.DROP_NONE;
+						}
+						break;
+					}
+				}
+
+				// the cursor has left the drop target boundaries
+				// OR the drop operation has been cancelled (such
+				// as by hitting ECS) OR the drop is about to happen
+				// (user has released the mous ebutotn over this target)
+				public void dragLeave(DropTargetEvent event) {
+				}
+
+				// the operation being performed has changed usually due to
+				// the user changing the selected modifier keys while dragging
+				public void dragOperationChanged(DropTargetEvent event) {
+					if (event.detail == DND.DROP_DEFAULT) {
+						if ((event.operations & DND.DROP_COPY) != 0)
+							event.detail = DND.DROP_COPY;
+						else
+							event.detail = DND.DROP_NONE;
+					}
+					if (resourceTransfer.isSupportedType(event.currentDataType)) {
+						if (event.detail != DND.DROP_COPY)
+							event.detail = DND.DROP_NONE;
+					}
+				}
+
+				// the cursor is over the drop target
+				public void dragOver(DropTargetEvent event) {
+				}
+
+				// the data has been dropped
+				public void drop(DropTargetEvent event) {
+					if (textTransfer.isSupportedType(event.currentDataType)) {
+						String txt = (String) event.data;
+						fileText.setText(txt);
+					}
+					if (resourceTransfer.isSupportedType(event.currentDataType)) {
+						IResource[] files = (IResource[]) event.data;
+						resource = files[0];
+						fileText.setText(resource.getFullPath().toString());
+					}
+				}
+
+				public void dropAccept(DropTargetEvent event) {
+				}
+
+			});
+		}
+
+	}
+
+	Button okButton, cancelButton;
+	InternalGroup rightPanel, leftPanel, ancestorPanel;
+	ISelection fselection;
+
+	protected CompareWithOtherResourceDialog(Shell shell, ISelection selection) {
+		super(shell);
+		setShellStyle(SWT.MODELESS | SWT.TITLE);
+		fselection = selection;
+	}
+
+	protected Control createDialogArea(Composite parent) {
+
+		Composite mainPanel = new Composite(parent, SWT.NULL);
+		GridLayout layout = new GridLayout();
+		layout.numColumns = 2;
+		layout.makeColumnsEqualWidth = true;
+		mainPanel.setLayout(layout);
+		mainPanel.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
+
+		ancestorPanel = new InternalGroup(mainPanel);
+		ancestorPanel.setText(Messages
+				.getString("CompareWithOther.ancestor_group")); //$NON-NLS-1$
+		GridData ancestorGD = new GridData(SWT.FILL, SWT.FILL, true, true);
+		ancestorGD.horizontalSpan = 2;
+		ancestorPanel.setLayoutData(ancestorGD);
+
+		leftPanel = new InternalGroup(mainPanel);
+		leftPanel.setText(Messages
+				.getString("CompareWithOther.left_panel_group")); //$NON-NLS-1$
+		GridData leftGD = new GridData(SWT.FILL, SWT.FILL, true, true);
+		leftPanel.setLayoutData(leftGD);
+
+		rightPanel = new InternalGroup(mainPanel);
+		rightPanel.setText(Messages
+				.getString("CompareWithOther.right_panel_group")); //$NON-NLS-1$
+		GridData rightGD = new GridData(SWT.FILL, SWT.FILL, true, true);
+		rightPanel.setLayoutData(rightGD);
+		
+		setSelection(fselection);
+
+		return mainPanel;
+	}
+
+	@Override
+	protected void createButtonsForButtonBar(Composite parent) {
+		okButton = createButton(parent, OK, Messages
+				.getString("CompareWithOther.OK_button"), false); //$NON-NLS-1$
+		okButton.addSelectionListener(new SelectionListener() {
+
+			public void widgetDefaultSelected(SelectionEvent e) {
+			}
+
+			public void widgetSelected(SelectionEvent e) {
+
+				IResource[] resources;
+
+				IResource rightResource = rightPanel.getResource();
+				IResource leftResource = leftPanel.getResource();
+				IResource ancestorResource = ancestorPanel.getResource();
+				if (ancestorResource == null)
+					resources = new IResource[] { leftResource, rightResource };
+				else
+					resources = new IResource[] { ancestorResource,
+							leftResource, rightResource };
+
+				if (CompareAction.isEnabled(resources))
+					CompareAction.run(resources);
+			}
+
+		});
+
+		cancelButton = createButton(parent, CANCEL, Messages
+				.getString("CompareWithOther.Cancel_button"), true); //$NON-NLS-1$
+		cancelButton.addSelectionListener(new SelectionListener() {
+
+			public void widgetDefaultSelected(SelectionEvent e) {
+			}
+
+			public void widgetSelected(SelectionEvent e) {
+			}
+
+		});
+	}
+
+	public void setSelection(ISelection selection) {
+		IResource[] selectedResources = Utilities.getResources(selection);
+		switch (selectedResources.length) {
+		case 0:
+			break;
+		case 1:
+			setResource(leftPanel, selectedResources[0]);
+			break;
+		case 2:
+			setResource(leftPanel, selectedResources[0]);
+			setResource(rightPanel, selectedResources[1]);
+			break;
+		case 3:
+			setResource(ancestorPanel, selectedResources[0]);
+			setResource(leftPanel, selectedResources[1]);
+			setResource(rightPanel, selectedResources[2]);
+			break;
+		}
+	}
+
+	private void setResource(InternalGroup panel, IResource resource) {
+		panel.resource = resource;
+		panel.fileText.setText(resource.getFullPath().toString());
+	}
+}
Index: compare/org/eclipse/compare/Messages.java
===================================================================
RCS file: compare/org/eclipse/compare/Messages.java
diff -N compare/org/eclipse/compare/Messages.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ compare/org/eclipse/compare/Messages.java	1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,22 @@
+package org.eclipse.compare;
+
+import java.util.MissingResourceException;
+import java.util.ResourceBundle;
+
+public class Messages {
+	private static final String BUNDLE_NAME = "org.eclipse.compare.messages"; //$NON-NLS-1$
+
+	private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle
+			.getBundle(BUNDLE_NAME);
+
+	private Messages() {
+	}
+
+	public static String getString(String key) {
+		try {
+			return RESOURCE_BUNDLE.getString(key);
+		} catch (MissingResourceException e) {
+			return '!' + key + '!';
+		}
+	}
+}
Index: compare/org/eclipse/compare/messages.properties
===================================================================
RCS file: compare/org/eclipse/compare/messages.properties
diff -N compare/org/eclipse/compare/messages.properties
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ compare/org/eclipse/compare/messages.properties	1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,9 @@
+CompareWithOther.ancestor_group=Ancestor
+CompareWithOther.Cancel_button=Cancel
+CompareWithOther.label_file=File: 
+CompareWithOther.left_panel_group=Left panel
+CompareWithOther.OK_button=OK
+CompareWithOther.open_file_button=Open File...
+CompareWithOther.open_resource_button=Open Resource...
+CompareWithOther.open_type_button=Open Type...
+CompareWithOther.right_panel_group=Right panel