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 277506 | Differences between
and this patch

Collapse All | Expand All

(-)src/org/eclipse/pde/internal/ui/editor/targetdefinition/EnvironmentPage.java (-3 / +2 lines)
Lines 49-59 Link Here
49
		FormToolkit toolkit = managedForm.getToolkit();
49
		FormToolkit toolkit = managedForm.getToolkit();
50
		fillBody(managedForm, toolkit);
50
		fillBody(managedForm, toolkit);
51
		toolkit.decorateFormHeading(form.getForm());
51
		toolkit.decorateFormHeading(form.getForm());
52
		// TODO Fix help URL
52
		((TargetEditor) getEditor()).contributeToToolbar(managedForm.getForm(), IHelpContextIds.TARGET_EDITOR_ENVIRONMENT_PAGE);
53
		((TargetEditor) getEditor()).contributeToToolbar(managedForm.getForm(), ""); //$NON-NLS-1$
54
		((TargetEditor) getEditor()).addForm(managedForm);
53
		((TargetEditor) getEditor()).addForm(managedForm);
55
		form.updateToolBar();
54
		form.updateToolBar();
56
		PlatformUI.getWorkbench().getHelpSystem().setHelp(form.getBody(), IHelpContextIds.ENVIRONMENT_PAGE);
55
		PlatformUI.getWorkbench().getHelpSystem().setHelp(form.getBody(), IHelpContextIds.TARGET_EDITOR_ENVIRONMENT_PAGE);
57
	}
56
	}
58
57
59
	/* (non-Javadoc)
58
	/* (non-Javadoc)
(-)src/org/eclipse/pde/internal/ui/editor/targetdefinition/ContentPage.java (-9 / +3 lines)
Lines 14-19 Link Here
14
import org.eclipse.pde.internal.ui.*;
14
import org.eclipse.pde.internal.ui.*;
15
import org.eclipse.pde.internal.ui.editor.FormLayoutFactory;
15
import org.eclipse.pde.internal.ui.editor.FormLayoutFactory;
16
import org.eclipse.swt.widgets.Composite;
16
import org.eclipse.swt.widgets.Composite;
17
import org.eclipse.ui.PlatformUI;
17
import org.eclipse.ui.forms.IManagedForm;
18
import org.eclipse.ui.forms.IManagedForm;
18
import org.eclipse.ui.forms.editor.FormPage;
19
import org.eclipse.ui.forms.editor.FormPage;
19
import org.eclipse.ui.forms.widgets.FormToolkit;
20
import org.eclipse.ui.forms.widgets.FormToolkit;
Lines 52-62 Link Here
52
		form.setImage(PDEPlugin.getDefault().getLabelProvider().get(PDEPluginImages.DESC_TARGET_DEFINITION));
53
		form.setImage(PDEPlugin.getDefault().getLabelProvider().get(PDEPluginImages.DESC_TARGET_DEFINITION));
53
		toolkit.decorateFormHeading(form.getForm());
54
		toolkit.decorateFormHeading(form.getForm());
54
		fillBody(managedForm, toolkit);
55
		fillBody(managedForm, toolkit);
55
		// TODO Finish help
56
		((TargetEditor) getEditor()).contributeToToolbar(managedForm.getForm(), IHelpContextIds.TARGET_EDITOR_CONTENT_PAGE);
56
		((TargetEditor) getEditor()).contributeToToolbar(managedForm.getForm(), ""); //$NON-NLS-1$
57
		((TargetEditor) getEditor()).addForm(managedForm);
57
		((TargetEditor) getEditor()).addForm(managedForm);
58
		form.updateToolBar();
58
		form.updateToolBar();
59
//		PlatformUI.getWorkbench().getHelpSystem().setHelp(form.getBody(), IHelpContextIds.TARGET_OVERVIEW_PAGE);
59
		PlatformUI.getWorkbench().getHelpSystem().setHelp(form.getBody(), IHelpContextIds.TARGET_EDITOR_CONTENT_PAGE);
60
	}
60
	}
61
61
62
	/* (non-Javadoc)
62
	/* (non-Javadoc)
Lines 80-89 Link Here
80
		((TargetEditor) getEditor()).setDirty(isDirty());
80
		((TargetEditor) getEditor()).setDirty(isDirty());
81
		return true;
81
		return true;
82
	}
82
	}
83
84
	// TODO Hook up help toolbar action
85
//	protected String getHelpResource() {
86
//		return "/org.eclipse.pde.doc.user/guide/tools/editors/target_definition_editor/overview.htm"; //$NON-NLS-1$
87
//	}
88
89
}
83
}
(-)src/org/eclipse/pde/internal/ui/editor/targetdefinition/TargetEditor.java (-3 / +4 lines)
Lines 263-269 Link Here
263
		editorDirtyStateChanged();
263
		editorDirtyStateChanged();
264
	}
264
	}
265
265
266
	public void contributeToToolbar(final ScrolledForm form, String helpURL) {
266
	public void contributeToToolbar(final ScrolledForm form, String contextID) {
267
		ControlContribution setAsTarget = new ControlContribution("Set") { //$NON-NLS-1$
267
		ControlContribution setAsTarget = new ControlContribution("Set") { //$NON-NLS-1$
268
			protected Control createControl(Composite parent) {
268
			protected Control createControl(Composite parent) {
269
				final ImageHyperlink hyperlink = new ImageHyperlink(parent, SWT.NONE);
269
				final ImageHyperlink hyperlink = new ImageHyperlink(parent, SWT.NONE);
Lines 286-297 Link Here
286
				return hyperlink;
286
				return hyperlink;
287
			}
287
			}
288
		};
288
		};
289
		final String href = ""; //$NON-NLS-1$
289
		final String helpContextID = contextID;
290
		Action help = new Action("help") { //$NON-NLS-1$
290
		Action help = new Action("help") { //$NON-NLS-1$
291
			public void run() {
291
			public void run() {
292
				BusyIndicator.showWhile(form.getForm().getDisplay(), new Runnable() {
292
				BusyIndicator.showWhile(form.getForm().getDisplay(), new Runnable() {
293
					public void run() {
293
					public void run() {
294
						PlatformUI.getWorkbench().getHelpSystem().displayHelpResource(href);
294
						PlatformUI.getWorkbench().getHelpSystem().displayHelp(helpContextID);
295
					}
295
					}
296
				});
296
				});
297
			}
297
			}
Lines 309-314 Link Here
309
	 */
309
	 */
310
	public void addForm(IManagedForm managedForm) {
310
	public void addForm(IManagedForm managedForm) {
311
		fManagedFormPages.add(managedForm);
311
		fManagedFormPages.add(managedForm);
312
		PlatformUI.getWorkbench().getHelpSystem().setHelp(managedForm.getForm().getBody(), IHelpContextIds.TARGET_EDITOR);
312
	}
313
	}
313
314
314
	/**
315
	/**
(-)src/org/eclipse/pde/internal/ui/editor/targetdefinition/ImplicitDependenciesSection.java (-3 / +4 lines)
Lines 10-17 Link Here
10
 *******************************************************************************/
10
 *******************************************************************************/
