Bug 157027 Use file buffers in Java element Compare

1 files changed, 14 insertions, 1 deletions

diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/CompareEditorInput.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/CompareEditorInput.java
index 1f7cfe2ed..36e93c36d 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/CompareEditorInput.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/CompareEditorInput.java
@@ -161,6 +161,8 @@ public abstract class CompareEditorInput implements IEditorInput, IPropertyChang
 	private ICompareContainer fContainer;
 	private boolean fContainerProvided;
 
+	private String fHelpContextId;
+
 	/**
 	 * Creates a <code>CompareEditorInput</code> which is initialized with the given
 	 * compare configuration.
@@ -445,6 +447,8 @@ public abstract class CompareEditorInput implements IEditorInput, IPropertyChang
 				handleDispose();
 			}
 		});
+		if (fHelpContextId != null)
+			PlatformUI.getWorkbench().getHelpSystem().setHelp(fComposite, fHelpContextId);
 		contentsCreated();
 		return fComposite;
 	}
@@ -1036,7 +1040,7 @@ public abstract class CompareEditorInput implements IEditorInput, IPropertyChang
 		if (isEditable())
 			return CompareMessages.CompareDialog_commit_button;
 		if (isEditionSelectionDialog())
-			return "&Select";
+			return CompareMessages.CompareEditorInput_0;
 		return IDialogConstants.OK_LABEL;
 	}
 
@@ -1107,5 +1111,14 @@ public abstract class CompareEditorInput implements IEditorInput, IPropertyChang
 		}
 		return null;
 	}
+	
+	/**
+	 * Set the help context id for this input.
+	 * @param helpContextId the help context id.
+	 * @since 3.3
+	 */
+	public void setHelpContextId(String helpContextId) {
+		this.fHelpContextId = helpContextId;	
+	}
 }