Attachment 49703 Details for Bug 156679 – updating deprecated calls and smoothing context help

[patch] updating deprecated calls and smoothing context help

PATCH05_nodeprecated.txt (text/plain), 14.97 KB, created by Crispin Semmens

on 2006-09-08 06:33:11 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Crispin Semmens

Created: 2006-09-08 06:33:11 EDT

Size: 14.97 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.cdt.doc.user
>Index: contexts_CDT.xml
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.cdt/all/org.eclipse.cdt.doc.user/contexts_CDT.xml,v
>retrieving revision 1.9
>diff -u -r1.9 contexts_CDT.xml
>--- contexts_CDT.xml	4 Mar 2005 19:25:22 -0000	1.9
>+++ contexts_CDT.xml	8 Sep 2006 10:21:26 -0000
>@@ -373,5 +373,10 @@
>    <topic href="reference/cdt_u_search.htm"
>    	label="C/C++ search page"/>
> </context>
>+<context id ="documentation_property_page_context">
>+   <description>Click below to see help.</description>
>+   <topic href="reference/cdt_u_mprop_documentation.htm"
>+   	label="C/C++ Documentation"/>
>+</context>
> 
> </contexts>
>#P org.eclipse.cdt.ui
>Index: src/org/eclipse/cdt/internal/ui/ICHelpContextIds.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.cdt/all/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/ICHelpContextIds.java,v
>retrieving revision 1.31
>diff -u -r1.31 ICHelpContextIds.java
>--- src/org/eclipse/cdt/internal/ui/ICHelpContextIds.java	7 Jul 2006 12:39:18 -0000	1.31
>+++ src/org/eclipse/cdt/internal/ui/ICHelpContextIds.java	8 Sep 2006 10:21:27 -0000
>@@ -69,6 +69,7 @@
> 
> 	public static final String TODO_TASK_PROPERTY_PAGE = PREFIX + "tasktags_property_page_context"; //$NON-NLS-1$
> 	public static final String TODO_TASK_PREFERENCE_PAGE = PREFIX + "tasktags_preference_page_context"; //$NON-NLS-1$
>+	public static final String PROJECT_DOCUMENTATION = PREFIX + "documentation_property_page_context"; //$NON-NLS-1$
> 
> 	public static final String BINARY_PARSER_PAGE = PREFIX + "newproj_parser_binary"; //$NON-NLS-1$
> 	public static final String ERROR_PARSERS_PAGE = PREFIX + "newproj_parser_error"; //$NON-NLS-1$
>Index: src/org/eclipse/cdt/ui/dialogs/IndexerOptionPropertyPage.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.cdt/all/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/IndexerOptionPropertyPage.java,v
>retrieving revision 1.15
>diff -u -r1.15 IndexerOptionPropertyPage.java
>--- src/org/eclipse/cdt/ui/dialogs/IndexerOptionPropertyPage.java	31 Mar 2006 21:40:26 -0000	1.15
>+++ src/org/eclipse/cdt/ui/dialogs/IndexerOptionPropertyPage.java	8 Sep 2006 10:21:27 -0000
>@@ -41,7 +41,7 @@
> 		composite.setLayout(new FillLayout());
> 
> 		optionPage.createControl(composite);
>-		PlatformUI.getWorkbench().getHelpSystem().setHelp(composite, ICHelpContextIds.PROJECT_INDEXER_PROPERTIES);	
>+		PlatformUI.getWorkbench().getHelpSystem().setHelp(getControl(), ICHelpContextIds.PROJECT_INDEXER_PROPERTIES);	
> 		initialize();
> 		
> 		return composite;
>Index: src/org/eclipse/cdt/ui/dialogs/CHelpConfigurationPropertyPage.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.cdt/all/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/CHelpConfigurationPropertyPage.java,v
>retrieving revision 1.2
>diff -u -r1.2 CHelpConfigurationPropertyPage.java
>--- src/org/eclipse/cdt/ui/dialogs/CHelpConfigurationPropertyPage.java	27 Jun 2005 03:45:40 -0000	1.2
>+++ src/org/eclipse/cdt/ui/dialogs/CHelpConfigurationPropertyPage.java	8 Sep 2006 10:21:27 -0000
>@@ -18,6 +18,7 @@
> import org.eclipse.cdt.internal.ui.CHelpProviderManager;
> import org.eclipse.cdt.internal.ui.CPluginImages;
> import org.eclipse.cdt.internal.ui.CUIMessages;
>+import org.eclipse.cdt.internal.ui.ICHelpContextIds;
> import org.eclipse.cdt.internal.ui.text.CHelpBookDescriptor;
> import org.eclipse.cdt.internal.ui.util.ImageDescriptorRegistry;
> import org.eclipse.cdt.internal.ui.util.PixelConverter;
>@@ -36,6 +37,7 @@
> import org.eclipse.swt.widgets.Control;
> import org.eclipse.ui.IWorkbench;
> import org.eclipse.ui.IWorkbenchPreferencePage;
>+import org.eclipse.ui.PlatformUI;
> import org.eclipse.ui.dialogs.PropertyPage;
> 
> /**
>@@ -90,6 +92,10 @@
> 			fCHelpBookList.setUncheckAllButtonIndex(1);
> 		}
> 		
>+		/**
>+		 * @param parent
>+		 * @return
>+		 */
> 		public Control createControl(Composite parent){
> 			PixelConverter converter= new PixelConverter(parent);
> 			
>@@ -100,6 +106,8 @@
> 
> 			int buttonBarWidth= converter.convertWidthInCharsToPixels(24);
> 			fCHelpBookList.setButtonsMinWidth(buttonBarWidth);
>+
>+			PlatformUI.getWorkbench().getHelpSystem().setHelp(getControl(), ICHelpContextIds.PROJECT_DOCUMENTATION);	
> 			
> 			return composite;
> 		}
>Index: src/org/eclipse/cdt/internal/ui/preferences/CFileTypesPropertyPage.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.cdt/all/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CFileTypesPropertyPage.java,v
>retrieving revision 1.19
>diff -u -r1.19 CFileTypesPropertyPage.java
>--- src/org/eclipse/cdt/internal/ui/preferences/CFileTypesPropertyPage.java	12 Jul 2006 13:15:28 -0000	1.19
>+++ src/org/eclipse/cdt/internal/ui/preferences/CFileTypesPropertyPage.java	8 Sep 2006 10:21:27 -0000
>@@ -162,7 +162,7 @@
> 		fUseProject.setSelection(custom);
> 		fPrefsBlock.setEnabled(custom);
> 	
>-		PlatformUI.getWorkbench().getHelpSystem().setHelp( topPane, ICHelpContextIds.FILE_TYPES_STD_PAGE );
>+		PlatformUI.getWorkbench().getHelpSystem().setHelp( getControl(), ICHelpContextIds.FILE_TYPES_STD_PAGE );
> 		return topPane;
> 	}
> 	
>#P org.eclipse.cdt.managedbuilder.ui
>Index: src/org/eclipse/cdt/managedbuilder/ui/properties/BuildPropertyPage.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.cdt/all/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/BuildPropertyPage.java,v
>retrieving revision 1.36
>diff -u -r1.36 BuildPropertyPage.java
>--- src/org/eclipse/cdt/managedbuilder/ui/properties/BuildPropertyPage.java	16 Aug 2006 15:27:16 -0000	1.36
>+++ src/org/eclipse/cdt/managedbuilder/ui/properties/BuildPropertyPage.java	8 Sep 2006 10:21:28 -0000
>@@ -58,7 +58,7 @@
> import org.eclipse.swt.widgets.Shell;
> import org.eclipse.ui.IWorkbenchPropertyPage;
> import org.eclipse.ui.actions.WorkspaceModifyDelegatingOperation;
>-import org.eclipse.ui.help.WorkbenchHelp;
>+import org.eclipse.ui.PlatformUI;
> 
> public class BuildPropertyPage extends AbstractBuildPropertyPage implements IWorkbenchPropertyPage, 
> 					IPreferencePageContainer, ICOptionContainer {
>@@ -138,6 +138,7 @@
> 			contentForClosedProject(composite);
> 		} else {
> 			contentForCProject(composite);
>+			PlatformUI.getWorkbench().getHelpSystem().setHelp(parent, ManagedBuilderHelpContextIds.MAN_PROJ_BUILD_PROP);
> 		}
> 
> 		return composite;
>@@ -226,8 +227,6 @@
> 
> 		// Do not call this until the widgets are constructed		
> 		handleProjectTypeSelection();
>-		
>-		WorkbenchHelp.setHelp(parent, ManagedBuilderHelpContextIds.MAN_PROJ_BUILD_PROP);
> 	}
> 
> 	private IProjectType[] getProjectTypes() {
>Index: src/org/eclipse/cdt/managedbuilder/ui/properties/ResourceBuildPropertyPage.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.cdt/all/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/ResourceBuildPropertyPage.java,v
>retrieving revision 1.13
>diff -u -r1.13 ResourceBuildPropertyPage.java
>--- src/org/eclipse/cdt/managedbuilder/ui/properties/ResourceBuildPropertyPage.java	10 Mar 2006 15:21:05 -0000	1.13
>+++ src/org/eclipse/cdt/managedbuilder/ui/properties/ResourceBuildPropertyPage.java	8 Sep 2006 10:21:29 -0000
>@@ -58,7 +58,7 @@
> import org.eclipse.swt.widgets.Shell;
> import org.eclipse.ui.IWorkbenchPropertyPage;
> import org.eclipse.ui.actions.WorkspaceModifyDelegatingOperation;
>-import org.eclipse.ui.help.WorkbenchHelp;
>+import org.eclipse.ui.PlatformUI;
> 
> 
> public class ResourceBuildPropertyPage extends AbstractBuildPropertyPage implements
>@@ -151,6 +151,8 @@
> 		    noContent(composite,ManagedBuilderUIMessages.getResourceString(NOTMBSFILE_LABEL));
> 		}
> 		
>+		PlatformUI.getWorkbench().getHelpSystem().setHelp(getControl(), ManagedBuilderHelpContextIds.MAN_PROJ_BUILD_PROP);
>+		
> 		return composite;
> 	}
> 	
>@@ -227,8 +229,6 @@
> 		//	Update the contents of the configuration widget
> 		populateConfigurations();
> 		fOptionBlock.createContents(tabGroup, getElement());
>-
>-		WorkbenchHelp.setHelp(composite,ManagedBuilderHelpContextIds.MAN_PROJ_BUILD_PROP);
> 	}
> 	
> 	protected void noContent(Composite composite, String message) {
>Index: src/org/eclipse/cdt/managedbuilder/internal/ui/ManagedProjectOptionBlock.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.cdt/all/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/internal/ui/ManagedProjectOptionBlock.java,v
>retrieving revision 1.8
>diff -u -r1.8 ManagedProjectOptionBlock.java
>--- src/org/eclipse/cdt/managedbuilder/internal/ui/ManagedProjectOptionBlock.java	30 Sep 2005 19:09:19 -0000	1.8
>+++ src/org/eclipse/cdt/managedbuilder/internal/ui/ManagedProjectOptionBlock.java	8 Sep 2006 10:21:28 -0000
>@@ -17,7 +17,7 @@
> import org.eclipse.swt.layout.GridLayout;
> import org.eclipse.swt.widgets.Composite;
> import org.eclipse.swt.widgets.Control;
>-import org.eclipse.ui.help.WorkbenchHelp;
>+import org.eclipse.ui.PlatformUI;
> 
> public class ManagedProjectOptionBlock extends TabFolderOptionBlock {
> 
>@@ -55,7 +55,7 @@
> 		((Composite)control).setLayoutData(gd);
> 
> 		if (getErrorParserBlock()!= null)
>-			WorkbenchHelp.setHelp(getErrorParserBlock().getControl(), ManagedBuilderHelpContextIds.MAN_PROJ_ERROR_PARSER);
>+			PlatformUI.getWorkbench().getHelpSystem().setHelp(getErrorParserBlock().getControl(), ManagedBuilderHelpContextIds.MAN_PROJ_ERROR_PARSER);
> 
> 		return control;
> 	}	
>Index: src/org/eclipse/cdt/managedbuilder/internal/ui/ManagedBuildOptionBlock.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.cdt/all/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/internal/ui/ManagedBuildOptionBlock.java,v
>retrieving revision 1.8
>diff -u -r1.8 ManagedBuildOptionBlock.java
>--- src/org/eclipse/cdt/managedbuilder/internal/ui/ManagedBuildOptionBlock.java	30 Sep 2005 19:09:19 -0000	1.8
>+++ src/org/eclipse/cdt/managedbuilder/internal/ui/ManagedBuildOptionBlock.java	8 Sep 2006 10:21:28 -0000
>@@ -27,7 +27,7 @@
> import org.eclipse.swt.layout.GridLayout;
> import org.eclipse.swt.widgets.Composite;
> import org.eclipse.swt.widgets.Control;
>-import org.eclipse.ui.help.WorkbenchHelp;
>+import org.eclipse.ui.PlatformUI;
> 
> public class ManagedBuildOptionBlock extends TabFolderOptionBlock {
> 
>@@ -139,7 +139,7 @@
> 		//if (getToolsSettingsBlock() != null)
> 		//	WorkbenchHelp.setHelp(getToolsSettingsBlock().getControl(), ManagedBuilderHelpContextIds.MAN_PROJ_ERROR_PARSER);
> 		if (getErrorParserBlock() != null)
>-			WorkbenchHelp.setHelp(getErrorParserBlock().getControl(), ManagedBuilderHelpContextIds.MAN_PROJ_ERROR_PARSER);
>+			PlatformUI.getWorkbench().getHelpSystem().setHelp(getErrorParserBlock().getControl(), ManagedBuilderHelpContextIds.MAN_PROJ_ERROR_PARSER);
> 
> 		return control;
> 	}	
>Index: src/org/eclipse/cdt/managedbuilder/ui/wizards/NewManagedProjectOptionPage.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.cdt/all/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/NewManagedProjectOptionPage.java,v
>retrieving revision 1.10
>diff -u -r1.10 NewManagedProjectOptionPage.java
>--- src/org/eclipse/cdt/managedbuilder/ui/wizards/NewManagedProjectOptionPage.java	20 Jun 2005 20:52:06 -0000	1.10
>+++ src/org/eclipse/cdt/managedbuilder/ui/wizards/NewManagedProjectOptionPage.java	8 Sep 2006 10:21:29 -0000
>@@ -25,7 +25,7 @@
> import org.eclipse.cdt.ui.wizards.NewCProjectWizardOptionPage;
> import org.eclipse.core.resources.IProject;
> import org.eclipse.core.runtime.Preferences;
>-import org.eclipse.ui.help.WorkbenchHelp;
>+import org.eclipse.ui.PlatformUI;
> import org.eclipse.jface.wizard.IWizardPage;
> 
> public class NewManagedProjectOptionPage extends NewCProjectWizardOptionPage {
>@@ -81,7 +81,7 @@
> 				} else if (page instanceof IndexerBlock) {
> 					id = ManagedBuilderHelpContextIds.MAN_PROJ_WIZ_INDEXER_TAB;
> 				}
>-				WorkbenchHelp.setHelp(page.getControl(), id);	
>+				PlatformUI.getWorkbench().getHelpSystem().setHelp(page.getControl(), id);	
> 				
> 			}
> 		}
>Index: src/org/eclipse/cdt/managedbuilder/ui/wizards/NewManagedProjectWizard.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.cdt/all/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/NewManagedProjectWizard.java,v
>retrieving revision 1.28
>diff -u -r1.28 NewManagedProjectWizard.java
>--- src/org/eclipse/cdt/managedbuilder/ui/wizards/NewManagedProjectWizard.java	24 Nov 2005 00:31:19 -0000	1.28
>+++ src/org/eclipse/cdt/managedbuilder/ui/wizards/NewManagedProjectWizard.java	8 Sep 2006 10:21:29 -0000
>@@ -34,7 +34,7 @@
> import org.eclipse.core.runtime.SubProgressMonitor;
> import org.eclipse.jface.wizard.IWizardPage;
> import org.eclipse.swt.widgets.Composite;
>-import org.eclipse.ui.help.WorkbenchHelp;
>+import org.eclipse.ui.PlatformUI;
> 
> 
> public class NewManagedProjectWizard extends NewCProjectWizard {
>@@ -104,7 +104,7 @@
> 			for (int i = 0; i < pages.length; i++) {
> 				IWizardPage page = pages[i];
> 				if (page instanceof NewCProjectWizardPage) {
>-					WorkbenchHelp.setHelp(page.getControl(), ManagedBuilderHelpContextIds.MAN_PROJ_WIZ_NAME_PAGE);
>+					PlatformUI.getWorkbench().getHelpSystem().setHelp(page.getControl(), ManagedBuilderHelpContextIds.MAN_PROJ_WIZ_NAME_PAGE);
> 				}
> 				else if (page instanceof NewManagedProjectOptionPage) {
> 					NewManagedProjectOptionPage optionPage = (NewManagedProjectOptionPage) page;
>Index: src/org/eclipse/cdt/managedbuilder/ui/wizards/CProjectPlatformPage.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.cdt/all/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/CProjectPlatformPage.java,v
>retrieving revision 1.20
>diff -u -r1.20 CProjectPlatformPage.java
>--- src/org/eclipse/cdt/managedbuilder/ui/wizards/CProjectPlatformPage.java	26 Apr 2006 19:09:42 -0000	1.20
>+++ src/org/eclipse/cdt/managedbuilder/ui/wizards/CProjectPlatformPage.java	8 Sep 2006 10:21:29 -0000
>@@ -49,7 +49,7 @@
> import org.eclipse.swt.widgets.Label;
> import org.eclipse.swt.widgets.Listener;
> import org.eclipse.swt.widgets.Table;
>-import org.eclipse.ui.help.WorkbenchHelp;
>+import org.eclipse.ui.PlatformUI;
> 
> /**
>  * Class that implements the project type and configuration selection page in the new 
>@@ -196,7 +196,7 @@
> 		composite.setLayoutData(new GridData(GridData.FILL_BOTH));
> 
> 		// Setup the help information
>-		WorkbenchHelp.setHelp(composite, ManagedBuilderHelpContextIds.MAN_PROJ_PLATFORM_HELP);
>+		PlatformUI.getWorkbench().getHelpSystem().setHelp(composite, ManagedBuilderHelpContextIds.MAN_PROJ_PLATFORM_HELP);
> 
> 		// Create the widgets
> 		createTypeSelectGroup(composite);

Flags:

bjorn.freeman-benson: iplog+

Actions: View | Diff

Attachments on bug 156679: 49703