Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
View | Details | Raw Unified | Return to bug 232329
Collapse All | Expand All

(-)plugin.xml (-2 / +10 lines)
Lines 76-87 Link Here
76
   <extension point="org.eclipse.help.contexts"> 
76
   <extension point="org.eclipse.help.contexts"> 
77
      <contexts file="contexts_Search.xml" plugin="org.eclipse.search"/> 
77
      <contexts file="contexts_Search.xml" plugin="org.eclipse.search"/> 
78
   </extension>
78
   </extension>
79
   
79
80
	<extension point="org.eclipse.help.contexts"> 
80
	<extension point="org.eclipse.help.contexts"> 
81
		<contexts file="contexts_Update.xml"  plugin="org.eclipse.update.ui"/> 
81
		<contexts file="contexts_P2.xml"  plugin="org.eclipse.equinox.p2.ui"/> 
82
	</extension>
82
	</extension>
83
83
84
	<extension point="org.eclipse.help.contexts"> 
84
	<extension point="org.eclipse.help.contexts"> 
85
		<contexts file="contexts_P2.xml"  plugin="org.eclipse.equinox.p2.ui.sdk"/> 
86
	</extension>
87
	
88
	<extension point="org.eclipse.help.contexts"> 
89
		<contexts file="contexts_Update.xml"  plugin="org.eclipse.update.ui"/> 
90
	</extension>
91
	
92
	<extension point="org.eclipse.help.contexts"> 
85
		<contexts file="contexts_UserAssistance.xml"  plugin="org.eclipse.help.ui"/> 
93
		<contexts file="contexts_UserAssistance.xml"  plugin="org.eclipse.help.ui"/> 
86
	</extension>
94
	</extension>
87
	
95
	
(-)tasks/tasks-120.htm (+32 lines)
Added Link Here
1
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
2
<HTML>
3
<HEAD>
4
5
<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2005. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
6
7
<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1">
8
<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
9
<LINK REL="STYLESHEET" HREF="../book.css" CHARSET="ISO-8859-1" TYPE="text/css">
10
<title>Updating features with the Software Updates dialog</title>
11
<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"> </script>
12
</HEAD>
13
14
<BODY BGCOLOR="#ffffff">
15
<H1>Updating features with the Software Updates dialog</H1>
16
TODO --- FILL IN CONTENTS
17
See tasks-36.htm for old Update version of this task
18
<P><img border="0" src="../images/ngrelc.png" alt="Related concepts" ><br>
19
<a href="../concepts/concepts-25.htm">Features</a>
20
</P>
21
22
<P>
23
<img border="0" src="../images/ngrelt.png" alt="Related tasks" ><br>
24
<a href="tasks-33.htm">Inspecting the current configuration</a><br>
25
<a href="tasks-36.htm">Updating features with the update manager</a><br>
26
<a href="tasks-38.htm">Restoring a saved configuration</a>
27
</P>
28
29
30
31
</BODY>
32
</HTML>
(-)tasks/tasks-121.htm (+35 lines)
Added Link Here
1
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
2
<HTML>
3
<HEAD>
4
5
<meta name="copyright" content="Copyright (c) IBM Corporation and others 2008. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
6
7
<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1">
8
<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
9
<LINK REL="STYLESHEET" HREF="../book.css" CHARSET="ISO-8859-1" TYPE="text/css">
10
<title>Installing new add-on features with the Software Updates dialog</title>
11
<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"> </script>
12
</HEAD>
13
14
<BODY BGCOLOR="#ffffff">
15
<h1>Installing new add-on features with the Software Updates dialog</h1>
16
TODO --- FILL IN CONTENTS
17
See tasks-34.htm for old Update version of this task
18
19
<P><img border="0" src="../images/ngrelc.png" alt="Related concepts" ><br>
20
<a href="../concepts/concepts-25.htm">Features</a>
21
</P>
22
23
<P><img border="0" src="../images/ngrelt.png" alt="Related tasks" ><br>
24
<a href="tasks-33.htm">Inspecting the current configuration</a><br>
25
<a href="tasks-34.htm">Installing new features with the update manager</a><br>
26
<a href="tasks-35.htm">Enabling, disabling, and uninstalling features</a><br>
27
<a href="tasks-37.htm">Controlling the Eclipse update policy</a><br>
28
<a href="tasks-37a.htm">Scheduling automatic updates</a><br>
29
<a href="tasks-38.htm">Restoring a saved configuration</a>
30
</P>
31
32
33
34
</BODY>
35
</HTML>
(-)contexts_P2.xml (+36 lines)
Added Link Here
1
<?xml version="1.0" encoding="UTF-8"?>
2
<?NLS TYPE="org.eclipse.help.contexts"?>
3
<contexts>
4
    <!-- Dialogs -->
