fix for bug 125236

7 files changed, 78 insertions, 66 deletions

diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/IDebugHelpContextIds.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/IDebugHelpContextIds.java
index ee557aa9c..826975550 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/IDebugHelpContextIds.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/IDebugHelpContextIds.java
@@ -36,12 +36,9 @@ public interface IDebugHelpContextIds {
 	public static final String VARIABLES_CONTENT_PROVIDERS_ACTION = PREFIX + "variables_content_providers_action_context"; //$NON-NLS-1$
 	public static final String VARIABLES_SELECT_LOGICAL_STRUCTURE = PREFIX + "variables_select_logical_structure"; //$NON-NLS-1$
 	public static final String SELECT_WORKING_SET_ACTION = PREFIX + "select_working_set_context"; //$NON-NLS-1$			
-
 	public static final String CLEAR_WORKING_SET_ACTION = PREFIX + "clear_working_set_context"; //$NON-NLS-1$
 	public static final String EDIT_LAUNCH_CONFIGURATION_ACTION = PREFIX + "edit_launch_configuration_action_context"; //$NON-NLS-1$
 	public static final String OPEN_LAUNCH_CONFIGURATION_ACTION = PREFIX + "open_launch_configuration_action_context"; //$NON-NLS-1$
-	public static final String ADD_WATCH_EXPRESSION_DIALOG= PREFIX + "add_watch_expression_dialog_context"; //$NON-NLS-1$
-	public static final String EDIT_WATCH_EXPRESSION_DIALOG= PREFIX + "edit_watch_expression_dialog_context"; //$NON-NLS-1$
 	public static final String LINK_BREAKPOINTS_WITH_DEBUG_ACTION= PREFIX + "link_breakpoints_with_debug_context"; //$NON-NLS-1$
 	public static final String EDIT_SOURCELOOKUP_ACTION = PREFIX + "edit_source_lookup_path_context";//$NON-NLS-1$
 	public static final String LOOKUP_SOURCE_ACTION = PREFIX + "lookup_source_context";//$NON-NLS-1$
@@ -85,6 +82,11 @@ public interface IDebugHelpContextIds {
 	public static final String ADD_FOLDER_CONTAINER_DIALOG = PREFIX + "folder_source_container_dialog";//$NON-NLS-1$
 	public static final String ADD_ARCHIVE_CONTAINER_DIALOG = PREFIX + "archive_source_container_dialog";//$NON-NLS-1$
 	public static final String MULTIPLE_SOURCE_DIALOG = PREFIX + "multiple_source_selection_dialog";//$NON-NLS-1$
+	public static final String FIND_EXPRESSION_DIALOG = PREFIX + "find_expressions_dialog_context"; //$NON-NLS-1$
+	public static final String FIND_VARIABLES_DIALOG = PREFIX + "find_variables_dialog_context"; //$NON-NLS-1$
+	public static final String ADD_WATCH_EXPRESSION_DIALOG= PREFIX + "add_watch_expression_dialog_context"; //$NON-NLS-1$
+	public static final String EDIT_WATCH_EXPRESSION_DIALOG = PREFIX + "edit_watch_expression_dialog_context"; //$NON-NLS-1$
+	public static final String FIND_ELEMENT_DIALOG = PREFIX + "find_element_dialog_context"; //$NON-NLS-1$
 	
 	// Property pages
 	public static final String PROCESS_PROPERTY_PAGE = PREFIX + "process_property_page_context"; //$NON-NLS-1$
@@ -98,7 +100,9 @@ public interface IDebugHelpContextIds {
 	// Working set page
 	public static final String WORKING_SET_PAGE = PREFIX + "working_set_page_context"; //$NON-NLS-1$			
 	
-	
+	//Wizards
+	public static final String IMPORT_BREAKPOINTS_WIZARD_PAGE = PREFIX + "import_breakpoints_wizard_page_context"; //$NON-NLS-1$
+	public static final String EXPORT_BREAKPOINTS_WIZARD_PAGE = PREFIX + "export_breakpoints_wizard_page_context"; //$NON-NLS-1$
 	
 	//Editor	
 	public static final String NO_SOURCE_EDITOR = PREFIX + "debugger_editor_no_source_common";//$NON-NLS-1$
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/expressions/WatchExpressionDialog.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/expressions/WatchExpressionDialog.java
index 5f0c6244c..7c699b34e 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/expressions/WatchExpressionDialog.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/expressions/WatchExpressionDialog.java
@@ -43,7 +43,7 @@ public class WatchExpressionDialog extends StatusDialog {
 	 * The detail formatter to edit.
 	 */
 	private IWatchExpression fWatchExpression;
-
+	
 	// widgets
 	private SourceViewer fSnippetViewer;
 	private Button fCheckBox;
@@ -86,12 +86,8 @@ public class WatchExpressionDialog extends StatusDialog {
 		
 		fSnippetViewer= new SourceViewer(container, null, SWT.BORDER | SWT.V_SCROLL | SWT.H_SCROLL);
 		fSnippetViewer.setInput(this);
-
 		
 		IDocument document= new Document();
-		//IDocumentPartitioner partitioner= new RuleBasedPartitioner(...);
-		//document.setDocumentPartitioner(partitioner);
-		//partitioner.connect(document);
 		fSnippetViewer.configure(new SourceViewerConfiguration());
 		fSnippetViewer.setEditable(true);
 		fSnippetViewer.setDocument(document);
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/importexport/breakpoints/WizardExportBreakpointsPage.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/importexport/breakpoints/WizardExportBreakpointsPage.java
index 67b2cb918..595509644 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/importexport/breakpoints/WizardExportBreakpointsPage.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/importexport/breakpoints/WizardExportBreakpointsPage.java
@@ -20,6 +20,7 @@ import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.Path;
 import org.eclipse.debug.core.DebugPlugin;
 import org.eclipse.debug.core.model.IBreakpoint;
+import org.eclipse.debug.internal.ui.IDebugHelpContextIds;
 import org.eclipse.debug.internal.ui.IInternalDebugUIConstants;
 import org.eclipse.debug.internal.ui.SWTUtil;
 import org.eclipse.debug.internal.ui.views.breakpoints.BreakpointsViewer;
@@ -46,6 +47,7 @@ import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Listener;
 import org.eclipse.swt.widgets.Text;
 import org.eclipse.swt.widgets.Widget;
+import org.eclipse.ui.PlatformUI;
 
 /**
  * <p>
@@ -92,7 +94,7 @@ public class WizardExportBreakpointsPage extends WizardPage implements Listener
 	public WizardExportBreakpointsPage(String pageName, IStructuredSelection selection) {
 		super(pageName, ImportExportMessages.WizardExportBreakpoints_0, null);
 		fSelection = selection;
-	}// end constructor
+	}
 	
 	/* (non-Javadoc)
 	 * @see org.eclipse.swt.widgets.Listener#handleEvent(org.eclipse.swt.widgets.Event)
@@ -101,17 +103,17 @@ public class WizardExportBreakpointsPage extends WizardPage implements Listener
 		Widget source = event.widget;
 		if (source == fDestinationBrowseButton) {
 			handleDestinationBrowseButtonPressed();
-		}// end if
+		}
 		else if (source == fDestinationNameField) {
 			handlePathTextModifiedEvent();
-		}// end if
+		}
 		else if(source == fSelectAll) {
 			handleSelectAllPressed();
-		}//end if
+		}
 		else if(source == fDeselectAll) {
 			handleDeselectAllPressed();
-		}//end if
-	}// end handleEvent
+		}
+	}
 	
 	/**
 	 * Handles the select all button pressed
@@ -124,7 +126,7 @@ public class WizardExportBreakpointsPage extends WizardPage implements Listener
 		viewer.setGrayedElements(new Object[] {});
 		viewer.getTree().deselectAll();
 		setPageComplete(detectPageComplete());
-	}//end handleSelectAllPressed
+	}
 	
 	/**
 	 * Handles the deselect all button pressed
@@ -135,14 +137,14 @@ public class WizardExportBreakpointsPage extends WizardPage implements Listener
 		viewer.setCheckedElements(new Object[] {});
 		viewer.setGrayedElements(new Object[] {});
 		setPageComplete(detectPageComplete());
-	}//end handleDeselectAllPressed
+	}
 	
 	/**
 	 * This method handles the modified event fomr the path combobox.
 	 */
 	protected void handlePathTextModifiedEvent() {
 		setPageComplete(detectPageComplete());
-	}// end handlePathComboModifiedEvent
+	}
 
 	/**
 	 * Open the SaveAsDialog so the user can save the listing of selected breakpoints
@@ -158,14 +160,14 @@ public class WizardExportBreakpointsPage extends WizardPage implements Listener
 				setErrorMessage(null);
 				if(fPath.getFileExtension() == null) {
 					fPath = fPath.addFileExtension(IImportExportConstants.EXTENSION);  
-				}//end if
+				}
 				else if(!fPath.getFileExtension().equals(IImportExportConstants.EXTENSION)) { 
 					fPath = fPath.addFileExtension(IImportExportConstants.EXTENSION); 
-				}//end elseif
+				}
 				fDestinationNameField.setText(fPath.toString());
-			}// end if
-		}//end if
-	}// end handleDestinationBrowseButtonPressed
+			}
+		}
+	}
 	
 	/* (non-Javadoc)
 	 * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite)
@@ -190,7 +192,8 @@ public class WizardExportBreakpointsPage extends WizardPage implements Listener
 		setControl(composite); 
 		setPageComplete(detectPageComplete());
 		restoreWidgetState();
-	}// end createControl
+		PlatformUI.getWorkbench().getHelpSystem().setHelp(getControl(), IDebugHelpContextIds.EXPORT_BREAKPOINTS_WIZARD_PAGE);
+	}
 	
 	/* (non-Javadoc)
 	 * @see org.eclipse.jface.dialogs.IDialogPage#getImage()
@@ -239,7 +242,7 @@ public class WizardExportBreakpointsPage extends WizardPage implements Listener
 		}
 		setMessage(ImportExportMessages.WizardBreakpointsPage_4);
 		return true;
-	}//end detectPageComplete
+	}
 
 	/**
 	 * Create the Options specification widgets.
@@ -258,7 +261,7 @@ public class WizardExportBreakpointsPage extends WizardPage implements Listener
 		fOverwriteExistingFilesCheckbox = new Button(OptionsGroup, SWT.CHECK | SWT.LEFT);
 		fOverwriteExistingFilesCheckbox.setText(ImportExportMessages.WizardBreakpointsPage_6);
 		fOverwriteExistingFilesCheckbox.setFont(font);
-	}// end createOptionsGroup
+	}
 
 	/**
 	 * Create the export destination specification widgets
@@ -287,7 +290,7 @@ public class WizardExportBreakpointsPage extends WizardPage implements Listener
 		fDestinationBrowseButton.addListener(SWT.Selection, this);
 		fDestinationBrowseButton.setFont(font);
 		setButtonLayoutData(fDestinationBrowseButton);
-	}// end createDestinationGroup
+	}
 
 	/**
 	 * Save the state of the widgets select, for successive invocations of the wizard
@@ -297,8 +300,8 @@ public class WizardExportBreakpointsPage extends WizardPage implements Listener
 		if(settings != null) {
 			settings.put(OVERWRITE_ALL_STATE, fOverwriteExistingFilesCheckbox.getSelection());
 			settings.put(DESTINATION_FILE_NAME, fDestinationNameField.getText().trim());
-		}//end if
-	}//end save state
+		}
+	}
 	
 	/**
 	 * Restores the state of the wizard from previous invocations
@@ -311,8 +314,8 @@ public class WizardExportBreakpointsPage extends WizardPage implements Listener
 			if (filename != null) {
 				fDestinationNameField.setText(filename);
 			}
-		}//end if
-	}//end restore state
+		}
+	}
 	
 	/**
 	 * The Finish button is clicked on the main wizard
@@ -328,11 +331,11 @@ public class WizardExportBreakpointsPage extends WizardPage implements Listener
 				fPath = new Path(fDestinationNameField.getText().trim());
 				if(fPath.getFileExtension() == null) {
 					fPath = fPath.addFileExtension(IImportExportConstants.EXTENSION);  
-				}//end if
+				}
 				else if(!fPath.getFileExtension().equals(IImportExportConstants.EXTENSION)) { 
 					fPath = fPath.addFileExtension(IImportExportConstants.EXTENSION); 
-				}//end elseif
-			}//end if
+				}
+			}
 			saveWidgetState();
 			if(fPath.toFile().exists() && !fOverwriteExistingFilesCheckbox.getSelection()) {
 				if (!MessageDialog.openQuestion(null, ImportExportMessages.WizardBreakpointsPage_12, MessageFormat.format(ImportExportMessages.ImportExportOperations_0, new String[] {fPath.toPortableString()}))) {
@@ -349,15 +352,15 @@ public class WizardExportBreakpointsPage extends WizardPage implements Listener
 				}
 			}
 			getContainer().run(true, true, new ExportBreakpointsOperation((IBreakpoint[]) breakpoints.toArray(new IBreakpoint[breakpoints.size()]), fPath.toOSString()));
-		}// end try
+		}
 		catch (InterruptedException e) {
 			DebugPlugin.log(e);
 			return false;
-		}// end catch
+		}
 		catch (InvocationTargetException e) {
 			DebugPlugin.log(e);
 			return false;
-		}//end catch
+		}
 		return true;
-	}// end finish
-}// end class
+	}
+}
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/importexport/breakpoints/WizardImportBreakpointsPage.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/importexport/breakpoints/WizardImportBreakpointsPage.java
index 70639160c..db822963b 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/importexport/breakpoints/WizardImportBreakpointsPage.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/importexport/breakpoints/WizardImportBreakpointsPage.java
@@ -16,6 +16,7 @@ import java.lang.reflect.InvocationTargetException;
 import java.text.MessageFormat;
 
 import org.eclipse.debug.core.DebugPlugin;
+import org.eclipse.debug.internal.ui.IDebugHelpContextIds;
 import org.eclipse.debug.internal.ui.IInternalDebugUIConstants;
 import org.eclipse.debug.internal.ui.SWTUtil;
 import org.eclipse.debug.ui.DebugUITools;
@@ -36,6 +37,7 @@ import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Listener;
 import org.eclipse.swt.widgets.Text;
 import org.eclipse.swt.widgets.Widget;
+import org.eclipse.ui.PlatformUI;
 
 /**
  * The import breakpoints wizard page.
@@ -65,7 +67,7 @@ public class WizardImportBreakpointsPage extends WizardPage implements Listener
 	 */
 	public WizardImportBreakpointsPage(String pageName) {
 		super(pageName, ImportExportMessages.WizardImportBreakpointsPage_0, null);
-	}// end constructor
+	}
 
 	/* (non-Javadoc)
 	 * @see org.eclipse.swt.widgets.Listener#handleEvent(org.eclipse.swt.widgets.Event)
@@ -76,7 +78,7 @@ public class WizardImportBreakpointsPage extends WizardPage implements Listener
 			handleBrowseForFileButtonPressed();
 		}
 		setPageComplete(detectPageComplete());
-	}// end handleEvent
+	}
 
 	/**
 	 * This method handles the fBrowseForFileButton being pressed.
@@ -87,8 +89,8 @@ public class WizardImportBreakpointsPage extends WizardPage implements Listener
 		String file = dialog.open();
 		if(file != null) {
 			fFileNameField.setText(file);
-		}// end if
-	}//end handleBrowseForFileButtonPressed
+		}
+	}
 	
 	/* (non-Javadoc)
 	 * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite)
@@ -104,7 +106,8 @@ public class WizardImportBreakpointsPage extends WizardPage implements Listener
 		setControl(composite);
 		restoreWidgetState();
 		setPageComplete(detectPageComplete());
-	}// end createControl
+		PlatformUI.getWorkbench().getHelpSystem().setHelp(getControl(), IDebugHelpContextIds.IMPORT_BREAKPOINTS_WIZARD_PAGE);
+	}
 
 	/* (non-Javadoc)
 	 * @see org.eclipse.jface.dialogs.IDialogPage#getImage()
@@ -129,11 +132,11 @@ public class WizardImportBreakpointsPage extends WizardPage implements Listener
 		if (!file.exists() || file.isDirectory()) {
 			setMessage(MessageFormat.format(ImportExportMessages.WizardImportBreakpointsPage_1, new String[]{fileName}), ERROR);
 			return false;
-		}//end if
+		}
 		
 		setMessage(ImportExportMessages.WizardImportBreakpointsPage_2); 
 		return true;
-	}//end detectPageComplete
+	}
 
 	/**
 	 * Create the options specification widgets.
@@ -155,7 +158,7 @@ public class WizardImportBreakpointsPage extends WizardPage implements Listener
 		fAutoCreateWorkingSets = new Button(optionsGroup, SWT.CHECK | SWT.LEFT);
 		fAutoCreateWorkingSets.setText(ImportExportMessages.WizardImportBreakpointsPage_5);
 		fAutoCreateWorkingSets.setFont(font);
-	}// end createOptionsGroup
+	}
 	
 	/**
 	 * Create the export destination specification widgets
@@ -184,7 +187,7 @@ public class WizardImportBreakpointsPage extends WizardPage implements Listener
 		// destination browse button
 		fBrowseForFileButton = SWTUtil.createPushButton(destinationSelectionGroup, ImportExportMessages.WizardBreakpointsPage_8, null);
 		fBrowseForFileButton.addListener(SWT.Selection, this);
-	}// end createDestinationGroup
+	}
 	
 	/**
 	 * Save the state of the widgets select, for successive invocations of the wizard
@@ -195,8 +198,8 @@ public class WizardImportBreakpointsPage extends WizardPage implements Listener
 			settings.put(REMOVE_DUPS, fAutoRemoveDuplicates.getSelection());
 			settings.put(CREATE_WORKING_SETS, fAutoCreateWorkingSets.getSelection());
 			settings.put(SOURCE_FILE_NAME, fFileNameField.getText().trim());
-		}//end if
-	}//end save state
+		}
+	}
 	
 	/**
 	 * Restores the state of the wizard from previous invocations
@@ -210,8 +213,8 @@ public class WizardImportBreakpointsPage extends WizardPage implements Listener
 			if (fileName != null) {
 				fFileNameField.setText(fileName);
 			}
-		}//end if
-	}//end restore state
+		}
+	}
 	
 	/**
 	 * <p>
@@ -225,16 +228,16 @@ public class WizardImportBreakpointsPage extends WizardPage implements Listener
 		try {
 			saveWidgetState();
 			getContainer().run(true, true, new ImportBreakpointsOperation(fFileNameField.getText().trim(), fAutoRemoveDuplicates.getSelection(), fAutoCreateWorkingSets.getSelection()));
-		}// end try
+		}
 		catch (InterruptedException e) {
 			DebugPlugin.log(e);
 			return false;
-		}// end catch
+		}
 		catch (InvocationTargetException e) {
 			DebugPlugin.log(e);
 			return false;
-		}//end catch
+		}
 		return true;
-	}// end finish
+	}
 	
-}//end class
+}
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationsDialog.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationsDialog.java
index d2a2cb1e6..b4953a9a1 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationsDialog.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationsDialog.java
@@ -377,12 +377,6 @@ public class LaunchConfigurationsDialog extends TitleAreaDialog implements ILaun
 		setEditArea(editAreaComp);
 		gd = new GridData(GridData.FILL_BOTH);
 		editAreaComp.setLayoutData(gd);
-			
-		/*// Build the separator line that demarcates the button bar
-		Label separator = new Label(topComp, SWT.HORIZONTAL | SWT.SEPARATOR);
-		gd = new GridData(GridData.FILL_HORIZONTAL);
-		gd.horizontalSpan = 2;
-		separator.setLayoutData(gd);*/
 		
 		dialogComp.layout(true);
 		applyDialogFont(dialogComp);
@@ -471,7 +465,6 @@ public class LaunchConfigurationsDialog extends TitleAreaDialog implements ILaun
 	protected void configureShell(Shell shell) {
 		super.configureShell(shell);
 		shell.setText(getShellTitle());
-		PlatformUI.getWorkbench().getHelpSystem().setHelp(shell, getHelpContextId());
 	}
 	
 	/* (non-Javadoc)
@@ -571,6 +564,7 @@ public class LaunchConfigurationsDialog extends TitleAreaDialog implements ILaun
 	protected Control createContents(Composite parent) {
 		Control contents = super.createContents(parent);
 		initializeContent();
+		PlatformUI.getWorkbench().getHelpSystem().setHelp(getDialogArea(), getHelpContextId());
 		return contents;
 	}
 	
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/viewers/AsynchronousTreeNavigationDialog.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/viewers/AsynchronousTreeNavigationDialog.java
index b28f684bb..6e3f865fb 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/viewers/AsynchronousTreeNavigationDialog.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/viewers/AsynchronousTreeNavigationDialog.java
@@ -10,9 +10,13 @@
  *******************************************************************************/
 package org.eclipse.debug.internal.ui.model.viewers;
 
+import org.eclipse.debug.internal.ui.IDebugHelpContextIds;
 import org.eclipse.debug.internal.ui.viewers.TreePath;
 import org.eclipse.debug.internal.ui.viewers.TreeSelection;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.TreeItem;
+import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.dialogs.ElementListSelectionDialog;
 
 /**
@@ -42,6 +46,15 @@ public class AsynchronousTreeNavigationDialog extends ElementListSelectionDialog
 	}
 
 	/* (non-Javadoc)
+	 * @see org.eclipse.ui.dialogs.ElementListSelectionDialog#createDialogArea(org.eclipse.swt.widgets.Composite)
+	 */
+	protected Control createDialogArea(Composite parent) {
+		Control comp = super.createDialogArea(parent);
+		PlatformUI.getWorkbench().getHelpSystem().setHelp(comp, IDebugHelpContextIds.FIND_ELEMENT_DIALOG);
+		return comp;
+	}
+	
+	/* (non-Javadoc)
 	 * @see org.eclipse.ui.dialogs.SelectionStatusDialog#okPressed()
 	 */
 	protected void okPressed() {
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/sourcelookup/SourceLookupDialog.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/sourcelookup/SourceLookupDialog.java
index 06f8e09b7..30c2fad6f 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/sourcelookup/SourceLookupDialog.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/sourcelookup/SourceLookupDialog.java
@@ -84,9 +84,8 @@ public class SourceLookupDialog extends TitleAreaDialog {
 		fPanel = new SourceLookupPanel();
 		fPanel.createControl(composite);
 		fPanel.initializeFrom(fDirector);
-		
 		Dialog.applyDialogFont(composite);
-		PlatformUI.getWorkbench().getHelpSystem().setHelp(getShell(),  IDebugHelpContextIds.EDIT_SOURCELOOKUP_DIALOG);
+		PlatformUI.getWorkbench().getHelpSystem().setHelp(composite,  IDebugHelpContextIds.EDIT_SOURCELOOKUP_DIALOG);
 		
 		return composite;
 	}