Attachment #39733 for bug #139104

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

View | Details | Raw Unified | Return to bug 139104
Collapse All | Expand All

Lines 247-252 Link Here

(-)contexts_PDE.xml (-1 / +46 lines)
247	<description>Specify product and application IDs</description>	247	<description>Specify product and application IDs</description>
248	</context>	248	</context>
249		249
		250	<!-- PLACE HOLDER -->
		251	<context id="environment_page">
		252	<description>This page allows you to define the target environment</description>
		253	</context>
		254	<!-- PLACE HOLDER -->
		255	<context id="target_overview_page">
		256	<description>This page allows you to speciy a target definition and target content</description>
		257	</context>
		258
250		259
251	<!-- end Children of the PDEFormPage -->	260	<!-- end Children of the PDEFormPage -->
252		261
Lines 293-298 Link Here
293	<topic label="Dynamic classpaths FAQ" href="guide/dynamic-classpaths.htm"/>	302	<topic label="Dynamic classpaths FAQ" href="guide/dynamic-classpaths.htm"/>
294	</context>	303	</context>
295		304
		305
296	<!-- Property pages -->	306	<!-- Property pages -->
297	<context id="selfhosting_property_page" >	307	<context id="selfhosting_property_page" >
298	<description>This page allows you to exclude certain class folders from the runtime workbench.</description>	308	<description>This page allows you to exclude certain class folders from the runtime workbench.</description>
Lines 323-331 Link Here
323	<description>The log view captures warnings and internal errors thrown by the internal platform or your code.</description>	333	<description>The log view captures warnings and internal errors thrown by the internal platform or your code.</description>
324	<topic label="Preparing the workbench" href="guide/pde_setup.htm"/>	334	<topic label="Preparing the workbench" href="guide/pde_setup.htm"/>
325	</context>	335	</context>
326		336
		337
		338	<!-- Selection pages -->
		339
		340	<!-- PLACE HOLDER -->
		341	<context id="tree_selection_page">
		342	<description>This page allows you to create a new extension using a wizard</description>
		343	</context>
327		344
328	<!-- Wizard pages -->	345	<!-- Wizard pages -->
		346
		347	<!-- PLACE HOLDER -->
		348	<context id="externalize_strings_page">
		349	<description>This page allows you to extract translatable strings and store them in a properties file for multi-language support.</description>
		350	</context>
		351
		352	<!-- PLACE HOLDER -->
		353	<context id="xhtml_conversion_page">
		354	<description>This page allows you to convert existing help files into XHTML</description>
		355	</context>
		356
		357	<!-- PLACE HOLDER -->
		358	<context id="product_file_page">
		359	<description>This page allows you to create a new product configuration and initialize its content.</description>
		360	</context>
		361
		362	<!-- PLACE HOLDER -->
		363	<context id="target_definition_page">
		364	<description>This page allows you to create a new target definition</description>
		365	</context>
		366
		367
329	<context id="new_project_structure_page">	368	<context id="new_project_structure_page">
330	<description>This wizard helps you create a new plug-in project.	369	<description>This wizard helps you create a new plug-in project.
331	If the plug-in is to contain resources only, create a simple project.	370	If the plug-in is to contain resources only, create a simple project.
Lines 517-522 Link Here
517	<description>This wizard builds and exports the selected features and the associated plug-ins into the specified location.</description>	556	<description>This wizard builds and exports the selected features and the associated plug-ins into the specified location.</description>
518	<topic label="Deploying a feature" href="guide/pde_feature_generating.htm"/>	557	<topic label="Deploying a feature" href="guide/pde_feature_generating.htm"/>
519	</context>	558	</context>
		559
		560	<!-- PLACE HOLDER -->
		561	<context id="product_export_wizard">
		562	<description>This page allows you to export a product to a destination outside the Eclipse workspace</description>
		563	</context>
		564
