Attachment 39733 Details for Bug 139104 – Patch #1

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] Patch #1

patch.txt (text/plain), 17.22 KB, created by Mike Pawlowski

on 2006-04-27 21:09:20 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Mike Pawlowski

Created: 2006-04-27 21:09:20 EDT

Size: 17.22 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.pde.doc.user
>Index: contexts_PDE.xml
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.pde.doc.user/contexts_PDE.xml,v
>retrieving revision 1.32
>diff -u -r1.32 contexts_PDE.xml
>--- contexts_PDE.xml	29 Mar 2006 19:33:01 -0000	1.32
>+++ contexts_PDE.xml	28 Apr 2006 00:56:18 -0000
>@@ -247,6 +247,15 @@
> 		<description>Specify product and application IDs</description>
> 	</context>
> 
>+    
>+	<context id="environment_page">
>+		<description>This page allows you to define the target environment</description>
>+	</context>
>+    
>+	<context id="target_overview_page">
>+		<description>This page allows you to speciy a target definition and target content</description>
>+	</context>
>+
> 
> 
> 
>@@ -293,6 +302,7 @@
> 	<topic label="Dynamic classpaths FAQ" href="guide/dynamic-classpaths.htm"/>
>    </context>
> 
>+
> 	
>     <context id="selfhosting_property_page" >
>       <description>This page allows you to exclude certain class folders from the runtime workbench.</description>
>@@ -323,9 +333,38 @@
> 		<description>The log view captures warnings and internal errors thrown by the internal platform or your code.</description>
> 		<topic label="Preparing the workbench" href="guide/pde_setup.htm"/>
> 	</context>
>-		
>+
>+
>+
>+
>+	
>+	<context id="tree_selection_page">
>+		<description>This page allows you to create a new extension using a wizard</description>
>+	</context>
> 		
> 
>+
>+	
>+	<context id="externalize_strings_page">
>+		<description>This page allows you to extract translatable strings and store them in a properties file for multi-language support.</description>
>+	</context>
>+
>+	
>+	<context id="xhtml_conversion_page">
>+		<description>This page allows you to convert existing help files into XHTML</description>
>+	</context>
>+
>+	
>+	<context id="product_file_page">
>+		<description>This page allows you to create a new product configuration and initialize its content.</description>
>+	</context>
>+
>+	
>+	<context id="target_definition_page">
>+		<description>This page allows you to create a new target definition</description>
>+	</context>
>+
>+
> 	<context id="new_project_structure_page">
> 		<description>This wizard helps you create a new plug-in project.
> If the plug-in is to contain resources only, create a simple project.
>@@ -517,6 +556,12 @@
> 		<description>This wizard builds and exports the selected features and the associated plug-ins into the specified location.</description>
> 		<topic label="Deploying a feature" href="guide/pde_feature_generating.htm"/>
> 	</context>
>+
>+	
>+	<context id="product_export_wizard">
>+		<description>This page allows you to export a product to a destination outside the Eclipse workspace</description>
>+	</context>
>+
> 	
> 	<context id="plugins_container_page">
> 		<description>This page shows you the actual classpath entries that are managed by this dynamic classpath container. In case one of the library entries does not have source associated, you can add source by selecting 'Attach Source...' button.</description>
>#P org.eclipse.pde.ui
>Index: src/org/eclipse/pde/internal/ui/wizards/target/TargetDefinitionWizardPage.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/target/TargetDefinitionWizardPage.java,v
>retrieving revision 1.3
>diff -u -r1.3 TargetDefinitionWizardPage.java
>--- src/org/eclipse/pde/internal/ui/wizards/target/TargetDefinitionWizardPage.java	3 Apr 2006 19:47:27 -0000	1.3
>+++ src/org/eclipse/pde/internal/ui/wizards/target/TargetDefinitionWizardPage.java	28 Apr 2006 00:56:20 -0000
>@@ -24,6 +24,7 @@
> import org.eclipse.pde.internal.core.TargetDefinitionManager;
> import org.eclipse.pde.internal.core.itarget.ITargetModel;
> import org.eclipse.pde.internal.core.target.TargetModel;
>+import org.eclipse.pde.internal.ui.IHelpContextIds;
> import org.eclipse.pde.internal.ui.PDEPlugin;
> import org.eclipse.pde.internal.ui.PDEUIMessages;
> import org.eclipse.pde.internal.ui.editor.target.OpenTargetProfileAction;
>@@ -37,6 +38,7 @@
> import org.eclipse.swt.widgets.Combo;
> import org.eclipse.swt.widgets.Composite;
> import org.eclipse.swt.widgets.Group;
>+import org.eclipse.ui.PlatformUI;
> import org.eclipse.ui.dialogs.WizardNewFileCreationPage;
> 
> public class TargetDefinitionWizardPage extends WizardNewFileCreationPage {
>@@ -63,6 +65,7 @@
> 	public void createControl(Composite parent) {
> 		super.createControl(parent);
> 		setFileName(EXTENSION); 
>+		PlatformUI.getWorkbench().getHelpSystem().setHelp(getControl(), IHelpContextIds.TARGET_DEFINITION_PAGE );
> 	}
> 	
>     protected void createAdvancedControls(Composite parent) {
>Index: src/org/eclipse/pde/internal/ui/wizards/product/ProductFileWizadPage.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/product/ProductFileWizadPage.java,v
>retrieving revision 1.16
>diff -u -r1.16 ProductFileWizadPage.java
>--- src/org/eclipse/pde/internal/ui/wizards/product/ProductFileWizadPage.java	3 Apr 2006 19:47:24 -0000	1.16
>+++ src/org/eclipse/pde/internal/ui/wizards/product/ProductFileWizadPage.java	28 Apr 2006 00:56:20 -0000
>@@ -29,6 +29,7 @@
> import org.eclipse.pde.core.plugin.IPluginModelBase;
> import org.eclipse.pde.internal.core.PDECore;
> import org.eclipse.pde.internal.core.TargetPlatform;
>+import org.eclipse.pde.internal.ui.IHelpContextIds;
> import org.eclipse.pde.internal.ui.PDEPlugin;
> import org.eclipse.pde.internal.ui.PDEUIMessages;
> import org.eclipse.swt.SWT;
>@@ -40,6 +41,7 @@
> import org.eclipse.swt.widgets.Combo;
> import org.eclipse.swt.widgets.Composite;
> import org.eclipse.swt.widgets.Group;
>+import org.eclipse.ui.PlatformUI;
> import org.eclipse.ui.dialogs.WizardNewFileCreationPage;
> 
> public class ProductFileWizadPage extends WizardNewFileCreationPage {
>@@ -224,6 +226,8 @@
> 		super.createControl(parent);
> 		Dialog.applyDialogFont(fGroup);
> 		setFileName(".product"); //$NON-NLS-1$
>+		
>+		PlatformUI.getWorkbench().getHelpSystem().setHelp(getControl(), IHelpContextIds.PRODUCT_FILE_PAGE );
> 	}
> 	
> }
>Index: src/org/eclipse/pde/internal/ui/wizards/xhtml/XHTMLConversionWizardPage.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/xhtml/XHTMLConversionWizardPage.java,v
>retrieving revision 1.3
>diff -u -r1.3 XHTMLConversionWizardPage.java
>--- src/org/eclipse/pde/internal/ui/wizards/xhtml/XHTMLConversionWizardPage.java	10 Apr 2006 20:05:41 -0000	1.3
>+++ src/org/eclipse/pde/internal/ui/wizards/xhtml/XHTMLConversionWizardPage.java	28 Apr 2006 00:56:20 -0000
>@@ -19,6 +19,7 @@
> import org.eclipse.jface.viewers.ITreeContentProvider;
> import org.eclipse.jface.viewers.Viewer;
> import org.eclipse.jface.wizard.WizardPage;
>+import org.eclipse.pde.internal.ui.IHelpContextIds;
> import org.eclipse.pde.internal.ui.PDEUIMessages;
> import org.eclipse.pde.internal.ui.wizards.xhtml.TocReplaceTable.TocReplaceEntry;
> import org.eclipse.swt.SWT;
>@@ -29,6 +30,7 @@
> import org.eclipse.swt.widgets.Button;
> import org.eclipse.swt.widgets.Composite;
> import org.eclipse.swt.widgets.Label;
>+import org.eclipse.ui.PlatformUI;
> import org.eclipse.ui.dialogs.ContainerCheckedTreeViewer;
> import org.eclipse.ui.model.WorkbenchLabelProvider;
> 
>@@ -123,6 +125,8 @@
> 		
> 		setControl(columns);
> 		Dialog.applyDialogFont(columns);
>+		
>+		PlatformUI.getWorkbench().getHelpSystem().setHelp(columns, IHelpContextIds.XHTML_CONVERSION_PAGE );
> 	}
> 	
> 	protected Composite createComposite(Composite parent, boolean noMargin, int cols, boolean valignTop) {
>Index: src/org/eclipse/pde/internal/ui/editor/target/EnvironmentPage.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/target/EnvironmentPage.java,v
>retrieving revision 1.4
>diff -u -r1.4 EnvironmentPage.java
>--- src/org/eclipse/pde/internal/ui/editor/target/EnvironmentPage.java	3 Apr 2006 19:47:17 -0000	1.4
>+++ src/org/eclipse/pde/internal/ui/editor/target/EnvironmentPage.java	28 Apr 2006 00:56:19 -0000
>@@ -10,10 +10,12 @@
>  *******************************************************************************/
> package org.eclipse.pde.internal.ui.editor.target;
> 
>+import org.eclipse.pde.internal.ui.IHelpContextIds;
> import org.eclipse.pde.internal.ui.PDEUIMessages;
> import org.eclipse.pde.internal.ui.editor.PDEFormPage;
> import org.eclipse.swt.layout.GridLayout;
> import org.eclipse.swt.widgets.Composite;
>+import org.eclipse.ui.PlatformUI;
> import org.eclipse.ui.forms.IManagedForm;
> import org.eclipse.ui.forms.editor.FormEditor;
> import org.eclipse.ui.forms.widgets.FormToolkit;
>@@ -33,6 +35,8 @@
> 		form.setText(PDEUIMessages.EnvironmentPage_title);
> 		FormToolkit toolkit = managedForm.getToolkit();
> 		fillBody(managedForm, toolkit);
>+		
>+		PlatformUI.getWorkbench().getHelpSystem().setHelp(form.getBody(), IHelpContextIds.ENVIRONMENT_PAGE);
> 	}
> 	
> 	private void fillBody(IManagedForm managedForm, FormToolkit toolkit) {
>Index: src/org/eclipse/pde/internal/ui/editor/target/OverviewPage.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/target/OverviewPage.java,v
>retrieving revision 1.7
>diff -u -r1.7 OverviewPage.java
>--- src/org/eclipse/pde/internal/ui/editor/target/OverviewPage.java	3 Apr 2006 19:47:17 -0000	1.7
>+++ src/org/eclipse/pde/internal/ui/editor/target/OverviewPage.java	28 Apr 2006 00:56:19 -0000
>@@ -10,10 +10,12 @@
>  *******************************************************************************/
> package org.eclipse.pde.internal.ui.editor.target;
> 
>+import org.eclipse.pde.internal.ui.IHelpContextIds;
> import org.eclipse.pde.internal.ui.PDEUIMessages;
> import org.eclipse.pde.internal.ui.editor.PDEFormPage;
> import org.eclipse.swt.layout.GridLayout;
> import org.eclipse.swt.widgets.Composite;
>+import org.eclipse.ui.PlatformUI;
> import org.eclipse.ui.forms.IManagedForm;
> import org.eclipse.ui.forms.editor.FormEditor;
> import org.eclipse.ui.forms.widgets.FormToolkit;
>@@ -37,6 +39,9 @@
> 		FormToolkit toolkit = managedForm.getToolkit();
> 		form.setText(PDEUIMessages.OverviewPage_title);  
> 		fillBody(managedForm, toolkit);
>+		
>+		PlatformUI.getWorkbench().getHelpSystem().setHelp(form.getBody(), IHelpContextIds.TARGET_OVERVIEW_PAGE );
>+
> 	}
> 
> 	private void fillBody(IManagedForm managedForm, FormToolkit toolkit) {
>Index: src/org/eclipse/pde/internal/ui/IHelpContextIds.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/IHelpContextIds.java,v
>retrieving revision 1.29
>diff -u -r1.29 IHelpContextIds.java
>--- src/org/eclipse/pde/internal/ui/IHelpContextIds.java	3 Apr 2006 19:47:30 -0000	1.29
>+++ src/org/eclipse/pde/internal/ui/IHelpContextIds.java	28 Apr 2006 00:56:19 -0000
>@@ -24,6 +24,7 @@
> 	public static final String COMPILERS_PREFERENCE_PAGE = PREFIX + "compilers_preference_page"; //$NON-NLS-1$
> 	public static final String TARGET_ENVIRONMENT_PREFERENCE_PAGE = PREFIX + "target_environment_preference_page"; //$NON-NLS-1$
>  	public static final String TARGET_PLATFORM_PREFERENCE_PAGE = PREFIX + "target_platform_preference_page"; //$NON-NLS-1$
>+
>  	
>  	// Property Pages
>  	public static final String SELFHOSTING_PROPERTY_PAGE = PREFIX + "selfhosting_property_page"; //$NON-NLS-1$
>@@ -109,6 +110,12 @@
> 	public static final String FEATURE_PORTABILITY_WIZARD = PREFIX + "feature_portability_wizard"; //$NON-NLS-1$
> 
> 	public static final String PLUGINS_CONTAINER_PAGE = PREFIX + "plugins_container_page"; //$NON-NLS-1$
>+	public static final String EXTERNALIZE_STRINGS_PAGE = PREFIX + "externalize_strings_page"; //$NON-NLS-1$
>+	public static final String PRODUCT_FILE_PAGE = PREFIX + "product_file_page"; //$NON-NLS-1$
>+	public static final String TARGET_DEFINITION_PAGE = PREFIX + "target_definition_page"; //$NON-NLS-1$
>+
>+	public static final String XHTML_CONVERSION_PAGE = PREFIX + "xhtml_conversion_page"; //$NON-NLS-1$
>+
> 	
> 	// dialogs
> 	public static final String FRAGMENT_ADD_TARGET = PREFIX + "fragment_add_target"; //$NON-NLS-1$
>@@ -171,7 +178,17 @@
> 	public static final String CONFIGURATION_PAGE = PREFIX + "configuration_page"; //$NON-NLS-1$
> 	public static final String OVERVIEW_PAGE = PREFIX + "overview_page"; //$NON-NLS-1$
> 	
>+	public static final String ENVIRONMENT_PAGE = PREFIX + "environment_page"; //$NON-NLS-1$	
>+	public static final String TARGET_OVERVIEW_PAGE = PREFIX + "target_overview_page"; //$NON-NLS-1$
> 	
> 	// Tools
> 	public static final String ORGANIZE_MANIFESTS = PREFIX + "organize_manifest"; //$NON-NLS-1$
>+
>+
>+
>+	// Selection Pages
>+	public static final String TREE_SELECTION_PAGE = PREFIX + "tree_selection_page"; //$NON-NLS-1$
>+
>+
>+	
> }
>Index: src/org/eclipse/pde/internal/ui/wizards/exports/ProductExportWizardPage.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/exports/ProductExportWizardPage.java,v
>retrieving revision 1.18
>diff -u -r1.18 ProductExportWizardPage.java
>--- src/org/eclipse/pde/internal/ui/wizards/exports/ProductExportWizardPage.java	3 Apr 2006 19:47:17 -0000	1.18
>+++ src/org/eclipse/pde/internal/ui/wizards/exports/ProductExportWizardPage.java	28 Apr 2006 00:56:20 -0000
>@@ -68,7 +68,10 @@
> 		}
> 		setControl(container);
> 		hookHelpContext(container);
>-		Dialog.applyDialogFont(container);				
>+		Dialog.applyDialogFont(container);	
>+		
>+		PlatformUI.getWorkbench().getHelpSystem()
>+		.setHelp(container, IHelpContextIds.PRODUCT_EXPORT_WIZARD);
> 	}
> 	
> 	private void createConfigurationSection(Composite parent) {
>Index: src/org/eclipse/pde/internal/ui/wizards/WizardTreeSelectionPage.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/WizardTreeSelectionPage.java,v
>retrieving revision 1.15
>diff -u -r1.15 WizardTreeSelectionPage.java
>--- src/org/eclipse/pde/internal/ui/wizards/WizardTreeSelectionPage.java	3 Apr 2006 19:47:14 -0000	1.15
>+++ src/org/eclipse/pde/internal/ui/wizards/WizardTreeSelectionPage.java	28 Apr 2006 00:56:20 -0000
>@@ -21,6 +21,7 @@
> import org.eclipse.jface.viewers.TableViewer;
> import org.eclipse.jface.viewers.TreeViewer;
> import org.eclipse.jface.wizard.IWizardNode;
>+import org.eclipse.pde.internal.ui.IHelpContextIds;
> import org.eclipse.pde.internal.ui.elements.ElementLabelProvider;
> import org.eclipse.pde.internal.ui.elements.ListContentProvider;
> import org.eclipse.pde.internal.ui.elements.TreeContentProvider;
>@@ -33,6 +34,7 @@
> import org.eclipse.swt.widgets.Table;
> import org.eclipse.swt.widgets.TableColumn;
> import org.eclipse.swt.widgets.Tree;
>+import org.eclipse.ui.PlatformUI;
> 
> 
> public abstract class WizardTreeSelectionPage
>@@ -153,6 +155,8 @@
> 		initializeViewers();
> 		rootSash.setWeights(new int[] {70, 30});		
> 		setControl(container);
>+		
>+		PlatformUI.getWorkbench().getHelpSystem().setHelp(parent, IHelpContextIds.TREE_SELECTION_PAGE );
> 	}
> 	protected Object getSingleSelection(IStructuredSelection selection) {
> 		Object selectedObject = selection.getFirstElement();
>Index: src/org/eclipse/pde/internal/ui/nls/ExternalizeStringsWizardPage.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/nls/ExternalizeStringsWizardPage.java,v
>retrieving revision 1.17
>diff -u -r1.17 ExternalizeStringsWizardPage.java
>--- src/org/eclipse/pde/internal/ui/nls/ExternalizeStringsWizardPage.java	3 Apr 2006 19:47:23 -0000	1.17
>+++ src/org/eclipse/pde/internal/ui/nls/ExternalizeStringsWizardPage.java	28 Apr 2006 00:56:20 -0000
>@@ -38,6 +38,7 @@
> import org.eclipse.jface.viewers.ViewerFilter;
> import org.eclipse.jface.wizard.WizardPage;
> import org.eclipse.pde.core.plugin.IPluginModelBase;
>+import org.eclipse.pde.internal.ui.IHelpContextIds;
> import org.eclipse.pde.internal.ui.PDEPlugin;
> import org.eclipse.pde.internal.ui.PDEUIMessages;
> import org.eclipse.pde.internal.ui.editor.context.ManifestDocumentSetupParticipant;
>@@ -65,6 +66,7 @@
> import org.eclipse.swt.widgets.Text;
> import org.eclipse.swt.widgets.TreeItem;
> import org.eclipse.text.edits.MalformedTreeException;
>+import org.eclipse.ui.PlatformUI;
> import org.eclipse.ui.dialogs.ContainerCheckedTreeViewer;
> 
> public class ExternalizeStringsWizardPage extends WizardPage {
>@@ -248,8 +250,7 @@
> 		setControl(superSash);
> 		Dialog.applyDialogFont(superSash);
> 
>-		// TODO ADD HELP
>-//		PlatformUI.getWorkbench().getHelpSystem().setHelp(superSash, IHelpContextIds.UPDATE_CLASSPATH);
>+		PlatformUI.getWorkbench().getHelpSystem().setHelp(superSash, IHelpContextIds.EXTERNALIZE_STRINGS_PAGE);
> 	}
> 
> 	private void createInputContents(Composite composite) {

Actions: View | Diff

Attachments on bug 139104: 39733