Attachment 102788 Details for Bug 232329 – Patch for dialog/wizard context IDs and placeholder content

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

[patch] Patch for dialog/wizard context IDs and placeholder content

patch232329 p2 help.txt (text/plain), 17.90 KB, created by Kevin McGuire

on 2008-05-29 21:23:39 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Kevin McGuire

Created: 2008-05-29 21:23:39 EDT

Size: 17.90 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.platform.doc.user
>Index: plugin.xml
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.platform.doc.user/plugin.xml,v
>retrieving revision 1.31
>diff -u -r1.31 plugin.xml
>--- plugin.xml	23 Jul 2007 14:28:59 -0000	1.31
>+++ plugin.xml	30 May 2008 01:16:27 -0000
>@@ -76,12 +76,20 @@
>    <extension point="org.eclipse.help.contexts"> 
>       <contexts file="contexts_Search.xml" plugin="org.eclipse.search"/> 
>    </extension>
>-   
>+
> 	<extension point="org.eclipse.help.contexts"> 
>-		<contexts file="contexts_Update.xml"  plugin="org.eclipse.update.ui"/> 
>+		<contexts file="contexts_P2.xml"  plugin="org.eclipse.equinox.p2.ui"/> 
> 	</extension>
> 
> 	<extension point="org.eclipse.help.contexts"> 
>+		<contexts file="contexts_P2.xml"  plugin="org.eclipse.equinox.p2.ui.sdk"/> 
>+	</extension>
>+	
>+	<extension point="org.eclipse.help.contexts"> 
>+		<contexts file="contexts_Update.xml"  plugin="org.eclipse.update.ui"/> 
>+	</extension>
>+	
>+	<extension point="org.eclipse.help.contexts"> 
> 		<contexts file="contexts_UserAssistance.xml"  plugin="org.eclipse.help.ui"/> 
> 	</extension>
> 	
>Index: tasks/tasks-120.htm
>===================================================================
>RCS file: tasks/tasks-120.htm
>diff -N tasks/tasks-120.htm
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ tasks/tasks-120.htm	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,32 @@
>+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
>+<HTML>
>+<HEAD>
>+
>+<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." >
>+
>+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1">
>+<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
>+<LINK REL="STYLESHEET" HREF="../book.css" CHARSET="ISO-8859-1" TYPE="text/css">
>+<title>Updating features with the Software Updates dialog</title>
>+<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"> </script>
>+</HEAD>
>+
>+<BODY BGCOLOR="#ffffff">
>+<H1>Updating features with the Software Updates dialog</H1>
>+TODO --- FILL IN CONTENTS
>+See tasks-36.htm for old Update version of this task
>+<P><img border="0" src="../images/ngrelc.png" alt="Related concepts" ><br>
>+<a href="../concepts/concepts-25.htm">Features</a>
>+</P>
>+
>+<P>
>+<img border="0" src="../images/ngrelt.png" alt="Related tasks" ><br>
>+<a href="tasks-33.htm">Inspecting the current configuration</a><br>
>+<a href="tasks-36.htm">Updating features with the update manager</a><br>
>+<a href="tasks-38.htm">Restoring a saved configuration</a>
>+</P>
>+
>+
>+
>+</BODY>
>+</HTML>
>Index: tasks/tasks-121.htm
>===================================================================
>RCS file: tasks/tasks-121.htm
>diff -N tasks/tasks-121.htm
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ tasks/tasks-121.htm	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,35 @@
>+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
>+<HTML>
>+<HEAD>
>+
>+<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." >
>+
>+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1">
>+<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
>+<LINK REL="STYLESHEET" HREF="../book.css" CHARSET="ISO-8859-1" TYPE="text/css">
>+<title>Installing new add-on features with the Software Updates dialog</title>
>+<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"> </script>
>+</HEAD>
>+
>+<BODY BGCOLOR="#ffffff">
>+<h1>Installing new add-on features with the Software Updates dialog</h1>
>+TODO --- FILL IN CONTENTS
>+See tasks-34.htm for old Update version of this task
>+
>+<P><img border="0" src="../images/ngrelc.png" alt="Related concepts" ><br>
>+<a href="../concepts/concepts-25.htm">Features</a>
>+</P>
>+
>+<P><img border="0" src="../images/ngrelt.png" alt="Related tasks" ><br>
>+<a href="tasks-33.htm">Inspecting the current configuration</a><br>
>+<a href="tasks-34.htm">Installing new features with the update manager</a><br>
>+<a href="tasks-35.htm">Enabling, disabling, and uninstalling features</a><br>
>+<a href="tasks-37.htm">Controlling the Eclipse update policy</a><br>
>+<a href="tasks-37a.htm">Scheduling automatic updates</a><br>
>+<a href="tasks-38.htm">Restoring a saved configuration</a>
>+</P>
>+
>+
>+
>+</BODY>
>+</HTML>
>Index: contexts_P2.xml
>===================================================================
>RCS file: contexts_P2.xml
>diff -N contexts_P2.xml
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ contexts_P2.xml	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,36 @@
>+<?xml version="1.0" encoding="UTF-8"?>
>+<?NLS TYPE="org.eclipse.help.contexts"?>
>+<contexts>
>+    
>+    
>+    <context id="update_and_install_dialog_context">
>+        <description>In this dialog, you can update your installation or add new sites to bring in additional add-on features.</description>
>+        <topic label="Updating features with the Software Updates dialog" href="tasks/tasks-120.htm"/>   
>+        <topic label="Installing new add-on features with the Software Updates dialog" href="tasks/tasks-121.htm"/>
>+    </context>
>+
>+    <context id="revert_configuration_wizard_context">
>+        <description>In this dialog, you can revert the configuration to its previous install state.</description>
>+    </context>
>+
>+    <context id="uinstall_wizard_context">
>+        <description>In this dialog, you can uninstall the selected feature.</description>
>+    </context>
>+ 
>+    <context id="update_wizard_context">
>+        <description>In this dialog, you can update the installation.</description>
>+    </context>
>+
>+    <context id="add_repository_dialog_context">
>+        <description>In this dialog, you can add new sites to bring in additional add-on features.</description>
>+    </context>
>+
>+    <context id="repository_manipulation_dialog_context">
>+        <description>In this dialog, you can manage your software sites.</description>
>+    </context>
>+
>+    <context id="install_wizard_context">
>+        <description>In this wizard, you can install add-ons.</description>
>+    </context>
>+
>+</contexts>
>#P org.eclipse.equinox.p2.ui
>Index: src/org/eclipse/equinox/internal/provisional/p2/ui/actions/UpdateAction.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/actions/UpdateAction.java,v
>retrieving revision 1.13
>diff -u -r1.13 UpdateAction.java
>--- src/org/eclipse/equinox/internal/provisional/p2/ui/actions/UpdateAction.java	15 May 2008 18:03:04 -0000	1.13
>+++ src/org/eclipse/equinox/internal/provisional/p2/ui/actions/UpdateAction.java	30 May 2008 01:16:27 -0000
>@@ -33,6 +33,7 @@
> import org.eclipse.jface.viewers.ISelectionProvider;
> import org.eclipse.jface.wizard.WizardDialog;
> import org.eclipse.swt.widgets.Shell;
>+import org.eclipse.ui.PlatformUI;
> 
> public class UpdateAction extends ProfileModificationAction {
> 
>@@ -52,6 +53,9 @@
> 
> 		UpdateWizard wizard = new UpdateWizard(targetProfileId, ius, (AvailableUpdateElement[]) allReplacements.toArray(new AvailableUpdateElement[allReplacements.size()]), latestReplacements.values().toArray(), plan, getLicenseManager());
> 		WizardDialog dialog = new WizardDialog(getShell(), wizard);
>+		dialog.create();
>+		PlatformUI.getWorkbench().getHelpSystem().setHelp(dialog.getShell(), IProvHelpContextIds.UPDATE_WIZARD);
>+
> 		return dialog.open();
> 	}
> 
>Index: src/org/eclipse/equinox/internal/provisional/p2/ui/actions/InstallAction.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/actions/InstallAction.java,v
>retrieving revision 1.13
>diff -u -r1.13 InstallAction.java
>--- src/org/eclipse/equinox/internal/provisional/p2/ui/actions/InstallAction.java	23 May 2008 00:55:55 -0000	1.13
>+++ src/org/eclipse/equinox/internal/provisional/p2/ui/actions/InstallAction.java	30 May 2008 01:16:27 -0000
>@@ -29,6 +29,7 @@
> import org.eclipse.jface.viewers.ISelectionProvider;
> import org.eclipse.jface.wizard.WizardDialog;
> import org.eclipse.swt.widgets.Shell;
>+import org.eclipse.ui.PlatformUI;
> 
> public class InstallAction extends ProfileModificationAction {
> 
>@@ -119,6 +120,9 @@
> 	protected int performOperation(IInstallableUnit[] ius, String targetProfileId, ProvisioningPlan plan) {
> 		InstallWizard wizard = new InstallWizard(targetProfileId, ius, plan, getLicenseManager());
> 		WizardDialog dialog = new WizardDialog(getShell(), wizard);
>+		dialog.create();
>+		PlatformUI.getWorkbench().getHelpSystem().setHelp(dialog.getShell(), IProvHelpContextIds.INSTALL_WIZARD);
>+
> 		return dialog.open();
> 	}
> 
>Index: src/org/eclipse/equinox/internal/provisional/p2/ui/actions/UninstallAction.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/actions/UninstallAction.java,v
>retrieving revision 1.12
>diff -u -r1.12 UninstallAction.java
>--- src/org/eclipse/equinox/internal/provisional/p2/ui/actions/UninstallAction.java	15 May 2008 18:03:04 -0000	1.12
>+++ src/org/eclipse/equinox/internal/provisional/p2/ui/actions/UninstallAction.java	30 May 2008 01:16:27 -0000
>@@ -19,8 +19,7 @@
> import org.eclipse.equinox.internal.provisional.p2.engine.IProfile;
> import org.eclipse.equinox.internal.provisional.p2.engine.ProvisioningContext;
> import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit;
>-import org.eclipse.equinox.internal.provisional.p2.ui.IProfileChooser;
>-import org.eclipse.equinox.internal.provisional.p2.ui.ProvUI;
>+import org.eclipse.equinox.internal.provisional.p2.ui.*;
> import org.eclipse.equinox.internal.provisional.p2.ui.dialogs.UninstallWizard;
> import org.eclipse.equinox.internal.provisional.p2.ui.model.InstalledIUElement;
> import org.eclipse.equinox.internal.provisional.p2.ui.operations.ProvisioningUtil;
>@@ -28,6 +27,7 @@
> import org.eclipse.jface.viewers.ISelectionProvider;
> import org.eclipse.jface.wizard.WizardDialog;
> import org.eclipse.swt.widgets.Shell;
>+import org.eclipse.ui.PlatformUI;
> 
> public class UninstallAction extends ProfileModificationAction {
> 
>@@ -71,6 +71,9 @@
> 	protected int performOperation(IInstallableUnit[] ius, String targetProfileId, ProvisioningPlan plan) {
> 		UninstallWizard wizard = new UninstallWizard(targetProfileId, ius, plan);
> 		WizardDialog dialog = new WizardDialog(getShell(), wizard);
>+		dialog.create();
>+		PlatformUI.getWorkbench().getHelpSystem().setHelp(dialog.getShell(), IProvHelpContextIds.UNINSTALL_WIZARD);
>+
> 		return dialog.open();
> 	}
> 
>Index: src/org/eclipse/equinox/internal/provisional/p2/ui/dialogs/AddRepositoryDialog.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/dialogs/AddRepositoryDialog.java,v
>retrieving revision 1.16
>diff -u -r1.16 AddRepositoryDialog.java
>--- src/org/eclipse/equinox/internal/provisional/p2/ui/dialogs/AddRepositoryDialog.java	16 Apr 2008 18:56:47 -0000	1.16
>+++ src/org/eclipse/equinox/internal/provisional/p2/ui/dialogs/AddRepositoryDialog.java	30 May 2008 01:16:27 -0000
>@@ -16,6 +16,7 @@
> import org.eclipse.core.runtime.Status;
> import org.eclipse.equinox.internal.p2.ui.ProvUIActivator;
> import org.eclipse.equinox.internal.p2.ui.ProvUIMessages;
>+import org.eclipse.equinox.internal.provisional.p2.ui.IProvHelpContextIds;
> import org.eclipse.equinox.internal.provisional.p2.ui.ProvisioningOperationRunner;
> import org.eclipse.equinox.internal.provisional.p2.ui.operations.ProvisioningOperation;
> import org.eclipse.jface.dialogs.*;
>@@ -27,6 +28,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.statushandlers.StatusManager;
> 
> /**
>@@ -54,6 +56,7 @@
> 		this.repoFlag = repoFlag;
> 		urlValidator = createURLValidator();
> 		setTitle(ProvUIMessages.AddRepositoryDialog_Title);
>+		PlatformUI.getWorkbench().getHelpSystem().setHelp(parentShell, IProvHelpContextIds.ADD_REPOSITORY_DIALOG);
> 	}
> 
> 	protected void createButtonsForButtonBar(Composite parent) {
>Index: src/org/eclipse/equinox/internal/provisional/p2/ui/IProvHelpContextIds.java
>===================================================================
>RCS file: src/org/eclipse/equinox/internal/provisional/p2/ui/IProvHelpContextIds.java
>diff -N src/org/eclipse/equinox/internal/provisional/p2/ui/IProvHelpContextIds.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/equinox/internal/provisional/p2/ui/IProvHelpContextIds.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,27 @@
>+package org.eclipse.equinox.internal.provisional.p2.ui;
>+
>+import org.eclipse.equinox.internal.p2.ui.ProvUIActivator;
>+
>+/**
>+ * Help context ids for the P2 UI
>+ * <p>
>+ * This interface contains constants only; it is not intended to be implemented
>+ * or extended.
>+ * </p>
>+ * @since 3.4
>+ */
>+
>+public interface IProvHelpContextIds {
>+	public static final String PREFIX = ProvUIActivator.PLUGIN_ID + "."; //$NON-NLS-1$
>+
>+	public static final String REVERT_CONFIGURATION_WIZARD = PREFIX + "revert_configuration_wizard_context"; //$NON-NLS-1$ 
>+
>+	public static final String UNINSTALL_WIZARD = PREFIX + "uinstall_wizard_context"; //$NON-NLS-1$ 
>+
>+	public static final String UPDATE_WIZARD = PREFIX + "update_wizard_context"; //$NON-NLS-1$ 
>+
>+	public static final String ADD_REPOSITORY_DIALOG = PREFIX + "add_repository_dialog_context"; //$NON-NLS-1$ 
>+
>+	public static final String INSTALL_WIZARD = PREFIX + "install_wizard_context"; //$NON-NLS-1$ 
>+
>+}
>#P org.eclipse.equinox.p2.ui.sdk
>Index: src/org/eclipse/equinox/internal/provisional/p2/ui/sdk/RepositoryManipulationDialog.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.ui.sdk/src/org/eclipse/equinox/internal/provisional/p2/ui/sdk/RepositoryManipulationDialog.java,v
>retrieving revision 1.5
>diff -u -r1.5 RepositoryManipulationDialog.java
>--- src/org/eclipse/equinox/internal/provisional/p2/ui/sdk/RepositoryManipulationDialog.java	14 May 2008 22:49:35 -0000	1.5
>+++ src/org/eclipse/equinox/internal/provisional/p2/ui/sdk/RepositoryManipulationDialog.java	30 May 2008 01:16:28 -0000
>@@ -33,6 +33,7 @@
> import org.eclipse.swt.layout.GridData;
> import org.eclipse.swt.layout.GridLayout;
> import org.eclipse.swt.widgets.*;
>+import org.eclipse.ui.PlatformUI;
> 
> /**
>  * Dialog that allows users to update, add, or remove repositories.
>@@ -63,6 +64,8 @@
> 
> 	protected void configureShell(Shell shell) {
> 		shell.setText(ProvSDKMessages.RepositoryManipulationDialog_UpdateSitesDialogTitle);
>+		PlatformUI.getWorkbench().getHelpSystem().setHelp(shell, IProvSDKHelpContextIds.REPOSITORY_MANIPULATION_DIALOG);
>+
> 		super.configureShell(shell);
> 	}
> 
>Index: src/org/eclipse/equinox/internal/p2/ui/sdk/UpdateAndInstallDialog.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.ui.sdk/src/org/eclipse/equinox/internal/p2/ui/sdk/UpdateAndInstallDialog.java,v
>retrieving revision 1.46
>diff -u -r1.46 UpdateAndInstallDialog.java
>--- src/org/eclipse/equinox/internal/p2/ui/sdk/UpdateAndInstallDialog.java	23 May 2008 01:19:24 -0000	1.46
>+++ src/org/eclipse/equinox/internal/p2/ui/sdk/UpdateAndInstallDialog.java	30 May 2008 01:16:28 -0000
>@@ -124,6 +124,8 @@
> 
> 	protected void configureShell(Shell shell) {
> 		shell.setText(ProvSDKMessages.UpdateAndInstallDialog_Title);
>+		PlatformUI.getWorkbench().getHelpSystem().setHelp(shell, IProvSDKHelpContextIds.UPDATE_AND_INSTALL_DIALOG);
>+
> 		super.configureShell(shell);
> 	}
> 
>@@ -652,11 +654,14 @@
> 				WizardDialog dialog = new WizardDialog(getShell(), wizard);
> 				dialog.create();
> 				dialog.getShell().setSize(600, 500);
>+				PlatformUI.getWorkbench().getHelpSystem().setHelp(dialog.getShell(), IProvHelpContextIds.REVERT_CONFIGURATION_WIZARD);
>+
> 				dialog.open();
> 			}
> 		};
> 		revertAction.setText(ProvSDKMessages.UpdateAndInstallDialog_RevertActionLabel);
> 		revertAction.setToolTipText(ProvSDKMessages.UpdateAndInstallDialog_RevertTooltip);
>+
> 		revertButton = createVerticalButton(composite, revertAction, false);
> 
> 		createMenu(installedIUGroup.getStructuredViewer().getControl(), new IAction[] {updateAction, uninstallAction, propertiesAction});
>Index: src/org/eclipse/equinox/internal/p2/ui/sdk/IProvSDKHelpContextIds.java
>===================================================================
>RCS file: src/org/eclipse/equinox/internal/p2/ui/sdk/IProvSDKHelpContextIds.java
>diff -N src/org/eclipse/equinox/internal/p2/ui/sdk/IProvSDKHelpContextIds.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/equinox/internal/p2/ui/sdk/IProvSDKHelpContextIds.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,19 @@
>+package org.eclipse.equinox.internal.p2.ui.sdk;
>+
>+/**
>+ * Help context ids for the P2 SDK
>+ * <p>
>+ * This interface contains constants only; it is not intended to be implemented
>+ * or extended.
>+ * </p>
>+ * @since 3.4
>+ */
>+
>+public interface IProvSDKHelpContextIds {
>+	public static final String PREFIX = ProvSDKUIActivator.PLUGIN_ID + "."; //$NON-NLS-1$
>+
>+	public static final String UPDATE_AND_INSTALL_DIALOG = PREFIX + "update_and_install_dialog_context"; //$NON-NLS-1$ 
>+
>+	public static final String REPOSITORY_MANIPULATION_DIALOG = PREFIX + "repository_manipulation_dialog_context"; //$NON-NLS-1$ 
>+
>+}

Actions: View | Diff

Attachments on bug 232329: 102788