520		565
521	<context id="plugins_container_page">	566	<context id="plugins_container_page">
522	<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>	567	<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>




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;

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 {

	public void createControl(Composite parent) {
		super.createControl(parent);
		setFileName(EXTENSION); 
		PlatformUI.getWorkbench().getHelpSystem().setHelp(getControl(), IHelpContextIds.TARGET_DEFINITION_PAGE );
	}
	
    protected void createAdvancedControls(Composite parent) {

Lines 24-29 Link Here

(-)src/org/eclipse/pde/internal/ui/IHelpContextIds.java (+17 lines)
24	public static final String COMPILERS_PREFERENCE_PAGE = PREFIX + "compilers_preference_page"; //$NON-NLS-1$	24	public static final String COMPILERS_PREFERENCE_PAGE = PREFIX + "compilers_preference_page"; //$NON-NLS-1$
25	public static final String TARGET_ENVIRONMENT_PREFERENCE_PAGE = PREFIX + "target_environment_preference_page"; //$NON-NLS-1$	25	public static final String TARGET_ENVIRONMENT_PREFERENCE_PAGE = PREFIX + "target_environment_preference_page"; //$NON-NLS-1$
26	public static final String TARGET_PLATFORM_PREFERENCE_PAGE = PREFIX + "target_platform_preference_page"; //$NON-NLS-1$	26	public static final String TARGET_PLATFORM_PREFERENCE_PAGE = PREFIX + "target_platform_preference_page"; //$NON-NLS-1$
		27
27		28
28	// Property Pages	29	// Property Pages
29	public static final String SELFHOSTING_PROPERTY_PAGE = PREFIX + "selfhosting_property_page"; //$NON-NLS-1$	30	public static final String SELFHOSTING_PROPERTY_PAGE = PREFIX + "selfhosting_property_page"; //$NON-NLS-1$
Lines 109-114 Link Here
109	public static final String FEATURE_PORTABILITY_WIZARD = PREFIX + "feature_portability_wizard"; //$NON-NLS-1$	110	public static final String FEATURE_PORTABILITY_WIZARD = PREFIX + "feature_portability_wizard"; //$NON-NLS-1$
110		111
111	public static final String PLUGINS_CONTAINER_PAGE = PREFIX + "plugins_container_page"; //$NON-NLS-1$	112	public static final String PLUGINS_CONTAINER_PAGE = PREFIX + "plugins_container_page"; //$NON-NLS-1$
		113	public static final String EXTERNALIZE_STRINGS_PAGE = PREFIX + "externalize_strings_page"; //$NON-NLS-1$
		114	public static final String PRODUCT_FILE_PAGE = PREFIX + "product_file_page"; //$NON-NLS-1$
		115	public static final String TARGET_DEFINITION_PAGE = PREFIX + "target_definition_page"; //$NON-NLS-1$
		116
		117	public static final String XHTML_CONVERSION_PAGE = PREFIX + "xhtml_conversion_page"; //$NON-NLS-1$
		118
112		119
113	// dialogs	120	// dialogs
114	public static final String FRAGMENT_ADD_TARGET = PREFIX + "fragment_add_target"; //$NON-NLS-1$	121	public static final String FRAGMENT_ADD_TARGET = PREFIX + "fragment_add_target"; //$NON-NLS-1$
Lines 171-177 Link Here
171	public static final String CONFIGURATION_PAGE = PREFIX + "configuration_page"; //$NON-NLS-1$	178	public static final String CONFIGURATION_PAGE = PREFIX + "configuration_page"; //$NON-NLS-1$
172	public static final String OVERVIEW_PAGE = PREFIX + "overview_page"; //$NON-NLS-1$	179	public static final String OVERVIEW_PAGE = PREFIX + "overview_page"; //$NON-NLS-1$
173		180
		181	public static final String ENVIRONMENT_PAGE = PREFIX + "environment_page"; //$NON-NLS-1$
		182	public static final String TARGET_OVERVIEW_PAGE = PREFIX + "target_overview_page"; //$NON-NLS-1$
174		183
175	// Tools	184	// Tools
176	public static final String ORGANIZE_MANIFESTS = PREFIX + "organize_manifest"; //$NON-NLS-1$	185	public static final String ORGANIZE_MANIFESTS = PREFIX + "organize_manifest"; //$NON-NLS-1$
		186
		187
		188
		189	// Selection Pages
		190	public static final String TREE_SELECTION_PAGE = PREFIX + "tree_selection_page"; //$NON-NLS-1$
		191
		192
		193
177	}	194	}

