Attachment 130536 Details for Bug 263440 – Patch_v2

[patch] Patch_v2

patch_diffHelp.txt (text/plain), 3.16 KB, created by Kacper Zdanowicz

on 2009-04-01 06:50:42 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Kacper Zdanowicz

Created: 2009-04-01 06:50:42 EDT

Size: 3.16 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.compare
>Index: compare/org/eclipse/compare/internal/GenerateDiffFileWizard.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/Attic/GenerateDiffFileWizard.java,v
>retrieving revision 1.1.2.7
>diff -u -r1.1.2.7 GenerateDiffFileWizard.java
>--- compare/org/eclipse/compare/internal/GenerateDiffFileWizard.java	30 Mar 2009 15:53:03 -0000	1.1.2.7
>+++ compare/org/eclipse/compare/internal/GenerateDiffFileWizard.java	1 Apr 2009 10:06:47 -0000
>@@ -70,6 +70,7 @@
> import org.eclipse.swt.widgets.Listener;
> import org.eclipse.swt.widgets.Shell;
> import org.eclipse.swt.widgets.Text;
>+import org.eclipse.ui.PlatformUI;
> import org.eclipse.ui.model.BaseWorkbenchContentProvider;
> import org.eclipse.ui.model.WorkbenchLabelProvider;
> import org.eclipse.ui.views.navigator.ResourceComparator;
>@@ -117,6 +118,9 @@
> 
> 			initializeDialogUnits(composite);
> 
>+			// set F1 help
>+			PlatformUI.getWorkbench().getHelpSystem().setHelp(composite, ICompareContextIds.DIRECTION_PATCH_PAGE);
>+			
> 			layout.marginHeight = IDialogConstants.VERTICAL_MARGIN;
> 			layout.marginWidth = IDialogConstants.HORIZONTAL_MARGIN;
> 			layout.verticalSpacing = IDialogConstants.VERTICAL_SPACING*2;
>@@ -631,8 +635,8 @@
> 			initializeDialogUnits(composite);
> 
> 			// set F1 help
>-			// TODO: PlatformUI.getWorkbench().getHelpSystem().setHelp(composite, IHelpContextIds.PATCH_SELECTION_PAGE);
>-
>+			PlatformUI.getWorkbench().getHelpSystem().setHelp(composite, ICompareContextIds.PATCH_SELECTION_PAGE);
>+			
> 			//Create a location group
> 			setupLocationControls(composite);
> 
>@@ -895,8 +899,8 @@
> 			setControl(composite);
> 
> 			// set F1 help
>-			// TODO: PlatformUI.getWorkbench().getHelpSystem().setHelp(composite, IHelpContextIds.PATCH_OPTIONS_PAGE);
>-
>+			PlatformUI.getWorkbench().getHelpSystem().setHelp(composite, ICompareContextIds.PATCH_OPTIONS_PAGE);
>+			
> 			diffTypeGroup = new Group(composite, SWT.NONE);
> 			layout = new GridLayout();
> 			layout.marginHeight = 0;
>Index: compare/org/eclipse/compare/internal/ICompareContextIds.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/ICompareContextIds.java,v
>retrieving revision 1.6
>diff -u -r1.6 ICompareContextIds.java
>--- compare/org/eclipse/compare/internal/ICompareContextIds.java	16 Mar 2007 19:53:08 -0000	1.6
>+++ compare/org/eclipse/compare/internal/ICompareContextIds.java	1 Apr 2009 10:06:47 -0000
>@@ -50,4 +50,13 @@
> 
> 	// Preference page
> 	public static final String COMPARE_PREFERENCE_PAGE= PREFIX + "compare_preference_page_context"; //$NON-NLS-1$
>+
>+	
>+	
>+	// Generate diff file wizard
>+	public static final String DIRECTION_PATCH_PAGE = PREFIX + "diff_file_direction_context"; //$NON-NLS-1$
>+	public static final String PATCH_SELECTION_PAGE = PREFIX + "diff_file_patch_selection_context"; //$NON-NLS-1$
>+	public static final String PATCH_OPTIONS_PAGE = PREFIX + "diff_file_patch_options_page"; //$NON-NLS-1$
>+	
>+	
> }

Actions: View | Diff

Attachments on bug 263440: 130183 | 130536 | 130537