5
    
6
    <context id="update_and_install_dialog_context">
7
        <description>In this dialog, you can update your installation or add new sites to bring in additional add-on features.</description>
8
        <topic label="Updating features with the Software Updates dialog" href="tasks/tasks-120.htm"/>   
9
        <topic label="Installing new add-on features with the Software Updates dialog" href="tasks/tasks-121.htm"/>
10
    </context>
11
12
    <context id="revert_configuration_wizard_context">
13
        <description>In this dialog, you can revert the configuration to its previous install state.</description>
14
    </context>
15
16
    <context id="uinstall_wizard_context">
17
        <description>In this dialog, you can uninstall the selected feature.</description>
18
    </context>
19
 
20
    <context id="update_wizard_context">
21
        <description>In this dialog, you can update the installation.</description>
22
    </context>
23
24
    <context id="add_repository_dialog_context">
25
        <description>In this dialog, you can add new sites to bring in additional add-on features.</description>
26
    </context>
27
28
    <context id="repository_manipulation_dialog_context">
29
        <description>In this dialog, you can manage your software sites.</description>
30
    </context>
31
32
    <context id="install_wizard_context">
33
        <description>In this wizard, you can install add-ons.</description>
34
    </context>
35
36
</contexts>
(-)src/org/eclipse/equinox/internal/provisional/p2/ui/actions/UpdateAction.java (+4 lines)
Lines 33-38 Link Here
33
import org.eclipse.jface.viewers.ISelectionProvider;
33
import org.eclipse.jface.viewers.ISelectionProvider;
34
import org.eclipse.jface.wizard.WizardDialog;
34
import org.eclipse.jface.wizard.WizardDialog;
35
import org.eclipse.swt.widgets.Shell;
35
import org.eclipse.swt.widgets.Shell;
36
import org.eclipse.ui.PlatformUI;
36
37
37
public class UpdateAction extends ProfileModificationAction {
38
public class UpdateAction extends ProfileModificationAction {
38
39
Lines 52-57 Link Here
52
53
53
		UpdateWizard wizard = new UpdateWizard(targetProfileId, ius, (AvailableUpdateElement[]) allReplacements.toArray(new AvailableUpdateElement[allReplacements.size()]), latestReplacements.values().toArray(), plan, getLicenseManager());
54
		UpdateWizard wizard = new UpdateWizard(targetProfileId, ius, (AvailableUpdateElement[]) allReplacements.toArray(new AvailableUpdateElement[allReplacements.size()]), latestReplacements.values().toArray(), plan, getLicenseManager());
54
		WizardDialog dialog = new WizardDialog(getShell(), wizard);
55
		WizardDialog dialog = new WizardDialog(getShell(), wizard);
56
		dialog.create();
57
		PlatformUI.getWorkbench().getHelpSystem().setHelp(dialog.getShell(), IProvHelpContextIds.UPDATE_WIZARD);
58
55
		return dialog.open();
59
		return dialog.open();
56
	}
60
	}