11
package org.eclipse.pde.internal.ui.editor.targetdefinition;
11
package org.eclipse.pde.internal.ui.editor.targetdefinition;
12
12
13
import org.eclipse.pde.internal.ui.shared.target.StyledBundleLabelProvider;
14
15
import java.util.*;
13
import java.util.*;
16
import java.util.List;
14
import java.util.List;
17
import org.eclipse.core.runtime.*;
15
import org.eclipse.core.runtime.*;
Lines 25-36 Link Here
25
import org.eclipse.pde.internal.ui.editor.FormLayoutFactory;
23
import org.eclipse.pde.internal.ui.editor.FormLayoutFactory;
26
import org.eclipse.pde.internal.ui.editor.plugin.ManifestEditor;
24
import org.eclipse.pde.internal.ui.editor.plugin.ManifestEditor;
27
import org.eclipse.pde.internal.ui.elements.DefaultTableProvider;
25
import org.eclipse.pde.internal.ui.elements.DefaultTableProvider;
26
import org.eclipse.pde.internal.ui.shared.target.StyledBundleLabelProvider;
28
import org.eclipse.swt.SWT;
27
import org.eclipse.swt.SWT;
29
import org.eclipse.swt.events.SelectionAdapter;
28
import org.eclipse.swt.events.SelectionAdapter;
30
import org.eclipse.swt.events.SelectionEvent;
29
import org.eclipse.swt.events.SelectionEvent;
31
import org.eclipse.swt.layout.GridData;
30
import org.eclipse.swt.layout.GridData;
32
import org.eclipse.swt.layout.GridLayout;
31
import org.eclipse.swt.layout.GridLayout;
33
import org.eclipse.swt.widgets.*;
32
import org.eclipse.swt.widgets.*;
33
import org.eclipse.ui.PlatformUI;
34
import org.eclipse.ui.dialogs.ElementListSelectionDialog;
34
import org.eclipse.ui.dialogs.ElementListSelectionDialog;
35
import org.eclipse.ui.forms.IFormColors;
35
import org.eclipse.ui.forms.IFormColors;
36
import org.eclipse.ui.forms.SectionPart;
36
import org.eclipse.ui.forms.SectionPart;
Lines 199-205 Link Here
199
		} catch (CoreException e) {
199
		} catch (CoreException e) {
200
			dialog.setMessage(e.getMessage());
200
			dialog.setMessage(e.getMessage());
201
		}
201
		}
202
202
		dialog.create();
203
		PlatformUI.getWorkbench().getHelpSystem().setHelp(dialog.getShell(), IHelpContextIds.IMPLICIT_DEPENDENCIES_SELECTION_DIALOG);
203
		if (dialog.open() == Window.OK) {
204
		if (dialog.open() == Window.OK) {
204
			Object[] models = dialog.getResult();
205
			Object[] models = dialog.getResult();
205
			ArrayList pluginsToAdd = new ArrayList();
206
			ArrayList pluginsToAdd = new ArrayList();
(-)src/org/eclipse/pde/internal/ui/editor/targetdefinition/DefinitionPage.java (-9 / +2 lines)
Lines 59-69 Link Here
59
		form.setImage(PDEPlugin.getDefault().getLabelProvider().get(PDEPluginImages.DESC_TARGET_DEFINITION));
59
		form.setImage(PDEPlugin.getDefault().getLabelProvider().get(PDEPluginImages.DESC_TARGET_DEFINITION));
60
		toolkit.decorateFormHeading(form.getForm());
60
		toolkit.decorateFormHeading(form.getForm());
61
		fillBody(managedForm, toolkit);
61
		fillBody(managedForm, toolkit);
62
		// TODO Finish help
62
		((TargetEditor) getEditor()).contributeToToolbar(managedForm.getForm(), IHelpContextIds.TARGET_EDITOR_DEFINITION_PAGE);
63
		((TargetEditor) getEditor()).contributeToToolbar(managedForm.getForm(), ""); //$NON-NLS-1$
64
		((TargetEditor) getEditor()).addForm(managedForm);
63
		((TargetEditor) getEditor()).addForm(managedForm);
65
		form.updateToolBar();
64
		form.updateToolBar();
66
		PlatformUI.getWorkbench().getHelpSystem().setHelp(form.getBody(), IHelpContextIds.TARGET_OVERVIEW_PAGE);
65
		PlatformUI.getWorkbench().getHelpSystem().setHelp(form.getBody(), IHelpContextIds.TARGET_EDITOR_DEFINITION_PAGE);
67
	}
66
	}
68
67
69
	/* (non-Javadoc)
68
	/* (non-Javadoc)
Lines 147-156 Link Here
147
		((TargetEditor) getEditor()).setDirty(isDirty());
146
		((TargetEditor) getEditor()).setDirty(isDirty());
148
		return true;
147
		return true;
149
	}
148
	}
150
151
	// TODO Hook up help toolbar action
152
//	protected String getHelpResource() {
153
//		return "/org.eclipse.pde.doc.user/guide/tools/editors/target_definition_editor/overview.htm"; //$NON-NLS-1$
154
//	}
155
156
}
149
}
(-)src/org/eclipse/pde/internal/ui/shared/target/EditIUContainerPage.java (-1 / +5 lines)
Lines 154-160 Link Here
154
		restoreWidgetState();
154
		restoreWidgetState();
155
		setControl(composite);
155
		setControl(composite);
156
		setPageComplete(false);
156
		setPageComplete(false);
157
		PlatformUI.getWorkbench().getHelpSystem().setHelp(composite, IHelpContextIds.P2_PROVISIONING_PAGE);
157
		if (fEditContainer == null) {
158
			PlatformUI.getWorkbench().getHelpSystem().setHelp(composite, IHelpContextIds.LOCATION_ADD_SITE_WIZARD);
159
		} else {
160
			PlatformUI.getWorkbench().getHelpSystem().setHelp(composite, IHelpContextIds.LOCATION_EDIT_SITE_WIZARD);
161
		}
158
	}
162
	}
159
163
160
	/**
164
	/**
(-)src/org/eclipse/pde/internal/ui/shared/target/PreviewContainerPage.java (-2 / +3 lines)
Lines 19-28 Link Here
19
import org.eclipse.jface.wizard.WizardPage;
19
import org.eclipse.jface.wizard.WizardPage;
20
import org.eclipse.pde.internal.core.target.provisional.IBundleContainer;
20
import org.eclipse.pde.internal.core.target.provisional.IBundleContainer;
21
import org.eclipse.pde.internal.core.target.provisional.ITargetDefinition;
21
import org.eclipse.pde.internal.core.target.provisional.ITargetDefinition;
22
import org.eclipse.pde.internal.ui.PDEPlugin;
22
import org.eclipse.pde.internal.ui.*;
23
import org.eclipse.pde.internal.ui.SWTFactory;
24
import org.eclipse.swt.layout.GridData;
23
import org.eclipse.swt.layout.GridData;
25
import org.eclipse.swt.widgets.Composite;
24
import org.eclipse.swt.widgets.Composite;
25
import org.eclipse.ui.PlatformUI;
26
26
27
/**
27
/**
28
 * Wizard page that displays the contents of a bundle container in a table
28
 * Wizard page that displays the contents of a bundle container in a table
Lines 54-59 Link Here
54
		fPreviewTable.setContentProvider(ArrayContentProvider.getInstance());
54
		fPreviewTable.setContentProvider(ArrayContentProvider.getInstance());
55
		fPreviewTable.getControl().setLayoutData(new GridData(GridData.FILL_BOTH));
55
		fPreviewTable.getControl().setLayoutData(new GridData(GridData.FILL_BOTH));
56
		setControl(composite);
56
		setControl(composite);
57
		PlatformUI.getWorkbench().getHelpSystem().setHelp(composite, IHelpContextIds.LOCATION_PREVIEW_WIZARD);
57
	}
58
	}
58
59
59
	/**
60
	/**
(-)src/org/eclipse/pde/internal/ui/shared/target/AddFeatureContainersPage.java (+6 lines)
Lines 28-33 Link Here
28
import org.eclipse.swt.layout.GridData;
28
import org.eclipse.swt.layout.GridData;
29
import org.eclipse.swt.widgets.Button;
29
import org.eclipse.swt.widgets.Button;
30
import org.eclipse.swt.widgets.Composite;
30
import org.eclipse.swt.widgets.Composite;
31
import org.eclipse.ui.PlatformUI;
31
32
32
/**
33
/**
33
 * Wizard page for creating one or more feature bundle containers.
34
 * Wizard page for creating one or more feature bundle containers.
Lines 43-48 Link Here
43
	private Button fIncludeVersionButton;
44
	private Button fIncludeVersionButton;
44
	private CheckboxTableViewer fFeatureTable;
45
	private CheckboxTableViewer fFeatureTable;
45
46
47
	protected AddFeatureContainersPage() {
48
		super(null, "AddFeatureContainers"); //$NON-NLS-1$
49
	}
50
46
	/* (non-Javadoc)
51
	/* (non-Javadoc)
47
	 * @see org.eclipse.pde.internal.ui.shared.target.EditDirectoryContainerPage#getDefaultTitle()
52
	 * @see org.eclipse.pde.internal.ui.shared.target.EditDirectoryContainerPage#getDefaultTitle()
48
	 */
