Attachment 137233 Details for Bug 277506 – Work in progress patch (do not commit)

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

[patch] Work in progress patch (do not commit)

20090527.txt (text/plain), 50.28 KB, created by Ankur Sharma

on 2009-05-26 17:32:18 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Ankur Sharma

Created: 2009-05-26 17:32:18 EDT

Size: 50.28 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.pde.ui
>Index: src/org/eclipse/pde/internal/ui/shared/target/TargetLocationsGroup.java
>===================================================================
>RCS file: /cvsroot/eclipse/pde/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/shared/target/TargetLocationsGroup.java,v
>retrieving revision 1.8
>diff -u -r1.8 TargetLocationsGroup.java
>--- src/org/eclipse/pde/internal/ui/shared/target/TargetLocationsGroup.java	11 May 2009 16:22:50 -0000	1.8
>+++ src/org/eclipse/pde/internal/ui/shared/target/TargetLocationsGroup.java	26 May 2009 21:30:17 -0000
>@@ -19,6 +19,7 @@
> import org.eclipse.pde.internal.core.target.IUBundleContainer;
> import org.eclipse.pde.internal.core.target.TargetDefinition;
> import org.eclipse.pde.internal.core.target.provisional.*;
>+import org.eclipse.pde.internal.ui.IHelpContextIds;
> import org.eclipse.pde.internal.ui.SWTFactory;
> import org.eclipse.pde.internal.ui.editor.FormLayoutFactory;
> import org.eclipse.pde.internal.ui.editor.targetdefinition.TargetEditor;
>@@ -29,6 +30,7 @@
> 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.forms.widgets.FormToolkit;
> 
> /**
>@@ -132,6 +134,7 @@
> 		initializeButtons();
> 
> 		toolkit.paintBordersFor(comp);
>+		PlatformUI.getWorkbench().getHelpSystem().setHelp(comp, IHelpContextIds.EDIT_TARGET_WIZARD_LOCATIONS_TAB);
> 	}
> 
> 	/**
>@@ -163,6 +166,7 @@
> 
> 		initializeTreeViewer(atree);
> 		initializeButtons();
>+		PlatformUI.getWorkbench().getHelpSystem().setHelp(comp, IHelpContextIds.EDIT_TARGET_WIZARD_LOCATIONS_TAB);
> 	}
> 
> 	/**
>Index: src/org/eclipse/pde/internal/ui/shared/target/TargetContentsGroup.java
>===================================================================
>RCS file: /cvsroot/eclipse/pde/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/shared/target/TargetContentsGroup.java,v
>retrieving revision 1.9
>diff -u -r1.9 TargetContentsGroup.java
>--- src/org/eclipse/pde/internal/ui/shared/target/TargetContentsGroup.java	11 May 2009 16:22:49 -0000	1.9
>+++ src/org/eclipse/pde/internal/ui/shared/target/TargetContentsGroup.java	26 May 2009 21:30:17 -0000
>@@ -30,8 +30,7 @@
> import org.eclipse.pde.internal.core.DependencyManager;
> import org.eclipse.pde.internal.core.PDEState;
> import org.eclipse.pde.internal.core.target.provisional.*;
>-import org.eclipse.pde.internal.ui.PDEPlugin;
>-import org.eclipse.pde.internal.ui.SWTFactory;
>+import org.eclipse.pde.internal.ui.*;
> import org.eclipse.pde.internal.ui.editor.targetdefinition.TargetEditor;
> import org.eclipse.pde.internal.ui.parts.ComboPart;
> import org.eclipse.pde.internal.ui.wizards.target.TargetDefinitionContentPage;
>@@ -41,6 +40,7 @@
> 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.FilteredTree;
> import org.eclipse.ui.dialogs.PatternFilter;
> import org.eclipse.ui.forms.widgets.FormToolkit;
>@@ -104,6 +104,7 @@
> 		PatternFilter filter = new PatternFilter();
> 		filter.setIncludeLeadingWildcard(true);
> 		super.init(SWT.NONE, filter);
>+		PlatformUI.getWorkbench().getHelpSystem().setHelp(parent, IHelpContextIds.EDIT_TARGET_WIZARD_CONTENT_TAB);
> 	}
> 
> 	public TargetContentsGroup(Composite parent, FormToolkit toolkit) {
>@@ -113,6 +114,7 @@
> 		PatternFilter filter = new PatternFilter();
> 		filter.setIncludeLeadingWildcard(true);
> 		super.init(SWT.NONE, filter);
>+		PlatformUI.getWorkbench().getHelpSystem().setHelp(parent, IHelpContextIds.EDIT_TARGET_WIZARD_CONTENT_TAB);
> 	}
> 
> 	/**
>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	26 May 2009 21:30:15 -0000
>@@ -19,17 +19,17 @@
> 	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 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 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_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$
>+	//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$
>@@ -116,7 +116,16 @@
> 	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 TOC_PAGE = PREFIX + "toc_page"; //$NON-NLS-1$
> 
> 	public static final String XHTML_CONVERSION_PAGE = PREFIX + "xhtml_conversion_page"; //$NON-NLS-1$
>@@ -239,8 +248,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$
>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	26 May 2009 21:30:18 -0000
>@@ -184,6 +184,7 @@
> 		depTab.setText(PDEUIMessages.TargetDefinitionEnvironmentPage_5);
> 		depTab.setControl(createImplicitTabContents(tabs));
> 
>+		PlatformUI.getWorkbench().getHelpSystem().setHelp(comp, IHelpContextIds.EDIT_TARGET_WIZARD);
> 		initializeListeners();
> 		targetChanged(getTargetDefinition());
> 		setControl(comp);
>@@ -361,7 +362,7 @@
> 				getTargetDefinition().setNL(getModelValue(value));
> 			}
> 		});
>-
>+		PlatformUI.getWorkbench().getHelpSystem().setHelp(group, IHelpContextIds.EDIT_TARGET_WIZARD_ENVIRONMENT_TAB);
> 	}
> 
> 	/**
>@@ -541,7 +542,7 @@
> 
> 		Button vmVars = SWTFactory.createPushButton(buttons, PDEUIMessages.JavaArgumentsTab_vmVariables, null, GridData.HORIZONTAL_ALIGN_END);
> 		vmVars.addSelectionListener(getVariablesListener(fVMArgs));
>-
>+		PlatformUI.getWorkbench().getHelpSystem().setHelp(container, IHelpContextIds.EDIT_TARGET_WIZARD_ARGUMENT_TAB);
> 		return container;
> 	}
> 
>@@ -601,7 +602,7 @@
> 		createImpLabel(container);
> 		createImpTable(container);
> 		createImpButtons(container);
>-		// TODO: PlatformUI.getWorkbench().getHelpSystem().setHelp(container, IHelpContextIds.IMPLICIT_PLUGINS_PREFERENCE_PAGE);
>+		PlatformUI.getWorkbench().getHelpSystem().setHelp(container, IHelpContextIds.EDIT_TARGET_WIZARD_IMPLICIT_TAB);
> 		return container;
> 	}
> 
>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	26 May 2009 21:30:17 -0000
>@@ -1,233 +1,235 @@
>-/*******************************************************************************
>- * 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()];
>+
>+			}
>+		});
>+
>+		PlatformUI.getWorkbench().getHelpSystem().setHelp(comp, IHelpContextIds.NEW_TARGET_WIZARD);
>+
>+		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;
>+	}
>+}
>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	26 May 2009 21:30:16 -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)
>@@ -148,9 +147,8 @@
> 		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$
>-//	}
>+	protected String getHelpResource() {
>+		return "/org.eclipse.pde.doc.user/guide/tools/editors/target_editor/definition_page.htm"; //$NON-NLS-1$
>+	}
> 
> }
>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	26 May 2009 21:30:15 -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)
>@@ -81,9 +81,8 @@
> 		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$
>-//	}
>+	protected String getHelpResource() {
>+		return "/org.eclipse.pde.doc.user/guide/tools/editors/target_editor/content_page.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	26 May 2009 21:30:16 -0000
>@@ -1,84 +1,87 @@
>-/*******************************************************************************
>- * 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;
>+	}
>+
>+	protected String getHelpResource() {
>+		return "/org.eclipse.pde.doc.user/guide/tools/editors/target_editor/environment_page.htm"; //$NON-NLS-1$
>+	}
>+}
>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	26 May 2009 21:30:16 -0000
>@@ -309,6 +309,7 @@
> 	 */
> 	public void addForm(IManagedForm managedForm) {
> 		fManagedFormPages.add(managedForm);
>+		PlatformUI.getWorkbench().getHelpSystem().setHelp(managedForm.getForm().getBody(), IHelpContextIds.TARGET_EDITOR);
> 	}
> 
> 	/**
>#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.58
>diff -u -r1.58 contexts_PDE.xml
>--- contexts_PDE.xml	13 May 2009 16:37:12 -0000	1.58
>+++ contexts_PDE.xml	26 May 2009 21:30:23 -0000
>@@ -459,16 +459,26 @@
> 		<description>This wizard allows you to register a Help table of contents with the project's plugin.xml file.</description>
>   <topic href="guide/tools/editors/toc_editor/editor.htm" label="Table of Contents Editor"/>
> 	</context>
>+ <context id="target_editor" title="Target Definition Editor">
>+    <description>The Target Definition Editor is used to edit target definition files in the workspace, which should end with the extension &quot;.target&quot;. Target definition files can be created using the New Target Definition Wizard or by moving them to the workspace on the Target Platform Preference Page.</description>
>+    <topic href="guide/tools/editors/target_editor/definition_page.htm" label="Target Definition Editor Definition Page"/>
>+    <topic href="guide/tools/editors/target_editor/content_page.htm" label="Target Definition Editor Content Page"/>
>+    <topic href="guide/tools/editors/target_editor/environment_page.htm" label="Target Definition Editor Environment Page"/>
>+    <topic href="guide/tools/editors/target_editor/target_editor.htm" label="Target Definition Editor"/>
>+ </context>
> 
> 
>     
>-	<context id="environment_page">
>-		<description>This page allows you to define the target environment</description>
>+	<context id="target_editor_environment_page" title="Target Definition Editor Environment Page">
>+		<description>The Enviroment Page in the Target Definition Editor is used to edit many settings in the definition affecting how the target will be compiled and run.</description>
> 	</context>
>     
>-	<context id="target_overview_page">
>-		<description>This page allows you to speciy a target definition and target content</description>
>+	<context id="target_editor_definition_page" title="Target Definition Editor Definition Page">
>+		<description>The Definition Page in the Target Definition Editor is used to edit the most important settings in a target definition file. The Target Name is used to display your targets on the Target Platform Preference Page. The Locations section is used to add locations that contain plug-ins and works the same as the Location Tab on the Edit Target Wizard.</description>
> 	</context>
>+ <context id="target_editor_content_page" title="Target Definition Editor Content Page">
>+    <description>The Content Page in the Target Definition Editor is used to view and edit the set of plug-ins to be included in the target definition when set as the active target platform. The definition must contain one or more locations containing plug-ins and the definition must be resolved to edit the content. Only the plug-ins that are checked on this page will be included in the target. There are multiple options available to filter and sort the list to quickly check what you require.</description>
>+ </context>
> 
> 
> 
>@@ -521,6 +531,7 @@
>    
>    <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>
>-
>-   
>+
>    <context id="source_preference_page" >
>       <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>
>       <topic label="Source Code Locations" href="guide/tools/preference_pages/source_code_locations.htm"/>
>    </context>
> 
>-	
>    <context id="launching_args_preference_page" >
>       <description>This page allows you to specify program and VM arguments that you wish to test your plug-ins with.</description>
>       <topic label="Launching Arguments" href="guide/tools/preference_pages/launching_args.htm"/>
>    </context>
>-   
>-   
>+
>    <context id="implicit_plugins_preference_page" >
>       <description>This page allows you to specify existing plug-ins that are required to run your plug-ins.</description>
>       <topic label="Implicit Dependencies" href="guide/tools/preference_pages/implicit_dependencies.htm"/>
>    </context>
>-
>+   
>    <context id="implicit_plugins_selection_dialog" >
>       <description>This dialog allows you to select one or more plug-ins to add as implicit dependencies of your plug-ins.</description>
>       <topic label="Implicit Dependencies" href="guide/tools/preference_pages/implicit_dependencies.htm"/>
>    </context>
> 
>-   
>    <context id="target_environment_preference_page" >
>       <description>This page allows you to set the target environment for the plug-ins you develop.</description>
>       <topic label="Target Environment" href="guide/tools/preference_pages/target_env.htm"/>
>@@ -570,7 +577,7 @@
>       <topic label="Target Environment" href="guide/tools/preference_pages/target_env.htm"/>
>    </context>
>    
>-     
>+-->     
> 
> 
> 
>@@ -966,7 +973,35 @@
>    <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"/>
>-   </context>		
>+   </context>
>+   <context id="new_target_wizard" title="New Target Wizard">
>+      <description>This wizard creates a new target definition that will be added to the Target Platform Preference Page. There are several options to initialize your target definition with data. The new target definition will be saved in the Eclipse preferences, to create a target definition in your workspace use the New Target Definition File Wizard.</description>
>+      <topic href="guide/tools/target_shared/new_target_wizard.htm" label="New Target Wizard"/>
>+   </context>
>+   <context id="edit_target_wizard" title="Target Definition Wizard">
>+      <description>This wizard is used to edit target definitions. It is opened when a target definition on the Target Platform Preference Page is edited or a new definition is created. This wizard provides the same functionality as the Target Editor.</description>
>+      <topic href="guide/tools/target_shared/edit_target_wizard.htm" label="Edit Target Wizard"/>
>+      <topic href="guide/tools/target_shared/edit_target_arguments_tab.htm" label="Argument Tab"/>
>+      <topic href="guide/tools/target_shared/edit_target_content_tab.htm" label="Content Tab"/>
>+      <topic href="guide/tools/target_shared/edit_target_environment_tab.htm" label="Environment Tab"/>
>+      <topic href="guide/tools/target_shared/edit_target_implicit_tab.htm" label="Implicit Dependencies Tab"/>
>+      <topic href="guide/tools/target_shared/edit_target_locations_tab.htm" label="Locations Tab"/>
>+   </context>
>+   <context id="edit_target_wizard_locations_tab" title="Target Definition Wizard Locations Tab">
>+      <description>The Location Tab in the Edit Target Wizard is used to set the locations that provide the plug-ins included in the target definition. There are several types of locations, allowing for definitions to be constructed in different styles.</description>
>+   </context>
>+   <context id="edit_target_wizard_argument_tab" title="Target Definition Wizard Arguments Tab">
>+      <description>The Arguments Tab in the Edit Target Wizard is used to set the default program and vm arguments for new PDE launch configurations.</description>
>+   </context>
>+   <context id="edit_target_wizard_content_tab" title="Target Definition Wizard Content Tab">
>+      <description>The Content Tab in the Edit Target Wizard is used to set a subset of plug-ins to include in the target platform. The tab displays a list of all plug-ins available in the target definition&apos;s locations. Only the plug-ins checked on this tab will be included. There are multiple ways to organize and filter the list.</description>
>+   </context>
>+   <context id="edit_target_wizard_environment_tab" title="Target Definition Wizard Environment Tab">
>+      <description>The Environment Tab in the Edit Target Wizard is used to set environment settings that affect how a target is compiled and run. The environment settings can also be edited on the Environment Page of the Target Editor.</description>
>+   </context>
>+   <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>
> 
> </contexts>
>

Actions: View | Diff

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