Lines 68-74 Link Here

(-)src/org/eclipse/pde/internal/ui/wizards/exports/ProductExportWizardPage.java (-1 / +4 lines)
68	}	68	}
69	setControl(container);	69	setControl(container);
70	hookHelpContext(container);	70	hookHelpContext(container);
71	Dialog.applyDialogFont(container);	71	Dialog.applyDialogFont(container);
		72
		73	PlatformUI.getWorkbench().getHelpSystem()
		74	.setHelp(container, IHelpContextIds.PRODUCT_EXPORT_WIZARD);
72	}	75	}
73		76
74	private void createConfigurationSection(Composite parent) {	77	private void createConfigurationSection(Composite parent) {




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;

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 {

		setControl(superSash);
		Dialog.applyDialogFont(superSash);

		PlatformUI.getWorkbench().getHelpSystem().setHelp(superSash, IHelpContextIds.EXTERNALIZE_STRINGS_PAGE);
//		PlatformUI.getWorkbench().getHelpSystem().setHelp(superSash, IHelpContextIds.UPDATE_CLASSPATH);
	}

	private void createInputContents(Composite composite) {

Return to bug 139104

Lines 24-29 Link Here

(-)src/org/eclipse/pde/internal/ui/wizards/target/TargetDefinitionWizardPage.java (+3 lines)
24	import org.eclipse.pde.internal.core.TargetDefinitionManager;	24	import org.eclipse.pde.internal.core.TargetDefinitionManager;
25	import org.eclipse.pde.internal.core.itarget.ITargetModel;	25	import org.eclipse.pde.internal.core.itarget.ITargetModel;
26	import org.eclipse.pde.internal.core.target.TargetModel;	26	import org.eclipse.pde.internal.core.target.TargetModel;
		27	import org.eclipse.pde.internal.ui.IHelpContextIds;
27	import org.eclipse.pde.internal.ui.PDEPlugin;	28	import org.eclipse.pde.internal.ui.PDEPlugin;
28	import org.eclipse.pde.internal.ui.PDEUIMessages;	29	import org.eclipse.pde.internal.ui.PDEUIMessages;
29	import org.eclipse.pde.internal.ui.editor.target.OpenTargetProfileAction;	30	import org.eclipse.pde.internal.ui.editor.target.OpenTargetProfileAction;
Lines 37-42 Link Here
37	import org.eclipse.swt.widgets.Combo;	38	import org.eclipse.swt.widgets.Combo;
38	import org.eclipse.swt.widgets.Composite;	39	import org.eclipse.swt.widgets.Composite;
39	import org.eclipse.swt.widgets.Group;	40	import org.eclipse.swt.widgets.Group;
		41	import org.eclipse.ui.PlatformUI;
40	import org.eclipse.ui.dialogs.WizardNewFileCreationPage;	42	import org.eclipse.ui.dialogs.WizardNewFileCreationPage;
41		43
42	public class TargetDefinitionWizardPage extends WizardNewFileCreationPage {	44	public class TargetDefinitionWizardPage extends WizardNewFileCreationPage {
Lines 63-68 Link Here
63	public void createControl(Composite parent) {	65	public void createControl(Composite parent) {
64	super.createControl(parent);	66	super.createControl(parent);
65	setFileName(EXTENSION);	67	setFileName(EXTENSION);
		68	PlatformUI.getWorkbench().getHelpSystem().setHelp(getControl(), IHelpContextIds.TARGET_DEFINITION_PAGE );
66	}	69	}
67		70
68	protected void createAdvancedControls(Composite parent) {	71	protected void createAdvancedControls(Composite parent) {

Lines 29-34 Link Here

(-)src/org/eclipse/pde/internal/ui/wizards/product/ProductFileWizadPage.java (+4 lines)
29	import org.eclipse.pde.core.plugin.IPluginModelBase;	29	import org.eclipse.pde.core.plugin.IPluginModelBase;
30	import org.eclipse.pde.internal.core.PDECore;	30	import org.eclipse.pde.internal.core.PDECore;
31	import org.eclipse.pde.internal.core.TargetPlatform;	31	import org.eclipse.pde.internal.core.TargetPlatform;
		32	import org.eclipse.pde.internal.ui.IHelpContextIds;
32	import org.eclipse.pde.internal.ui.PDEPlugin;	33	import org.eclipse.pde.internal.ui.PDEPlugin;
33	import org.eclipse.pde.internal.ui.PDEUIMessages;	34	import org.eclipse.pde.internal.ui.PDEUIMessages;
34	import org.eclipse.swt.SWT;	35	import org.eclipse.swt.SWT;
Lines 40-45 Link Here
40	import org.eclipse.swt.widgets.Combo;	41	import org.eclipse.swt.widgets.Combo;
41	import org.eclipse.swt.widgets.Composite;	42	import org.eclipse.swt.widgets.Composite;
42	import org.eclipse.swt.widgets.Group;	43	import org.eclipse.swt.widgets.Group;
		44	import org.eclipse.ui.PlatformUI;
43	import org.eclipse.ui.dialogs.WizardNewFileCreationPage;	45	import org.eclipse.ui.dialogs.WizardNewFileCreationPage;
44		46
45	public class ProductFileWizadPage extends WizardNewFileCreationPage {	47	public class ProductFileWizadPage extends WizardNewFileCreationPage {
Lines 224-229 Link Here
224	super.createControl(parent);	226	super.createControl(parent);
225	Dialog.applyDialogFont(fGroup);	227	Dialog.applyDialogFont(fGroup);
226	setFileName(".product"); //$NON-NLS-1$	228	setFileName(".product"); //$NON-NLS-1$
		229
		230	PlatformUI.getWorkbench().getHelpSystem().setHelp(getControl(), IHelpContextIds.PRODUCT_FILE_PAGE );
227	}	231	}
228		232
229	}	233	}

Lines 19-24 Link Here

(-)src/org/eclipse/pde/internal/ui/wizards/xhtml/XHTMLConversionWizardPage.java (+4 lines)
19	import org.eclipse.jface.viewers.ITreeContentProvider;	19	import org.eclipse.jface.viewers.ITreeContentProvider;
20	import org.eclipse.jface.viewers.Viewer;	20	import org.eclipse.jface.viewers.Viewer;
21	import org.eclipse.jface.wizard.WizardPage;	21	import org.eclipse.jface.wizard.WizardPage;
		22	import org.eclipse.pde.internal.ui.IHelpContextIds;
22	import org.eclipse.pde.internal.ui.PDEUIMessages;	23	import org.eclipse.pde.internal.ui.PDEUIMessages;
23	import org.eclipse.pde.internal.ui.wizards.xhtml.TocReplaceTable.TocReplaceEntry;	24	import org.eclipse.pde.internal.ui.wizards.xhtml.TocReplaceTable.TocReplaceEntry;
24	import org.eclipse.swt.SWT;	25	import org.eclipse.swt.SWT;
Lines 29-34 Link Here
29	import org.eclipse.swt.widgets.Button;	30	import org.eclipse.swt.widgets.Button;
30	import org.eclipse.swt.widgets.Composite;	31	import org.eclipse.swt.widgets.Composite;
31	import org.eclipse.swt.widgets.Label;	32	import org.eclipse.swt.widgets.Label;
		33	import org.eclipse.ui.PlatformUI;
32	import org.eclipse.ui.dialogs.ContainerCheckedTreeViewer;	34	import org.eclipse.ui.dialogs.ContainerCheckedTreeViewer;
33	import org.eclipse.ui.model.WorkbenchLabelProvider;	35	import org.eclipse.ui.model.WorkbenchLabelProvider;
34		36
Lines 123-128 Link Here
123		125
124	setControl(columns);	126	setControl(columns);
125	Dialog.applyDialogFont(columns);	127	Dialog.applyDialogFont(columns);
		128
		129	PlatformUI.getWorkbench().getHelpSystem().setHelp(columns, IHelpContextIds.XHTML_CONVERSION_PAGE );
126	}	130	}
127		131
128	protected Composite createComposite(Composite parent, boolean noMargin, int cols, boolean valignTop) {	132	protected Composite createComposite(Composite parent, boolean noMargin, int cols, boolean valignTop) {

Lines 10-19 Link Here

(-)src/org/eclipse/pde/internal/ui/editor/target/EnvironmentPage.java (+4 lines)
10	*******************************************************************************/	10	*******************************************************************************/
11	package org.eclipse.pde.internal.ui.editor.target;	11	package org.eclipse.pde.internal.ui.editor.target;
12		12
		13	import org.eclipse.pde.internal.ui.IHelpContextIds;
13	import org.eclipse.pde.internal.ui.PDEUIMessages;	14	import org.eclipse.pde.internal.ui.PDEUIMessages;
14	import org.eclipse.pde.internal.ui.editor.PDEFormPage;	15	import org.eclipse.pde.internal.ui.editor.PDEFormPage;
15	import org.eclipse.swt.layout.GridLayout;	16	import org.eclipse.swt.layout.GridLayout;
16	import org.eclipse.swt.widgets.Composite;	17	import org.eclipse.swt.widgets.Composite;
		18	import org.eclipse.ui.PlatformUI;
17	import org.eclipse.ui.forms.IManagedForm;	19	import org.eclipse.ui.forms.IManagedForm;
18	import org.eclipse.ui.forms.editor.FormEditor;	20	import org.eclipse.ui.forms.editor.FormEditor;
19	import org.eclipse.ui.forms.widgets.FormToolkit;	21	import org.eclipse.ui.forms.widgets.FormToolkit;
Lines 33-38 Link Here
33	form.setText(PDEUIMessages.EnvironmentPage_title);	35	form.setText(PDEUIMessages.EnvironmentPage_title);
34	FormToolkit toolkit = managedForm.getToolkit();	36	FormToolkit toolkit = managedForm.getToolkit();
35	fillBody(managedForm, toolkit);	37	fillBody(managedForm, toolkit);
		38
		39	PlatformUI.getWorkbench().getHelpSystem().setHelp(form.getBody(), IHelpContextIds.ENVIRONMENT_PAGE);
36	}	40	}
37		41
38	private void fillBody(IManagedForm managedForm, FormToolkit toolkit) {	42	private void fillBody(IManagedForm managedForm, FormToolkit toolkit) {

Lines 21-26 Link Here

(-)src/org/eclipse/pde/internal/ui/wizards/WizardTreeSelectionPage.java (+4 lines)
21	import org.eclipse.jface.viewers.TableViewer;	21	import org.eclipse.jface.viewers.TableViewer;
22	import org.eclipse.jface.viewers.TreeViewer;	22	import org.eclipse.jface.viewers.TreeViewer;
23	import org.eclipse.jface.wizard.IWizardNode;	23	import org.eclipse.jface.wizard.IWizardNode;
		24	import org.eclipse.pde.internal.ui.IHelpContextIds;
24	import org.eclipse.pde.internal.ui.elements.ElementLabelProvider;	25	import org.eclipse.pde.internal.ui.elements.ElementLabelProvider;
25	import org.eclipse.pde.internal.ui.elements.ListContentProvider;	26	import org.eclipse.pde.internal.ui.elements.ListContentProvider;
26	import org.eclipse.pde.internal.ui.elements.TreeContentProvider;	27	import org.eclipse.pde.internal.ui.elements.TreeContentProvider;
Lines 33-38 Link Here
33	import org.eclipse.swt.widgets.Table;	34	import org.eclipse.swt.widgets.Table;
34	import org.eclipse.swt.widgets.TableColumn;	35	import org.eclipse.swt.widgets.TableColumn;
35	import org.eclipse.swt.widgets.Tree;	36	import org.eclipse.swt.widgets.Tree;
		37	import org.eclipse.ui.PlatformUI;
36		38
37		39
38	public abstract class WizardTreeSelectionPage	40	public abstract class WizardTreeSelectionPage
Lines 153-158 Link Here
153	initializeViewers();	155	initializeViewers();
154	rootSash.setWeights(new int[] {70, 30});	156	rootSash.setWeights(new int[] {70, 30});
155	setControl(container);	157	setControl(container);
		158
		159	PlatformUI.getWorkbench().getHelpSystem().setHelp(parent, IHelpContextIds.TREE_SELECTION_PAGE );
156	}	160	}
157	protected Object getSingleSelection(IStructuredSelection selection) {	161	protected Object getSingleSelection(IStructuredSelection selection) {
158	Object selectedObject = selection.getFirstElement();	162	Object selectedObject = selection.getFirstElement();

Lines 38-43 Link Here

(-)src/org/eclipse/pde/internal/ui/nls/ExternalizeStringsWizardPage.java (-2 / +3 lines)
38	import org.eclipse.jface.viewers.ViewerFilter;	38	import org.eclipse.jface.viewers.ViewerFilter;
39	import org.eclipse.jface.wizard.WizardPage;	39	import org.eclipse.jface.wizard.WizardPage;
40	import org.eclipse.pde.core.plugin.IPluginModelBase;	40	import org.eclipse.pde.core.plugin.IPluginModelBase;
		41	import org.eclipse.pde.internal.ui.IHelpContextIds;
41	import org.eclipse.pde.internal.ui.PDEPlugin;	42	import org.eclipse.pde.internal.ui.PDEPlugin;
42	import org.eclipse.pde.internal.ui.PDEUIMessages;	43	import org.eclipse.pde.internal.ui.PDEUIMessages;
43	import org.eclipse.pde.internal.ui.editor.context.ManifestDocumentSetupParticipant;	44	import org.eclipse.pde.internal.ui.editor.context.ManifestDocumentSetupParticipant;
Lines 65-70 Link Here
65	import org.eclipse.swt.widgets.Text;	66	import org.eclipse.swt.widgets.Text;
66	import org.eclipse.swt.widgets.TreeItem;	67	import org.eclipse.swt.widgets.TreeItem;
67	import org.eclipse.text.edits.MalformedTreeException;	68	import org.eclipse.text.edits.MalformedTreeException;
		69	import org.eclipse.ui.PlatformUI;
68	import org.eclipse.ui.dialogs.ContainerCheckedTreeViewer;	70	import org.eclipse.ui.dialogs.ContainerCheckedTreeViewer;
69		71
70	public class ExternalizeStringsWizardPage extends WizardPage {	72	public class ExternalizeStringsWizardPage extends WizardPage {
Lines 248-255 Link Here
248	setControl(superSash);	250	setControl(superSash);
249	Dialog.applyDialogFont(superSash);	251	Dialog.applyDialogFont(superSash);
250		252
251	// TODO ADD HELP	253	PlatformUI.getWorkbench().getHelpSystem().setHelp(superSash, IHelpContextIds.EXTERNALIZE_STRINGS_PAGE);
252	// PlatformUI.getWorkbench().getHelpSystem().setHelp(superSash, IHelpContextIds.UPDATE_CLASSPATH);
253	}	254	}
254		255
255	private void createInputContents(Composite composite) {	256	private void createInputContents(Composite composite) {