53
	 */
Lines 63-68 Link Here
63
	protected void createLocationArea(Composite parent) {
68
	protected void createLocationArea(Composite parent) {
64
		super.createLocationArea(parent);
69
		super.createLocationArea(parent);
65
		createTableArea(parent);
70
		createTableArea(parent);
71
		PlatformUI.getWorkbench().getHelpSystem().setHelp(parent, IHelpContextIds.LOCATION_ADD_FEATURE_WIZARD);
66
	}
72
	}
67
73
68
	/* (non-Javadoc)
74
	/* (non-Javadoc)
(-)src/org/eclipse/pde/internal/ui/shared/target/EditFeatureContainerPage.java (-5 / +5 lines)
Lines 10-25 Link Here
10
 *******************************************************************************/
10
 *******************************************************************************/
11
package org.eclipse.pde.internal.ui.shared.target;
11
package org.eclipse.pde.internal.ui.shared.target;
12
12
13
import org.eclipse.pde.internal.core.target.FeatureBundleContainer;
14
15
import org.eclipse.core.runtime.CoreException;
13
import org.eclipse.core.runtime.CoreException;
14
import org.eclipse.pde.internal.core.target.FeatureBundleContainer;
16
import org.eclipse.pde.internal.core.target.provisional.IBundleContainer;
15
import org.eclipse.pde.internal.core.target.provisional.IBundleContainer;
17
import org.eclipse.pde.internal.ui.PDEPlugin;
16
import org.eclipse.pde.internal.ui.*;
18
import org.eclipse.pde.internal.ui.SWTFactory;
19
import org.eclipse.swt.SWT;
17
import org.eclipse.swt.SWT;
20
import org.eclipse.swt.layout.GridData;
18
import org.eclipse.swt.layout.GridData;
21
import org.eclipse.swt.widgets.Composite;
19
import org.eclipse.swt.widgets.Composite;
22
import org.eclipse.swt.widgets.Text;
20
import org.eclipse.swt.widgets.Text;
21
import org.eclipse.ui.PlatformUI;
23
22
24
/**
23
/**
25
 * Wizard page for editing a feature bundle container, currently none of the options can be changed
24
 * Wizard page for editing a feature bundle container, currently none of the options can be changed
Lines 28-34 Link Here
28
public class EditFeatureContainerPage extends EditDirectoryContainerPage {
27
public class EditFeatureContainerPage extends EditDirectoryContainerPage {
29
28
30
	public EditFeatureContainerPage(IBundleContainer container) {
29
	public EditFeatureContainerPage(IBundleContainer container) {
31
		super(container);
30
		super(container, "EditFeatureContainer"); //$NON-NLS-1$
32
	}
31
	}
33
32
34
	/* (non-Javadoc)
33
	/* (non-Javadoc)
Lines 51-56 Link Here
51
	protected void createLocationArea(Composite parent) {
50
	protected void createLocationArea(Composite parent) {
52
		FeatureBundleContainer container = (FeatureBundleContainer) getBundleContainer();
51
		FeatureBundleContainer container = (FeatureBundleContainer) getBundleContainer();
53
		Composite comp = SWTFactory.createComposite(parent, 2, 1, GridData.FILL_HORIZONTAL);
52
		Composite comp = SWTFactory.createComposite(parent, 2, 1, GridData.FILL_HORIZONTAL);
53
		PlatformUI.getWorkbench().getHelpSystem().setHelp(parent, IHelpContextIds.LOCATION_EDIT_FEATURE_WIZARD);
54
54
55
		SWTFactory.createLabel(comp, Messages.EditFeatureContainerPage_2, 1);
55
		SWTFactory.createLabel(comp, Messages.EditFeatureContainerPage_2, 1);
56
		Text text = SWTFactory.createText(comp, SWT.READ_ONLY | SWT.BORDER, 1);
56
		Text text = SWTFactory.createText(comp, SWT.READ_ONLY | SWT.BORDER, 1);
(-)src/org/eclipse/pde/internal/ui/shared/target/EditProfileContainerPage.java (-4 / +11 lines)
Lines 10-17 Link Here
10
 *******************************************************************************/
10
 *******************************************************************************/
