Attachment #130183 for bug #263440

Lines 69-74 Link Here

(-)compare/org/eclipse/compare/internal/GenerateDiffFileWizard.java (-6 / +10 lines)
69	import org.eclipse.swt.widgets.Listener;	69	import org.eclipse.swt.widgets.Listener;
70	import org.eclipse.swt.widgets.Shell;	70	import org.eclipse.swt.widgets.Shell;
71	import org.eclipse.swt.widgets.Text;	71	import org.eclipse.swt.widgets.Text;
		72	import org.eclipse.ui.PlatformUI;
72	import org.eclipse.ui.model.BaseWorkbenchContentProvider;	73	import org.eclipse.ui.model.BaseWorkbenchContentProvider;
73	import org.eclipse.ui.model.WorkbenchLabelProvider;	74	import org.eclipse.ui.model.WorkbenchLabelProvider;
74	import org.eclipse.ui.views.navigator.ResourceComparator;	75	import org.eclipse.ui.views.navigator.ResourceComparator;
Lines 111-116 Link Here
111	}	112	}
112		113
113	public void createControl(Composite parent) {	114	public void createControl(Composite parent) {
		115
		116	PlatformUI.getWorkbench().getHelpSystem().setHelp(parent, ICompareContextIds.DIRECTION_PATCH_PAGE);
		117
		118
114	Composite composite = new Composite(parent, SWT.NULL);	119	Composite composite = new Composite(parent, SWT.NULL);
115	GridLayout layout = new GridLayout();	120	GridLayout layout = new GridLayout();
116		121
Lines 622-635 Link Here
622	*/	627	*/
623	public void createControl(Composite parent) {	628	public void createControl(Composite parent) {
624		629
		630	PlatformUI.getWorkbench().getHelpSystem().setHelp(parent, ICompareContextIds.PATCH_SELECTION_PAGE);
		631
625	final Composite composite= new Composite(parent, SWT.NULL);	632	final Composite composite= new Composite(parent, SWT.NULL);
626	composite.setLayout(new GridLayout());	633	composite.setLayout(new GridLayout());
627	setControl(composite);	634	setControl(composite);
628	initializeDialogUnits(composite);	635	initializeDialogUnits(composite);
629		636
630	// set F1 help
631	// TODO: PlatformUI.getWorkbench().getHelpSystem().setHelp(composite, IHelpContextIds.PATCH_SELECTION_PAGE);
632
633	//Create a location group	637	//Create a location group
634	setupLocationControls(composite);	638	setupLocationControls(composite);
635		639
Lines 885-899 Link Here
885	* @see IDialogPage#createControl(Composite)	889	* @see IDialogPage#createControl(Composite)
886	*/	890	*/
887	public void createControl(Composite parent) {	891	public void createControl(Composite parent) {
		892
		893	PlatformUI.getWorkbench().getHelpSystem().setHelp(parent, ICompareContextIds.PATCH_OPTIONS_PAGE);
		894
888	Composite composite= new Composite(parent, SWT.NULL);	895	Composite composite= new Composite(parent, SWT.NULL);
889	GridLayout layout= new GridLayout();	896	GridLayout layout= new GridLayout();
890	composite.setLayout(layout);	897	composite.setLayout(layout);
891	composite.setLayoutData(new GridData());	898	composite.setLayoutData(new GridData());
892	setControl(composite);	899	setControl(composite);
893		900
894	// set F1 help
895	// TODO: PlatformUI.getWorkbench().getHelpSystem().setHelp(composite, IHelpContextIds.PATCH_OPTIONS_PAGE);
896
897	diffTypeGroup = new Group(composite, SWT.NONE);	901	diffTypeGroup = new Group(composite, SWT.NONE);
898	layout = new GridLayout();	902	layout = new GridLayout();
899	layout.marginHeight = 0;	903	layout.marginHeight = 0;

Lines 50-53 Link Here

(-)compare/org/eclipse/compare/internal/ICompareContextIds.java (+9 lines)
50		50
51	// Preference page	51	// Preference page
52	public static final String COMPARE_PREFERENCE_PAGE= PREFIX + "compare_preference_page_context"; //$NON-NLS-1$	52	public static final String COMPARE_PREFERENCE_PAGE= PREFIX + "compare_preference_page_context"; //$NON-NLS-1$
		53
		54
		55
		56	// Generate diff file wizard
		57	public static final String DIRECTION_PATCH_PAGE = PREFIX + "diff_file_direction_context"; //$NON-NLS-1$
		58	public static final String PATCH_SELECTION_PAGE = PREFIX + "diff_file_patch_selection_context"; //$NON-NLS-1$
		59	public static final String PATCH_OPTIONS_PAGE = PREFIX + "diff_file_patch_options_page"; //$NON-NLS-1$
		60
		61
53	}	62	}

Return to bug 263440