Attachment 130183 Details for Bug 263440 – Patch_v1

[patch] Patch_v1

patch_diff_help.txt (text/plain), 3.56 KB, created by mariusz.tanski

on 2009-03-29 11:53:42 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: mariusz.tanski

Created: 2009-03-29 11:53:42 EDT

Size: 3.56 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.5
>diff -u -r1.1.2.5 GenerateDiffFileWizard.java
>--- compare/org/eclipse/compare/internal/GenerateDiffFileWizard.java	18 Mar 2009 12:23:22 -0000	1.1.2.5
>+++ compare/org/eclipse/compare/internal/GenerateDiffFileWizard.java	26 Mar 2009 22:05:31 -0000
>@@ -69,6 +69,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;
>@@ -111,6 +112,10 @@
> 		}
> 
> 		public void createControl(Composite parent) {
>+
>+			PlatformUI.getWorkbench().getHelpSystem().setHelp(parent, ICompareContextIds.DIRECTION_PATCH_PAGE);
>+
>+			
> 			Composite composite = new Composite(parent, SWT.NULL);
> 			GridLayout layout = new GridLayout();
> 
>@@ -622,14 +627,13 @@
> 		 */
> 		public void createControl(Composite parent) {
> 
>+			PlatformUI.getWorkbench().getHelpSystem().setHelp(parent, ICompareContextIds.PATCH_SELECTION_PAGE);
>+			
> 			final Composite composite= new Composite(parent, SWT.NULL);
> 			composite.setLayout(new GridLayout());
> 			setControl(composite);
> 			initializeDialogUnits(composite);
> 
>-			// set F1 help
>-			// TODO: PlatformUI.getWorkbench().getHelpSystem().setHelp(composite, IHelpContextIds.PATCH_SELECTION_PAGE);
>-
> 			//Create a location group
> 			setupLocationControls(composite);
> 
>@@ -885,15 +889,15 @@
> 		 * @see IDialogPage#createControl(Composite)
> 		 */
> 		public void createControl(Composite parent) {
>+			
>+			PlatformUI.getWorkbench().getHelpSystem().setHelp(parent, ICompareContextIds.PATCH_OPTIONS_PAGE);
>+			
> 			Composite composite= new Composite(parent, SWT.NULL);
> 			GridLayout layout= new GridLayout();
> 			composite.setLayout(layout);
> 			composite.setLayoutData(new GridData());
> 			setControl(composite);
> 
>-			// set F1 help
>-			// TODO: PlatformUI.getWorkbench().getHelpSystem().setHelp(composite, IHelpContextIds.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	26 Mar 2009 22:05:31 -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