11
package org.eclipse.pde.internal.ui.shared.target;
11
package org.eclipse.pde.internal.ui.shared.target;
12
12
13
import org.eclipse.pde.internal.core.target.ProfileBundleContainer;
14
15
import java.io.File;
13
import java.io.File;
16
import java.util.ArrayList;
14
import java.util.ArrayList;
17
import java.util.List;
15
import java.util.List;
Lines 20-31 Link Here
20
import org.eclipse.debug.ui.StringVariableSelectionDialog;
18
import org.eclipse.debug.ui.StringVariableSelectionDialog;
21
import org.eclipse.jface.dialogs.IDialogSettings;
19
import org.eclipse.jface.dialogs.IDialogSettings;
22
import org.eclipse.jface.dialogs.IMessageProvider;
20
import org.eclipse.jface.dialogs.IMessageProvider;
21
import org.eclipse.pde.internal.core.target.ProfileBundleContainer;
23
import org.eclipse.pde.internal.core.target.provisional.IBundleContainer;
22
import org.eclipse.pde.internal.core.target.provisional.IBundleContainer;
23
import org.eclipse.pde.internal.ui.IHelpContextIds;
24
import org.eclipse.pde.internal.ui.SWTFactory;
24
import org.eclipse.pde.internal.ui.SWTFactory;
25
import org.eclipse.swt.SWT;
25
import org.eclipse.swt.SWT;
26
import org.eclipse.swt.events.*;
26
import org.eclipse.swt.events.*;
27
import org.eclipse.swt.layout.GridData;
27
import org.eclipse.swt.layout.GridData;
28
import org.eclipse.swt.widgets.*;
28
import org.eclipse.swt.widgets.*;
29
import org.eclipse.ui.PlatformUI;
29
30
30
/**
31
/**
31
 * Wizard page for creating a profile (installation) bundle container.
32
 * Wizard page for creating a profile (installation) bundle container.
Lines 58-68 Link Here
58
	private static final String SETTINGS_CONFIG_3 = "config3"; //$NON-NLS-1$
59
	private static final String SETTINGS_CONFIG_3 = "config3"; //$NON-NLS-1$
59
60
60
	public EditProfileContainerPage() {
61
	public EditProfileContainerPage() {
61
		super();
62
		super(null, "EditProfileContainer"); //$NON-NLS-1$
62
	}
63
	}
63
64
64
	public EditProfileContainerPage(IBundleContainer container) {
65
	public EditProfileContainerPage(IBundleContainer container) {
65
		super(container);
66
		super(container, "EditProfileContainer"); //$NON-NLS-1$
66
	}
67
	}
67
68
68
	/* (non-Javadoc)
69
	/* (non-Javadoc)
Lines 90-95 Link Here
90
91
91
		Composite configComp = SWTFactory.createComposite(parent, 2, 1, GridData.FILL_HORIZONTAL, 0, 0);
92
		Composite configComp = SWTFactory.createComposite(parent, 2, 1, GridData.FILL_HORIZONTAL, 0, 0);
92
93
94
		if (fContainer == null) {
95
			PlatformUI.getWorkbench().getHelpSystem().setHelp(parent, IHelpContextIds.LOCATION_ADD_INSTALLATION_WIZARD);
96
		} else {
97
			PlatformUI.getWorkbench().getHelpSystem().setHelp(parent, IHelpContextIds.LOCATION_EDIT_INSTALLATION_WIZARD);
98
		}
99
93
		fUseDefaultConfig = new Button(configComp, SWT.CHECK | SWT.RIGHT);
100
		fUseDefaultConfig = new Button(configComp, SWT.CHECK | SWT.RIGHT);
94
		GridData gd = new GridData();
101
		GridData gd = new GridData();
95
		gd.horizontalSpan = 2;
102
		gd.horizontalSpan = 2;
(-)src/org/eclipse/pde/internal/ui/shared/target/ArgumentsFromContainerSelectionDialog.java (-2 / +3 lines)
Lines 19-32 Link Here
19
import org.eclipse.jface.viewers.*;
19
import org.eclipse.jface.viewers.*;
20
import org.eclipse.pde.internal.core.target.provisional.IBundleContainer;
20
import org.eclipse.pde.internal.core.target.provisional.IBundleContainer;
21
import org.eclipse.pde.internal.core.target.provisional.ITargetDefinition;
21
import org.eclipse.pde.internal.core.target.provisional.ITargetDefinition;
22
import org.eclipse.pde.internal.ui.PDEPlugin;
22
import org.eclipse.pde.internal.ui.*;
23
import org.eclipse.pde.internal.ui.SWTFactory;
24
import org.eclipse.swt.SWT;
23
import org.eclipse.swt.SWT;
25
import org.eclipse.swt.events.SelectionAdapter;
24
import org.eclipse.swt.events.SelectionAdapter;
26
import org.eclipse.swt.events.SelectionEvent;
25
import org.eclipse.swt.events.SelectionEvent;
27
import org.eclipse.swt.layout.GridData;
26
import org.eclipse.swt.layout.GridData;
28
import org.eclipse.swt.layout.GridLayout;
27
import org.eclipse.swt.layout.GridLayout;
29
import org.eclipse.swt.widgets.*;
28
import org.eclipse.swt.widgets.*;
29
import org.eclipse.ui.PlatformUI;
30
30
31
/**
31
/**
32
 * A dialog where the user can select arguments provided by installation (profile) containers in
32
 * A dialog where the user can select arguments provided by installation (profile) containers in
Lines 87-92 Link Here
87
			}
87
			}
88
		}
88
		}
89
89
90
		PlatformUI.getWorkbench().getHelpSystem().setHelp(parent, IHelpContextIds.ARGS_FROM_CONTAINER_SELECTION_DIALOG);
90
		Composite comp = SWTFactory.createComposite(parent, 1, 1, GridData.FILL_BOTH, 10, 10);
91
		Composite comp = SWTFactory.createComposite(parent, 1, 1, GridData.FILL_BOTH, 10, 10);
91
		((GridLayout) comp.getLayout()).verticalSpacing = 10;
92
		((GridLayout) comp.getLayout()).verticalSpacing = 10;
92
93
(-)src/org/eclipse/pde/internal/ui/shared/target/AddBundleContainerSelectionPage.java (+1 lines)
Lines 143-148 Link Here
143
		sashForm.setWeights(new int[] {70, 30});
143
		sashForm.setWeights(new int[] {70, 30});
144
		initViewerContents(wizardSelectionViewer);
144
		initViewerContents(wizardSelectionViewer);
145
		setControl(comp);
145
		setControl(comp);
146
		PlatformUI.getWorkbench().getHelpSystem().setHelp(parent, IHelpContextIds.ADD_LOCATION_WIZARD);
146
	}
147
	}
147
148
148
	/**
149
	/**
(-)src/org/eclipse/pde/internal/ui/shared/target/EditDirectoryContainerPage.java (-5 / +16 lines)
Lines 10-18 Link Here
10
 *******************************************************************************/
10
 *******************************************************************************/
11
package org.eclipse.pde.internal.ui.shared.target;
11
package org.eclipse.pde.internal.ui.shared.target;
12
12
13
import org.eclipse.pde.internal.core.target.AbstractBundleContainer;
14
import org.eclipse.pde.internal.core.target.DirectoryBundleContainer;
15
16
import java.io.File;
13
import java.io.File;
17
import java.util.ArrayList;
14
import java.util.ArrayList;
18
import java.util.List;
15
import java.util.List;
Lines 24-37 Link Here
24
import org.eclipse.jface.dialogs.IMessageProvider;
21
import org.eclipse.jface.dialogs.IMessageProvider;
25
import org.eclipse.jface.wizard.WizardPage;
22
import org.eclipse.jface.wizard.WizardPage;
26
import org.eclipse.pde.internal.core.PDECore;
23
import org.eclipse.pde.internal.core.PDECore;
24
import org.eclipse.pde.internal.core.target.AbstractBundleContainer;
25
import org.eclipse.pde.internal.core.target.DirectoryBundleContainer;
27
import org.eclipse.pde.internal.core.target.provisional.IBundleContainer;
26
import org.eclipse.pde.internal.core.target.provisional.IBundleContainer;
28
import org.eclipse.pde.internal.core.target.provisional.ITargetPlatformService;
27
import org.eclipse.pde.internal.core.target.provisional.ITargetPlatformService;
29
import org.eclipse.pde.internal.ui.PDEPlugin;
28
import org.eclipse.pde.internal.ui.*;
30
import org.eclipse.pde.internal.ui.SWTFactory;
31
import org.eclipse.swt.SWT;
29
import org.eclipse.swt.SWT;
32
import org.eclipse.swt.events.*;
30
import org.eclipse.swt.events.*;
33
import org.eclipse.swt.layout.GridData;
31
import org.eclipse.swt.layout.GridData;
34
import org.eclipse.swt.widgets.*;
32
import org.eclipse.swt.widgets.*;
33
import org.eclipse.ui.PlatformUI;
35
import org.eclipse.ui.progress.UIJob;
34
import org.eclipse.ui.progress.UIJob;
36
35
37
/**
36
/**
Lines 77-82 Link Here
77
		super("EditDirectoryContainer"); //$NON-NLS-1$
76
		super("EditDirectoryContainer"); //$NON-NLS-1$
78
	}
77
	}
79
78
79
	public EditDirectoryContainerPage(IBundleContainer container, String name) {
80
		super(name);
81
		fContainer = container;
82
	}
83
80
	/* (non-Javadoc)
84
	/* (non-Javadoc)
81
	 * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite)
85
	 * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite)
82
	 */
86
	 */
Lines 88-93 Link Here
88
		createLocationArea(comp);
92
		createLocationArea(comp);
89
		setControl(comp);
93
		setControl(comp);
90
		initializeInputFields(fContainer);
94
		initializeInputFields(fContainer);
95
		if ("EditDirectoryContainer".equalsIgnoreCase(getName())) { //$NON-NLS-1$
96
			if (fContainer == null) {
97
				PlatformUI.getWorkbench().getHelpSystem().setHelp(comp, IHelpContextIds.LOCATION_ADD_DIRECTORY_WIZARD);
98
			} else {
99
				PlatformUI.getWorkbench().getHelpSystem().setHelp(comp, IHelpContextIds.LOCATION_EDIT_DIRECTORY_WIZARD);
100
			}
101
		}
91
	}
102
	}