57
61
(-)src/org/eclipse/equinox/internal/provisional/p2/ui/actions/InstallAction.java (+4 lines)
Lines 29-34 Link Here
29
import org.eclipse.jface.viewers.ISelectionProvider;
29
import org.eclipse.jface.viewers.ISelectionProvider;
30
import org.eclipse.jface.wizard.WizardDialog;
30
import org.eclipse.jface.wizard.WizardDialog;
31
import org.eclipse.swt.widgets.Shell;
31
import org.eclipse.swt.widgets.Shell;
32
import org.eclipse.ui.PlatformUI;
32
33
33
public class InstallAction extends ProfileModificationAction {
34
public class InstallAction extends ProfileModificationAction {
34
35
Lines 119-124 Link Here
119
	protected int performOperation(IInstallableUnit[] ius, String targetProfileId, ProvisioningPlan plan) {
120
	protected int performOperation(IInstallableUnit[] ius, String targetProfileId, ProvisioningPlan plan) {
120
		InstallWizard wizard = new InstallWizard(targetProfileId, ius, plan, getLicenseManager());
121
		InstallWizard wizard = new InstallWizard(targetProfileId, ius, plan, getLicenseManager());
121
		WizardDialog dialog = new WizardDialog(getShell(), wizard);
122
		WizardDialog dialog = new WizardDialog(getShell(), wizard);
123
		dialog.create();
124
		PlatformUI.getWorkbench().getHelpSystem().setHelp(dialog.getShell(), IProvHelpContextIds.INSTALL_WIZARD);
125
122
		return dialog.open();
126
		return dialog.open();
123
	}
127
	}
124
128
(-)src/org/eclipse/equinox/internal/provisional/p2/ui/actions/UninstallAction.java (-2 / +5 lines)
Lines 19-26 Link Here
19
import org.eclipse.equinox.internal.provisional.p2.engine.IProfile;
19
import org.eclipse.equinox.internal.provisional.p2.engine.IProfile;
20
import org.eclipse.equinox.internal.provisional.p2.engine.ProvisioningContext;
20
import org.eclipse.equinox.internal.provisional.p2.engine.ProvisioningContext;
21
import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit;
21
import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit;
22
import org.eclipse.equinox.internal.provisional.p2.ui.IProfileChooser;
22
import org.eclipse.equinox.internal.provisional.p2.ui.*;
23
import org.eclipse.equinox.internal.provisional.p2.ui.ProvUI;
24
import org.eclipse.equinox.internal.provisional.p2.ui.dialogs.UninstallWizard;
23
import org.eclipse.equinox.internal.provisional.p2.ui.dialogs.UninstallWizard;
25
import org.eclipse.equinox.internal.provisional.p2.ui.model.InstalledIUElement;
24
import org.eclipse.equinox.internal.provisional.p2.ui.model.InstalledIUElement;
26
import org.eclipse.equinox.internal.provisional.p2.ui.operations.ProvisioningUtil;
25
import org.eclipse.equinox.internal.provisional.p2.ui.operations.ProvisioningUtil;
Lines 28-33 Link Here
28
import org.eclipse.jface.viewers.ISelectionProvider;
27
import org.eclipse.jface.viewers.ISelectionProvider;
29
import org.eclipse.jface.wizard.WizardDialog;
28
import org.eclipse.jface.wizard.WizardDialog;
30
import org.eclipse.swt.widgets.Shell;
29
import org.eclipse.swt.widgets.Shell;
30
import org.eclipse.ui.PlatformUI;
31
31
32
public class UninstallAction extends ProfileModificationAction {
32
public class UninstallAction extends ProfileModificationAction {
33
33
Lines 71-76 Link Here
71
	protected int performOperation(IInstallableUnit[] ius, String targetProfileId, ProvisioningPlan plan) {
71
	protected int performOperation(IInstallableUnit[] ius, String targetProfileId, ProvisioningPlan plan) {
72
		UninstallWizard wizard = new UninstallWizard(targetProfileId, ius, plan);
72
		UninstallWizard wizard = new UninstallWizard(targetProfileId, ius, plan);
73
		WizardDialog dialog = new WizardDialog(getShell(), wizard);
73
		WizardDialog dialog = new WizardDialog(getShell(), wizard);
74
		dialog.create();
75
		PlatformUI.getWorkbench().getHelpSystem().setHelp(dialog.getShell(), IProvHelpContextIds.UNINSTALL_WIZARD);
76
74
		return dialog.open();
77
		return dialog.open();
75
	}
78
	}
76
79
(-)src/org/eclipse/equinox/internal/provisional/p2/ui/dialogs/AddRepositoryDialog.java (+3 lines)
Lines 16-21 Link Here
16
import org.eclipse.core.runtime.Status;
16
import org.eclipse.core.runtime.Status;
17
import org.eclipse.equinox.internal.p2.ui.ProvUIActivator;
17
import org.eclipse.equinox.internal.p2.ui.ProvUIActivator;
18
import org.eclipse.equinox.internal.p2.ui.ProvUIMessages;
18
import org.eclipse.equinox.internal.p2.ui.ProvUIMessages;
19
import org.eclipse.equinox.internal.provisional.p2.ui.IProvHelpContextIds;
19
import org.eclipse.equinox.internal.provisional.p2.ui.ProvisioningOperationRunner;
20
import org.eclipse.equinox.internal.provisional.p2.ui.ProvisioningOperationRunner;
20
import org.eclipse.equinox.internal.provisional.p2.ui.operations.ProvisioningOperation;
21
import org.eclipse.equinox.internal.provisional.p2.ui.operations.ProvisioningOperation;
21
import org.eclipse.jface.dialogs.*;
22
import org.eclipse.jface.dialogs.*;
Lines 27-32 Link Here
27
import org.eclipse.swt.layout.GridData;
28
import org.eclipse.swt.layout.GridData;
28
import org.eclipse.swt.layout.GridLayout;
29
import org.eclipse.swt.layout.GridLayout;
29
import org.eclipse.swt.widgets.*;
30
import org.eclipse.swt.widgets.*;
31
import org.eclipse.ui.PlatformUI;
30
import org.eclipse.ui.statushandlers.StatusManager;
32
import org.eclipse.ui.statushandlers.StatusManager;
31
33
32
/**
34
/**
Lines 54-59 Link Here
54
		this.repoFlag = repoFlag;
56
		this.repoFlag = repoFlag;
55
		urlValidator = createURLValidator();
57
		urlValidator = createURLValidator();
56
		setTitle(ProvUIMessages.AddRepositoryDialog_Title);
58
		setTitle(ProvUIMessages.AddRepositoryDialog_Title);
59
		PlatformUI.getWorkbench().getHelpSystem().setHelp(parentShell, IProvHelpContextIds.ADD_REPOSITORY_DIALOG);
57
	}
60
	}
58
61
59
	protected void createButtonsForButtonBar(Composite parent) {
62
	protected void createButtonsForButtonBar(Composite parent) {
(-)src/org/eclipse/equinox/internal/provisional/p2/ui/IProvHelpContextIds.java (+27 lines)
Added Link Here
1
package org.eclipse.equinox.internal.provisional.p2.ui;
2
3
import org.eclipse.equinox.internal.p2.ui.ProvUIActivator;
4
5
/**
6
 * Help context ids for the P2 UI
7
 * <p>
8
 * This interface contains constants only; it is not intended to be implemented
9
 * or extended.
10
 * </p>
11
 * @since 3.4
12
 */
13
14
public interface IProvHelpContextIds {
15
	public static final String PREFIX = ProvUIActivator.PLUGIN_ID + "."; //$NON-NLS-1$
16
17
	public static final String REVERT_CONFIGURATION_WIZARD = PREFIX + "revert_configuration_wizard_context"; //$NON-NLS-1$ 
18
19
	public static final String UNINSTALL_WIZARD = PREFIX + "uinstall_wizard_context"; //$NON-NLS-1$ 
20
21
	public static final String UPDATE_WIZARD = PREFIX + "update_wizard_context"; //$NON-NLS-1$ 
22
23
	public static final String ADD_REPOSITORY_DIALOG = PREFIX + "add_repository_dialog_context"; //$NON-NLS-1$ 
24
25
	public static final String INSTALL_WIZARD = PREFIX + "install_wizard_context"; //$NON-NLS-1$ 
26
27
}
(-)src/org/eclipse/equinox/internal/provisional/p2/ui/sdk/RepositoryManipulationDialog.java (+3 lines)
Lines 33-38 Link Here
33
import org.eclipse.swt.layout.GridData;
33
import org.eclipse.swt.layout.GridData;
34
import org.eclipse.swt.layout.GridLayout;
34
import org.eclipse.swt.layout.GridLayout;
35
import org.eclipse.swt.widgets.*;
35
import org.eclipse.swt.widgets.*;
36
import org.eclipse.ui.PlatformUI;
36
37
37
/**
38
/**
38
 * Dialog that allows users to update, add, or remove repositories.
39
 * Dialog that allows users to update, add, or remove repositories.
Lines 63-68 Link Here
63
64
64
	protected void configureShell(Shell shell) {
65
	protected void configureShell(Shell shell) {
65
		shell.setText(ProvSDKMessages.RepositoryManipulationDialog_UpdateSitesDialogTitle);
66
		shell.setText(ProvSDKMessages.RepositoryManipulationDialog_UpdateSitesDialogTitle);
67
		PlatformUI.getWorkbench().getHelpSystem().setHelp(shell, IProvSDKHelpContextIds.REPOSITORY_MANIPULATION_DIALOG);
68
66
		super.configureShell(shell);
69
		super.configureShell(shell);
67
	}
70
	}
68
71
(-)src/org/eclipse/equinox/internal/p2/ui/sdk/UpdateAndInstallDialog.java (+5 lines)
Lines 124-129 Link Here
124
124
125
	protected void configureShell(Shell shell) {
125
	protected void configureShell(Shell shell) {
126
		shell.setText(ProvSDKMessages.UpdateAndInstallDialog_Title);
126
		shell.setText(ProvSDKMessages.UpdateAndInstallDialog_Title);
127
		PlatformUI.getWorkbench().getHelpSystem().setHelp(shell, IProvSDKHelpContextIds.UPDATE_AND_INSTALL_DIALOG);
128
127
		super.configureShell(shell);
129
		super.configureShell(shell);
128
	}
130
	}
129
131
Lines 652-662 Link Here
652
				WizardDialog dialog = new WizardDialog(getShell(), wizard);
654
				WizardDialog dialog = new WizardDialog(getShell(), wizard);
653
				dialog.create();
655
				dialog.create();
654
				dialog.getShell().setSize(600, 500);
656
				dialog.getShell().setSize(600, 500);
657
				PlatformUI.getWorkbench().getHelpSystem().setHelp(dialog.getShell(), IProvHelpContextIds.REVERT_CONFIGURATION_WIZARD);
658
655
				dialog.open();
659
				dialog.open();
656
			}
660
			}
657
		};
661
		};
658
		revertAction.setText(ProvSDKMessages.UpdateAndInstallDialog_RevertActionLabel);
662
		revertAction.setText(ProvSDKMessages.UpdateAndInstallDialog_RevertActionLabel);
659
		revertAction.setToolTipText(ProvSDKMessages.UpdateAndInstallDialog_RevertTooltip);
663
		revertAction.setToolTipText(ProvSDKMessages.UpdateAndInstallDialog_RevertTooltip);
664
660
		revertButton = createVerticalButton(composite, revertAction, false);
665
		revertButton = createVerticalButton(composite, revertAction, false);
661
666
662
		createMenu(installedIUGroup.getStructuredViewer().getControl(), new IAction[] {updateAction, uninstallAction, propertiesAction});
667
		createMenu(installedIUGroup.getStructuredViewer().getControl(), new IAction[] {updateAction, uninstallAction, propertiesAction});
(-)src/org/eclipse/equinox/internal/p2/ui/sdk/IProvSDKHelpContextIds.java (+19 lines)
Added Link Here
1
package org.eclipse.equinox.internal.p2.ui.sdk;
2
3
/**
4
 * Help context ids for the P2 SDK
5
 * <p>
6
 * This interface contains constants only; it is not intended to be implemented
7
 * or extended.
8
 * </p>
9
 * @since 3.4
10
 */
11
12
public interface IProvSDKHelpContextIds {
13
	public static final String PREFIX = ProvSDKUIActivator.PLUGIN_ID + "."; //$NON-NLS-1$
14
15
	public static final String UPDATE_AND_INSTALL_DIALOG = PREFIX + "update_and_install_dialog_context"; //$NON-NLS-1$ 
16
17
	public static final String REPOSITORY_MANIPULATION_DIALOG = PREFIX + "repository_manipulation_dialog_context"; //$NON-NLS-1$ 
18
19
}

Return to bug 232329