Attachment 137455 Details for Bug 277506 – Full Path

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

[patch] Full Path

20090528.txt (text/plain), 64.96 KB, created by Ankur Sharma

on 2009-05-28 06:54:26 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Ankur Sharma

Created: 2009-05-28 06:54:26 EDT

Size: 64.96 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.pde.doc.user
>Index: contexts_PDE.xml
>===================================================================
>RCS file: /cvsroot/eclipse/pde/doc/org.eclipse.pde.doc.user/contexts_PDE.xml,v
>retrieving revision 1.59
>diff -u -r1.59 contexts_PDE.xml
>--- contexts_PDE.xml	27 May 2009 19:50:56 -0000	1.59
>+++ contexts_PDE.xml	28 May 2009 10:53:53 -0000
>@@ -530,54 +530,14 @@
> 
>    
>    <context id="target_platform_preference_page" >
>-      <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>
>-
>-   </context>
>-     
>+    
> 
> 
> 
>@@ -970,6 +930,8 @@
>     	<description>This editor creates a context help XML file, which allows you to create and edit dynamic help entries.</description>
>     	<topic href="guide/tools/editors/ctx_help_editor/ctx_help_editor.htm" label="Context Help Editor"/>
>     </context>
>+    
>+    
>    <context id="target_platform_state" title="Target Platform State View">
>       <description>The Target Platform State view shows the current status of the resolver state in PDE.</description>
>       <topic href="guide/tools/views/target_platform_state.htm" label="Target Platform State View"/>
>@@ -1002,10 +964,44 @@
>    <context id="edit_target_wizard_implicit_tab" title="Target Definition Wizard Implicit Dependencies Tab">
>       <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>
>    </context>
>+   <context id="implicit_dependencies_selection_dialog" title="Implicit Dependencies Selection Dialog">
>+      <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>
>+      <topic href="guide/tools/target_shared/implicit_plugin_selection_dialog.htm" label="Implicit Dependencies Selection Dialog"/>
>+   </context>
>    <context id="move_target_wizard" title="Move Target Wizard">
>       <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>
>       <topic href="guide/tools/target_shared/move_target_wizard.htm" label="Move Target Definition"/>
>    </context>
>-
>+   <context id="import_arguments_dialog" title="Import Arguments">
>+      <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>
>+      <topic href="guide/tools/target_shared/import_arguments_dialog.htm" label="Import Arguments"/>
>+   </context>
>+   <context id="add_location_wizard" title="Add Location Wizard">
>+      <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>
>+   </context>
>+   <context id="location_add_directory_wizard" title="Add Directory Location Wizard">
>+   </context>
>+   <context id="location_edit_directory_wizard" title="Edit Directory Location Wizard">
>+      <description>The Directory Location Wizard is used to create and edit directory locations in target definitions.</description>
>+   </context>
>+   <context id="location_preview_wizard" title="Preview Contents">
>+   </context>
>+   <context id="location_add_feature_wizard" title="Add Feature Locations Wizard">
>+      <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>
>+   </context>
>+   <context id="location_edit_feature_wizard" title="Edit Feature Location Wizard">
>+      <description>The Edit Feature Location Wizard allows you to view the details of a feature location in your target definition.</description>
>+   </context>
>+   <context id="location_add_installation_wizard" title="Add Installation Location Wizard">
>+   </context>
>+   <context id="location_edit_installation_wizard" title="Edit Installation Location Wizard">
>+      <description>The Installation Location Wizard is used to create and edit installation locations in target definitions.</description>
>+   </context>
>+   <context id="location_add_site_wizard" title="Add Software Site Location Wizard">
>+   </context>
>+   <context id="location_edit_site_wizard" title="Edit Software Site Location Wizard">
>+      <description>The Software Site Location Wizard is used to create and edit software site locations in target definitions.</description>
>+   </context>
>+
> </contexts>
> 
>#P org.eclipse.pde.ui
>Index: src/org/eclipse/pde/internal/ui/shared/target/EditDirectoryContainerPage.java
>===================================================================
>RCS file: /cvsroot/eclipse/pde/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/shared/target/EditDirectoryContainerPage.java,v
>retrieving revision 1.7
>diff -u -r1.7 EditDirectoryContainerPage.java
>--- src/org/eclipse/pde/internal/ui/shared/target/EditDirectoryContainerPage.java	28 Apr 2009 21:47:12 -0000	1.7
>+++ src/org/eclipse/pde/internal/ui/shared/target/EditDirectoryContainerPage.java	28 May 2009 10:53:59 -0000
>@@ -10,9 +10,6 @@
>  *******************************************************************************/
> package org.eclipse.pde.internal.ui.shared.target;
> 
>-import org.eclipse.pde.internal.core.target.AbstractBundleContainer;
>-import org.eclipse.pde.internal.core.target.DirectoryBundleContainer;
>-
> import java.io.File;
> import java.util.ArrayList;
> import java.util.List;
>@@ -24,14 +21,16 @@
> import org.eclipse.jface.dialogs.IMessageProvider;
> import org.eclipse.jface.wizard.WizardPage;
> import org.eclipse.pde.internal.core.PDECore;
>+import org.eclipse.pde.internal.core.target.AbstractBundleContainer;
>+import org.eclipse.pde.internal.core.target.DirectoryBundleContainer;
> import org.eclipse.pde.internal.core.target.provisional.IBundleContainer;
> import org.eclipse.pde.internal.core.target.provisional.ITargetPlatformService;
>-import org.eclipse.pde.internal.ui.PDEPlugin;
>-import org.eclipse.pde.internal.ui.SWTFactory;
>+import org.eclipse.pde.internal.ui.*;
> import org.eclipse.swt.SWT;
> import org.eclipse.swt.events.*;
> import org.eclipse.swt.layout.GridData;
> import org.eclipse.swt.widgets.*;
>+import org.eclipse.ui.PlatformUI;
> import org.eclipse.ui.progress.UIJob;
> 
> /**
>@@ -77,6 +76,11 @@
> 		super("EditDirectoryContainer"); //$NON-NLS-1$
> 	}
> 
>+	public EditDirectoryContainerPage(IBundleContainer container, String name) {
>+		super(name);
>+		fContainer = container;
>+	}
>+
> 	/* (non-Javadoc)
> 	 * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite)
> 	 */
>@@ -88,6 +92,13 @@
> 		createLocationArea(comp);
> 		setControl(comp);
> 		initializeInputFields(fContainer);
>+		if ("EditDirectoryContainer".equalsIgnoreCase(getName())) { //$NON-NLS-1$
>+			if (fContainer == null) {
>+				PlatformUI.getWorkbench().getHelpSystem().setHelp(comp, IHelpContextIds.LOCATION_ADD_DIRECTORY_WIZARD);
>+			} else {
>+				PlatformUI.getWorkbench().getHelpSystem().setHelp(comp, IHelpContextIds.LOCATION_EDIT_DIRECTORY_WIZARD);
>+			}
>+		}
> 	}
> 
> 	/**
>Index: src/org/eclipse/pde/internal/ui/shared/target/ArgumentsFromContainerSelectionDialog.java
>===================================================================
>RCS file: /cvsroot/eclipse/pde/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/shared/target/ArgumentsFromContainerSelectionDialog.java,v
>retrieving revision 1.2
>diff -u -r1.2 ArgumentsFromContainerSelectionDialog.java
>--- src/org/eclipse/pde/internal/ui/shared/target/ArgumentsFromContainerSelectionDialog.java	24 Apr 2009 18:59:18 -0000	1.2
>+++ src/org/eclipse/pde/internal/ui/shared/target/ArgumentsFromContainerSelectionDialog.java	28 May 2009 10:53:59 -0000
>@@ -19,14 +19,14 @@
> import org.eclipse.jface.viewers.*;
> import org.eclipse.pde.internal.core.target.provisional.IBundleContainer;
> import org.eclipse.pde.internal.core.target.provisional.ITargetDefinition;
>-import org.eclipse.pde.internal.ui.PDEPlugin;
>-import org.eclipse.pde.internal.ui.SWTFactory;
>+import org.eclipse.pde.internal.ui.*;
> import org.eclipse.swt.SWT;
> import org.eclipse.swt.events.SelectionAdapter;
> import org.eclipse.swt.events.SelectionEvent;
> import org.eclipse.swt.layout.GridData;
> import org.eclipse.swt.layout.GridLayout;
> import org.eclipse.swt.widgets.*;
>+import org.eclipse.ui.PlatformUI;
> 
> /**
>  * A dialog where the user can select arguments provided by installation (profile) containers in
>@@ -87,6 +87,7 @@
> 			}
> 		}
> 
>+		PlatformUI.getWorkbench().getHelpSystem().setHelp(parent, IHelpContextIds.ARGS_FROM_CONTAINER_SELECTION_DIALOG);
> 		Composite comp = SWTFactory.createComposite(parent, 1, 1, GridData.FILL_BOTH, 10, 10);
> 		((GridLayout) comp.getLayout()).verticalSpacing = 10;
> 
>Index: src/org/eclipse/pde/internal/ui/shared/target/AddBundleContainerSelectionPage.java
>===================================================================
>RCS file: /cvsroot/eclipse/pde/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/shared/target/AddBundleContainerSelectionPage.java,v
>retrieving revision 1.17
>diff -u -r1.17 AddBundleContainerSelectionPage.java
>--- src/org/eclipse/pde/internal/ui/shared/target/AddBundleContainerSelectionPage.java	12 May 2009 20:39:21 -0000	1.17
>+++ src/org/eclipse/pde/internal/ui/shared/target/AddBundleContainerSelectionPage.java	28 May 2009 10:53:58 -0000
>@@ -143,6 +143,7 @@
> 		sashForm.setWeights(new int[] {70, 30});
> 		initViewerContents(wizardSelectionViewer);
> 		setControl(comp);
>+		PlatformUI.getWorkbench().getHelpSystem().setHelp(parent, IHelpContextIds.ADD_LOCATION_WIZARD);
> 	}
> 
> 	/**
>Index: src/org/eclipse/pde/internal/ui/shared/target/EditFeatureContainerPage.java
>===================================================================
>RCS file: /cvsroot/eclipse/pde/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/shared/target/EditFeatureContainerPage.java,v
>retrieving revision 1.6
>diff -u -r1.6 EditFeatureContainerPage.java
>--- src/org/eclipse/pde/internal/ui/shared/target/EditFeatureContainerPage.java	28 Apr 2009 21:47:12 -0000	1.6
>+++ src/org/eclipse/pde/internal/ui/shared/target/EditFeatureContainerPage.java	28 May 2009 10:53:59 -0000
>@@ -10,16 +10,15 @@
>  *******************************************************************************/
> package org.eclipse.pde.internal.ui.shared.target;
> 
>-import org.eclipse.pde.internal.core.target.FeatureBundleContainer;
>-
> import org.eclipse.core.runtime.CoreException;
>+import org.eclipse.pde.internal.core.target.FeatureBundleContainer;
> import org.eclipse.pde.internal.core.target.provisional.IBundleContainer;
>-import org.eclipse.pde.internal.ui.PDEPlugin;
>-import org.eclipse.pde.internal.ui.SWTFactory;
>+import org.eclipse.pde.internal.ui.*;
> import org.eclipse.swt.SWT;
> import org.eclipse.swt.layout.GridData;
> import org.eclipse.swt.widgets.Composite;
> import org.eclipse.swt.widgets.Text;
>+import org.eclipse.ui.PlatformUI;
> 
> /**
>  * Wizard page for editing a feature bundle container, currently none of the options can be changed
>@@ -28,7 +27,7 @@
> public class EditFeatureContainerPage extends EditDirectoryContainerPage {
> 
> 	public EditFeatureContainerPage(IBundleContainer container) {
>-		super(container);
>+		super(container, "EditFeatureContainer"); //$NON-NLS-1$
> 	}
> 
> 	/* (non-Javadoc)
>@@ -51,6 +50,7 @@
> 	protected void createLocationArea(Composite parent) {
> 		FeatureBundleContainer container = (FeatureBundleContainer) getBundleContainer();
> 		Composite comp = SWTFactory.createComposite(parent, 2, 1, GridData.FILL_HORIZONTAL);
>+		PlatformUI.getWorkbench().getHelpSystem().setHelp(parent, IHelpContextIds.LOCATION_EDIT_FEATURE_WIZARD);
> 
> 		SWTFactory.createLabel(comp, Messages.EditFeatureContainerPage_2, 1);
> 		Text text = SWTFactory.createText(comp, SWT.READ_ONLY | SWT.BORDER, 1);
>Index: src/org/eclipse/pde/internal/ui/shared/target/EditProfileContainerPage.java
>===================================================================
>RCS file: /cvsroot/eclipse/pde/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/shared/target/EditProfileContainerPage.java,v
>retrieving revision 1.7
>diff -u -r1.7 EditProfileContainerPage.java
>--- src/org/eclipse/pde/internal/ui/shared/target/EditProfileContainerPage.java	28 Apr 2009 21:47:11 -0000	1.7
>+++ src/org/eclipse/pde/internal/ui/shared/target/EditProfileContainerPage.java	28 May 2009 10:54:00 -0000
>@@ -10,8 +10,6 @@
>  *******************************************************************************/
> package org.eclipse.pde.internal.ui.shared.target;
> 
>-import org.eclipse.pde.internal.core.target.ProfileBundleContainer;
>-
> import java.io.File;
> import java.util.ArrayList;
> import java.util.List;
>@@ -20,12 +18,15 @@
> import org.eclipse.debug.ui.StringVariableSelectionDialog;
> import org.eclipse.jface.dialogs.IDialogSettings;
> import org.eclipse.jface.dialogs.IMessageProvider;
>+import org.eclipse.pde.internal.core.target.ProfileBundleContainer;
> import org.eclipse.pde.internal.core.target.provisional.IBundleContainer;
>+import org.eclipse.pde.internal.ui.IHelpContextIds;
> import org.eclipse.pde.internal.ui.SWTFactory;
> import org.eclipse.swt.SWT;
> import org.eclipse.swt.events.*;
> import org.eclipse.swt.layout.GridData;
> import org.eclipse.swt.widgets.*;
>+import org.eclipse.ui.PlatformUI;
> 
> /**
>  * Wizard page for creating a profile (installation) bundle container.
>@@ -58,11 +59,11 @@
> 	private static final String SETTINGS_CONFIG_3 = "config3"; //$NON-NLS-1$
> 
> 	public EditProfileContainerPage() {
>-		super();
>+		super(null, "EditProfileContainer"); //$NON-NLS-1$
> 	}
> 
> 	public EditProfileContainerPage(IBundleContainer container) {
>-		super(container);
>+		super(container, "EditProfileContainer"); //$NON-NLS-1$
> 	}
> 
> 	/* (non-Javadoc)
>@@ -90,6 +91,12 @@
> 
> 		Composite configComp = SWTFactory.createComposite(parent, 2, 1, GridData.FILL_HORIZONTAL, 0, 0);
> 
>+		if (fContainer == null) {
>+			PlatformUI.getWorkbench().getHelpSystem().setHelp(parent, IHelpContextIds.LOCATION_ADD_INSTALLATION_WIZARD);
>+		} else {
>+			PlatformUI.getWorkbench().getHelpSystem().setHelp(parent, IHelpContextIds.LOCATION_EDIT_INSTALLATION_WIZARD);
>+		}
>+
> 		fUseDefaultConfig = new Button(configComp, SWT.CHECK | SWT.RIGHT);
> 		GridData gd = new GridData();
> 		gd.horizontalSpan = 2;
>Index: src/org/eclipse/pde/internal/ui/shared/target/AddFeatureContainersPage.java
>===================================================================
>RCS file: /cvsroot/eclipse/pde/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/shared/target/AddFeatureContainersPage.java,v
>retrieving revision 1.4
>diff -u -r1.4 AddFeatureContainersPage.java
>--- src/org/eclipse/pde/internal/ui/shared/target/AddFeatureContainersPage.java	14 Apr 2009 03:34:15 -0000	1.4
>+++ src/org/eclipse/pde/internal/ui/shared/target/AddFeatureContainersPage.java	28 May 2009 10:53:59 -0000
>@@ -28,6 +28,7 @@
> import org.eclipse.swt.layout.GridData;
> import org.eclipse.swt.widgets.Button;
> import org.eclipse.swt.widgets.Composite;
>+import org.eclipse.ui.PlatformUI;
> 
> /**
>  * Wizard page for creating one or more feature bundle containers.
>@@ -43,6 +44,10 @@
> 	private Button fIncludeVersionButton;
> 	private CheckboxTableViewer fFeatureTable;
> 
>+	protected AddFeatureContainersPage() {
>+		super(null, "AddFeatureContainers"); //$NON-NLS-1$
>+	}
>+
> 	/* (non-Javadoc)
> 	 * @see org.eclipse.pde.internal.ui.shared.target.EditDirectoryContainerPage#getDefaultTitle()
> 	 */
>@@ -63,6 +68,7 @@
> 	protected void createLocationArea(Composite parent) {
> 		super.createLocationArea(parent);
> 		createTableArea(parent);
>+		PlatformUI.getWorkbench().getHelpSystem().setHelp(parent, IHelpContextIds.LOCATION_ADD_FEATURE_WIZARD);
> 	}
> 
> 	/* (non-Javadoc)
>Index: src/org/eclipse/pde/internal/ui/shared/target/PreviewContainerPage.java
>===================================================================
>RCS file: /cvsroot/eclipse/pde/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/shared/target/PreviewContainerPage.java,v
>retrieving revision 1.6
>diff -u -r1.6 PreviewContainerPage.java
>--- src/org/eclipse/pde/internal/ui/shared/target/PreviewContainerPage.java	29 Apr 2009 15:52:57 -0000	1.6
>+++ src/org/eclipse/pde/internal/ui/shared/target/PreviewContainerPage.java	28 May 2009 10:54:00 -0000
>@@ -19,10 +19,10 @@
> import org.eclipse.jface.wizard.WizardPage;
> import org.eclipse.pde.internal.core.target.provisional.IBundleContainer;
> import org.eclipse.pde.internal.core.target.provisional.ITargetDefinition;
>-import org.eclipse.pde.internal.ui.PDEPlugin;
>-import org.eclipse.pde.internal.ui.SWTFactory;
>+import org.eclipse.pde.internal.ui.*;
> import org.eclipse.swt.layout.GridData;
> import org.eclipse.swt.widgets.Composite;
>+import org.eclipse.ui.PlatformUI;
> 
> /**
>  * Wizard page that displays the contents of a bundle container in a table
>@@ -54,6 +54,7 @@
> 		fPreviewTable.setContentProvider(ArrayContentProvider.getInstance());
> 		fPreviewTable.getControl().setLayoutData(new GridData(GridData.FILL_BOTH));
> 		setControl(composite);
>+		PlatformUI.getWorkbench().getHelpSystem().setHelp(composite, IHelpContextIds.LOCATION_PREVIEW_WIZARD);
> 	}
> 
> 	/**
>Index: src/org/eclipse/pde/internal/ui/shared/target/EditIUContainerPage.java
>===================================================================
>RCS file: /cvsroot/eclipse/pde/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/shared/target/EditIUContainerPage.java,v
>retrieving revision 1.8
>diff -u -r1.8 EditIUContainerPage.java
>--- src/org/eclipse/pde/internal/ui/shared/target/EditIUContainerPage.java	12 May 2009 20:39:21 -0000	1.8
>+++ src/org/eclipse/pde/internal/ui/shared/target/EditIUContainerPage.java	28 May 2009 10:53:59 -0000
>@@ -154,7 +154,11 @@
> 		restoreWidgetState();
> 		setControl(composite);
> 		setPageComplete(false);
>-		PlatformUI.getWorkbench().getHelpSystem().setHelp(composite, IHelpContextIds.P2_PROVISIONING_PAGE);
>+		if (fEditContainer == null) {
>+			PlatformUI.getWorkbench().getHelpSystem().setHelp(composite, IHelpContextIds.LOCATION_ADD_SITE_WIZARD);
>+		} else {
>+			PlatformUI.getWorkbench().getHelpSystem().setHelp(composite, IHelpContextIds.LOCATION_EDIT_SITE_WIZARD);
>+		}
> 	}
> 
> 	/**
>Index: src/org/eclipse/pde/internal/ui/wizards/target/TargetDefinitionContentPage.java
>===================================================================
>RCS file: /cvsroot/eclipse/pde/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/target/TargetDefinitionContentPage.java,v
>retrieving revision 1.22
>diff -u -r1.22 TargetDefinitionContentPage.java
>--- src/org/eclipse/pde/internal/ui/wizards/target/TargetDefinitionContentPage.java	21 May 2009 20:17:41 -0000	1.22
>+++ src/org/eclipse/pde/internal/ui/wizards/target/TargetDefinitionContentPage.java	28 May 2009 10:54:00 -0000
>@@ -161,6 +161,7 @@
> 		SWTFactory.createWrapLabel(pluginTabContainer, PDEUIMessages.ContentSection_1, 2, 400);
> 		fLocationTree = TargetLocationsGroup.createInDialog(pluginTabContainer);
> 		fLocationTab.setControl(pluginTabContainer);
>+		PlatformUI.getWorkbench().getHelpSystem().setHelp(pluginTabContainer, IHelpContextIds.EDIT_TARGET_WIZARD_LOCATIONS_TAB);
> 
> 		TabItem contentTab = new TabItem(tabs, SWT.NONE);
> 		contentTab.setText(PDEUIMessages.TargetDefinitionContentPage_6);
>@@ -168,6 +169,7 @@
> 		SWTFactory.createWrapLabel(contentTabContainer, PDEUIMessages.ContentSection_1, 2, 400);
> 		fContentTree = new TargetContentsGroup(contentTabContainer);
> 		contentTab.setControl(contentTabContainer);
>+		PlatformUI.getWorkbench().getHelpSystem().setHelp(contentTabContainer, IHelpContextIds.EDIT_TARGET_WIZARD_CONTENT_TAB);
> 
> 		TabItem envTab = new TabItem(tabs, SWT.NONE);
> 		envTab.setText(PDEUIMessages.TargetDefinitionEnvironmentPage_3);
>@@ -175,15 +177,19 @@
> 		createTargetEnvironmentGroup(envTabContainer);
> 		createJREGroup(envTabContainer);
> 		envTab.setControl(envTabContainer);
>+		PlatformUI.getWorkbench().getHelpSystem().setHelp(envTabContainer, IHelpContextIds.EDIT_TARGET_WIZARD_ENVIRONMENT_TAB);
> 
> 		TabItem argsTab = new TabItem(tabs, SWT.NONE);
> 		argsTab.setText(PDEUIMessages.TargetDefinitionEnvironmentPage_4);
> 		argsTab.setControl(createArgumentsGroup(tabs));
>+		PlatformUI.getWorkbench().getHelpSystem().setHelp(argsTab.getControl(), IHelpContextIds.EDIT_TARGET_WIZARD_ARGUMENT_TAB);
> 
> 		TabItem depTab = new TabItem(tabs, SWT.NONE);
> 		depTab.setText(PDEUIMessages.TargetDefinitionEnvironmentPage_5);
> 		depTab.setControl(createImplicitTabContents(tabs));
>+		PlatformUI.getWorkbench().getHelpSystem().setHelp(depTab.getControl(), IHelpContextIds.EDIT_TARGET_WIZARD_IMPLICIT_TAB);
> 
>+		PlatformUI.getWorkbench().getHelpSystem().setHelp(comp, IHelpContextIds.EDIT_TARGET_WIZARD);
> 		initializeListeners();
> 		targetChanged(getTargetDefinition());
> 		setControl(comp);
>@@ -361,7 +367,6 @@
> 				getTargetDefinition().setNL(getModelValue(value));
> 			}
> 		});
>-
> 	}
> 
> 	/**
>@@ -541,7 +546,6 @@
> 
> 		Button vmVars = SWTFactory.createPushButton(buttons, PDEUIMessages.JavaArgumentsTab_vmVariables, null, GridData.HORIZONTAL_ALIGN_END);
> 		vmVars.addSelectionListener(getVariablesListener(fVMArgs));
>-
> 		return container;
> 	}
> 
>@@ -601,7 +605,6 @@
> 		createImpLabel(container);
> 		createImpTable(container);
> 		createImpButtons(container);
>-		// TODO: PlatformUI.getWorkbench().getHelpSystem().setHelp(container, IHelpContextIds.IMPLICIT_PLUGINS_PREFERENCE_PAGE);
> 		return container;
> 	}
> 
>Index: src/org/eclipse/pde/internal/ui/wizards/target/MoveTargetDefinitionPage.java
>===================================================================
>RCS file: /cvsroot/eclipse/pde/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/target/MoveTargetDefinitionPage.java,v
>retrieving revision 1.1
>diff -u -r1.1 MoveTargetDefinitionPage.java
>--- src/org/eclipse/pde/internal/ui/wizards/target/MoveTargetDefinitionPage.java	9 Mar 2009 18:40:28 -0000	1.1
>+++ src/org/eclipse/pde/internal/ui/wizards/target/MoveTargetDefinitionPage.java	28 May 2009 10:54:00 -0000
>@@ -14,9 +14,11 @@
> import org.eclipse.core.runtime.IPath;
> import org.eclipse.jface.viewers.IStructuredSelection;
> import org.eclipse.osgi.util.NLS;
>+import org.eclipse.pde.internal.ui.IHelpContextIds;
> import org.eclipse.pde.internal.ui.PDEUIMessages;
> import org.eclipse.pde.internal.ui.wizards.PDEWizardNewFileCreationPage;
> import org.eclipse.swt.widgets.Composite;
>+import org.eclipse.ui.PlatformUI;
> 
> /**
>  * Defines the Page to get the location where the new target file has to be created
>@@ -67,4 +69,9 @@
> 		}
> 		return super.validatePage();
> 	}
>+
>+	public void createControl(Composite parent) {
>+		super.createControl(parent);
>+		PlatformUI.getWorkbench().getHelpSystem().setHelp(getControl(), IHelpContextIds.MOVE_TARGET_WIZARD);
>+	}
> }
>Index: src/org/eclipse/pde/internal/ui/wizards/target/TargetCreationPage.java
>===================================================================
>RCS file: /cvsroot/eclipse/pde/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/target/TargetCreationPage.java,v
>retrieving revision 1.7
>diff -u -r1.7 TargetCreationPage.java
>--- src/org/eclipse/pde/internal/ui/wizards/target/TargetCreationPage.java	28 Apr 2009 21:47:12 -0000	1.7
>+++ src/org/eclipse/pde/internal/ui/wizards/target/TargetCreationPage.java	28 May 2009 10:54:00 -0000
>@@ -1,233 +1,234 @@
>-/*******************************************************************************
>- * Copyright (c) 2005, 2009 IBM Corporation and others.
>- * All rights reserved. This program and the accompanying materials
>- * are made available under the terms of the Eclipse Public License v1.0
>- * which accompanies this distribution, and is available at
>- * http://www.eclipse.org/legal/epl-v10.html
>- *
>- * Contributors:
>- *     IBM Corporation - initial API and implementation
>- *******************************************************************************/
>-package org.eclipse.pde.internal.ui.wizards.target;
>-
>-import org.eclipse.core.runtime.CoreException;
>-import org.eclipse.core.runtime.IConfigurationElement;
>-import org.eclipse.jface.dialogs.Dialog;
>-import org.eclipse.jface.wizard.IWizardPage;
>-import org.eclipse.jface.wizard.WizardSelectionPage;
>-import org.eclipse.pde.internal.core.PDECore;
>-import org.eclipse.pde.internal.core.target.TargetPlatformService;
>-import org.eclipse.pde.internal.core.target.provisional.ITargetDefinition;
>-import org.eclipse.pde.internal.core.target.provisional.ITargetPlatformService;
>-import org.eclipse.pde.internal.ui.PDEUIMessages;
>-import org.eclipse.pde.internal.ui.SWTFactory;
>-import org.eclipse.swt.SWT;
>-import org.eclipse.swt.events.SelectionAdapter;
>-import org.eclipse.swt.events.SelectionEvent;
>-import org.eclipse.swt.layout.GridData;
>-import org.eclipse.swt.widgets.*;
>-
>-/**
>- * First wizard page used to create a target definition. Defines the location where
>- * the definition will be created and how to seed the definition.
>- */
>-public class TargetCreationPage extends WizardSelectionPage {
>-
>-	protected static final int USE_EMPTY = 0;
>-	protected static final int USE_DEFAULT = 1;
>-	protected static final int USE_CURRENT_TP = 2;
>-	protected static final int USE_EXISTING_TARGET = 3;
>-
>-	private Button fEmptyButton;
>-	private Button fDefaultButton;
>-	private Button fCurrentTPButton;
>-	private Button fExistingTargetButton;
>-	private Combo fTargets;
>-	private String[] fTargetIds;
>-	private String templateTargetId;
>-	private ITargetDefinition[] fTargetDefs = new ITargetDefinition[4];
>-
>-	public TargetCreationPage(String pageName) {
>-		super(pageName);
>-		setTitle(PDEUIMessages.TargetProfileWizardPage_title);
>-		setDescription(PDEUIMessages.TargetProfileWizardPage_description);
>-	}
>-
>-	/**
>-	 * Returns the target service or <code>null</code> if none.
>-	 * 
>-	 * @return target service or <code>null</code>
>-	 */
>-	protected ITargetPlatformService getTargetService() {
>-		return (ITargetPlatformService) PDECore.getDefault().acquireService(ITargetPlatformService.class.getName());
>-	}
>-
>-	/* (non-Javadoc)
>-	 * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite)
>-	 */
>-	public void createControl(Composite parent) {
>-		Composite comp = SWTFactory.createComposite(parent, 2, 1, GridData.FILL_BOTH);
>-		SWTFactory.createLabel(comp, PDEUIMessages.TargetCreationPage_0, 3);
>-
>-		fEmptyButton = SWTFactory.createRadioButton(comp, PDEUIMessages.TargetCreationPage_1, 2);
>-		fDefaultButton = SWTFactory.createRadioButton(comp, PDEUIMessages.TargetCreationPage_2, 2);
>-		fCurrentTPButton = SWTFactory.createRadioButton(comp, PDEUIMessages.TargetCreationPage_3, 2);
>-		fExistingTargetButton = SWTFactory.createRadioButton(comp, PDEUIMessages.TargetCreationPage_4, 1);
>-		fExistingTargetButton.addSelectionListener(new SelectionAdapter() {
>-			public void widgetSelected(SelectionEvent e) {
>-				boolean enabled = fExistingTargetButton.getSelection();
>-				fTargets.setEnabled(enabled);
>-			}
>-		});
>-
>-		fEmptyButton.setSelection(true);
>-
>-		fTargets = SWTFactory.createCombo(comp, SWT.SINGLE | SWT.READ_ONLY, 1, GridData.BEGINNING, null);
>-		fTargets.setEnabled(false);
>-		initializeTargetCombo();
>-		fTargets.addSelectionListener(new SelectionAdapter() {
>-
>-			public void widgetSelected(SelectionEvent e) {
>-				templateTargetId = fTargetIds[fTargets.getSelectionIndex()];
>-
>-			}
>-		});
>-
>-		Dialog.applyDialogFont(comp);
>-		setSelectedNode(new EditTargetNode());
>-		setControl(comp);
>-		setPageComplete(true);
>-	}
>-
>-	protected void initializeTargetCombo() {
>-		IConfigurationElement[] elements = PDECore.getDefault().getTargetProfileManager().getSortedTargets();
>-		fTargetIds = new String[elements.length];
>-		for (int i = 0; i < elements.length; i++) {
>-			String name = elements[i].getAttribute("name"); //$NON-NLS-1$
>-			if (fTargets.indexOf(name) == -1)
>-				fTargets.add(name);
>-			fTargetIds[i] = elements[i].getAttribute("id"); //$NON-NLS-1$
>-		}
>-		if (elements.length > 0) {
>-			fTargets.select(0);
>-			setTargetId(fTargetIds[fTargets.getSelectionIndex()]);
>-		}
>-	}
>-
>-	protected int getInitializationOption() {
>-		if (fEmptyButton.getSelection())
>-			return USE_EMPTY;
>-		if (fDefaultButton.getSelection())
>-			return USE_DEFAULT;
>-		else if (fCurrentTPButton.getSelection())
>-			return USE_CURRENT_TP;
>-		return USE_EXISTING_TARGET;
>-	}
>-
>-	protected String getTargetId() {
>-		return templateTargetId;
>-	}
>-
>-	protected void setTargetId(String targetId) {
>-		templateTargetId = targetId;
>-	}
>-
>-	protected ITargetDefinition createTarget(int targetOption) {
>-		ITargetPlatformService service = getTargetService();
>-		if (service != null) {
>-			ITargetDefinition definition = service.newTarget();
>-			switch (targetOption) {
>-				case USE_EMPTY :
>-					definition.setName(PDEUIMessages.TargetCreationPage_6);
>-					break;
>-				case USE_DEFAULT :
>-					try {
>-						populateBasicTarget(definition);
>-					} catch (CoreException e) {
>-						setErrorMessage(e.getMessage());
>-						return null;
>-					}
>-					break;
>-				case USE_CURRENT_TP :
>-					try {
>-						populateFromCurrentTargetPlatform(definition);
>-					} catch (CoreException e) {
>-						setErrorMessage(e.getMessage());
>-						return null;
>-					}
>-					break;
>-				case USE_EXISTING_TARGET :
>-					try {
>-						populateFromTemplate(definition, getTargetId());
>-					} catch (CoreException e) {
>-						setErrorMessage(e.getMessage());
>-						return null;
>-					}
>-					break;
>-			}
>-			return definition;
>-		}
>-		return null;
>-	}
>-
>-	/**
>-	 * Applies basic target settings to the given target definition.
>-	 * 
>-	 * @param definition
>-	 * @throws CoreException 
>-	 */
>-	private void populateBasicTarget(ITargetDefinition definition) throws CoreException {
>-		ITargetPlatformService service = getTargetService();
>-		if (service instanceof TargetPlatformService) {
>-			TargetPlatformService ts = (TargetPlatformService) service;
>-			ITargetDefinition def = ts.newDefaultTargetDefinition();
>-			ts.copyTargetDefinition(def, definition);
>-		}
>-	}
>-
>-	/**
>-	 * Populates the given definition from current target platform settings.
>-	 * 
>-	 * @param definition
>-	 * @throws CoreException 
>-	 */
>-	private void populateFromCurrentTargetPlatform(ITargetDefinition definition) throws CoreException {
>-		ITargetPlatformService service = getTargetService();
>-		if (service instanceof TargetPlatformService) {
>-			TargetPlatformService ts = (TargetPlatformService) service;
>-			ts.loadTargetDefinitionFromPreferences(definition);
>-		}
>-	}
>-
>-	/**
>-	 * Populates the given definition from the specified target template.
>-	 * 
>-	 * @param definition
>-	 * @param id target extension identifier
>-	 * @exception CoreException if unable to complete
>-	 */
>-	private void populateFromTemplate(ITargetDefinition definition, String id) throws CoreException {
>-		ITargetPlatformService service = getTargetService();
>-		if (service != null) {
>-			service.loadTargetDefinition(definition, id);
>-		}
>-	}
>-
>-	/* (non-Javadoc)
>-	 * @see org.eclipse.jface.wizard.WizardSelectionPage#getNextPage()
>-	 */
>-	public IWizardPage getNextPage() {
>-		ITargetDefinition target = null;
>-		int option = getInitializationOption();
>-		if (fTargetDefs[option] == null) {
>-			fTargetDefs[option] = createTarget(option);
>-		}
>-		target = fTargetDefs[option];
>-		if (target != null) {
>-			((NewTargetDefinitionWizard2) getWizard()).setTargetDefinition(target);
>-			((EditTargetNode) getSelectedNode()).setTargetDefinition(target);
>-			return super.getNextPage();
>-		}
>-		return null;
>-	}
>-}
>+/*******************************************************************************
>+ * Copyright (c) 2005, 2009 IBM Corporation and others.
>+ * All rights reserved. This program and the accompanying materials
>+ * are made available under the terms of the Eclipse Public License v1.0
>+ * which accompanies this distribution, and is available at
>+ * http://www.eclipse.org/legal/epl-v10.html
>+ *
>+ * Contributors:
>+ *     IBM Corporation - initial API and implementation
>+ *******************************************************************************/
>+package org.eclipse.pde.internal.ui.wizards.target;
>+
>+import org.eclipse.core.runtime.CoreException;
>+import org.eclipse.core.runtime.IConfigurationElement;
>+import org.eclipse.jface.dialogs.Dialog;
>+import org.eclipse.jface.wizard.IWizardPage;
>+import org.eclipse.jface.wizard.WizardSelectionPage;
>+import org.eclipse.pde.internal.core.PDECore;
>+import org.eclipse.pde.internal.core.target.TargetPlatformService;
>+import org.eclipse.pde.internal.core.target.provisional.ITargetDefinition;
>+import org.eclipse.pde.internal.core.target.provisional.ITargetPlatformService;
>+import org.eclipse.pde.internal.ui.*;
>+import org.eclipse.swt.SWT;
>+import org.eclipse.swt.events.SelectionAdapter;
>+import org.eclipse.swt.events.SelectionEvent;
>+import org.eclipse.swt.layout.GridData;
>+import org.eclipse.swt.widgets.*;
>+import org.eclipse.ui.PlatformUI;
>+
>+/**
>+ * First wizard page used to create a target definition. Defines the location where
>+ * the definition will be created and how to seed the definition.
>+ */
>+public class TargetCreationPage extends WizardSelectionPage {
>+
>+	protected static final int USE_EMPTY = 0;
>+	protected static final int USE_DEFAULT = 1;
>+	protected static final int USE_CURRENT_TP = 2;
>+	protected static final int USE_EXISTING_TARGET = 3;
>+
>+	private Button fEmptyButton;
>+	private Button fDefaultButton;
>+	private Button fCurrentTPButton;
>+	private Button fExistingTargetButton;
>+	private Combo fTargets;
>+	private String[] fTargetIds;
>+	private String templateTargetId;
>+	private ITargetDefinition[] fTargetDefs = new ITargetDefinition[4];
>+
>+	public TargetCreationPage(String pageName) {
>+		super(pageName);
>+		setTitle(PDEUIMessages.TargetProfileWizardPage_title);
>+		setDescription(PDEUIMessages.TargetProfileWizardPage_description);
>+	}
>+
>+	/**
>+	 * Returns the target service or <code>null</code> if none.
>+	 * 
>+	 * @return target service or <code>null</code>
>+	 */
>+	protected ITargetPlatformService getTargetService() {
>+		return (ITargetPlatformService) PDECore.getDefault().acquireService(ITargetPlatformService.class.getName());
>+	}
>+
>+	/* (non-Javadoc)
>+	 * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite)
>+	 */
>+	public void createControl(Composite parent) {
>+		Composite comp = SWTFactory.createComposite(parent, 2, 1, GridData.FILL_BOTH);
>+		SWTFactory.createLabel(comp, PDEUIMessages.TargetCreationPage_0, 3);
>+
>+		fEmptyButton = SWTFactory.createRadioButton(comp, PDEUIMessages.TargetCreationPage_1, 2);
>+		fDefaultButton = SWTFactory.createRadioButton(comp, PDEUIMessages.TargetCreationPage_2, 2);
>+		fCurrentTPButton = SWTFactory.createRadioButton(comp, PDEUIMessages.TargetCreationPage_3, 2);
>+		fExistingTargetButton = SWTFactory.createRadioButton(comp, PDEUIMessages.TargetCreationPage_4, 1);
>+		fExistingTargetButton.addSelectionListener(new SelectionAdapter() {
>+			public void widgetSelected(SelectionEvent e) {
>+				boolean enabled = fExistingTargetButton.getSelection();
>+				fTargets.setEnabled(enabled);
>+			}
>+		});
>+
>+		fEmptyButton.setSelection(true);
>+
>+		fTargets = SWTFactory.createCombo(comp, SWT.SINGLE | SWT.READ_ONLY, 1, GridData.BEGINNING, null);
>+		fTargets.setEnabled(false);
>+		initializeTargetCombo();
>+		fTargets.addSelectionListener(new SelectionAdapter() {
>+
>+			public void widgetSelected(SelectionEvent e) {
>+				templateTargetId = fTargetIds[fTargets.getSelectionIndex()];
>+
>+			}
>+		});
>+
>+		Dialog.applyDialogFont(comp);
>+		setSelectedNode(new EditTargetNode());
>+		setControl(comp);
>+		setPageComplete(true);
>+		PlatformUI.getWorkbench().getHelpSystem().setHelp(parent, IHelpContextIds.NEW_TARGET_WIZARD);
>+	}
>+
>+	protected void initializeTargetCombo() {
>+		IConfigurationElement[] elements = PDECore.getDefault().getTargetProfileManager().getSortedTargets();
>+		fTargetIds = new String[elements.length];
>+		for (int i = 0; i < elements.length; i++) {
>+			String name = elements[i].getAttribute("name"); //$NON-NLS-1$
>+			if (fTargets.indexOf(name) == -1)
>+				fTargets.add(name);
>+			fTargetIds[i] = elements[i].getAttribute("id"); //$NON-NLS-1$
>+		}
>+		if (elements.length > 0) {
>+			fTargets.select(0);
>+			setTargetId(fTargetIds[fTargets.getSelectionIndex()]);
>+		}
>+	}
>+
>+	protected int getInitializationOption() {
>+		if (fEmptyButton.getSelection())
>+			return USE_EMPTY;
>+		if (fDefaultButton.getSelection())
>+			return USE_DEFAULT;
>+		else if (fCurrentTPButton.getSelection())
>+			return USE_CURRENT_TP;
>+		return USE_EXISTING_TARGET;
>+	}
>+
>+	protected String getTargetId() {
>+		return templateTargetId;
>+	}
>+
>+	protected void setTargetId(String targetId) {
>+		templateTargetId = targetId;
>+	}
>+
>+	protected ITargetDefinition createTarget(int targetOption) {
>+		ITargetPlatformService service = getTargetService();
>+		if (service != null) {
>+			ITargetDefinition definition = service.newTarget();
>+			switch (targetOption) {
>+				case USE_EMPTY :
>+					definition.setName(PDEUIMessages.TargetCreationPage_6);
>+					break;
>+				case USE_DEFAULT :
>+					try {
>+						populateBasicTarget(definition);
>+					} catch (CoreException e) {
>+						setErrorMessage(e.getMessage());
>+						return null;
>+					}
>+					break;
>+				case USE_CURRENT_TP :
>+					try {
>+						populateFromCurrentTargetPlatform(definition);
>+					} catch (CoreException e) {
>+						setErrorMessage(e.getMessage());
>+						return null;
>+					}
>+					break;
>+				case USE_EXISTING_TARGET :
>+					try {
>+						populateFromTemplate(definition, getTargetId());
>+					} catch (CoreException e) {
>+						setErrorMessage(e.getMessage());
>+						return null;
>+					}
>+					break;
>+			}
>+			return definition;
>+		}
>+		return null;
>+	}
>+
>+	/**
>+	 * Applies basic target settings to the given target definition.
>+	 * 
>+	 * @param definition
>+	 * @throws CoreException 
>+	 */
>+	private void populateBasicTarget(ITargetDefinition definition) throws CoreException {
>+		ITargetPlatformService service = getTargetService();
>+		if (service instanceof TargetPlatformService) {
>+			TargetPlatformService ts = (TargetPlatformService) service;
>+			ITargetDefinition def = ts.newDefaultTargetDefinition();
>+			ts.copyTargetDefinition(def, definition);
>+		}
>+	}
>+
>+	/**
>+	 * Populates the given definition from current target platform settings.
>+	 * 
>+	 * @param definition
>+	 * @throws CoreException 
>+	 */
>+	private void populateFromCurrentTargetPlatform(ITargetDefinition definition) throws CoreException {
>+		ITargetPlatformService service = getTargetService();
>+		if (service instanceof TargetPlatformService) {
>+			TargetPlatformService ts = (TargetPlatformService) service;
>+			ts.loadTargetDefinitionFromPreferences(definition);
>+		}
>+	}
>+
>+	/**
>+	 * Populates the given definition from the specified target template.
>+	 * 
>+	 * @param definition
>+	 * @param id target extension identifier
>+	 * @exception CoreException if unable to complete
>+	 */
>+	private void populateFromTemplate(ITargetDefinition definition, String id) throws CoreException {
>+		ITargetPlatformService service = getTargetService();
>+		if (service != null) {
>+			service.loadTargetDefinition(definition, id);
>+		}
>+	}
>+
>+	/* (non-Javadoc)
>+	 * @see org.eclipse.jface.wizard.WizardSelectionPage#getNextPage()
>+	 */
>+	public IWizardPage getNextPage() {
>+		ITargetDefinition target = null;
>+		int option = getInitializationOption();
>+		if (fTargetDefs[option] == null) {
>+			fTargetDefs[option] = createTarget(option);
>+		}
>+		target = fTargetDefs[option];
>+		if (target != null) {
>+			((NewTargetDefinitionWizard2) getWizard()).setTargetDefinition(target);
>+			((EditTargetNode) getSelectedNode()).setTargetDefinition(target);
>+			return super.getNextPage();
>+		}
>+		return null;
>+	}
>+}
>Index: src/org/eclipse/pde/internal/ui/editor/targetdefinition/DefinitionPage.java
>===================================================================
>RCS file: /cvsroot/eclipse/pde/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/targetdefinition/DefinitionPage.java,v
>retrieving revision 1.9
>diff -u -r1.9 DefinitionPage.java
>--- src/org/eclipse/pde/internal/ui/editor/targetdefinition/DefinitionPage.java	7 May 2009 17:59:42 -0000	1.9
>+++ src/org/eclipse/pde/internal/ui/editor/targetdefinition/DefinitionPage.java	28 May 2009 10:53:58 -0000
>@@ -59,11 +59,10 @@
> 		form.setImage(PDEPlugin.getDefault().getLabelProvider().get(PDEPluginImages.DESC_TARGET_DEFINITION));
> 		toolkit.decorateFormHeading(form.getForm());
> 		fillBody(managedForm, toolkit);
>-		// TODO Finish help
> 		((TargetEditor) getEditor()).contributeToToolbar(managedForm.getForm(), ""); //$NON-NLS-1$
> 		((TargetEditor) getEditor()).addForm(managedForm);
> 		form.updateToolBar();
>-		PlatformUI.getWorkbench().getHelpSystem().setHelp(form.getBody(), IHelpContextIds.TARGET_OVERVIEW_PAGE);
>+		PlatformUI.getWorkbench().getHelpSystem().setHelp(form.getBody(), IHelpContextIds.TARGET_EDITOR_DEFINITION_PAGE);
> 	}
> 
> 	/* (non-Javadoc)
>@@ -147,10 +146,4 @@
> 		((TargetEditor) getEditor()).setDirty(isDirty());
> 		return true;
> 	}
>-
>-	// TODO Hook up help toolbar action
>-//	protected String getHelpResource() {
>-//		return "/org.eclipse.pde.doc.user/guide/tools/editors/target_definition_editor/overview.htm"; //$NON-NLS-1$
>-//	}
>-
> }
>Index: src/org/eclipse/pde/internal/ui/editor/targetdefinition/ImplicitDependenciesSection.java
>===================================================================
>RCS file: /cvsroot/eclipse/pde/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/targetdefinition/ImplicitDependenciesSection.java,v
>retrieving revision 1.7
>diff -u -r1.7 ImplicitDependenciesSection.java
>--- src/org/eclipse/pde/internal/ui/editor/targetdefinition/ImplicitDependenciesSection.java	24 Apr 2009 18:59:21 -0000	1.7
>+++ src/org/eclipse/pde/internal/ui/editor/targetdefinition/ImplicitDependenciesSection.java	28 May 2009 10:53:58 -0000
>@@ -10,8 +10,6 @@
>  *******************************************************************************/
> package org.eclipse.pde.internal.ui.editor.targetdefinition;
> 
>-import org.eclipse.pde.internal.ui.shared.target.StyledBundleLabelProvider;
>-
> import java.util.*;
> import java.util.List;
> import org.eclipse.core.runtime.*;
>@@ -25,12 +23,14 @@
> import org.eclipse.pde.internal.ui.editor.FormLayoutFactory;
> import org.eclipse.pde.internal.ui.editor.plugin.ManifestEditor;
> import org.eclipse.pde.internal.ui.elements.DefaultTableProvider;
>+import org.eclipse.pde.internal.ui.shared.target.StyledBundleLabelProvider;
> import org.eclipse.swt.SWT;
> import org.eclipse.swt.events.SelectionAdapter;
> import org.eclipse.swt.events.SelectionEvent;
> import org.eclipse.swt.layout.GridData;
> import org.eclipse.swt.layout.GridLayout;
> import org.eclipse.swt.widgets.*;
>+import org.eclipse.ui.PlatformUI;
> import org.eclipse.ui.dialogs.ElementListSelectionDialog;
> import org.eclipse.ui.forms.IFormColors;
> import org.eclipse.ui.forms.SectionPart;
>@@ -199,7 +199,8 @@
> 		} catch (CoreException e) {
> 			dialog.setMessage(e.getMessage());
> 		}
>-
>+		dialog.create();
>+		PlatformUI.getWorkbench().getHelpSystem().setHelp(dialog.getShell(), IHelpContextIds.IMPLICIT_DEPENDENCIES_SELECTION_DIALOG);
> 		if (dialog.open() == Window.OK) {
> 			Object[] models = dialog.getResult();
> 			ArrayList pluginsToAdd = new ArrayList();
>Index: src/org/eclipse/pde/internal/ui/editor/targetdefinition/TargetEditor.java
>===================================================================
>RCS file: /cvsroot/eclipse/pde/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/targetdefinition/TargetEditor.java,v
>retrieving revision 1.15
>diff -u -r1.15 TargetEditor.java
>--- src/org/eclipse/pde/internal/ui/editor/targetdefinition/TargetEditor.java	11 May 2009 16:22:50 -0000	1.15
>+++ src/org/eclipse/pde/internal/ui/editor/targetdefinition/TargetEditor.java	28 May 2009 10:53:58 -0000
>@@ -309,6 +309,7 @@
> 	 */
> 	public void addForm(IManagedForm managedForm) {
> 		fManagedFormPages.add(managedForm);
>+		PlatformUI.getWorkbench().getHelpSystem().setHelp(managedForm.getForm().getBody(), IHelpContextIds.TARGET_EDITOR);
> 	}
> 
> 	/**
>Index: src/org/eclipse/pde/internal/ui/editor/targetdefinition/ContentPage.java
>===================================================================
>RCS file: /cvsroot/eclipse/pde/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/targetdefinition/ContentPage.java,v
>retrieving revision 1.2
>diff -u -r1.2 ContentPage.java
>--- src/org/eclipse/pde/internal/ui/editor/targetdefinition/ContentPage.java	7 May 2009 17:59:42 -0000	1.2
>+++ src/org/eclipse/pde/internal/ui/editor/targetdefinition/ContentPage.java	28 May 2009 10:53:57 -0000
>@@ -14,6 +14,7 @@
> import org.eclipse.pde.internal.ui.*;
> import org.eclipse.pde.internal.ui.editor.FormLayoutFactory;
> import org.eclipse.swt.widgets.Composite;
>+import org.eclipse.ui.PlatformUI;
> import org.eclipse.ui.forms.IManagedForm;
> import org.eclipse.ui.forms.editor.FormPage;
> import org.eclipse.ui.forms.widgets.FormToolkit;
>@@ -52,11 +53,10 @@
> 		form.setImage(PDEPlugin.getDefault().getLabelProvider().get(PDEPluginImages.DESC_TARGET_DEFINITION));
> 		toolkit.decorateFormHeading(form.getForm());
> 		fillBody(managedForm, toolkit);
>-		// TODO Finish help
> 		((TargetEditor) getEditor()).contributeToToolbar(managedForm.getForm(), ""); //$NON-NLS-1$
> 		((TargetEditor) getEditor()).addForm(managedForm);
> 		form.updateToolBar();
>-//		PlatformUI.getWorkbench().getHelpSystem().setHelp(form.getBody(), IHelpContextIds.TARGET_OVERVIEW_PAGE);
>+		PlatformUI.getWorkbench().getHelpSystem().setHelp(form.getBody(), IHelpContextIds.TARGET_EDITOR_CONTENT_PAGE);
> 	}
> 
> 	/* (non-Javadoc)
>@@ -80,10 +80,4 @@
> 		((TargetEditor) getEditor()).setDirty(isDirty());
> 		return true;
> 	}
>-
>-	// TODO Hook up help toolbar action
>-//	protected String getHelpResource() {
>-//		return "/org.eclipse.pde.doc.user/guide/tools/editors/target_definition_editor/overview.htm"; //$NON-NLS-1$
>-//	}
>-
> }
>Index: src/org/eclipse/pde/internal/ui/editor/targetdefinition/EnvironmentPage.java
>===================================================================
>RCS file: /cvsroot/eclipse/pde/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/targetdefinition/EnvironmentPage.java,v
>retrieving revision 1.7
>diff -u -r1.7 EnvironmentPage.java
>--- src/org/eclipse/pde/internal/ui/editor/targetdefinition/EnvironmentPage.java	7 May 2009 17:59:42 -0000	1.7
>+++ src/org/eclipse/pde/internal/ui/editor/targetdefinition/EnvironmentPage.java	28 May 2009 10:53:58 -0000
>@@ -1,84 +1,83 @@
>-/*******************************************************************************
>- * Copyright (c) 2005, 2009 IBM Corporation and others.
>- * All rights reserved. This program and the accompanying materials
>- * are made available under the terms of the Eclipse Public License v1.0
>- * which accompanies this distribution, and is available at
>- * http://www.eclipse.org/legal/epl-v10.html
>- *
>- * Contributors:
>- *     IBM Corporation - initial API and implementation
>- *******************************************************************************/
>-package org.eclipse.pde.internal.ui.editor.targetdefinition;
>-
>-import org.eclipse.pde.internal.ui.*;
>-import org.eclipse.pde.internal.ui.editor.FormLayoutFactory;
>-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.editor.FormPage;
>-import org.eclipse.ui.forms.widgets.FormToolkit;
>-import org.eclipse.ui.forms.widgets.ScrolledForm;
>-
>-/**
>- * Second page for the target definition editor.  Provides ability to alter various
>- * environment elements of the target.
>- * @see TargetEditor
>- * @see EnvironmentSection
>- * @see JRESection
>- * @see ArgumentsSection
>- * @see ImplicitDependenciesSection
>- */
>-public class EnvironmentPage extends FormPage {
>-
>-	public static final String PAGE_ID = "environment"; //$NON-NLS-1$
>-
>-	public EnvironmentPage(FormEditor editor) {
>-		super(editor, PAGE_ID, PDEUIMessages.EnvironmentPage_title);
>-	}
>-
>-	/* (non-Javadoc)
>-	 * @see org.eclipse.ui.forms.editor.FormPage#createFormContent(org.eclipse.ui.forms.IManagedForm)
>-	 */
>-	protected void createFormContent(IManagedForm managedForm) {
>-		super.createFormContent(managedForm);
>-		ScrolledForm form = managedForm.getForm();
>-		form.setText(PDEUIMessages.EnvironmentPage_title);
>-		PDEPlugin.getDefault().getLabelProvider().connect(this);
>-		form.setImage(PDEPlugin.getDefault().getLabelProvider().get(PDEPluginImages.DESC_TARGET_ENVIRONMENT));
>-		FormToolkit toolkit = managedForm.getToolkit();
>-		fillBody(managedForm, toolkit);
>-		toolkit.decorateFormHeading(form.getForm());
>-		// TODO Fix help URL
>-		((TargetEditor) getEditor()).contributeToToolbar(managedForm.getForm(), ""); //$NON-NLS-1$
>-		((TargetEditor) getEditor()).addForm(managedForm);
>-		form.updateToolBar();
>-		PlatformUI.getWorkbench().getHelpSystem().setHelp(form.getBody(), IHelpContextIds.ENVIRONMENT_PAGE);
>-	}
>-
>-	/* (non-Javadoc)
>-	 * @see org.eclipse.ui.forms.editor.FormPage#dispose()
>-	 */
>-	public void dispose() {
>-		PDEPlugin.getDefault().getLabelProvider().disconnect(this);
>-		super.dispose();
>-	}
>-
>-	private void fillBody(IManagedForm managedForm, FormToolkit toolkit) {
>-		Composite body = managedForm.getForm().getBody();
>-		body.setLayout(FormLayoutFactory.createFormGridLayout(false, 2));
>-
>-		managedForm.addPart(new EnvironmentSection(this, body));
>-		managedForm.addPart(new JRESection(this, body));
>-		managedForm.addPart(new ArgumentsSection(this, body));
>-		managedForm.addPart(new ImplicitDependenciesSection(this, body));
>-	}
>-
>-	/* (non-Javadoc)
>-	 * @see org.eclipse.ui.forms.editor.FormPage#canLeaveThePage()
>-	 */
>-	public boolean canLeaveThePage() {
>-		((TargetEditor) getEditor()).setDirty(isDirty());
>-		return true;
>-	}
>-}
>+/*******************************************************************************
>+ * Copyright (c) 2005, 2009 IBM Corporation and others.
>+ * All rights reserved. This program and the accompanying materials
>+ * are made available under the terms of the Eclipse Public License v1.0
>+ * which accompanies this distribution, and is available at
>+ * http://www.eclipse.org/legal/epl-v10.html
>+ *
>+ * Contributors:
>+ *     IBM Corporation - initial API and implementation
>+ *******************************************************************************/
>+package org.eclipse.pde.internal.ui.editor.targetdefinition;
>+
>+import org.eclipse.pde.internal.ui.*;
>+import org.eclipse.pde.internal.ui.editor.FormLayoutFactory;
>+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.editor.FormPage;
>+import org.eclipse.ui.forms.widgets.FormToolkit;
>+import org.eclipse.ui.forms.widgets.ScrolledForm;
>+
>+/**
>+ * Second page for the target definition editor.  Provides ability to alter various
>+ * environment elements of the target.
>+ * @see TargetEditor
>+ * @see EnvironmentSection
>+ * @see JRESection
>+ * @see ArgumentsSection
>+ * @see ImplicitDependenciesSection
>+ */
>+public class EnvironmentPage extends FormPage {
>+
>+	public static final String PAGE_ID = "environment"; //$NON-NLS-1$
>+
>+	public EnvironmentPage(FormEditor editor) {
>+		super(editor, PAGE_ID, PDEUIMessages.EnvironmentPage_title);
>+	}
>+
>+	/* (non-Javadoc)
>+	 * @see org.eclipse.ui.forms.editor.FormPage#createFormContent(org.eclipse.ui.forms.IManagedForm)
>+	 */
>+	protected void createFormContent(IManagedForm managedForm) {
>+		super.createFormContent(managedForm);
>+		ScrolledForm form = managedForm.getForm();
>+		form.setText(PDEUIMessages.EnvironmentPage_title);
>+		PDEPlugin.getDefault().getLabelProvider().connect(this);
>+		form.setImage(PDEPlugin.getDefault().getLabelProvider().get(PDEPluginImages.DESC_TARGET_ENVIRONMENT));
>+		FormToolkit toolkit = managedForm.getToolkit();
>+		fillBody(managedForm, toolkit);
>+		toolkit.decorateFormHeading(form.getForm());
>+		((TargetEditor) getEditor()).contributeToToolbar(managedForm.getForm(), ""); //$NON-NLS-1$
>+		((TargetEditor) getEditor()).addForm(managedForm);
>+		form.updateToolBar();
>+		PlatformUI.getWorkbench().getHelpSystem().setHelp(form.getBody(), IHelpContextIds.TARGET_EDITOR_ENVIRONMENT_PAGE);
>+	}
>+
>+	/* (non-Javadoc)
>+	 * @see org.eclipse.ui.forms.editor.FormPage#dispose()
>+	 */
>+	public void dispose() {
>+		PDEPlugin.getDefault().getLabelProvider().disconnect(this);
>+		super.dispose();
>+	}
>+
>+	private void fillBody(IManagedForm managedForm, FormToolkit toolkit) {
>+		Composite body = managedForm.getForm().getBody();
>+		body.setLayout(FormLayoutFactory.createFormGridLayout(false, 2));
>+
>+		managedForm.addPart(new EnvironmentSection(this, body));
>+		managedForm.addPart(new JRESection(this, body));
>+		managedForm.addPart(new ArgumentsSection(this, body));
>+		managedForm.addPart(new ImplicitDependenciesSection(this, body));
>+	}
>+
>+	/* (non-Javadoc)
>+	 * @see org.eclipse.ui.forms.editor.FormPage#canLeaveThePage()
>+	 */
>+	public boolean canLeaveThePage() {
>+		((TargetEditor) getEditor()).setDirty(isDirty());
>+		return true;
>+	}
>+}
>Index: src/org/eclipse/pde/internal/ui/IHelpContextIds.java
>===================================================================
>RCS file: /cvsroot/eclipse/pde/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/IHelpContextIds.java,v
>retrieving revision 1.47
>diff -u -r1.47 IHelpContextIds.java
>--- src/org/eclipse/pde/internal/ui/IHelpContextIds.java	2 Apr 2009 22:26:54 -0000	1.47
>+++ src/org/eclipse/pde/internal/ui/IHelpContextIds.java	28 May 2009 10:53:57 -0000
>@@ -19,17 +19,10 @@
> 	public static final String BUILD_OPTIONS_PREFERENCE_PAGE = PREFIX + "build_options_preference_page"; //$NON-NLS-1$
> 	public static final String EDITOR_PREFERENCE_PAGE = PREFIX + "editor_preference_page"; //$NON-NLS-1$
> 	public static final String OSGI_PREFERENCE_PAGE = PREFIX + "osgi_preference_page"; //$NON-NLS-1$
>-	public static final String SOURCE_PREFERENCE_PAGE = PREFIX + "source_preference_page"; //$NON-NLS-1$
>-	public static final String TARGET_PLUGINS_PREFERENCE_PAGE = PREFIX + "target_plugins_preference_page"; //$NON-NLS-1$
> 	public static final String TARGET_PROVISIONERS_PREFERENCE_PAGE = PREFIX + "target_provisioners_preference_page"; //$NON-NLS-1$
>-	public static final String IMPLICIT_PLUGINS_PREFERENCE_PAGE = PREFIX + "implicit_plugins_preference_page"; //$NON-NLS-1$
>-	public static final String IMPLICIT_PLUGINS_SELECTION_DIALOG = PREFIX + "implicit_plugins_selection_dialog"; //$NON-NLS-1$
>-	public static final String LAUNCHING_ARGS_PREFERENCE_PAGE = PREFIX + "launching_args_preference_page"; //$NON-NLS-1$
> 	public static final String COMPILERS_PREFERENCE_PAGE = PREFIX + "compilers_preference_page"; //$NON-NLS-1$
> 	public static final String PROJECT_SELECTION_DIALOG = PREFIX + "project_selection_dialog"; //$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$
>-	public static final String TARGET_SELECTION_DIALOG = PREFIX + "target_selection_dialog"; //$NON-NLS-1$
> 
> 	// Property Pages
> 	public static final String SELFHOSTING_PROPERTY_PAGE = PREFIX + "selfhosting_property_page"; //$NON-NLS-1$
>@@ -40,7 +33,7 @@
> 
> 	public static final String DEPENDENCIES_VIEW = PREFIX + "dependencies_view"; //$NON-NLS-1$
> 	public static final String HISTORY_ACTION = PREFIX + "history_action"; //$NON-NLS-1$
>-	public static final String TARGET_STATE_VIEW = PREFIX + "target_state_view"; //$NON-NLS-1$
>+	public static final String TARGET_STATE_VIEW = PREFIX + "target_platform_state"; //$NON-NLS-1$
> 	public static final String HISTORY_LIST_ACTION = PREFIX + "history_list_action"; //$NON-NLS-1$
> 	public static final String HISTORY_LIST_DIALOG = PREFIX + "history_list_dialog"; //$NON-NLS-1$
> 
>@@ -116,7 +109,27 @@
> 	public static final String EXTERNALIZE_STRINGS_PAGE = PREFIX + "externalize_strings_page"; //$NON-NLS-1$
> 	public static final String CHEAT_SHEET_PAGE = PREFIX + "cheat_sheet_page"; //$NON-NLS-1$
> 	public static final String PRODUCT_FILE_PAGE = PREFIX + "product_file_page"; //$NON-NLS-1$
>+	//This TARGET_DEFINITION_PAGE points to old target help.
> 	public static final String TARGET_DEFINITION_PAGE = PREFIX + "target_definition_page"; //$NON-NLS-1$
>+	//These are the new target help links
>+	public static final String NEW_TARGET_WIZARD = PREFIX + "new_target_wizard"; //$NON-NLS-1$
>+	public static final String EDIT_TARGET_WIZARD = PREFIX + "edit_target_wizard"; //$NON-NLS-1$
>+	public static final String EDIT_TARGET_WIZARD_LOCATIONS_TAB = PREFIX + "edit_target_wizard_locations_tab"; //$NON-NLS-1$
>+	public static final String EDIT_TARGET_WIZARD_ARGUMENT_TAB = PREFIX + "edit_target_wizard_argument_tab"; //$NON-NLS-1$
>+	public static final String EDIT_TARGET_WIZARD_CONTENT_TAB = PREFIX + "edit_target_wizard_content_tab"; //$NON-NLS-1$
>+	public static final String EDIT_TARGET_WIZARD_ENVIRONMENT_TAB = PREFIX + "edit_target_wizard_environment_tab"; //$NON-NLS-1$
>+	public static final String EDIT_TARGET_WIZARD_IMPLICIT_TAB = PREFIX + "edit_target_wizard_implicit_tab"; //$NON-NLS-1$
>+	public static final String MOVE_TARGET_WIZARD = PREFIX + "move_target_wizard"; //$NON-NLS-1$
>+	public static final String ADD_LOCATION_WIZARD = PREFIX + "add_location_wizard"; //$NON-NLS-1$
>+	public static final String LOCATION_PREVIEW_WIZARD = PREFIX + "location_preview_wizard"; //$NON-NLS-1$
>+	public static final String LOCATION_EDIT_DIRECTORY_WIZARD = PREFIX + "location_edit_directory_wizard"; //$NON-NLS-1$
>+	public static final String LOCATION_ADD_DIRECTORY_WIZARD = PREFIX + "location_add_directory_wizard"; //$NON-NLS-1$
>+	public static final String LOCATION_ADD_FEATURE_WIZARD = PREFIX + "location_add_feature_wizard"; //$NON-NLS-1$
>+	public static final String LOCATION_EDIT_FEATURE_WIZARD = PREFIX + "location_edit_feature_wizard"; //$NON-NLS-1$
>+	public static final String LOCATION_ADD_INSTALLATION_WIZARD = PREFIX + "location_add_installation_wizard"; //$NON-NLS-1$
>+	public static final String LOCATION_EDIT_INSTALLATION_WIZARD = PREFIX + "location_edit_installation_wizard"; //$NON-NLS-1$
>+	public static final String LOCATION_ADD_SITE_WIZARD = PREFIX + "location_add_site_wizard"; //$NON-NLS-1$
>+	public static final String LOCATION_EDIT_SITE_WIZARD = PREFIX + "location_edit_site_wizard"; //$NON-NLS-1$
> 	public static final String TOC_PAGE = PREFIX + "toc_page"; //$NON-NLS-1$
> 
> 	public static final String XHTML_CONVERSION_PAGE = PREFIX + "xhtml_conversion_page"; //$NON-NLS-1$
>@@ -168,6 +181,9 @@
> 
> 	public static final String FILTERED_PLUGIN_ARTIFACTS_DIALOG = PREFIX + "filtered_plugin_artifacts_dialog"; //$NON-NLS-1$
> 
>+	public static final String IMPLICIT_DEPENDENCIES_SELECTION_DIALOG = PREFIX + "implicit_dependencies_selection_dialog"; //$NON-NLS-1$
>+	public static final String ARGS_FROM_CONTAINER_SELECTION_DIALOG = PREFIX + "import_arguments_dialog"; //$NON-NLS-1$
>+
> 	// Generic source page
> 	public static final String MANIFEST_SOURCE_PAGE = PREFIX + "manifest_source_page"; //$NON-NLS-1$
> 
>@@ -239,8 +255,10 @@
> 	public static final String OVERVIEW_PAGE = PREFIX + "overview_page"; //$NON-NLS-1$
> 	public static final String LICENSING_PAGE = PREFIX + "licensing_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$
>+	public static final String TARGET_EDITOR = PREFIX + "target_editor"; //$NON-NLS-1$
>+	public static final String TARGET_EDITOR_ENVIRONMENT_PAGE = PREFIX + "target_editor_environment_page"; //$NON-NLS-1$	
>+	public static final String TARGET_EDITOR_DEFINITION_PAGE = PREFIX + "target_editor_definition_page"; //$NON-NLS-1$
>+	public static final String TARGET_EDITOR_CONTENT_PAGE = PREFIX + "target_editor_content_page"; //$NON-NLS-1$
> 
> 	// Tools
> 	public static final String ORGANIZE_MANIFESTS = PREFIX + "organize_manifest"; //$NON-NLS-1$
>@@ -250,4 +268,4 @@
> 	public static final String UPDATE_SITE_PROVISIONING_PAGE = PREFIX + "update_site_provisioning_page"; //$NON-NLS-1$
> 	public static final String P2_PROVISIONING_PAGE = PREFIX + "p2_provisioning_page"; //$NON-NLS-1$
> 
>-}
>+}
>\ No newline at end of file

Flags:

curtis.windatt.public: iplog+

Actions: View | Diff

Attachments on bug 277506: 137233 | 137327 | 137455 | 137500