92
103
93
	/**
104
	/**
(-)src/org/eclipse/pde/internal/ui/IHelpContextIds.java (-16 / +29 lines)
Lines 19-35 Link Here
19
	public static final String BUILD_OPTIONS_PREFERENCE_PAGE = PREFIX + "build_options_preference_page"; //$NON-NLS-1$
19
	public static final String BUILD_OPTIONS_PREFERENCE_PAGE = PREFIX + "build_options_preference_page"; //$NON-NLS-1$
20
	public static final String EDITOR_PREFERENCE_PAGE = PREFIX + "editor_preference_page"; //$NON-NLS-1$
20
	public static final String EDITOR_PREFERENCE_PAGE = PREFIX + "editor_preference_page"; //$NON-NLS-1$
21
	public static final String OSGI_PREFERENCE_PAGE = PREFIX + "osgi_preference_page"; //$NON-NLS-1$
21
	public static final String OSGI_PREFERENCE_PAGE = PREFIX + "osgi_preference_page"; //$NON-NLS-1$
22
	public static final String SOURCE_PREFERENCE_PAGE = PREFIX + "source_preference_page"; //$NON-NLS-1$
23
	public static final String TARGET_PLUGINS_PREFERENCE_PAGE = PREFIX + "target_plugins_preference_page"; //$NON-NLS-1$
24
	public static final String TARGET_PROVISIONERS_PREFERENCE_PAGE = PREFIX + "target_provisioners_preference_page"; //$NON-NLS-1$
22
	public static final String TARGET_PROVISIONERS_PREFERENCE_PAGE = PREFIX + "target_provisioners_preference_page"; //$NON-NLS-1$
25
	public static final String IMPLICIT_PLUGINS_PREFERENCE_PAGE = PREFIX + "implicit_plugins_preference_page"; //$NON-NLS-1$
26
	public static final String IMPLICIT_PLUGINS_SELECTION_DIALOG = PREFIX + "implicit_plugins_selection_dialog"; //$NON-NLS-1$
27
	public static final String LAUNCHING_ARGS_PREFERENCE_PAGE = PREFIX + "launching_args_preference_page"; //$NON-NLS-1$
28
	public static final String COMPILERS_PREFERENCE_PAGE = PREFIX + "compilers_preference_page"; //$NON-NLS-1$
23
	public static final String COMPILERS_PREFERENCE_PAGE = PREFIX + "compilers_preference_page"; //$NON-NLS-1$
29
	public static final String PROJECT_SELECTION_DIALOG = PREFIX + "project_selection_dialog"; //$NON-NLS-1$
24
	public static final String PROJECT_SELECTION_DIALOG = PREFIX + "project_selection_dialog"; //$NON-NLS-1$
30
	public static final String TARGET_ENVIRONMENT_PREFERENCE_PAGE = PREFIX + "target_environment_preference_page"; //$NON-NLS-1$
31
	public static final String TARGET_PLATFORM_PREFERENCE_PAGE = PREFIX + "target_platform_preference_page"; //$NON-NLS-1$
25
	public static final String TARGET_PLATFORM_PREFERENCE_PAGE = PREFIX + "target_platform_preference_page"; //$NON-NLS-1$
32
	public static final String TARGET_SELECTION_DIALOG = PREFIX + "target_selection_dialog"; //$NON-NLS-1$
33
26
34
	// Property Pages
27
	// Property Pages
35
	public static final String SELFHOSTING_PROPERTY_PAGE = PREFIX + "selfhosting_property_page"; //$NON-NLS-1$
28
	public static final String SELFHOSTING_PROPERTY_PAGE = PREFIX + "selfhosting_property_page"; //$NON-NLS-1$
Lines 40-46 Link Here
40
33
41
	public static final String DEPENDENCIES_VIEW = PREFIX + "dependencies_view"; //$NON-NLS-1$
34
	public static final String DEPENDENCIES_VIEW = PREFIX + "dependencies_view"; //$NON-NLS-1$
42
	public static final String HISTORY_ACTION = PREFIX + "history_action"; //$NON-NLS-1$
35
	public static final String HISTORY_ACTION = PREFIX + "history_action"; //$NON-NLS-1$
43
	public static final String TARGET_STATE_VIEW = PREFIX + "target_state_view"; //$NON-NLS-1$
36
	public static final String TARGET_STATE_VIEW = PREFIX + "target_platform_state"; //$NON-NLS-1$
44
	public static final String HISTORY_LIST_ACTION = PREFIX + "history_list_action"; //$NON-NLS-1$
37
	public static final String HISTORY_LIST_ACTION = PREFIX + "history_list_action"; //$NON-NLS-1$
45
	public static final String HISTORY_LIST_DIALOG = PREFIX + "history_list_dialog"; //$NON-NLS-1$
38
	public static final String HISTORY_LIST_DIALOG = PREFIX + "history_list_dialog"; //$NON-NLS-1$
46
39
Lines 116-122 Link Here
116
	public static final String EXTERNALIZE_STRINGS_PAGE = PREFIX + "externalize_strings_page"; //$NON-NLS-1$
109
	public static final String EXTERNALIZE_STRINGS_PAGE = PREFIX + "externalize_strings_page"; //$NON-NLS-1$
117
	public static final String CHEAT_SHEET_PAGE = PREFIX + "cheat_sheet_page"; //$NON-NLS-1$
110
	public static final String CHEAT_SHEET_PAGE = PREFIX + "cheat_sheet_page"; //$NON-NLS-1$
118
	public static final String PRODUCT_FILE_PAGE = PREFIX + "product_file_page"; //$NON-NLS-1$
111
	public static final String PRODUCT_FILE_PAGE = PREFIX + "product_file_page"; //$NON-NLS-1$
112
	//This TARGET_DEFINITION_PAGE points to old target help.
119
	public static final String TARGET_DEFINITION_PAGE = PREFIX + "target_definition_page"; //$NON-NLS-1$
113
	public static final String TARGET_DEFINITION_PAGE = PREFIX + "target_definition_page"; //$NON-NLS-1$
114
	//These are the new target help links
115
	public static final String NEW_TARGET_WIZARD = PREFIX + "new_target_wizard"; //$NON-NLS-1$
116
	public static final String EDIT_TARGET_WIZARD = PREFIX + "edit_target_wizard"; //$NON-NLS-1$
117
	public static final String EDIT_TARGET_WIZARD_LOCATIONS_TAB = PREFIX + "edit_target_wizard_locations_tab"; //$NON-NLS-1$
118
	public static final String EDIT_TARGET_WIZARD_ARGUMENT_TAB = PREFIX + "edit_target_wizard_argument_tab"; //$NON-NLS-1$
119
	public static final String EDIT_TARGET_WIZARD_CONTENT_TAB = PREFIX + "edit_target_wizard_content_tab"; //$NON-NLS-1$
120
	public static final String EDIT_TARGET_WIZARD_ENVIRONMENT_TAB = PREFIX + "edit_target_wizard_environment_tab"; //$NON-NLS-1$
121
	public static final String EDIT_TARGET_WIZARD_IMPLICIT_TAB = PREFIX + "edit_target_wizard_implicit_tab"; //$NON-NLS-1$
122
	public static final String MOVE_TARGET_WIZARD = PREFIX + "move_target_wizard"; //$NON-NLS-1$
123
	public static final String ADD_LOCATION_WIZARD = PREFIX + "add_location_wizard"; //$NON-NLS-1$
124
	public static final String LOCATION_PREVIEW_WIZARD = PREFIX + "location_preview_wizard"; //$NON-NLS-1$
125
	public static final String LOCATION_EDIT_DIRECTORY_WIZARD = PREFIX + "location_edit_directory_wizard"; //$NON-NLS-1$
126
	public static final String LOCATION_ADD_DIRECTORY_WIZARD = PREFIX + "location_add_directory_wizard"; //$NON-NLS-1$
127
	public static final String LOCATION_ADD_FEATURE_WIZARD = PREFIX + "location_add_feature_wizard"; //$NON-NLS-1$
128
	public static final String LOCATION_EDIT_FEATURE_WIZARD = PREFIX + "location_edit_feature_wizard"; //$NON-NLS-1$
129
	public static final String LOCATION_ADD_INSTALLATION_WIZARD = PREFIX + "location_add_installation_wizard"; //$NON-NLS-1$
130
	public static final String LOCATION_EDIT_INSTALLATION_WIZARD = PREFIX + "location_edit_installation_wizard"; //$NON-NLS-1$
131
	public static final String LOCATION_ADD_SITE_WIZARD = PREFIX + "location_add_site_wizard"; //$NON-NLS-1$
132
	public static final String LOCATION_EDIT_SITE_WIZARD = PREFIX + "location_edit_site_wizard"; //$NON-NLS-1$
120
	public static final String TOC_PAGE = PREFIX + "toc_page"; //$NON-NLS-1$
133
	public static final String TOC_PAGE = PREFIX + "toc_page"; //$NON-NLS-1$
121
134
122
	public static final String XHTML_CONVERSION_PAGE = PREFIX + "xhtml_conversion_page"; //$NON-NLS-1$
135
	public static final String XHTML_CONVERSION_PAGE = PREFIX + "xhtml_conversion_page"; //$NON-NLS-1$
Lines 168-173 Link Here
168
181
169
	public static final String FILTERED_PLUGIN_ARTIFACTS_DIALOG = PREFIX + "filtered_plugin_artifacts_dialog"; //$NON-NLS-1$
182
	public static final String FILTERED_PLUGIN_ARTIFACTS_DIALOG = PREFIX + "filtered_plugin_artifacts_dialog"; //$NON-NLS-1$
170
183
184
	public static final String IMPLICIT_DEPENDENCIES_SELECTION_DIALOG = PREFIX + "implicit_dependencies_selection_dialog"; //$NON-NLS-1$
185
	public static final String ARGS_FROM_CONTAINER_SELECTION_DIALOG = PREFIX + "import_arguments_dialog"; //$NON-NLS-1$
186
171
	// Generic source page
187
	// Generic source page
172
	public static final String MANIFEST_SOURCE_PAGE = PREFIX + "manifest_source_page"; //$NON-NLS-1$
188
	public static final String MANIFEST_SOURCE_PAGE = PREFIX + "manifest_source_page"; //$NON-NLS-1$
173
189
Lines 239-253 Link Here
239
	public static final String OVERVIEW_PAGE = PREFIX + "overview_page"; //$NON-NLS-1$
255
	public static final String OVERVIEW_PAGE = PREFIX + "overview_page"; //$NON-NLS-1$
240
	public static final String LICENSING_PAGE = PREFIX + "licensing_page"; //$NON-NLS-1$
256
	public static final String LICENSING_PAGE = PREFIX + "licensing_page"; //$NON-NLS-1$
241
257
242
	public static final String ENVIRONMENT_PAGE = PREFIX + "environment_page"; //$NON-NLS-1$	
258
	public static final String TARGET_EDITOR = PREFIX + "target_editor"; //$NON-NLS-1$
243
	public static final String TARGET_OVERVIEW_PAGE = PREFIX + "target_overview_page"; //$NON-NLS-1$
259
	public static final String TARGET_EDITOR_ENVIRONMENT_PAGE = PREFIX + "target_editor_environment_page"; //$NON-NLS-1$	
260
	public static final String TARGET_EDITOR_DEFINITION_PAGE = PREFIX + "target_editor_definition_page"; //$NON-NLS-1$
261
	public static final String TARGET_EDITOR_CONTENT_PAGE = PREFIX + "target_editor_content_page"; //$NON-NLS-1$
244
262
245
	// Tools
263
	// Tools
246
	public static final String ORGANIZE_MANIFESTS = PREFIX + "organize_manifest"; //$NON-NLS-1$
264
	public static final String ORGANIZE_MANIFESTS = PREFIX + "organize_manifest"; //$NON-NLS-1$
247
265
248
	// Provisioning
266
}
249
	public static final String FILE_SYSTEM_PROVISIONING_PAGE = PREFIX + "file_system_provisioning_page"; //$NON-NLS-1$
250
	public static final String UPDATE_SITE_PROVISIONING_PAGE = PREFIX + "update_site_provisioning_page"; //$NON-NLS-1$
251
	public static final String P2_PROVISIONING_PAGE = PREFIX + "p2_provisioning_page"; //$NON-NLS-1$
252
253
}
(-)src/org/eclipse/pde/internal/ui/wizards/target/TargetCreationPage.java (-2 / +3 lines)
Lines 19-31 Link Here
19
import org.eclipse.pde.internal.core.target.TargetPlatformService;
19
import org.eclipse.pde.internal.core.target.TargetPlatformService;
20
import org.eclipse.pde.internal.core.target.provisional.ITargetDefinition;
20
import org.eclipse.pde.internal.core.target.provisional.ITargetDefinition;
21
import org.eclipse.pde.internal.core.target.provisional.ITargetPlatformService;
21
import org.eclipse.pde.internal.core.target.provisional.ITargetPlatformService;
22
import org.eclipse.pde.internal.ui.PDEUIMessages;
22
import org.eclipse.pde.internal.ui.*;
23
import org.eclipse.pde.internal.ui.SWTFactory;
24
import org.eclipse.swt.SWT;
23
import org.eclipse.swt.SWT;
25
import org.eclipse.swt.events.SelectionAdapter;
24
import org.eclipse.swt.events.SelectionAdapter;
26
import org.eclipse.swt.events.SelectionEvent;
25
import org.eclipse.swt.events.SelectionEvent;
27
import org.eclipse.swt.layout.GridData;
26
import org.eclipse.swt.layout.GridData;
28
import org.eclipse.swt.widgets.*;
27
import org.eclipse.swt.widgets.*;
28
import org.eclipse.ui.PlatformUI;
29
29
30
/**
30
/**
31
 * First wizard page used to create a target definition. Defines the location where
31
 * First wizard page used to create a target definition. Defines the location where
Lines 97-102 Link Here
97
		setSelectedNode(new EditTargetNode());
97
		setSelectedNode(new EditTargetNode());
98
		setControl(comp);
98
		setControl(comp);
99
		setPageComplete(true);
99
		setPageComplete(true);
100
		PlatformUI.getWorkbench().getHelpSystem().setHelp(parent, IHelpContextIds.NEW_TARGET_WIZARD);
100
	}
101
	}
101
102
102
	protected void initializeTargetCombo() {
103
	protected void initializeTargetCombo() {
(-)src/org/eclipse/pde/internal/ui/wizards/target/MoveTargetDefinitionPage.java (+7 lines)
Lines 14-22 Link Here
14
import org.eclipse.core.runtime.IPath;
14
import org.eclipse.core.runtime.IPath;
15
import org.eclipse.jface.viewers.IStructuredSelection;
15
import org.eclipse.jface.viewers.IStructuredSelection;
16
import org.eclipse.osgi.util.NLS;
16
import org.eclipse.osgi.util.NLS;
17
import org.eclipse.pde.internal.ui.IHelpContextIds;
17
import org.eclipse.pde.internal.ui.PDEUIMessages;
18
import org.eclipse.pde.internal.ui.PDEUIMessages;
18
import org.eclipse.pde.internal.ui.wizards.PDEWizardNewFileCreationPage;
19
import org.eclipse.pde.internal.ui.wizards.PDEWizardNewFileCreationPage;
19
import org.eclipse.swt.widgets.Composite;
20
import org.eclipse.swt.widgets.Composite;
21
import org.eclipse.ui.PlatformUI;
20
22
21
/**
23
/**
22
 * Defines the Page to get the location where the new target file has to be created
24
 * Defines the Page to get the location where the new target file has to be created
Lines 67-70 Link Here
67
		}
69
		}
68
		return super.validatePage();
70
		return super.validatePage();
69
	}
71
	}
72
73
	public void createControl(Composite parent) {
74
		super.createControl(parent);
75
		PlatformUI.getWorkbench().getHelpSystem().setHelp(getControl(), IHelpContextIds.MOVE_TARGET_WIZARD);
76
	}
70
}
77
}
(-)src/org/eclipse/pde/internal/ui/wizards/target/TargetDefinitionContentPage.java (-3 / +6 lines)
Lines 161-166 Link Here
161
		SWTFactory.createWrapLabel(pluginTabContainer, PDEUIMessages.ContentSection_1, 2, 400);
161
		SWTFactory.createWrapLabel(pluginTabContainer, PDEUIMessages.ContentSection_1, 2, 400);
162
		fLocationTree = TargetLocationsGroup.createInDialog(pluginTabContainer);
162
		fLocationTree = TargetLocationsGroup.createInDialog(pluginTabContainer);
163
		fLocationTab.setControl(pluginTabContainer);
163
		fLocationTab.setControl(pluginTabContainer);
164
		PlatformUI.getWorkbench().getHelpSystem().setHelp(pluginTabContainer, IHelpContextIds.EDIT_TARGET_WIZARD_LOCATIONS_TAB);
164
165
165
		TabItem contentTab = new TabItem(tabs, SWT.NONE);
166
		TabItem contentTab = new TabItem(tabs, SWT.NONE);
166
		contentTab.setText(PDEUIMessages.TargetDefinitionContentPage_6);
167
		contentTab.setText(PDEUIMessages.TargetDefinitionContentPage_6);
Lines 168-173 Link Here
168
		SWTFactory.createWrapLabel(contentTabContainer, PDEUIMessages.ContentSection_1, 2, 400);
169
		SWTFactory.createWrapLabel(contentTabContainer, PDEUIMessages.ContentSection_1, 2, 400);
169
		fContentTree = new TargetContentsGroup(contentTabContainer);
170
		fContentTree = new TargetContentsGroup(contentTabContainer);
170
		contentTab.setControl(contentTabContainer);
171
		contentTab.setControl(contentTabContainer);
172
		PlatformUI.getWorkbench().getHelpSystem().setHelp(contentTabContainer, IHelpContextIds.EDIT_TARGET_WIZARD_CONTENT_TAB);
171
173
172
		TabItem envTab = new TabItem(tabs, SWT.NONE);
174
		TabItem envTab = new TabItem(tabs, SWT.NONE);
173
		envTab.setText(PDEUIMessages.TargetDefinitionEnvironmentPage_3);
175
		envTab.setText(PDEUIMessages.TargetDefinitionEnvironmentPage_3);
Lines 175-189 Link Here
175
		createTargetEnvironmentGroup(envTabContainer);
177
		createTargetEnvironmentGroup(envTabContainer);
176
		createJREGroup(envTabContainer);
178
		createJREGroup(envTabContainer);
177
		envTab.setControl(envTabContainer);
179
		envTab.setControl(envTabContainer);
180
		PlatformUI.getWorkbench().getHelpSystem().setHelp(envTabContainer, IHelpContextIds.EDIT_TARGET_WIZARD_ENVIRONMENT_TAB);
178
181
179
		TabItem argsTab = new TabItem(tabs, SWT.NONE);
182
		TabItem argsTab = new TabItem(tabs, SWT.NONE);
180
		argsTab.setText(PDEUIMessages.TargetDefinitionEnvironmentPage_4);
183
		argsTab.setText(PDEUIMessages.TargetDefinitionEnvironmentPage_4);
181
		argsTab.setControl(createArgumentsGroup(tabs));
184
		argsTab.setControl(createArgumentsGroup(tabs));
185
		PlatformUI.getWorkbench().getHelpSystem().setHelp(argsTab.getControl(), IHelpContextIds.EDIT_TARGET_WIZARD_ARGUMENT_TAB);
182
186
183
		TabItem depTab = new TabItem(tabs, SWT.NONE);
187
		TabItem depTab = new TabItem(tabs, SWT.NONE);
184
		depTab.setText(PDEUIMessages.TargetDefinitionEnvironmentPage_5);
188
		depTab.setText(PDEUIMessages.TargetDefinitionEnvironmentPage_5);
185
		depTab.setControl(createImplicitTabContents(tabs));
189
		depTab.setControl(createImplicitTabContents(tabs));
190
		PlatformUI.getWorkbench().getHelpSystem().setHelp(depTab.getControl(), IHelpContextIds.EDIT_TARGET_WIZARD_IMPLICIT_TAB);
186
191
192
		PlatformUI.getWorkbench().getHelpSystem().setHelp(comp, IHelpContextIds.EDIT_TARGET_WIZARD);
187
		initializeListeners();
193
		initializeListeners();
188
		targetChanged(getTargetDefinition());
194
		targetChanged(getTargetDefinition());
189
		setControl(comp);
195
		setControl(comp);
Lines 361-367 Link Here
361
				getTargetDefinition().setNL(getModelValue(value));
367
				getTargetDefinition().setNL(getModelValue(value));
362
			}
368
			}
363
		});
369
		});
364
365
	}
370
	}
366
371
367
	/**
372
	/**
Lines 541-547 Link Here
541
546
542
		Button vmVars = SWTFactory.createPushButton(buttons, PDEUIMessages.JavaArgumentsTab_vmVariables, null, GridData.HORIZONTAL_ALIGN_END);
547
		Button vmVars = SWTFactory.createPushButton(buttons, PDEUIMessages.JavaArgumentsTab_vmVariables, null, GridData.HORIZONTAL_ALIGN_END);
543
		vmVars.addSelectionListener(getVariablesListener(fVMArgs));
548
		vmVars.addSelectionListener(getVariablesListener(fVMArgs));
544
545
		return container;
549
		return container;
546
	}
550
	}
547
551
Lines 601-607 Link Here
601
		createImpLabel(container);
605
		createImpLabel(container);
602
		createImpTable(container);
606
		createImpTable(container);
603
		createImpButtons(container);
607
		createImpButtons(container);
604
		// TODO: PlatformUI.getWorkbench().getHelpSystem().setHelp(container, IHelpContextIds.IMPLICIT_PLUGINS_PREFERENCE_PAGE);
605
		return container;
608
		return container;
606
	}
609
	}
607
610
(-)contexts_PDE.xml (-46 / +6 lines)
Lines 530-583 Link Here
530
530
531
   <!-- one to one mapping -->
531
   <!-- one to one mapping -->
532
   <context id="target_platform_preference_page" >
532
   <context id="target_platform_preference_page" >
533
      <description>This page allows you to configure the target platform that will be used to develop and test against.  In cases where a plug-in with the same id exists both in the workspace and in the target platform, the workspace copy will take precedence.</description>
533
      <description>The Target Platform preference page allows you to manage a set of target definitions and select one as the active target platform. A target definition consists of a set of plug-ins and environment settings. The active target platform is used to build and launch your workspace plug-ins.</description>
534
<!--       
534
      <topic href="guide/tools/preference_pages/preferences.htm" label="PDE Preferences"/>
535
      <topic label="Target Platform Preferences" href="guide/tools/preference_pages/target_platform.htm"/>
535
      <topic href="guide/tools/target_shared/new_target_wizard.htm" label="New Target Wizard"/>
536
536
      <topic href="guide/tools/target_shared/edit_target_wizard.htm" label="Edit Target Wizard"/>
537
      <topic label="Target Plug-ins" href="guide/tools/preference_pages/target_plugins.htm"/>
537
      <topic href="guide/tools/target_shared/move_target_wizard.htm" label="Move Target Wizard"/>
538
      <topic label="Target Environment" href="guide/tools/preference_pages/target_env.htm"/>
538
      <topic href="guide/tools/editors/target_editor/target_editor.htm" label="Target Editor"/>
539
      <topic label="Launching Arguments" href="guide/tools/preference_pages/launching_args.htm"/>
540
      <topic label="Implicit Dependencies" href="guide/tools/preference_pages/implicit_dependencies.htm"/>
541
      <topic label="Source Code Locations" href="guide/tools/preference_pages/source_code_locations.htm"/>
542
      -->
543
   </context>
544
<!-- 
545
   <context id="target_plugins_preference_page" >
546
      <description>This page allows you to set the target platform plug-in content for the plug-ins you develop.</description>
547
      <topic label="Target Plug-Ins" href="guide/tools/preference_pages/target_plugins.htm"/>
548
   </context>
549
550
   <context id="source_preference_page" >
551
      <description>This page allows you to configure source code locations.  When attaching source archives to Java libraries, PDE first looks in plug-ins.  If not found, the search is extended to source locations.  Source locations can be provided by plug-ins that are used to carry source code (in SDKs). They can also be defined by users. Unchecked source locations will be ignored by PDE.</description>
552
      <topic label="Source Code Locations" href="guide/tools/preference_pages/source_code_locations.htm"/>
553
   </context>
554
555
   <context id="launching_args_preference_page" >
556
      <description>This page allows you to specify program and VM arguments that you wish to test your plug-ins with.</description>
557
      <topic label="Launching Arguments" href="guide/tools/preference_pages/launching_args.htm"/>
558
   </context>
559
560
   <context id="implicit_plugins_preference_page" >
561
      <description>This page allows you to specify existing plug-ins that are required to run your plug-ins.</description>
562
      <topic label="Implicit Dependencies" href="guide/tools/preference_pages/implicit_dependencies.htm"/>
563
   </context>
564
   
565
   <context id="implicit_plugins_selection_dialog" >
566
      <description>This dialog allows you to select one or more plug-ins to add as implicit dependencies of your plug-ins.</description>
567
      <topic label="Implicit Dependencies" href="guide/tools/preference_pages/implicit_dependencies.htm"/>
568
   </context>
569
570
   <context id="target_environment_preference_page" >
571
      <description>This page allows you to set the target environment for the plug-ins you develop.</description>
572
      <topic label="Target Environment" href="guide/tools/preference_pages/target_env.htm"/>
573
   </context>
574
   
575
   <context id="target_selection_dialog" >
576
      <description>This dialog allows you to select a target definition among the ones contained in your workspace.</description>
577
      <topic label="Target Environment" href="guide/tools/preference_pages/target_env.htm"/>
578
   </context>
539
   </context>
579
   
(-)> (-1 / +37 lines)
Lines 970-975 Link Here
970
    	<description>This editor creates a context help XML file, which allows you to create and edit dynamic help entries.</description>
930
    	<description>This editor creates a context help XML file, which allows you to create and edit dynamic help entries.</description>
971
    	<topic href="guide/tools/editors/ctx_help_editor/ctx_help_editor.htm" label="Context Help Editor"/>
931
    	<topic href="guide/tools/editors/ctx_help_editor/ctx_help_editor.htm" label="Context Help Editor"/>
972
    </context>
932
    </context>
933
    
934
<!-- Target related contexts -->    
973
   <context id="target_platform_state" title="Target Platform State View">
935
   <context id="target_platform_state" title="Target Platform State View">
974
      <description>The Target Platform State view shows the current status of the resolver state in PDE.</description>
936
      <description>The Target Platform State view shows the current status of the resolver state in PDE.</description>
975
      <topic href="guide/tools/views/target_platform_state.htm" label="Target Platform State View"/>
937
      <topic href="guide/tools/views/target_platform_state.htm" label="Target Platform State View"/>
Lines 1002-1011 Link Here
1002
   <context id="edit_target_wizard_implicit_tab" title="Target Definition Wizard Implicit Dependencies Tab">
964
   <context id="edit_target_wizard_implicit_tab" title="Target Definition Wizard Implicit Dependencies Tab">
1003
      <description>The Implicit Tab in the Edit Target Wizard is used to set the implicit dependencies of the target. Any plug-in marked as an implicit dependency will always be added as a required plug-in when PDE determines requirements. Implicit dependencies can also be edited on the Environment Page of the Target Editor.</description>
965
      <description>The Implicit Tab in the Edit Target Wizard is used to set the implicit dependencies of the target. Any plug-in marked as an implicit dependency will always be added as a required plug-in when PDE determines requirements. Implicit dependencies can also be edited on the Environment Page of the Target Editor.</description>
1004
   </context>
966
   </context>
967
   <context id="implicit_dependencies_selection_dialog" title="Implicit Dependencies Selection Dialog">
968
      <description>The Implicit Dependencies Selection Dialog allows you to browse through the plug-ins in your target and add one or more of them as implicit dependencies.</description>
969
      <topic href="guide/tools/target_shared/implicit_plugin_selection_dialog.htm" label="Implicit Dependencies Selection Dialog"/>
970
   </context>
1005
   <context id="move_target_wizard" title="Move Target Wizard">
971
   <context id="move_target_wizard" title="Move Target Wizard">
1006
      <description>This wizard moves a target definition stored in the Eclipse preferences to a file in the workspace. This wizard is accessed by pressing Move on the Target Platform Preference Page. You must choose a project or directory to create the file in and a filename. Target definition files must end in the file extension &quot;.target&quot;.</description>
972
      <description>This wizard moves a target definition stored in the Eclipse preferences to a file in the workspace. This wizard is accessed by pressing Move on the Target Platform Preference Page. You must choose a project or directory to create the file in and a filename. Target definition files must end in the file extension &quot;.target&quot;.</description>
1007
      <topic href="guide/tools/target_shared/move_target_wizard.htm" label="Move Target Definition"/>
973
      <topic href="guide/tools/target_shared/move_target_wizard.htm" label="Move Target Definition"/>
1008
   </context>
974
   </context>
1009
975
   <context id="import_arguments_dialog" title="Import Arguments">
976
      <description>The Import Arguments dialog is used to copy the arguments used in installations in your target. Often, if you have an Eclipse installation in your target that requires certain vm arguments to launch, you will require the same arguments to launch.</description>
977
      <topic href="guide/tools/target_shared/import_arguments_dialog.htm" label="Import Arguments"/>
978
   </context>
979
   <context id="add_location_wizard" title="Add Location Wizard">
980
      <description>The Add Location Wizard is opened from the Location Tab or the Definition Page. It is used to add a new location to a target definition. On the first page you must select a type of location to add.</description>
981
   </context>
982
   <context id="location_add_directory_wizard" title="Add Directory Location Wizard">
983
   </context>
984
   <context id="location_edit_directory_wizard" title="Edit Directory Location Wizard">
985
      <description>The Directory Location Wizard is used to create and edit directory locations in target definitions.</description>
986
   </context>
987
   <context id="location_preview_wizard" title="Preview Contents">
988
   </context>
989
   <context id="location_add_feature_wizard" title="Add Feature Locations Wizard">
990
      <description>The Add Feature Locations Wizard is opened from the Add Location Wizard. Select a folder containing features (it can also contain a folder called &quot;features&quot;). All features found in the directory will be adde to the list. Check the features you want to add to your target. When Finish is pressed locations will be added to your target for each selected feature. The plug-ins in the features will be added to your target.</description>
991
   </context>
992
   <context id="location_edit_feature_wizard" title="Edit Feature Location Wizard">
993
      <description>The Edit Feature Location Wizard allows you to view the details of a feature location in your target definition.</description>
994
   </context>
995
   <context id="location_add_installation_wizard" title="Add Installation Location Wizard">
996
   </context>
997
   <context id="location_edit_installation_wizard" title="Edit Installation Location Wizard">
998
      <description>The Installation Location Wizard is used to create and edit installation locations in target definitions.</description>
999
   </context>
1000
   <context id="location_add_site_wizard" title="Add Software Site Location Wizard">
1001
   </context>
1002
   <context id="location_edit_site_wizard" title="Edit Software Site Location Wizard">
1003
      <description>The Software Site Location Wizard is used to create and edit software site locations in target definitions.</description>
1004
   </context>
1005
<!-- END Target related contexts -->
1010
</contexts>
1006
</contexts>
1011
1007

Return to bug 277506